diff --git a/DEPS b/DEPS index c03eed9..df234e04 100644 --- a/DEPS +++ b/DEPS
@@ -312,7 +312,7 @@ # 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': '753d59e9384baf21a2a226ff3de653b8c92f7569', + 'angle_revision': '3422358be2103ec7f2b1c0dc3fc858a38521b9d2', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling SwiftShader # and whatever else without interference from each other. @@ -320,7 +320,7 @@ # Three lines of non-changing comments so that # the commit queue can handle CLs rolling PDFium # and whatever else without interference from each other. - 'pdfium_revision': 'b8f41c99763347cd7d094f5006ba588fb185a924', + 'pdfium_revision': '5e8468a4179bec77dfebec058ef3b06ef00d95e6', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling BoringSSL # and whatever else without interference from each other. @@ -351,7 +351,7 @@ # Three lines of non-changing comments so that # the commit queue can handle CLs rolling NaCl # and whatever else without interference from each other. - 'nacl_revision': '7c419b0459b994b7c8d4a5ab73cf8fddd1c812b4', + 'nacl_revision': '84258fc0d4661791cdd5bde0bb74ed32dfa18b6c', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling freetype # and whatever else without interference from each other. @@ -375,7 +375,7 @@ # Three lines of non-changing comments so that # the commit queue can handle CLs rolling catapult # and whatever else without interference from each other. - 'catapult_revision': '5bde1feaaaaa2a557fbbc91a0b223f3e4d79e8cb', + 'catapult_revision': 'c5057163e2ef2334aaa03b030ffa930ab83d1a4d', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling libFuzzer # and whatever else without interference from each other. @@ -383,7 +383,7 @@ # Three lines of non-changing comments so that # the commit queue can handle CLs rolling devtools-frontend # and whatever else without interference from each other. - 'devtools_frontend_revision': 'f931aec3eca7c860dc4d657f328daca19d19221d', + 'devtools_frontend_revision': 'b29da32422767c87749ca8132c2c0c8f378da6d7', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling libprotobuf-mutator # and whatever else without interference from each other. @@ -419,7 +419,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': '5dd9d1dee8b5efe50450b85919932fb10d6e6aef', + 'dawn_revision': '7cc9bcd1a907dd4dba9d990ab95751e8de71a6cb', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling feed # and whatever else without interference from each other. @@ -770,7 +770,7 @@ 'src/clank': { 'url': 'https://chrome-internal.googlesource.com/clank/internal/apps.git' + '@' + - 'bd5648e4a0743bab8d04e5c729ece9063e57a776', + '0f90e57aa05daa1bc022861c668d3e2345d2239c', 'condition': 'checkout_android and checkout_src_internal', }, @@ -959,7 +959,7 @@ 'packages': [ { 'package': 'chromium/third_party/androidx', - 'version': 'xe7xzjyhah4CYZYt9qLQqSrwscUnADxNRVBDD_ITqEAC', + 'version': 'btXkjr59BovHt7mjeB3OxCJisQRYv3qijJneQHYON6cC', }, ], 'condition': 'checkout_android', @@ -1204,13 +1204,13 @@ }, 'src/third_party/depot_tools': - Var('chromium_git') + '/chromium/tools/depot_tools.git' + '@' + '790a0c522dcfd85dc061565adadb2782b6ad9da1', + Var('chromium_git') + '/chromium/tools/depot_tools.git' + '@' + '9a2a8cddc1d16cfa7238984a96903cf65ce11cad', 'src/third_party/devtools-frontend/src': 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' + '@' + 'f82d08d0c487bebfa9c7e64cf39ee2e5174e9627', + 'url': 'https://chrome-internal.googlesource.com/devtools/devtools-internal.git' + '@' + '2679c8c2ecb4af39cee731ce0a359a4f71f9ea3b', 'condition': 'checkout_src_internal', }, @@ -1899,7 +1899,7 @@ Var('chromium_git') + '/v8/v8.git' + '@' + Var('v8_revision'), 'src-internal': { - 'url': 'https://chrome-internal.googlesource.com/chrome/src-internal.git@22924b06da441a8938aac2db216b0801b8e47a7a', + 'url': 'https://chrome-internal.googlesource.com/chrome/src-internal.git@d66f4e546b7ae42ca09e7da637bbc4f9c6f00280', 'condition': 'checkout_src_internal', },
diff --git a/android_webview/java/src/org/chromium/android_webview/common/ProductionSupportedFlagList.java b/android_webview/java/src/org/chromium/android_webview/common/ProductionSupportedFlagList.java index cdc6ab074..62d4653 100644 --- a/android_webview/java/src/org/chromium/android_webview/common/ProductionSupportedFlagList.java +++ b/android_webview/java/src/org/chromium/android_webview/common/ProductionSupportedFlagList.java
@@ -354,6 +354,9 @@ Flag.baseFeature(ContentSwitches.DISABLE_DOMAIN_BLOCKING_FOR3DAP_IS, "Disable the per-domain blocking for 3D APIs after GPU reset. " + "This switch is intended only for tests."), + Flag.baseFeature(MetricsFeatures.METRICS_SERVICE_ALLOW_EARLY_LOG_CLOSE, + "Controls whether a log is allowed to be closed when Chrome" + + " is backgrounded/foregrounded early."), // Add new commandline switches and features above. The final entry should have a // trailing comma for cleaner diffs. };
diff --git a/ash/BUILD.gn b/ash/BUILD.gn index b713237..afa7d95 100644 --- a/ash/BUILD.gn +++ b/ash/BUILD.gn
@@ -1160,6 +1160,8 @@ "system/accessibility/unified_accessibility_detailed_view_controller.h", "system/audio/audio_detailed_view.cc", "system/audio/audio_detailed_view.h", + "system/audio/audio_effects_controller.cc", + "system/audio/audio_effects_controller.h", "system/audio/display_speaker_controller.cc", "system/audio/display_speaker_controller.h", "system/audio/mic_gain_slider_controller.cc", @@ -2818,6 +2820,7 @@ "bubble/bubble_utils_unittest.cc", "capture_mode/capture_mode_camera_unittests.cc", "capture_mode/capture_mode_demo_tools_unittests.cc", + "capture_mode/capture_mode_feature_pod_controller_unittest.cc", "capture_mode/capture_mode_test_util.cc", "capture_mode/capture_mode_test_util.h", "capture_mode/capture_mode_unittests.cc", @@ -3016,6 +3019,7 @@ "system/accessibility/select_to_speak/select_to_speak_tray_unittest.cc", "system/accessibility/switch_access/switch_access_back_button_bubble_controller_unittest.cc", "system/accessibility/switch_access/switch_access_menu_bubble_controller_unittest.cc", + "system/audio/audio_effects_controller_unittest.cc", "system/audio/unified_audio_detailed_view_controller_unittest.cc", "system/audio/unified_volume_view_unittest.cc", "system/bluetooth/bluetooth_detailed_view_controller_unittest.cc",
diff --git a/ash/accelerators/accelerator_controller_unittest.cc b/ash/accelerators/accelerator_controller_unittest.cc index 1dcd245..788c1a467 100644 --- a/ash/accelerators/accelerator_controller_unittest.cc +++ b/ash/accelerators/accelerator_controller_unittest.cc
@@ -68,6 +68,7 @@ #include "services/media_session/public/mojom/media_session.mojom.h" #include "testing/gmock/include/gmock/gmock.h" #include "third_party/abseil-cpp/absl/types/optional.h" +#include "ui/accessibility/accessibility_features.h" #include "ui/aura/client/aura_constants.h" #include "ui/aura/test/test_windows.h" #include "ui/base/accelerators/accelerator.h" @@ -88,6 +89,7 @@ #include "ui/events/keycodes/keyboard_codes_posix.h" #include "ui/events/test/event_generator.h" #include "ui/message_center/message_center.h" +#include "ui/message_center/public/cpp/notification_types.h" #include "ui/views/widget/widget.h" #include "ui/wm/core/accelerator_filter.h" @@ -331,6 +333,13 @@ kFullscreenMagnifierToggleAccelNotificationId); } + bool IsNotificationPinned(const std::string& id) const { + auto* notification = message_center()->FindVisibleNotificationById(id); + DCHECK(notification); + return notification->pinned() || + notification->priority() == message_center::SYSTEM_PRIORITY; + } + AccessibilityConfirmationDialog* GetConfirmationDialog() { return Shell::Get() ->accessibility_controller() @@ -2131,6 +2140,10 @@ } TEST_F(AcceleratorControllerTest, TestToggleHighContrast) { + base::test::ScopedFeatureList scoped_feature_list; + scoped_feature_list.InitAndEnableFeature( + ::features::kAccessibilityAcceleratorNotificationsTimeout); + ui::Accelerator accelerator(ui::VKEY_H, ui::EF_COMMAND_DOWN | ui::EF_CONTROL_DOWN); // High Contrast Mode Enabled dialog and notification should be shown. @@ -2143,6 +2156,7 @@ AcceptConfirmationDialog(); base::RunLoop().RunUntilIdle(); EXPECT_TRUE(ContainsHighContrastNotification()); + EXPECT_FALSE(IsNotificationPinned(kHighContrastToggleAccelNotificationId)); EXPECT_TRUE(accessibility_controller->high_contrast().WasDialogAccepted()); EXPECT_FALSE(IsConfirmationDialogOpen()); @@ -2160,6 +2174,16 @@ RemoveAllNotifications(); } +TEST_F(AcceleratorControllerTest, TestToggleHighContrastPinned) { + ui::Accelerator accelerator(ui::VKEY_H, + ui::EF_COMMAND_DOWN | ui::EF_CONTROL_DOWN); + EXPECT_TRUE(ProcessInController(accelerator)); + AcceptConfirmationDialog(); + base::RunLoop().RunUntilIdle(); + EXPECT_TRUE(ContainsHighContrastNotification()); + EXPECT_TRUE(IsNotificationPinned(kHighContrastToggleAccelNotificationId)); +} + TEST_F(AcceleratorControllerTest, CalculatorKey) { auto observer = std::make_unique<MockAcceleratorObserver>(); auto* accelerator_controller = ash::AcceleratorController::Get(); @@ -2535,6 +2559,10 @@ }; TEST_F(MagnifiersAcceleratorsTester, TestToggleFullscreenMagnifier) { + base::test::ScopedFeatureList scoped_feature_list; + scoped_feature_list.InitAndEnableFeature( + ::features::kAccessibilityAcceleratorNotificationsTimeout); + FakeMagnificationManager manager; manager.SetPrefs(user_pref_service()); EXPECT_FALSE(docked_magnifier_controller()->GetEnabled()); @@ -2557,6 +2585,8 @@ EXPECT_FALSE(docked_magnifier_controller()->GetEnabled()); EXPECT_TRUE(fullscreen_magnifier_controller()->IsEnabled()); EXPECT_TRUE(ContainsFullscreenMagnifierNotification()); + EXPECT_FALSE( + IsNotificationPinned(kFullscreenMagnifierToggleAccelNotificationId)); EXPECT_TRUE(ProcessInController(fullscreen_magnifier_accelerator)); EXPECT_FALSE(docked_magnifier_controller()->GetEnabled()); @@ -2579,6 +2609,10 @@ } TEST_F(MagnifiersAcceleratorsTester, TestToggleDockedMagnifier) { + base::test::ScopedFeatureList scoped_feature_list; + scoped_feature_list.InitAndEnableFeature( + ::features::kAccessibilityAcceleratorNotificationsTimeout); + EXPECT_FALSE(docked_magnifier_controller()->GetEnabled()); EXPECT_FALSE(fullscreen_magnifier_controller()->IsEnabled()); EXPECT_FALSE(IsConfirmationDialogOpen()); @@ -2597,6 +2631,7 @@ EXPECT_TRUE(docked_magnifier_controller()->GetEnabled()); EXPECT_FALSE(fullscreen_magnifier_controller()->IsEnabled()); EXPECT_TRUE(ContainsDockedMagnifierNotification()); + EXPECT_FALSE(IsNotificationPinned(kDockedMagnifierToggleAccelNotificationId)); EXPECT_TRUE(ProcessInController(docked_magnifier_accelerator)); EXPECT_FALSE(docked_magnifier_controller()->GetEnabled()); @@ -2615,6 +2650,30 @@ RemoveAllNotifications(); } +TEST_F(MagnifiersAcceleratorsTester, TestToggleMagnifiersPinned) { + FakeMagnificationManager manager; + manager.SetPrefs(user_pref_service()); + + const ui::Accelerator fullscreen_magnifier_accelerator( + ui::VKEY_M, ui::EF_COMMAND_DOWN | ui::EF_CONTROL_DOWN); + EXPECT_TRUE(ProcessInController(fullscreen_magnifier_accelerator)); + AcceptConfirmationDialog(); + base::RunLoop().RunUntilIdle(); + EXPECT_TRUE(ContainsFullscreenMagnifierNotification()); + EXPECT_TRUE( + IsNotificationPinned(kFullscreenMagnifierToggleAccelNotificationId)); + + const ui::Accelerator docked_magnifier_accelerator( + ui::VKEY_D, ui::EF_COMMAND_DOWN | ui::EF_CONTROL_DOWN); + EXPECT_TRUE(ProcessInController(docked_magnifier_accelerator)); + AcceptConfirmationDialog(); + base::RunLoop().RunUntilIdle(); + EXPECT_TRUE(ContainsDockedMagnifierNotification()); + EXPECT_TRUE(IsNotificationPinned(kDockedMagnifierToggleAccelNotificationId)); + + RemoveAllNotifications(); +} + class AccessibilityAcceleratorTester : public MagnifiersAcceleratorsTester { public: AccessibilityAcceleratorTester() = default;
diff --git a/ash/accelerators/accelerator_notifications.cc b/ash/accelerators/accelerator_notifications.cc index 466cc75..6c0a728 100644 --- a/ash/accelerators/accelerator_notifications.cc +++ b/ash/accelerators/accelerator_notifications.cc
@@ -20,6 +20,7 @@ #include "ash/system/model/system_tray_model.h" #include "base/strings/string_split.h" #include "chromeos/ui/vector_icons/vector_icons.h" +#include "ui/accessibility/accessibility_features.h" #include "ui/base/l10n/l10n_util.h" #include "ui/message_center/message_center.h" @@ -143,14 +144,24 @@ title, message, chromeos::kEnterpriseIcon); } +// Shows a notification with the given title and message and the accessibility +// icon, without any click handler. void ShowAccessibilityNotification( int title_id, int message_id, const std::string& notification_id, const NotificationCatalogName& catalog_name) { - CreateAndShowStickyNotification( - notification_id, catalog_name, l10n_util::GetStringUTF16(title_id), - l10n_util::GetStringUTF16(message_id), kNotificationAccessibilityIcon); + if (::features::IsAccessibilityAcceleratorNotificationsTimeoutEnabled()) { + // Show a notification that times out. + CreateAndShowNotification( + notification_id, catalog_name, l10n_util::GetStringUTF16(title_id), + l10n_util::GetStringUTF16(message_id), kNotificationAccessibilityIcon); + } else { + // Show a notification that does not time out. + CreateAndShowStickyNotification( + notification_id, catalog_name, l10n_util::GetStringUTF16(title_id), + l10n_util::GetStringUTF16(message_id), kNotificationAccessibilityIcon); + } } void RemoveNotification(const std::string& notification_id) {
diff --git a/ash/capture_mode/capture_mode_feature_pod_controller.cc b/ash/capture_mode/capture_mode_feature_pod_controller.cc index a3116da..2766063 100644 --- a/ash/capture_mode/capture_mode_feature_pod_controller.cc +++ b/ash/capture_mode/capture_mode_feature_pod_controller.cc
@@ -28,6 +28,7 @@ FeaturePodButton* CaptureModeFeaturePodController::CreateButton() { DCHECK(!button_); + DCHECK(!features::IsQsRevampEnabled()); button_ = new FeaturePodButton(this, /*is_togglable=*/false); button_->SetVectorIcon(kCaptureModeIcon); const auto label_text = @@ -59,6 +60,12 @@ feature_tile->SetLabel(label_text); feature_tile->SetSubLabelVisibility(false); feature_tile->SetTooltipText(label_text); + const bool visible = + !Shell::Get()->session_controller()->IsUserSessionBlocked(); + feature_tile->SetVisible(visible); + if (visible) { + TrackVisibilityUMA(); + } return feature_tile; }
diff --git a/ash/capture_mode/capture_mode_feature_pod_controller.h b/ash/capture_mode/capture_mode_feature_pod_controller.h index eb22b97..5766b4ba 100644 --- a/ash/capture_mode/capture_mode_feature_pod_controller.h +++ b/ash/capture_mode/capture_mode_feature_pod_controller.h
@@ -7,6 +7,7 @@ #include <memory> +#include "ash/ash_export.h" #include "ash/constants/quick_settings_catalogs.h" #include "ash/system/unified/feature_pod_controller_base.h" #include "base/memory/weak_ptr.h" @@ -17,7 +18,8 @@ class UnifiedSystemTrayController; // Controller of a feature pod button that launches screen capture. -class CaptureModeFeaturePodController : public FeaturePodControllerBase { +class ASH_EXPORT CaptureModeFeaturePodController + : public FeaturePodControllerBase { public: explicit CaptureModeFeaturePodController( UnifiedSystemTrayController* controller);
diff --git a/ash/capture_mode/capture_mode_feature_pod_controller_unittest.cc b/ash/capture_mode/capture_mode_feature_pod_controller_unittest.cc new file mode 100644 index 0000000..614bd4a1 --- /dev/null +++ b/ash/capture_mode/capture_mode_feature_pod_controller_unittest.cc
@@ -0,0 +1,102 @@ +// Copyright 2023 The Chromium Authors +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "ash/capture_mode/capture_mode_feature_pod_controller.h" + +#include <memory> + +#include "ash/capture_mode/capture_mode_util.h" +#include "ash/constants/ash_features.h" +#include "ash/system/unified/feature_pod_button.h" +#include "ash/system/unified/feature_tile.h" +#include "ash/system/unified/unified_system_tray.h" +#include "ash/system/unified/unified_system_tray_bubble.h" +#include "ash/system/unified/unified_system_tray_controller.h" +#include "ash/test/ash_test_base.h" +#include "base/memory/ptr_util.h" +#include "base/test/scoped_feature_list.h" +#include "testing/gtest/include/gtest/gtest.h" + +namespace ash { + +// Tests are parameterized by feature QsRevamp. +class CaptureModeFeaturePodControllerTest + : public AshTestBase, + public testing::WithParamInterface<bool> { + public: + CaptureModeFeaturePodControllerTest() { + if (IsQsRevampEnabled()) { + feature_list_.InitWithFeatures( + {features::kQsRevamp, features::kQsRevampWip}, {}); + } else { + feature_list_.InitWithFeatures( + {}, {features::kQsRevamp, features::kQsRevampWip}); + } + } + + bool IsQsRevampEnabled() const { return GetParam(); } + + // AshTestBase: + void SetUp() override { + AshTestBase::SetUp(); + GetPrimaryUnifiedSystemTray()->ShowBubble(); + } + + void TearDown() override { + tile_.reset(); + button_.reset(); + controller_.reset(); + AshTestBase::TearDown(); + } + + void CreateButton() { + auto* tray_controller = GetPrimaryUnifiedSystemTray() + ->bubble() + ->unified_system_tray_controller(); + controller_ = + std::make_unique<CaptureModeFeaturePodController>(tray_controller); + if (IsQsRevampEnabled()) { + tile_ = controller_->CreateTile(); + } else { + button_ = base::WrapUnique(controller_->CreateButton()); + } + } + + bool IsButtonVisible() { + return IsQsRevampEnabled() ? tile_->GetVisible() : button_->GetVisible(); + } + + void PressIcon() { controller_->OnIconPressed(); } + + private: + base::test::ScopedFeatureList feature_list_; + std::unique_ptr<CaptureModeFeaturePodController> controller_; + std::unique_ptr<FeaturePodButton> button_; + std::unique_ptr<FeatureTile> tile_; +}; + +INSTANTIATE_TEST_SUITE_P(QsRevamp, + CaptureModeFeaturePodControllerTest, + testing::Bool()); + +TEST_P(CaptureModeFeaturePodControllerTest, ButtonVisibility) { + // The button is visible in an active session. + CreateButton(); + EXPECT_TRUE(IsButtonVisible()); + + // The button is not visible at the lock screen. + GetSessionControllerClient()->LockScreen(); + CreateButton(); + EXPECT_FALSE(IsButtonVisible()); +} + +TEST_P(CaptureModeFeaturePodControllerTest, PressIconStartsCaptureMode) { + CreateButton(); + ASSERT_FALSE(capture_mode_util::IsCaptureModeActive()); + + PressIcon(); + EXPECT_TRUE(capture_mode_util::IsCaptureModeActive()); +} + +} // namespace ash
diff --git a/ash/capture_mode/capture_mode_util.h b/ash/capture_mode/capture_mode_util.h index 4f04d8e..fbed369 100644 --- a/ash/capture_mode/capture_mode_util.h +++ b/ash/capture_mode/capture_mode_util.h
@@ -48,7 +48,7 @@ // Returns true if the capture mode feature is enabled and capture mode is // active. This method allows callers to avoid including the full header for // CaptureModeController, which has many transitive includes. -bool IsCaptureModeActive(); +ASH_EXPORT bool IsCaptureModeActive(); // Retrieves the point on the |rect| associated with |position|. ASH_EXPORT gfx::Point GetLocationForFineTunePosition(const gfx::Rect& rect,
diff --git a/ash/public/mojom/accelerator_info.mojom b/ash/public/mojom/accelerator_info.mojom index a74ab9cae..2f48bc1 100644 --- a/ash/public/mojom/accelerator_info.mojom +++ b/ash/public/mojom/accelerator_info.mojom
@@ -104,7 +104,7 @@ // An accelerator that can display arbitrary text with optional modifiers/keys // interspersed. struct TextAcceleratorProperties { - array<TextAcceleratorPart> parts; + array<TextAcceleratorPart> text_accelerator; }; // An accelerator that has at least one modifier and a set of keys.
diff --git a/ash/shell.cc b/ash/shell.cc index 3b992b38..4b09755b 100644 --- a/ash/shell.cc +++ b/ash/shell.cc
@@ -116,6 +116,7 @@ #include "ash/style/ash_color_mixer.h" #include "ash/style/ash_color_provider.h" #include "ash/style/dark_light_mode_controller_impl.h" +#include "ash/system/audio/audio_effects_controller.h" #include "ash/system/audio/display_speaker_controller.h" #include "ash/system/bluetooth/bluetooth_device_status_ui_handler.h" #include "ash/system/bluetooth/bluetooth_notification_controller.h" @@ -1033,6 +1034,8 @@ camera_effects_controller_.reset(); + audio_effects_controller_.reset(); + shell_delegate_.reset(); multi_capture_service_client_.reset(); @@ -1295,6 +1298,10 @@ camera_effects_controller_ = std::make_unique<CameraEffectsController>(); } + if (features::IsVcControlsUiEnabled()) { + audio_effects_controller_ = std::make_unique<AudioEffectsController>(); + } + shelf_config_ = std::make_unique<ShelfConfig>(); shelf_controller_ = std::make_unique<ShelfController>();
diff --git a/ash/shell.h b/ash/shell.h index 2c1df9c..b0faafe4 100644 --- a/ash/shell.h +++ b/ash/shell.h
@@ -101,6 +101,7 @@ class AshFocusRules; class AshTouchTransformController; class AssistantControllerImpl; +class AudioEffectsController; class AutoclickController; class AutozoomControllerImpl; class BackGestureEventHandler; @@ -395,6 +396,9 @@ AssistantControllerImpl* assistant_controller() { return assistant_controller_.get(); } + AudioEffectsController* audio_effects_controller() { + return audio_effects_controller_.get(); + } AutoclickController* autoclick_controller() { return autoclick_controller_.get(); } @@ -864,6 +868,7 @@ scoped_refptr<dbus::Bus> dbus_bus_; std::unique_ptr<AshDBusServices> ash_dbus_services_; std::unique_ptr<AssistantControllerImpl> assistant_controller_; + std::unique_ptr<AudioEffectsController> audio_effects_controller_; std::unique_ptr<AutozoomControllerImpl> autozoom_controller_; std::unique_ptr<BacklightsForcedOffSetter> backlights_forced_off_setter_; std::unique_ptr<BrightnessControlDelegate> brightness_control_delegate_;
diff --git a/ash/system/audio/audio_effects_controller.cc b/ash/system/audio/audio_effects_controller.cc new file mode 100644 index 0000000..d46ef873 --- /dev/null +++ b/ash/system/audio/audio_effects_controller.cc
@@ -0,0 +1,167 @@ +// Copyright 2023 The Chromium Authors +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "ash/system/audio/audio_effects_controller.h" + +#include "ash/accessibility/accessibility_controller_impl.h" +#include "ash/resources/vector_icons/vector_icons.h" +#include "ash/session/session_controller_impl.h" +#include "ash/shell.h" +#include "ash/strings/grit/ash_strings.h" +#include "ash/system/video_conference/effects/video_conference_tray_effects_manager.h" +#include "ash/system/video_conference/effects/video_conference_tray_effects_manager_types.h" +#include "ash/system/video_conference/video_conference_tray_controller.h" +#include "base/notreached.h" +#include "chromeos/ash/components/audio/cras_audio_handler.h" +#include "components/live_caption/caption_util.h" +#include "ui/base/l10n/l10n_util.h" + +namespace ash { + +AudioEffectsController::AudioEffectsController() { + auto* session_controller = Shell::Get()->session_controller(); + DCHECK(session_controller); + session_observation_.Observe(session_controller); +} + +AudioEffectsController::~AudioEffectsController() { + VideoConferenceTrayEffectsManager& effects_manager = + VideoConferenceTrayController::Get()->effects_manager(); + if (effects_manager.IsDelegateRegistered(this)) { + effects_manager.UnregisterDelegate(this); + } +} + +bool AudioEffectsController::IsEffectSupported( + AudioEffectId effect_id /*=AudioEffectId::kNone*/) { + switch (effect_id) { + case AudioEffectId::kNoiseCancellation: + return CrasAudioHandler::Get()->noise_cancellation_supported(); + case AudioEffectId::kLiveCaption: + return captions::IsLiveCaptionFeatureSupported(); + case AudioEffectId::kNone: + return IsEffectSupported(AudioEffectId::kNoiseCancellation) || + IsEffectSupported(AudioEffectId::kLiveCaption); + } + + NOTREACHED(); + return false; +} + +absl::optional<int> AudioEffectsController::GetEffectState(int effect_id) { + switch (effect_id) { + case AudioEffectId::kNoiseCancellation: { + return CrasAudioHandler::Get()->GetNoiseCancellationState() ? 1 : 0; + } + case AudioEffectId::kLiveCaption: { + return Shell::Get()->accessibility_controller()->live_caption().enabled() + ? 1 + : 0; + } + case AudioEffectId::kNone: + return absl::nullopt; + } + + NOTREACHED(); + return absl::nullopt; +} + +void AudioEffectsController::OnEffectControlActivated( + absl::optional<int> effect_id, + absl::optional<int> value) { + DCHECK(effect_id.has_value()); + switch (effect_id.value()) { + case AudioEffectId::kNoiseCancellation: { + // Toggle noise cancellation. + CrasAudioHandler* audio_handler = CrasAudioHandler::Get(); + bool new_state = !audio_handler->GetNoiseCancellationState(); + audio_handler->SetNoiseCancellationState(new_state); + audio_handler->SetNoiseCancellationPrefState(new_state); + return; + } + case AudioEffectId::kLiveCaption: { + // Toggle live caption. + AccessibilityControllerImpl* controller = + Shell::Get()->accessibility_controller(); + controller->live_caption().SetEnabled( + !controller->live_caption().enabled()); + return; + } + case AudioEffectId::kNone: + return; + } + + NOTREACHED(); +} + +void AudioEffectsController::OnActiveUserPrefServiceChanged( + PrefService* pref_service) { + VideoConferenceTrayEffectsManager& effects_manager = + VideoConferenceTrayController::Get()->effects_manager(); + + // Invoked when the user initially logs in and on user switching in + // multi-profile. If the delegate is already registered, no need to continue. + if (effects_manager.IsDelegateRegistered(this)) { + return; + } + + if (IsEffectSupported(AudioEffectId::kNoiseCancellation)) { + AddNoiseCancellationEffect(); + } + + if (IsEffectSupported(AudioEffectId::kLiveCaption)) { + AddLiveCaptionEffect(); + } + + if (IsEffectSupported()) { + effects_manager.RegisterDelegate(this); + } +} + +void AudioEffectsController::AddNoiseCancellationEffect() { + std::unique_ptr<VcHostedEffect> effect = std::make_unique<VcHostedEffect>( + VcEffectType::kToggle, + base::BindRepeating(&AudioEffectsController::GetEffectState, + base::Unretained(this), + static_cast<int>(AudioEffectId::kNoiseCancellation))); + effect->set_id(static_cast<int>(AudioEffectId::kNoiseCancellation)); + effect->AddState(std::make_unique<VcEffectState>( + /*icon=*/&kPrivacyIndicatorsMicrophoneIcon, + /*label_text=*/ + l10n_util::GetStringUTF16( + IDS_ASH_STATUS_TRAY_AUDIO_INPUT_NOISE_CANCELLATION), + /*accessible_name_id=*/ + IDS_ASH_STATUS_TRAY_AUDIO_INPUT_NOISE_CANCELLATION, + /*button_callback=*/ + base::BindRepeating(&AudioEffectsController::OnEffectControlActivated, + weak_factory_.GetWeakPtr(), + /*effect_id=*/ + static_cast<int>(AudioEffectId::kNoiseCancellation), + /*value=*/0))); + AddEffect(std::move(effect)); +} + +void AudioEffectsController::AddLiveCaptionEffect() { + std::unique_ptr<VcHostedEffect> effect = std::make_unique<VcHostedEffect>( + VcEffectType::kToggle, + base::BindRepeating(&AudioEffectsController::GetEffectState, + base::Unretained(this), + static_cast<int>(AudioEffectId::kLiveCaption))); + effect->set_id(static_cast<int>(AudioEffectId::kLiveCaption)); + effect->AddState(std::make_unique<VcEffectState>( + /*icon=*/&kPrivacyIndicatorsMicrophoneIcon, + /*label_text=*/ + l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_LIVE_CAPTION), + /*accessible_name_id=*/ + IDS_ASH_STATUS_TRAY_LIVE_CAPTION, + /*button_callback=*/ + base::BindRepeating(&AudioEffectsController::OnEffectControlActivated, + weak_factory_.GetWeakPtr(), + /*effect_id=*/ + static_cast<int>(AudioEffectId::kLiveCaption), + /*value=*/0))); + AddEffect(std::move(effect)); +} + +} // namespace ash
diff --git a/ash/system/audio/audio_effects_controller.h b/ash/system/audio/audio_effects_controller.h new file mode 100644 index 0000000..ab9259de --- /dev/null +++ b/ash/system/audio/audio_effects_controller.h
@@ -0,0 +1,62 @@ +// Copyright 2023 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_SYSTEM_AUDIO_AUDIO_EFFECTS_CONTROLLER_H_ +#define ASH_SYSTEM_AUDIO_AUDIO_EFFECTS_CONTROLLER_H_ + +#include "ash/ash_export.h" +#include "ash/public/cpp/session/session_controller.h" +#include "ash/public/cpp/session/session_observer.h" +#include "ash/system/video_conference/effects/video_conference_tray_effects_delegate.h" +#include "base/memory/weak_ptr.h" +#include "base/scoped_observation.h" +#include "third_party/abseil-cpp/absl/types/optional.h" + +namespace ash { + +class ASH_EXPORT AudioEffectsController : public VcEffectsDelegate, + public SessionObserver { + public: + enum AudioEffectId { + kNone = 0, + kNoiseCancellation = 1, + kLiveCaption = 2, + }; + + AudioEffectsController(); + + AudioEffectsController(const AudioEffectsController&) = delete; + AudioEffectsController& operator=(const AudioEffectsController&) = delete; + + ~AudioEffectsController() override; + + // Returns whether `effect_id` is supported. If passed an `effect_id` of + // `AudioEffectId::kNone`, the function returns whether *any* effects are + // supported. + bool IsEffectSupported(AudioEffectId effect_id = AudioEffectId::kNone); + + // VcEffectsDelegate: + absl::optional<int> GetEffectState(int effect_id) override; + void OnEffectControlActivated(absl::optional<int> effect_id, + absl::optional<int> state) override; + + // SessionObserver: + void OnActiveUserPrefServiceChanged(PrefService* pref_service) override; + + private: + // Construct effect for noise cancellation. + void AddNoiseCancellationEffect(); + + // Construct effect for live caption. + void AddLiveCaptionEffect(); + + base::ScopedObservation<SessionController, SessionObserver> + session_observation_{this}; + + base::WeakPtrFactory<AudioEffectsController> weak_factory_{this}; +}; + +} // namespace ash + +#endif // ASH_SYSTEM_AUDIO_AUDIO_EFFECTS_CONTROLLER_H_ \ No newline at end of file
diff --git a/ash/system/audio/audio_effects_controller_unittest.cc b/ash/system/audio/audio_effects_controller_unittest.cc new file mode 100644 index 0000000..0ef46e7 --- /dev/null +++ b/ash/system/audio/audio_effects_controller_unittest.cc
@@ -0,0 +1,307 @@ +// Copyright 2023 The Chromium Authors +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "ash/system/audio/audio_effects_controller.h" + +#include "ash/accessibility/accessibility_controller_impl.h" +#include "ash/constants/ash_features.h" +#include "ash/shell.h" +#include "ash/system/video_conference/fake_video_conference_tray_controller.h" +#include "ash/test/ash_test_base.h" +#include "base/test/scoped_feature_list.h" +#include "chromeos/ash/components/audio/cras_audio_handler.h" +#include "chromeos/ash/components/dbus/audio/cras_audio_client.h" +#include "chromeos/ash/components/dbus/audio/fake_cras_audio_client.h" +#include "media/base/media_switches.h" + +namespace ash { + +class AudioEffectsControllerTest : public NoSessionAshTestBase { + public: + AudioEffectsControllerTest() = default; + + AudioEffectsControllerTest(const AudioEffectsControllerTest&) = delete; + AudioEffectsControllerTest& operator=(const AudioEffectsControllerTest&) = + delete; + + ~AudioEffectsControllerTest() override = default; + + // NoSessionAshTestBase: + void SetUp() override { + scoped_feature_list_.InitWithFeatures({features::kVcControlsUi}, {}); + + // Here we have to create the global instance of `CrasAudioHandler` before + // `FakeVideoConferenceTrayController`, so we do it here and not in + // `AshTestBase`. + CrasAudioClient::InitializeFake(); + CrasAudioHandler::InitializeForTesting(); + + // Instantiates a fake controller (the real one is created in + // ChromeBrowserMainExtraPartsAsh::PreProfileInit() which is not called in + // ash unit tests). This controller is needed because it owns the effects + // manager. + tray_controller_ = std::make_unique<FakeVideoConferenceTrayController>(); + + set_create_global_cras_audio_handler(false); + + NoSessionAshTestBase::SetUp(); + + audio_effects_controller_ = Shell::Get()->audio_effects_controller(); + } + + void TearDown() override { + AshTestBase::TearDown(); + tray_controller_.reset(); + CrasAudioHandler::Shutdown(); + CrasAudioClient::Shutdown(); + } + + protected: + FakeCrasAudioClient* fake_cras_audio_client() { + return FakeCrasAudioClient::Get(); + } + + CrasAudioHandler* cras_audio_handler() { return CrasAudioHandler::Get(); } + + AudioEffectsController* audio_effects_controller() { + return audio_effects_controller_; + } + + private: + AudioEffectsController* audio_effects_controller_ = nullptr; + std::unique_ptr<FakeVideoConferenceTrayController> tray_controller_; + base::test::ScopedFeatureList scoped_feature_list_; +}; + +TEST_F(AudioEffectsControllerTest, NoiseCancellationNotSupported) { + // Prepare `CrasAudioHandler` to report that noise cancellation is + // not-supported. + fake_cras_audio_client()->SetNoiseCancellationSupported(false); + cras_audio_handler()->RequestNoiseCancellationSupported(base::DoNothing()); + + SimulateUserLogin("testuser1@gmail.com"); + + // `AudioEffectsController` reports noise that cancellation is not-supported. + EXPECT_FALSE(audio_effects_controller()->IsEffectSupported( + AudioEffectsController::AudioEffectId::kNoiseCancellation)); +} + +TEST_F(AudioEffectsControllerTest, NoiseCancellationSupported) { + // Prepare `CrasAudioHandler` to report that noise cancellation is supported. + fake_cras_audio_client()->SetNoiseCancellationSupported(true); + cras_audio_handler()->RequestNoiseCancellationSupported(base::DoNothing()); + + SimulateUserLogin("testuser1@gmail.com"); + + // `AudioEffectsController` reports that noise cancellation is supported. + EXPECT_TRUE(audio_effects_controller()->IsEffectSupported( + AudioEffectsController::AudioEffectId::kNoiseCancellation)); +} + +TEST_F(AudioEffectsControllerTest, NoiseCancellationNotEnabled) { + // Prepare noise cancellation support. + fake_cras_audio_client()->SetNoiseCancellationSupported(true); + cras_audio_handler()->RequestNoiseCancellationSupported(base::DoNothing()); + + SimulateUserLogin("testuser1@gmail.com"); + + // Explicitly disable noise cancellation. + cras_audio_handler()->SetNoiseCancellationState(false); + cras_audio_handler()->SetNoiseCancellationPrefState(false); + + // Noise cancellation effect state is disabled. + absl::optional<int> effect_state = audio_effects_controller()->GetEffectState( + AudioEffectsController::AudioEffectId::kNoiseCancellation); + EXPECT_TRUE(effect_state.has_value()); + EXPECT_EQ(effect_state, 0); + + cras_audio_handler()->SetNoiseCancellationState(true); + cras_audio_handler()->SetNoiseCancellationPrefState(true); + effect_state = audio_effects_controller()->GetEffectState( + AudioEffectsController::AudioEffectId::kNoiseCancellation); + EXPECT_TRUE(effect_state.has_value()); + EXPECT_EQ(effect_state, 1); +} + +TEST_F(AudioEffectsControllerTest, NoiseCancellationEnabled) { + // Prepare noise cancellation support. + fake_cras_audio_client()->SetNoiseCancellationSupported(true); + cras_audio_handler()->RequestNoiseCancellationSupported(base::DoNothing()); + + SimulateUserLogin("testuser1@gmail.com"); + + // Explicitly enable noise cancellation. + cras_audio_handler()->SetNoiseCancellationState(true); + cras_audio_handler()->SetNoiseCancellationPrefState(true); + + // Noise cancellation effect state is disabled. + absl::optional<int> effect_state = audio_effects_controller()->GetEffectState( + AudioEffectsController::AudioEffectId::kNoiseCancellation); + EXPECT_TRUE(effect_state.has_value()); + EXPECT_EQ(effect_state, 1); +} + +TEST_F(AudioEffectsControllerTest, NoiseCancellationSetNotEnabled) { + // Prepare noise cancellation support. + fake_cras_audio_client()->SetNoiseCancellationSupported(true); + cras_audio_handler()->RequestNoiseCancellationSupported(base::DoNothing()); + + SimulateUserLogin("testuser1@gmail.com"); + + // Explicitly enable noise cancellation. + cras_audio_handler()->SetNoiseCancellationState(true); + cras_audio_handler()->SetNoiseCancellationPrefState(true); + + // Check that noise cancellation is enabled. + EXPECT_TRUE(cras_audio_handler()->GetNoiseCancellationState()); + + // User pressed the noise cancellation toggle. + audio_effects_controller()->OnEffectControlActivated( + AudioEffectsController::AudioEffectId::kNoiseCancellation, absl::nullopt); + + // State should now be disabled. + EXPECT_FALSE(cras_audio_handler()->GetNoiseCancellationState()); +} + +TEST_F(AudioEffectsControllerTest, NoiseCancellationSetEnabled) { + // Prepare noise cancellation support. + fake_cras_audio_client()->SetNoiseCancellationSupported(true); + cras_audio_handler()->RequestNoiseCancellationSupported(base::DoNothing()); + + SimulateUserLogin("testuser1@gmail.com"); + + // Explicitly disable noise cancellation. + cras_audio_handler()->SetNoiseCancellationState(false); + cras_audio_handler()->SetNoiseCancellationPrefState(false); + + // Check that noise cancellation is disabled. + EXPECT_FALSE(cras_audio_handler()->GetNoiseCancellationState()); + + // User pressed the noise cancellation toggle. + audio_effects_controller()->OnEffectControlActivated( + AudioEffectsController::AudioEffectId::kNoiseCancellation, absl::nullopt); + + // State should now be enabled. + EXPECT_TRUE(cras_audio_handler()->GetNoiseCancellationState()); +} + +TEST_F(AudioEffectsControllerTest, LiveCaptionNotSupported) { + SimulateUserLogin("testuser1@gmail.com"); + + // No live caption feature flags enabled, so `AudioEffectsController` reports + // that live caption is not supported. + EXPECT_FALSE(audio_effects_controller()->IsEffectSupported( + AudioEffectsController::AudioEffectId::kLiveCaption)); +} + +TEST_F(AudioEffectsControllerTest, LiveCaptionSupported) { + base::test::ScopedFeatureList scoped_feature_list; + scoped_feature_list.InitWithFeatures( + {media::kLiveCaption, media::kLiveCaptionSystemWideOnChromeOS, + ash::features::kOnDeviceSpeechRecognition}, + {}); + + SimulateUserLogin("testuser1@gmail.com"); + + // Live caption feature flags are enabled, so `AudioEffectsController` reports + // that live caption is supported. + EXPECT_TRUE(audio_effects_controller()->IsEffectSupported( + AudioEffectsController::AudioEffectId::kLiveCaption)); +} + +TEST_F(AudioEffectsControllerTest, LiveCaptionNotEnabled) { + // Ensure that live caption is supported. + base::test::ScopedFeatureList scoped_feature_list; + scoped_feature_list.InitWithFeatures( + {media::kLiveCaption, media::kLiveCaptionSystemWideOnChromeOS, + ash::features::kOnDeviceSpeechRecognition}, + {}); + + SimulateUserLogin("testuser1@gmail.com"); + + // Explicitly disable live caption, confirm that it is disabled. + AccessibilityControllerImpl* controller = + Shell::Get()->accessibility_controller(); + controller->live_caption().SetEnabled(false); + EXPECT_FALSE(controller->live_caption().enabled()); + + // Live caption effect state is disabled. + absl::optional<int> state = audio_effects_controller()->GetEffectState( + AudioEffectsController::AudioEffectId::kLiveCaption); + EXPECT_TRUE(state.has_value()); + EXPECT_FALSE(state.value()); +} + +TEST_F(AudioEffectsControllerTest, LiveCaptionEnabled) { + // Ensure that live caption is supported. + base::test::ScopedFeatureList scoped_feature_list; + scoped_feature_list.InitWithFeatures( + {media::kLiveCaption, media::kLiveCaptionSystemWideOnChromeOS, + ash::features::kOnDeviceSpeechRecognition}, + {}); + + SimulateUserLogin("testuser1@gmail.com"); + + // Explicitly enable live caption, confirm that it is enabled. + AccessibilityControllerImpl* controller = + Shell::Get()->accessibility_controller(); + controller->live_caption().SetEnabled(true); + EXPECT_TRUE(controller->live_caption().enabled()); + + // Live caption effect state is enabled. + absl::optional<int> state = audio_effects_controller()->GetEffectState( + AudioEffectsController::AudioEffectId::kLiveCaption); + EXPECT_TRUE(state.has_value()); + EXPECT_TRUE(state.value()); +} + +TEST_F(AudioEffectsControllerTest, LiveCaptionSetNotEnabled) { + // Ensure that live caption is supported. + base::test::ScopedFeatureList scoped_feature_list; + scoped_feature_list.InitWithFeatures( + {media::kLiveCaption, media::kLiveCaptionSystemWideOnChromeOS, + ash::features::kOnDeviceSpeechRecognition}, + {}); + + SimulateUserLogin("testuser1@gmail.com"); + + // Explicitly enable live caption, confirm that it is enabled. + AccessibilityControllerImpl* controller = + Shell::Get()->accessibility_controller(); + controller->live_caption().SetEnabled(true); + EXPECT_TRUE(controller->live_caption().enabled()); + + // User pressed the live caption toggle. + audio_effects_controller()->OnEffectControlActivated( + AudioEffectsController::AudioEffectId::kLiveCaption, absl::nullopt); + + // Live caption is now disabled. + EXPECT_FALSE(controller->live_caption().enabled()); +} + +TEST_F(AudioEffectsControllerTest, LiveCaptionSetEnabled) { + // Ensure that live caption is supported. + base::test::ScopedFeatureList scoped_feature_list; + scoped_feature_list.InitWithFeatures( + {media::kLiveCaption, media::kLiveCaptionSystemWideOnChromeOS, + ash::features::kOnDeviceSpeechRecognition}, + {}); + + SimulateUserLogin("testuser1@gmail.com"); + + // Explicitly disable live caption, confirm that it is disabled. + AccessibilityControllerImpl* controller = + Shell::Get()->accessibility_controller(); + controller->live_caption().SetEnabled(false); + EXPECT_FALSE(controller->live_caption().enabled()); + + // User pressed the live caption toggle. + audio_effects_controller()->OnEffectControlActivated( + AudioEffectsController::AudioEffectId::kLiveCaption, absl::nullopt); + + // Live caption is now enabled. + EXPECT_TRUE(controller->live_caption().enabled()); +} + +} // namespace ash
diff --git a/ash/webui/shortcut_customization_ui/backend/accelerator_configuration_provider_unittest.cc b/ash/webui/shortcut_customization_ui/backend/accelerator_configuration_provider_unittest.cc index 150609a..1ccd01f2 100644 --- a/ash/webui/shortcut_customization_ui/backend/accelerator_configuration_provider_unittest.cc +++ b/ash/webui/shortcut_customization_ui/backend/accelerator_configuration_provider_unittest.cc
@@ -631,7 +631,7 @@ // (keys/modifiers). Validating the plain text parts is handled by the // paramaterized tests below. const auto& text_accel_parts = RemovePlainTextParts( - info->layout_properties->get_text_accelerator()->parts); + info->layout_properties->get_text_accelerator()->text_accelerator); const auto& replacement_parts = GetReplacementsForAction(id); for (size_t i = 0; i < replacement_parts.size(); i++) { ValidateTextAccelerators(replacement_parts[i], text_accel_parts[i]); @@ -761,11 +761,11 @@ auto& bundle = ui::ResourceBundle::GetSharedInstance(); int FAKE_RESOURCE_ID = 1; bundle.OverrideLocaleStringResource(FAKE_RESOURCE_ID, replacement_string_); - const auto text_accelerator = provider_->CreateTextAcceleratorProperties( + const auto parts = provider_->CreateTextAcceleratorProperties( {FAKE_RESOURCE_ID, replacements_}); - EXPECT_EQ(expected_parts_.size(), text_accelerator->parts.size()); + EXPECT_EQ(expected_parts_.size(), parts->text_accelerator.size()); for (size_t i = 0; i < expected_parts_.size(); i++) { - ValidateTextAccelerators(expected_parts_[i], text_accelerator->parts[i]); + ValidateTextAccelerators(expected_parts_[i], parts->text_accelerator[i]); } }
diff --git a/ash/webui/shortcut_customization_ui/resources/js/accelerator_row.ts b/ash/webui/shortcut_customization_ui/resources/js/accelerator_row.ts index 14e52d1..b91b9f7 100644 --- a/ash/webui/shortcut_customization_ui/resources/js/accelerator_row.ts +++ b/ash/webui/shortcut_customization_ui/resources/js/accelerator_row.ts
@@ -145,7 +145,7 @@ assert(info.length === 1); const textAcceleratorInfo = info[0]; assert(isTextAcceleratorInfo(textAcceleratorInfo)); - return textAcceleratorInfo.layoutProperties.textAccelerator.parts; + return textAcceleratorInfo.layoutProperties.textAccelerator.textAccelerator; } static get template(): HTMLTemplateElement {
diff --git a/ash/webui/shortcut_customization_ui/resources/js/fake_data.ts b/ash/webui/shortcut_customization_ui/resources/js/fake_data.ts index 49f8817..2dffbfe 100644 --- a/ash/webui/shortcut_customization_ui/resources/js/fake_data.ts +++ b/ash/webui/shortcut_customization_ui/resources/js/fake_data.ts
@@ -37,7 +37,7 @@ locked: true, layoutProperties: { textAccelerator: { - parts: [ + textAccelerator: [ { text: stringToMojoString16('ctrl'), type: TextAcceleratorPartType.kModifier,
diff --git a/ash/webui/shortcut_customization_ui/resources/js/shortcut_types.ts b/ash/webui/shortcut_customization_ui/resources/js/shortcut_types.ts index ea4f1fd..e2c9199 100644 --- a/ash/webui/shortcut_customization_ui/resources/js/shortcut_types.ts +++ b/ash/webui/shortcut_customization_ui/resources/js/shortcut_types.ts
@@ -98,7 +98,8 @@ export type TextAcceleratorInfo = Omit<AcceleratorInfoTypes.AcceleratorInfo, 'layoutProperties'>&{ layoutProperties: { - textAccelerator: {parts: AcceleratorInfoTypes.TextAcceleratorPart[]}, + textAccelerator: + {textAccelerator: AcceleratorInfoTypes.TextAcceleratorPart[]}, }, };
diff --git a/ash/wm/default_state.cc b/ash/wm/default_state.cc index 2fef61c..1d911b8 100644 --- a/ash/wm/default_state.cc +++ b/ash/wm/default_state.cc
@@ -62,10 +62,13 @@ : gfx::Size(); } -void MoveToDisplayForRestore(WindowState* window_state) { - if (!window_state->HasRestoreBounds()) - return; - const gfx::Rect restore_bounds = window_state->GetRestoreBoundsInScreen(); +// Called to ensure the window is moved to the correct display when entering the +// next state, taking into account whether it's restoring or not. +void MoveWindowToDisplay(WindowState* window_state) { + const gfx::Rect window_bounds = + window_state->HasRestoreBounds() + ? window_state->GetRestoreBoundsInScreen() + : window_state->GetCurrentBoundsInScreen(); // Move only if the restore bounds is outside of // the display. There is no information about in which @@ -77,9 +80,9 @@ ->GetDisplayNearestWindow(window_state->window()) .bounds(); - if (!display_area.Intersects(restore_bounds)) { + if (!display_area.Intersects(window_bounds)) { const display::Display& display = - display::Screen::GetScreen()->GetDisplayMatching(restore_bounds); + display::Screen::GetScreen()->GetDisplayMatching(window_bounds); RootWindowController* new_root_controller = Shell::Get()->GetRootWindowControllerWithDisplayId(display.id()); if (new_root_controller->GetRootWindow() != @@ -468,36 +471,21 @@ // TODO(oshima): This was added for DOCKED windows. Investigate if // we still need this. if (window_state->window()->parent()) { - if (!window_state->HasRestoreBounds() && - IsNormalWindowStateType(previous_state_type) && - !window_state->IsMinimized() && !window_state->IsNormalStateType()) { - window_state->SaveCurrentBoundsForRestore(); - } - // When restoring from a minimized state, we want to restore to the // previous bounds. However, we want to maintain the restore bounds. // (The restore bounds are set if a user maximized the window in one // axis by double clicking the window border for example). - gfx::Rect restore_bounds_in_screen; if (previous_state_type == WindowStateType::kMinimized && window_state->IsNormalStateType() && window_state->HasRestoreBounds() && !window_state->unminimize_to_restore_bounds()) { - restore_bounds_in_screen = window_state->GetRestoreBoundsInScreen(); window_state->SaveCurrentBoundsForRestore(); } if (window_state->IsMaximizedOrFullscreenOrPinned()) - MoveToDisplayForRestore(window_state); + MoveWindowToDisplay(window_state); UpdateBoundsFromState(window_state, previous_state_type); UpdateMinimizedState(window_state, previous_state_type); - - // Normal state should have no restore bounds unless it's - // unminimized. - if (!restore_bounds_in_screen.IsEmpty()) - window_state->SetRestoreBoundsInScreen(restore_bounds_in_screen); - else if (window_state->IsNormalStateType()) - window_state->ClearRestoreBounds(); } window_state->NotifyPostStateTypeChange(previous_state_type);
diff --git a/ash/wm/toplevel_window_event_handler_unittest.cc b/ash/wm/toplevel_window_event_handler_unittest.cc index a122d19..a511864 100644 --- a/ash/wm/toplevel_window_event_handler_unittest.cc +++ b/ash/wm/toplevel_window_event_handler_unittest.cc
@@ -514,6 +514,8 @@ std::unique_ptr<aura::Window> target(CreateTestWindowInShellWithDelegate( new TestWindowDelegate(HTCAPTION), 0, gfx::Rect(0, 0, 100, 100))); WindowState* window_state = WindowState::Get(target.get()); + EXPECT_EQ(WindowStateType::kDefault, window_state->GetStateType()); + EXPECT_EQ(gfx::Rect(), window_state->GetRestoreBoundsInScreen()); ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow(), target.get()); gfx::Rect old_bounds = target->bounds(); @@ -531,6 +533,8 @@ // Verify that the window has moved after the gesture. EXPECT_NE(old_bounds.ToString(), target->bounds().ToString()); EXPECT_EQ(WindowStateType::kSecondarySnapped, window_state->GetStateType()); + EXPECT_EQ(gfx::Rect(0, 0, 100, 100), + window_state->GetRestoreBoundsInScreen()); old_bounds = target->bounds(); @@ -542,8 +546,12 @@ EXPECT_NE(old_bounds.ToString(), target->bounds().ToString()); EXPECT_EQ(WindowStateType::kPrimarySnapped, window_state->GetStateType()); + EXPECT_EQ(gfx::Rect(0, 0, 100, 100), + window_state->GetRestoreBoundsInScreen()); window_state->Restore(); + EXPECT_EQ(WindowStateType::kNormal, window_state->GetStateType()); + EXPECT_EQ(gfx::Rect(), window_state->GetRestoreBoundsInScreen()); gfx::Rect bounds_before_maximization = target->bounds(); bounds_before_maximization.Offset(0, 100); target->SetBounds(bounds_before_maximization);
diff --git a/ash/wm/window_state.cc b/ash/wm/window_state.cc index 867e250..1a437948 100644 --- a/ash/wm/window_state.cc +++ b/ash/wm/window_state.cc
@@ -142,6 +142,27 @@ return false; } +// Compares two WindowStateTypes for equivalence, where kDefault and kNormal +// are treated as equivalent. +bool IsEquivalent(WindowStateType lhs, WindowStateType rhs) { + return lhs == rhs || + // Treat kDefault and kNormal as equivalent. + ((lhs == chromeos::WindowStateType::kDefault && + rhs == chromeos::WindowStateType::kNormal) || + (lhs == chromeos::WindowStateType::kNormal && + rhs == chromeos::WindowStateType::kDefault)); +} + +// Gets the bounds in screen coordinates from the RestoreState that can be used +// for restore. Returns empty bounds if state is nullptr. +gfx::Rect GetBoundsForRestore(const WindowState::RestoreState* state) { + if (!state) { + return {}; + } + return state->restore_bounds_in_screen ? *state->restore_bounds_in_screen + : state->actual_bounds_in_screen; +} + bool IsTabletModeEnabled() { return Shell::Get()->tablet_mode_controller()->InTabletMode(); } @@ -305,6 +326,25 @@ window_ = nullptr; } +bool WindowState::RestoreState::operator==( + const WindowState::RestoreState& other) const { + return window_state_type == other.window_state_type && + actual_bounds_in_screen == other.actual_bounds_in_screen && + restore_bounds_in_screen == other.restore_bounds_in_screen; +} + +std::ostream& operator<<(std::ostream& os, + const WindowState::RestoreState& state) { + os << "RestoreState{ window_state_type=" << state.window_state_type + << " actual_bounds_in_screen=" << state.actual_bounds_in_screen.ToString() + << " restore_bounds_in_screen=" + << (state.restore_bounds_in_screen + ? state.restore_bounds_in_screen->ToString() + : "unset") + << " }"; + return os; +} + WindowState::~WindowState() { // WindowState is registered as an owned property of |window_|, and window // unregisters all of its observers in its d'tor before destroying its @@ -502,10 +542,14 @@ bar_controller->UpdateBarOnWindowStateChanges(window_); } -void WindowState::SaveCurrentBoundsForRestore() { +gfx::Rect WindowState::GetCurrentBoundsInScreen() const { gfx::Rect bounds_in_screen = window_->GetTargetBounds(); ::wm::ConvertRectToScreen(window_->parent(), &bounds_in_screen); - SetRestoreBoundsInScreen(bounds_in_screen); + return bounds_in_screen; +} + +void WindowState::SaveCurrentBoundsForRestore() { + SetRestoreBoundsInScreen(GetCurrentBoundsInScreen()); } gfx::Rect WindowState::GetRestoreBoundsInScreen() const { @@ -728,11 +772,12 @@ } WindowStateType WindowState::GetRestoreWindowState() const { - WindowStateType restore_state = - window_state_restore_history_.empty() || - window_state_restore_history_.back() == WindowStateType::kDefault - ? WindowStateType::kNormal - : window_state_restore_history_.back(); + WindowStateType restore_state = WindowStateType::kNormal; + if (auto* state = PeekNextRestoreState()) { + restore_state = state->window_state_type == WindowStateType::kDefault + ? WindowStateType::kNormal + : state->window_state_type; + } // Different with the restore behaviors in clamshell mode, a window can not be // restored to kNormal window state if it's a maximize-able window. @@ -884,6 +929,7 @@ for (auto& observer : observer_list_) observer.OnPreWindowStateTypeChange(this, old_window_state_type); OnPrePipStateChange(old_window_state_type); + UpdateRestoreHistory(old_window_state_type); } void WindowState::NotifyPostStateTypeChange( @@ -891,7 +937,7 @@ for (auto& observer : observer_list_) observer.OnPostWindowStateTypeChange(this, old_window_state_type); OnPostPipStateChange(old_window_state_type); - UpdateWindowStateRestoreHistoryStack(old_window_state_type); + UpdateRestorePropertiesFromRestoreHistory(); SaveWindowForWindowRestore(this); if (chromeos::IsSnappedWindowStateType(old_window_state_type)) { // If the state type is no longer snapped, partial may have ended. @@ -1086,7 +1132,7 @@ } } -void WindowState::UpdateWindowStateRestoreHistoryStack( +void WindowState::UpdateRestoreHistory( chromeos::WindowStateType previous_state_type) { WindowStateType current_state_type = GetStateType(); @@ -1099,18 +1145,36 @@ // We'll need to pop out any window state that the `current_state_type` can // not restore back to (i.e., whose restore order is equal or higher than // `current_state_type`). - for (auto state : base::Reversed(window_state_restore_history_)) { + for (auto& state : base::Reversed(window_state_restore_history_)) { // Don't allow same-level restore here to prevent restore cycles which can // lead to unbounded stack, e.g. when toggling between fullscreen and // floated repeatedly. The side effect is that restore will only remember // (handled below) at most one such same-level transition (e.g. fullscreen // to floated, or vice versa), which is ok. - if (CanRestoreState(current_state_type, state, + if (CanRestoreState(current_state_type, state.window_state_type, /*allow_same_level_restore=*/false)) { break; } + // Retrieve and hold onto the restore state for the state type that we're + // entering into, so it can be used later, e.g., to update the restore + // bounds property. + if (IsEquivalent(state.window_state_type, current_state_type)) { + current_restore_state_ = std::move(state); + } window_state_restore_history_.pop_back(); } + // If the state we're entering into is not in the history, but we also have + // existing restore bounds, then we want to use it. This can happen if, for + // example, a window was restored from full restore in a non-normal window + // state type, then it may have a truncated restore history but with restore + // bounds. + if (!current_restore_state_ && HasRestoreBounds()) { + current_restore_state_ = { + .window_state_type = current_state_type, + .actual_bounds_in_screen = GetCurrentBoundsInScreen(), + .restore_bounds_in_screen = GetRestoreBoundsInScreen(), + }; + } if (IsValidForRestoreHistory(previous_state_type) && // Allow same-level restore, so the previous state can be remembered. @@ -1118,9 +1182,37 @@ // time, in the code above. CanRestoreState(current_state_type, previous_state_type, /*allow_same_level_restore=*/true)) { - window_state_restore_history_.push_back(previous_state_type); + window_state_restore_history_.push_back({ + .window_state_type = previous_state_type, + .actual_bounds_in_screen = GetCurrentBoundsInScreen(), + }); + // Save current restore bounds, if any. Also check that restore bounds are + // not the same as current bounds, because when dragging a window, the + // restore bounds is used temporarily to remember the original pre-drag + // bounds and is not cleared, which gets unnecessarily carried over later + // when updating restore state from the restore history. + // TODO(aluh): Fix drag-drop code to properly clear temporary restore + // bounds, so we can remove this workaround. + if (HasRestoreBounds() && + GetRestoreBoundsInScreen() != GetCurrentBoundsInScreen()) { + window_state_restore_history_.back().restore_bounds_in_screen = + GetRestoreBoundsInScreen(); + } } + // The check for tablet mode has the same reason as + // UpdateRestorePropertiesFromRestoreHistory(). + if (!IsTabletModeEnabled()) { + // Update the restore bounds so it can be used to update window bounds. + if (current_restore_state_ && + current_restore_state_->restore_bounds_in_screen) { + SetRestoreBoundsInScreen( + *current_restore_state_->restore_bounds_in_screen); + } + } +} + +void WindowState::UpdateRestorePropertiesFromRestoreHistory() { // TODO(xdai): For now we don't save the restore history in tablet mode in the // window property, so that when exiting tablet mode, the window can still // restore back to its old window state (see the test case @@ -1129,7 +1221,31 @@ if (!IsTabletModeEnabled()) { window_->SetProperty(aura::client::kRestoreShowStateKey, chromeos::ToWindowShowState(GetRestoreWindowState())); + // Update restore bounds again, since it may have been modified by other + // bounds update logic, e.g. when unminimizing. + if (current_restore_state_ && + current_restore_state_->restore_bounds_in_screen) { + // This means we had existing restore bounds, so propagate it. + SetRestoreBoundsInScreen( + *current_restore_state_->restore_bounds_in_screen); + } else if (auto bounds = GetBoundsForRestore(PeekNextRestoreState()); + !bounds.IsEmpty()) { + // This means we're entering a new state not in the restore history, i.e. + // not restoring back to an earlier state, so we propagate the restorable + // bounds from the most recent restore state. + SetRestoreBoundsInScreen(bounds); + } else { + // There's no restore bounds from anywhere to propagate, so clear it. + ClearRestoreBounds(); + } } + current_restore_state_.reset(); +} + +const WindowState::RestoreState* WindowState::PeekNextRestoreState() const { + return !window_state_restore_history_.empty() + ? &window_state_restore_history_.back() + : nullptr; } chromeos::WindowStateType WindowState::GetMaximizedOrCenteredWindowType()
diff --git a/ash/wm/window_state.h b/ash/wm/window_state.h index ebc6e045..cd49266 100644 --- a/ash/wm/window_state.h +++ b/ash/wm/window_state.h
@@ -6,6 +6,7 @@ #define ASH_WM_WINDOW_STATE_H_ #include <memory> +#include <ostream> #include <vector> #include "ash/ash_export.h" @@ -106,6 +107,28 @@ kAnimateZero, }; + // Represents the state of a window relevant for restore. + struct RestoreState { + // The WindowStateType for which this RestoreState is applicable. + chromeos::WindowStateType window_state_type = + chromeos::WindowStateType::kDefault; + + // The actual window bounds, in screen coordinates, during this + // window_state_type. If there was no explicit restore bounds property + // during this state, then the actual bounds here is used for restoring. + gfx::Rect actual_bounds_in_screen; + + // The value of the restore bounds property, if any, in screen coordinates, + // during this window_state_type. This is separate from the actual bounds + // above, because some special cases, such as horizontal/vertical maximize, + // have different actual bounds and restore bounds. + absl::optional<gfx::Rect> restore_bounds_in_screen; + + // TODO(aluh): Simplify to defaulted comparison operator once C++20 is + // supported. + bool operator==(const RestoreState&) const; + }; + // The default duration for an animation between two sets of bounds. static constexpr base::TimeDelta kBoundsChangeSlideDuration = base::Milliseconds(120); @@ -211,6 +234,9 @@ // state impl. State changes should happen through events (as much // as possible). + // Gets the current bounds in screen DIP coordinates. + gfx::Rect GetCurrentBoundsInScreen() const; + // Saves the current bounds to be used as a restore bounds. void SaveCurrentBoundsForRestore(); @@ -396,7 +422,8 @@ // Returns the Display that this WindowState is on. display::Display GetDisplay() const; - // Returns the window state to restore to from the current window state. + // Returns the WindowStateType to restore to from the current window state. + // TODO(aluh): Rename to GetWindowStateTypeForRestore() for clarity. chromeos::WindowStateType GetRestoreWindowState() const; // Called when `window_` is dragged to maximized to track if it's a @@ -411,8 +438,8 @@ snap_action_source_ = type; } - const std::vector<chromeos::WindowStateType>& - window_state_restore_history_for_testing() const { + const std::vector<RestoreState>& window_state_restore_history_for_testing() + const { return window_state_restore_history_; } @@ -520,10 +547,17 @@ // window was not partial. void MaybeRecordPartialDuration(); - // Called after the window state change to update the window state restore - // history stack. - void UpdateWindowStateRestoreHistoryStack( - chromeos::WindowStateType previous_state_type); + // Called before the window state change to push/pop the applicable window + // state to/from the restore history. + void UpdateRestoreHistory(chromeos::WindowStateType previous_state_type); + + // Called after the window state change to update the various window restore + // properties from the restore history. + void UpdateRestorePropertiesFromRestoreHistory(); + + // Looks at the next RestoreState from the restore history without modifying + // the history. Returns nullptr if history is empty. + const RestoreState* PeekNextRestoreState() const; // Depending on the capabilities of the window we either return // |WindowStateType::kMaximized| or |WindowStateType::kNormal|. @@ -639,15 +673,23 @@ base::TimeTicks partial_start_time_; // Maintains the window state restore history that the current window state - // can restore back to. See kWindowStateRestoreHistoryLayerMap in the cc file - // for what window state types that can be put in the restore history stack. - std::vector<chromeos::WindowStateType> window_state_restore_history_; + // can restore back to, with relevant restore states. + // See `kWindowStateRestoreHistoryLayerMap` in the cc file for what window + // state types can be put in the restore history stack. + std::vector<RestoreState> window_state_restore_history_; + + // Holds the current working restore state. + absl::optional<RestoreState> current_restore_state_; // This is used to record where the current snap window state change request // comes from. WindowSnapActionSource snap_action_source_ = WindowSnapActionSource::kOthers; }; +ASH_EXPORT +std::ostream& operator<<(std::ostream& os, + const WindowState::RestoreState& state); + } // namespace ash #endif // ASH_WM_WINDOW_STATE_H_
diff --git a/ash/wm/window_state_unittest.cc b/ash/wm/window_state_unittest.cc index e5311bb..484da56 100644 --- a/ash/wm/window_state_unittest.cc +++ b/ash/wm/window_state_unittest.cc
@@ -1022,104 +1022,153 @@ // Tests the basic functionalties related to window state restore history stack. TEST_F(WindowStateTest, WindowStateRestoreHistoryBasicFunctionalites) { + UpdateDisplay("800x600"); + const gfx::Rect fullscreen_bounds = GetPrimaryDisplay().bounds(); + const gfx::Rect work_area_bounds = GetPrimaryDisplay().work_area(); + const gfx::Size snap_window_size(work_area_bounds.width() / 2, + work_area_bounds.height()); + // Start with kDefault window state. - std::unique_ptr<aura::Window> window = CreateAppWindow(); + const gfx::Rect default_bounds(20, 10, 200, 150); + std::unique_ptr<aura::Window> window = CreateAppWindow(default_bounds); WindowState* window_state = WindowState::Get(window.get()); EXPECT_TRUE(window_state->IsNormalStateType()); + EXPECT_EQ(window->GetBoundsInScreen(), default_bounds); - const std::vector<chromeos::WindowStateType>& restore_stack = + const std::vector<WindowState::RestoreState>& restore_stack = window_state->window_state_restore_history_for_testing(); EXPECT_TRUE(restore_stack.empty()); EXPECT_EQ(window_state->GetRestoreWindowState(), WindowStateType::kNormal); + EXPECT_EQ(window_state->GetRestoreBoundsInScreen(), gfx::Rect()); // Transition to kPrimarySnapped window state. const WMEvent snap_primary(WM_EVENT_SNAP_PRIMARY); window_state->OnWMEvent(&snap_primary); - EXPECT_EQ(restore_stack.size(), 1u); - EXPECT_EQ(restore_stack[0], WindowStateType::kDefault); + EXPECT_EQ(window->GetBoundsInScreen(), gfx::Rect(snap_window_size)); + ASSERT_EQ(restore_stack.size(), 1u); + EXPECT_EQ( + restore_stack[0], + (WindowState::RestoreState{.window_state_type = WindowStateType::kDefault, + .actual_bounds_in_screen = default_bounds})); EXPECT_EQ(window_state->GetRestoreWindowState(), WindowStateType::kNormal); + EXPECT_EQ(window_state->GetRestoreBoundsInScreen(), default_bounds); // Then transition to kMaximized window state. const WMEvent maximize_event(WM_EVENT_MAXIMIZE); window_state->OnWMEvent(&maximize_event); - EXPECT_EQ(restore_stack.size(), 2u); - EXPECT_EQ(restore_stack[0], WindowStateType::kDefault); - EXPECT_EQ(restore_stack[1], WindowStateType::kPrimarySnapped); + EXPECT_EQ(window->GetBoundsInScreen(), work_area_bounds); + ASSERT_EQ(restore_stack.size(), 2u); + EXPECT_EQ(restore_stack[0].window_state_type, WindowStateType::kDefault); + EXPECT_EQ(restore_stack[1], + (WindowState::RestoreState{ + .window_state_type = WindowStateType::kPrimarySnapped, + .actual_bounds_in_screen = gfx::Rect(snap_window_size), + .restore_bounds_in_screen = default_bounds})); EXPECT_EQ(window_state->GetRestoreWindowState(), WindowStateType::kPrimarySnapped); + EXPECT_EQ(window_state->GetRestoreBoundsInScreen(), default_bounds); // Then transition to kFullscreen window state. const WMEvent fullscreen_event(WM_EVENT_FULLSCREEN); window_state->OnWMEvent(&fullscreen_event); - EXPECT_EQ(restore_stack.size(), 3u); - EXPECT_EQ(restore_stack[0], WindowStateType::kDefault); - EXPECT_EQ(restore_stack[1], WindowStateType::kPrimarySnapped); - EXPECT_EQ(restore_stack[2], WindowStateType::kMaximized); + EXPECT_EQ(window->GetBoundsInScreen(), fullscreen_bounds); + ASSERT_EQ(restore_stack.size(), 3u); + EXPECT_EQ(restore_stack[0].window_state_type, WindowStateType::kDefault); + EXPECT_EQ(restore_stack[1].window_state_type, + WindowStateType::kPrimarySnapped); + EXPECT_EQ(restore_stack[2], + (WindowState::RestoreState{ + .window_state_type = WindowStateType::kMaximized, + .actual_bounds_in_screen = work_area_bounds, + .restore_bounds_in_screen = default_bounds})); EXPECT_EQ(window_state->GetRestoreWindowState(), WindowStateType::kMaximized); + EXPECT_EQ(window_state->GetRestoreBoundsInScreen(), default_bounds); // Then transition to kMinimized window state. const WMEvent minimized_event(WM_EVENT_MINIMIZE); window_state->OnWMEvent(&minimized_event); - EXPECT_EQ(restore_stack.size(), 4u); - EXPECT_EQ(restore_stack[0], WindowStateType::kDefault); - EXPECT_EQ(restore_stack[1], WindowStateType::kPrimarySnapped); - EXPECT_EQ(restore_stack[2], WindowStateType::kMaximized); - EXPECT_EQ(restore_stack[3], WindowStateType::kFullscreen); + ASSERT_EQ(restore_stack.size(), 4u); + EXPECT_EQ(restore_stack[0].window_state_type, WindowStateType::kDefault); + EXPECT_EQ(restore_stack[1].window_state_type, + WindowStateType::kPrimarySnapped); + EXPECT_EQ(restore_stack[2].window_state_type, WindowStateType::kMaximized); + EXPECT_EQ(restore_stack[3], + (WindowState::RestoreState{ + .window_state_type = WindowStateType::kFullscreen, + .actual_bounds_in_screen = fullscreen_bounds, + .restore_bounds_in_screen = default_bounds})); EXPECT_EQ(window_state->GetRestoreWindowState(), WindowStateType::kFullscreen); + EXPECT_EQ(window_state->GetRestoreBoundsInScreen(), default_bounds); // Then start restore from here. It should restore back to kFullscreen window // state. window_state->Restore(); + EXPECT_EQ(window->GetBoundsInScreen(), fullscreen_bounds); EXPECT_EQ(window_state->GetStateType(), WindowStateType::kFullscreen); - EXPECT_EQ(restore_stack.size(), 3u); - EXPECT_EQ(restore_stack[0], WindowStateType::kDefault); - EXPECT_EQ(restore_stack[1], WindowStateType::kPrimarySnapped); - EXPECT_EQ(restore_stack[2], WindowStateType::kMaximized); + ASSERT_EQ(restore_stack.size(), 3u); + EXPECT_EQ(restore_stack[0].window_state_type, WindowStateType::kDefault); + EXPECT_EQ(restore_stack[1].window_state_type, + WindowStateType::kPrimarySnapped); + EXPECT_EQ(restore_stack[2].window_state_type, WindowStateType::kMaximized); EXPECT_EQ(window_state->GetRestoreWindowState(), WindowStateType::kMaximized); + EXPECT_EQ(window_state->GetRestoreBoundsInScreen(), default_bounds); // Then restore back to kMaximized window state. window_state->Restore(); + EXPECT_EQ(window->GetBoundsInScreen(), work_area_bounds); EXPECT_EQ(window_state->GetStateType(), WindowStateType::kMaximized); - EXPECT_EQ(restore_stack.size(), 2u); - EXPECT_EQ(restore_stack[0], WindowStateType::kDefault); - EXPECT_EQ(restore_stack[1], WindowStateType::kPrimarySnapped); + ASSERT_EQ(restore_stack.size(), 2u); + EXPECT_EQ(restore_stack[0].window_state_type, WindowStateType::kDefault); + EXPECT_EQ(restore_stack[1].window_state_type, + WindowStateType::kPrimarySnapped); EXPECT_EQ(window_state->GetRestoreWindowState(), WindowStateType::kPrimarySnapped); + EXPECT_EQ(window_state->GetRestoreBoundsInScreen(), default_bounds); // Then restore back to kPrimarySnapped window state. window_state->Restore(); + EXPECT_EQ(window->GetBoundsInScreen(), gfx::Rect(snap_window_size)); EXPECT_EQ(window_state->GetStateType(), WindowStateType::kPrimarySnapped); - EXPECT_EQ(restore_stack.size(), 1u); - EXPECT_EQ(restore_stack[0], WindowStateType::kDefault); + ASSERT_EQ(restore_stack.size(), 1u); + EXPECT_EQ(restore_stack[0].window_state_type, WindowStateType::kDefault); EXPECT_EQ(window_state->GetRestoreWindowState(), WindowStateType::kNormal); + EXPECT_EQ(window_state->GetRestoreBoundsInScreen(), default_bounds); // Then restore back to kNormal window state. window_state->Restore(); + EXPECT_EQ(window->GetBoundsInScreen(), default_bounds); EXPECT_EQ(window_state->GetStateType(), WindowStateType::kNormal); EXPECT_TRUE(restore_stack.empty()); EXPECT_EQ(window_state->GetRestoreWindowState(), WindowStateType::kNormal); + EXPECT_EQ(window_state->GetRestoreBoundsInScreen(), gfx::Rect()); // Restore a kNormal window state window will keep the window's kNormal window // state. window_state->Restore(); + EXPECT_EQ(window->GetBoundsInScreen(), default_bounds); EXPECT_EQ(window_state->GetStateType(), WindowStateType::kNormal); EXPECT_TRUE(restore_stack.empty()); EXPECT_EQ(window_state->GetRestoreWindowState(), WindowStateType::kNormal); + EXPECT_EQ(window_state->GetRestoreBoundsInScreen(), gfx::Rect()); } // Tests that window state transitioning from higher to lower layer will erase // the window state restore history in between. TEST_F(WindowStateTest, TransitionFromHighToLowerLayerEraseRestoreHistory) { + UpdateDisplay("800x600"); + // Start with kDefault window state. - std::unique_ptr<aura::Window> window = CreateAppWindow(); + const gfx::Rect default_bounds(20, 10, 200, 150); + std::unique_ptr<aura::Window> window = CreateAppWindow(default_bounds); WindowState* window_state = WindowState::Get(window.get()); EXPECT_TRUE(window_state->IsNormalStateType()); - const std::vector<chromeos::WindowStateType>& restore_stack = + const std::vector<WindowState::RestoreState>& restore_stack = window_state->window_state_restore_history_for_testing(); EXPECT_TRUE(restore_stack.empty()); EXPECT_EQ(window_state->GetRestoreWindowState(), WindowStateType::kNormal); + EXPECT_EQ(window_state->GetRestoreBoundsInScreen(), gfx::Rect()); // Transition to kPrimarySnapped window state. const WMEvent snap_primary(WM_EVENT_SNAP_PRIMARY); @@ -1132,34 +1181,41 @@ // Then transition to kFullscreen window state. const WMEvent fullscreen_event(WM_EVENT_FULLSCREEN); window_state->OnWMEvent(&fullscreen_event); - EXPECT_EQ(restore_stack.size(), 3u); - EXPECT_EQ(restore_stack[0], WindowStateType::kDefault); - EXPECT_EQ(restore_stack[1], WindowStateType::kPrimarySnapped); - EXPECT_EQ(restore_stack[2], WindowStateType::kMaximized); + ASSERT_EQ(restore_stack.size(), 3u); + EXPECT_EQ(restore_stack[0].window_state_type, WindowStateType::kDefault); + EXPECT_EQ(restore_stack[1].window_state_type, + WindowStateType::kPrimarySnapped); + EXPECT_EQ(restore_stack[2].window_state_type, WindowStateType::kMaximized); EXPECT_EQ(window_state->GetRestoreWindowState(), WindowStateType::kMaximized); + EXPECT_EQ(window_state->GetRestoreBoundsInScreen(), default_bounds); // Now transition back to kPrimarySnapped window state. It should have erased // any restore history after kPrimarySnapped. window_state->OnWMEvent(&snap_primary); - EXPECT_EQ(restore_stack.size(), 1u); - EXPECT_EQ(restore_stack[0], WindowStateType::kDefault); + ASSERT_EQ(restore_stack.size(), 1u); + EXPECT_EQ(restore_stack[0].window_state_type, WindowStateType::kDefault); EXPECT_EQ(window_state->GetRestoreWindowState(), WindowStateType::kNormal); + EXPECT_EQ(window_state->GetRestoreBoundsInScreen(), default_bounds); } // Tests the restore behaviors when window state transitions in the same layer. // There are 3 cases: {kNormal & kDefault}, {kPrimarySnapped & // kSecondarySnapped}, and {kMinimized & kPip}. TEST_F(WindowStateTest, TransitionInTheSameLayerKeepSameRestoreHistory) { + UpdateDisplay("800x600"); + // First we test kNormal & kDefault. // Start with kDefault window state. - std::unique_ptr<aura::Window> window = CreateAppWindow(); + const gfx::Rect default_bounds(20, 10, 200, 150); + std::unique_ptr<aura::Window> window = CreateAppWindow(default_bounds); WindowState* window_state = WindowState::Get(window.get()); EXPECT_TRUE(window_state->IsNormalStateType()); - const std::vector<chromeos::WindowStateType>& restore_stack = + const std::vector<WindowState::RestoreState>& restore_stack = window_state->window_state_restore_history_for_testing(); EXPECT_TRUE(restore_stack.empty()); EXPECT_EQ(window_state->GetRestoreWindowState(), WindowStateType::kNormal); + EXPECT_EQ(window_state->GetRestoreBoundsInScreen(), gfx::Rect()); // Transition to kNormal window state. Since it's on the same layer as // kDefault, kDefault won't be pushed into the restore history stack. @@ -1167,57 +1223,70 @@ window_state->OnWMEvent(&normal_event); EXPECT_TRUE(restore_stack.empty()); EXPECT_EQ(window_state->GetRestoreWindowState(), WindowStateType::kNormal); + EXPECT_EQ(window_state->GetRestoreBoundsInScreen(), gfx::Rect()); // Test kPrimarySnapped & kSecondarySnapped. // Transition to kPrimarySnapped window state. const WMEvent snap_primary(WM_EVENT_SNAP_PRIMARY); window_state->OnWMEvent(&snap_primary); - EXPECT_EQ(restore_stack.size(), 1u); - EXPECT_EQ(restore_stack[0], WindowStateType::kNormal); + ASSERT_EQ(restore_stack.size(), 1u); + EXPECT_EQ(restore_stack[0].window_state_type, WindowStateType::kNormal); EXPECT_EQ(window_state->GetRestoreWindowState(), WindowStateType::kNormal); + EXPECT_EQ(window_state->GetRestoreBoundsInScreen(), default_bounds); // Transition to kSecondarySnapped window state. Since it's on the same layer // as kPrimarySnapped, kPrimarySnapped won't be pushed into the restore // history stack. const WMEvent snap_secondary(WM_EVENT_SNAP_SECONDARY); window_state->OnWMEvent(&snap_secondary); - EXPECT_EQ(restore_stack.size(), 1u); - EXPECT_EQ(restore_stack[0], WindowStateType::kNormal); + ASSERT_EQ(restore_stack.size(), 1u); + EXPECT_EQ(restore_stack[0].window_state_type, WindowStateType::kNormal); EXPECT_EQ(window_state->GetRestoreWindowState(), WindowStateType::kNormal); + EXPECT_EQ(window_state->GetRestoreBoundsInScreen(), default_bounds); // Test kMinimized & kPip. // Transition to kMinimized window state. const WMEvent minimized_event(WM_EVENT_MINIMIZE); window_state->OnWMEvent(&minimized_event); - EXPECT_EQ(restore_stack.size(), 2u); - EXPECT_EQ(restore_stack[0], WindowStateType::kNormal); - EXPECT_EQ(restore_stack[1], WindowStateType::kSecondarySnapped); + ASSERT_EQ(restore_stack.size(), 2u); + EXPECT_EQ(restore_stack[0].window_state_type, WindowStateType::kNormal); + EXPECT_EQ(restore_stack[1].window_state_type, + WindowStateType::kSecondarySnapped); EXPECT_EQ(window_state->GetRestoreWindowState(), WindowStateType::kSecondarySnapped); + EXPECT_EQ(window_state->GetRestoreBoundsInScreen(), default_bounds); // Transition to kPip Window state. Since it's on the same layer as // kMinimized, kMinimized won't be pushed into the restore history stack. const WMEvent pip_event(WM_EVENT_PIP); window_state->OnWMEvent(&pip_event); - EXPECT_EQ(restore_stack.size(), 2u); - EXPECT_EQ(restore_stack[0], WindowStateType::kNormal); - EXPECT_EQ(restore_stack[1], WindowStateType::kSecondarySnapped); + ASSERT_EQ(restore_stack.size(), 2u); + EXPECT_EQ(restore_stack[0].window_state_type, WindowStateType::kNormal); + EXPECT_EQ(restore_stack[1].window_state_type, + WindowStateType::kSecondarySnapped); EXPECT_EQ(window_state->GetRestoreWindowState(), WindowStateType::kSecondarySnapped); + EXPECT_EQ(window_state->GetRestoreBoundsInScreen(), default_bounds); } // Test the restore behaviors of kPinned and kTrustedPinned window state. They // are different with kFullscreen restore behaviors. TEST_F(WindowStateTest, PinnedRestoreTest) { + UpdateDisplay("800x600"); + const gfx::Rect fullscreen_bounds = GetPrimaryDisplay().bounds(); + const gfx::Rect work_area_bounds = GetPrimaryDisplay().work_area(); + // Start with kDefault window state. - std::unique_ptr<aura::Window> window = CreateAppWindow(); + const gfx::Rect default_bounds(20, 10, 200, 150); + std::unique_ptr<aura::Window> window = CreateAppWindow(default_bounds); WindowState* window_state = WindowState::Get(window.get()); EXPECT_TRUE(window_state->IsNormalStateType()); - const std::vector<chromeos::WindowStateType>& restore_stack = + const std::vector<WindowState::RestoreState>& restore_stack = window_state->window_state_restore_history_for_testing(); EXPECT_TRUE(restore_stack.empty()); EXPECT_EQ(window_state->GetRestoreWindowState(), WindowStateType::kNormal); + EXPECT_EQ(window_state->GetRestoreBoundsInScreen(), gfx::Rect()); // Transition to kPrimarySnapped window state. const WMEvent snap_primary(WM_EVENT_SNAP_PRIMARY); @@ -1226,104 +1295,215 @@ // Then transition to kMaximized window state. const WMEvent maximize_event(WM_EVENT_MAXIMIZE); window_state->OnWMEvent(&maximize_event); - EXPECT_EQ(restore_stack.size(), 2u); - EXPECT_EQ(restore_stack[0], WindowStateType::kDefault); - EXPECT_EQ(restore_stack[1], WindowStateType::kPrimarySnapped); + ASSERT_EQ(restore_stack.size(), 2u); + EXPECT_EQ(restore_stack[0].window_state_type, WindowStateType::kDefault); + EXPECT_EQ(restore_stack[1].window_state_type, + WindowStateType::kPrimarySnapped); EXPECT_EQ(window_state->GetRestoreWindowState(), WindowStateType::kPrimarySnapped); + EXPECT_EQ(window_state->GetRestoreBoundsInScreen(), default_bounds); // Then transition to kPinned window state. Since kPinned window state is not // supported in the window state restore history layer, the restore history // stack will be cleared. It can only restore back to kNormal window state. const WMEvent pinned_event(WM_EVENT_PIN); window_state->OnWMEvent(&pinned_event); + EXPECT_EQ(window->GetBoundsInScreen(), fullscreen_bounds); EXPECT_TRUE(restore_stack.empty()); EXPECT_EQ(window_state->GetRestoreWindowState(), WindowStateType::kNormal); + EXPECT_EQ(window_state->GetRestoreBoundsInScreen(), gfx::Rect()); window_state->Restore(); + EXPECT_EQ(window->GetBoundsInScreen(), work_area_bounds); EXPECT_EQ(window_state->GetStateType(), WindowStateType::kNormal); EXPECT_TRUE(restore_stack.empty()); EXPECT_EQ(window_state->GetRestoreWindowState(), WindowStateType::kNormal); + EXPECT_EQ(window_state->GetRestoreBoundsInScreen(), gfx::Rect()); // Same should happen for kTrustedPinned as well. window_state->OnWMEvent(&snap_primary); window_state->OnWMEvent(&maximize_event); - EXPECT_EQ(restore_stack.size(), 2u); + ASSERT_EQ(restore_stack.size(), 2u); EXPECT_EQ(window_state->GetRestoreWindowState(), WindowStateType::kPrimarySnapped); + EXPECT_EQ(window_state->GetRestoreBoundsInScreen(), work_area_bounds); const WMEvent trusted_pinned_event(WM_EVENT_TRUSTED_PIN); window_state->OnWMEvent(&trusted_pinned_event); + EXPECT_EQ(window->GetBoundsInScreen(), fullscreen_bounds); EXPECT_TRUE(restore_stack.empty()); EXPECT_EQ(window_state->GetRestoreWindowState(), WindowStateType::kNormal); + EXPECT_EQ(window_state->GetRestoreBoundsInScreen(), gfx::Rect()); window_state->Restore(); + EXPECT_EQ(window->GetBoundsInScreen(), work_area_bounds); EXPECT_EQ(window_state->GetStateType(), WindowStateType::kNormal); EXPECT_TRUE(restore_stack.empty()); EXPECT_EQ(window_state->GetRestoreWindowState(), WindowStateType::kNormal); + EXPECT_EQ(window_state->GetRestoreBoundsInScreen(), gfx::Rect()); } // Test the restore behaviors of kMinimized and kPip window state. They are both // viewed as the final state in the restore layer. TEST_F(WindowStateTest, MinimizedAndPipRestoreTest) { + UpdateDisplay("800x600"); + // Start with kDefault window state. - std::unique_ptr<aura::Window> window = CreateAppWindow(); + const gfx::Rect default_bounds(20, 10, 200, 150); + std::unique_ptr<aura::Window> window = CreateAppWindow(default_bounds); WindowState* window_state = WindowState::Get(window.get()); EXPECT_TRUE(window_state->IsNormalStateType()); - const std::vector<chromeos::WindowStateType>& restore_stack = + const std::vector<WindowState::RestoreState>& restore_stack = window_state->window_state_restore_history_for_testing(); EXPECT_TRUE(restore_stack.empty()); EXPECT_EQ(window_state->GetRestoreWindowState(), WindowStateType::kNormal); + EXPECT_EQ(window_state->GetRestoreBoundsInScreen(), gfx::Rect()); // Maximize the window. const WMEvent maximize_event(WM_EVENT_MAXIMIZE); window_state->OnWMEvent(&maximize_event); - EXPECT_EQ(restore_stack.size(), 1u); - EXPECT_EQ(restore_stack[0], WindowStateType::kDefault); + ASSERT_EQ(restore_stack.size(), 1u); + EXPECT_EQ(restore_stack[0].window_state_type, WindowStateType::kDefault); + EXPECT_EQ(window_state->GetRestoreBoundsInScreen(), default_bounds); // kPip window can be minimized to kMinimized window state, but restoring from // kMinimized window state can't restore back to kPip window state. const WMEvent pip_event(WM_EVENT_PIP); window_state->OnWMEvent(&pip_event); - EXPECT_EQ(restore_stack.size(), 2u); - EXPECT_EQ(restore_stack[0], WindowStateType::kDefault); - EXPECT_EQ(restore_stack[1], WindowStateType::kMaximized); + ASSERT_EQ(restore_stack.size(), 2u); + EXPECT_EQ(restore_stack[0].window_state_type, WindowStateType::kDefault); + EXPECT_EQ(restore_stack[1].window_state_type, WindowStateType::kMaximized); EXPECT_EQ(window_state->GetRestoreWindowState(), WindowStateType::kMaximized); + EXPECT_EQ(window_state->GetRestoreBoundsInScreen(), default_bounds); const WMEvent minimized_event(WM_EVENT_MINIMIZE); window_state->OnWMEvent(&minimized_event); - EXPECT_EQ(restore_stack.size(), 2u); - EXPECT_EQ(restore_stack[0], WindowStateType::kDefault); - EXPECT_EQ(restore_stack[1], WindowStateType::kMaximized); + ASSERT_EQ(restore_stack.size(), 2u); + EXPECT_EQ(restore_stack[0].window_state_type, WindowStateType::kDefault); + EXPECT_EQ(restore_stack[1].window_state_type, WindowStateType::kMaximized); EXPECT_EQ(window_state->GetRestoreWindowState(), WindowStateType::kMaximized); + EXPECT_EQ(window_state->GetRestoreBoundsInScreen(), default_bounds); // Restore the minimized window. It should go back to pre-pip window state. window_state->Restore(); EXPECT_EQ(window_state->GetStateType(), WindowStateType::kMaximized); - EXPECT_EQ(restore_stack.size(), 1u); - EXPECT_EQ(restore_stack[0], WindowStateType::kDefault); + ASSERT_EQ(restore_stack.size(), 1u); + EXPECT_EQ(restore_stack[0].window_state_type, WindowStateType::kDefault); EXPECT_EQ(window_state->GetRestoreWindowState(), WindowStateType::kNormal); + EXPECT_EQ(window_state->GetRestoreBoundsInScreen(), default_bounds); // Similarly, if the pre-pip window state is kMinimized, restoring from kPip // should go back to the pre-minimized window state. window_state->OnWMEvent(&minimized_event); - EXPECT_EQ(restore_stack.size(), 2u); - EXPECT_EQ(restore_stack[0], WindowStateType::kDefault); - EXPECT_EQ(restore_stack[1], WindowStateType::kMaximized); + ASSERT_EQ(restore_stack.size(), 2u); + EXPECT_EQ(restore_stack[0].window_state_type, WindowStateType::kDefault); + EXPECT_EQ(restore_stack[1].window_state_type, WindowStateType::kMaximized); EXPECT_EQ(window_state->GetRestoreWindowState(), WindowStateType::kMaximized); + EXPECT_EQ(window_state->GetRestoreBoundsInScreen(), default_bounds); window_state->OnWMEvent(&pip_event); - EXPECT_EQ(restore_stack.size(), 2u); - EXPECT_EQ(restore_stack[0], WindowStateType::kDefault); - EXPECT_EQ(restore_stack[1], WindowStateType::kMaximized); + ASSERT_EQ(restore_stack.size(), 2u); + EXPECT_EQ(restore_stack[0].window_state_type, WindowStateType::kDefault); + EXPECT_EQ(restore_stack[1].window_state_type, WindowStateType::kMaximized); EXPECT_EQ(window_state->GetRestoreWindowState(), WindowStateType::kMaximized); + EXPECT_EQ(window_state->GetRestoreBoundsInScreen(), default_bounds); // Restore the Pip window. It should go back to pre-minimized window state. window_state->Restore(); EXPECT_EQ(window_state->GetStateType(), WindowStateType::kMaximized); - EXPECT_EQ(restore_stack.size(), 1u); - EXPECT_EQ(restore_stack[0], WindowStateType::kDefault); + ASSERT_EQ(restore_stack.size(), 1u); + EXPECT_EQ(restore_stack[0].window_state_type, WindowStateType::kDefault); + EXPECT_EQ(window_state->GetRestoreWindowState(), WindowStateType::kNormal); + EXPECT_EQ(window_state->GetRestoreBoundsInScreen(), default_bounds); +} + +TEST_F(WindowStateTest, HorizontalMaximizeThenMinimizeAndRestore) { + UpdateDisplay("800x600"); + const gfx::Rect work_area_bounds = GetPrimaryDisplay().work_area(); + + // Start with kDefault window state. + const gfx::Rect default_bounds(20, 10, 200, 150); + std::unique_ptr<aura::Window> window = CreateAppWindow(default_bounds); + WindowState* window_state = WindowState::Get(window.get()); + EXPECT_TRUE(window_state->IsNormalStateType()); + + const std::vector<WindowState::RestoreState>& restore_stack = + window_state->window_state_restore_history_for_testing(); + EXPECT_TRUE(restore_stack.empty()); + EXPECT_EQ(window_state->GetRestoreWindowState(), WindowStateType::kNormal); + EXPECT_EQ(window_state->GetRestoreBoundsInScreen(), gfx::Rect()); + + const gfx::Rect horizontal_maximize_bounds( + 0, default_bounds.y(), work_area_bounds.width(), default_bounds.height()); + const WMEvent horizontal_maximize_event(WM_EVENT_TOGGLE_HORIZONTAL_MAXIMIZE); + window_state->OnWMEvent(&horizontal_maximize_event); + EXPECT_EQ(window->GetBoundsInScreen(), horizontal_maximize_bounds); + EXPECT_TRUE(restore_stack.empty()); + EXPECT_EQ(window_state->GetRestoreBoundsInScreen(), default_bounds); + + const WMEvent minimize_event(WM_EVENT_MINIMIZE); + window_state->OnWMEvent(&minimize_event); + ASSERT_EQ(restore_stack.size(), 1u); + EXPECT_EQ(restore_stack[0], + (WindowState::RestoreState{ + .window_state_type = WindowStateType::kDefault, + .actual_bounds_in_screen = horizontal_maximize_bounds, + .restore_bounds_in_screen = default_bounds})); + EXPECT_EQ(window_state->GetRestoreWindowState(), WindowStateType::kNormal); + EXPECT_EQ(window_state->GetRestoreBoundsInScreen(), default_bounds); + + // Unminimize should restore back to horizontally maximized bounds while + // maintaining restore bounds. + window_state->Restore(); + EXPECT_EQ(window->GetBoundsInScreen(), horizontal_maximize_bounds); + EXPECT_EQ(window_state->GetStateType(), WindowStateType::kNormal); + EXPECT_TRUE(restore_stack.empty()); + EXPECT_EQ(window_state->GetRestoreWindowState(), WindowStateType::kNormal); + EXPECT_EQ(window_state->GetRestoreBoundsInScreen(), default_bounds); +} + +TEST_F(WindowStateTest, HorizontalMaximizeThenMaximizeAndRestore) { + UpdateDisplay("800x600"); + const gfx::Rect work_area_bounds = GetPrimaryDisplay().work_area(); + + // Start with kDefault window state. + const gfx::Rect default_bounds(20, 10, 200, 150); + std::unique_ptr<aura::Window> window = CreateAppWindow(default_bounds); + WindowState* window_state = WindowState::Get(window.get()); + EXPECT_TRUE(window_state->IsNormalStateType()); + + const std::vector<WindowState::RestoreState>& restore_stack = + window_state->window_state_restore_history_for_testing(); + EXPECT_TRUE(restore_stack.empty()); + EXPECT_EQ(window_state->GetRestoreWindowState(), WindowStateType::kNormal); + EXPECT_EQ(window_state->GetRestoreBoundsInScreen(), gfx::Rect()); + + const gfx::Rect horizontal_maximize_bounds( + 0, default_bounds.y(), work_area_bounds.width(), default_bounds.height()); + const WMEvent horizontal_maximize_event(WM_EVENT_TOGGLE_HORIZONTAL_MAXIMIZE); + window_state->OnWMEvent(&horizontal_maximize_event); + EXPECT_EQ(window->GetBoundsInScreen(), horizontal_maximize_bounds); + EXPECT_TRUE(restore_stack.empty()); + EXPECT_EQ(window_state->GetRestoreBoundsInScreen(), default_bounds); + + const WMEvent maximize_event(WM_EVENT_MAXIMIZE); + window_state->OnWMEvent(&maximize_event); + ASSERT_EQ(restore_stack.size(), 1u); + EXPECT_EQ(restore_stack[0], + (WindowState::RestoreState{ + .window_state_type = WindowStateType::kDefault, + .actual_bounds_in_screen = horizontal_maximize_bounds, + .restore_bounds_in_screen = default_bounds})); + EXPECT_EQ(window_state->GetRestoreWindowState(), WindowStateType::kNormal); + EXPECT_EQ(window_state->GetRestoreBoundsInScreen(), default_bounds); + + // Restore from maximized should go back to default bounds, not the + // horizontally maximized bounds. + window_state->Restore(); + EXPECT_EQ(window->GetBoundsInScreen(), default_bounds); + EXPECT_EQ(window_state->GetStateType(), WindowStateType::kNormal); + EXPECT_TRUE(restore_stack.empty()); EXPECT_EQ(window_state->GetRestoreWindowState(), WindowStateType::kNormal); }
diff --git a/base/features.cc b/base/features.cc index a3725f3..a94eadb8f 100644 --- a/base/features.cc +++ b/base/features.cc
@@ -16,9 +16,7 @@ FEATURE_ENABLED_BY_DEFAULT); // Optimizes parsing and loading of data: URLs. -BASE_FEATURE(kOptimizeDataUrls, - "OptimizeDataUrls", - FEATURE_DISABLED_BY_DEFAULT); +BASE_FEATURE(kOptimizeDataUrls, "OptimizeDataUrls", FEATURE_ENABLED_BY_DEFAULT); BASE_FEATURE(kSupportsUserDataFlatHashMap, "SupportsUserDataFlatHashMap",
diff --git a/base/metrics/field_trial.cc b/base/metrics/field_trial.cc index aed802f..117e062e 100644 --- a/base/metrics/field_trial.cc +++ b/base/metrics/field_trial.cc
@@ -751,7 +751,6 @@ CommandLine* command_line, LaunchOptions* launch_options) { DCHECK(command_line); - DCHECK(launch_options); // Use shared memory to communicate field trial state to child processes. // The browser is the only process that has write access to the shared memory. @@ -1060,8 +1059,6 @@ std::string FieldTrialList::SerializeSharedMemoryRegionMetadata( const ReadOnlySharedMemoryRegion& shm, LaunchOptions* launch_options) { - DCHECK(launch_options); - std::stringstream ss; #if BUILDFLAG(IS_WIN) // Elevated process might not need this, although it is harmless.
diff --git a/base/task/thread_pool/thread_group_impl_unittest.cc b/base/task/thread_pool/thread_group_impl_unittest.cc index 01a82feb..e28c79e 100644 --- a/base/task/thread_pool/thread_group_impl_unittest.cc +++ b/base/task/thread_pool/thread_group_impl_unittest.cc
@@ -84,6 +84,7 @@ task_tracker_.FlushForTesting(); if (thread_group_) thread_group_->JoinForTesting(); + mock_pooled_task_runner_delegate_.SetThreadGroup(nullptr); thread_group_.reset(); } @@ -1423,6 +1424,7 @@ task_tracker_.FlushForTesting(); thread_group_->JoinForTesting(); EXPECT_EQ(thread_group_->GetMaxTasksForTesting(), kMaxTasks); + mock_pooled_task_runner_delegate_.SetThreadGroup(nullptr); thread_group_.reset(); } @@ -1907,6 +1909,7 @@ // Unwinding this test will be racy if worker cleanup can race with // ThreadGroupImpl destruction : https://crbug.com/810464. + mock_pooled_task_runner_delegate_.SetThreadGroup(nullptr); thread_group_.reset(); }
diff --git a/base/threading/thread_restrictions.h b/base/threading/thread_restrictions.h index 9cc4929..493cb7c3 100644 --- a/base/threading/thread_restrictions.h +++ b/base/threading/thread_restrictions.h
@@ -411,6 +411,10 @@ class WindowResizeHelperMac; } +namespace updater { +class SystemctlLauncherScopedAllowBaseSyncPrimitives; +} + namespace viz { class HostGpuMemoryBufferManager; class ClientGpuMemoryBufferManager; @@ -744,6 +748,7 @@ friend class storage::ObfuscatedFileUtil; friend class syncer::HttpBridge; friend class syncer::GetLocalChangesRequest; + friend class updater::SystemctlLauncherScopedAllowBaseSyncPrimitives; friend class viz::ClientGpuMemoryBufferManager; friend class webrtc::DesktopConfigurationMonitor; friend class ::tracing::FuchsiaPerfettoProducerConnector;
diff --git a/build/android/gyp/apkbuilder.py b/build/android/gyp/apkbuilder.py index 3ed14c28..15c59504 100755 --- a/build/android/gyp/apkbuilder.py +++ b/build/android/gyp/apkbuilder.py
@@ -9,6 +9,7 @@ import argparse import logging import os +import posixpath import shutil import sys import tempfile @@ -178,7 +179,8 @@ def _GetAssetsToAdd(path_tuples, fast_align, disable_compression=False, - allow_reads=True): + allow_reads=True, + apk_root_dir=''): """Returns the list of file_detail tuples for assets in the apk. Args: @@ -207,7 +209,11 @@ if allow_reads and compress and os.path.getsize(src_path) < 16: compress = False - apk_path = 'assets/' + dest_path + if dest_path.startswith('../'): + # posixpath.join('', 'foo') == 'foo' + apk_path = posixpath.join(apk_root_dir, dest_path[3:]) + else: + apk_path = 'assets/' + dest_path alignment = 0 if compress and not fast_align else 4 assets_to_add.append((apk_path, src_path, compress, alignment)) return assets_to_add @@ -347,12 +353,14 @@ ret = _GetAssetsToAdd(assets, fast_align, disable_compression=False, - allow_reads=allow_reads) + allow_reads=allow_reads, + apk_root_dir=apk_root_dir) ret.extend( _GetAssetsToAdd(uncompressed_assets, fast_align, disable_compression=True, - allow_reads=allow_reads)) + allow_reads=allow_reads, + apk_root_dir=apk_root_dir)) return ret libs_to_add = _GetNativeLibrariesToAdd(native_libs, options.android_abi,
diff --git a/build/android/gyp/create_app_bundle.py b/build/android/gyp/create_app_bundle.py index ba67861..8b3c797a 100755 --- a/build/android/gyp/create_app_bundle.py +++ b/build/android/gyp/create_app_bundle.py
@@ -11,6 +11,7 @@ import json import logging import os +import posixpath import shutil import sys import zipfile @@ -131,15 +132,13 @@ # Merge all uncompressed assets into a set. uncompressed_list = [] - if options.uncompressed_assets: - for l in options.uncompressed_assets: - for entry in build_utils.ParseGnList(l): - # Each entry has the following format: 'zipPath' or 'srcPath:zipPath' - pos = entry.find(':') - if pos >= 0: - uncompressed_list.append(entry[pos + 1:]) - else: - uncompressed_list.append(entry) + for entry in build_utils.ParseGnList(options.uncompressed_assets): + # Each entry has the following format: 'zipPath' or 'srcPath:zipPath' + pos = entry.find(':') + if pos >= 0: + uncompressed_list.append(entry[pos + 1:]) + else: + uncompressed_list.append(entry) options.uncompressed_assets = set(uncompressed_list) @@ -203,7 +202,9 @@ uncompressed_globs = [ 'assets/locales#lang_*/*.pak', 'assets/fallback-locales/*.pak' ] - uncompressed_globs.extend('assets/' + x for x in uncompressed_assets) + # normpath to allow for ../ prefix. + uncompressed_globs.extend( + posixpath.normpath('assets/' + x) for x in uncompressed_assets) # NOTE: Use '**' instead of '*' to work through directories! uncompressed_globs.extend('**.' + ext for ext in _UNCOMPRESSED_FILE_EXTS) if not compress_dex:
diff --git a/build/android/gyp/write_build_config.py b/build/android/gyp/write_build_config.py index 65ca0e1..95793a7 100755 --- a/build/android/gyp/write_build_config.py +++ b/build/android/gyp/write_build_config.py
@@ -773,10 +773,9 @@ locale_paks.add(dest) def create_list(asset_map): - ret = ['%s:%s' % (src, dest) for dest, src in asset_map.items()] # Sort to ensure deterministic ordering. - ret.sort() - return ret + items = sorted(asset_map.items()) + return [f'{src}:{dest}' for dest, src in items] return create_list(compressed), create_list(uncompressed), locale_paks
diff --git a/build/config/c++/c++.gni b/build/config/c++/c++.gni index a1164a0..e4dae41 100644 --- a/build/config/c++/c++.gni +++ b/build/config/c++/c++.gni
@@ -2,6 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. +import("//build/config/chromeos/ui_mode.gni") import("//build/config/sanitizers/sanitizers.gni") declare_args() { @@ -10,8 +11,10 @@ # standard library support. # Don't check in changes that set this to false for more platforms; doing so # is not supported. - use_custom_libcxx = is_fuchsia || is_android || is_apple || is_linux || - is_chromeos || (is_win && is_clang) + use_custom_libcxx = + is_fuchsia || is_android || is_apple || is_linux || is_chromeos_lacros || + (is_win && is_clang) || + (is_chromeos && default_toolchain != "//build/toolchain/cros:target") # Use libc++ instead of stdlibc++ when using the host_cpu toolchain, even if # use_custom_libcxx is false. This is useful for cross-compiles where a custom
diff --git a/build/fuchsia/test/run_executable_test.py b/build/fuchsia/test/run_executable_test.py index f6230c1..494e39a 100755 --- a/build/fuchsia/test/run_executable_test.py +++ b/build/fuchsia/test/run_executable_test.py
@@ -85,6 +85,7 @@ self._code_coverage_dir = code_coverage_dir self._custom_artifact_directory = None self._isolated_script_test_output = None + self._isolated_script_test_perf_output = None self._logs_dir = logs_dir self._test_launcher_summary_output = None self._test_server = None @@ -94,9 +95,9 @@ parser.add_argument( '--isolated-script-test-output', help='If present, store test results on this path.') - # This argument has been deprecated. parser.add_argument('--isolated-script-test-perf-output', - help=argparse.SUPPRESS) + help='If present, store chartjson results on this ' + 'path.') parser.add_argument( '--test-launcher-shard-index', type=int, @@ -135,6 +136,12 @@ child_args.append( '--isolated-script-test-output=/custom_artifacts/%s' % os.path.basename(self._isolated_script_test_output)) + if args.isolated_script_test_perf_output: + self._isolated_script_test_perf_output = \ + args.isolated_script_test_perf_output + child_args.append( + '--isolated-script-test-perf-output=/custom_artifacts/%s' % + os.path.basename(self._isolated_script_test_perf_output)) if args.test_launcher_shard_index is not None: child_args.append('--test-launcher-shard-index=%d' % args.test_launcher_shard_index) @@ -180,6 +187,11 @@ test_runner, os.path.basename(self._isolated_script_test_output), self._isolated_script_test_output) + if self._isolated_script_test_perf_output: + _copy_custom_output_file( + test_runner, + os.path.basename(self._isolated_script_test_perf_output), + self._isolated_script_test_perf_output) if self._code_coverage_dir: _copy_coverage_files(test_runner, os.path.basename(self._code_coverage_dir))
diff --git a/build/get_landmines.py b/build/get_landmines.py index dead854..311f042 100755 --- a/build/get_landmines.py +++ b/build/get_landmines.py
@@ -78,6 +78,7 @@ print('The Great Blink mv for source files (crbug.com/768828)') if host_os() == 'linux': print('Clobber to workaround buggy .ninja_deps cycle (crbug.com/934404)') + print('Clobber to flush stale generated files. See crbug.com/1406628') def main():
diff --git a/cc/BUILD.gn b/cc/BUILD.gn index 30e89fd..18a09f3 100644 --- a/cc/BUILD.gn +++ b/cc/BUILD.gn
@@ -563,6 +563,7 @@ "test/mock_layer_tree_mutator.cc", "test/mock_layer_tree_mutator.h", "test/mock_occlusion_tracker.h", + "test/paint_image_matchers.h", "test/paint_op_helper.h", "test/paint_op_matchers.h", "test/pixel_comparator.cc",
diff --git a/cc/layers/picture_layer_impl_unittest.cc b/cc/layers/picture_layer_impl_unittest.cc index 208012b..ac0a5993 100644 --- a/cc/layers/picture_layer_impl_unittest.cc +++ b/cc/layers/picture_layer_impl_unittest.cc
@@ -6219,7 +6219,7 @@ EXPECT_EQ(active_layer()->GetPaintWorkletRecordMap().size(), 2u); auto it = active_layer()->GetPaintWorkletRecordMap().find(input1); ASSERT_NE(it, active_layer()->GetPaintWorkletRecordMap().end()); - EXPECT_EQ(it->second.second, record1); + EXPECT_TRUE(it->second.second->EqualsForTesting(record1)); EXPECT_TRUE(active_layer()->GetPaintWorkletRecordMap().contains(input2)); // Committing new PaintWorkletInputs (in a new raster source) should replace
diff --git a/cc/layers/recording_source_unittest.cc b/cc/layers/recording_source_unittest.cc index 46683334..82dc907e 100644 --- a/cc/layers/recording_source_unittest.cc +++ b/cc/layers/recording_source_unittest.cc
@@ -61,8 +61,10 @@ raster_source->GetDiscardableImagesInRect(gfx::Rect(0, 0, 128, 128), &images); EXPECT_EQ(2u, images.size()); - EXPECT_TRUE(images[0]->paint_image() == discardable_image[0][0]); - EXPECT_TRUE(images[1]->paint_image() == discardable_image[1][1]); + EXPECT_TRUE( + images[0]->paint_image().IsSameForTesting(discardable_image[0][0])); + EXPECT_TRUE( + images[1]->paint_image().IsSameForTesting(discardable_image[1][1])); } // Shifted tile sized iterators. These should find only one pixel ref. @@ -71,7 +73,8 @@ raster_source->GetDiscardableImagesInRect(gfx::Rect(130, 140, 128, 128), &images); EXPECT_EQ(1u, images.size()); - EXPECT_TRUE(images[0]->paint_image() == discardable_image[1][1]); + EXPECT_TRUE( + images[0]->paint_image().IsSameForTesting(discardable_image[1][1])); } // The rotated bitmap would still be in the top right tile. @@ -80,7 +83,8 @@ raster_source->GetDiscardableImagesInRect(gfx::Rect(130, 0, 128, 128), &images); EXPECT_EQ(1u, images.size()); - EXPECT_TRUE(images[0]->paint_image() == discardable_image[1][1]); + EXPECT_TRUE( + images[0]->paint_image().IsSameForTesting(discardable_image[1][1])); } // Layer sized iterators. These should find all pixel refs. @@ -90,9 +94,12 @@ &images); EXPECT_EQ(3u, images.size()); // Top left tile with bitmap[0][0] and bitmap[1][1]. - EXPECT_TRUE(images[0]->paint_image() == discardable_image[0][0]); - EXPECT_TRUE(images[1]->paint_image() == discardable_image[1][0]); - EXPECT_TRUE(images[2]->paint_image() == discardable_image[1][1]); + EXPECT_TRUE( + images[0]->paint_image().IsSameForTesting(discardable_image[0][0])); + EXPECT_TRUE( + images[1]->paint_image().IsSameForTesting(discardable_image[1][0])); + EXPECT_TRUE( + images[2]->paint_image().IsSameForTesting(discardable_image[1][1])); } // Verify different raster scales @@ -223,7 +230,8 @@ raster_source->GetDiscardableImagesInRect(gfx::Rect(0, 0, 128, 128), &images); EXPECT_EQ(1u, images.size()); - EXPECT_TRUE(images[0]->paint_image() == discardable_image[0][0]); + EXPECT_TRUE( + images[0]->paint_image().IsSameForTesting(discardable_image[0][0])); } // Shifted tile sized iterators. These should find only one image. @@ -232,7 +240,8 @@ raster_source->GetDiscardableImagesInRect(gfx::Rect(140, 140, 128, 128), &images); EXPECT_EQ(1u, images.size()); - EXPECT_TRUE(images[0]->paint_image() == discardable_image[1][1]); + EXPECT_TRUE( + images[0]->paint_image().IsSameForTesting(discardable_image[1][1])); } // Ensure there's no discardable images in the empty cell @@ -249,9 +258,12 @@ raster_source->GetDiscardableImagesInRect(gfx::Rect(0, 0, 256, 256), &images); EXPECT_EQ(3u, images.size()); - EXPECT_TRUE(images[0]->paint_image() == discardable_image[0][0]); - EXPECT_TRUE(images[1]->paint_image() == discardable_image[1][0]); - EXPECT_TRUE(images[2]->paint_image() == discardable_image[1][1]); + EXPECT_TRUE( + images[0]->paint_image().IsSameForTesting(discardable_image[0][0])); + EXPECT_TRUE( + images[1]->paint_image().IsSameForTesting(discardable_image[1][0])); + EXPECT_TRUE( + images[2]->paint_image().IsSameForTesting(discardable_image[1][1])); } } @@ -291,7 +303,8 @@ raster_source->GetDiscardableImagesInRect(gfx::Rect(0, 0, 256, 256), &images); EXPECT_EQ(1u, images.size()); - EXPECT_TRUE(images[0]->paint_image() == discardable_image[0][0]); + EXPECT_TRUE( + images[0]->paint_image().IsSameForTesting(discardable_image[0][0])); } // Shifted tile sized iterators. These should find only one image. { @@ -299,7 +312,8 @@ raster_source->GetDiscardableImagesInRect(gfx::Rect(260, 260, 256, 256), &images); EXPECT_EQ(1u, images.size()); - EXPECT_TRUE(images[0]->paint_image() == discardable_image[1][1]); + EXPECT_TRUE( + images[0]->paint_image().IsSameForTesting(discardable_image[1][1])); } // Ensure there's no discardable images in the empty cell { @@ -314,9 +328,12 @@ raster_source->GetDiscardableImagesInRect(gfx::Rect(0, 0, 512, 512), &images); EXPECT_EQ(3u, images.size()); - EXPECT_TRUE(images[0]->paint_image() == discardable_image[0][0]); - EXPECT_TRUE(images[1]->paint_image() == discardable_image[0][1]); - EXPECT_TRUE(images[2]->paint_image() == discardable_image[1][1]); + EXPECT_TRUE( + images[0]->paint_image().IsSameForTesting(discardable_image[0][0])); + EXPECT_TRUE( + images[1]->paint_image().IsSameForTesting(discardable_image[0][1])); + EXPECT_TRUE( + images[2]->paint_image().IsSameForTesting(discardable_image[1][1])); } }
diff --git a/cc/paint/BUILD.gn b/cc/paint/BUILD.gn index ca082143..04d7e4b 100644 --- a/cc/paint/BUILD.gn +++ b/cc/paint/BUILD.gn
@@ -87,7 +87,6 @@ "skia_paint_image_generator.cc", "skia_paint_image_generator.h", "skottie_color_map.h", - "skottie_frame_data.cc", "skottie_frame_data.h", "skottie_frame_data_provider.h", "skottie_marker.h",
diff --git a/cc/paint/discardable_image_map_unittest.cc b/cc/paint/discardable_image_map_unittest.cc index 696effa..4fa9f424 100644 --- a/cc/paint/discardable_image_map_unittest.cc +++ b/cc/paint/discardable_image_map_unittest.cc
@@ -23,6 +23,7 @@ #include "cc/test/fake_content_layer_client.h" #include "cc/test/fake_recording_source.h" #include "cc/test/lottie_test_data.h" +#include "cc/test/paint_image_matchers.h" #include "cc/test/skia_common.h" #include "cc/test/test_paint_worklet_input.h" #include "skia/buildflags.h" @@ -94,8 +95,8 @@ EXPECT_EQ(draw_images.size(), position_draw_images.size()); for (size_t i = 0; i < draw_images.size(); ++i) { - EXPECT_TRUE(draw_images[i].paint_image() == - position_draw_images[i].image); + EXPECT_TRUE(draw_images[i].paint_image().IsSameForTesting( + position_draw_images[i].image)); EXPECT_EQ(draw_images[i].target_color_space(), target_color_params.color_space); } @@ -154,7 +155,7 @@ std::vector<gfx::Rect> inset_rects = InsetImageRects(images); if ((x + y) & 1) { EXPECT_EQ(1u, images.size()) << x << " " << y; - EXPECT_TRUE(images[0].image == discardable_image[y][x]) + EXPECT_TRUE(images[0].image.IsSameForTesting(discardable_image[y][x])) << x << " " << y; EXPECT_EQ(gfx::Rect(x * 512 + 6, y * 512 + 6, 500, 500), inset_rects[0]); @@ -170,16 +171,16 @@ std::vector<gfx::Rect> inset_rects = InsetImageRects(images); EXPECT_EQ(4u, images.size()); - EXPECT_TRUE(images[0].image == discardable_image[1][2]); + EXPECT_TRUE(images[0].image.IsSameForTesting(discardable_image[1][2])); EXPECT_EQ(gfx::Rect(2 * 512 + 6, 512 + 6, 500, 500), inset_rects[0]); - EXPECT_TRUE(images[1].image == discardable_image[2][1]); + EXPECT_TRUE(images[1].image.IsSameForTesting(discardable_image[2][1])); EXPECT_EQ(gfx::Rect(512 + 6, 2 * 512 + 6, 500, 500), inset_rects[1]); - EXPECT_TRUE(images[2].image == discardable_image[2][3]); + EXPECT_TRUE(images[2].image.IsSameForTesting(discardable_image[2][3])); EXPECT_EQ(gfx::Rect(3 * 512 + 6, 2 * 512 + 6, 500, 500), inset_rects[2]); - EXPECT_TRUE(images[3].image == discardable_image[3][2]); + EXPECT_TRUE(images[3].image.IsSameForTesting(discardable_image[3][2])); EXPECT_EQ(gfx::Rect(2 * 512 + 6, 3 * 512 + 6, 500, 500), inset_rects[3]); } @@ -225,7 +226,7 @@ std::vector<gfx::Rect> inset_rects = InsetImageRects(images); if ((x + y) & 1) { EXPECT_EQ(1u, images.size()) << x << " " << y; - EXPECT_TRUE(images[0].image == discardable_image[y][x]) + EXPECT_TRUE(images[0].image.IsSameForTesting(discardable_image[y][x])) << x << " " << y; EXPECT_EQ(gfx::Rect(1024 + x * 512 + 6, y * 512 + 6, 500, 500), inset_rects[0]); @@ -241,17 +242,17 @@ std::vector<gfx::Rect> inset_rects = InsetImageRects(images); EXPECT_EQ(4u, images.size()); - EXPECT_TRUE(images[0].image == discardable_image[1][2]); + EXPECT_TRUE(images[0].image.IsSameForTesting(discardable_image[1][2])); EXPECT_EQ(gfx::Rect(1024 + 2 * 512 + 6, 512 + 6, 500, 500), inset_rects[0]); - EXPECT_TRUE(images[1].image == discardable_image[2][1]); + EXPECT_TRUE(images[1].image.IsSameForTesting(discardable_image[2][1])); EXPECT_EQ(gfx::Rect(1024 + 512 + 6, 2 * 512 + 6, 500, 500), inset_rects[1]); - EXPECT_TRUE(images[2].image == discardable_image[2][3]); + EXPECT_TRUE(images[2].image.IsSameForTesting(discardable_image[2][3])); EXPECT_EQ(gfx::Rect(1024 + 3 * 512 + 6, 2 * 512 + 6, 500, 500), inset_rects[2]); - EXPECT_TRUE(images[3].image == discardable_image[3][2]); + EXPECT_TRUE(images[3].image.IsSameForTesting(discardable_image[3][2])); EXPECT_EQ(gfx::Rect(1024 + 2 * 512 + 6, 3 * 512 + 6, 500, 500), inset_rects[3]); } @@ -324,7 +325,7 @@ std::vector<gfx::Rect> inset_rects = InsetImageRects(images); if ((x + y) & 1) { EXPECT_EQ(1u, images.size()) << x << " " << y; - EXPECT_TRUE(images[0].image == discardable_image[y][x]) + EXPECT_TRUE(images[0].image.IsSameForTesting(discardable_image[y][x])) << x << " " << y; EXPECT_EQ(gfx::Rect(x * 512 + 6, y * 512 + 6, 500, 500), inset_rects[0]); @@ -354,7 +355,7 @@ GetDiscardableImagesInRect(image_map, gfx::Rect(0, 0, 1, 1)); std::vector<gfx::Rect> inset_rects = InsetImageRects(images); EXPECT_EQ(1u, images.size()); - EXPECT_TRUE(images[0].image == discardable_image); + EXPECT_TRUE(images[0].image.IsSameForTesting(discardable_image)); EXPECT_EQ(gfx::Rect(0, 0, 2048, 2048), inset_rects[0]); } @@ -380,7 +381,7 @@ std::vector<PositionScaleDrawImage> images = GetDiscardableImagesInRect(image_map, gfx::Rect(0, 0, 1, 1)); EXPECT_EQ(1u, images.size()); - EXPECT_TRUE(images[0].image == discardable_image); + EXPECT_TRUE(images[0].image.IsSameForTesting(discardable_image)); } // Check if SkNoDrawCanvas does not crash for large layers. @@ -465,7 +466,7 @@ std::vector<PositionScaleDrawImage> images = GetDiscardableImagesInRect(image_map, gfx::Rect(0, 0, 1, 1)); EXPECT_EQ(1u, images.size()); - EXPECT_TRUE(images[0].image == discardable_image); + EXPECT_TRUE(images[0].image.IsSameForTesting(discardable_image)); } TEST_F(DiscardableImageMapTest, GetDiscardableImagesInRectMaxImage) { @@ -489,7 +490,7 @@ GetDiscardableImagesInRect(image_map, gfx::Rect(42, 42, 1, 1)); std::vector<gfx::Rect> inset_rects = InsetImageRects(images); EXPECT_EQ(1u, images.size()); - EXPECT_TRUE(images[0].image == discardable_image); + EXPECT_TRUE(images[0].image.IsSameForTesting(discardable_image)); EXPECT_EQ(gfx::Rect(42, 42, 2006, 2006), inset_rects[0]); } @@ -644,7 +645,8 @@ gfx::Rect(x * 512, y * 512, 500, 500), &draw_images); if ((x + y) & 1) { EXPECT_EQ(1u, draw_images.size()) << x << " " << y; - EXPECT_TRUE(draw_images[0]->paint_image() == discardable_image[y][x]) + EXPECT_TRUE(draw_images[0]->paint_image().IsSameForTesting( + discardable_image[y][x])) << x << " " << y; EXPECT_EQ(std::max(x * 0.5f, kMinScale), draw_images[0]->scale().fWidth); @@ -661,10 +663,14 @@ image_map.GetDiscardableImagesInRect(gfx::Rect(512, 512, 2048, 2048), &draw_images); EXPECT_EQ(4u, draw_images.size()); - EXPECT_TRUE(draw_images[0]->paint_image() == discardable_image[1][2]); - EXPECT_TRUE(draw_images[1]->paint_image() == discardable_image[2][1]); - EXPECT_TRUE(draw_images[2]->paint_image() == discardable_image[2][3]); - EXPECT_TRUE(draw_images[3]->paint_image() == discardable_image[3][2]); + EXPECT_TRUE( + draw_images[0]->paint_image().IsSameForTesting(discardable_image[1][2])); + EXPECT_TRUE( + draw_images[1]->paint_image().IsSameForTesting(discardable_image[2][1])); + EXPECT_TRUE( + draw_images[2]->paint_image().IsSameForTesting(discardable_image[2][3])); + EXPECT_TRUE( + draw_images[3]->paint_image().IsSameForTesting(discardable_image[3][2])); } TEST_F(DiscardableImageMapTest, ClipsImageRects) { @@ -690,7 +696,7 @@ GetDiscardableImagesInRect(image_map, visible_rect); std::vector<gfx::Rect> inset_rects = InsetImageRects(images); EXPECT_EQ(1u, images.size()); - EXPECT_TRUE(images[0].image == discardable_image); + EXPECT_TRUE(images[0].image.IsSameForTesting(discardable_image)); EXPECT_EQ(gfx::Rect(250, 250), inset_rects[0]); } @@ -719,12 +725,12 @@ std::vector<const DrawImage*> images; image_map.GetDiscardableImagesInRect(gfx::Rect(0, 0, 5, 95), &images); EXPECT_EQ(1u, images.size()); - EXPECT_TRUE(discardable_image == images[0]->paint_image()); + EXPECT_TRUE(discardable_image.IsSameForTesting(images[0]->paint_image())); images.clear(); image_map.GetDiscardableImagesInRect(gfx::Rect(105, 105, 5, 95), &images); EXPECT_EQ(1u, images.size()); - EXPECT_TRUE(discardable_image2 == images[0]->paint_image()); + EXPECT_TRUE(discardable_image2.IsSameForTesting(images[0]->paint_image())); } TEST_F(DiscardableImageMapTest, GathersAnimatedImages) { @@ -768,11 +774,12 @@ display_list->discardable_image_map().GetDiscardableImagesInRect(visible_rect, &images); ASSERT_EQ(images.size(), 3u); - EXPECT_EQ(images[0]->paint_image(), static_image); + EXPECT_TRUE(images[0]->paint_image().IsSameForTesting(static_image)); EXPECT_DCHECK_DEATH(images[0]->frame_index()); - EXPECT_EQ(images[1]->paint_image(), animated_loop_none); + EXPECT_TRUE(images[1]->paint_image().IsSameForTesting(animated_loop_none)); EXPECT_DCHECK_DEATH(images[1]->frame_index()); - EXPECT_EQ(images[2]->paint_image(), animation_loop_infinite); + EXPECT_TRUE( + images[2]->paint_image().IsSameForTesting(animation_loop_infinite)); EXPECT_DCHECK_DEATH(images[2]->frame_index()); } @@ -804,7 +811,7 @@ std::vector<PositionScaleDrawImage> images = GetDiscardableImagesInRect( display_list->discardable_image_map(), visible_rect); ASSERT_EQ(images.size(), 1u); - EXPECT_EQ(images[0].image, static_image); + EXPECT_TRUE(images[0].image.IsSameForTesting(static_image)); } TEST_F(DiscardableImageMapTest, CapturesImagesInPaintRecordShaders) { @@ -847,7 +854,7 @@ GetDiscardableImagesInRect(image_map, visible_rect); std::vector<gfx::Rect> inset_rects = InsetImageRects(draw_images); ASSERT_EQ(draw_images.size(), 1u); - EXPECT_EQ(draw_images[0].image, animated_image); + EXPECT_TRUE(draw_images[0].image.IsSameForTesting(animated_image)); // The position of the image is the position of the DrawRectOp that uses the // shader. EXPECT_EQ(gfx::Rect(400, 400), inset_rects[0]); @@ -892,7 +899,7 @@ GetDiscardableImagesInRect(image_map, visible_rect); std::vector<gfx::Rect> inset_rects = InsetImageRects(draw_images); ASSERT_EQ(draw_images.size(), 1u); - EXPECT_EQ(draw_images[0].image, animated_image); + EXPECT_TRUE(draw_images[0].image.IsSameForTesting(animated_image)); // The position of the image is the position of the DrawRectOp that uses the // filter. Since the bounds of the filter does not depend on the source/input, // the resulting bounds is that of the RecordPaintFilter. @@ -921,7 +928,7 @@ GetDiscardableImagesInRect(image_map, visible_rect); std::vector<gfx::Rect> inset_rects = InsetImageRects(draw_images); ASSERT_EQ(draw_images.size(), 1u); - EXPECT_EQ(draw_images[0].image, image); + EXPECT_TRUE(draw_images[0].image.IsSameForTesting(image)); EXPECT_EQ(gfx::Rect(500, 500), inset_rects[0]); EXPECT_EQ(SkSize::Make(1.f, 1.f), draw_images[0].scale); } @@ -1227,10 +1234,10 @@ std::vector<PositionScaleDrawImage> images_out = GetDiscardableImagesInRect(image_map, gfx::Rect(1024, 0, 1024, 2048)); ASSERT_THAT(images_out, SizeIs(2)); - EXPECT_THAT(images_out, - Contains(Field(&PositionScaleDrawImage::image, Eq(image_0)))); - EXPECT_THAT(images_out, - Contains(Field(&PositionScaleDrawImage::image, Eq(image_1)))); + EXPECT_THAT(images_out, Contains(Field(&PositionScaleDrawImage::image, + ImageIsSame(image_0)))); + EXPECT_THAT(images_out, Contains(Field(&PositionScaleDrawImage::image, + ImageIsSame(image_1)))); } TEST_F(DiscardableImageMapTest,
diff --git a/cc/paint/draw_image.cc b/cc/paint/draw_image.cc index 63947b21d..875fc5e 100644 --- a/cc/paint/draw_image.cc +++ b/cc/paint/draw_image.cc
@@ -94,8 +94,8 @@ DrawImage& DrawImage::operator=(DrawImage&& other) = default; DrawImage& DrawImage::operator=(const DrawImage& other) = default; -bool DrawImage::operator==(const DrawImage& other) const { - return paint_image_ == other.paint_image_ && +bool DrawImage::IsSameForTesting(const DrawImage& other) const { + return paint_image_.IsSameForTesting(other.paint_image_) && // IN-TEST use_dark_mode_ == other.use_dark_mode_ && src_rect_ == other.src_rect_ && filter_quality_ == other.filter_quality_ && scale_ == other.scale_ &&
diff --git a/cc/paint/draw_image.h b/cc/paint/draw_image.h index 9d397fa..bafbc2ef 100644 --- a/cc/paint/draw_image.h +++ b/cc/paint/draw_image.h
@@ -53,7 +53,10 @@ DrawImage& operator=(DrawImage&& other); DrawImage& operator=(const DrawImage& other); - bool operator==(const DrawImage& other) const; + // For testing only. Checks if `this` and `other` are the same image, i.e. + // share the same underlying image. `a.IsSameForTesting(b)` will be true after + // `DrawImage b = a;`. + bool IsSameForTesting(const DrawImage& other) const; const PaintImage& paint_image() const { return paint_image_; } bool use_dark_mode() const { return use_dark_mode_; }
diff --git a/cc/paint/paint_filter.cc b/cc/paint/paint_filter.cc index 4f2ce29..f107e17 100644 --- a/cc/paint/paint_filter.cc +++ b/cc/paint/paint_filter.cc
@@ -33,8 +33,17 @@ namespace { const bool kHasNoDiscardableImages = false; -bool AreScalarsEqual(SkScalar one, SkScalar two) { - return PaintOp::AreEqualEvenIfNaN(one, two); +template <typename T> +bool AreValuesEqualForTesting(const sk_sp<T>& a, const sk_sp<T>& b) { + return base::ValuesEquivalent(a, b, [](const T& x, const T& y) { + return x.EqualsForTesting(y); // IN-TEST + }); +} + +template <typename T> +bool AreEqualForTesting(const PaintFilter& a, const PaintFilter& b) { + return static_cast<const T&>(a).EqualsForTesting( // IN-TEST + static_cast<const T&>(b)); } bool HasDiscardableImages(const sk_sp<PaintFilter>& filter) { @@ -153,86 +162,61 @@ return SnapshotWithImagesInternal(image_provider); } -bool PaintFilter::operator==(const PaintFilter& other) const { - if (type_ != other.type_) +bool PaintFilter::EqualsForTesting(const PaintFilter& other) const { + if (type_ != other.type_) { return false; - if (!!crop_rect_ != !!other.crop_rect_) + } + if (crop_rect_ != other.crop_rect_) { return false; - if (crop_rect_) { - if (!PaintOp::AreSkRectsEqual(*crop_rect_, *other.crop_rect_)) { - return false; - } } switch (type_) { case Type::kNullFilter: return true; case Type::kColorFilter: - return *static_cast<const ColorFilterPaintFilter*>(this) == - static_cast<const ColorFilterPaintFilter&>(other); + return AreEqualForTesting<ColorFilterPaintFilter>(*this, other); case Type::kBlur: - return *static_cast<const BlurPaintFilter*>(this) == - static_cast<const BlurPaintFilter&>(other); + return AreEqualForTesting<BlurPaintFilter>(*this, other); case Type::kDropShadow: - return *static_cast<const DropShadowPaintFilter*>(this) == - static_cast<const DropShadowPaintFilter&>(other); + return AreEqualForTesting<DropShadowPaintFilter>(*this, other); case Type::kMagnifier: - return *static_cast<const MagnifierPaintFilter*>(this) == - static_cast<const MagnifierPaintFilter&>(other); + return AreEqualForTesting<MagnifierPaintFilter>(*this, other); case Type::kCompose: - return *static_cast<const ComposePaintFilter*>(this) == - static_cast<const ComposePaintFilter&>(other); + return AreEqualForTesting<ComposePaintFilter>(*this, other); case Type::kAlphaThreshold: - return *static_cast<const AlphaThresholdPaintFilter*>(this) == - static_cast<const AlphaThresholdPaintFilter&>(other); + return AreEqualForTesting<AlphaThresholdPaintFilter>(*this, other); case Type::kXfermode: - return *static_cast<const XfermodePaintFilter*>(this) == - static_cast<const XfermodePaintFilter&>(other); + return AreEqualForTesting<XfermodePaintFilter>(*this, other); case Type::kArithmetic: - return *static_cast<const ArithmeticPaintFilter*>(this) == - static_cast<const ArithmeticPaintFilter&>(other); + return AreEqualForTesting<ArithmeticPaintFilter>(*this, other); case Type::kMatrixConvolution: - return *static_cast<const MatrixConvolutionPaintFilter*>(this) == - static_cast<const MatrixConvolutionPaintFilter&>(other); + return AreEqualForTesting<MatrixConvolutionPaintFilter>(*this, other); case Type::kDisplacementMapEffect: - return *static_cast<const DisplacementMapEffectPaintFilter*>(this) == - static_cast<const DisplacementMapEffectPaintFilter&>(other); + return AreEqualForTesting<DisplacementMapEffectPaintFilter>(*this, other); case Type::kImage: - return *static_cast<const ImagePaintFilter*>(this) == - static_cast<const ImagePaintFilter&>(other); + return AreEqualForTesting<ImagePaintFilter>(*this, other); case Type::kPaintRecord: - return *static_cast<const RecordPaintFilter*>(this) == - static_cast<const RecordPaintFilter&>(other); + return AreEqualForTesting<RecordPaintFilter>(*this, other); case Type::kMerge: - return *static_cast<const MergePaintFilter*>(this) == - static_cast<const MergePaintFilter&>(other); + return AreEqualForTesting<MergePaintFilter>(*this, other); case Type::kMorphology: - return *static_cast<const MorphologyPaintFilter*>(this) == - static_cast<const MorphologyPaintFilter&>(other); + return AreEqualForTesting<MorphologyPaintFilter>(*this, other); case Type::kOffset: - return *static_cast<const OffsetPaintFilter*>(this) == - static_cast<const OffsetPaintFilter&>(other); + return AreEqualForTesting<OffsetPaintFilter>(*this, other); case Type::kTile: - return *static_cast<const TilePaintFilter*>(this) == - static_cast<const TilePaintFilter&>(other); + return AreEqualForTesting<TilePaintFilter>(*this, other); case Type::kTurbulence: - return *static_cast<const TurbulencePaintFilter*>(this) == - static_cast<const TurbulencePaintFilter&>(other); + return AreEqualForTesting<TurbulencePaintFilter>(*this, other); case Type::kShader: - return *static_cast<const ShaderPaintFilter*>(this) == - static_cast<const ShaderPaintFilter&>(other); + return AreEqualForTesting<ShaderPaintFilter>(*this, other); case Type::kMatrix: - return *static_cast<const MatrixPaintFilter*>(this) == - static_cast<const MatrixPaintFilter&>(other); + return AreEqualForTesting<MatrixPaintFilter>(*this, other); case Type::kLightingDistant: - return *static_cast<const LightingDistantPaintFilter*>(this) == - static_cast<const LightingDistantPaintFilter&>(other); + return AreEqualForTesting<LightingDistantPaintFilter>(*this, other); case Type::kLightingPoint: - return *static_cast<const LightingPointPaintFilter*>(this) == - static_cast<const LightingPointPaintFilter&>(other); + return AreEqualForTesting<LightingPointPaintFilter>(*this, other); case Type::kLightingSpot: - return *static_cast<const LightingSpotPaintFilter*>(this) == - static_cast<const LightingSpotPaintFilter&>(other); + return AreEqualForTesting<LightingSpotPaintFilter>(*this, other); } NOTREACHED(); return true; @@ -266,11 +250,14 @@ color_filter_, Snapshot(input_, image_provider), GetCropRect()); } -bool ColorFilterPaintFilter::operator==( +bool ColorFilterPaintFilter::EqualsForTesting( const ColorFilterPaintFilter& other) const { - return PaintOp::AreSkFlattenablesEqual(color_filter_.get(), - other.color_filter_.get()) && - base::ValuesEquivalent(input_.get(), other.input_.get()); + return base::ValuesEquivalent( + color_filter_, other.color_filter_, + [](const auto& a, const auto& b) { + return a.serialize()->equals(b.serialize().get()); + }) && + AreValuesEqualForTesting(input_, other.input_); // IN-TEST } BlurPaintFilter::BlurPaintFilter(SkScalar sigma_x, @@ -304,11 +291,10 @@ GetCropRect()); } -bool BlurPaintFilter::operator==(const BlurPaintFilter& other) const { - return PaintOp::AreEqualEvenIfNaN(sigma_x_, other.sigma_x_) && - PaintOp::AreEqualEvenIfNaN(sigma_y_, other.sigma_y_) && +bool BlurPaintFilter::EqualsForTesting(const BlurPaintFilter& other) const { + return sigma_x_ == other.sigma_x_ && sigma_y_ == other.sigma_y_ && tile_mode_ == other.tile_mode_ && - base::ValuesEquivalent(input_.get(), other.input_.get()); + AreValuesEqualForTesting(input_, other.input_); // IN-TEST } DropShadowPaintFilter::DropShadowPaintFilter(SkScalar dx, @@ -357,14 +343,12 @@ Snapshot(input_, image_provider), GetCropRect()); } -bool DropShadowPaintFilter::operator==( +bool DropShadowPaintFilter::EqualsForTesting( const DropShadowPaintFilter& other) const { - return PaintOp::AreEqualEvenIfNaN(dx_, other.dx_) && - PaintOp::AreEqualEvenIfNaN(dy_, other.dy_) && - PaintOp::AreEqualEvenIfNaN(sigma_x_, other.sigma_x_) && - PaintOp::AreEqualEvenIfNaN(sigma_y_, other.sigma_y_) && - color_ == other.color_ && shadow_mode_ == other.shadow_mode_ && - base::ValuesEquivalent(input_.get(), other.input_.get()); + return dx_ == other.dx_ && dy_ == other.dy_ && sigma_x_ == other.sigma_x_ && + sigma_y_ == other.sigma_y_ && color_ == other.color_ && + shadow_mode_ == other.shadow_mode_ && + AreValuesEqualForTesting(input_, other.input_); // IN-TEST } MagnifierPaintFilter::MagnifierPaintFilter(const SkRect& src_rect, @@ -394,10 +378,10 @@ src_rect_, inset_, Snapshot(input_, image_provider), GetCropRect()); } -bool MagnifierPaintFilter::operator==(const MagnifierPaintFilter& other) const { - return PaintOp::AreSkRectsEqual(src_rect_, other.src_rect_) && - PaintOp::AreEqualEvenIfNaN(inset_, other.inset_) && - base::ValuesEquivalent(input_.get(), other.input_.get()); +bool MagnifierPaintFilter::EqualsForTesting( + const MagnifierPaintFilter& other) const { + return src_rect_ == other.src_rect_ && inset_ == other.inset_ && + AreValuesEqualForTesting(input_, other.input_); // IN-TEST } ComposePaintFilter::ComposePaintFilter(sk_sp<PaintFilter> outer, @@ -426,9 +410,10 @@ Snapshot(inner_, image_provider)); } -bool ComposePaintFilter::operator==(const ComposePaintFilter& other) const { - return base::ValuesEquivalent(outer_.get(), other.outer_.get()) && - base::ValuesEquivalent(inner_.get(), other.inner_.get()); +bool ComposePaintFilter::EqualsForTesting( + const ComposePaintFilter& other) const { + return AreValuesEqualForTesting(outer_, other.outer_) && // IN-TEST + AreValuesEqualForTesting(inner_, other.inner_); // IN-TEST } AlphaThresholdPaintFilter::AlphaThresholdPaintFilter(const SkRegion& region, @@ -464,12 +449,11 @@ GetCropRect()); } -bool AlphaThresholdPaintFilter::operator==( +bool AlphaThresholdPaintFilter::EqualsForTesting( const AlphaThresholdPaintFilter& other) const { - return region_ == other.region_ && - PaintOp::AreEqualEvenIfNaN(inner_min_, other.inner_min_) && - PaintOp::AreEqualEvenIfNaN(outer_max_, other.outer_max_) && - base::ValuesEquivalent(input_.get(), other.input_.get()); + return region_ == other.region_ && inner_min_ == other.inner_min_ && + outer_max_ == other.outer_max_ && + AreValuesEqualForTesting(input_, other.input_); // IN-TEST } XfermodePaintFilter::XfermodePaintFilter(SkBlendMode blend_mode, @@ -505,10 +489,11 @@ Snapshot(foreground_, image_provider), GetCropRect()); } -bool XfermodePaintFilter::operator==(const XfermodePaintFilter& other) const { +bool XfermodePaintFilter::EqualsForTesting( + const XfermodePaintFilter& other) const { return blend_mode_ == other.blend_mode_ && - base::ValuesEquivalent(background_.get(), other.background_.get()) && - base::ValuesEquivalent(foreground_.get(), other.foreground_.get()); + AreValuesEqualForTesting(background_, other.background_) && // IN-TEST + AreValuesEqualForTesting(foreground_, other.foreground_); // IN-TEST } ArithmeticPaintFilter::ArithmeticPaintFilter(float k1, @@ -554,15 +539,12 @@ Snapshot(foreground_, image_provider), GetCropRect()); } -bool ArithmeticPaintFilter::operator==( +bool ArithmeticPaintFilter::EqualsForTesting( const ArithmeticPaintFilter& other) const { - return PaintOp::AreEqualEvenIfNaN(k1_, other.k1_) && - PaintOp::AreEqualEvenIfNaN(k2_, other.k2_) && - PaintOp::AreEqualEvenIfNaN(k3_, other.k3_) && - PaintOp::AreEqualEvenIfNaN(k4_, other.k4_) && - enforce_pm_color_ == other.enforce_pm_color_ && - base::ValuesEquivalent(background_.get(), other.background_.get()) && - base::ValuesEquivalent(foreground_.get(), other.foreground_.get()); + return k1_ == other.k1_ && k2_ == other.k2_ && k3_ == other.k3_ && + k4_ == other.k4_ && enforce_pm_color_ == other.enforce_pm_color_ && + AreValuesEqualForTesting(background_, other.background_) && // IN-TEST + AreValuesEqualForTesting(foreground_, other.foreground_); // IN-TEST } MatrixConvolutionPaintFilter::MatrixConvolutionPaintFilter( @@ -612,17 +594,15 @@ convolve_alpha_, Snapshot(input_, image_provider), GetCropRect()); } -bool MatrixConvolutionPaintFilter::operator==( +bool MatrixConvolutionPaintFilter::EqualsForTesting( const MatrixConvolutionPaintFilter& other) const { return kernel_size_ == other.kernel_size_ && - base::ranges::equal(kernel_.container(), other.kernel_.container(), - AreScalarsEqual) && - PaintOp::AreEqualEvenIfNaN(gain_, other.gain_) && - PaintOp::AreEqualEvenIfNaN(bias_, other.bias_) && + base::ranges::equal(kernel_.container(), other.kernel_.container()) && + gain_ == other.gain_ && bias_ == other.bias_ && kernel_offset_ == other.kernel_offset_ && tile_mode_ == other.tile_mode_ && convolve_alpha_ == other.convolve_alpha_ && - base::ValuesEquivalent(input_.get(), other.input_.get()); + AreValuesEqualForTesting(input_, other.input_); // IN-TEST } DisplacementMapEffectPaintFilter::DisplacementMapEffectPaintFilter( @@ -664,13 +644,13 @@ Snapshot(color_, image_provider), GetCropRect()); } -bool DisplacementMapEffectPaintFilter::operator==( +bool DisplacementMapEffectPaintFilter::EqualsForTesting( const DisplacementMapEffectPaintFilter& other) const { return channel_x_ == other.channel_x_ && channel_y_ == other.channel_y_ && - PaintOp::AreEqualEvenIfNaN(scale_, other.scale_) && - base::ValuesEquivalent(displacement_.get(), - other.displacement_.get()) && - base::ValuesEquivalent(color_.get(), other.color_.get()); + scale_ == other.scale_ && + AreValuesEqualForTesting(displacement_, // IN-TEST + other.displacement_) && + AreValuesEqualForTesting(color_, other.color_); // IN-TEST } ImagePaintFilter::ImagePaintFilter(PaintImage image, @@ -719,10 +699,9 @@ dst_rect_, filter_quality_); } -bool ImagePaintFilter::operator==(const ImagePaintFilter& other) const { - return !!image_ == !!other.image_ && - PaintOp::AreSkRectsEqual(src_rect_, other.src_rect_) && - PaintOp::AreSkRectsEqual(dst_rect_, other.dst_rect_) && +bool ImagePaintFilter::EqualsForTesting(const ImagePaintFilter& other) const { + return !!image_ == !!other.image_ && src_rect_ == other.src_rect_ && + dst_rect_ == other.dst_rect_ && filter_quality_ == other.filter_quality_; } @@ -827,11 +806,11 @@ scaling_behavior_, image_provider)); } -bool RecordPaintFilter::operator==(const RecordPaintFilter& other) const { - return record_.empty() == other.record_.empty() && +bool RecordPaintFilter::EqualsForTesting(const RecordPaintFilter& other) const { + return record_.EqualsForTesting(other.record_) && // IN-TEST scaling_behavior_ == other.scaling_behavior_ && raster_scale_ == other.raster_scale_ && - PaintOp::AreSkRectsEqual(record_bounds_, other.record_bounds_); + record_bounds_ == other.record_bounds_; } MergePaintFilter::MergePaintFilter(const sk_sp<PaintFilter>* const filters, @@ -875,14 +854,11 @@ &inputs_[0], inputs_->size(), GetCropRect(), image_provider)); } -bool MergePaintFilter::operator==(const MergePaintFilter& other) const { - if (inputs_->size() != other.inputs_->size()) - return false; - for (size_t i = 0; i < inputs_->size(); ++i) { - if (!base::ValuesEquivalent(inputs_[i].get(), other.inputs_[i].get())) - return false; - } - return true; +bool MergePaintFilter::EqualsForTesting(const MergePaintFilter& other) const { + return base::ranges::equal( + inputs_, other.inputs_, [](const auto& a, const auto& b) { + return AreValuesEqualForTesting(a, b); // IN-TEST + }); } MorphologyPaintFilter::MorphologyPaintFilter(MorphType morph_type, @@ -924,11 +900,11 @@ GetCropRect()); } -bool MorphologyPaintFilter::operator==( +bool MorphologyPaintFilter::EqualsForTesting( const MorphologyPaintFilter& other) const { return morph_type_ == other.morph_type_ && radius_x_ == other.radius_x_ && radius_y_ == other.radius_y_ && - base::ValuesEquivalent(input_.get(), other.input_.get()); + AreValuesEqualForTesting(input_, other.input_); // IN-TEST } OffsetPaintFilter::OffsetPaintFilter(SkScalar dx, @@ -958,10 +934,9 @@ dx_, dy_, Snapshot(input_, image_provider), GetCropRect()); } -bool OffsetPaintFilter::operator==(const OffsetPaintFilter& other) const { - return PaintOp::AreEqualEvenIfNaN(dx_, other.dx_) && - PaintOp::AreEqualEvenIfNaN(dy_, other.dy_) && - base::ValuesEquivalent(input_.get(), other.input_.get()); +bool OffsetPaintFilter::EqualsForTesting(const OffsetPaintFilter& other) const { + return dx_ == other.dx_ && dy_ == other.dy_ && + AreValuesEqualForTesting(input_, other.input_); // IN-TEST } TilePaintFilter::TilePaintFilter(const SkRect& src, @@ -990,10 +965,9 @@ Snapshot(input_, image_provider)); } -bool TilePaintFilter::operator==(const TilePaintFilter& other) const { - return PaintOp::AreSkRectsEqual(src_, other.src_) && - PaintOp::AreSkRectsEqual(dst_, other.dst_) && - base::ValuesEquivalent(input_.get(), other.input_.get()); +bool TilePaintFilter::EqualsForTesting(const TilePaintFilter& other) const { + return src_ == other.src_ && dst_ == other.dst_ && + AreValuesEqualForTesting(input_, other.input_); // IN-TEST } TurbulencePaintFilter::TurbulencePaintFilter(TurbulenceType turbulence_type, @@ -1042,15 +1016,12 @@ seed_, &tile_size_, GetCropRect()); } -bool TurbulencePaintFilter::operator==( +bool TurbulencePaintFilter::EqualsForTesting( const TurbulencePaintFilter& other) const { return turbulence_type_ == other.turbulence_type_ && - PaintOp::AreEqualEvenIfNaN(base_frequency_x_, - other.base_frequency_x_) && - PaintOp::AreEqualEvenIfNaN(base_frequency_y_, - other.base_frequency_y_) && - num_octaves_ == other.num_octaves_ && - PaintOp::AreEqualEvenIfNaN(seed_, other.seed_) && + base_frequency_x_ == other.base_frequency_x_ && + base_frequency_y_ == other.base_frequency_y_ && + num_octaves_ == other.num_octaves_ && seed_ == other.seed_ && tile_size_ == other.tile_size_; } @@ -1114,10 +1085,11 @@ } } -bool ShaderPaintFilter::operator==(const ShaderPaintFilter& other) const { +bool ShaderPaintFilter::EqualsForTesting(const ShaderPaintFilter& other) const { DCHECK(shader_ && other.shader_); return alpha_ == other.alpha_ && filter_quality_ == other.filter_quality_ && - dither_ == other.dither_ && *shader_ == *other.shader_; + dither_ == other.dither_ && + shader_->EqualsForTesting(*other.shader_); // IN-TEST } MatrixPaintFilter::MatrixPaintFilter(const SkMatrix& matrix, @@ -1147,10 +1119,9 @@ Snapshot(input_, image_provider)); } -bool MatrixPaintFilter::operator==(const MatrixPaintFilter& other) const { - return PaintOp::AreSkMatricesEqual(matrix_, other.matrix_) && - filter_quality_ == other.filter_quality_ && - base::ValuesEquivalent(input_.get(), other.input_.get()); +bool MatrixPaintFilter::EqualsForTesting(const MatrixPaintFilter& other) const { + return matrix_ == other.matrix_ && filter_quality_ == other.filter_quality_ && + AreValuesEqualForTesting(input_, other.input_); // IN-TEST } LightingDistantPaintFilter::LightingDistantPaintFilter( @@ -1204,15 +1175,13 @@ shininess_, Snapshot(input_, image_provider), GetCropRect()); } -bool LightingDistantPaintFilter::operator==( +bool LightingDistantPaintFilter::EqualsForTesting( const LightingDistantPaintFilter& other) const { return lighting_type_ == other.lighting_type_ && - PaintOp::AreSkPoint3sEqual(direction_, other.direction_) && - light_color_ == other.light_color_ && - PaintOp::AreEqualEvenIfNaN(surface_scale_, other.surface_scale_) && - PaintOp::AreEqualEvenIfNaN(kconstant_, other.kconstant_) && - PaintOp::AreEqualEvenIfNaN(shininess_, other.shininess_) && - base::ValuesEquivalent(input_.get(), other.input_.get()); + direction_ == other.direction_ && light_color_ == other.light_color_ && + surface_scale_ == other.surface_scale_ && + kconstant_ == other.kconstant_ && shininess_ == other.shininess_ && + AreValuesEqualForTesting(input_, other.input_); // IN-TEST } LightingPointPaintFilter::LightingPointPaintFilter(LightingType lighting_type, @@ -1265,15 +1234,13 @@ shininess_, Snapshot(input_, image_provider), GetCropRect()); } -bool LightingPointPaintFilter::operator==( +bool LightingPointPaintFilter::EqualsForTesting( const LightingPointPaintFilter& other) const { return lighting_type_ == other.lighting_type_ && - PaintOp::AreSkPoint3sEqual(location_, other.location_) && - light_color_ == other.light_color_ && - PaintOp::AreEqualEvenIfNaN(surface_scale_, other.surface_scale_) && - PaintOp::AreEqualEvenIfNaN(kconstant_, other.kconstant_) && - PaintOp::AreEqualEvenIfNaN(shininess_, other.shininess_) && - base::ValuesEquivalent(input_.get(), other.input_.get()); + location_ == other.location_ && light_color_ == other.light_color_ && + surface_scale_ == other.surface_scale_ && + kconstant_ == other.kconstant_ && shininess_ == other.shininess_ && + AreValuesEqualForTesting(input_, other.input_); // IN-TEST } LightingSpotPaintFilter::LightingSpotPaintFilter(LightingType lighting_type, @@ -1336,19 +1303,16 @@ Snapshot(input_, image_provider), GetCropRect()); } -bool LightingSpotPaintFilter::operator==( +bool LightingSpotPaintFilter::EqualsForTesting( const LightingSpotPaintFilter& other) const { return lighting_type_ == other.lighting_type_ && - PaintOp::AreSkPoint3sEqual(location_, other.location_) && - PaintOp::AreSkPoint3sEqual(target_, other.target_) && - PaintOp::AreEqualEvenIfNaN(specular_exponent_, - other.specular_exponent_) && - PaintOp::AreEqualEvenIfNaN(cutoff_angle_, other.cutoff_angle_) && + location_ == other.location_ && target_ == other.target_ && + specular_exponent_ == other.specular_exponent_ && + cutoff_angle_ == other.cutoff_angle_ && light_color_ == other.light_color_ && - PaintOp::AreEqualEvenIfNaN(surface_scale_, other.surface_scale_) && - PaintOp::AreEqualEvenIfNaN(kconstant_, other.kconstant_) && - PaintOp::AreEqualEvenIfNaN(shininess_, other.shininess_) && - base::ValuesEquivalent(input_.get(), other.input_.get()); + surface_scale_ == other.surface_scale_ && + kconstant_ == other.kconstant_ && shininess_ == other.shininess_ && + AreValuesEqualForTesting(input_, other.input_); // IN-TEST } } // namespace cc
diff --git a/cc/paint/paint_filter.h b/cc/paint/paint_filter.h index e194cbcb..1aa6a76 100644 --- a/cc/paint/paint_filter.h +++ b/cc/paint/paint_filter.h
@@ -115,10 +115,7 @@ // that are easy to compare. As an example, it doesn't compare equality of // images, rather only its existence. This is meant to be used only by tests // and fuzzers. - // TODO(vmpstr): Rename this and places that its used to something like - // EqualsForTesting. - bool operator==(const PaintFilter& other) const; - bool operator!=(const PaintFilter& other) const { return !(*this == other); } + bool EqualsForTesting(const PaintFilter& other) const; protected: PaintFilter(Type type, @@ -166,7 +163,7 @@ const sk_sp<PaintFilter>& input() const { return input_; } size_t SerializedSize() const override; - bool operator==(const ColorFilterPaintFilter& other) const; + bool EqualsForTesting(const ColorFilterPaintFilter& other) const; protected: sk_sp<PaintFilter> SnapshotWithImagesInternal( @@ -194,7 +191,7 @@ SkTileMode tile_mode() const { return tile_mode_; } size_t SerializedSize() const override; - bool operator==(const BlurPaintFilter& other) const; + bool EqualsForTesting(const BlurPaintFilter& other) const; protected: sk_sp<PaintFilter> SnapshotWithImagesInternal( @@ -234,7 +231,7 @@ const sk_sp<PaintFilter>& input() const { return input_; } size_t SerializedSize() const override; - bool operator==(const DropShadowPaintFilter& other) const; + bool EqualsForTesting(const DropShadowPaintFilter& other) const; protected: sk_sp<PaintFilter> SnapshotWithImagesInternal( @@ -264,7 +261,7 @@ const sk_sp<PaintFilter>& input() const { return input_; } size_t SerializedSize() const override; - bool operator==(const MagnifierPaintFilter& other) const; + bool EqualsForTesting(const MagnifierPaintFilter& other) const; protected: sk_sp<PaintFilter> SnapshotWithImagesInternal( @@ -286,7 +283,7 @@ const sk_sp<PaintFilter>& inner() const { return inner_; } size_t SerializedSize() const override; - bool operator==(const ComposePaintFilter& other) const; + bool EqualsForTesting(const ComposePaintFilter& other) const; protected: sk_sp<PaintFilter> SnapshotWithImagesInternal( @@ -313,7 +310,7 @@ const sk_sp<PaintFilter>& input() const { return input_; } size_t SerializedSize() const override; - bool operator==(const AlphaThresholdPaintFilter& other) const; + bool EqualsForTesting(const AlphaThresholdPaintFilter& other) const; protected: sk_sp<PaintFilter> SnapshotWithImagesInternal( @@ -340,7 +337,7 @@ const sk_sp<PaintFilter>& foreground() const { return foreground_; } size_t SerializedSize() const override; - bool operator==(const XfermodePaintFilter& other) const; + bool EqualsForTesting(const XfermodePaintFilter& other) const; protected: sk_sp<PaintFilter> SnapshotWithImagesInternal( @@ -374,7 +371,7 @@ const sk_sp<PaintFilter>& foreground() const { return foreground_; } size_t SerializedSize() const override; - bool operator==(const ArithmeticPaintFilter& other) const; + bool EqualsForTesting(const ArithmeticPaintFilter& other) const; protected: sk_sp<PaintFilter> SnapshotWithImagesInternal( @@ -414,7 +411,7 @@ const sk_sp<PaintFilter>& input() const { return input_; } size_t SerializedSize() const override; - bool operator==(const MatrixConvolutionPaintFilter& other) const; + bool EqualsForTesting(const MatrixConvolutionPaintFilter& other) const; protected: sk_sp<PaintFilter> SnapshotWithImagesInternal( @@ -450,7 +447,7 @@ const sk_sp<PaintFilter>& color() const { return color_; } size_t SerializedSize() const override; - bool operator==(const DisplacementMapEffectPaintFilter& other) const; + bool EqualsForTesting(const DisplacementMapEffectPaintFilter& other) const; protected: sk_sp<PaintFilter> SnapshotWithImagesInternal( @@ -479,7 +476,7 @@ PaintFlags::FilterQuality filter_quality() const { return filter_quality_; } size_t SerializedSize() const override; - bool operator==(const ImagePaintFilter& other) const; + bool EqualsForTesting(const ImagePaintFilter& other) const; protected: sk_sp<PaintFilter> SnapshotWithImagesInternal( @@ -518,7 +515,7 @@ ScalingBehavior scaling_behavior() const { return scaling_behavior_; } size_t SerializedSize() const override; - bool operator==(const RecordPaintFilter& other) const; + bool EqualsForTesting(const RecordPaintFilter& other) const; protected: sk_sp<PaintFilter> SnapshotWithImagesInternal( @@ -552,7 +549,7 @@ } size_t SerializedSize() const override; - bool operator==(const MergePaintFilter& other) const; + bool EqualsForTesting(const MergePaintFilter& other) const; protected: sk_sp<PaintFilter> SnapshotWithImagesInternal( @@ -583,7 +580,7 @@ const sk_sp<PaintFilter>& input() const { return input_; } size_t SerializedSize() const override; - bool operator==(const MorphologyPaintFilter& other) const; + bool EqualsForTesting(const MorphologyPaintFilter& other) const; protected: sk_sp<PaintFilter> SnapshotWithImagesInternal( @@ -610,7 +607,7 @@ const sk_sp<PaintFilter>& input() const { return input_; } size_t SerializedSize() const override; - bool operator==(const OffsetPaintFilter& other) const; + bool EqualsForTesting(const OffsetPaintFilter& other) const; protected: sk_sp<PaintFilter> SnapshotWithImagesInternal( @@ -635,7 +632,7 @@ const sk_sp<PaintFilter>& input() const { return input_; } size_t SerializedSize() const override; - bool operator==(const TilePaintFilter& other) const; + bool EqualsForTesting(const TilePaintFilter& other) const; protected: sk_sp<PaintFilter> SnapshotWithImagesInternal( @@ -672,7 +669,7 @@ SkISize tile_size() const { return tile_size_; } size_t SerializedSize() const override; - bool operator==(const TurbulencePaintFilter& other) const; + bool EqualsForTesting(const TurbulencePaintFilter& other) const; protected: sk_sp<PaintFilter> SnapshotWithImagesInternal( @@ -707,7 +704,7 @@ SkImageFilters::Dither dither() const { return dither_; } size_t SerializedSize() const override; - bool operator==(const ShaderPaintFilter& other) const; + bool EqualsForTesting(const ShaderPaintFilter& other) const; protected: sk_sp<PaintFilter> SnapshotWithImagesInternal( @@ -733,7 +730,7 @@ const sk_sp<PaintFilter>& input() const { return input_; } size_t SerializedSize() const override; - bool operator==(const MatrixPaintFilter& other) const; + bool EqualsForTesting(const MatrixPaintFilter& other) const; protected: sk_sp<PaintFilter> SnapshotWithImagesInternal( @@ -770,7 +767,7 @@ const sk_sp<PaintFilter>& input() const { return input_; } size_t SerializedSize() const override; - bool operator==(const LightingDistantPaintFilter& other) const; + bool EqualsForTesting(const LightingDistantPaintFilter& other) const; protected: sk_sp<PaintFilter> SnapshotWithImagesInternal( @@ -811,7 +808,7 @@ const sk_sp<PaintFilter>& input() const { return input_; } size_t SerializedSize() const override; - bool operator==(const LightingPointPaintFilter& other) const; + bool EqualsForTesting(const LightingPointPaintFilter& other) const; protected: sk_sp<PaintFilter> SnapshotWithImagesInternal( @@ -858,7 +855,7 @@ const sk_sp<PaintFilter>& input() const { return input_; } size_t SerializedSize() const override; - bool operator==(const LightingSpotPaintFilter& other) const; + bool EqualsForTesting(const LightingSpotPaintFilter& other) const; protected: sk_sp<PaintFilter> SnapshotWithImagesInternal(
diff --git a/cc/paint/paint_filter_unittest.cc b/cc/paint/paint_filter_unittest.cc index 35de027..cfd23b0c 100644 --- a/cc/paint/paint_filter_unittest.cc +++ b/cc/paint/paint_filter_unittest.cc
@@ -178,7 +178,7 @@ EXPECT_GT(image_provider.image_count_, 0) << PaintFilter::TypeToString(GetParamType()); } - EXPECT_EQ(*filter, *snapshot_filter) + EXPECT_TRUE(filter->EqualsForTesting(*snapshot_filter)) << PaintFilter::TypeToString(GetParamType()); }
diff --git a/cc/paint/paint_flags.cc b/cc/paint/paint_flags.cc index 7949d4e..20e7f9a 100644 --- a/cc/paint/paint_flags.cc +++ b/cc/paint/paint_flags.cc
@@ -2,10 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include <utility> - #include "cc/paint/paint_flags.h" +#include <utility> + +#include "base/memory/values_equivalent.h" #include "base/notreached.h" #include "cc/paint/paint_filter.h" #include "cc/paint/paint_op_buffer.h" @@ -15,10 +16,25 @@ namespace { -static bool affects_alpha(const SkColorFilter* cf) { +bool affects_alpha(const SkColorFilter* cf) { return cf && !cf->isAlphaUnchanged(); } +template <typename T> +bool AreValuesEqualForTesting(const sk_sp<T>& a, const sk_sp<T>& b) { + return base::ValuesEquivalent(a, b, [](const T& x, const T& y) { + return x.EqualsForTesting(y); // IN-TEST + }); +} + +bool AreSkFlattenablesEqualForTesting(const sk_sp<SkFlattenable> a, // IN-TEST + const sk_sp<SkFlattenable> b) { + return base::ValuesEquivalent( + a, b, [](const SkFlattenable& x, const SkFlattenable& y) { + return x.serialize()->equals(y.serialize().get()); + }); +} + } // namespace namespace cc { @@ -156,54 +172,29 @@ return PaintOp::IsValidPaintFlagsSkBlendMode(getBlendMode()); } -bool PaintFlags::operator==(const PaintFlags& other) const { +bool PaintFlags::EqualsForTesting(const PaintFlags& other) const { // Can't just ToSkPaint and operator== here as SkPaint does pointer // comparisons on all the ref'd skia objects on the SkPaint, which // is not true after serialization. - if (getColor() != other.getColor()) - return false; - if (!PaintOp::AreEqualEvenIfNaN(getStrokeWidth(), other.getStrokeWidth())) - return false; - if (!PaintOp::AreEqualEvenIfNaN(getStrokeMiter(), other.getStrokeMiter())) - return false; - if (getBlendMode() != other.getBlendMode()) - return false; - if (getStrokeCap() != other.getStrokeCap()) - return false; - if (getStrokeJoin() != other.getStrokeJoin()) - return false; - if (getStyle() != other.getStyle()) - return false; - if (getFilterQuality() != other.getFilterQuality()) - return false; - - if (!PaintOp::AreSkFlattenablesEqual(getPathEffect().get(), - other.getPathEffect().get())) { - return false; - } - if (!PaintOp::AreSkFlattenablesEqual(getMaskFilter().get(), - other.getMaskFilter().get())) { - return false; - } - if (!PaintOp::AreSkFlattenablesEqual(getColorFilter().get(), - other.getColorFilter().get())) { - return false; - } - if (!PaintOp::AreSkFlattenablesEqual(getLooper().get(), - other.getLooper().get())) { - return false; - } - - if (!getImageFilter() != !other.getImageFilter()) - return false; - if (getImageFilter() && *getImageFilter() != *other.getImageFilter()) - return false; - - if (!getShader() != !other.getShader()) - return false; - if (getShader() && *getShader() != *other.getShader()) - return false; - return true; + return getColor() == other.getColor() && + getStrokeWidth() == getStrokeWidth() && + getStrokeMiter() == other.getStrokeMiter() && + getBlendMode() == other.getBlendMode() && + getStrokeCap() == other.getStrokeCap() && + getStrokeJoin() == other.getStrokeJoin() && + getStyle() == other.getStyle() && + getFilterQuality() == other.getFilterQuality() && + AreSkFlattenablesEqualForTesting(path_effect_, // IN-TEST + other.path_effect_) && + AreSkFlattenablesEqualForTesting(mask_filter_, // IN-TEST + other.mask_filter_) && + AreSkFlattenablesEqualForTesting(color_filter_, // IN-TEST + other.color_filter_) && + AreSkFlattenablesEqualForTesting(draw_looper_, // IN-TEST + other.draw_looper_) && + AreValuesEqualForTesting(image_filter_, // IN-TEST + other.image_filter_) && + AreValuesEqualForTesting(shader_, other.shader_); // IN-TEST } bool PaintFlags::HasDiscardableImages() const {
diff --git a/cc/paint/paint_flags.h b/cc/paint/paint_flags.h index fe7b927..23e9db0 100644 --- a/cc/paint/paint_flags.h +++ b/cc/paint/paint_flags.h
@@ -187,8 +187,7 @@ FilterQuality filter_quality); bool IsValid() const; - bool operator==(const PaintFlags& other) const; - bool operator!=(const PaintFlags& other) const { return !(*this == other); } + bool EqualsForTesting(const PaintFlags& other) const; bool HasDiscardableImages() const;
diff --git a/cc/paint/paint_image.cc b/cc/paint/paint_image.cc index 8da77457..fdba1d7 100644 --- a/cc/paint/paint_image.cc +++ b/cc/paint/paint_image.cc
@@ -49,32 +49,21 @@ PaintImage& PaintImage::operator=(const PaintImage& other) = default; PaintImage& PaintImage::operator=(PaintImage&& other) = default; -bool PaintImage::operator==(const PaintImage& other) const { - if (sk_image_ != other.sk_image_) - return false; - if (paint_record_ != other.paint_record_) - return false; - if (paint_record_rect_ != other.paint_record_rect_) - return false; - if (content_id_ != other.content_id_) - return false; - if (paint_image_generator_ != other.paint_image_generator_) - return false; - if (id_ != other.id_) - return false; - if (animation_type_ != other.animation_type_) - return false; - if (completion_state_ != other.completion_state_) - return false; - if (is_multipart_ != other.is_multipart_) - return false; - if (texture_backing_ != other.texture_backing_) - return false; - if (paint_worklet_input_ != other.paint_worklet_input_) - return false; +bool PaintImage::IsSameForTesting(const PaintImage& other) const { + return sk_image_ == other.sk_image_ && + !!paint_record_ == !!other.paint_record_ && + (!paint_record_ || + &paint_record_->GetFirstOp() == &other.paint_record_->GetFirstOp()) && + paint_record_rect_ == other.paint_record_rect_ && + content_id_ == other.content_id_ && + paint_image_generator_ == other.paint_image_generator_ && + id_ == other.id_ && animation_type_ == other.animation_type_ && + completion_state_ == other.completion_state_ && + is_multipart_ == other.is_multipart_ && + texture_backing_ == other.texture_backing_ && + paint_worklet_input_ == other.paint_worklet_input_; // Do not check may_be_lcp_candidate_ as it should not affect any rendering // operation, only metrics collection. - return true; } // static
diff --git a/cc/paint/paint_image.h b/cc/paint/paint_image.h index 09a14ee..d338a40 100644 --- a/cc/paint/paint_image.h +++ b/cc/paint/paint_image.h
@@ -198,8 +198,10 @@ PaintImage& operator=(const PaintImage& other); PaintImage& operator=(PaintImage&& other); - bool operator==(const PaintImage& other) const; - bool operator!=(const PaintImage& other) const { return !(*this == other); } + // For testing only. Checks if `this` and `other` are the same image, i.e. + // share the same underlying image. `a.IsSameForTesting(b)` will be true after + // `PaintImage b = a;`. + bool IsSameForTesting(const PaintImage& other) const; // Returns the smallest size that is at least as big as the requested_size // such that we can decode to exactly that scale. If the requested size is
diff --git a/cc/paint/paint_op.cc b/cc/paint/paint_op.cc index f1348698..6446e2d 100644 --- a/cc/paint/paint_op.cc +++ b/cc/paint/paint_op.cc
@@ -106,20 +106,6 @@ canvas->drawImageRect(image, src, dst, options, paint, constraint); } -bool GrSlugAreEqual(sk_sp<GrSlug> left, sk_sp<GrSlug> right) { - if (!left && !right) { - return true; - } - if (left && right) { - auto left_data = left->serialize(); - auto right_data = right->serialize(); - return left_data->equals(right_data.get()); - } - return false; -} - -} // namespace - #define TYPES(M) \ M(AnnotateOp) \ M(ClipPathOp) \ @@ -278,9 +264,15 @@ TYPES(M)}; #undef M -using EqualsFunction = bool (*)(const PaintOp* left, const PaintOp* right); -#define M(T) &T::AreEqual, -static const EqualsFunction g_equals_operator[kNumOpTypes] = {TYPES(M)}; +using AreEqualForTestingFunction = bool (*)(const PaintOp&, const PaintOp&); +template <typename T> +bool AreEqualForTesting(const PaintOp& a, const PaintOp& b) { + return static_cast<const T&>(a).EqualsForTesting( // IN-TEST + static_cast<const T&>(b)); +} +#define M(T) &AreEqualForTesting<T>, +static const AreEqualForTestingFunction + g_equal_for_testing_functions[kNumOpTypes] = {TYPES(M)}; #undef M // Most state ops (matrix, clip, save, restore) have a trivial destructor. @@ -324,6 +316,8 @@ #undef TYPES +} // namespace + const SkRect PaintOp::kUnsetRect = {SK_ScalarInfinity, 0, 0, 0}; const size_t PaintOp::kMaxSkip; @@ -1460,478 +1454,154 @@ canvas->translate(op->dx, op->dy); } -// static -bool PaintOp::AreSkPointsEqual(const SkPoint& left, const SkPoint& right) { - if (!AreEqualEvenIfNaN(left.fX, right.fX)) - return false; - if (!AreEqualEvenIfNaN(left.fY, right.fY)) - return false; - return true; +bool AnnotateOp::EqualsForTesting(const AnnotateOp& other) const { + return annotation_type == other.annotation_type && rect == other.rect && + !data == !other.data && (!data || data->equals(other.data.get())); } -// static -bool PaintOp::AreSkPoint3sEqual(const SkPoint3& left, const SkPoint3& right) { - if (!AreEqualEvenIfNaN(left.fX, right.fX)) - return false; - if (!AreEqualEvenIfNaN(left.fY, right.fY)) - return false; - if (!AreEqualEvenIfNaN(left.fZ, right.fZ)) - return false; - return true; +bool ClipPathOp::EqualsForTesting(const ClipPathOp& other) const { + return path == other.path && op == other.op && antialias == other.antialias; } -// static -bool PaintOp::AreSkRectsEqual(const SkRect& left, const SkRect& right) { - if (!AreEqualEvenIfNaN(left.fLeft, right.fLeft)) - return false; - if (!AreEqualEvenIfNaN(left.fTop, right.fTop)) - return false; - if (!AreEqualEvenIfNaN(left.fRight, right.fRight)) - return false; - if (!AreEqualEvenIfNaN(left.fBottom, right.fBottom)) - return false; - return true; +bool ClipRectOp::EqualsForTesting(const ClipRectOp& other) const { + return rect == other.rect && op == other.op && antialias == other.antialias; } -// static -bool PaintOp::AreSkRRectsEqual(const SkRRect& left, const SkRRect& right) { - char left_buffer[SkRRect::kSizeInMemory]; - left.writeToMemory(left_buffer); - char right_buffer[SkRRect::kSizeInMemory]; - right.writeToMemory(right_buffer); - return !memcmp(left_buffer, right_buffer, SkRRect::kSizeInMemory); +bool ClipRRectOp::EqualsForTesting(const ClipRRectOp& other) const { + return rrect == other.rrect && op == other.op && antialias == other.antialias; } -// static -bool PaintOp::AreSkMatricesEqual(const SkMatrix& left, const SkMatrix& right) { - for (int i = 0; i < 9; ++i) { - if (!AreEqualEvenIfNaN(left.get(i), right.get(i))) - return false; - } - - // If a serialized matrix says it is identity, then the original must have - // those values, as the serialization process clobbers the matrix values. - if (left.isIdentity()) { - if (SkMatrix::I() != left) - return false; - if (SkMatrix::I() != right) - return false; - } - - if (left.getType() != right.getType()) - return false; - - return true; +bool ConcatOp::EqualsForTesting(const ConcatOp& other) const { + return matrix == other.matrix; } -// static -bool PaintOp::AreSkM44sEqual(const SkM44& left, const SkM44& right) { - for (int r = 0; r < 4; ++r) { - for (int c = 0; c < 4; ++c) { - if (!AreEqualEvenIfNaN(left.rc(r, c), right.rc(r, c))) - return false; - } - } - - return true; +bool CustomDataOp::EqualsForTesting(const CustomDataOp& other) const { + return id == other.id; } -// static -bool PaintOp::AreSkFlattenablesEqual(SkFlattenable* left, - SkFlattenable* right) { - if (!right || !left) - return !right && !left; - - sk_sp<SkData> left_data = left->serialize(); - sk_sp<SkData> right_data = right->serialize(); - if (left_data->size() != right_data->size()) - return false; - if (!left_data->equals(right_data.get())) - return false; - return true; +bool DrawColorOp::EqualsForTesting(const DrawColorOp& other) const { + return color == other.color; } -bool AnnotateOp::AreEqual(const PaintOp* base_left, const PaintOp* base_right) { - auto* left = static_cast<const AnnotateOp*>(base_left); - auto* right = static_cast<const AnnotateOp*>(base_right); - DCHECK(left->IsValid()); - DCHECK(right->IsValid()); - if (left->annotation_type != right->annotation_type) - return false; - if (!AreSkRectsEqual(left->rect, right->rect)) - return false; - if (!left->data != !right->data) - return false; - if (left->data) { - if (left->data->size() != right->data->size()) - return false; - if (0 != - memcmp(left->data->data(), right->data->data(), right->data->size())) - return false; - } - return true; +bool DrawDRRectOp::EqualsForTesting(const DrawDRRectOp& other) const { + return flags.EqualsForTesting(other.flags) && // IN-TEST + outer == other.outer && inner == other.inner; } -bool ClipPathOp::AreEqual(const PaintOp* base_left, const PaintOp* base_right) { - auto* left = static_cast<const ClipPathOp*>(base_left); - auto* right = static_cast<const ClipPathOp*>(base_right); - DCHECK(left->IsValid()); - DCHECK(right->IsValid()); - if (left->path != right->path) - return false; - if (left->op != right->op) - return false; - if (left->antialias != right->antialias) - return false; - return true; -} - -bool ClipRectOp::AreEqual(const PaintOp* base_left, const PaintOp* base_right) { - auto* left = static_cast<const ClipRectOp*>(base_left); - auto* right = static_cast<const ClipRectOp*>(base_right); - DCHECK(left->IsValid()); - DCHECK(right->IsValid()); - if (!AreSkRectsEqual(left->rect, right->rect)) - return false; - if (left->op != right->op) - return false; - if (left->antialias != right->antialias) - return false; - return true; -} - -bool ClipRRectOp::AreEqual(const PaintOp* base_left, - const PaintOp* base_right) { - auto* left = static_cast<const ClipRRectOp*>(base_left); - auto* right = static_cast<const ClipRRectOp*>(base_right); - DCHECK(left->IsValid()); - DCHECK(right->IsValid()); - if (!AreSkRRectsEqual(left->rrect, right->rrect)) - return false; - if (left->op != right->op) - return false; - if (left->antialias != right->antialias) - return false; - return true; -} - -bool ConcatOp::AreEqual(const PaintOp* base_left, const PaintOp* base_right) { - auto* left = static_cast<const ConcatOp*>(base_left); - auto* right = static_cast<const ConcatOp*>(base_right); - DCHECK(left->IsValid()); - DCHECK(right->IsValid()); - return AreSkM44sEqual(left->matrix, right->matrix); -} - -bool CustomDataOp::AreEqual(const PaintOp* base_left, - const PaintOp* base_right) { - auto* left = static_cast<const CustomDataOp*>(base_left); - auto* right = static_cast<const CustomDataOp*>(base_right); - DCHECK(left->IsValid()); - DCHECK(right->IsValid()); - return left->id == right->id; -} - -bool DrawColorOp::AreEqual(const PaintOp* base_left, - const PaintOp* base_right) { - auto* left = static_cast<const DrawColorOp*>(base_left); - auto* right = static_cast<const DrawColorOp*>(base_right); - DCHECK(left->IsValid()); - DCHECK(right->IsValid()); - return left->color == right->color; -} - -bool DrawDRRectOp::AreEqual(const PaintOp* base_left, - const PaintOp* base_right) { - auto* left = static_cast<const DrawDRRectOp*>(base_left); - auto* right = static_cast<const DrawDRRectOp*>(base_right); - DCHECK(left->IsValid()); - DCHECK(right->IsValid()); - if (left->flags != right->flags) - return false; - if (!AreSkRRectsEqual(left->outer, right->outer)) - return false; - if (!AreSkRRectsEqual(left->inner, right->inner)) - return false; - return true; -} - -bool DrawImageOp::AreEqual(const PaintOp* base_left, - const PaintOp* base_right) { - auto* left = static_cast<const DrawImageOp*>(base_left); - auto* right = static_cast<const DrawImageOp*>(base_right); - DCHECK(left->IsValid()); - DCHECK(right->IsValid()); - if (left->flags != right->flags) - return false; - // TODO(enne): Test PaintImage equality once implemented - if (!AreEqualEvenIfNaN(left->left, right->left)) - return false; - if (!AreEqualEvenIfNaN(left->top, right->top)) - return false; - +bool DrawImageOp::EqualsForTesting(const DrawImageOp& other) const { + // For now image, sampling and constraint are not compared. // scale_adjustment intentionally omitted because it is added during // serialization based on raster scale. - return true; + return flags.EqualsForTesting(other.flags) && // IN-TEST + top == other.top && left == other.left; } -bool DrawImageRectOp::AreEqual(const PaintOp* base_left, - const PaintOp* base_right) { - auto* left = static_cast<const DrawImageRectOp*>(base_left); - auto* right = static_cast<const DrawImageRectOp*>(base_right); - DCHECK(left->IsValid()); - DCHECK(right->IsValid()); - if (left->flags != right->flags) - return false; - // TODO(enne): Test PaintImage equality once implemented - if (!AreSkRectsEqual(left->src, right->src)) - return false; - if (!AreSkRectsEqual(left->dst, right->dst)) - return false; - +bool DrawImageRectOp::EqualsForTesting(const DrawImageRectOp& other) const { + // For now image, sampling and constraint are not compared. // scale_adjustment intentionally omitted because it is added during // serialization based on raster scale. - return true; + return flags.EqualsForTesting(other.flags) && // IN-TEST + src == other.src && dst == other.dst; } -bool DrawIRectOp::AreEqual(const PaintOp* base_left, - const PaintOp* base_right) { - auto* left = static_cast<const DrawIRectOp*>(base_left); - auto* right = static_cast<const DrawIRectOp*>(base_right); - DCHECK(left->IsValid()); - DCHECK(right->IsValid()); - if (left->flags != right->flags) - return false; - if (left->rect != right->rect) - return false; - return true; +bool DrawIRectOp::EqualsForTesting(const DrawIRectOp& other) const { + return flags.EqualsForTesting(other.flags) && rect == other.rect; // IN-TEST } -bool DrawLineOp::AreEqual(const PaintOp* base_left, const PaintOp* base_right) { - auto* left = static_cast<const DrawLineOp*>(base_left); - auto* right = static_cast<const DrawLineOp*>(base_right); - DCHECK(left->IsValid()); - DCHECK(right->IsValid()); - if (left->flags != right->flags) - return false; - if (!AreEqualEvenIfNaN(left->x0, right->x0)) - return false; - if (!AreEqualEvenIfNaN(left->y0, right->y0)) - return false; - if (!AreEqualEvenIfNaN(left->x1, right->x1)) - return false; - if (!AreEqualEvenIfNaN(left->y1, right->y1)) - return false; - return true; +bool DrawLineOp::EqualsForTesting(const DrawLineOp& other) const { + return flags.EqualsForTesting(other.flags) && // IN-TEST + x0 == other.x0 && y0 == other.y0 && x1 == other.x1 && y1 == other.y1; } -bool DrawOvalOp::AreEqual(const PaintOp* base_left, const PaintOp* base_right) { - auto* left = static_cast<const DrawOvalOp*>(base_left); - auto* right = static_cast<const DrawOvalOp*>(base_right); - DCHECK(left->IsValid()); - DCHECK(right->IsValid()); - if (left->flags != right->flags) - return false; - if (!AreSkRectsEqual(left->oval, right->oval)) - return false; - return true; +bool DrawOvalOp::EqualsForTesting(const DrawOvalOp& other) const { + return flags.EqualsForTesting(other.flags) && oval == other.oval; // IN-TEST } -bool DrawPathOp::AreEqual(const PaintOp* base_left, const PaintOp* base_right) { - auto* left = static_cast<const DrawPathOp*>(base_left); - auto* right = static_cast<const DrawPathOp*>(base_right); - DCHECK(left->IsValid()); - DCHECK(right->IsValid()); - if (left->flags != right->flags) - return false; - if (left->path != right->path) - return false; - return true; +bool DrawPathOp::EqualsForTesting(const DrawPathOp& other) const { + return flags.EqualsForTesting(other.flags) && path == other.path; // IN-TEST } -bool DrawRecordOp::AreEqual(const PaintOp* base_left, - const PaintOp* base_right) { - auto* left = static_cast<const DrawRecordOp*>(base_left); - auto* right = static_cast<const DrawRecordOp*>(base_right); - DCHECK(left->IsValid()); - DCHECK(right->IsValid()); - return left->record == right->record; +bool DrawRecordOp::EqualsForTesting(const DrawRecordOp& other) const { + return record.EqualsForTesting(other.record); // IN-TEST } -bool DrawRectOp::AreEqual(const PaintOp* base_left, const PaintOp* base_right) { - auto* left = static_cast<const DrawRectOp*>(base_left); - auto* right = static_cast<const DrawRectOp*>(base_right); - DCHECK(left->IsValid()); - DCHECK(right->IsValid()); - if (left->flags != right->flags) - return false; - if (!AreSkRectsEqual(left->rect, right->rect)) - return false; - return true; +bool DrawRectOp::EqualsForTesting(const DrawRectOp& other) const { + return flags.EqualsForTesting(other.flags) && rect == other.rect; // IN-TEST } -bool DrawRRectOp::AreEqual(const PaintOp* base_left, - const PaintOp* base_right) { - auto* left = static_cast<const DrawRRectOp*>(base_left); - auto* right = static_cast<const DrawRRectOp*>(base_right); - DCHECK(left->IsValid()); - DCHECK(right->IsValid()); - if (left->flags != right->flags) - return false; - if (!AreSkRRectsEqual(left->rrect, right->rrect)) - return false; - return true; +bool DrawRRectOp::EqualsForTesting(const DrawRRectOp& other) const { + return flags.EqualsForTesting(other.flags) && // IN-TEST + rrect == other.rrect; } -bool DrawSkottieOp::AreEqual(const PaintOp* base_left, - const PaintOp* base_right) { - auto* left = static_cast<const DrawSkottieOp*>(base_left); - auto* right = static_cast<const DrawSkottieOp*>(base_right); - DCHECK(left->IsValid()); - DCHECK(right->IsValid()); +bool DrawSkottieOp::EqualsForTesting(const DrawSkottieOp& other) const { // TODO(malaykeshav): Verify the skottie objects of each PaintOb are equal - // based on the serialized bytes. - if (left->t != right->t) + // bsed on the serialized bytes. + if (t != other.t || dst != other.dst || color_map != other.color_map || + text_map != other.text_map) { return false; - if (!AreSkRectsEqual(left->dst, right->dst)) - return false; - if (left->images.size() != right->images.size()) - return false; - - auto left_iter = left->images.begin(); - auto right_iter = right->images.begin(); - for (; left_iter != left->images.end(); ++left_iter, ++right_iter) { - if (left_iter->first != right_iter->first || - // PaintImage's comparison operator compares the underlying SkImage's - // pointer address. This does not necessarily hold in cases where the - // image's content may be the same, but it got realloacted to a - // different spot somewhere in memory via the transfer cache. The next - // best thing is to just compare the dimensions of the PaintImage. - left_iter->second.image.width() != right_iter->second.image.width() || - left_iter->second.image.height() != right_iter->second.image.height() || - left_iter->second.quality != right_iter->second.quality) { - return false; - } } + return base::ranges::equal( + images, other.images, [](const auto& a, const auto& b) { + return a.first == b.first && + // PaintImage::IsSameForTesting() returns false in cases where + // the + // image's content may be the same, but it got realloacted to a + // different spot somewhere in memory via the transfer cache. The + // next best thing is to just compare the dimensions of the + // PaintImage. + a.second.image.width() == b.second.image.width() && + a.second.image.height() == b.second.image.height() && + a.second.quality == b.second.quality; + }); +} - if (left->color_map != right->color_map) - return false; +bool DrawTextBlobOp::EqualsForTesting(const DrawTextBlobOp& other) const { + return flags.EqualsForTesting(other.flags) && // IN-TEST + x == other.x && y == other.y && node_id == other.node_id && + !slug == !other.slug && + (!slug || slug->serialize()->equals(other.slug->serialize().get())); +} - if (left->text_map != right->text_map) - return false; - +bool NoopOp::EqualsForTesting(const NoopOp& other) const { return true; } -bool DrawTextBlobOp::AreEqual(const PaintOp* base_left, - const PaintOp* base_right) { - auto* left = static_cast<const DrawTextBlobOp*>(base_left); - auto* right = static_cast<const DrawTextBlobOp*>(base_right); - DCHECK(left->IsValid()); - DCHECK(right->IsValid()); - if (left->flags != right->flags) - return false; - if (!AreEqualEvenIfNaN(left->x, right->x)) - return false; - if (!AreEqualEvenIfNaN(left->y, right->y)) - return false; - if (left->node_id != right->node_id) - return false; - return GrSlugAreEqual(left->slug, right->slug); -} - -bool NoopOp::AreEqual(const PaintOp* base_left, const PaintOp* base_right) { +bool RestoreOp::EqualsForTesting(const RestoreOp& other) const { return true; } -bool RestoreOp::AreEqual(const PaintOp* base_left, const PaintOp* base_right) { +bool RotateOp::EqualsForTesting(const RotateOp& other) const { + return degrees == other.degrees; +} + +bool SaveOp::EqualsForTesting(const SaveOp& other) const { return true; } -bool RotateOp::AreEqual(const PaintOp* base_left, const PaintOp* base_right) { - auto* left = static_cast<const RotateOp*>(base_left); - auto* right = static_cast<const RotateOp*>(base_right); - DCHECK(left->IsValid()); - DCHECK(right->IsValid()); - if (!AreEqualEvenIfNaN(left->degrees, right->degrees)) - return false; - return true; +bool SaveLayerOp::EqualsForTesting(const SaveLayerOp& other) const { + return flags.EqualsForTesting(other.flags) && // IN-TEST + bounds == other.bounds; } -bool SaveOp::AreEqual(const PaintOp* base_left, const PaintOp* base_right) { - return true; +bool SaveLayerAlphaOp::EqualsForTesting(const SaveLayerAlphaOp& other) const { + return bounds == other.bounds && alpha == other.alpha; } -bool SaveLayerOp::AreEqual(const PaintOp* base_left, - const PaintOp* base_right) { - auto* left = static_cast<const SaveLayerOp*>(base_left); - auto* right = static_cast<const SaveLayerOp*>(base_right); - DCHECK(left->IsValid()); - DCHECK(right->IsValid()); - if (left->flags != right->flags) - return false; - if (!AreSkRectsEqual(left->bounds, right->bounds)) - return false; - return true; +bool ScaleOp::EqualsForTesting(const ScaleOp& other) const { + return sx == other.sx && sy == other.sy; } -bool SaveLayerAlphaOp::AreEqual(const PaintOp* base_left, - const PaintOp* base_right) { - auto* left = static_cast<const SaveLayerAlphaOp*>(base_left); - auto* right = static_cast<const SaveLayerAlphaOp*>(base_right); - DCHECK(left->IsValid()); - DCHECK(right->IsValid()); - if (!AreSkRectsEqual(left->bounds, right->bounds)) - return false; - if (left->alpha != right->alpha) - return false; - return true; +bool SetMatrixOp::EqualsForTesting(const SetMatrixOp& other) const { + return matrix == other.matrix; } -bool ScaleOp::AreEqual(const PaintOp* base_left, const PaintOp* base_right) { - auto* left = static_cast<const ScaleOp*>(base_left); - auto* right = static_cast<const ScaleOp*>(base_right); - DCHECK(left->IsValid()); - DCHECK(right->IsValid()); - if (!AreEqualEvenIfNaN(left->sx, right->sx)) - return false; - if (!AreEqualEvenIfNaN(left->sy, right->sy)) - return false; - return true; +bool SetNodeIdOp::EqualsForTesting(const SetNodeIdOp& other) const { + return node_id == other.node_id; } -bool SetMatrixOp::AreEqual(const PaintOp* base_left, - const PaintOp* base_right) { - auto* left = static_cast<const SetMatrixOp*>(base_left); - auto* right = static_cast<const SetMatrixOp*>(base_right); - DCHECK(left->IsValid()); - DCHECK(right->IsValid()); - if (!AreSkM44sEqual(left->matrix, right->matrix)) - return false; - return true; -} - -bool SetNodeIdOp::AreEqual(const PaintOp* base_left, - const PaintOp* base_right) { - auto* left = static_cast<const SetNodeIdOp*>(base_left); - auto* right = static_cast<const SetNodeIdOp*>(base_right); - - DCHECK(left->IsValid()); - DCHECK(right->IsValid()); - return left->node_id == right->node_id; -} - -bool TranslateOp::AreEqual(const PaintOp* base_left, - const PaintOp* base_right) { - auto* left = static_cast<const TranslateOp*>(base_left); - auto* right = static_cast<const TranslateOp*>(base_right); - DCHECK(left->IsValid()); - DCHECK(right->IsValid()); - if (!AreEqualEvenIfNaN(left->dx, right->dx)) - return false; - if (!AreEqualEvenIfNaN(left->dy, right->dy)) - return false; - return true; +bool TranslateOp::EqualsForTesting(const TranslateOp& other) const { + return dx == other.dx && dy == other.dy; } bool PaintOp::IsDrawOp() const { @@ -1942,10 +1612,10 @@ return g_has_paint_flags[type]; } -bool PaintOp::operator==(const PaintOp& other) const { +bool PaintOp::EqualsForTesting(const PaintOp& other) const { if (GetType() != other.GetType()) return false; - return g_equals_operator[type](this, &other); + return g_equal_for_testing_functions[type](*this, other); } // static
diff --git a/cc/paint/paint_op.h b/cc/paint/paint_op.h index 19958d3..1b4850e 100644 --- a/cc/paint/paint_op.h +++ b/cc/paint/paint_op.h
@@ -32,8 +32,6 @@ #include "cc/paint/skottie_resource_metadata.h" #include "cc/paint/skottie_text_property_value.h" #include "cc/paint/skottie_wrapper.h" -#include "third_party/abseil-cpp/absl/types/optional.h" -#include "third_party/abseil-cpp/absl/types/variant.h" #include "third_party/skia/include/core/SkColor.h" #include "third_party/skia/include/core/SkPath.h" #include "third_party/skia/include/core/SkRRect.h" @@ -122,8 +120,7 @@ bool IsDrawOp() const; bool IsPaintOpWithFlags() const; - bool operator==(const PaintOp& other) const; - bool operator!=(const PaintOp& other) const { return !(*this == other); } + bool EqualsForTesting(const PaintOp& other) const; // Indicates how PaintImages are serialized. enum class SerializedImageType : uint8_t { @@ -242,22 +239,6 @@ return IsUnsetRect(rect) || rect.isFinite(); } - // PaintOp supports having nans, but some tests want to make sure - // that operator== is true on two objects. These helpers compare - // various types in a way where nan == nan is true. - static bool AreEqualEvenIfNaN(float left, float right) { - if (std::isnan(left) && std::isnan(right)) - return true; - return left == right; - } - static bool AreSkPointsEqual(const SkPoint& left, const SkPoint& right); - static bool AreSkPoint3sEqual(const SkPoint3& left, const SkPoint3& right); - static bool AreSkRectsEqual(const SkRect& left, const SkRect& right); - static bool AreSkRRectsEqual(const SkRRect& left, const SkRRect& right); - static bool AreSkMatricesEqual(const SkMatrix& left, const SkMatrix& right); - static bool AreSkM44sEqual(const SkM44& left, const SkM44& right); - static bool AreSkFlattenablesEqual(SkFlattenable* left, SkFlattenable* right); - static constexpr bool kIsDrawOp = false; static constexpr bool kHasPaintFlags = false; // Since skip and type fit in a uint32_t, this is the max size of skip. @@ -313,7 +294,7 @@ SkCanvas* canvas, const PlaybackParams& params); bool IsValid() const { return rect.isFinite(); } - static bool AreEqual(const PaintOp* left, const PaintOp* right); + bool EqualsForTesting(const AnnotateOp& other) const; HAS_SERIALIZATION_FUNCTIONS(); PaintCanvas::AnnotationType annotation_type; @@ -342,7 +323,7 @@ SkCanvas* canvas, const PlaybackParams& params); bool IsValid() const { return IsValidSkClipOp(op) && IsValidPath(path); } - static bool AreEqual(const PaintOp* left, const PaintOp* right); + bool EqualsForTesting(const ClipPathOp& other) const; int CountSlowPaths() const; bool HasNonAAPaint() const { return !antialias; } HAS_SERIALIZATION_FUNCTIONS(); @@ -350,7 +331,7 @@ ThreadsafePath path; SkClipOp op; bool antialias; - UsePaintCache use_cache; + UsePaintCache use_cache = UsePaintCache::kDisabled; private: ClipPathOp() : PaintOp(kType) {} @@ -367,7 +348,7 @@ SkCanvas* canvas, const PlaybackParams& params); bool IsValid() const { return IsValidSkClipOp(op) && rect.isFinite(); } - static bool AreEqual(const PaintOp* left, const PaintOp* right); + bool EqualsForTesting(const ClipRectOp& other) const; HAS_SERIALIZATION_FUNCTIONS(); SkRect rect; @@ -389,7 +370,7 @@ SkCanvas* canvas, const PlaybackParams& params); bool IsValid() const { return IsValidSkClipOp(op) && rrect.isValid(); } - static bool AreEqual(const PaintOp* left, const PaintOp* right); + bool EqualsForTesting(const ClipRRectOp& other) const; bool HasNonAAPaint() const { return !antialias; } HAS_SERIALIZATION_FUNCTIONS(); @@ -411,7 +392,7 @@ SkCanvas* canvas, const PlaybackParams& params); bool IsValid() const { return true; } - static bool AreEqual(const PaintOp* left, const PaintOp* right); + bool EqualsForTesting(const ConcatOp& other) const; HAS_SERIALIZATION_FUNCTIONS(); SkM44 matrix; @@ -430,7 +411,7 @@ SkCanvas* canvas, const PlaybackParams& params); bool IsValid() const { return true; } - static bool AreEqual(const PaintOp* left, const PaintOp* right); + bool EqualsForTesting(const CustomDataOp& other) const; HAS_SERIALIZATION_FUNCTIONS(); // Stores user defined id as a placeholder op. @@ -452,7 +433,7 @@ SkCanvas* canvas, const PlaybackParams& params); bool IsValid() const { return IsValidDrawColorSkBlendMode(mode); } - static bool AreEqual(const PaintOp* left, const PaintOp* right); + bool EqualsForTesting(const DrawColorOp& other) const; HAS_SERIALIZATION_FUNCTIONS(); SkColor4f color; @@ -479,7 +460,7 @@ bool IsValid() const { return flags.IsValid() && outer.isValid() && inner.isValid(); } - static bool AreEqual(const PaintOp* left, const PaintOp* right); + bool EqualsForTesting(const DrawDRRectOp& other) const; HAS_SERIALIZATION_FUNCTIONS(); SkRRect outer; @@ -510,7 +491,7 @@ return flags.IsValid() && SkScalarIsFinite(scale_adjustment.width()) && SkScalarIsFinite(scale_adjustment.height()); } - static bool AreEqual(const PaintOp* left, const PaintOp* right); + bool EqualsForTesting(const DrawImageOp& other) const; bool HasDiscardableImages() const; bool HasNonAAPaint() const { return false; } HAS_SERIALIZATION_FUNCTIONS(); @@ -554,7 +535,7 @@ SkScalarIsFinite(scale_adjustment.width()) && SkScalarIsFinite(scale_adjustment.height()); } - static bool AreEqual(const PaintOp* left, const PaintOp* right); + bool EqualsForTesting(const DrawImageRectOp& other) const; bool HasDiscardableImages() const; HAS_SERIALIZATION_FUNCTIONS(); @@ -585,7 +566,7 @@ SkCanvas* canvas, const PlaybackParams& params); bool IsValid() const { return flags.IsValid(); } - static bool AreEqual(const PaintOp* left, const PaintOp* right); + bool EqualsForTesting(const DrawIRectOp& other) const; bool HasNonAAPaint() const { return false; } HAS_SERIALIZATION_FUNCTIONS(); @@ -612,7 +593,7 @@ SkCanvas* canvas, const PlaybackParams& params); bool IsValid() const { return flags.IsValid(); } - static bool AreEqual(const PaintOp* left, const PaintOp* right); + bool EqualsForTesting(const DrawLineOp& other) const; HAS_SERIALIZATION_FUNCTIONS(); int CountSlowPaths() const; @@ -642,7 +623,7 @@ // Reproduce SkRRect::isValid without converting. return flags.IsValid() && oval.isFinite() && oval.isSorted(); } - static bool AreEqual(const PaintOp* left, const PaintOp* right); + bool EqualsForTesting(const DrawOvalOp& other) const; HAS_SERIALIZATION_FUNCTIONS(); SkRect oval; @@ -669,7 +650,7 @@ SkCanvas* canvas, const PlaybackParams& params); bool IsValid() const { return flags.IsValid() && IsValidPath(path); } - static bool AreEqual(const PaintOp* left, const PaintOp* right); + bool EqualsForTesting(const DrawPathOp& other) const; int CountSlowPaths() const; HAS_SERIALIZATION_FUNCTIONS(); @@ -680,7 +661,7 @@ // serialize/deserialize this value and set it on the SkPath before handing it // to Skia. uint8_t sk_path_fill_type; - UsePaintCache use_cache; + UsePaintCache use_cache = UsePaintCache::kDisabled; private: DrawPathOp() : PaintOpWithFlags(kType) {} @@ -698,7 +679,7 @@ SkCanvas* canvas, const PlaybackParams& params); bool IsValid() const { return true; } - static bool AreEqual(const PaintOp* left, const PaintOp* right); + bool EqualsForTesting(const DrawRecordOp& other) const; size_t AdditionalBytesUsed() const; size_t AdditionalOpCount() const; bool HasDiscardableImages() const; @@ -726,7 +707,7 @@ SkCanvas* canvas, const PlaybackParams& params); bool IsValid() const { return flags.IsValid() && rect.isFinite(); } - static bool AreEqual(const PaintOp* left, const PaintOp* right); + bool EqualsForTesting(const DrawRectOp& other) const; HAS_SERIALIZATION_FUNCTIONS(); SkRect rect; @@ -748,7 +729,7 @@ SkCanvas* canvas, const PlaybackParams& params); bool IsValid() const { return flags.IsValid() && rrect.isValid(); } - static bool AreEqual(const PaintOp* left, const PaintOp* right); + bool EqualsForTesting(const DrawRRectOp& other) const; HAS_SERIALIZATION_FUNCTIONS(); SkRRect rrect; @@ -777,7 +758,7 @@ return skottie && skottie->is_valid() && !dst.isEmpty() && t >= 0 && t <= 1.f; } - static bool AreEqual(const PaintOp* left, const PaintOp* right); + bool EqualsForTesting(const DrawSkottieOp& other) const; bool HasDiscardableImages() const; HAS_SERIALIZATION_FUNCTIONS(); @@ -830,7 +811,7 @@ const PlaybackParams& params); bool IsValid() const { return flags.IsValid(); } bool HasDrawTextOps() const { return true; } - static bool AreEqual(const PaintOp* left, const PaintOp* right); + bool EqualsForTesting(const DrawTextBlobOp& other) const; HAS_SERIALIZATION_FUNCTIONS(); sk_sp<SkTextBlob> blob; @@ -855,7 +836,7 @@ SkCanvas* canvas, const PlaybackParams& params) {} bool IsValid() const { return true; } - static bool AreEqual(const PaintOp* left, const PaintOp* right); + bool EqualsForTesting(const NoopOp& other) const; HAS_SERIALIZATION_FUNCTIONS(); }; @@ -869,7 +850,7 @@ SkCanvas* canvas, const PlaybackParams& params); bool IsValid() const { return true; } - static bool AreEqual(const PaintOp* left, const PaintOp* right); + bool EqualsForTesting(const RestoreOp& other) const; HAS_SERIALIZATION_FUNCTIONS(); }; @@ -883,7 +864,7 @@ SkCanvas* canvas, const PlaybackParams& params); bool IsValid() const { return true; } - static bool AreEqual(const PaintOp* left, const PaintOp* right); + bool EqualsForTesting(const RotateOp& other) const; HAS_SERIALIZATION_FUNCTIONS(); SkScalar degrees; @@ -902,7 +883,7 @@ SkCanvas* canvas, const PlaybackParams& params); bool IsValid() const { return true; } - static bool AreEqual(const PaintOp* left, const PaintOp* right); + bool EqualsForTesting(const SaveOp& other) const; HAS_SERIALIZATION_FUNCTIONS(); }; @@ -920,7 +901,7 @@ SkCanvas* canvas, const PlaybackParams& params); bool IsValid() const { return flags.IsValid() && IsValidOrUnsetRect(bounds); } - static bool AreEqual(const PaintOp* left, const PaintOp* right); + bool EqualsForTesting(const SaveLayerOp& other) const; bool HasNonAAPaint() const { return false; } // We simply assume any effects (or even no effects -- just starting an empty // transparent layer) would break LCD text or be broken by the flags for @@ -950,7 +931,7 @@ SkCanvas* canvas, const PlaybackParams& params); bool IsValid() const { return IsValidOrUnsetRect(bounds); } - static bool AreEqual(const PaintOp* left, const PaintOp* right); + bool EqualsForTesting(const SaveLayerAlphaOp& other) const; bool HasSaveLayerOps() const { return true; } bool HasSaveLayerAlphaOps() const { return true; } HAS_SERIALIZATION_FUNCTIONS(); @@ -972,7 +953,7 @@ SkCanvas* canvas, const PlaybackParams& params); bool IsValid() const { return true; } - static bool AreEqual(const PaintOp* left, const PaintOp* right); + bool EqualsForTesting(const ScaleOp& other) const; HAS_SERIALIZATION_FUNCTIONS(); SkScalar sx; @@ -998,7 +979,7 @@ SkCanvas* canvas, const PlaybackParams& params); bool IsValid() const { return true; } - static bool AreEqual(const PaintOp* left, const PaintOp* right); + bool EqualsForTesting(const SetMatrixOp& other) const; HAS_SERIALIZATION_FUNCTIONS(); SkM44 matrix; @@ -1017,7 +998,7 @@ SkCanvas* canvas, const PlaybackParams& params); bool IsValid() const { return true; } - static bool AreEqual(const PaintOp* left, const PaintOp* right); + bool EqualsForTesting(const SetNodeIdOp& other) const; HAS_SERIALIZATION_FUNCTIONS(); int node_id; @@ -1036,7 +1017,7 @@ SkCanvas* canvas, const PlaybackParams& params); bool IsValid() const { return true; } - static bool AreEqual(const PaintOp* left, const PaintOp* right); + bool EqualsForTesting(const TranslateOp& other) const; HAS_SERIALIZATION_FUNCTIONS(); SkScalar dx;
diff --git a/cc/paint/paint_op_buffer.cc b/cc/paint/paint_op_buffer.cc index 6e3454d..8c3ee05f 100644 --- a/cc/paint/paint_op_buffer.cc +++ b/cc/paint/paint_op_buffer.cc
@@ -8,6 +8,7 @@ #include <utility> #include "base/notreached.h" +#include "base/ranges/algorithm.h" #include "base/types/optional_util.h" #include "cc/paint/paint_flags.h" #include "cc/paint/paint_image_builder.h" @@ -374,7 +375,7 @@ return ReallocBuffer(used_); } -bool PaintOpBuffer::operator==(const PaintOpBuffer& other) const { +bool PaintOpBuffer::EqualsForTesting(const PaintOpBuffer& other) const { // Check status fields first, which is faster than checking equality of // paint operations. This doesn't need to be complete, and should not check // data buffer capacity related fields because they don't affect equality. @@ -391,17 +392,10 @@ return false; } - Iterator left_iter(*this); - Iterator right_iter(other); - - for (; left_iter != left_iter.end(); ++left_iter, ++right_iter) { - if (*left_iter != *right_iter) - return false; - } - - DCHECK(left_iter == left_iter.end()); - DCHECK(right_iter == right_iter.end()); - return true; + return base::ranges::equal(*this, other, + [](const PaintOp& a, const PaintOp& b) { + return a.EqualsForTesting(b); // IN-TEST + }); } bool PaintOpBuffer::NeedsAdditionalInvalidationForLCDText(
diff --git a/cc/paint/paint_op_buffer.h b/cc/paint/paint_op_buffer.h index 4a3f01648..8e5758a 100644 --- a/cc/paint/paint_op_buffer.h +++ b/cc/paint/paint_op_buffer.h
@@ -238,10 +238,7 @@ // retains the original data buffer for future use. PaintRecord ReleaseAsRecord(); - bool operator==(const PaintOpBuffer& other) const; - bool operator!=(const PaintOpBuffer& other) const { - return !(*this == other); - } + bool EqualsForTesting(const PaintOpBuffer& other) const; const PaintOp& GetFirstOp() const { DCHECK(!empty());
diff --git a/cc/paint/paint_op_buffer_iterator.cc b/cc/paint/paint_op_buffer_iterator.cc index 0bf9eaa..c677840 100644 --- a/cc/paint/paint_op_buffer_iterator.cc +++ b/cc/paint/paint_op_buffer_iterator.cc
@@ -59,6 +59,9 @@ FindNextOp(); } +PaintOpBuffer::PlaybackFoldingIterator::PlaybackFoldingIterator( + const PlaybackFoldingIterator&) = default; + PaintOpBuffer::PlaybackFoldingIterator::~PlaybackFoldingIterator() = default; void PaintOpBuffer::PlaybackFoldingIterator::FindNextOp() {
diff --git a/cc/paint/paint_op_buffer_iterator.h b/cc/paint/paint_op_buffer_iterator.h index 11ee659..750e78c 100644 --- a/cc/paint/paint_op_buffer_iterator.h +++ b/cc/paint/paint_op_buffer_iterator.h
@@ -5,6 +5,7 @@ #ifndef CC_PAINT_PAINT_OP_BUFFER_ITERATOR_H_ #define CC_PAINT_PAINT_OP_BUFFER_ITERATOR_H_ +#include <iterator> #include <utility> #include <vector> @@ -13,9 +14,18 @@ namespace cc { -class CC_PAINT_EXPORT PaintOpBuffer::Iterator { +class PaintOpBufferIteratorBase { public: using value_type = PaintOp; + using difference_type = std::ptrdiff_t; + using pointer = value_type*; + using reference = value_type&; + using iterator_category = std::forward_iterator_tag; +}; + +class CC_PAINT_EXPORT PaintOpBuffer::Iterator + : public PaintOpBufferIteratorBase { + public: explicit Iterator(const PaintOpBuffer& buffer) : Iterator(buffer, buffer.data_.get(), 0u) {} @@ -42,6 +52,11 @@ CHECK_LE(op_offset_, buffer_->used_); return *this; } + Iterator operator++(int) { + Iterator original = *this; + operator++(); + return original; + } explicit operator bool() const { return op_offset_ < buffer_->used_; } private: @@ -56,9 +71,9 @@ size_t op_offset_ = 0; }; -class CC_PAINT_EXPORT PaintOpBuffer::OffsetIterator { +class CC_PAINT_EXPORT PaintOpBuffer::OffsetIterator + : public PaintOpBufferIteratorBase { public: - using value_type = PaintOp; // Offsets and paint op buffer must come from the same DisplayItemList. OffsetIterator(const PaintOpBuffer& buffer, const std::vector<size_t>& offsets) @@ -108,6 +123,11 @@ static_cast<uint32_t>(PaintOpType::LastPaintOpType)); return *this; } + OffsetIterator operator++(int) { + OffsetIterator original = *this; + operator++(); + return original; + } explicit operator bool() const { return op_offset_ < buffer_->used_; } @@ -132,9 +152,9 @@ size_t offsets_index_ = 0; }; -class CC_PAINT_EXPORT PaintOpBuffer::CompositeIterator { +class CC_PAINT_EXPORT PaintOpBuffer::CompositeIterator + : public PaintOpBufferIteratorBase { public: - using value_type = PaintOp; // Offsets and paint op buffer must come from the same DisplayItemList. CompositeIterator(const PaintOpBuffer& buffer, const std::vector<size_t>* offsets); @@ -166,6 +186,11 @@ absl::visit([](auto& iter) { ++iter; }, iter_); return *this; } + CompositeIterator operator++(int) { + CompositeIterator original = *this; + operator++(); + return original; + } explicit operator bool() const { return absl::visit([](const auto& iter) { return !!iter; }, iter_); } @@ -177,10 +202,12 @@ absl::variant<Iterator, OffsetIterator> iter_; }; -class CC_PAINT_EXPORT PaintOpBuffer::PlaybackFoldingIterator { +class CC_PAINT_EXPORT PaintOpBuffer::PlaybackFoldingIterator + : public PaintOpBufferIteratorBase { public: PlaybackFoldingIterator(const PaintOpBuffer& buffer, const std::vector<size_t>* offsets); + PlaybackFoldingIterator(const PlaybackFoldingIterator& other); ~PlaybackFoldingIterator(); const PaintOp* get() const { return current_op_; } @@ -191,6 +218,11 @@ FindNextOp(); return *this; } + PlaybackFoldingIterator operator++(int) { + PlaybackFoldingIterator original = *this; + operator++(); + return original; + } explicit operator bool() const { return !!current_op_; }
diff --git a/cc/paint/paint_op_buffer_unittest.cc b/cc/paint/paint_op_buffer_unittest.cc index 3f4e3b2..94a327c 100644 --- a/cc/paint/paint_op_buffer_unittest.cc +++ b/cc/paint/paint_op_buffer_unittest.cc
@@ -218,7 +218,7 @@ // Should be possible to reappend to the original and get the same result. PushOps(&original); VerifyOps(&original); - EXPECT_EQ(original, destination); + EXPECT_TRUE(original.EqualsForTesting(destination)); } TEST_F(PaintOpAppendTest, MoveThenReappendOperatorEq) { @@ -231,7 +231,7 @@ // Should be possible to reappend to the original and get the same result. PushOps(&original); VerifyOps(&original); - EXPECT_EQ(original, destination); + EXPECT_TRUE(original.EqualsForTesting(destination)); } // Verify that a SaveLayerAlpha / Draw / Restore can be optimized to just @@ -1939,10 +1939,8 @@ for (const PaintOp& base_written : DeserializerIterator( output_.get(), serializer.TotalBytesWritten(), serializer.options_provider()->deserialize_options())) { - SCOPED_TRACE(base::StringPrintf( - "%s #%zu", PaintOpTypeToString(GetParamType()).c_str(), i)); ASSERT_TRUE(iter); - EXPECT_EQ(*iter, base_written); + EXPECT_THAT(base_written, PaintOpEq(std::ref(*iter))) << "i: " << i; ++iter; ++i; } @@ -2110,7 +2108,7 @@ output_.get(), bytes_written, deserialized.get(), deserialized_size, &bytes_read, options_provider.deserialize_options()); ASSERT_TRUE(written) << PaintOpTypeToString(GetParamType()); - EXPECT_EQ(op, *written); + EXPECT_THAT(op, PaintOpEq<const PaintOp&>(*written)); written->DestroyThis(); written = nullptr; @@ -2720,7 +2718,7 @@ } MATCHER_P(MatchesPaintImage, paint_image, "") { - return arg.paint_image() == paint_image; + return arg.paint_image().IsSameForTesting(paint_image); } MATCHER_P2(MatchesRect, rect, scale, "") { @@ -3208,7 +3206,7 @@ EXPECT_THAT(actual.record(), PaintOpsAreEq(ScaleOp(scale_x, scale_y))); } } else { - EXPECT_TRUE(*filter == *deserialized_filter); + EXPECT_TRUE(filter->EqualsForTesting(*deserialized_filter)); } } } @@ -3480,7 +3478,8 @@ PaintOpBuffer buffer2; buffer2.push<CustomDataOp>(1234u); - EXPECT_EQ(new_buffer.GetFirstOp(), buffer2.GetFirstOp()); + EXPECT_THAT(new_buffer.GetFirstOp(), + PaintOpEq(std::ref(buffer2.GetFirstOp()))); } // Push and verify. @@ -3526,7 +3525,7 @@ options_provider.deserialize_options(), enable_security_constraints); reader.Read(&out_filter); - EXPECT_TRUE(*filter == *out_filter); + EXPECT_TRUE(filter->EqualsForTesting(*out_filter)); } TEST(PaintOpBufferTest, DrawImageRectSerializeScaledImages) { @@ -3911,9 +3910,7 @@ PlaybackParams params(nullptr, original_ctm); SetMatrixOp op(matrix); SetMatrixOp::Raster(&op, canvas, params); - - EXPECT_TRUE(AnnotateOp::AreSkM44sEqual(canvas->getLocalToDevice(), - SkM44(original_ctm, matrix))); + EXPECT_TRUE(canvas->getLocalToDevice() == SkM44(original_ctm, matrix)); } } }
diff --git a/cc/paint/paint_op_helper_unittest.cc b/cc/paint/paint_op_helper_unittest.cc index da02eaeb..262d6b4 100644 --- a/cc/paint/paint_op_helper_unittest.cc +++ b/cc/paint/paint_op_helper_unittest.cc
@@ -14,7 +14,7 @@ TEST(PaintOpHelper, AnnotateToString) { AnnotateOp op(PaintCanvas::AnnotationType::URL, SkRect::MakeXYWH(1, 2, 3, 4), nullptr); - std::string str = PaintOpHelper::ToString(&op); + std::string str = PaintOpHelper::ToString(op); EXPECT_EQ(str, "AnnotateOp(type=URL, rect=[1.000,2.000 3.000x4.000], data=(nil))"); } @@ -22,7 +22,7 @@ TEST(PaintOpHelper, ClipPathToString) { ClipPathOp op(SkPath(), SkClipOp::kDifference, true, UsePaintCache::kDisabled); - std::string str = PaintOpHelper::ToString(&op); + std::string str = PaintOpHelper::ToString(op); EXPECT_EQ(str, "ClipPathOp(path=<SkPath>, op=kDifference, antialias=true, " "use_cache=false)"); @@ -31,7 +31,7 @@ TEST(PaintOpHelper, ClipRectToString) { ClipRectOp op(SkRect::MakeXYWH(10.1f, 20.2f, 30.3f, 40.4f), SkClipOp::kIntersect, false); - std::string str = PaintOpHelper::ToString(&op); + std::string str = PaintOpHelper::ToString(op); EXPECT_EQ(str, "ClipRectOp(rect=[10.100,20.200 30.300x40.400], op=kIntersect, " "antialias=false)"); @@ -40,7 +40,7 @@ TEST(PaintOpHelper, ClipRRectToString) { ClipRRectOp op(SkRRect::MakeRect(SkRect::MakeXYWH(1, 2, 3, 4)), SkClipOp::kDifference, false); - std::string str = PaintOpHelper::ToString(&op); + std::string str = PaintOpHelper::ToString(op); EXPECT_EQ(str, "ClipRRectOp(rrect=[bounded by 1.000,2.000 3.000x4.000], " "op=kDifference, antialias=false)"); @@ -48,7 +48,7 @@ TEST(PaintOpHelper, ConcatToString) { ConcatOp op(SkM44(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16)); - std::string str = PaintOpHelper::ToString(&op); + std::string str = PaintOpHelper::ToString(op); EXPECT_EQ(str, "ConcatOp(matrix=[ 1.0000 2.0000 3.0000 4.0000][ 5.0000 " "6.0000 7.0000 8.0000][ 9.0000 10.0000 11.0000 12.0000][ " @@ -57,7 +57,7 @@ TEST(PaintOpHelper, DrawColorToString) { DrawColorOp op({0.1, 0.2, 0.3, 0.4}, SkBlendMode::kSrc); - std::string str = PaintOpHelper::ToString(&op); + std::string str = PaintOpHelper::ToString(op); EXPECT_EQ(str, "DrawColorOp(color=rgba(0.100000, 0.200000, 0.300000, 0.400000), " "mode=kSrc)"); @@ -67,7 +67,7 @@ DrawDRRectOp op(SkRRect::MakeRect(SkRect::MakeXYWH(1, 2, 3, 4)), SkRRect::MakeRect(SkRect::MakeXYWH(5, 6, 7, 8)), PaintFlags()); - std::string str = PaintOpHelper::ToString(&op); + std::string str = PaintOpHelper::ToString(op); EXPECT_EQ( str, "DrawDRRectOp(outer=[bounded by 1.000,2.000 3.000x4.000], inner=[bounded " @@ -83,7 +83,7 @@ TEST(PaintOpHelper, DrawImageToString) { DrawImageOp op(PaintImage(), 10.5f, 20.3f); - std::string str = PaintOpHelper::ToString(&op); + std::string str = PaintOpHelper::ToString(op); EXPECT_EQ( str, "DrawImageOp(image=<paint image>, left=10.500, top=20.300, " @@ -100,7 +100,7 @@ DrawImageRectOp op(PaintImage(), SkRect::MakeXYWH(1, 2, 3, 4), SkRect::MakeXYWH(5, 6, 7, 8), SkCanvas::kStrict_SrcRectConstraint); - std::string str = PaintOpHelper::ToString(&op); + std::string str = PaintOpHelper::ToString(op); EXPECT_EQ( str, "DrawImageRectOp(image=<paint image>, src=[1.000,2.000 3.000x4.000], " @@ -116,7 +116,7 @@ TEST(PaintOpHelper, DrawIRectToString) { DrawIRectOp op(SkIRect::MakeXYWH(1, 2, 3, 4), PaintFlags()); - std::string str = PaintOpHelper::ToString(&op); + std::string str = PaintOpHelper::ToString(op); EXPECT_EQ(str, "DrawIRectOp(rect=[1,2 3x4], flags=[color=rgba(0, 0, 0, 255), " "blendMode=kSrcOver, isAntiAlias=false, isDither=false, " @@ -131,7 +131,7 @@ TEST(PaintOpHelper, DrawLineToString) { DrawLineOp op(1.1f, 2.2f, 3.3f, 4.4f, PaintFlags()); - std::string str = PaintOpHelper::ToString(&op); + std::string str = PaintOpHelper::ToString(op); EXPECT_EQ( str, "DrawLineOp(x0=1.100, y0=2.200, x1=3.300, y1=4.400, flags=[color=rgba(0, " @@ -146,7 +146,7 @@ TEST(PaintOpHelper, DrawOvalToString) { DrawOvalOp op(SkRect::MakeXYWH(100, 200, 300, 400), PaintFlags()); - std::string str = PaintOpHelper::ToString(&op); + std::string str = PaintOpHelper::ToString(op); EXPECT_EQ( str, "DrawOvalOp(oval=[100.000,200.000 300.000x400.000], flags=[color=rgba(0, " @@ -162,7 +162,7 @@ TEST(PaintOpHelper, DrawPathToString) { SkPath path; DrawPathOp op(path, PaintFlags(), UsePaintCache::kDisabled); - std::string str = PaintOpHelper::ToString(&op); + std::string str = PaintOpHelper::ToString(op); EXPECT_EQ(str, "DrawPathOp(path=<SkPath>, flags=[color=rgba(0, 0, 0, 255), " "blendMode=kSrcOver, isAntiAlias=false, isDither=false, " @@ -177,13 +177,13 @@ TEST(PaintOpHelper, DrawRecordToString) { DrawRecordOp op((PaintRecord())); - std::string str = PaintOpHelper::ToString(&op); + std::string str = PaintOpHelper::ToString(op); EXPECT_EQ(str, "DrawRecordOp(record=(empty))"); } TEST(PaintOpHelper, DrawRectToString) { DrawRectOp op(SkRect::MakeXYWH(-1, -2, -3, -4), PaintFlags()); - std::string str = PaintOpHelper::ToString(&op); + std::string str = PaintOpHelper::ToString(op); EXPECT_EQ( str, "DrawRectOp(rect=[-1.000,-2.000 -3.000x-4.000], flags=[color=rgba(0, 0, " @@ -199,7 +199,7 @@ TEST(PaintOpHelper, DrawRRectToString) { DrawRRectOp op(SkRRect::MakeRect(SkRect::MakeXYWH(-1, -2, 3, 4)), PaintFlags()); - std::string str = PaintOpHelper::ToString(&op); + std::string str = PaintOpHelper::ToString(op); EXPECT_EQ( str, "DrawRRectOp(rrect=[bounded by -1.000,-2.000 3.000x4.000], " @@ -214,7 +214,7 @@ TEST(PaintOpHelper, DrawTextBlobToString) { DrawTextBlobOp op(nullptr, 100, -222, PaintFlags()); - std::string str = PaintOpHelper::ToString(&op); + std::string str = PaintOpHelper::ToString(op); EXPECT_EQ( str, "DrawTextBlobOp(blob=(nil), x=100.000, y=-222.000, flags=[color=rgba(0, " @@ -229,31 +229,31 @@ TEST(PaintOpHelper, NoopToString) { NoopOp op; - std::string str = PaintOpHelper::ToString(&op); + std::string str = PaintOpHelper::ToString(op); EXPECT_EQ(str, "NoopOp()"); } TEST(PaintOpHelper, RestoreToString) { RestoreOp op; - std::string str = PaintOpHelper::ToString(&op); + std::string str = PaintOpHelper::ToString(op); EXPECT_EQ(str, "RestoreOp()"); } TEST(PaintOpHelper, RotateToString) { RotateOp op(360); - std::string str = PaintOpHelper::ToString(&op); + std::string str = PaintOpHelper::ToString(op); EXPECT_EQ(str, "RotateOp(degrees=360.000)"); } TEST(PaintOpHelper, SaveToString) { SaveOp op; - std::string str = PaintOpHelper::ToString(&op); + std::string str = PaintOpHelper::ToString(op); EXPECT_EQ(str, "SaveOp()"); } TEST(PaintOpHelper, SaveLayerToString) { SaveLayerOp op(SkRect::MakeXYWH(1, 2, 3, 4), PaintFlags()); - std::string str = PaintOpHelper::ToString(&op); + std::string str = PaintOpHelper::ToString(op); EXPECT_EQ( str, "SaveLayerOp(bounds=[1.000,2.000 3.000x4.000], flags=[color=rgba(0, 0, " @@ -268,20 +268,20 @@ TEST(PaintOpHelper, SaveLayerAlphaToString) { SaveLayerAlphaOp op(SkRect::MakeXYWH(1, 2, 3, 4), 1.0f); - std::string str = PaintOpHelper::ToString(&op); + std::string str = PaintOpHelper::ToString(op); EXPECT_EQ(str, "SaveLayerAlphaOp(bounds=[1.000,2.000 3.000x4.000], alpha=255)"); } TEST(PaintOpHelper, ScaleToString) { ScaleOp op(12, 13.9f); - std::string str = PaintOpHelper::ToString(&op); + std::string str = PaintOpHelper::ToString(op); EXPECT_EQ(str, "ScaleOp(sx=12.000, sy=13.900)"); } TEST(PaintOpHelper, SetMatrixToString) { SetMatrixOp op(SkM44(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16)); - std::string str = PaintOpHelper::ToString(&op); + std::string str = PaintOpHelper::ToString(op); EXPECT_EQ(str, "SetMatrixOp(matrix=[ 1.0000 2.0000 3.0000 4.0000][ 5.0000 " " 6.0000 7.0000 8.0000][ 9.0000 10.0000 11.0000 12.0000][ " @@ -290,7 +290,7 @@ TEST(PaintOpHelper, TranslateToString) { TranslateOp op(0, 0); - std::string str = PaintOpHelper::ToString(&op); + std::string str = PaintOpHelper::ToString(op); EXPECT_EQ(str, "TranslateOp(dx=0.000, dy=0.000)"); }
diff --git a/cc/paint/paint_record.h b/cc/paint/paint_record.h index b4d7b31..0722197 100644 --- a/cc/paint/paint_record.h +++ b/cc/paint/paint_record.h
@@ -30,11 +30,9 @@ PaintRecord(const PaintRecord&); PaintRecord& operator=(const PaintRecord&); - bool operator==(const PaintRecord& other) const { - return buffer_ == other.buffer_ || - (buffer_ && other.buffer_ && *buffer_ == *other.buffer_); + bool EqualsForTesting(const PaintRecord& other) const { + return buffer_->EqualsForTesting(*other.buffer_); } - bool operator!=(const PaintRecord& other) const { return !(*this == other); } const PaintOpBuffer& buffer() const { return *buffer_; }
diff --git a/cc/paint/paint_shader.cc b/cc/paint/paint_shader.cc index d1a5d9a..94416bb6 100644 --- a/cc/paint/paint_shader.cc +++ b/cc/paint/paint_shader.cc
@@ -35,23 +35,25 @@ return recorder.finishRecordingAsPicture(); } -bool CompareMatrices(const SkMatrix& a, - const SkMatrix& b, - bool ignore_scaling_differences) { - if (!ignore_scaling_differences) - return PaintOp::AreSkMatricesEqual(a, b); +bool CompareMatricesForTesting(const SkMatrix& a, // IN-TEST + const SkMatrix& b, + bool ignore_scaling_differences) { + if (!ignore_scaling_differences) { + return a == b; + } SkSize scale; SkMatrix a_without_scale; SkMatrix b_without_scale; const bool decomposes = a.decomposeScale(&scale, &a_without_scale); - if (decomposes != b.decomposeScale(&scale, &b_without_scale)) + if (decomposes != b.decomposeScale(&scale, &b_without_scale)) { return false; - - if (!decomposes) + } + if (!decomposes) { return true; - return PaintOp::AreSkMatricesEqual(a_without_scale, b_without_scale); + } + return a_without_scale == b_without_scale; } } // namespace @@ -583,7 +585,7 @@ return false; } -bool PaintShader::operator==(const PaintShader& other) const { +bool PaintShader::EqualsForTesting(const PaintShader& other) const { if (shader_type_ != other.shader_type_) return false; @@ -596,23 +598,19 @@ const SkMatrix& local_matrix = local_matrix_ ? *local_matrix_ : SkMatrix::I(); const SkMatrix& other_local_matrix = other.local_matrix_ ? *other.local_matrix_ : SkMatrix::I(); - if (!CompareMatrices(local_matrix, other_local_matrix, - ignore_scaling_differences)) { + if (!CompareMatricesForTesting(local_matrix, other_local_matrix, // IN-TEST + ignore_scaling_differences)) { return false; } - if (fallback_color_ != other.fallback_color_) + if (fallback_color_ != other.fallback_color_ || flags_ != other.flags_ || + tx_ != other.tx_ || ty_ != other.ty_) { return false; - if (flags_ != other.flags_) - return false; - if (tx_ != other.tx_) - return false; - if (ty_ != other.ty_) - return false; - + } if (!ignore_scaling_differences && - scaling_behavior_ != other.scaling_behavior_) + scaling_behavior_ != other.scaling_behavior_) { return false; + } // Variables that only some shaders use. switch (shader_type_) { @@ -620,31 +618,20 @@ case Type::kColor: break; case Type::kSweepGradient: - if (!PaintOp::AreEqualEvenIfNaN(start_degrees_, other.start_degrees_)) + if (start_degrees_ != other.start_degrees_ || + end_degrees_ != other.end_degrees_) { return false; - if (!PaintOp::AreEqualEvenIfNaN(end_degrees_, other.end_degrees_)) - return false; + } [[fallthrough]]; case Type::kLinearGradient: case Type::kRadialGradient: case Type::kTwoPointConicalGradient: - if (!PaintOp::AreEqualEvenIfNaN(start_radius_, other.start_radius_)) + if (start_radius_ != other.start_radius_ || + end_radius_ != other.end_radius_ || center_ != other.center_ || + start_point_ != other.start_point_ || + end_point_ != other.end_point_ || colors_ != other.colors_ || + positions_ != other.positions_) { return false; - if (!PaintOp::AreEqualEvenIfNaN(end_radius_, other.end_radius_)) - return false; - if (!PaintOp::AreSkPointsEqual(center_, other.center_)) - return false; - if (!PaintOp::AreSkPointsEqual(start_point_, other.start_point_)) - return false; - if (!PaintOp::AreSkPointsEqual(end_point_, other.end_point_)) - return false; - if (colors_ != other.colors_) - return false; - if (positions_.size() != other.positions_.size()) - return false; - for (size_t i = 0; i < positions_.size(); ++i) { - if (!PaintOp::AreEqualEvenIfNaN(positions_[i], other.positions_[i])) - return false; } break; case Type::kImage:
diff --git a/cc/paint/paint_shader.h b/cc/paint/paint_shader.h index 14c53afd..8b0fbfc 100644 --- a/cc/paint/paint_shader.h +++ b/cc/paint/paint_shader.h
@@ -170,8 +170,7 @@ // shader is correct is hard. bool IsValid() const; - bool operator==(const PaintShader& other) const; - bool operator!=(const PaintShader& other) const { return !(*this == other); } + bool EqualsForTesting(const PaintShader& other) const; RecordShaderId paint_record_shader_id() const { DCHECK(id_ == kInvalidRecordShaderId || shader_type_ == Type::kPaintRecord);
diff --git a/cc/paint/paint_shader_unittest.cc b/cc/paint/paint_shader_unittest.cc index cddbe2c..3a9fbd2 100644 --- a/cc/paint/paint_shader_unittest.cc +++ b/cc/paint/paint_shader_unittest.cc
@@ -113,7 +113,8 @@ surface->getCanvas()->drawPaint(canvas.paint_); // Using the shader requests decode for images at the correct scale. - EXPECT_EQ(image_provider.draw_image().paint_image(), paint_image); + EXPECT_TRUE( + image_provider.draw_image().paint_image().IsSameForTesting(paint_image)); EXPECT_EQ(image_provider.draw_image().scale().width(), 0.25f); EXPECT_EQ(image_provider.draw_image().scale().height(), 0.25f); }
diff --git a/cc/paint/skottie_frame_data.cc b/cc/paint/skottie_frame_data.cc deleted file mode 100644 index 087805b..0000000 --- a/cc/paint/skottie_frame_data.cc +++ /dev/null
@@ -1,14 +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. - -#include "cc/paint/skottie_frame_data.h" - -namespace cc { - -bool operator==(const SkottieFrameData& frame_l, - const SkottieFrameData& frame_r) { - return frame_l.image == frame_r.image && frame_l.quality == frame_r.quality; -} - -} // namespace cc
diff --git a/cc/paint/skottie_frame_data.h b/cc/paint/skottie_frame_data.h index 295e2c8a8..ca8300e 100644 --- a/cc/paint/skottie_frame_data.h +++ b/cc/paint/skottie_frame_data.h
@@ -31,9 +31,6 @@ PaintFlags::FilterQuality quality = PaintFlags::FilterQuality::kLow; }; -CC_PAINT_EXPORT bool operator==(const SkottieFrameData& frame_l, - const SkottieFrameData& frame_r); - // Map from asset id to the image to use for that asset. using SkottieFrameDataMap = base::flat_map<SkottieResourceIdHash, SkottieFrameData>;
diff --git a/cc/paint/skottie_serialization_history_unittest.cc b/cc/paint/skottie_serialization_history_unittest.cc index 6aa58ef..2f3f59e 100644 --- a/cc/paint/skottie_serialization_history_unittest.cc +++ b/cc/paint/skottie_serialization_history_unittest.cc
@@ -12,6 +12,7 @@ #include "cc/paint/skottie_text_property_value.h" #include "cc/paint/skottie_wrapper.h" #include "cc/test/lottie_test_data.h" +#include "cc/test/paint_image_matchers.h" #include "cc/test/skia_common.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" @@ -52,14 +53,11 @@ {image_2, PaintFlags::FilterQuality::kMedium}}, }; history_.FilterNewSkottieFrameState(*skottie, images, empty_text_map); - EXPECT_THAT( - images, - UnorderedElementsAre( - Pair(HashSkottieResourceId("asset_a"), - SkottieFrameData({image_1, PaintFlags::FilterQuality::kMedium})), - Pair(HashSkottieResourceId("asset_b"), - SkottieFrameData( - {image_2, PaintFlags::FilterQuality::kMedium})))); + EXPECT_THAT(images, UnorderedElementsAre( + SkottieImageIs("asset_a", image_1, + PaintFlags::FilterQuality::kMedium), + SkottieImageIs("asset_b", image_2, + PaintFlags::FilterQuality::kMedium))); images = { {HashSkottieResourceId("asset_a"), @@ -68,11 +66,9 @@ {image_2, PaintFlags::FilterQuality::kMedium}}, }; history_.FilterNewSkottieFrameState(*skottie, images, empty_text_map); - EXPECT_THAT( - images, - UnorderedElementsAre(Pair( - HashSkottieResourceId("asset_a"), - SkottieFrameData({image_3, PaintFlags::FilterQuality::kMedium})))); + EXPECT_THAT(images, + UnorderedElementsAre(SkottieImageIs( + "asset_a", image_3, PaintFlags::FilterQuality::kMedium))); images = { {HashSkottieResourceId("asset_a"), @@ -81,11 +77,9 @@ {image_4, PaintFlags::FilterQuality::kMedium}}, }; history_.FilterNewSkottieFrameState(*skottie, images, empty_text_map); - EXPECT_THAT( - images, - UnorderedElementsAre(Pair( - HashSkottieResourceId("asset_b"), - SkottieFrameData({image_4, PaintFlags::FilterQuality::kMedium})))); + EXPECT_THAT(images, + UnorderedElementsAre(SkottieImageIs( + "asset_b", image_4, PaintFlags::FilterQuality::kMedium))); history_.FilterNewSkottieFrameState(*skottie, images, empty_text_map); EXPECT_THAT(images, IsEmpty()); @@ -106,29 +100,23 @@ {image_2, PaintFlags::FilterQuality::kMedium}}, }; history_.FilterNewSkottieFrameState(*skottie, images, empty_text_map); - EXPECT_THAT( - images, - Contains(Pair(HashSkottieResourceId("asset_a"), - SkottieFrameData( - {blank_image, PaintFlags::FilterQuality::kMedium})))); + EXPECT_THAT(images, + Contains(SkottieImageIs("asset_a", blank_image, + PaintFlags::FilterQuality::kMedium))); images = {{HashSkottieResourceId("asset_a"), {image_1, PaintFlags::FilterQuality::kMedium}}}; history_.FilterNewSkottieFrameState(*skottie, images, empty_text_map); - EXPECT_THAT( - images, - Contains(Pair( - HashSkottieResourceId("asset_a"), - SkottieFrameData({image_1, PaintFlags::FilterQuality::kMedium})))); + EXPECT_THAT(images, + Contains(SkottieImageIs("asset_a", image_1, + PaintFlags::FilterQuality::kMedium))); images = {{HashSkottieResourceId("asset_a"), {blank_image, PaintFlags::FilterQuality::kMedium}}}; history_.FilterNewSkottieFrameState(*skottie, images, empty_text_map); - EXPECT_THAT( - images, - Contains(Pair(HashSkottieResourceId("asset_a"), - SkottieFrameData( - {blank_image, PaintFlags::FilterQuality::kMedium})))); + EXPECT_THAT(images, + Contains(SkottieImageIs("asset_a", blank_image, + PaintFlags::FilterQuality::kMedium))); history_.FilterNewSkottieFrameState(*skottie, images, empty_text_map); EXPECT_THAT(images, IsEmpty()); @@ -144,13 +132,10 @@ SkottieTextPropertyValue("test_1b", gfx::RectF(2, 2, 2, 2))}, }; history_.FilterNewSkottieFrameState(*skottie, empty_images, text_map); - EXPECT_THAT( - text_map, - UnorderedElementsAre( - Pair(HashSkottieResourceId("node_a"), - SkottieTextPropertyValue("test_1a", gfx::RectF(1, 1, 1, 1))), - Pair(HashSkottieResourceId("node_b"), - SkottieTextPropertyValue("test_1b", gfx::RectF(2, 2, 2, 2))))); + EXPECT_THAT(text_map, + UnorderedElementsAre( + SkottieTextIs("node_a", "test_1a", gfx::RectF(1, 1, 1, 1)), + SkottieTextIs("node_b", "test_1b", gfx::RectF(2, 2, 2, 2)))); text_map = { {HashSkottieResourceId("node_a"), @@ -159,11 +144,8 @@ SkottieTextPropertyValue("test_1b", gfx::RectF(2, 2, 2, 2))}, }; history_.FilterNewSkottieFrameState(*skottie, empty_images, text_map); - EXPECT_THAT( - text_map, - UnorderedElementsAre( - Pair(HashSkottieResourceId("node_a"), - SkottieTextPropertyValue("test_2a", gfx::RectF(1, 1, 1, 1))))); + EXPECT_THAT(text_map, UnorderedElementsAre(SkottieTextIs( + "node_a", "test_2a", gfx::RectF(1, 1, 1, 1)))); text_map = { {HashSkottieResourceId("node_a"), @@ -172,11 +154,8 @@ SkottieTextPropertyValue("test_1b", gfx::RectF(2, 2, 2, 2))}, }; history_.FilterNewSkottieFrameState(*skottie, empty_images, text_map); - EXPECT_THAT( - text_map, - UnorderedElementsAre( - Pair(HashSkottieResourceId("node_a"), - SkottieTextPropertyValue("test_2a", gfx::RectF(3, 3, 3, 3))))); + EXPECT_THAT(text_map, UnorderedElementsAre(SkottieTextIs( + "node_a", "test_2a", gfx::RectF(3, 3, 3, 3)))); history_.FilterNewSkottieFrameState(*skottie, empty_images, text_map); EXPECT_THAT(text_map, IsEmpty()); @@ -204,11 +183,9 @@ {image_2, PaintFlags::FilterQuality::kMedium}}, }; history_.FilterNewSkottieFrameState(*skottie, images, empty_text_map); - EXPECT_THAT( - images, - UnorderedElementsAre( - Pair(HashSkottieResourceId("asset_a"), - SkottieFrameData({image_1, PaintFlags::FilterQuality::kHigh})))); + EXPECT_THAT(images, + UnorderedElementsAre(SkottieImageIs( + "asset_a", image_1, PaintFlags::FilterQuality::kHigh))); } TEST_F(SkottieSerializationHistoryTest, @@ -238,12 +215,10 @@ history_.FilterNewSkottieFrameState(*skottie_2, images_2, empty_text_map); EXPECT_THAT( images_2, - UnorderedElementsAre( - Pair(HashSkottieResourceId("asset_2a"), - SkottieFrameData({image_1, PaintFlags::FilterQuality::kMedium})), - Pair(HashSkottieResourceId("asset_2b"), - SkottieFrameData( - {image_2, PaintFlags::FilterQuality::kMedium})))); + UnorderedElementsAre(SkottieImageIs("asset_2a", image_1, + PaintFlags::FilterQuality::kMedium), + SkottieImageIs("asset_2b", image_2, + PaintFlags::FilterQuality::kMedium))); images_1 = { {HashSkottieResourceId("asset_1a"), @@ -259,11 +234,9 @@ }; history_.FilterNewSkottieFrameState(*skottie_1, images_1, empty_text_map); history_.FilterNewSkottieFrameState(*skottie_2, images_2, empty_text_map); - EXPECT_THAT( - images_2, - UnorderedElementsAre(Pair( - HashSkottieResourceId("asset_2a"), - SkottieFrameData({image_4, PaintFlags::FilterQuality::kMedium})))); + EXPECT_THAT(images_2, + UnorderedElementsAre(SkottieImageIs( + "asset_2a", image_4, PaintFlags::FilterQuality::kMedium))); } TEST_F(SkottieSerializationHistoryTest, RequestInactiveAnimationsPurge) { @@ -302,12 +275,10 @@ // History for |skottie_2| should start again. EXPECT_THAT( images_2, - UnorderedElementsAre( - Pair(HashSkottieResourceId("asset_2a"), - SkottieFrameData({image_1, PaintFlags::FilterQuality::kMedium})), - Pair(HashSkottieResourceId("asset_2b"), - SkottieFrameData( - {image_2, PaintFlags::FilterQuality::kMedium})))); + UnorderedElementsAre(SkottieImageIs("asset_2a", image_1, + PaintFlags::FilterQuality::kMedium), + SkottieImageIs("asset_2b", image_2, + PaintFlags::FilterQuality::kMedium))); } } // namespace
diff --git a/cc/raster/playback_image_provider_unittest.cc b/cc/raster/playback_image_provider_unittest.cc index a5e99eb..0250036a 100644 --- a/cc/raster/playback_image_provider_unittest.cc +++ b/cc/raster/playback_image_provider_unittest.cc
@@ -150,7 +150,7 @@ matrix); provider.GetRasterContent(draw_image); ASSERT_TRUE(cache.last_image().paint_image()); - ASSERT_EQ(cache.last_image().paint_image(), image); + ASSERT_TRUE(cache.last_image().paint_image().IsSameForTesting(image)); ASSERT_EQ(cache.last_image().frame_index(), 1u); }
diff --git a/cc/raster/raster_source_unittest.cc b/cc/raster/raster_source_unittest.cc index b3491f6..cfb38d2 100644 --- a/cc/raster/raster_source_unittest.cc +++ b/cc/raster/raster_source_unittest.cc
@@ -226,10 +226,11 @@ TargetColorParams target_color_params; std::vector<const DrawImage*> images; raster->GetDiscardableImagesInRect(gfx::Rect(0, 0, 256, 256), &images); - EXPECT_EQ(1u, images.size()); + ASSERT_EQ(1u, images.size()); DrawImage image(*images[0], 1.f, PaintImage::kDefaultFrameIndex, target_color_params); - EXPECT_EQ(discardable_image[0][0], images[0]->paint_image()); + EXPECT_TRUE( + discardable_image[0][0].IsSameForTesting(images[0]->paint_image())); EXPECT_EQ(target_color_params.color_space, image.target_color_space()); } // Shifted tile sized iterators. These should find only one pixel ref. @@ -238,10 +239,11 @@ target_color_params.color_space = gfx::ColorSpace::CreateXYZD50(); std::vector<const DrawImage*> images; raster->GetDiscardableImagesInRect(gfx::Rect(260, 260, 256, 256), &images); - EXPECT_EQ(1u, images.size()); + ASSERT_EQ(1u, images.size()); DrawImage image(*images[0], 1.f, PaintImage::kDefaultFrameIndex, target_color_params); - EXPECT_EQ(discardable_image[1][1], images[0]->paint_image()); + EXPECT_TRUE( + discardable_image[1][1].IsSameForTesting(images[0]->paint_image())); EXPECT_EQ(target_color_params.color_space, image.target_color_space()); } // Ensure there's no discardable pixel refs in the empty cell @@ -254,10 +256,13 @@ { std::vector<const DrawImage*> images; raster->GetDiscardableImagesInRect(gfx::Rect(0, 0, 512, 512), &images); - EXPECT_EQ(3u, images.size()); - EXPECT_EQ(discardable_image[0][0], images[0]->paint_image()); - EXPECT_EQ(discardable_image[0][1], images[1]->paint_image()); - EXPECT_EQ(discardable_image[1][1], images[2]->paint_image()); + ASSERT_EQ(3u, images.size()); + EXPECT_TRUE( + discardable_image[0][0].IsSameForTesting(images[0]->paint_image())); + EXPECT_TRUE( + discardable_image[0][1].IsSameForTesting(images[1]->paint_image())); + EXPECT_TRUE( + discardable_image[1][1].IsSameForTesting(images[2]->paint_image())); } }
diff --git a/cc/test/paint_image_matchers.h b/cc/test/paint_image_matchers.h new file mode 100644 index 0000000..cd2ebfd2 --- /dev/null +++ b/cc/test/paint_image_matchers.h
@@ -0,0 +1,63 @@ +// Copyright 2023 The Chromium Authors +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef CC_TEST_PAINT_IMAGE_MATCHERS_H_ +#define CC_TEST_PAINT_IMAGE_MATCHERS_H_ + +#include "cc/paint/paint_image.h" +#include "cc/paint/skottie_frame_data.h" +#include "cc/paint/skottie_resource_metadata.h" +#include "testing/gmock/include/gmock/gmock.h" + +namespace cc { + +// Checks `arg.IsSameForTesting(image)`. +// Mainly used in container matchers: +// std::vector<PaintImage> images; +// PaintImage image; +// EXPECT_THAT(images, Contains(ImageIsSame(image))); +MATCHER_P(ImageIsSame, image, "") { + return arg.IsSameForTesting(image); +} + +// Checks the values of `arg` (a 2-tuple) are the same image. Used by +// ImagesAreSame(). +MATCHER(TwoImagesAreSame, "") { + return std::get<0>(arg).IsSameForTesting(std::get<1>(arg)); +} + +// Checks two containers contain the same images (PaintImage or DrawImage) in +// the same order. +// Example use: +// std::vector<PaintImage> images1, images2; +// EXPECT_THAT(images1, ImagesAreSame(images2)); +template <typename Images> +auto ImagesAreSame(const Images& images) { + return ::testing::Pointwise(TwoImagesAreSame(), images); +} +template <typename Image> +auto ImagesAreSame(std::initializer_list<Image> list) { + return ::testing::Pointwise(TwoImagesAreSame(), list); +} + +MATCHER_P2(SkottieImageIs, resource_id, frame_data, "") { + return arg.first == HashSkottieResourceId(resource_id) && + arg.second.image.IsSameForTesting(frame_data.image) && + arg.second.quality == frame_data.quality; +} + +MATCHER_P3(SkottieImageIs, resource_id, image, quality, "") { + return arg.first == HashSkottieResourceId(resource_id) && + arg.second.image.IsSameForTesting(image) && + arg.second.quality == quality; +} + +MATCHER_P3(SkottieTextIs, resource_id, text, box, "") { + return arg.first == HashSkottieResourceId(resource_id) && + arg.second == SkottieTextPropertyValue(text, box); +} + +} // namespace cc + +#endif // CC_TEST_PAINT_IMAGE_MATCHERS_H_
diff --git a/cc/test/paint_op_helper.h b/cc/test/paint_op_helper.h index e4cbd2d..7b35dd75 100644 --- a/cc/test/paint_op_helper.h +++ b/cc/test/paint_op_helper.h
@@ -21,150 +21,147 @@ // implementation should be limited ot the header. class PaintOpHelper { public: - static std::string ToString(const PaintOp* base_op) { + static std::string ToString(const PaintOp& base_op) { std::ostringstream str; str << std::boolalpha; - switch (base_op->GetType()) { + switch (base_op.GetType()) { case PaintOpType::Annotate: { - const auto* op = static_cast<const AnnotateOp*>(base_op); + const auto& op = static_cast<const AnnotateOp&>(base_op); str << "AnnotateOp(type=" - << PaintOpHelper::EnumToString(op->annotation_type) - << ", rect=" << PaintOpHelper::SkiaTypeToString(op->rect) - << ", data=" << PaintOpHelper::SkiaTypeToString(op->data) << ")"; + << PaintOpHelper::EnumToString(op.annotation_type) + << ", rect=" << PaintOpHelper::SkiaTypeToString(op.rect) + << ", data=" << PaintOpHelper::SkiaTypeToString(op.data) << ")"; break; } case PaintOpType::ClipPath: { - const auto* op = static_cast<const ClipPathOp*>(base_op); - str << "ClipPathOp(path=" << PaintOpHelper::SkiaTypeToString(op->path) - << ", op=" << PaintOpHelper::SkiaTypeToString(op->op) - << ", antialias=" << op->antialias - << ", use_cache=" << (op->use_cache == UsePaintCache::kEnabled) + const auto& op = static_cast<const ClipPathOp&>(base_op); + str << "ClipPathOp(path=" << PaintOpHelper::SkiaTypeToString(op.path) + << ", op=" << PaintOpHelper::SkiaTypeToString(op.op) + << ", antialias=" << op.antialias + << ", use_cache=" << (op.use_cache == UsePaintCache::kEnabled) << ")"; break; } case PaintOpType::ClipRect: { - const auto* op = static_cast<const ClipRectOp*>(base_op); - str << "ClipRectOp(rect=" << PaintOpHelper::SkiaTypeToString(op->rect) - << ", op=" << PaintOpHelper::SkiaTypeToString(op->op) - << ", antialias=" << op->antialias << ")"; + const auto& op = static_cast<const ClipRectOp&>(base_op); + str << "ClipRectOp(rect=" << PaintOpHelper::SkiaTypeToString(op.rect) + << ", op=" << PaintOpHelper::SkiaTypeToString(op.op) + << ", antialias=" << op.antialias << ")"; break; } case PaintOpType::ClipRRect: { - const auto* op = static_cast<const ClipRRectOp*>(base_op); - str << "ClipRRectOp(rrect=" - << PaintOpHelper::SkiaTypeToString(op->rrect) - << ", op=" << PaintOpHelper::SkiaTypeToString(op->op) - << ", antialias=" << op->antialias << ")"; + const auto& op = static_cast<const ClipRRectOp&>(base_op); + str << "ClipRRectOp(rrect=" << PaintOpHelper::SkiaTypeToString(op.rrect) + << ", op=" << PaintOpHelper::SkiaTypeToString(op.op) + << ", antialias=" << op.antialias << ")"; break; } case PaintOpType::Concat: { - const auto* op = static_cast<const ConcatOp*>(base_op); - str << "ConcatOp(matrix=" << PaintOpHelper::SkiaTypeToString(op->matrix) + const auto& op = static_cast<const ConcatOp&>(base_op); + str << "ConcatOp(matrix=" << PaintOpHelper::SkiaTypeToString(op.matrix) << ")"; break; } case PaintOpType::CustomData: { - const auto* op = static_cast<const CustomDataOp*>(base_op); - str << "CustomDataOp(id=" << PaintOpHelper::SkiaTypeToString(op->id) + const auto& op = static_cast<const CustomDataOp&>(base_op); + str << "CustomDataOp(id=" << PaintOpHelper::SkiaTypeToString(op.id) << ")"; break; } case PaintOpType::DrawColor: { - const auto* op = static_cast<const DrawColorOp*>(base_op); - str << "DrawColorOp(color=" - << PaintOpHelper::SkiaTypeToString(op->color) - << ", mode=" << PaintOpHelper::SkiaTypeToString(op->mode) << ")"; + const auto& op = static_cast<const DrawColorOp&>(base_op); + str << "DrawColorOp(color=" << PaintOpHelper::SkiaTypeToString(op.color) + << ", mode=" << PaintOpHelper::SkiaTypeToString(op.mode) << ")"; break; } case PaintOpType::DrawDRRect: { - const auto* op = static_cast<const DrawDRRectOp*>(base_op); + const auto& op = static_cast<const DrawDRRectOp&>(base_op); str << "DrawDRRectOp(outer=" - << PaintOpHelper::SkiaTypeToString(op->outer) - << ", inner=" << PaintOpHelper::SkiaTypeToString(op->inner) - << ", flags=" << PaintOpHelper::FlagsToString(op->flags) << ")"; + << PaintOpHelper::SkiaTypeToString(op.outer) + << ", inner=" << PaintOpHelper::SkiaTypeToString(op.inner) + << ", flags=" << PaintOpHelper::FlagsToString(op.flags) << ")"; break; } case PaintOpType::DrawImage: { - const auto* op = static_cast<const DrawImageOp*>(base_op); - str << "DrawImageOp(image=" << PaintOpHelper::ImageToString(op->image) - << ", left=" << PaintOpHelper::SkiaTypeToString(op->left) - << ", top=" << PaintOpHelper::SkiaTypeToString(op->top) - << ", flags=" << PaintOpHelper::FlagsToString(op->flags) << ")"; + const auto& op = static_cast<const DrawImageOp&>(base_op); + str << "DrawImageOp(image=" << PaintOpHelper::ImageToString(op.image) + << ", left=" << PaintOpHelper::SkiaTypeToString(op.left) + << ", top=" << PaintOpHelper::SkiaTypeToString(op.top) + << ", flags=" << PaintOpHelper::FlagsToString(op.flags) << ")"; break; } case PaintOpType::DrawImageRect: { - const auto* op = static_cast<const DrawImageRectOp*>(base_op); + const auto& op = static_cast<const DrawImageRectOp&>(base_op); str << "DrawImageRectOp(image=" - << PaintOpHelper::ImageToString(op->image) - << ", src=" << PaintOpHelper::SkiaTypeToString(op->src) - << ", dst=" << PaintOpHelper::SkiaTypeToString(op->dst) - << ", constraint=" << PaintOpHelper::EnumToString(op->constraint) - << ", flags=" << PaintOpHelper::FlagsToString(op->flags) << ")"; + << PaintOpHelper::ImageToString(op.image) + << ", src=" << PaintOpHelper::SkiaTypeToString(op.src) + << ", dst=" << PaintOpHelper::SkiaTypeToString(op.dst) + << ", constraint=" << PaintOpHelper::EnumToString(op.constraint) + << ", flags=" << PaintOpHelper::FlagsToString(op.flags) << ")"; break; } case PaintOpType::DrawIRect: { - const auto* op = static_cast<const DrawIRectOp*>(base_op); - str << "DrawIRectOp(rect=" << PaintOpHelper::SkiaTypeToString(op->rect) - << ", flags=" << PaintOpHelper::FlagsToString(op->flags) << ")"; + const auto& op = static_cast<const DrawIRectOp&>(base_op); + str << "DrawIRectOp(rect=" << PaintOpHelper::SkiaTypeToString(op.rect) + << ", flags=" << PaintOpHelper::FlagsToString(op.flags) << ")"; break; } case PaintOpType::DrawLine: { - const auto* op = static_cast<const DrawLineOp*>(base_op); - str << "DrawLineOp(x0=" << PaintOpHelper::SkiaTypeToString(op->x0) - << ", y0=" << PaintOpHelper::SkiaTypeToString(op->y0) - << ", x1=" << PaintOpHelper::SkiaTypeToString(op->x1) - << ", y1=" << PaintOpHelper::SkiaTypeToString(op->y1) - << ", flags=" << PaintOpHelper::FlagsToString(op->flags) << ")"; + const auto& op = static_cast<const DrawLineOp&>(base_op); + str << "DrawLineOp(x0=" << PaintOpHelper::SkiaTypeToString(op.x0) + << ", y0=" << PaintOpHelper::SkiaTypeToString(op.y0) + << ", x1=" << PaintOpHelper::SkiaTypeToString(op.x1) + << ", y1=" << PaintOpHelper::SkiaTypeToString(op.y1) + << ", flags=" << PaintOpHelper::FlagsToString(op.flags) << ")"; break; } case PaintOpType::DrawOval: { - const auto* op = static_cast<const DrawOvalOp*>(base_op); - str << "DrawOvalOp(oval=" << PaintOpHelper::SkiaTypeToString(op->oval) - << ", flags=" << PaintOpHelper::FlagsToString(op->flags) << ")"; + const auto& op = static_cast<const DrawOvalOp&>(base_op); + str << "DrawOvalOp(oval=" << PaintOpHelper::SkiaTypeToString(op.oval) + << ", flags=" << PaintOpHelper::FlagsToString(op.flags) << ")"; break; } case PaintOpType::DrawPath: { - const auto* op = static_cast<const DrawPathOp*>(base_op); - str << "DrawPathOp(path=" << PaintOpHelper::SkiaTypeToString(op->path) - << ", flags=" << PaintOpHelper::FlagsToString(op->flags) - << ", use_cache=" << (op->use_cache == UsePaintCache::kEnabled) + const auto& op = static_cast<const DrawPathOp&>(base_op); + str << "DrawPathOp(path=" << PaintOpHelper::SkiaTypeToString(op.path) + << ", flags=" << PaintOpHelper::FlagsToString(op.flags) + << ", use_cache=" << (op.use_cache == UsePaintCache::kEnabled) << ")"; break; } case PaintOpType::DrawRecord: { - const auto* op = static_cast<const DrawRecordOp*>(base_op); + const auto& op = static_cast<const DrawRecordOp&>(base_op); str << "DrawRecordOp(record=" - << PaintOpHelper::RecordToString(op->record) << ")"; + << PaintOpHelper::RecordToString(op.record) << ")"; break; } case PaintOpType::DrawRect: { - const auto* op = static_cast<const DrawRectOp*>(base_op); - str << "DrawRectOp(rect=" << PaintOpHelper::SkiaTypeToString(op->rect) - << ", flags=" << PaintOpHelper::FlagsToString(op->flags) << ")"; + const auto& op = static_cast<const DrawRectOp&>(base_op); + str << "DrawRectOp(rect=" << PaintOpHelper::SkiaTypeToString(op.rect) + << ", flags=" << PaintOpHelper::FlagsToString(op.flags) << ")"; break; } case PaintOpType::DrawRRect: { - const auto* op = static_cast<const DrawRRectOp*>(base_op); - str << "DrawRRectOp(rrect=" - << PaintOpHelper::SkiaTypeToString(op->rrect) - << ", flags=" << PaintOpHelper::FlagsToString(op->flags) << ")"; + const auto& op = static_cast<const DrawRRectOp&>(base_op); + str << "DrawRRectOp(rrect=" << PaintOpHelper::SkiaTypeToString(op.rrect) + << ", flags=" << PaintOpHelper::FlagsToString(op.flags) << ")"; break; } case PaintOpType::DrawSkottie: { - const auto* op = static_cast<const DrawSkottieOp*>(base_op); + const auto& op = static_cast<const DrawSkottieOp&>(base_op); str << "DrawSkottieOp(" - << "skottie=" << PaintOpHelper::SkottieToString(op->skottie) - << ", dst=" << PaintOpHelper::SkiaTypeToString(op->dst) - << ", t=" << op->t << ")"; + << "skottie=" << PaintOpHelper::SkottieToString(op.skottie) + << ", dst=" << PaintOpHelper::SkiaTypeToString(op.dst) + << ", t=" << op.t << ")"; break; } case PaintOpType::DrawTextBlob: { - const auto* op = static_cast<const DrawTextBlobOp*>(base_op); + const auto& op = static_cast<const DrawTextBlobOp&>(base_op); str << "DrawTextBlobOp(blob=" - << PaintOpHelper::TextBlobToString(op->blob) - << ", x=" << PaintOpHelper::SkiaTypeToString(op->x) - << ", y=" << PaintOpHelper::SkiaTypeToString(op->y) - << ", flags=" << PaintOpHelper::FlagsToString(op->flags) << ")"; + << PaintOpHelper::TextBlobToString(op.blob) + << ", x=" << PaintOpHelper::SkiaTypeToString(op.x) + << ", y=" << PaintOpHelper::SkiaTypeToString(op.y) + << ", flags=" << PaintOpHelper::FlagsToString(op.flags) << ")"; break; } case PaintOpType::Noop: { @@ -176,9 +173,9 @@ break; } case PaintOpType::Rotate: { - const auto* op = static_cast<const RotateOp*>(base_op); + const auto& op = static_cast<const RotateOp&>(base_op); str << "RotateOp(degrees=" - << PaintOpHelper::SkiaTypeToString(op->degrees) << ")"; + << PaintOpHelper::SkiaTypeToString(op.degrees) << ")"; break; } case PaintOpType::Save: { @@ -186,40 +183,40 @@ break; } case PaintOpType::SaveLayer: { - const auto* op = static_cast<const SaveLayerOp*>(base_op); + const auto& op = static_cast<const SaveLayerOp&>(base_op); str << "SaveLayerOp(bounds=" - << PaintOpHelper::SkiaTypeToString(op->bounds) - << ", flags=" << PaintOpHelper::FlagsToString(op->flags) << ")"; + << PaintOpHelper::SkiaTypeToString(op.bounds) + << ", flags=" << PaintOpHelper::FlagsToString(op.flags) << ")"; break; } case PaintOpType::SaveLayerAlpha: { - const auto* op = static_cast<const SaveLayerAlphaOp*>(base_op); + const auto& op = static_cast<const SaveLayerAlphaOp&>(base_op); str << "SaveLayerAlphaOp(bounds=" - << PaintOpHelper::SkiaTypeToString(op->bounds) - << ", alpha=" << static_cast<uint32_t>(op->alpha * 255) << ")"; + << PaintOpHelper::SkiaTypeToString(op.bounds) + << ", alpha=" << static_cast<uint32_t>(op.alpha * 255) << ")"; break; } case PaintOpType::Scale: { - const auto* op = static_cast<const ScaleOp*>(base_op); - str << "ScaleOp(sx=" << PaintOpHelper::SkiaTypeToString(op->sx) - << ", sy=" << PaintOpHelper::SkiaTypeToString(op->sy) << ")"; + const auto& op = static_cast<const ScaleOp&>(base_op); + str << "ScaleOp(sx=" << PaintOpHelper::SkiaTypeToString(op.sx) + << ", sy=" << PaintOpHelper::SkiaTypeToString(op.sy) << ")"; break; } case PaintOpType::SetMatrix: { - const auto* op = static_cast<const SetMatrixOp*>(base_op); + const auto& op = static_cast<const SetMatrixOp&>(base_op); str << "SetMatrixOp(matrix=" - << PaintOpHelper::SkiaTypeToString(op->matrix) << ")"; + << PaintOpHelper::SkiaTypeToString(op.matrix) << ")"; break; } case PaintOpType::Translate: { - const auto* op = static_cast<const TranslateOp*>(base_op); - str << "TranslateOp(dx=" << PaintOpHelper::SkiaTypeToString(op->dx) - << ", dy=" << PaintOpHelper::SkiaTypeToString(op->dy) << ")"; + const auto& op = static_cast<const TranslateOp&>(base_op); + str << "TranslateOp(dx=" << PaintOpHelper::SkiaTypeToString(op.dx) + << ", dy=" << PaintOpHelper::SkiaTypeToString(op.dy) << ")"; break; } case PaintOpType::SetNodeId: { - const auto* op = static_cast<const SetNodeIdOp*>(base_op); - str << "SetNodeIdOp(id=" << op->node_id << ")"; + const auto& op = static_cast<const SetNodeIdOp&>(base_op); + str << "SetNodeIdOp(id=" << op.node_id << ")"; break; } }
diff --git a/cc/test/paint_op_matchers.h b/cc/test/paint_op_matchers.h index 58ab4d5..b8e22d8 100644 --- a/cc/test/paint_op_matchers.h +++ b/cc/test/paint_op_matchers.h
@@ -27,11 +27,11 @@ op, base::StringPrintf("%s equal to %s", negation ? "isn't" : "is", - PaintOpHelper::ToString(&op).c_str())) { - *result_listener << "\n Expected: " << PaintOpHelper::ToString(&op) - << "\n Actual: " << PaintOpHelper::ToString(&arg); + PaintOpHelper::ToString(op).c_str())) { + *result_listener << "\n Expected: " << PaintOpHelper::ToString(op) + << "\n Actual: " << PaintOpHelper::ToString(arg); const PaintOp& op_ref = op; // To unpack std::reference_wrapper, if needed. - return op_ref == arg; + return op_ref.EqualsForTesting(arg); } // Matcher checking that a PaintOpBuffer contains the specified PaintOps. @@ -54,7 +54,7 @@ // Example use: // PaintOpBuffer buffer = ...; // EXPECT_THAT(buffer, -// ElementsAre(PaintOpIs<SaveOp>(), PaintOpIs<SetMatrixOp())); +// ElementsAre(PaintOpIs<SaveOp>(), PaintOpIs<SetMatrixOp>())); template <typename OpT> class PaintOpIs { public:
diff --git a/cc/tiles/checker_image_tracker_unittest.cc b/cc/tiles/checker_image_tracker_unittest.cc index f43905f..e970f41 100644 --- a/cc/tiles/checker_image_tracker_unittest.cc +++ b/cc/tiles/checker_image_tracker_unittest.cc
@@ -12,6 +12,7 @@ #include "base/run_loop.h" #include "base/task/single_thread_task_runner.h" #include "cc/paint/paint_image_builder.h" +#include "cc/test/paint_image_matchers.h" #include "cc/test/skia_common.h" #include "cc/tiles/image_controller.h" #include "testing/gtest/include/gtest/gtest.h" @@ -192,8 +193,10 @@ BuildImageDecodeQueue(draw_images, WhichTree::PENDING_TREE); ASSERT_EQ(2u, image_decode_queue.size()); - EXPECT_EQ(checkerable_image.paint_image(), image_decode_queue[0].paint_image); - EXPECT_EQ(checkerable_image.paint_image(), image_decode_queue[1].paint_image); + EXPECT_TRUE(checkerable_image.paint_image().IsSameForTesting( + image_decode_queue[0].paint_image)); + EXPECT_TRUE(checkerable_image.paint_image().IsSameForTesting( + image_decode_queue[1].paint_image)); checker_image_tracker_->ScheduleImageDecodeQueue(image_decode_queue); EXPECT_EQ(image_controller_.num_of_locked_images(), 1); @@ -432,7 +435,8 @@ CheckerImageTracker::ImageDecodeQueue image_decode_queue = BuildImageDecodeQueue(draw_images, WhichTree::PENDING_TREE); EXPECT_EQ(image_decode_queue.size(), 1U); - EXPECT_EQ(image_decode_queue[0].paint_image, static_image.paint_image()); + EXPECT_TRUE(image_decode_queue[0].paint_image.IsSameForTesting( + static_image.paint_image())); // Change the partial image to complete and try again. It should sstill not // be checkered. @@ -530,18 +534,15 @@ checker_image_tracker_->SetMaxDecodePriorityAllowed( CheckerImageTracker::DecodeType::kRaster); base::RunLoop().RunUntilIdle(); - EXPECT_EQ(image_controller_.decoded_images().size(), 2u); - EXPECT_EQ(image_controller_.decoded_images()[0], image1); - EXPECT_EQ(image_controller_.decoded_images()[1], image2); + EXPECT_THAT(image_controller_.decoded_images(), + ImagesAreSame({image1, image2})); // All decodes allowed. The complete queue should be flushed. checker_image_tracker_->SetMaxDecodePriorityAllowed( CheckerImageTracker::DecodeType::kPreDecode); base::RunLoop().RunUntilIdle(); - EXPECT_EQ(image_controller_.decoded_images()[0], image1); - EXPECT_EQ(image_controller_.decoded_images()[1], image2); - EXPECT_EQ(image_controller_.decoded_images()[2], image3); - EXPECT_EQ(image_controller_.decoded_images()[3], image4); + EXPECT_THAT(image_controller_.decoded_images(), + ImagesAreSame({image1, image2, image3, image4})); } TEST_F(CheckerImageTrackerTest, UseSrcRectForSize) {
diff --git a/cc/trees/draw_property_utils.cc b/cc/trees/draw_property_utils.cc index f2baa45..2e379a88 100644 --- a/cc/trees/draw_property_utils.cc +++ b/cc/trees/draw_property_utils.cc
@@ -506,15 +506,10 @@ !HasSingularTransform(backface_transform_id, tree) && draw_property_utils::IsLayerBackFaceVisible( layer, backface_transform_id, property_trees)) { - UMA_HISTOGRAM_BOOLEAN( - "Compositing.Renderer.LayerUpdateSkippedDueToBackface", true); return false; } } - UMA_HISTOGRAM_BOOLEAN("Compositing.Renderer.LayerUpdateSkippedDueToBackface", - false); - return true; }
diff --git a/cc/trees/layer_tree_host_impl_unittest.cc b/cc/trees/layer_tree_host_impl_unittest.cc index 3439776..0f39a04 100644 --- a/cc/trees/layer_tree_host_impl_unittest.cc +++ b/cc/trees/layer_tree_host_impl_unittest.cc
@@ -17569,8 +17569,9 @@ // Finally, 'paint' the content. This should unlock tile preparation and // update the PictureLayerImpl's map. std::move(painter->TakeDoneCallback()).Run(std::move(painted_job_map)); - EXPECT_EQ(*root->GetPaintWorkletRecordMap().find(input)->second.second, - record); + EXPECT_TRUE(root->GetPaintWorkletRecordMap() + .find(input) + ->second.second->EqualsForTesting(record)); EXPECT_TRUE(did_prepare_tiles_); } @@ -17667,8 +17668,9 @@ // updated, but since the tree was force activated there should be no tile // preparation. std::move(painter->TakeDoneCallback()).Run(std::move(painted_job_map)); - EXPECT_EQ(root->GetPaintWorkletRecordMap().find(input)->second.second, - record); + EXPECT_TRUE(root->GetPaintWorkletRecordMap() + .find(input) + ->second.second->EqualsForTesting(record)); EXPECT_FALSE(did_prepare_tiles_); }
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeBaseAppCompatActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeBaseAppCompatActivity.java index a16893e..3bbeccc 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeBaseAppCompatActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeBaseAppCompatActivity.java
@@ -31,6 +31,7 @@ import org.chromium.chrome.R; import org.chromium.chrome.browser.base.ServiceTracingProxyProvider; import org.chromium.chrome.browser.base.SplitChromeApplication; +import org.chromium.chrome.browser.flags.ChromeFeatureList; import org.chromium.chrome.browser.language.GlobalAppLocaleController; import org.chromium.chrome.browser.metrics.UmaSessionStats; import org.chromium.chrome.browser.night_mode.GlobalNightModeStateProviderHolder; @@ -237,6 +238,9 @@ */ @CallSuper protected void applyThemeOverlays() { + if (ChromeFeatureList.sBaselineGm3SurfaceColors.isEnabled()) { + setTheme(R.style.SurfaceColorsThemeOverlay); + } DynamicColors.applyToActivityIfAvailable(this); DeferredStartupHandler.getInstance().addDeferredTask(() -> {
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/flags/ChromeCachedFlags.java b/chrome/android/java/src/org/chromium/chrome/browser/app/flags/ChromeCachedFlags.java index 0fdfdd5..2b6222d 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/app/flags/ChromeCachedFlags.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/flags/ChromeCachedFlags.java
@@ -74,6 +74,7 @@ { add(ChromeFeatureList.sAppMenuMobileSiteOption); add(ChromeFeatureList.sBackGestureRefactorAndroid); + add(ChromeFeatureList.sBaselineGm3SurfaceColors); add(ChromeFeatureList.sCctAutoTranslate); add(ChromeFeatureList.sCctBrandTransparency); add(ChromeFeatureList.sCctFeatureUsage);
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/ViewTransitionPixelTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/ViewTransitionPixelTest.java index 7f66f968..13e2dd73 100644 --- a/chrome/android/javatests/src/org/chromium/chrome/browser/ViewTransitionPixelTest.java +++ b/chrome/android/javatests/src/org/chromium/chrome/browser/ViewTransitionPixelTest.java
@@ -89,7 +89,7 @@ } } - private void startTest(@VirtualKeyboardMode.EnumType int vkMode) throws Throwable { + private void startKeyboardTest(@VirtualKeyboardMode.EnumType int vkMode) throws Throwable { mVirtualKeyboardMode = vkMode; String url = "/chrome/test/data/android/view_transition.html"; @@ -247,7 +247,7 @@ getWebContents(), "startTransitionAnimation();"); } - // Sets animation times to the final "incoming" state. Animations remain paused. + // Sets animation times to the final "incoming" state. Animations remain paused. private void animateToEndState() throws Throwable { JavaScriptUtils.executeJavaScriptAndWaitForResult(getWebContents(), "animateToEndState();"); } @@ -290,7 +290,7 @@ @MediumTest @Feature({"RenderTest"}) public void testVirtualKeyboardResizesVisual() throws Throwable { - startTest(VirtualKeyboardMode.RESIZES_VISUAL); + startKeyboardTest(VirtualKeyboardMode.RESIZES_VISUAL); showAndWaitForKeyboard(); @@ -332,7 +332,7 @@ @MediumTest @Feature({"RenderTest"}) public void testVirtualKeyboardResizesContent() throws Throwable { - startTest(VirtualKeyboardMode.RESIZES_CONTENT); + startKeyboardTest(VirtualKeyboardMode.RESIZES_CONTENT); showAndWaitForKeyboard(); @@ -363,4 +363,33 @@ finishAnimations(); } + + /** + * Test view transitions when into a <dialog> element. + * + * Tested here to ensure snapshot viewport positioning behavior with respect to top-layer + * objects like <dialog>. + */ + @Test + @MediumTest + @Feature({"RenderTest"}) + public void testDialog() throws Throwable { + String url = "/chrome/test/data/android/view_transition_dialog.html"; + mActivityTestRule.startMainActivityWithURL(mTestServer.getURL(url)); + mActivityTestRule.waitForActivityNativeInitializationComplete(); + + createTransitionAndWaitUntilDomUpdateDispatched(); + + // Start the animation. The "animation" simply displays the old transition for the full + // duration of the test. This test is interested in how the <dialog> element is positioned. + // Since that's in the end-state, skip straight to that. + startTransitionAnimation(); + animateToEndState(); + waitForFramePresented(); + + Bitmap newState = takeScreenshot(); + mRenderTestRule.compareForResult(newState, "incoming_dialog_element"); + + finishAnimations(); + } }
diff --git a/chrome/app/os_settings_strings.grdp b/chrome/app/os_settings_strings.grdp index 5caf2b4..89c0b00 100644 --- a/chrome/app/os_settings_strings.grdp +++ b/chrome/app/os_settings_strings.grdp
@@ -2888,6 +2888,12 @@ <message name="IDS_SETTINGS_INTERNET_HOTSPOT_SUBTITLE_WITH_LEARN_MORE_LINK" desc="Subtitle of the hotspot subpage which explains how hotspot may affect your Chromebook."> Uses your Chromebook’s mobile data and your carrier may charge additional fees. May increase battery usage. <ph name="BEGIN_LINK_LEARN_MORE"><a target="_blank" href="$1"></ph>Learn more<ph name="END_LINK_LEARN_MORE"></a></ph> </message> + <message name="IDS_SETTINGS_INTERNET_HOTSPOT_MOBILE_DATA_NOT_SUPPORTED_SUBLABEL_WITH_LEARN_MORE_LINK" desc="Sublabel of the hotspot summary which explains the hostpost toggle is disabled because the mobile data plan doesn't support hotspot."> + Your mobile data may not support hotspot. <ph name="BEGIN_LINK_LEARN_MORE"><a target="_blank" href="$1"></ph>Learn more<ph name="END_LINK_LEARN_MORE"></a></ph> + </message> + <message name="IDS_SETTINGS_INTERNET_HOTSPOT_NO_MOBILE_DATA_SUBLABEL_WITH_LEARN_MORE_LINK" desc="Sublabel of the hotspot summary which notice user to first connect to mobile data to use hotspot."> + Connect to mobile data to use hotspot. <ph name="BEGIN_LINK_LEARN_MORE"><a target="_blank" href="$1"></ph>Learn more<ph name="END_LINK_LEARN_MORE"></a></ph> + </message> <message name="IDS_SETTINGS_INTERNET_HOTSPOT_TOGGLE_A11Y_LABEL" desc="Accessibility label for Hotspot enable/disable toggle."> Hotspot enable </message>
diff --git a/chrome/app/os_settings_strings_grdp/IDS_SETTINGS_INTERNET_HOTSPOT_MOBILE_DATA_NOT_SUPPORTED_SUBLABEL_WITH_LEARN_MORE_LINK.png.sha1 b/chrome/app/os_settings_strings_grdp/IDS_SETTINGS_INTERNET_HOTSPOT_MOBILE_DATA_NOT_SUPPORTED_SUBLABEL_WITH_LEARN_MORE_LINK.png.sha1 new file mode 100644 index 0000000..d18594b --- /dev/null +++ b/chrome/app/os_settings_strings_grdp/IDS_SETTINGS_INTERNET_HOTSPOT_MOBILE_DATA_NOT_SUPPORTED_SUBLABEL_WITH_LEARN_MORE_LINK.png.sha1
@@ -0,0 +1 @@ +2cbfefd5b12a32da96e777f34560ac2d66fd7fa0 \ No newline at end of file
diff --git a/chrome/app/os_settings_strings_grdp/IDS_SETTINGS_INTERNET_HOTSPOT_NO_MOBILE_DATA_SUBLABEL_WITH_LEARN_MORE_LINK.png.sha1 b/chrome/app/os_settings_strings_grdp/IDS_SETTINGS_INTERNET_HOTSPOT_NO_MOBILE_DATA_SUBLABEL_WITH_LEARN_MORE_LINK.png.sha1 new file mode 100644 index 0000000..5c9f37f3 --- /dev/null +++ b/chrome/app/os_settings_strings_grdp/IDS_SETTINGS_INTERNET_HOTSPOT_NO_MOBILE_DATA_SUBLABEL_WITH_LEARN_MORE_LINK.png.sha1
@@ -0,0 +1 @@ +a9bbbcf631921d0c571eb20ed48d62e67564d606 \ No newline at end of file
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn index 27b94d5..c6e93e9 100644 --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn
@@ -4399,6 +4399,7 @@ "//chrome/browser/ui/webui/side_panel/user_notes:mojo_bindings", "//chrome/browser/ui/webui/tab_search:mojo_bindings", "//chrome/browser/ui/webui/tab_strip:mojo_bindings", + "//chrome/browser/ui/webui/web_app_internals:mojo_bindings", "//chrome/browser/web_applications", "//chrome/browser/web_applications/adjustments", "//chrome/browser/web_applications/app_service", @@ -4423,7 +4424,6 @@ "//components/live_caption:live_translate", "//components/memory_pressure", "//components/omnibox/browser:mojo_bindings", - "//components/services/app_service:lib", "//components/services/app_service/public/cpp:app_file_handling", "//components/services/app_service/public/cpp:app_share_target", "//components/services/app_service/public/cpp:app_types", @@ -7721,6 +7721,7 @@ deps += [ "//chrome/browser/resources/media_router/internals:build_ts", "//chrome/browser/share/core/resources:make_share_targets_protobuf", + "//chrome/browser/ui/webui/web_app_internals:mojo_bindings_js", ] } if (is_chromeos_ash) {
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc index 23aa6d7..c6440bcb 100644 --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc
@@ -6176,6 +6176,11 @@ FEATURE_WITH_PARAMS_VALUE_TYPE(chrome::android::kFoldableJankFix, kFoldableJankFixDelayVariations, "FoldableJankFix")}, + + {"enable-baseline-gm3-surface-colors", + flag_descriptions::kBaselineGM3SurfaceColorsName, + flag_descriptions::kBaselineGM3SurfaceColorsDescription, kOsAndroid, + FEATURE_VALUE_TYPE(chrome::android::kBaselineGM3SurfaceColors)}, #endif // BUILDFLAG(IS_ANDROID) {"unsafely-treat-insecure-origin-as-secure", @@ -6697,6 +6702,14 @@ flag_descriptions::kEnableRgbKeyboardDescription, kOsCrOS, FEATURE_VALUE_TYPE(ash::features::kRgbKeyboard)}, + {"enable-accessibility-accelerators-notifications-timeout", + flag_descriptions::kAccessibilityAcceleratorNotificationsTimeoutName, + flag_descriptions:: + kAccessibilityAcceleratorNotificationsTimeoutDescription, + kOsCrOS, + FEATURE_VALUE_TYPE( + features::kAccessibilityAcceleratorNotificationsTimeout)}, + {"enable-accessibility-service", flag_descriptions::kAccessibilityServiceName, flag_descriptions::kAccessibilityServiceDescription, kOsCrOS,
diff --git a/chrome/browser/accessibility/ax_screen_ai_annotator.cc b/chrome/browser/accessibility/ax_screen_ai_annotator.cc index 9b7c94d..1964155f 100644 --- a/chrome/browser/accessibility/ax_screen_ai_annotator.cc +++ b/chrome/browser/accessibility/ax_screen_ai_annotator.cc
@@ -90,7 +90,7 @@ if (!web_contents->GetPrimaryMainFrame()) return; - base::Time start_time = base::Time::Now(); + base::TimeTicks start_time = base::TimeTicks::Now(); #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) // TODO(https://crbug.com/1278249): Need to run GrabViewSnapshot() in a // thread that is not the main UI thread. @@ -110,11 +110,12 @@ #endif } -void AXScreenAIAnnotator::OnScreenshotReceived(const ui::AXTreeID& ax_tree_id, - const base::Time& start_time, - gfx::Image snapshot) { +void AXScreenAIAnnotator::OnScreenshotReceived( + const ui::AXTreeID& ax_tree_id, + const base::TimeTicks& start_time, + gfx::Image snapshot) { DCHECK(screen_ai_annotator_.is_bound()); - base::TimeDelta elapsed_time = base::Time::Now() - start_time; + base::TimeDelta elapsed_time = base::TimeTicks::Now() - start_time; if (snapshot.IsEmpty()) { VLOG(1) << "AxScreenAIAnnotator could not grab snapshot."; base::UmaHistogramTimes(
diff --git a/chrome/browser/accessibility/ax_screen_ai_annotator.h b/chrome/browser/accessibility/ax_screen_ai_annotator.h index 7aee868..418116b 100644 --- a/chrome/browser/accessibility/ax_screen_ai_annotator.h +++ b/chrome/browser/accessibility/ax_screen_ai_annotator.h
@@ -61,7 +61,7 @@ // snapshot at the time of triggering the request. `start_time` represents // the time when the screenshot is requested. virtual void OnScreenshotReceived(const ui::AXTreeID& ax_tree_id, - const base::Time& start_time, + const base::TimeTicks& start_time, gfx::Image snapshot); // Informs this instance that the Screen AI Service has finished creating the
diff --git a/chrome/browser/accessibility/screen_ai_service_browsertest.cc b/chrome/browser/accessibility/screen_ai_service_browsertest.cc index 4b57278..963b66b 100644 --- a/chrome/browser/accessibility/screen_ai_service_browsertest.cc +++ b/chrome/browser/accessibility/screen_ai_service_browsertest.cc
@@ -32,7 +32,7 @@ MOCK_METHOD(void, OnScreenshotReceived, (const ui::AXTreeID& ax_tree_id, - const base::Time& start_time, + const base::TimeTicks& start_time, gfx::Image snapshot), (override)); }; @@ -56,7 +56,8 @@ EXPECT_CALL(*annotator, BindToScreenAIService); EXPECT_CALL(*annotator, OnScreenshotReceived) .WillOnce([&run_loop](const ui::AXTreeID& ax_tree_id, - const base::Time& start_time, gfx::Image snapshot) { + const base::TimeTicks& start_time, + gfx::Image snapshot) { EXPECT_FALSE(snapshot.IsEmpty()); EXPECT_GT(snapshot.Size().width(), 0); EXPECT_GT(snapshot.Size().height(), 0);
diff --git a/chrome/browser/apps/app_service/BUILD.gn b/chrome/browser/apps/app_service/BUILD.gn index 27df3f1..b374a75 100644 --- a/chrome/browser/apps/app_service/BUILD.gn +++ b/chrome/browser/apps/app_service/BUILD.gn
@@ -69,7 +69,6 @@ "//components/crx_file", "//components/favicon/core", "//components/keyed_service/content", - "//components/services/app_service:lib", "//components/services/app_service/public/cpp:app_types", "//components/services/app_service/public/cpp:app_update", "//components/services/app_service/public/cpp:icon_loader", @@ -284,6 +283,8 @@ "publishers/extension_apps_base.cc", "publishers/extension_apps_base.h", ] + + deps += [ "//components/services/app_service/public/cpp:preferred_app" ] } }
diff --git a/chrome/browser/apps/app_service/DEPS b/chrome/browser/apps/app_service/DEPS index 90eb889..b7716010 100644 --- a/chrome/browser/apps/app_service/DEPS +++ b/chrome/browser/apps/app_service/DEPS
@@ -1,5 +1,4 @@ include_rules = [ - "+components/services/app_service/app_service_mojom_impl.h", "+components/services/app_service/public", "+components/app_constants", "+components/app_restore",
diff --git a/chrome/browser/apps/app_service/app_service_proxy_ash.cc b/chrome/browser/apps/app_service/app_service_proxy_ash.cc index 4aa2f3d..f5e33aa 100644 --- a/chrome/browser/apps/app_service/app_service_proxy_ash.cc +++ b/chrome/browser/apps/app_service/app_service_proxy_ash.cc
@@ -35,7 +35,6 @@ #include "components/app_restore/full_restore_save_handler.h" #include "components/app_restore/full_restore_utils.h" #include "components/grit/components_resources.h" -#include "components/services/app_service/app_service_mojom_impl.h" #include "components/services/app_service/public/cpp/app_capability_access_cache_wrapper.h" #include "components/services/app_service/public/cpp/app_registry_cache_wrapper.h" #include "components/services/app_service/public/cpp/features.h" @@ -130,11 +129,6 @@ AppServiceProxyBase::Initialize(); - if (!base::FeatureList::IsEnabled(kStopMojomAppService) && - !app_service_.is_connected()) { - return; - } - AppRegistryCache::Observer::Observe(&AppRegistryCache()); publisher_host_ = std::make_unique<PublisherHost>(this);
diff --git a/chrome/browser/apps/app_service/app_service_proxy_ash.h b/chrome/browser/apps/app_service/app_service_proxy_ash.h index a54131c..9c0cf14 100644 --- a/chrome/browser/apps/app_service/app_service_proxy_ash.h +++ b/chrome/browser/apps/app_service/app_service_proxy_ash.h
@@ -28,8 +28,6 @@ #include "components/services/app_service/public/cpp/icon_types.h" #include "components/services/app_service/public/cpp/instance_registry.h" #include "components/services/app_service/public/cpp/preferred_app.h" -#include "components/services/app_service/public/mojom/app_service.mojom.h" -#include "components/services/app_service/public/mojom/types.mojom.h" #include "ui/gfx/native_widget_types.h" // Avoid including this header file directly or referring directly to
diff --git a/chrome/browser/apps/app_service/app_service_proxy_base.cc b/chrome/browser/apps/app_service/app_service_proxy_base.cc index a0c1d8e..e1b61f7b 100644 --- a/chrome/browser/apps/app_service/app_service_proxy_base.cc +++ b/chrome/browser/apps/app_service/app_service_proxy_base.cc
@@ -21,7 +21,6 @@ #include "chrome/browser/apps/app_service/metrics/app_service_metrics.h" #include "chrome/browser/apps/app_service/publishers/app_publisher.h" #include "chrome/browser/profiles/profile.h" -#include "components/services/app_service/app_service_mojom_impl.h" #include "components/services/app_service/public/cpp/app_launch_util.h" #include "components/services/app_service/public/cpp/app_update.h" #include "components/services/app_service/public/cpp/features.h" @@ -31,11 +30,7 @@ #include "components/services/app_service/public/cpp/intent_util.h" #include "components/services/app_service/public/cpp/preferred_app.h" #include "components/services/app_service/public/cpp/types_util.h" -#include "components/services/app_service/public/mojom/types.mojom.h" #include "content/public/browser/url_data_source.h" -#include "mojo/public/cpp/bindings/pending_receiver.h" -#include "mojo/public/cpp/bindings/pending_remote.h" -#include "mojo/public/cpp/bindings/struct_ptr.h" #include "url/gurl.h" namespace apps { @@ -131,7 +126,6 @@ // Service, before the profile is fully initialized. Such tests can call this // after full profile initialization to ensure the App Service implementation // has all of profile state it needs. - app_service_.reset(); profile_ = profile; is_using_testing_profile_ = true; app_registry_cache_.ReinitializeForTesting(); // IN-TEST @@ -166,21 +160,6 @@ browser_app_launcher_ = std::make_unique<apps::BrowserAppLauncher>(profile_); - if (!base::FeatureList::IsEnabled(kStopMojomAppService)) { - app_service_mojom_impl_ = - std::make_unique<apps::AppServiceMojomImpl>(profile_->GetPath()); - - app_service_mojom_impl_->BindReceiver( - app_service_.BindNewPipeAndPassReceiver()); - - if (app_service_.is_connected()) { - // The AppServiceProxy is a subscriber: something that wants to be able to - // list all known apps. - mojo::PendingRemote<apps::mojom::Subscriber> subscriber; - receivers_.Add(this, subscriber.InitWithNewPipeAndPassReceiver()); - app_service_->RegisterSubscriber(std::move(subscriber), nullptr); - } - } // Make the chrome://app-icon/ resource available. content::URLDataSource::Add(profile_, std::make_unique<apps::AppIconSource>(profile_)); @@ -191,10 +170,6 @@ return it == publishers_.end() ? nullptr : it->second; } -mojo::Remote<apps::mojom::AppService>& AppServiceProxyBase::AppService() { - return app_service_; -} - apps::AppRegistryCache& AppServiceProxyBase::AppRegistryCache() { return app_registry_cache_; } @@ -688,11 +663,6 @@ app_capability_access_cache_.OnCapabilityAccesses(std::move(deltas)); } -void AppServiceProxyBase::Clone( - mojo::PendingReceiver<apps::mojom::Subscriber> receiver) { - receivers_.Add(this, std::move(receiver)); -} - IntentFilterPtr AppServiceProxyBase::FindBestMatchingFilter( const IntentPtr& intent) { IntentFilterPtr best_matching_intent_filter;
diff --git a/chrome/browser/apps/app_service/app_service_proxy_base.h b/chrome/browser/apps/app_service/app_service_proxy_base.h index e13fcfc8..d244a2c 100644 --- a/chrome/browser/apps/app_service/app_service_proxy_base.h +++ b/chrome/browser/apps/app_service/app_service_proxy_base.h
@@ -34,12 +34,6 @@ #include "components/services/app_service/public/cpp/preferred_app.h" #include "components/services/app_service/public/cpp/preferred_apps_impl.h" #include "components/services/app_service/public/cpp/preferred_apps_list.h" -#include "components/services/app_service/public/mojom/app_service.mojom.h" -#include "components/services/app_service/public/mojom/types.mojom-forward.h" -#include "components/services/app_service/public/mojom/types.mojom-shared.h" -#include "mojo/public/cpp/bindings/pending_receiver.h" -#include "mojo/public/cpp/bindings/receiver_set.h" -#include "mojo/public/cpp/bindings/remote.h" #include "third_party/abseil-cpp/absl/types/optional.h" #include "ui/gfx/native_widget_types.h" @@ -56,7 +50,6 @@ class AppUpdate; class BrowserAppLauncher; class PreferredAppsListHandle; -class AppServiceMojomImpl; struct AppLaunchParams; struct IntentLaunchInfo { @@ -84,7 +77,6 @@ // See components/services/app_service/README.md. class AppServiceProxyBase : public KeyedService, public IconLoader, - public apps::mojom::Subscriber, public PreferredAppsImpl::Host { public: explicit AppServiceProxyBase(Profile* profile); @@ -99,7 +91,6 @@ Profile* profile() const { return profile_; } - mojo::Remote<apps::mojom::AppService>& AppService(); apps::AppRegistryCache& AppRegistryCache(); apps::AppCapabilityAccessCache& AppCapabilityAccessCache(); @@ -376,9 +367,6 @@ virtual bool MaybeShowLaunchPreventionDialog( const apps::AppUpdate& update) = 0; - // apps::mojom::Subscriber overrides. - void Clone(mojo::PendingReceiver<apps::mojom::Subscriber> receiver) override; - IntentFilterPtr FindBestMatchingFilter(const IntentPtr& intent); virtual void PerformPostLaunchTasks(apps::LaunchSource launch_source); @@ -409,16 +397,9 @@ base::flat_map<AppType, AppPublisher*> publishers_; - // This proxy privately owns its instance of the App Service. This should not - // be exposed except through the Mojo interface connected to |app_service_|. - std::unique_ptr<apps::AppServiceMojomImpl> app_service_mojom_impl_; - - mojo::Remote<apps::mojom::AppService> app_service_; apps::AppRegistryCache app_registry_cache_; apps::AppCapabilityAccessCache app_capability_access_cache_; - mojo::ReceiverSet<apps::mojom::Subscriber> receivers_; - // The LoadIconFromIconKey implementation sends a chained series of requests // through each icon loader, starting from the outer and working back to the // inner. Fields are listed from inner to outer, the opposite of call order,
diff --git a/chrome/browser/apps/app_service/app_service_proxy_desktop.cc b/chrome/browser/apps/app_service/app_service_proxy_desktop.cc index 4e1b6d1c..25ef6b0 100644 --- a/chrome/browser/apps/app_service/app_service_proxy_desktop.cc +++ b/chrome/browser/apps/app_service/app_service_proxy_desktop.cc
@@ -7,7 +7,6 @@ #include "chrome/browser/web_applications/app_service/web_app_publisher_helper.h" #include "chrome/browser/web_applications/web_app_command_scheduler.h" #include "chrome/browser/web_applications/web_app_provider.h" -#include "components/services/app_service/app_service_mojom_impl.h" #include "components/services/app_service/public/cpp/app_types.h" #include "components/services/app_service/public/cpp/features.h" @@ -25,11 +24,6 @@ AppServiceProxyBase::Initialize(); - if (!base::FeatureList::IsEnabled(kStopMojomAppService) && - !app_service_.is_connected()) { - return; - } - publisher_host_ = std::make_unique<PublisherHost>(this); }
diff --git a/chrome/browser/ash/accessibility/dictation_browsertest.cc b/chrome/browser/ash/accessibility/dictation_browsertest.cc index a687eec4..1925ac14 100644 --- a/chrome/browser/ash/accessibility/dictation_browsertest.cc +++ b/chrome/browser/ash/accessibility/dictation_browsertest.cc
@@ -56,6 +56,7 @@ #include "content/public/test/browser_test.h" #include "content/public/test/browser_test_utils.h" #include "content/public/test/fake_speech_recognition_manager.h" +#include "content/public/test/test_navigation_observer.h" #include "extensions/browser/browsertest_util.h" #include "extensions/browser/extension_host_test_helper.h" #include "media/mojo/mojom/speech_recognition_service.mojom.h" @@ -895,22 +896,21 @@ // Is a DictationTest for the same reason as the above test. IN_PROC_BROWSER_TEST_P(DictationTest, Help) { + // Setup a TestNavigationObserver, which will allow us to know when the help + // center URL is loaded. + auto observer = std::make_unique<content::TestNavigationObserver>( + GURL("https://support.google.com/chromebook?p=text_dictation_m100")); + observer->WatchExistingWebContents(); + observer->StartWatchingNewWebContents(); + ToggleDictationWithKeystroke(); WaitForRecognitionStarted(); SendFinalResultAndWait("help"); - // Wait for the help URL to load. - SuccessWaiter( - base::BindLambdaForTesting([&]() { - content::WebContents* web_contents = - browser()->tab_strip_model()->GetActiveWebContents(); - return web_contents->GetVisibleURL() == - "https://support.google.com/chromebook?p=text_dictation_m100"; - }), - "Still waiting for help URL to load") - .Wait(); - + // Speech recognition should automatically turn off. WaitForRecognitionStopped(); + // Wait for the help center URL to load. + observer->Wait(); } // Confirms that punctuation can be sent and entered into the editable. We
diff --git a/chrome/browser/ash/input_method/input_method_engine.cc b/chrome/browser/ash/input_method/input_method_engine.cc index 01f461a7..052709d 100644 --- a/chrome/browser/ash/input_method/input_method_engine.cc +++ b/chrome/browser/ash/input_method/input_method_engine.cc
@@ -623,9 +623,6 @@ static_cast<int>(anchor_pos), static_cast<int>(offset_pos)); } -void InputMethodEngine::SetCompositionBounds( - const std::vector<gfx::Rect>& bounds) {} - void InputMethodEngine::SetCaretBounds(const gfx::Rect& caret_bounds) { observer_->OnCaretBoundsChanged(caret_bounds); }
diff --git a/chrome/browser/ash/input_method/input_method_engine.h b/chrome/browser/ash/input_method/input_method_engine.h index 365a8d6..7fc801657 100644 --- a/chrome/browser/ash/input_method/input_method_engine.h +++ b/chrome/browser/ash/input_method/input_method_engine.h
@@ -227,7 +227,6 @@ uint32_t cursor_pos, uint32_t anchor_pos, uint32_t offset_pos) override; - void SetCompositionBounds(const std::vector<gfx::Rect>& bounds) override; void SetCaretBounds(const gfx::Rect& caret_bounds) override; void PropertyActivate(const std::string& property_name) override; void CandidateClicked(uint32_t index) override;
diff --git a/chrome/browser/ash/input_method/mock_input_method_engine.cc b/chrome/browser/ash/input_method/mock_input_method_engine.cc index 21e2b01..1db0637 100644 --- a/chrome/browser/ash/input_method/mock_input_method_engine.cc +++ b/chrome/browser/ash/input_method/mock_input_method_engine.cc
@@ -38,9 +38,6 @@ uint32_t anchor_pos, uint32_t offset_pos) {} -void MockInputMethodEngine::SetCompositionBounds( - const std::vector<gfx::Rect>& bounds) {} - void MockInputMethodEngine::SetCaretBounds(const gfx::Rect& caret_bounds) {} ui::VirtualKeyboardController*
diff --git a/chrome/browser/ash/input_method/mock_input_method_engine.h b/chrome/browser/ash/input_method/mock_input_method_engine.h index 056c4e4..5131dedf 100644 --- a/chrome/browser/ash/input_method/mock_input_method_engine.h +++ b/chrome/browser/ash/input_method/mock_input_method_engine.h
@@ -43,7 +43,6 @@ uint32_t cursor_pos, uint32_t anchor_pos, uint32_t offset_pos) override; - void SetCompositionBounds(const std::vector<gfx::Rect>& bounds) override; void SetCaretBounds(const gfx::Rect& caret_bounds) override; ui::VirtualKeyboardController* GetVirtualKeyboardController() const override; void PropertyActivate(const std::string& property_name) override;
diff --git a/chrome/browser/ash/phonehub/attestation_certificate_generator_impl.cc b/chrome/browser/ash/phonehub/attestation_certificate_generator_impl.cc index 92dfe541..460d7f7 100644 --- a/chrome/browser/ash/phonehub/attestation_certificate_generator_impl.cc +++ b/chrome/browser/ash/phonehub/attestation_certificate_generator_impl.cc
@@ -9,6 +9,7 @@ #include "components/user_manager/user.h" namespace ash::phonehub { + AttestationCertificateGeneratorImpl::AttestationCertificateGeneratorImpl( Profile* profile, std::unique_ptr<attestation::SoftBindAttestationFlow>
diff --git a/chrome/browser/ash/phonehub/attestation_certificate_generator_impl.h b/chrome/browser/ash/phonehub/attestation_certificate_generator_impl.h index 07c5548..60ad566 100644 --- a/chrome/browser/ash/phonehub/attestation_certificate_generator_impl.h +++ b/chrome/browser/ash/phonehub/attestation_certificate_generator_impl.h
@@ -26,9 +26,9 @@ void GenerateCertificate(OnCertificateGeneratedCallback callback) override; private: - std::unique_ptr<device_sync::CryptAuthKeyRegistry> key_registry_; std::unique_ptr<attestation::SoftBindAttestationFlow> soft_bind_attestation_flow_; + std::unique_ptr<device_sync::CryptAuthKeyRegistry> key_registry_; Profile* profile_; }; } // namespace ash::phonehub
diff --git a/chrome/browser/ash/phonehub/phone_hub_manager_factory.cc b/chrome/browser/ash/phonehub/phone_hub_manager_factory.cc index 21c8130..2b03ffc 100644 --- a/chrome/browser/ash/phonehub/phone_hub_manager_factory.cc +++ b/chrome/browser/ash/phonehub/phone_hub_manager_factory.cc
@@ -6,8 +6,10 @@ #include "ash/constants/ash_features.h" #include "ash/public/cpp/system_tray.h" +#include "chrome/browser/ash/attestation/soft_bind_attestation_flow_impl.h" #include "chrome/browser/ash/device_sync/device_sync_client_factory.h" #include "chrome/browser/ash/multidevice_setup/multidevice_setup_client_factory.h" +#include "chrome/browser/ash/phonehub/attestation_certificate_generator_impl.h" #include "chrome/browser/ash/phonehub/browser_tabs_metadata_fetcher_impl.h" #include "chrome/browser/ash/phonehub/browser_tabs_model_provider_impl.h" #include "chrome/browser/ash/phonehub/camera_roll_download_manager_impl.h" @@ -47,12 +49,14 @@ bool IsLoggedInAsPrimaryUser(Profile* profile) { // Guest/incognito profiles cannot use Phone Hub. - if (profile->IsOffTheRecord()) + if (profile->IsOffTheRecord()) { return false; + } // Likewise, kiosk users are ineligible. - if (user_manager::UserManager::Get()->IsLoggedInAsAnyKioskApp()) + if (user_manager::UserManager::Get()->IsLoggedInAsAnyKioskApp()) { return false; + } return ProfileHelper::IsPrimaryProfile(profile); } @@ -88,17 +92,32 @@ KeyedService* PhoneHubManagerFactory::BuildServiceInstanceFor( content::BrowserContext* context) const { - if (!features::IsPhoneHubEnabled()) + if (!features::IsPhoneHubEnabled()) { return nullptr; + } Profile* profile = Profile::FromBrowserContext(context); // Only available to the primary profile. - if (!IsLoggedInAsPrimaryUser(profile)) + if (!IsLoggedInAsPrimaryUser(profile)) { return nullptr; + } - if (IsProhibitedByPolicy(profile)) + if (IsProhibitedByPolicy(profile)) { return nullptr; + } + + std::unique_ptr<AttestationCertificateGeneratorImpl> + attestation_certificate_generator = nullptr; + + if (features::IsEcheSWAEnabled()) { + auto soft_bind_attestation_flow = + std::make_unique<attestation::SoftBindAttestationFlowImpl>(); + + attestation_certificate_generator = + std::make_unique<AttestationCertificateGeneratorImpl>( + profile, std::move(soft_bind_attestation_flow)); + } PhoneHubManagerImpl* phone_hub_manager = new PhoneHubManagerImpl( profile->GetPrefs(), @@ -121,7 +140,8 @@ ash::HoldingSpaceKeyedServiceFactory::GetInstance()->GetService( profile)) : nullptr, - base::BindRepeating(&multidevice_setup::MultiDeviceSetupDialog::Show)); + base::BindRepeating(&multidevice_setup::MultiDeviceSetupDialog::Show), + std::move(attestation_certificate_generator)); // Provide |phone_hub_manager| to the system tray so that it can be used by // the UI. @@ -154,8 +174,9 @@ // to be necessary in tests. if (g_context_for_service == context) { auto* system_tray = SystemTray::Get(); - if (system_tray) + if (system_tray) { system_tray->SetPhoneHubManager(nullptr); + } g_context_for_service = nullptr; }
diff --git a/chrome/browser/ash/video_conference/video_conference_app_service_client.cc b/chrome/browser/ash/video_conference/video_conference_app_service_client.cc index fadce77..7e2c28c 100644 --- a/chrome/browser/ash/video_conference/video_conference_app_service_client.cc +++ b/chrome/browser/ash/video_conference/video_conference_app_service_client.cc
@@ -4,6 +4,8 @@ #include "chrome/browser/ash/video_conference/video_conference_app_service_client.h" +#include "ash/session/session_controller_impl.h" +#include "ash/shell.h" #include "base/containers/contains.h" #include "base/strings/utf_string_conversions.h" #include "base/unguessable_token.h" @@ -11,8 +13,6 @@ #include "chrome/browser/apps/app_service/app_service_proxy_factory.h" #include "chrome/browser/ash/crosapi/crosapi_ash.h" #include "chrome/browser/ash/crosapi/crosapi_manager.h" -#include "chrome/browser/ash/login/users/chrome_user_manager.h" -#include "chrome/browser/ash/profiles/profile_helper.h" #include "chrome/browser/ash/video_conference/video_conference_manager_ash.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" @@ -21,6 +21,9 @@ #include "components/user_manager/user_manager.h" namespace ash { +namespace { +VideoConferenceAppServiceClient* g_client_instance = nullptr; +} VideoConferenceAppServiceClient::VideoConferenceAppServiceClient() : client_id_(base::UnguessableToken::Create()), @@ -36,19 +39,21 @@ ->crosapi_ash() ->video_conference_manager_ash() ->RegisterCppClient(this, client_id_); - ChromeUserManager::Get()->AddSessionStateObserver(this); + + session_observation_.Observe(Shell::Get()->session_controller()); + + g_client_instance = this; } VideoConferenceAppServiceClient::~VideoConferenceAppServiceClient() { - ChromeUserManager::Get()->RemoveSessionStateObserver(this); // C++ clients are responsible for manually calling |UnregisterClient| on the // manager when disconnecting. - if (crosapi::CrosapiManager::IsInitialized()) { - crosapi::CrosapiManager::Get() - ->crosapi_ash() - ->video_conference_manager_ash() - ->UnregisterClient(client_id_); - } + crosapi::CrosapiManager::Get() + ->crosapi_ash() + ->video_conference_manager_ash() + ->UnregisterClient(client_id_); + + g_client_instance = nullptr; } void VideoConferenceAppServiceClient::GetMediaApps( @@ -188,12 +193,19 @@ instance_registry_ = nullptr; } -void VideoConferenceAppServiceClient::ActiveUserChanged( - user_manager::User* active_user) { - Profile* profile = ProfileHelper::Get()->GetProfileByUser(active_user); +void VideoConferenceAppServiceClient::OnSessionStateChanged( + session_manager::SessionState state) { + if (state != session_manager::SessionState::ACTIVE) { + return; + } + + Profile* profile = ProfileManager::GetActiveUserProfile(); + user_manager::User* active_user = + user_manager::UserManager::Get()->GetActiveUser(); // Skip the profile that AppServiceProxy is not available. - if (!apps::AppServiceProxyFactory::IsAppServiceAvailableForProfile(profile)) { + if (!apps::AppServiceProxyFactory::IsAppServiceAvailableForProfile(profile) || + !active_user) { instance_registry_observation_.Reset(); app_capability_observation_.Reset(); return; @@ -209,11 +221,15 @@ capability_cache_ = apps::AppCapabilityAccessCacheWrapper::Get().GetAppCapabilityAccessCache( active_user->GetAccountId()); - DCHECK(capability_cache_); app_capability_observation_.Reset(); app_capability_observation_.Observe(capability_cache_); } +VideoConferenceAppServiceClient* +VideoConferenceAppServiceClient::GetForTesting() { + return g_client_instance; +} + std::string VideoConferenceAppServiceClient::GetAppName( const AppIdString& app_id) { std::string app_name;
diff --git a/chrome/browser/ash/video_conference/video_conference_app_service_client.h b/chrome/browser/ash/video_conference/video_conference_app_service_client.h index ca84856..be06fc5 100644 --- a/chrome/browser/ash/video_conference/video_conference_app_service_client.h +++ b/chrome/browser/ash/video_conference/video_conference_app_service_client.h
@@ -8,6 +8,8 @@ #include <map> #include <string> +#include "ash/public/cpp/session/session_controller.h" +#include "ash/public/cpp/session/session_observer.h" #include "base/memory/raw_ptr.h" #include "base/scoped_observation.h" #include "base/time/time.h" @@ -15,7 +17,6 @@ #include "chromeos/crosapi/mojom/video_conference.mojom.h" #include "components/services/app_service/public/cpp/app_capability_access_cache.h" #include "components/services/app_service/public/cpp/instance_registry.h" -#include "components/user_manager/user_manager.h" namespace apps { class AppRegistryCache; @@ -31,7 +32,7 @@ : public crosapi::mojom::VideoConferenceManagerClient, public apps::AppCapabilityAccessCache::Observer, public apps::InstanceRegistry::Observer, - public user_manager::UserManager::UserSessionStateObserver { + public SessionObserver { public: using AppIdString = std::string; @@ -81,12 +82,15 @@ void OnInstanceRegistryWillBeDestroyed( apps::InstanceRegistry* cache) override; - // user_manager::UserManager::UserSessionStateObserver overrides. - void ActiveUserChanged(user_manager::User* active_user) override; + // SessionObserver overrides. + void OnSessionStateChanged(session_manager::SessionState state) override; private: friend class VideoConferenceAppServiceClientTest; + // Returns current VideoConferenceAppServiceClient for testing purpose. + static VideoConferenceAppServiceClient* GetForTesting(); + // Returns the name of the app with `app_id`. std::string GetAppName(const AppIdString& app_id); @@ -124,6 +128,9 @@ // This records a list of AppState; each represents a video conference app. std::map<AppIdString, AppState> id_to_app_state_; + base::ScopedObservation<SessionController, SessionObserver> + session_observation_{this}; + base::ScopedObservation<apps::InstanceRegistry, apps::InstanceRegistry::Observer> instance_registry_observation_{this};
diff --git a/chrome/browser/ash/video_conference/video_conference_app_service_client_browsertest.cc b/chrome/browser/ash/video_conference/video_conference_app_service_client_browsertest.cc index 39ffec1..5ae20ac7 100644 --- a/chrome/browser/ash/video_conference/video_conference_app_service_client_browsertest.cc +++ b/chrome/browser/ash/video_conference/video_conference_app_service_client_browsertest.cc
@@ -6,17 +6,19 @@ #include <cstdlib> +#include "ash/constants/ash_features.h" +#include "ash/session/session_controller_impl.h" +#include "ash/shell.h" #include "ash/system/video_conference/video_conference_media_state.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h" #include "base/test/bind.h" +#include "base/test/scoped_feature_list.h" #include "base/unguessable_token.h" #include "chrome/browser/apps/app_service/app_service_proxy_ash.h" #include "chrome/browser/apps/app_service/app_service_proxy_factory.h" #include "chrome/browser/ash/crosapi/crosapi_ash.h" #include "chrome/browser/ash/crosapi/crosapi_manager.h" -#include "chrome/browser/ash/login/login_manager_test.h" -#include "chrome/browser/ash/login/test/login_manager_mixin.h" #include "chrome/browser/ash/video_conference/video_conference_manager_ash.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/ui/browser.h" @@ -70,9 +72,9 @@ // showing an app instance. class FakeAppInstance { public: - FakeAppInstance(Profile* profile, const AppIdString& app_id) { - instance_registry_ = &apps::AppServiceProxyFactory::GetForProfile(profile) - ->InstanceRegistry(); + FakeAppInstance(apps::InstanceRegistry* instance_registry, + const AppIdString& app_id) { + instance_registry_ = instance_registry; window_ = std::unique_ptr<aura::Window>( aura::test::CreateTestWindowWithId(/*id=*/++next_window_id_, nullptr)); instance_ = std::make_unique<apps::Instance>( @@ -123,56 +125,46 @@ } // namespace -class VideoConferenceAppServiceClientTest : public LoginManagerTest { +class VideoConferenceAppServiceClientTest : public InProcessBrowserTest { public: void SetUpOnMainThread() override { - LoginManagerTest::SetUpOnMainThread(); + InProcessBrowserTest::SetUpOnMainThread(); - // Login two accounts. - login_manager_.AppendRegularUsers(2); - LoginUser(login_manager_.users()[0].account_id); - LoginUser(login_manager_.users()[1].account_id); + client_ = VideoConferenceAppServiceClient::GetForTesting(); + // This is not triggered automatically. + client_->OnSessionStateChanged( + Shell::Get()->session_controller()->GetSessionState()); - capability_cache_.SetAccountId(login_manager_.users()[0].account_id); - apps::AppCapabilityAccessCacheWrapper::Get().AddAppCapabilityAccessCache( - login_manager_.users()[0].account_id, &capability_cache_); - - client_ = std::make_unique<VideoConferenceAppServiceClient>(); - - // Switching users will force AppService objects update inside the - // `client_`. - user_manager::UserManager::Get()->SwitchActiveUser( - login_manager_.users()[0].account_id); - profile_ = ProfileManager::GetActiveUserProfile(); - } - - void TearDownOnMainThread() override { - client_.reset(); - LoginManagerTest::TearDownOnMainThread(); + Profile* profile = ProfileManager::GetActiveUserProfile(); + instance_registry_ = &apps::AppServiceProxyFactory::GetForProfile(profile) + ->InstanceRegistry(); + app_registry_cache_ = &apps::AppServiceProxyFactory::GetForProfile(profile) + ->AppRegistryCache(); + capability_cache_ = + apps::AppCapabilityAccessCacheWrapper::Get() + .GetAppCapabilityAccessCache(user_manager::UserManager::Get() + ->GetActiveUser() + ->GetAccountId()); } // This function creates an app with given id and name, and adds the app into // AppRegistryCache of current profile. void InstallApp(const std::string& app_id) { - auto* proxy = apps::AppServiceProxyFactory::GetForProfile(profile_); std::vector<apps::AppPtr> deltas; - apps::AppRegistryCache& cache = proxy->AppRegistryCache(); deltas.push_back(MakeApp(app_id)); - cache.OnApps(std::move(deltas), apps::AppType::kUnknown, - /*should_notify_initialized=*/false); + app_registry_cache_->OnApps(std::move(deltas), apps::AppType::kUnknown, + /*should_notify_initialized=*/false); } // Update the permission of current `app_id`. void UpdateAppPermision(const std::string& app_id, bool has_camera_permission, bool has_microphone_permission) { - auto* proxy = apps::AppServiceProxyFactory::GetForProfile(profile_); std::vector<apps::AppPtr> deltas; - apps::AppRegistryCache& cache = proxy->AppRegistryCache(); deltas.push_back( MakeApp(app_id, has_camera_permission, has_microphone_permission)); - cache.OnApps(std::move(deltas), apps::AppType::kUnknown, - /*should_notify_initialized=*/false); + app_registry_cache_->OnApps(std::move(deltas), apps::AppType::kUnknown, + /*should_notify_initialized=*/false); } // Set the camera/michrophone accessing info for app with `app_id`. @@ -186,7 +178,7 @@ std::vector<apps::CapabilityAccessPtr> deltas; deltas.push_back(std::move(delta)); - capability_cache_.OnCapabilityAccesses(std::move(deltas)); + capability_cache_->OnCapabilityAccesses(std::move(deltas)); } // Adds {id, state} pair to client_->id_to_app_state_. @@ -225,10 +217,13 @@ protected: int next_window_id_ = 0; - LoginManagerMixin login_manager_{&mixin_host_}; - Profile* profile_ = nullptr; - apps::AppCapabilityAccessCache capability_cache_; - std::unique_ptr<VideoConferenceAppServiceClient> client_; + apps::InstanceRegistry* instance_registry_ = nullptr; + apps::AppRegistryCache* app_registry_cache_ = nullptr; + apps::AppCapabilityAccessCache* capability_cache_ = nullptr; + VideoConferenceAppServiceClient* client_ = nullptr; + + base::test::ScopedFeatureList scoped_feature_list_{ + ash::features::kVcControlsUi}; }; IN_PROC_BROWSER_TEST_F(VideoConferenceAppServiceClientTest, GetAppName) { @@ -311,9 +306,9 @@ IN_PROC_BROWSER_TEST_F(VideoConferenceAppServiceClientTest, ReturnToApp) { // Add two instance for kAppId1. - FakeAppInstance instance1(profile_, kAppId1); + FakeAppInstance instance1(instance_registry_, kAppId1); instance1.Start(); - FakeAppInstance instance2(profile_, kAppId1); + FakeAppInstance instance2(instance_registry_, kAppId1); instance2.Start(); aura::Window* window1 = instance1.window(); @@ -402,7 +397,7 @@ IN_PROC_BROWSER_TEST_F(VideoConferenceAppServiceClientTest, LastActivityTime) { // Start an instance of kAppId1. InstallApp(kAppId1); - FakeAppInstance instance1(profile_, kAppId1); + FakeAppInstance instance1(instance_registry_, kAppId1); instance1.Start(); // has-camera, has-mic should start tracking of the kAppId1. @@ -439,9 +434,9 @@ IN_PROC_BROWSER_TEST_F(VideoConferenceAppServiceClientTest, CloseApp) { // Start two instance of kAppId1. InstallApp(kAppId1); - FakeAppInstance instance1(profile_, kAppId1); + FakeAppInstance instance1(instance_registry_, kAppId1); instance1.Start(); - FakeAppInstance instance2(profile_, kAppId1); + FakeAppInstance instance2(instance_registry_, kAppId1); instance2.Start(); // No media app should be recorded till now. @@ -490,9 +485,9 @@ UpdateAppPermision(kAppId2, false, true); // Start two running instance. - FakeAppInstance instance1(profile_, kAppId1); + FakeAppInstance instance1(instance_registry_, kAppId1); instance1.Start(); - FakeAppInstance instance2(profile_, kAppId2); + FakeAppInstance instance2(instance_registry_, kAppId2); instance2.Start(); VideoConferenceMediaState state = GetMediaStateInVideoConferenceManagerAsh();
diff --git a/chrome/browser/chrome_browser_interface_binders.cc b/chrome/browser/chrome_browser_interface_binders.cc index 318e63d..c4e5abd2 100644 --- a/chrome/browser/chrome_browser_interface_binders.cc +++ b/chrome/browser/chrome_browser_interface_binders.cc
@@ -155,6 +155,8 @@ #include "chrome/browser/ui/webui/feed/feed_ui.h" #include "chrome/browser/ui/webui/image_editor/image_editor.mojom.h" #include "chrome/browser/ui/webui/image_editor/image_editor_untrusted_ui.h" +#include "chrome/browser/ui/webui/web_app_internals/web_app_internals.mojom.h" +#include "chrome/browser/ui/webui/web_app_internals/web_app_internals_ui.h" #include "components/omnibox/browser/omnibox.mojom.h" #if !defined(OFFICIAL_BUILD) #include "chrome/browser/ui/webui/new_tab_page/foo/foo.mojom.h" // nogncheck crbug.com/1125897 @@ -1343,6 +1345,11 @@ ::app_home::mojom::PageHandlerFactory, webapps::AppHomeUI>(map); } #endif + +#if !BUILDFLAG(IS_ANDROID) + RegisterWebUIControllerInterfaceBinder<::mojom::WebAppInternalsHandler, + WebAppInternalsUI>(map); +#endif } void PopulateChromeWebUIFrameInterfaceBrokers(
diff --git a/chrome/browser/data_saver/data_saver_browsertest.cc b/chrome/browser/data_saver/data_saver_browsertest.cc index ffc7f58..8dbe577 100644 --- a/chrome/browser/data_saver/data_saver_browsertest.cc +++ b/chrome/browser/data_saver/data_saver_browsertest.cc
@@ -9,7 +9,6 @@ #include "base/containers/contains.h" #include "base/functional/bind.h" #include "base/memory/raw_ptr.h" -#include "base/test/metrics/histogram_tester.h" #include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/profiles/profile.h" @@ -606,7 +605,6 @@ data_saver::OverrideIsDataSaverEnabledForTesting(true); SetImagesNotToLoad({"/data_saver/red.jpg"}); - base::HistogramTester histogram_tester; ASSERT_TRUE(ui_test_utils::NavigateToURL( browser(), test_server_->GetURL("/data_saver/image_srcset.html"))); } @@ -616,7 +614,6 @@ data_saver::OverrideIsDataSaverEnabledForTesting(false); SetImagesNotToLoad({"/data_saver/green.jpg"}); - base::HistogramTester histogram_tester; ASSERT_TRUE(ui_test_utils::NavigateToURL( browser(), test_server_->GetURL("/data_saver/image_srcset.html"))); }
diff --git a/chrome/browser/dips/dips_database.cc b/chrome/browser/dips/dips_database.cc index 4ecda7c..d3eb438 100644 --- a/chrome/browser/dips/dips_database.cc +++ b/chrome/browser/dips/dips_database.cc
@@ -72,7 +72,10 @@ // NOTE: When changing the version, add a new golden file for the new version // and a test to verify that Init() works with it. const int kCurrentVersionNumber = 2; -const int kCompatibleVersionNumber = 1; + +// The lowest current version embedded in Chrome code that can use the current +// version of this database. +const int kCompatibleVersionNumber = 2; } // namespace @@ -300,6 +303,10 @@ DCHECK(db_->is_open()); + sql::MetaTable::RazeIfIncompatible(db_.get(), + sql::MetaTable::kNoLowestSupportedVersion, + kCurrentVersionNumber); + // Scope initialization in a transaction so we can't be partially initialized. sql::Transaction transaction(db_.get()); if (!transaction.Begin())
diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json index 215fca1..1fc9f24f 100644 --- a/chrome/browser/flag-metadata.json +++ b/chrome/browser/flag-metadata.json
@@ -1655,6 +1655,11 @@ "expiry_milestone": 111 }, { + "name": "enable-accessibility-accelerators-notifications-timeout", + "owners": [ "katie@chromium.org", "//ash/accessibility/OWNERS" ], + "expiry_milestone": 120 + }, + { "name": "enable-accessibility-live-caption", "owners": [ "abigailbklein@google.com", "evliu@google.com", "//ui/accessibility/OWNERS" ], "expiry_milestone": 120 @@ -1797,6 +1802,11 @@ "expiry_milestone": 86 }, { + "name": "enable-baseline-gm3-surface-colors", + "owners": ["nemco", "skavuluru"], + "expiry_milestone": 115 + }, + { "name": "enable-bluetooth-spp-in-serial-api", "owners": [ "mattreynolds", "//content/browser/serial/OWNERS" ], "expiry_milestone": 120
diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc index c48062c7..be33272cc 100644 --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc
@@ -992,6 +992,13 @@ "during the handshake when resuming a connection to a compatible TLS 1.3 " "server."; +const char kAccessibilityAcceleratorNotificationsTimeoutName[] = + "Allows accelerator notifications for accessibility features to time out"; +const char kAccessibilityAcceleratorNotificationsTimeoutDescription[] = + "Enables notifications for accessibility features turned on by keyboard " + "shortcut (docked magnifier, screen magnifier and high contrast) to time " + "out instead of remaining pinned."; + const char kAccessibilityServiceName[] = "Experimental Accessibility Service"; const char kAccessibilityServiceDescription[] = "This option enables the experimental Accessibility Service and runs some " @@ -4008,6 +4015,10 @@ "Enables fix for jank seen during fold to unfold transition on foldables " "with Android 12+"; +const char kBaselineGM3SurfaceColorsName[] = "Baseline GM3 Surface Colors"; +const char kBaselineGM3SurfaceColorsDescription[] = + "Updates baseline surface colors to match the GM3 formula."; + const char kTouchDragAndContextMenuName[] = "Simultaneous touch drag and context menu"; const char kTouchDragAndContextMenuDescription[] =
diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h index 833abcc0..9f455aa 100644 --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h
@@ -566,6 +566,9 @@ extern const char kEnableTLS13EarlyDataName[]; extern const char kEnableTLS13EarlyDataDescription[]; +extern const char kAccessibilityAcceleratorNotificationsTimeoutName[]; +extern const char kAccessibilityAcceleratorNotificationsTimeoutDescription[]; + extern const char kAccessibilityServiceName[]; extern const char kAccessibilityServiceDescription[]; @@ -1664,9 +1667,13 @@ extern const char kTabStripRedesignAndroidName[]; extern const char kTabStripRedesignAndroidDescription[]; + extern const char kFoldableJankFixAndroidName[]; extern const char kFoldableJankFixAndroidDescription[]; +extern const char kBaselineGM3SurfaceColorsName[]; +extern const char kBaselineGM3SurfaceColorsDescription[]; + extern const char kTextBasedAudioDescriptionName[]; extern const char kTextBasedAudioDescriptionDescription[];
diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc index 7bf837a..19e818cd 100644 --- a/chrome/browser/flags/android/chrome_feature_list.cc +++ b/chrome/browser/flags/android/chrome_feature_list.cc
@@ -170,6 +170,7 @@ &kAppMenuMobileSiteOption, &kAppToWebAttribution, &kBackgroundThreadPool, + &kBaselineGM3SurfaceColors, &kCastDeviceFilter, &kClearOmniboxFocusAfterNavigation, &kCloseTabSuggestions, @@ -470,6 +471,10 @@ "BackgroundThreadPool", base::FEATURE_DISABLED_BY_DEFAULT); +BASE_FEATURE(kBaselineGM3SurfaceColors, + "BaselineGM3SurfaceColors", + base::FEATURE_DISABLED_BY_DEFAULT); + BASE_FEATURE(kConditionalTabStripAndroid, "ConditionalTabStripAndroid", base::FEATURE_DISABLED_BY_DEFAULT); @@ -843,7 +848,7 @@ BASE_FEATURE(kSplitCompositorTask, "SplitCompositorTask", - base::FEATURE_DISABLED_BY_DEFAULT); + base::FEATURE_ENABLED_BY_DEFAULT); BASE_FEATURE(kStoreHoursAndroid, "StoreHoursAndroid",
diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser/flags/android/chrome_feature_list.h index 750437c..c1edc61 100644 --- a/chrome/browser/flags/android/chrome_feature_list.h +++ b/chrome/browser/flags/android/chrome_feature_list.h
@@ -29,6 +29,7 @@ BASE_DECLARE_FEATURE(kAppMenuMobileSiteOption); BASE_DECLARE_FEATURE(kAppToWebAttribution); BASE_DECLARE_FEATURE(kBackgroundThreadPool); +BASE_DECLARE_FEATURE(kBaselineGM3SurfaceColors); BASE_DECLARE_FEATURE(kClearOmniboxFocusAfterNavigation); BASE_DECLARE_FEATURE(kCloseTabSuggestions); BASE_DECLARE_FEATURE(kCriticalPersistedTabData);
diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java index 7cde692..3c4a0455 100644 --- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java +++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
@@ -170,45 +170,48 @@ public static final String ADD_TO_HOMESCREEN_IPH = "AddToHomescreenIPH"; public static final String ALLOW_NEW_INCOGNITO_TAB_INTENTS = "AllowNewIncognitoTabIntents"; public static final String ANDROID_SCROLL_OPTIMIZATIONS = "AndroidScrollOptimizations"; - public static final String ANIMATED_IMAGE_DRAG_SHADOW = "AnimatedImageDragShadow"; - public static final String AUTOFILL_ADDRESS_PROFILE_SAVE_PROMPT_NICKNAME_SUPPORT = - "AutofillAddressProfileSavePromptNicknameSupport"; - public static final String AUTOFILL_ALLOW_NON_HTTP_ACTIVATION = - "AutofillAllowNonHttpActivation"; - public static final String AUTOFILL_CREDIT_CARD_AUTHENTICATION = - "AutofillCreditCardAuthentication"; - public static final String AUTOFILL_ENABLE_RANKING_FORMULA = "AutofillEnableRankingFormula"; - public static final String AUTOFILL_ENABLE_MANUAL_FALLBACK_FOR_VIRTUAL_CARDS = - "AutofillEnableManualFallbackForVirtualCards"; - public static final String AUTOFILL_ENABLE_SUPPORT_FOR_HONORIFIC_PREFIXES = - "AutofillEnableSupportForHonorificPrefixes"; - public static final String AUTOFILL_ENABLE_SUPPORT_FOR_MORE_STRUCTURE_IN_ADDRESSES = - "AutofillEnableSupportForMoreStructureInAddresses"; - public static final String AUTOFILL_ENABLE_UPDATE_VIRTUAL_CARD_ENROLLMENT = - "AutofillEnableUpdateVirtualCardEnrollment"; - public static final String AUTOFILL_RANKING_FORMULA_USAGE_HALF_LIFE = - "AutofillRankingFormulaUsageHalfLife"; - public static final String AUTOFILL_ENABLE_VIRTUAL_CARD_METADATA = - "AutofillEnableVirtualCardMetadata"; - public static final String AUTOFILL_ENABLE_CARD_PRODUCT_NAME = "AutofillEnableCardProductName"; public static final String ANDROID_SEARCH_ENGINE_CHOICE_NOTIFICATION = "AndroidSearchEngineChoiceNotification"; + public static final String ANIMATED_IMAGE_DRAG_SHADOW = "AnimatedImageDragShadow"; public static final String APP_LANGUAGE_PROMPT = "AppLanguagePrompt"; public static final String APP_LANGUAGE_PROMPT_ULP = "AppLanguagePromptULP"; + public static final String APP_MENU_MOBILE_SITE_OPTION = "AppMenuMobileSiteOption"; public static final String ASSISTANT_CONSENT_SIMPLIFIED_TEXT = "AssistantConsentSimplifiedText"; public static final String ASSISTANT_CONSENT_V2 = "AssistantConsentV2"; public static final String ASSISTANT_INTENT_EXPERIMENT_ID = "AssistantIntentExperimentId"; public static final String ASSISTANT_INTENT_TRANSLATE_INFO = "AssistantIntentTranslateInfo"; public static final String ASSISTANT_NON_PERSONALIZED_VOICE_SEARCH = "AssistantNonPersonalizedVoiceSearch"; - public static final String AUTOFILL_MANUAL_FALLBACK_ANDROID = "AutofillManualFallbackAndroid"; - public static final String AUTOFILL_REFRESH_STYLE_ANDROID = "AutofillRefreshStyleAndroid"; + public static final String AUTOFILL_ADDRESS_PROFILE_SAVE_PROMPT_NICKNAME_SUPPORT = + "AutofillAddressProfileSavePromptNicknameSupport"; + public static final String AUTOFILL_ALLOW_NON_HTTP_ACTIVATION = + "AutofillAllowNonHttpActivation"; + public static final String AUTOFILL_CREDIT_CARD_AUTHENTICATION = + "AutofillCreditCardAuthentication"; + public static final String AUTOFILL_ENABLE_CARD_PRODUCT_NAME = "AutofillEnableCardProductName"; + public static final String AUTOFILL_ENABLE_MANUAL_FALLBACK_FOR_VIRTUAL_CARDS = + "AutofillEnableManualFallbackForVirtualCards"; + public static final String AUTOFILL_ENABLE_RANKING_FORMULA = "AutofillEnableRankingFormula"; + public static final String AUTOFILL_ENABLE_SUPPORT_FOR_HONORIFIC_PREFIXES = + "AutofillEnableSupportForHonorificPrefixes"; + public static final String AUTOFILL_ENABLE_SUPPORT_FOR_MORE_STRUCTURE_IN_ADDRESSES = + "AutofillEnableSupportForMoreStructureInAddresses"; + public static final String AUTOFILL_ENABLE_UPDATE_VIRTUAL_CARD_ENROLLMENT = + "AutofillEnableUpdateVirtualCardEnrollment"; + public static final String AUTOFILL_ENABLE_VIRTUAL_CARD_METADATA = + "AutofillEnableVirtualCardMetadata"; public static final String AUTOFILL_KEYBOARD_ACCESSORY = "AutofillKeyboardAccessory"; - public static final String APP_MENU_MOBILE_SITE_OPTION = "AppMenuMobileSiteOption"; + public static final String AUTOFILL_MANUAL_FALLBACK_ANDROID = "AutofillManualFallbackAndroid"; + public static final String AUTOFILL_RANKING_FORMULA_USAGE_HALF_LIFE = + "AutofillRankingFormulaUsageHalfLife"; + public static final String AUTOFILL_REFRESH_STYLE_ANDROID = "AutofillRefreshStyleAndroid"; public static final String BACKGROUND_THREAD_POOL = "BackgroundThreadPool"; public static final String BACK_FORWARD_CACHE = "BackForwardCache"; public static final String BACK_GESTURE_REFACTOR = "BackGestureRefactorAndroid"; + public static final String BASELINE_GM3_SURFACE_COLORS = "BaselineGM3SurfaceColors"; public static final String BIOMETRIC_TOUCH_TO_FILL = "BiometricTouchToFill"; + public static final String BOOKMARKS_IMPROVED_SAVE_FLOW = "BookmarksImprovedSaveFlow"; + public static final String BOOKMARKS_REFRESH = "BookmarksRefresh"; public static final String CACHE_DEPRECATED_SYSTEM_LOCATION_SETTING = "CacheDeprecatedSystemLocationSetting"; public static final String CAF_MRP_DEFERRED_DISCOVERY = "CafMRPDeferredDiscovery"; @@ -229,6 +232,8 @@ public static final String CCT_REAL_TIME_ENGAGEMENT_SIGNALS = "CCTRealTimeEngagementSignals"; public static final String CCT_REDIRECT_PRECONNECT = "CCTRedirectPreconnect"; public static final String CCT_REMOVE_REMOTE_VIEW_IDS = "CCTRemoveRemoteViewIds"; + public static final String CCT_REPORT_PARALLEL_REQUEST_STATUS = + "CCTReportParallelRequestStatus"; public static final String CCT_RESIZABLE_90_MAXIMUM_HEIGHT = "CCTResizable90MaximumHeight"; public static final String CCT_RESIZABLE_ALLOW_RESIZE_BY_USER_GESTURE = "CCTResizableAllowResizeByUserGesture"; @@ -236,12 +241,7 @@ public static final String CCT_RESIZABLE_SIDE_SHEET = "CCTResizableSideSheet"; public static final String CCT_RESOURCE_PREFETCH = "CCTResourcePrefetch"; public static final String CCT_RETAINING_STATE_IN_MEMORY = "CCTRetainingStateInMemory"; - public static final String CCT_REPORT_PARALLEL_REQUEST_STATUS = - "CCTReportParallelRequestStatus"; public static final String CCT_TOOLBAR_CUSTOMIZATIONS = "CCTToolbarCustomizations"; - public static final String CLOSE_TAB_SUGGESTIONS = "CloseTabSuggestions"; - public static final String DISCARD_OCCLUDED_BITMAPS = "DiscardOccludedBitmaps"; - public static final String DONT_AUTO_HIDE_BROWSER_CONTROLS = "DontAutoHideBrowserControls"; public static final String CHROME_NEW_DOWNLOAD_TAB = "ChromeNewDownloadTab"; public static final String CHROME_SHARE_LONG_SCREENSHOT = "ChromeShareLongScreenshot"; public static final String CHROME_SHARING_HUB = "ChromeSharingHub"; @@ -250,22 +250,13 @@ public static final String CHROME_SURVEY_NEXT_ANDROID = "ChromeSurveyNextAndroid"; public static final String CLEAR_OMNIBOX_FOCUS_AFTER_NAVIGATION = "ClearOmniboxFocusAfterNavigation"; + public static final String CLOSE_TAB_SUGGESTIONS = "CloseTabSuggestions"; public static final String COMMAND_LINE_ON_NON_ROOTED = "CommandLineOnNonRooted"; public static final String COMMERCE_COUPONS = "CommerceCoupons"; public static final String COMMERCE_MERCHANT_VIEWER = "CommerceMerchantViewer"; public static final String COMMERCE_PRICE_TRACKING = "CommercePriceTracking"; public static final String CONDITIONAL_TAB_STRIP_ANDROID = "ConditionalTabStripAndroid"; public static final String CONTACTS_PICKER_SELECT_ALL = "ContactsPickerSelectAll"; - public static final String CONTEXT_MENU_ENABLE_LENS_SHOPPING_ALLOWLIST = - "ContextMenuEnableLensShoppingAllowlist"; - public static final String CONTEXT_MENU_GOOGLE_LENS_CHIP = "ContextMenuGoogleLensChip"; - public static final String CONTEXT_MENU_POPUP_FOR_ALL_SCREEN_SIZES = - "ContextMenuPopupForAllScreenSizes"; - public static final String CONTEXT_MENU_SEARCH_WITH_GOOGLE_LENS = - "ContextMenuSearchWithGoogleLens"; - public static final String CONTEXT_MENU_TRANSLATE_WITH_GOOGLE_LENS = - "ContextMenuTranslateWithGoogleLens"; - public static final String LENS_CAMERA_ASSISTED_SEARCH = "LensCameraAssistedSearch"; public static final String CONTEXTUAL_PAGE_ACTIONS = "ContextualPageActions"; public static final String CONTEXTUAL_PAGE_ACTION_PRICE_TRACKING = "ContextualPageActionPriceTracking"; @@ -278,23 +269,31 @@ "ContextualSearchSuppressShortView"; public static final String CONTEXTUAL_SEARCH_THIN_WEB_VIEW_IMPLEMENTATION = "ContextualSearchThinWebViewImplementation"; + public static final String CONTEXT_MENU_ENABLE_LENS_SHOPPING_ALLOWLIST = + "ContextMenuEnableLensShoppingAllowlist"; + public static final String CONTEXT_MENU_GOOGLE_LENS_CHIP = "ContextMenuGoogleLensChip"; + public static final String CONTEXT_MENU_POPUP_FOR_ALL_SCREEN_SIZES = + "ContextMenuPopupForAllScreenSizes"; + public static final String CONTEXT_MENU_SEARCH_WITH_GOOGLE_LENS = + "ContextMenuSearchWithGoogleLens"; + public static final String CONTEXT_MENU_TRANSLATE_WITH_GOOGLE_LENS = + "ContextMenuTranslateWithGoogleLens"; public static final String CORMORANT = "Cormorant"; - public static final String SYNC_ANDROID_LIMIT_NTP_PROMO_IMPRESSIONS = - "SyncAndroidLimitNTPPromoImpressions"; - public static final String SYNC_ANDROID_PROMOS_WITH_TITLE = "SyncAndroidPromosWithTitle"; public static final String CRITICAL_PERSISTED_TAB_DATA = "CriticalPersistedTabData"; public static final String DARKEN_WEBSITES_CHECKBOX_IN_THEMES_SETTING = "DarkenWebsitesCheckboxInThemesSetting"; public static final String DEFER_KEEP_SCREEN_ON_DURING_GESTURE = "DeferKeepScreenOnDuringGesture"; public static final String DETAILED_LANGUAGE_SETTINGS = "DetailedLanguageSettings"; - public static final String ENABLE_IPH = "EnableIPH"; + public static final String DISCARD_OCCLUDED_BITMAPS = "DiscardOccludedBitmaps"; public static final String DNS_OVER_HTTPS = "DnsOverHttps"; - public static final String DOWNLOADS_FOREGROUND = "DownloadsForeground"; + public static final String DONT_AUTO_HIDE_BROWSER_CONTROLS = "DontAutoHideBrowserControls"; public static final String DOWNLOADS_AUTO_RESUMPTION_NATIVE = "DownloadsAutoResumptionNative"; + public static final String DOWNLOADS_FOREGROUND = "DownloadsForeground"; public static final String DOWNLOAD_OFFLINE_CONTENT_PROVIDER = "UseDownloadOfflineContentProvider"; public static final String EARLY_LIBRARY_LOAD = "EarlyLibraryLoad"; + public static final String ENABLE_IPH = "EnableIPH"; public static final String ENABLE_PASSWORDS_ACCOUNT_STORAGE = "EnablePasswordsAccountStorage"; public static final String EXPERIMENTS_FOR_AGSA = "ExperimentsForAgsa"; public static final String EXPLICIT_LANGUAGE_ASK = "ExplicitLanguageAsk"; @@ -305,21 +304,26 @@ public static final String FEED_IMAGE_MEMORY_CACHE_SIZE_PERCENTAGE = "FeedImageMemoryCacheSizePercentage"; public static final String FEED_LOADING_PLACEHOLDER = "FeedLoadingPlaceholder"; + public static final String FEED_MULTI_COLUMN = "DiscoverFeedMultiColumn"; + public static final String FEED_NO_VIEW_CACHE = "FeedNoViewCache"; public static final String FEED_PERFORMANCE_STUDY = "FeedPerformanceStudy"; + public static final String FEED_POSITION_ANDROID = "FeedPositionAndroid"; + public static final String FEED_SHOW_SIGN_IN_COMMAND = "FeedShowSignInCommand"; public static final String FILLING_PASSWORDS_FROM_ANY_ORIGIN = "FillingPasswordsFromAnyOrigin"; public static final String FIXED_UMA_SESSION_RESUME_ORDER = "FixedUmaSessionResumeOrder"; public static final String FOCUS_OMNIBOX_IN_INCOGNITO_TAB_INTENTS = "FocusOmniboxInIncognitoTabIntents"; public static final String FOLDABLE_JANK_FIX = "FoldableJankFix"; public static final String FORCE_APP_LANGUAGE_PROMPT = "ForceAppLanguagePrompt"; - public static final String FORCE_WEB_CONTENTS_DARK_MODE = "WebContentsForceDark"; public static final String FORCE_DISABLE_EXTENDED_SYNC_PROMOS = "ForceDisableExtendedSyncPromos"; public static final String FORCE_STARTUP_SIGNIN_PROMO = "ForceStartupSigninPromo"; - public static final String TANGIBLE_SYNC = "TangibleSync"; + public static final String FORCE_WEB_CONTENTS_DARK_MODE = "WebContentsForceDark"; public static final String GRID_TAB_SWITCHER_FOR_TABLETS = "GridTabSwitcherForTablets"; public static final String HIDE_NON_DISPLAYABLE_ACCOUNT_EMAIL = "HideNonDisplayableAccountEmail"; + public static final String HISTORY_JOURNEYS = "Journeys"; + public static final String HISTORY_ORGANIC_REPEATABLE_QUERIES = "OrganicRepeatableQueries"; public static final String HTTPS_FIRST_MODE = "HttpsOnlyMode"; public static final String INCOGNITO_DOWNLOADS_WARNING = "IncognitoDownloadsWarning"; public static final String INCOGNITO_NTP_REVAMP = "IncognitoNtpRevamp"; @@ -335,12 +339,11 @@ public static final String INTEREST_FEED_NOTICE_CARD_AUTO_DISMISS = "InterestFeedNoticeCardAutoDismiss"; public static final String INTEREST_FEED_V2 = "InterestFeedV2"; - public static final String INTEREST_FEED_V2_HEARTS = "InterestFeedV2Hearts"; public static final String INTEREST_FEED_V2_AUTOPLAY = "InterestFeedV2Autoplay"; + public static final String INTEREST_FEED_V2_HEARTS = "InterestFeedV2Hearts"; public static final String IS_VOICE_SEARCH_ENABLED_CACHE = "IsVoiceSearchEnabledCache"; - public static final String HISTORY_JOURNEYS = "Journeys"; - public static final String HISTORY_ORGANIC_REPEATABLE_QUERIES = "OrganicRepeatableQueries"; public static final String LEAK_DETECTION_UNAUTHENTICATED = "LeakDetectionUnauthenticated"; + public static final String LENS_CAMERA_ASSISTED_SEARCH = "LensCameraAssistedSearch"; public static final String LENS_ON_QUICK_ACTION_SEARCH_WIDGET = "LensOnQuickActionSearchWidget"; public static final String LIGHTWEIGHT_REACTIONS = "LightweightReactions"; public static final String LOCAL_WEB_APPROVALS = "LocalWebApprovals"; @@ -355,8 +358,8 @@ public static final String MESSAGES_FOR_ANDROID_STACKING_ANIMATION = "MessagesForAndroidStackingAnimation"; public static final String MESSAGES_FOR_ANDROID_SYNC_ERROR = "MessagesForAndroidSyncError"; - public static final String MODAL_PERMISSION_DIALOG_VIEW = "ModalPermissionDialogView"; public static final String METRICS_SETTINGS_ANDROID = "MetricsSettingsAndroid"; + public static final String MODAL_PERMISSION_DIALOG_VIEW = "ModalPermissionDialogView"; public static final String NOTIFICATION_PERMISSION_VARIANT = "NotificationPermissionVariant"; public static final String OFFLINE_PAGES_DESCRIPTIVE_FAIL_STATUS = "OfflinePagesDescriptiveFailStatus"; @@ -398,9 +401,6 @@ public static final String PORTALS = "Portals"; public static final String PORTALS_CROSS_ORIGIN = "PortalsCrossOrigin"; public static final String POST_TASK_FOCUS_TAB = "PostTaskFocusTab"; - public static final String PWA_DEFAULT_OFFLINE_PAGE = "PWAsDefaultOfflinePage"; - public static final String BOOKMARKS_IMPROVED_SAVE_FLOW = "BookmarksImprovedSaveFlow"; - public static final String BOOKMARKS_REFRESH = "BookmarksRefresh"; public static final String PREEMPTIVE_LINK_TO_TEXT_GENERATION = "PreemptiveLinkToTextGeneration"; public static final String PREFETCH_NOTIFICATION_SCHEDULING_INTEGRATION = @@ -413,6 +413,7 @@ public static final String PROBABILISTIC_CRYPTID_RENDERER = "ProbabilisticCryptidRenderer"; public static final String PUSH_MESSAGING_DISALLOW_SENDER_IDS = "PushMessagingDisallowSenderIDs"; + public static final String PWA_DEFAULT_OFFLINE_PAGE = "PWAsDefaultOfflinePage"; public static final String PWA_UPDATE_DIALOG_FOR_ICON = "PwaUpdateDialogForIcon"; public static final String PWA_UPDATE_DIALOG_FOR_NAME = "PwaUpdateDialogForName"; public static final String QUERY_TILES = "QueryTiles"; @@ -422,8 +423,8 @@ public static final String QUICK_ACTION_SEARCH_WIDGET = "QuickActionSearchWidgetAndroid"; public static final String QUIET_NOTIFICATION_PROMPTS = "QuietNotificationPrompts"; public static final String REACHED_CODE_PROFILER = "ReachedCodeProfiler"; - public static final String READ_LATER = "ReadLater"; public static final String READER_MODE_IN_CCT = "ReaderModeInCCT"; + public static final String READ_LATER = "ReadLater"; public static final String RECOVER_FROM_NEVER_SAVE_ANDROID = "RecoverFromNeverSaveAndroid"; public static final String REENGAGEMENT_NOTIFICATION = "ReengagementNotification"; public static final String RELATED_SEARCHES = "RelatedSearches"; @@ -434,60 +435,63 @@ public static final String REQUEST_DESKTOP_SITE_DEFAULTS = "RequestDesktopSiteDefaults"; public static final String REQUEST_DESKTOP_SITE_DEFAULTS_CONTROL = "RequestDesktopSiteDefaultsControl"; - public static final String REQUEST_DESKTOP_SITE_DEFAULTS_DOWNGRADE = - "RequestDesktopSiteDefaultsDowngrade"; public static final String REQUEST_DESKTOP_SITE_DEFAULTS_CONTROL_SYNTHETIC = "RequestDesktopSiteDefaultsControlSynthetic"; + public static final String REQUEST_DESKTOP_SITE_DEFAULTS_DOWNGRADE = + "RequestDesktopSiteDefaultsDowngrade"; public static final String REQUEST_DESKTOP_SITE_DEFAULTS_SYNTHETIC = "RequestDesktopSiteDefaultsSynthetic"; - public static final String REQUEST_DESKTOP_SITE_OPT_IN_SYNTHETIC = - "RequestDesktopSiteOptInSynthetic"; public static final String REQUEST_DESKTOP_SITE_OPT_IN_CONTROL_SYNTHETIC = "RequestDesktopSiteOptInControlSynthetic"; + public static final String REQUEST_DESKTOP_SITE_OPT_IN_SYNTHETIC = + "RequestDesktopSiteOptInSynthetic"; public static final String REQUEST_DESKTOP_SITE_PER_SITE_IPH = "RequestDesktopSitePerSiteIph"; public static final String SAFE_BROWSING_DELAYED_WARNINGS = "SafeBrowsingDelayedWarnings"; public static final String SAFE_MODE_FOR_CACHED_FLAGS = "SafeModeForCachedFlags"; public static final String SCREENSHOTS_FOR_ANDROID_V2 = "ScreenshotsForAndroidV2"; - + public static final String SEARCH_RESUMPTION_MODULE_ANDROID = "SearchResumptionModuleAndroid"; public static final String SEND_TAB_TO_SELF_SIGNIN_PROMO = "SendTabToSelfSigninPromo"; public static final String SEND_TAB_TO_SELF_V2 = "SendTabToSelfV2"; + public static final String SHARED_HIGHLIGHTING_AMP = "SharedHighlightingAmp"; public static final String SHARE_CROW_BUTTON = "ShareCrowButton"; public static final String SHARE_CROW_BUTTON_LAUNCH_TAB = "ShareCrowLaunchTab"; - public static final String SHARED_HIGHLIGHTING_AMP = "SharedHighlightingAmp"; public static final String SHOPPING_LIST = "ShoppingList"; public static final String SHOW_EXTENDED_PRELOADING_SETTING = "ShowExtendedPreloadingSetting"; public static final String SHOW_SCROLLABLE_MVT_ON_NTP_ANDROID = "ShowScrollableMVTOnNTPAndroid"; + public static final String SKIP_SERVICE_WORKER_FOR_INSTALL_PROMPT = + "SkipServiceWorkerForInstallPromot"; public static final String SMART_SUGGESTION_FOR_LARGE_DOWNLOADS = "SmartSuggestionForLargeDownloads"; public static final String SNOOZABLE_IPH = "IPH_Snooze"; - public static final String SPLIT_COMPOSITOR_TASK = "SplitCompositorTask"; public static final String SPLIT_CACHE_BY_NETWORK_ISOLATION_KEY = "SplitCacheByNetworkIsolationKey"; + public static final String SPLIT_COMPOSITOR_TASK = "SplitCompositorTask"; public static final String START_SURFACE_ANDROID = "StartSurfaceAndroid"; - public static final String FEED_MULTI_COLUMN = "DiscoverFeedMultiColumn"; - public static final String TAB_STRIP_REDESIGN = "TabStripRedesign"; - public static final String FEED_POSITION_ANDROID = "FeedPositionAndroid"; - public static final String SEARCH_RESUMPTION_MODULE_ANDROID = "SearchResumptionModuleAndroid"; - public static final String START_SURFACE_RETURN_TIME = "StartSurfaceReturnTime"; - public static final String START_SURFACE_REFACTOR = "StartSurfaceRefactor"; public static final String START_SURFACE_DISABLED_FEED_IMPROVEMENT = "StartSurfaceDisabledFeedImprovement"; + public static final String START_SURFACE_REFACTOR = "StartSurfaceRefactor"; + public static final String START_SURFACE_RETURN_TIME = "StartSurfaceReturnTime"; public static final String STORE_HOURS = "StoreHoursAndroid"; public static final String SUGGESTION_ANSWERS_COLOR_REVERSE = "SuggestionAnswersColorReverse"; public static final String SUPPRESS_TOOLBAR_CAPTURES = "SuppressToolbarCaptures"; public static final String SWAP_PIXEL_FORMAT_TO_FIX_CONVERT_FROM_TRANSLUCENT = "SwapPixelFormatToFixConvertFromTranslucent"; + public static final String SYNC_ANDROID_LIMIT_NTP_PROMO_IMPRESSIONS = + "SyncAndroidLimitNTPPromoImpressions"; + public static final String SYNC_ANDROID_PROMOS_WITH_TITLE = "SyncAndroidPromosWithTitle"; public static final String SYNC_ENABLE_HISTORY_DATA_TYPE = "SyncEnableHistoryDataType"; public static final String TAB_ENGAGEMENT_REPORTING_ANDROID = "TabEngagementReportingAndroid"; + public static final String TAB_GRID_LAYOUT_ANDROID = "TabGridLayoutAndroid"; public static final String TAB_GROUPS_ANDROID = "TabGroupsAndroid"; - public static final String TAB_GROUPS_UI_IMPROVEMENTS_ANDROID = - "TabGroupsUiImprovementsAndroid"; public static final String TAB_GROUPS_CONTINUATION_ANDROID = "TabGroupsContinuationAndroid"; public static final String TAB_GROUPS_FOR_TABLETS = "TabGroupsForTablets"; - public static final String TAB_GRID_LAYOUT_ANDROID = "TabGridLayoutAndroid"; + public static final String TAB_GROUPS_UI_IMPROVEMENTS_ANDROID = + "TabGroupsUiImprovementsAndroid"; public static final String TAB_SELECTION_EDITOR_V2 = "TabSelectionEditorV2"; - public static final String TAB_TO_GTS_ANIMATION = "TabToGTSAnimation"; public static final String TAB_STRIP_IMPROVEMENTS = "TabStripImprovements"; + public static final String TAB_STRIP_REDESIGN = "TabStripRedesign"; + public static final String TAB_TO_GTS_ANIMATION = "TabToGTSAnimation"; + public static final String TANGIBLE_SYNC = "TangibleSync"; public static final String TEST_DEFAULT_DISABLED = "TestDefaultDisabled"; public static final String TEST_DEFAULT_ENABLED = "TestDefaultEnabled"; public static final String TOOLBAR_MIC_IPH_ANDROID = "ToolbarMicIphAndroid"; @@ -505,7 +509,6 @@ "TrustedWebActivityQualityEnforcementForced"; public static final String TRUSTED_WEB_ACTIVITY_QUALITY_ENFORCEMENT_WARNING = "TrustedWebActivityQualityEnforcementWarning"; - public static final String VIDEO_TUTORIALS = "VideoTutorials"; public static final String UNIFIED_CREDENTIAL_MANAGER_DRY_RUN = "UnifiedCredentialManagerDryRun"; public static final String UNIFIED_PASSWORD_MANAGER_ANDROID = "UnifiedPasswordManagerAndroid"; @@ -514,22 +517,18 @@ public static final String UNIFIED_PASSWORD_MANAGER_ERROR_MESSAGES = "UnifiedPasswordManagerErrorMessages"; public static final String UPCOMING_SHARING_FEATURES = "UpcomingSharingFeatures"; - public static final String UPDATE_NOTIFICATION_IMMEDIATE_SHOW_OPTION = - "UpdateNotificationScheduleServiceImmediateShowOption"; public static final String UPDATE_HISTORY_ENTRY_POINTS_IN_INCOGNITO = "UpdateHistoryEntryPointsInIncognito"; + public static final String UPDATE_NOTIFICATION_IMMEDIATE_SHOW_OPTION = + "UpdateNotificationScheduleServiceImmediateShowOption"; public static final String USE_CHIME_ANDROID_SDK = "UseChimeAndroidSdk"; public static final String USE_CLIENT_CONFIG_IPH = "UseClientConfigIPH"; public static final String USE_LIBUNWINDSTACK_NATIVE_UNWINDER_ANDROID = "UseLibunwindstackNativeUnwinderAndroid"; - public static final String VOICE_SEARCH_AUDIO_CAPTURE_POLICY = "VoiceSearchAudioCapturePolicy"; + public static final String VIDEO_TUTORIALS = "VideoTutorials"; public static final String VOICE_BUTTON_IN_TOP_TOOLBAR = "VoiceButtonInTopToolbar"; + public static final String VOICE_SEARCH_AUDIO_CAPTURE_POLICY = "VoiceSearchAudioCapturePolicy"; public static final String VR_BROWSING_FEEDBACK = "VrBrowsingFeedback"; - public static final String WEB_FEED = "WebFeed"; - public static final String WEB_FEED_AWARENESS = "WebFeedAwareness"; - public static final String WEB_FEED_ONBOARDING = "WebFeedOnboarding"; - public static final String WEB_FEED_SORT = "WebFeedSort"; - public static final String WEB_FILTER_INTERSTITIAL_REFRESH = "WebFilterInterstitialRefresh"; public static final String WEBNOTES_DYNAMIC_TEMPLATES = "WebNotesDynamicTemplates"; public static final String WEBNOTES_STYLIZE = "WebNotesStylize"; public static final String WEB_APK_ALLOW_ICON_UPDATA = "WebApkAllowIconUpdate"; @@ -539,18 +538,21 @@ public static final String WEB_APK_TRAMPOLINE_ON_INITIAL_INTENT = "WebApkTrampolineOnInitialIntent"; public static final String WEB_APK_UNIQUE_ID = "WebApkUniqueId"; - public static final String XSURFACE_METRICS_REPORTING = "XsurfaceMetricsReporting"; + public static final String WEB_FEED = "WebFeed"; + public static final String WEB_FEED_AWARENESS = "WebFeedAwareness"; + public static final String WEB_FEED_ONBOARDING = "WebFeedOnboarding"; + public static final String WEB_FEED_SORT = "WebFeedSort"; + public static final String WEB_FILTER_INTERSTITIAL_REFRESH = "WebFilterInterstitialRefresh"; public static final String WEB_OTP_CROSS_DEVICE_SIMPLE_STRING = "WebOtpCrossDeviceSimpleString"; - public static final String FEED_NO_VIEW_CACHE = "FeedNoViewCache"; - public static final String FEED_SHOW_SIGN_IN_COMMAND = "FeedShowSignInCommand"; - public static final String SKIP_SERVICE_WORKER_FOR_INSTALL_PROMPT = - "SkipServiceWorkerForInstallPromot"; + public static final String XSURFACE_METRICS_REPORTING = "XsurfaceMetricsReporting"; /* Alphabetical: */ public static final CachedFlag sAppMenuMobileSiteOption = new CachedFlag(APP_MENU_MOBILE_SITE_OPTION, false); public static final CachedFlag sBackGestureRefactorAndroid = new CachedFlag(BACK_GESTURE_REFACTOR, false); + public static final CachedFlag sBaselineGm3SurfaceColors = + new CachedFlag(BASELINE_GM3_SURFACE_COLORS, false); public static final CachedFlag sCctAutoTranslate = new CachedFlag(CCT_AUTO_TRANSLATE, true); public static final CachedFlag sCctBrandTransparency = new CachedFlag(CCT_BRAND_TRANSPARENCY, false); @@ -583,6 +585,7 @@ new CachedFlag(CRITICAL_PERSISTED_TAB_DATA, false); public static final CachedFlag sDiscardOccludedBitmaps = new CachedFlag(DISCARD_OCCLUDED_BITMAPS, false); + public static final CachedFlag sDiscoverMultiColumn = new CachedFlag(FEED_MULTI_COLUMN, false); public static final CachedFlag sDownloadsAutoResumptionNative = new CachedFlag(DOWNLOADS_AUTO_RESUMPTION_NATIVE, true); public static final CachedFlag sEarlyLibraryLoad = new CachedFlag(EARLY_LIBRARY_LOAD, true); @@ -599,6 +602,8 @@ public static final CachedFlag sInterestFeedV2 = new CachedFlag(INTEREST_FEED_V2, true); public static final CachedFlag sLensCameraAssistedSearch = new CachedFlag(LENS_CAMERA_ASSISTED_SEARCH, true); + public static final CachedFlag sOSKResizesVisualViewportByDefault = + new CachedFlag(OSK_RESIZES_VISUAL_VIEWPORT, false); public static final CachedFlag sOmahaMinSdkVersionAndroid = new CachedFlag(OMAHA_MIN_SDK_VERSION_ANDROID, false); public static final CachedFlag sOmniboxMatchToolbarAndStatusBarColor = @@ -611,8 +616,6 @@ new CachedFlag(OMNIBOX_REMOVE_EXCESSIVE_RECYCLED_VIEW_CLEAR_CALLS, false); public static final CachedFlag sOptimizationGuidePushNotifications = new CachedFlag(OPTIMIZATION_GUIDE_PUSH_NOTIFICATIONS, false); - public static final CachedFlag sOSKResizesVisualViewportByDefault = - new CachedFlag(OSK_RESIZES_VISUAL_VIEWPORT, false); public static final CachedFlag sPaintPreviewDemo = new CachedFlag(PAINT_PREVIEW_DEMO, false); public static final CachedFlag sPrefetchNotificationSchedulingIntegration = new CachedFlag(PREFETCH_NOTIFICATION_SCHEDULING_INTEGRATION, false); @@ -621,12 +624,12 @@ public static final CachedFlag sReadLater = new CachedFlag(READ_LATER, false); public static final CachedFlag sStartSurfaceAndroid = new CachedFlag(START_SURFACE_ANDROID, true); - public static final CachedFlag sStartSurfaceReturnTime = - new CachedFlag(START_SURFACE_RETURN_TIME, false); - public static final CachedFlag sStartSurfaceRefactor = - new CachedFlag(START_SURFACE_REFACTOR, false); public static final CachedFlag sStartSurfaceDisabledFeedImprovement = new CachedFlag(START_SURFACE_DISABLED_FEED_IMPROVEMENT, false); + public static final CachedFlag sStartSurfaceRefactor = + new CachedFlag(START_SURFACE_REFACTOR, false); + public static final CachedFlag sStartSurfaceReturnTime = + new CachedFlag(START_SURFACE_RETURN_TIME, false); public static final CachedFlag sStoreHoursAndroid = new CachedFlag(STORE_HOURS, false); public static final CachedFlag sSwapPixelFormatToFixConvertFromTranslucent = new CachedFlag(SWAP_PIXEL_FORMAT_TO_FIX_CONVERT_FROM_TRANSLUCENT, true); @@ -641,9 +644,8 @@ new CachedFlag(TAB_SELECTION_EDITOR_V2, false); public static final CachedFlag sTabStripImprovements = new CachedFlag(TAB_STRIP_IMPROVEMENTS, true); - public static final CachedFlag sTabToGTSAnimation = new CachedFlag(TAB_TO_GTS_ANIMATION, true); - public static final CachedFlag sDiscoverMultiColumn = new CachedFlag(FEED_MULTI_COLUMN, false); public static final CachedFlag sTabStripRedesign = new CachedFlag(TAB_STRIP_REDESIGN, false); + public static final CachedFlag sTabToGTSAnimation = new CachedFlag(TAB_TO_GTS_ANIMATION, true); public static final CachedFlag sTestDefaultDisabled = new CachedFlag(TEST_DEFAULT_DISABLED, false); public static final CachedFlag sTestDefaultEnabled = new CachedFlag(TEST_DEFAULT_ENABLED, true);
diff --git a/chrome/browser/lacros/input_method_lacros_browsertest.cc b/chrome/browser/lacros/input_method_lacros_browsertest.cc index bc91e77c..fbd384f 100644 --- a/chrome/browser/lacros/input_method_lacros_browsertest.cc +++ b/chrome/browser/lacros/input_method_lacros_browsertest.cc
@@ -225,7 +225,7 @@ } IN_PROC_BROWSER_TEST_F(InputMethodLacrosBrowserTest, - SetCompositionInsertsCompositionInInputField) { + SetCompositionInsertsCompositionInEmptyInputField) { mojo::Remote<InputMethodTestInterface> input_method = BindInputMethodTestInterface( {InputMethodTestInterface::MethodMinVersions::kWaitForFocusMinVersion, @@ -246,6 +246,75 @@ } IN_PROC_BROWSER_TEST_F(InputMethodLacrosBrowserTest, + SetCompositionInsertsCompositionAtStartOfInputField) { + mojo::Remote<InputMethodTestInterface> input_method = + BindInputMethodTestInterface( + {InputMethodTestInterface::MethodMinVersions::kWaitForFocusMinVersion, + InputMethodTestInterface::MethodMinVersions:: + kSetCompositionMinVersion}); + if (!input_method.is_bound()) { + GTEST_SKIP() << "Unsupported ash version"; + } + const std::string id = RenderAutofocusedInputFieldInLacros(browser()); + ASSERT_TRUE(SetInputFieldText(GetActiveWebContents(browser()), id, " world", + gfx::Range(0))); + InputMethodTestInterfaceAsyncWaiter input_method_async_waiter( + input_method.get()); + input_method_async_waiter.WaitForFocus(); + + input_method_async_waiter.SetComposition("hello", 5); + + EXPECT_TRUE(WaitUntilInputFieldHasText(GetActiveWebContents(browser()), id, + "hello world", gfx::Range(5))); +} + +IN_PROC_BROWSER_TEST_F(InputMethodLacrosBrowserTest, + SetCompositionInsertsCompositionAtEndOfInputField) { + mojo::Remote<InputMethodTestInterface> input_method = + BindInputMethodTestInterface( + {InputMethodTestInterface::MethodMinVersions::kWaitForFocusMinVersion, + InputMethodTestInterface::MethodMinVersions:: + kSetCompositionMinVersion}); + if (!input_method.is_bound()) { + GTEST_SKIP() << "Unsupported ash version"; + } + const std::string id = RenderAutofocusedInputFieldInLacros(browser()); + ASSERT_TRUE(SetInputFieldText(GetActiveWebContents(browser()), id, "hello ", + gfx::Range(6))); + InputMethodTestInterfaceAsyncWaiter input_method_async_waiter( + input_method.get()); + input_method_async_waiter.WaitForFocus(); + + input_method_async_waiter.SetComposition("world", 5); + + EXPECT_TRUE(WaitUntilInputFieldHasText(GetActiveWebContents(browser()), id, + "hello world", gfx::Range(11))); +} + +IN_PROC_BROWSER_TEST_F(InputMethodLacrosBrowserTest, + SetCompositionInsertsCompositionInMiddleOfInputField) { + mojo::Remote<InputMethodTestInterface> input_method = + BindInputMethodTestInterface( + {InputMethodTestInterface::MethodMinVersions::kWaitForFocusMinVersion, + InputMethodTestInterface::MethodMinVersions:: + kSetCompositionMinVersion}); + if (!input_method.is_bound()) { + GTEST_SKIP() << "Unsupported ash version"; + } + const std::string id = RenderAutofocusedInputFieldInLacros(browser()); + ASSERT_TRUE(SetInputFieldText(GetActiveWebContents(browser()), id, "held", + gfx::Range(2))); + InputMethodTestInterfaceAsyncWaiter input_method_async_waiter( + input_method.get()); + input_method_async_waiter.WaitForFocus(); + + input_method_async_waiter.SetComposition("llo wor", 3); + + EXPECT_TRUE(WaitUntilInputFieldHasText(GetActiveWebContents(browser()), id, + "hello world", gfx::Range(5))); +} + +IN_PROC_BROWSER_TEST_F(InputMethodLacrosBrowserTest, SetCompositionReplacesCompositionInInputField) { mojo::Remote<InputMethodTestInterface> input_method = BindInputMethodTestInterface(
diff --git a/chrome/browser/resources/BUILD.gn b/chrome/browser/resources/BUILD.gn index f1b930c..27081b600 100644 --- a/chrome/browser/resources/BUILD.gn +++ b/chrome/browser/resources/BUILD.gn
@@ -45,14 +45,17 @@ "privacy_sandbox:resources", "profile_internals:resources", "settings:resources", - "side_panel:resources", "side_panel/bookmarks:resources", "side_panel/customize_chrome:resources", "side_panel/history_clusters:resources", + "side_panel/read_anything:resources", "side_panel/reading_list:resources", + "side_panel/shared:resources", + "side_panel/user_notes:resources", "signin:resources", "support_tool:resources", "tab_search:resources", + "web_app_internals:resources", "webui_gallery:resources", "whats_new:resources", ]
diff --git a/chrome/browser/resources/chromeos/accessibility/chromevox/background/command_handler.js b/chrome/browser/resources/chromeos/accessibility/chromevox/background/command_handler.js index 9676b370..33f86362 100644 --- a/chrome/browser/resources/chromeos/accessibility/chromevox/background/command_handler.js +++ b/chrome/browser/resources/chromeos/accessibility/chromevox/background/command_handler.js
@@ -71,7 +71,7 @@ /** * To support viewGraphicAsBraille_(), the current image node. - * @type {?AutomationNode} + * @private {?AutomationNode} */ this.imageNode_;
diff --git a/chrome/browser/resources/chromeos/accessibility/chromevox/background/output/output.js b/chrome/browser/resources/chromeos/accessibility/chromevox/background/output/output.js index e853114c..dc57d7d7 100644 --- a/chrome/browser/resources/chromeos/accessibility/chromevox/background/output/output.js +++ b/chrome/browser/resources/chromeos/accessibility/chromevox/background/output/output.js
@@ -623,97 +623,6 @@ new OutputFormatParser(formatter).parse(params.outputFormat); } - /** @override */ - formatMessage_(data, token, tree, options) { - const buff = data.outputBuffer; - const node = data.node; - const formatLog = data.outputFormatLogger; - - const isPluralized = (token[0] === '@'); - if (isPluralized) { - token = token.slice(1); - } - // Tokens can have substitutions. - const pieces = token.split('+'); - token = pieces.reduce((prev, cur) => { - let lookup = cur; - if (cur[0] === '$') { - lookup = node[cur.slice(1)]; - } - return prev + lookup; - }, ''); - const msgId = token; - let msgArgs = []; - formatLog.write(token + '{'); - if (!isPluralized) { - let curArg = tree.firstChild; - while (curArg) { - if (curArg.value[0] !== '$') { - const errorMsg = 'Unexpected value: ' + curArg.value; - formatLog.writeError(errorMsg); - console.error(errorMsg); - return; - } - let msgBuff = []; - this.format_({ - node, - outputFormat: curArg, - outputBuffer: msgBuff, - outputFormatLogger: formatLog, - }); - // Fill in empty string if nothing was formatted. - if (!msgBuff.length) { - msgBuff = ['']; - } - msgArgs = msgArgs.concat(msgBuff); - curArg = curArg.nextSibling; - } - } - let msg = Msgs.getMsg(msgId, msgArgs); - try { - if (this.formatOptions_.braille) { - msg = Msgs.getMsg(msgId + '_brl', msgArgs) || msg; - } - } catch (e) { - } - - if (!msg) { - const errorMsg = 'Could not get message ' + msgId; - formatLog.writeError(errorMsg); - console.error(errorMsg); - return; - } - - if (isPluralized) { - const arg = tree.firstChild; - if (!arg || arg.nextSibling) { - const errorMsg = 'Pluralized messages take exactly one argument'; - formatLog.writeError(errorMsg); - console.error(errorMsg); - return; - } - if (arg.value[0] !== '$') { - const errorMsg = 'Unexpected value: ' + arg.value; - formatLog.writeError(errorMsg); - console.error(errorMsg); - return; - } - const argBuff = []; - this.format_({ - node, - outputFormat: arg, - outputBuffer: argBuff, - outputFormatLogger: formatLog, - }); - const namedArgs = {COUNT: Number(argBuff[0])}; - msg = new goog.i18n.MessageFormat(msg).format(namedArgs); - } - formatLog.write('}'); - - this.append_(buff, msg, options); - formatLog.write(': ' + msg + '\n'); - } - /** * @param {!CursorRange} range * @param {CursorRange} prevRange
diff --git a/chrome/browser/resources/chromeos/accessibility/chromevox/background/output/output_formatter.js b/chrome/browser/resources/chromeos/accessibility/chromevox/background/output/output_formatter.js index fc834c43..3619625 100644 --- a/chrome/browser/resources/chromeos/accessibility/chromevox/background/output/output_formatter.js +++ b/chrome/browser/resources/chromeos/accessibility/chromevox/background/output/output_formatter.js
@@ -129,7 +129,7 @@ } this.speechProps_.properties['relativePitch'] = -0.2; } - this.output_.formatMessage_(this.params_, token, tree, options); + this.formatMessage_(this.params_, token, tree, options); } /** @override */ @@ -567,6 +567,104 @@ /** * @param {!outputTypes.OutputFormattingData} data * @param {string} token + * @param {!OutputFormatTree} tree + * @param {!{annotation: Array<*>, isUnique: (boolean|undefined)}} options + * @private + */ + formatMessage_(data, token, tree, options) { + const buff = data.outputBuffer; + const node = data.node; + const formatLog = data.outputFormatLogger; + + const isPluralized = (token[0] === '@'); + if (isPluralized) { + token = token.slice(1); + } + // Tokens can have substitutions. + const pieces = token.split('+'); + token = pieces.reduce((prev, cur) => { + let lookup = cur; + if (cur[0] === '$') { + lookup = node[cur.slice(1)]; + } + return prev + lookup; + }, ''); + const msgId = token; + let msgArgs = []; + formatLog.write(token + '{'); + if (!isPluralized) { + let curArg = tree.firstChild; + while (curArg) { + if (curArg.value[0] !== '$') { + const errorMsg = 'Unexpected value: ' + curArg.value; + formatLog.writeError(errorMsg); + console.error(errorMsg); + return; + } + let msgBuff = []; + this.output_.format_({ + node, + outputFormat: curArg, + outputBuffer: msgBuff, + outputFormatLogger: formatLog, + }); + // Fill in empty string if nothing was formatted. + if (!msgBuff.length) { + msgBuff = ['']; + } + msgArgs = msgArgs.concat(msgBuff); + curArg = curArg.nextSibling; + } + } + let msg = Msgs.getMsg(msgId, msgArgs); + try { + if (this.output_.formatAsBraille) { + msg = Msgs.getMsg(msgId + '_brl', msgArgs) || msg; + } + } catch (e) { + // TODO(accessibility): Handle whatever error this is. + } + + if (!msg) { + const errorMsg = 'Could not get message ' + msgId; + formatLog.writeError(errorMsg); + console.error(errorMsg); + return; + } + + if (isPluralized) { + const arg = tree.firstChild; + if (!arg || arg.nextSibling) { + const errorMsg = 'Pluralized messages take exactly one argument'; + formatLog.writeError(errorMsg); + console.error(errorMsg); + return; + } + if (arg.value[0] !== '$') { + const errorMsg = 'Unexpected value: ' + arg.value; + formatLog.writeError(errorMsg); + console.error(errorMsg); + return; + } + const argBuff = []; + this.output_.format_({ + node, + outputFormat: arg, + outputBuffer: argBuff, + outputFormatLogger: formatLog, + }); + const namedArgs = {COUNT: Number(argBuff[0])}; + msg = new goog.i18n.MessageFormat(msg).format(namedArgs); + } + formatLog.write('}'); + + this.output_.append_(buff, msg, options); + formatLog.write(': ' + msg + '\n'); + } + + /** + * @param {!outputTypes.OutputFormattingData} data + * @param {string} token * @param {!{annotation: Array<*>, isUnique: (boolean|undefined)}} options */ formatName_(data, token, options) {
diff --git a/chrome/browser/resources/chromeos/accessibility/chromevox/background/output/output_interface.js b/chrome/browser/resources/chromeos/accessibility/chromevox/background/output/output_interface.js index 2968db4..8895dc45 100644 --- a/chrome/browser/resources/chromeos/accessibility/chromevox/background/output/output_interface.js +++ b/chrome/browser/resources/chromeos/accessibility/chromevox/background/output/output_interface.js
@@ -49,14 +49,6 @@ format_(params) {} /** - * @param {!outputTypes.OutputFormattingData} data - * @param {string} token - * @param {!OutputFormatTree} tree - * @param {!{annotation: Array<*>, isUnique: (boolean|undefined)}} options - */ - formatMessage_(data, token, tree, options) {} - - /** * @param {!AutomationNode} node * @param {!AutomationNode} prevNode * @param {!outputTypes.OutputEventType} type
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 fe0582c..919825b2 100644 --- a/chrome/browser/resources/chromeos/accessibility/chromevox/common/command_store.js +++ b/chrome/browser/resources/chromeos/accessibility/chromevox/common/command_store.js
@@ -29,67 +29,66 @@ * categories. */ -export const CommandStore = {}; +export class CommandStore { + /** + * Gets a message given a command. + * @param {!Command} command The command to query. + * @return {string|undefined} The message id, if any. + */ + static messageForCommand(command) { + return (CommandStore.CMD_ALLOWLIST[command] || {}).msgId; + } -/** - * Gets a message given a command. - * @param {!Command} command The command to query. - * @return {string|undefined} The message id, if any. - */ -CommandStore.messageForCommand = function(command) { - return (CommandStore.CMD_ALLOWLIST[command] || {}).msgId; -}; + /** + * Gets a category given a command. + * @param {!Command} command The command to query. + * @return {string|undefined} The category, if any. + */ + static categoryForCommand(command) { + return (CommandStore.CMD_ALLOWLIST[command] || {}).category; + } - -/** - * Gets a category given a command. - * @param {!Command} command The command to query. - * @return {string|undefined} The category, if any. - */ -CommandStore.categoryForCommand = function(command) { - return (CommandStore.CMD_ALLOWLIST[command] || {}).category; -}; - -/** - * Gets the first command associated with the message id - * @param {string} msgId - * @return {!Command|undefined} The command, if any. - */ -CommandStore.commandForMessage = function(msgId) { - for (const commandName in CommandStore.CMD_ALLOWLIST) { - const command = CommandStore.CMD_ALLOWLIST[commandName]; - if (command.msgId === msgId) { - return commandName; + /** + * Gets the first command associated with the message id + * @param {string} msgId + * @return {!Command|undefined} The command, if any. + */ + static commandForMessage(msgId) { + for (const commandName in CommandStore.CMD_ALLOWLIST) { + const command = CommandStore.CMD_ALLOWLIST[commandName]; + if (command.msgId === msgId) { + return commandName; + } } } -}; -/** - * Gets all commands for a category. - * @param {string} category The category to query. - * @return {Array<!Command>} The commands, if any. - */ -CommandStore.commandsForCategory = function(category) { - const ret = []; - for (const cmd in CommandStore.CMD_ALLOWLIST) { - const struct = CommandStore.CMD_ALLOWLIST[cmd]; - if (category === struct.category) { - ret.push(cmd); + /** + * Gets all commands for a category. + * @param {string} category The category to query. + * @return {Array<!Command>} The commands, if any. + */ + static commandsForCategory(category) { + const ret = []; + for (const cmd in CommandStore.CMD_ALLOWLIST) { + const struct = CommandStore.CMD_ALLOWLIST[cmd]; + if (category === struct.category) { + ret.push(cmd); + } } + return ret; } - return ret; -}; -/** - * @param {!Command} command The command to query. - * @return {boolean} Whether or not this command is denied in the OOBE. - */ -CommandStore.denySignedOut = function(command) { - if (!CommandStore.CMD_ALLOWLIST[command]) { - return false; + /** + * @param {!Command} command The command to query. + * @return {boolean} Whether or not this command is denied in the OOBE. + */ + static denySignedOut(command) { + if (!CommandStore.CMD_ALLOWLIST[command]) { + return false; + } + return Boolean(CommandStore.CMD_ALLOWLIST[command].denySignedOut); } - return Boolean(CommandStore.CMD_ALLOWLIST[command].denySignedOut); -}; +} /** * List of commands. Please keep list alphabetical.
diff --git a/chrome/browser/resources/chromeos/accessibility/chromevox/options/bluetooth_braille_display_manager.js b/chrome/browser/resources/chromeos/accessibility/chromevox/options/bluetooth_braille_display_manager.js index a6a870b..2e678319 100644 --- a/chrome/browser/resources/chromeos/accessibility/chromevox/options/bluetooth_braille_display_manager.js +++ b/chrome/browser/resources/chromeos/accessibility/chromevox/options/bluetooth_braille_display_manager.js
@@ -156,9 +156,7 @@ this.connectInternal(display); } else { chrome.bluetoothPrivate.disconnectAll( - this.preferredDisplayAddress_, () => { - this.connectInternal(display); - }); + this.preferredDisplayAddress_, () => this.connectInternal(display)); } }
diff --git a/chrome/browser/resources/chromeos/accessibility/chromevox/options/options.js b/chrome/browser/resources/chromeos/accessibility/chromevox/options/options.js index dbab73b..d6fc9d2a 100644 --- a/chrome/browser/resources/chromeos/accessibility/chromevox/options/options.js +++ b/chrome/browser/resources/chromeos/accessibility/chromevox/options/options.js
@@ -38,18 +38,13 @@ OptionsPage.brailleTables = tables; OptionsPage.populateBrailleTablesSelect(); }); - chrome.storage.local.get({'brailleWordWrap': true}, function(items) { - $('brailleWordWrap').checked = items.brailleWordWrap; - }); - chrome.storage.local.get({'virtualBrailleRows': 1}, function(items) { - $('virtual_braille_display_rows_input').value = - items['virtualBrailleRows']; - }); - chrome.storage.local.get({'virtualBrailleColumns': 40}, function(items) { - $('virtual_braille_display_columns_input').value = - items['virtualBrailleColumns']; - }); + $('brailleWordWrap').checked = LocalStorage.get('brailleWordWrap', true); + $('virtual_braille_display_rows_input').value = + LocalStorage.get('virtualBrailleRows', 1); + $('virtual_braille_display_columns_input').value = + LocalStorage.get('virtualBrailleColumns', 40); + const changeToInterleave = Msgs.getMsg('options_change_current_display_style_interleave'); const changeToSideBySide = @@ -151,12 +146,9 @@ document.addEventListener('click', OptionsPage.eventListener, false); document.addEventListener('keydown', OptionsPage.eventListener, false); - window.addEventListener('storage', event => { - if (event.key === 'speakTextUnderMouse') { - chrome.accessibilityPrivate.enableMouseEvents( - event.newValue === String(true)); - } - }); + LocalStorage.addListenerForKey( + 'speakTextUnderMouse', + enabled => chrome.accessibilityPrivate.enableMouseEvents(enabled)); const clearVirtualDisplay = function() { const groups = []; @@ -295,7 +287,7 @@ select.addEventListener('change', function(evt) { const selIndex = select.selectedIndex; const sel = select.options[selIndex]; - chrome.storage.local.set({voiceName: sel.voiceName}); + LocalStorage.set('voiceName', sel.voiceName); }, true); } @@ -454,7 +446,7 @@ setTimeout(function() { const target = event.target; if (target.id === 'brailleWordWrap') { - chrome.storage.local.set({brailleWordWrap: target.checked}); + LocalStorage.set(target.id, target.checked); } else if (target.className.indexOf('logging') !== -1) { BackgroundBridge.ChromeVoxPrefs.setLoggingPrefs( target.name, target.checked); @@ -509,21 +501,15 @@ return; } else if ( parseInt($(id).value, 10) < 1 || parseInt($(id).value, 10) > 99) { - chrome.storage.local.get(pref, function(items) { - $(id).value = items[pref]; - }); + $(id).value = LocalStorage.get(pref); } else { - const items = {}; - items[pref] = $(id).value; - chrome.storage.local.set(items); + LocalStorage.set(pref, $(id).value); } }, true); $(id).addEventListener('focusout', function(evt) { if ($(id).value === '') { - chrome.storage.local.get(pref, function(items) { - $(id).value = items[pref]; - }); + $(id).value = LocalStorage.get(pref); } }, true); };
diff --git a/chrome/browser/resources/chromeos/emoji_picker/emoji_button.ts b/chrome/browser/resources/chromeos/emoji_picker/emoji_button.ts index 0400bba..02d57d3 100644 --- a/chrome/browser/resources/chromeos/emoji_picker/emoji_button.ts +++ b/chrome/browser/resources/chromeos/emoji_picker/emoji_button.ts
@@ -12,7 +12,7 @@ import {PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js'; import {getTemplate} from './emoji_button.html.js'; -import {createCustomEvent, EMOJI_BUTTON_CLICK, EMOJI_VARIANTS_SHOWN, EmojiButtonClickEvent, EmojiVariantsShownEvent} from './events.js'; +import {createCustomEvent, EMOJI_IMG_BUTTON_CLICK, EMOJI_TEXT_BUTTON_CLICK, EMOJI_VARIANTS_SHOWN, EmojiImgButtonClickEvent, EmojiTextButtonClickEvent, EmojiVariantsShownEvent} from './events.js'; import {CategoryEnum, Emoji} from './types.js'; export class EmojiButton extends PolymerElement { @@ -52,7 +52,7 @@ if (this.disabled) { return; } - this.dispatchEvent(createCustomEvent(EMOJI_BUTTON_CLICK, { + this.dispatchEvent(createCustomEvent(EMOJI_TEXT_BUTTON_CLICK, { text: this.emoji, isVariant: this.variant, baseEmoji: this.base, @@ -78,7 +78,8 @@ } interface HTMLElementEventMap { [EMOJI_VARIANTS_SHOWN]: EmojiVariantsShownEvent; - [EMOJI_BUTTON_CLICK]: EmojiButtonClickEvent; + [EMOJI_TEXT_BUTTON_CLICK]: EmojiTextButtonClickEvent; + [EMOJI_IMG_BUTTON_CLICK]: EmojiImgButtonClickEvent; } }
diff --git a/chrome/browser/resources/chromeos/emoji_picker/emoji_group.html b/chrome/browser/resources/chromeos/emoji_picker/emoji_group.html index bffba8a..f1d1fe6 100644 --- a/chrome/browser/resources/chromeos/emoji_picker/emoji_group.html +++ b/chrome/browser/resources/chromeos/emoji_picker/emoji_group.html
@@ -254,7 +254,8 @@ <template is="dom-if" if="[[isVisual(category)]]"> <div class="left-column"> <template is="dom-repeat" items="[[filterColumn(data, 'left')]]"> - <img class="emoji-button" + <img data-index$="[[getIndex(item)]]" + class="emoji-button" is="cr-auto-img" auto-src$="[[getUrl(item)]]]" alt$="[[item.base.name]]"> @@ -262,7 +263,8 @@ </div> <div class="right-column"> <template is="dom-repeat" items="[[filterColumn(data, 'right')]]"> - <img class="emoji-button" + <img data-index$="[[getIndex(item)]]" + class="emoji-button" is="cr-auto-img" auto-src$="[[getUrl(item)]]" alt$="[[item.base.name]]">
diff --git a/chrome/browser/resources/chromeos/emoji_picker/emoji_group.ts b/chrome/browser/resources/chromeos/emoji_picker/emoji_group.ts index 2c71c5e..b877924 100644 --- a/chrome/browser/resources/chromeos/emoji_picker/emoji_group.ts +++ b/chrome/browser/resources/chromeos/emoji_picker/emoji_group.ts
@@ -11,7 +11,7 @@ import {beforeNextRender, PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js'; import {getTemplate} from './emoji_group.html.js'; -import {createCustomEvent, EMOJI_BUTTON_CLICK, EMOJI_CLEAR_RECENTS_CLICK, EMOJI_VARIANTS_SHOWN, EmojiButtonClickEvent, EmojiClearRecentClickEvent} from './events.js'; +import {createCustomEvent, EMOJI_CLEAR_RECENTS_CLICK, EMOJI_IMG_BUTTON_CLICK, EMOJI_TEXT_BUTTON_CLICK, EMOJI_VARIANTS_SHOWN, EmojiClearRecentClickEvent, EmojiTextButtonClickEvent} from './events.js'; import {CategoryEnum, EmojiVariants} from './types.js'; // Note - grid-layout and flex-layout names are used directly in CSS. @@ -157,10 +157,11 @@ return; } + // Text-based emoji clicked if (emoji.base.string) { const text = this.getDisplayEmojiForEmoji(emoji.base.string); - this.dispatchEvent(createCustomEvent(EMOJI_BUTTON_CLICK, { + this.dispatchEvent(createCustomEvent(EMOJI_TEXT_BUTTON_CLICK, { text: text, isVariant: text !== emoji.base.string, baseEmoji: emoji.base.string, @@ -168,6 +169,13 @@ name: emoji.base.name, category: this.category, })); + } else { + // Visual-based emoji clicked + this.dispatchEvent(createCustomEvent(EMOJI_IMG_BUTTON_CLICK, { + name: emoji.base.name, + visualContent: emoji.base.visualContent, + category: this.category, + })); } } @@ -293,7 +301,8 @@ |undefined { const dataIndex = target?.getAttribute('data-index'); - if (target?.nodeName !== 'BUTTON' || !dataIndex) { + if (!(target?.nodeName === 'BUTTON' || target?.nodeName === 'IMG') || + !dataIndex) { return undefined; } return this.data[Number(dataIndex)]; @@ -354,6 +363,13 @@ getUrl(item: EmojiVariants): string|undefined { return item.base.visualContent?.url.preview.url; } + + /** + * Returns the index of a visual based EmojiVariant. + */ + getIndex(item: EmojiVariants): number { + return this.data.indexOf(item); + } } declare global { @@ -362,8 +378,8 @@ } interface HTMLElementEventMap { [EMOJI_CLEAR_RECENTS_CLICK]: EmojiClearRecentClickEvent; - [EMOJI_BUTTON_CLICK]: EmojiButtonClickEvent; + [EMOJI_TEXT_BUTTON_CLICK]: EmojiTextButtonClickEvent; } } -customElements.define(EmojiGroupComponent.is, EmojiGroupComponent); +customElements.define(EmojiGroupComponent.is, EmojiGroupComponent); \ No newline at end of file
diff --git a/chrome/browser/resources/chromeos/emoji_picker/emoji_picker.ts b/chrome/browser/resources/chromeos/emoji_picker/emoji_picker.ts index c1d58be..23b7db0a 100644 --- a/chrome/browser/resources/chromeos/emoji_picker/emoji_picker.ts +++ b/chrome/browser/resources/chromeos/emoji_picker/emoji_picker.ts
@@ -23,7 +23,7 @@ import * as events from './events.js'; import {CATEGORY_METADATA, CATEGORY_TABS, EMOJI_GROUP_TABS, GIF_CATEGORY_METADATA, gifCategoryTabs, SUBCATEGORY_TABS, TABS_CATEGORY_START_INDEX, TABS_CATEGORY_START_INDEX_GIF_SUPPORT} from './metadata_extension.js'; import {RecentlyUsedStore} from './store.js'; -import {CategoryEnum, Emoji, EmojiGroupData, EmojiGroupElement, EmojiVariants, SubcategoryData} from './types.js'; +import {CategoryEnum, Emoji, EmojiGroupData, EmojiGroupElement, EmojiVariants, SubcategoryData, VisualContent} from './types.js'; export class EmojiPicker extends PolymerElement { static get is() { @@ -116,8 +116,13 @@ (ev: events.GroupButtonClickEvent) => this.selectGroup(ev.detail.group)); this.addEventListener( - events.EMOJI_BUTTON_CLICK, - (ev: events.EmojiButtonClickEvent) => this.onEmojiButtonClick(ev)); + events.EMOJI_TEXT_BUTTON_CLICK, + (ev: events.EmojiTextButtonClickEvent) => + this.onEmojiTextButtonClick(ev)); + this.addEventListener( + events.EMOJI_IMG_BUTTON_CLICK, + (ev: events.EmojiImgButtonClickEvent) => + this.onEmojiImgButtonClick(ev)); this.addEventListener( events.EMOJI_CLEAR_RECENTS_CLICK, (ev: events.EmojiClearRecentClickEvent) => this.clearRecentEmoji(ev)); @@ -452,11 +457,16 @@ this.highlightBarMoving = false; } - private onEmojiButtonClick(ev: events.EmojiButtonClickEvent) { + private onEmojiTextButtonClick(ev: events.EmojiTextButtonClickEvent) { const category = ev.detail.category; this.insertText(category, ev.detail); } + private onEmojiImgButtonClick(ev: events.EmojiImgButtonClickEvent) { + const category = ev.detail.category; + this.insertVisualContent(category, ev.detail); + } + async insertText(category: CategoryEnum, item: { emoji: string, isVariant: boolean, @@ -469,7 +479,7 @@ message.textContent = text + ' inserted.'; } - this.insertHistoryItem(category, { + this.insertHistoryTextItem(category, { selectedEmoji: text, baseEmoji: baseEmoji, alternates: allVariants || [], @@ -485,6 +495,17 @@ this.apiProxy.insertEmoji(text, isVariant, searchLength); } + insertVisualContent(category: CategoryEnum, item: { + name: string, + visualContent: VisualContent, + }) { + this.insertHistoryVisualContentItem(category, item); + + // TODO(b/264825662): Actually insert GIF to input field. + // Currently the Emoji Picker stays open and users need to + // close and re-open the Emoji Picker to see recently used GIFs. + } + clearRecentEmoji(event: events.EmojiClearRecentClickEvent) { const category = event.detail.category; this.clearHistoryData(category); @@ -753,7 +774,12 @@ return this.categoriesHistory[category]?.data?.history?.map( emoji => ({ - base: {string: emoji.base, name: emoji.name, keywords: []}, + base: { + string: emoji.base.string, + name: emoji.base.name, + visualContent: emoji.base.visualContent, + keywords: [], + }, alternates: emoji.alternates.map( (alternate: Emoji): Emoji => { @@ -813,7 +839,7 @@ * incognito state. * */ - insertHistoryItem(category: CategoryEnum, item: { + insertHistoryTextItem(category: CategoryEnum, item: { selectedEmoji: string, baseEmoji: string, alternates: Emoji[], @@ -826,7 +852,8 @@ const {selectedEmoji, baseEmoji, alternates, name} = item; this.categoriesHistory[category]?.bumpItem( - {base: selectedEmoji, alternates: alternates, name: name}); + category, + {base: {string: selectedEmoji, name: name}, alternates: alternates}); const preferenceUpdated = this.categoriesHistory[category]?.savePreferredVariant( @@ -836,6 +863,27 @@ } /** + * Inserts a new item to the history of a visual content category. It will do + * nothing during incognito state. + */ + insertHistoryVisualContentItem(category: CategoryEnum, item: { + visualContent: VisualContent, + name: string, + }) { + if (this.incognito) { + return; + } + + const {name, visualContent} = item; + + this.categoriesHistory[category]?.bumpItem( + category, + {base: {visualContent: visualContent, name: name}, alternates: []}); + + this.categoryHistoryUpdated(category, true, undefined); + } + + /** * Clears history items for a category. */ clearHistoryData(category: CategoryEnum) {
diff --git a/chrome/browser/resources/chromeos/emoji_picker/events.ts b/chrome/browser/resources/chromeos/emoji_picker/events.ts index c9b1f1a..baaf5d4 100644 --- a/chrome/browser/resources/chromeos/emoji_picker/events.ts +++ b/chrome/browser/resources/chromeos/emoji_picker/events.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 {CategoryEnum, Emoji} from './types'; +import {CategoryEnum, Emoji, VisualContent} from './types'; export type CategoryButtonClickEvent = CustomEvent<{categoryName: CategoryEnum}>; @@ -13,7 +13,7 @@ export const GROUP_BUTTON_CLICK = 'group-button-click'; -export type EmojiButtonClickEvent = CustomEvent<{ +export type EmojiTextButtonClickEvent = CustomEvent<{ emoji: string, isVariant: boolean, baseEmoji: string, @@ -23,7 +23,15 @@ category: CategoryEnum, }>; -export const EMOJI_BUTTON_CLICK = 'emoji-button-click'; +export const EMOJI_TEXT_BUTTON_CLICK = 'emoji-text-button-click'; + +export type EmojiImgButtonClickEvent = CustomEvent<{ + name: string, + visualContent: VisualContent, + category: CategoryEnum, +}>; + +export const EMOJI_IMG_BUTTON_CLICK = 'emoji-img-button-click'; /** * TODO(b/233130994): Update the type after removing emoji-button.
diff --git a/chrome/browser/resources/chromeos/emoji_picker/store.ts b/chrome/browser/resources/chromeos/emoji_picker/store.ts index 0ff9fb7..89eda4c 100644 --- a/chrome/browser/resources/chromeos/emoji_picker/store.ts +++ b/chrome/browser/resources/chromeos/emoji_picker/store.ts
@@ -2,13 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import {StoredItem} from './types.js'; +import {CategoryEnum, EmojiVariants} from './types.js'; -const MAX_RECENTS = 18; +const MAX_TEXT_RECENTS = 18; +const MAX_GIF_RECENTS = 10; /** * @param {string} keyName Keyname of the object stored in storage - * @return {{history:!Array<StoredItem>, preference:Object<string,string>}} + * @return {{history:!Array<EmojiVariants>, preference:Object<string,string>}} * recently used emoji, most recent first. */ function load(keyName: string) { @@ -22,18 +23,18 @@ } /** - * @param {{history:!Array<StoredItem>, preference:Object<string,string>}} data - * recently used emoji, most recent first. + * @param {{history:!Array<EmojiVariants>, preference:Object<string,string>}} + * data recently used emoji, most recent first. */ function save( keyName: string, - data: {history: StoredItem[], preference: {[index: string]: string}}) { + data: {history: EmojiVariants[], preference: {[index: string]: string}}) { window.localStorage.setItem(keyName, JSON.stringify(data)); } export class RecentlyUsedStore { storeName: string; - data: {history: StoredItem[], preference: {[index: string]: string}}; + data: {history: EmojiVariants[], preference: {[index: string]: string}}; constructor(name: string) { this.storeName = name; this.data = load(name); @@ -77,11 +78,25 @@ * Moves the given item to the front of the MRU list, inserting it if * it did not previously exist. */ - bumpItem(newItem: StoredItem) { + bumpItem(category: CategoryEnum, newItem: EmojiVariants) { // Find and remove newItem from array if it previously existed. // Note, this explicitly allows for multiple recent item entries for the // same "base" emoji just with a different variant. - const oldIndex = this.data.history.findIndex(x => x.base === newItem.base); + let oldIndex; + + // TODO(b/264931830): Change x.base.name to x.base.visualContent.id after id + // property is added to the visualContent interface. + if (category === CategoryEnum.GIF) { + oldIndex = + this.data.history.findIndex(x => x.base.name === newItem.base.name); + } else { + oldIndex = this.data.history.findIndex( + x => x.base.string === newItem.base.string); + } + + const MAX_RECENTS = + category === CategoryEnum.GIF ? MAX_GIF_RECENTS : MAX_TEXT_RECENTS; + if (oldIndex !== -1) { this.data.history.splice(oldIndex, 1); }
diff --git a/chrome/browser/resources/chromeos/emoji_picker/types.ts b/chrome/browser/resources/chromeos/emoji_picker/types.ts index c13cd6d9..70b014bf 100644 --- a/chrome/browser/resources/chromeos/emoji_picker/types.ts +++ b/chrome/browser/resources/chromeos/emoji_picker/types.ts
@@ -43,12 +43,6 @@ previewSize: Size; } -export interface StoredItem { - base: string; - alternates: Emoji[]; - name: string; -} - export interface SubcategoryData { name: string; icon?: string;
diff --git a/chrome/browser/resources/component_extension_resources.grd b/chrome/browser/resources/component_extension_resources.grd index a18ff42..130114b6 100644 --- a/chrome/browser/resources/component_extension_resources.grd +++ b/chrome/browser/resources/component_extension_resources.grd
@@ -77,11 +77,11 @@ <include name="IDS_ARC_INPUT_OVERLAY_ONBOARDING_ILLUSTRATION" file="chromeos/arc_input_overlay/onboarding_illustration.png" type="BINDATA" /> <include name="IDS_ARC_INPUT_OVERLAY_ONBOARDING_ILLUSTRATION_DARK" file="chromeos/arc_input_overlay/onboarding_illustration_dark.png" type="BINDATA" /> </if> - <include name="IDS_READ_ANYTHING_DEFAULT_PNG" file="side_panel/images/read_anything_default.png" type="BINDATA" /> - <include name="IDS_READ_ANYTHING_LIGHT_PNG" file="side_panel/images/read_anything_light.png" type="BINDATA" /> - <include name="IDS_READ_ANYTHING_DARK_PNG" file="side_panel/images/read_anything_dark.png" type="BINDATA" /> - <include name="IDS_READ_ANYTHING_YELLOW_PNG" file="side_panel/images/read_anything_yellow.png" type="BINDATA" /> - <include name="IDS_READ_ANYTHING_BLUE_PNG" file="side_panel/images/read_anything_blue.png" type="BINDATA" /> + <include name="IDS_READ_ANYTHING_DEFAULT_PNG" file="side_panel/read_anything/images/read_anything_default.png" type="BINDATA" /> + <include name="IDS_READ_ANYTHING_LIGHT_PNG" file="side_panel/read_anything/images/read_anything_light.png" type="BINDATA" /> + <include name="IDS_READ_ANYTHING_DARK_PNG" file="side_panel/read_anything/images/read_anything_dark.png" type="BINDATA" /> + <include name="IDS_READ_ANYTHING_YELLOW_PNG" file="side_panel/read_anything/images/read_anything_yellow.png" type="BINDATA" /> + <include name="IDS_READ_ANYTHING_BLUE_PNG" file="side_panel/read_anything/images/read_anything_blue.png" type="BINDATA" /> </includes> </release> </grit>
diff --git a/chrome/browser/resources/settings/chromeos/device_page/fake_input_device_settings_provider.ts b/chrome/browser/resources/settings/chromeos/device_page/fake_input_device_settings_provider.ts index cdfa6b32..137d01d9 100644 --- a/chrome/browser/resources/settings/chromeos/device_page/fake_input_device_settings_provider.ts +++ b/chrome/browser/resources/settings/chromeos/device_page/fake_input_device_settings_provider.ts
@@ -4,7 +4,7 @@ import {assert} from 'chrome://resources/js/assert_ts.js'; -import {InputDeviceSettingsProviderInterface, Keyboard, KeyboardObserverInterface, Touchpad, TouchpadObserverInterface} from './input_device_settings_types.js'; +import {InputDeviceSettingsProviderInterface, Keyboard, KeyboardObserverInterface, Mouse, MouseObserver, Touchpad, TouchpadObserverInterface} from './input_device_settings_types.js'; /** * @fileoverview @@ -15,6 +15,7 @@ interface InputDeviceType { fakeKeyboards: Keyboard[]; fakeTouchpads: Touchpad[]; + fakeMice: Mouse[]; } class FakeMethodState { @@ -69,6 +70,7 @@ // Setup method resolvers. this.methods.register('fakeKeyboards'); this.methods.register('fakeTouchpads'); + this.methods.register('fakeMice'); } setFakeKeyboards(keyboards: Keyboard[]): void { @@ -87,6 +89,14 @@ return this.methods.resolveMethod('fakeTouchpads'); } + setFakeMice(mice: Mouse[]): void { + this.methods.setResult('fakeMice', mice); + } + + getFakeMice(): Promise<Mouse[]> { + return this.methods.resolveMethod('fakeMice'); + } + observeKeyboardSettings(_observer: KeyboardObserverInterface): void { // TODO(yyhyyh): Implement observeKeyboardSettings(). } @@ -102,4 +112,12 @@ stopObserveTouchpadSettings(_observer: TouchpadObserverInterface): void { // TODO(yyhyyh): Implement stopObserveTouchpadSettings(). } + + observeMouseSettings(_observer: MouseObserver): void { + // TODO(yyhyyh): Implement observeMouseSettings(). + } + + stopObserveMouseSettings(_observer: MouseObserver): void { + // TODO(yyhyyh): Implement stopObserveMouseSettings(). + } }
diff --git a/chrome/browser/resources/settings/chromeos/device_page/input_device_settings_types.ts b/chrome/browser/resources/settings/chromeos/device_page/input_device_settings_types.ts index 73d13502..869cd9e 100644 --- a/chrome/browser/resources/settings/chromeos/device_page/input_device_settings_types.ts +++ b/chrome/browser/resources/settings/chromeos/device_page/input_device_settings_types.ts
@@ -50,6 +50,13 @@ isHaptic: boolean; } +export interface Mouse { + id: number; + name: string; + // This property represents whether or not the mouse is an external device. + isExternal: boolean; +} + export interface KeyboardSettings { // TODO: Populate KeyboardSettings interface. } @@ -68,9 +75,18 @@ onTouchpadsDisconnected(id: number): void; } +export interface MouseObserver { + // Fired when a mouse is connected. + onMouseConnected(mouse: Mouse): void; + // Fired when a mouse is removed from the list. + onMouseDisconnected(id: number): void; +} + export interface InputDeviceSettingsProviderInterface { observeKeyboardSettings(observer: KeyboardObserverInterface): void; stopObserveKeyboardSettings(observer: KeyboardObserverInterface): void; observeTouchpadSettings(observer: TouchpadObserverInterface): void; stopObserveTouchpadSettings(observer: TouchpadObserverInterface): void; + observeMouseSettings(observer: MouseObserver): void; + stopObserveMouseSettings(observer: MouseObserver): void; }
diff --git a/chrome/browser/resources/settings/chromeos/internet_page/hotspot_summary_item.html b/chrome/browser/resources/settings/chromeos/internet_page/hotspot_summary_item.html index 6e399ef..38cd9b1 100644 --- a/chrome/browser/resources/settings/chromeos/internet_page/hotspot_summary_item.html +++ b/chrome/browser/resources/settings/chromeos/internet_page/hotspot_summary_item.html
@@ -10,25 +10,45 @@ <div class="settings-box two-line no-padding"> <div id="hotspotSummaryItemRow" - actionable on-click="navigateToDetailPage_" + actionable="[[shouldShowArrowButton_(hotspotInfo.allowStatus)]]" + on-click="navigateToDetailPage_" class="flex layout horizontal center link-wrapper"> <iron-icon id="hotspotIcon" icon="[[getIconClass_(isHotspotToggleOn_)]]"> </iron-icon> + <div id="hotspotPageTitle" class="middle settings-box-text" aria-hidden="true"> $i18n{hotspotPageTitle} - <div class="secondary" id="hotspotSecondaryLabel"> - [[getSecondaryLabel_(isHotspotToggleOn_)]] + <div class="secondary" id="hotspotStateSublabel" + hidden="[[shouldHideHotspotStateSublabel_(hotspotInfo.allowStatus)]]"> + [[getHotspotStateSublabel_(isHotspotToggleOn_)]] </div> + <localized-link class="secondary" id="hotspotDisabledSublabelLink" + hidden="[[!shouldHideHotspotStateSublabel_(hotspotInfo.allowStatus)]]" + localized-string="[[getHotspotDisabledSublabelLink_( + hotspotInfo.allowStatus)]]"> + </localized-link> </div> - <cr-icon-button id="hotspotSummaryItemRowArrowIcon" - class="subpage-arrow layout end" - aria-label="$i18n{hotspotPageTitle}" - aria-description$="[[getSecondaryLabel_(isHotspotToggleOn_)]]" - aria-roledescription="$i18n{subpageArrowRoleDescription}" - on-click="navigateToDetailPage_"> - </cr-icon-button> + + <template is="dom-if" if="[[shouldShowPolicyIndicator_( + hotspotInfo.allowStatus)]]" restamp> + <cr-policy-indicator id="policyIndicator" + indicator-type="[[getPolicyIndicatorType_()]]"> + </cr-policy-indicator> + </template> + + <template is="dom-if" if="[[shouldShowArrowButton_( + hotspotInfo.allowStatus)]]" restamp> + <cr-icon-button id="hotspotSummaryItemRowArrowIcon" + class="subpage-arrow layout end" + aria-label="$i18n{hotspotPageTitle}" + aria-description$="[[getHotspotStateSublabel_(isHotspotToggleOn_)]]" + aria-roledescription="$i18n{subpageArrowRoleDescription}" + on-click="navigateToDetailPage_"> + </cr-icon-button> + </template> </div> + <div class="separator"></div> <cr-toggle id="enableHotspotToggle" class="margin-matches-padding"
diff --git a/chrome/browser/resources/settings/chromeos/internet_page/hotspot_summary_item.ts b/chrome/browser/resources/settings/chromeos/internet_page/hotspot_summary_item.ts index 2968e3e..07dd481 100644 --- a/chrome/browser/resources/settings/chromeos/internet_page/hotspot_summary_item.ts +++ b/chrome/browser/resources/settings/chromeos/internet_page/hotspot_summary_item.ts
@@ -11,18 +11,25 @@ import 'chrome://resources/cr_elements/cr_shared_vars.css.js'; import 'chrome://resources/polymer/v3_0/iron-flex-layout/iron-flex-layout-classes.js'; +import {CrPolicyIndicatorType} from 'chrome://resources/ash/common/cr_policy_indicator_behavior.js'; import {getHotspotConfig} from 'chrome://resources/ash/common/hotspot/cros_hotspot_config.js'; +import {CrPolicyNetworkBehaviorMojo, CrPolicyNetworkBehaviorMojoInterface} from 'chrome://resources/ash/common/network/cr_policy_network_behavior_mojo.js'; import {getInstance as getAnnouncerInstance} from 'chrome://resources/cr_elements/cr_a11y_announcer/cr_a11y_announcer.js'; -import {I18nMixin} from 'chrome://resources/cr_elements/i18n_mixin.js'; +import {I18nMixin, I18nMixinInterface} from 'chrome://resources/cr_elements/i18n_mixin.js'; import {HotspotAllowStatus, HotspotInfo, HotspotState} from 'chrome://resources/mojo/chromeos/ash/services/hotspot_config/public/mojom/cros_hotspot_config.mojom-webui.js'; -import {PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js'; +import {OncSource} from 'chrome://resources/mojo/chromeos/services/network_config/public/mojom/network_types.mojom-webui.js'; +import {mixinBehaviors, PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js'; +import {Constructor} from '../common/types.js'; import {routes} from '../os_route.js'; import {Router} from '../router.js'; import {getTemplate} from './hotspot_summary_item.html.js'; -const HotspotSummaryItemElementBase = I18nMixin(PolymerElement); +const HotspotSummaryItemElementBase = + mixinBehaviors([CrPolicyNetworkBehaviorMojo], I18nMixin(PolymerElement)) as + Constructor<PolymerElement&I18nMixinInterface& + CrPolicyNetworkBehaviorMojoInterface>; class HotspotSummaryItemElement extends HotspotSummaryItemElementBase { static get is() { @@ -52,25 +59,47 @@ }; } - hotspotInfo: HotspotInfo|undefined; + hotspotInfo: HotspotInfo; private isHotspotToggleOn_: boolean; - private onHotspotInfoChanged_( - newValue: HotspotInfo, _oldValue: HotspotInfo|undefined): void { + private onHotspotInfoChanged_(newValue: HotspotInfo, _oldValue: HotspotInfo): + void { this.isHotspotToggleOn_ = newValue.state === HotspotState.kEnabled || newValue.state === HotspotState.kEnabling; } - private navigateToDetailPage_(): void { + if (!this.shouldShowArrowButton_(this.hotspotInfo.allowStatus)) { + return; + } + Router.getInstance().navigateTo(routes.HOTSPOT_DETAIL); } - private getSecondaryLabel_(isHotspotToggleOn: boolean): string { + private getHotspotStateSublabel_(isHotspotToggleOn: boolean): string { return isHotspotToggleOn ? this.i18n('hotspotSummaryStateOn') : this.i18n('hotspotSummaryStateOff'); } + private shouldHideHotspotStateSublabel_(allowStatus: HotspotAllowStatus): + boolean { + return allowStatus === HotspotAllowStatus.kDisallowedReadinessCheckFail || + allowStatus === HotspotAllowStatus.kDisallowedNoMobileData; + } + + private getHotspotDisabledSublabelLink_(allowStatus: HotspotAllowStatus): + string { + if (allowStatus === HotspotAllowStatus.kDisallowedNoMobileData) { + return this.i18nAdvanced('hotspotNoMobileDataSublabelWithLink') + .toString(); + } + if (allowStatus === HotspotAllowStatus.kDisallowedReadinessCheckFail) { + return this.i18nAdvanced('hotspotMobileDataNotSupportedSublabelWithLink') + .toString(); + } + return ''; + } + /** * Observer for isHotspotToggleOn_ that returns early until the previous * value was not undefined to avoid wrongly toggling the HotspotInfo state. @@ -99,17 +128,18 @@ } private isToggleDisabled_(): boolean { - if (!this.hotspotInfo) { + if (!this.shouldShowArrowButton_(this.hotspotInfo.allowStatus)) { return true; } - if (this.hotspotInfo.allowStatus === - HotspotAllowStatus.kDisallowedByPolicy) { - return true; - } + return this.hotspotInfo.state === HotspotState.kEnabling || this.hotspotInfo.state === HotspotState.kDisabling; } + private shouldShowArrowButton_(allowStatus: HotspotAllowStatus): boolean { + return allowStatus === HotspotAllowStatus.kAllowed; + } + private getIconClass_(isHotspotToggleOn: boolean): string { if (isHotspotToggleOn) { return 'os-settings:hotspot-enabled'; @@ -117,6 +147,14 @@ return 'os-settings:hotspot-disabled'; } + private shouldShowPolicyIndicator_(allowStatus: HotspotAllowStatus): boolean { + return allowStatus === HotspotAllowStatus.kDisallowedByPolicy; + } + + private getPolicyIndicatorType_(): CrPolicyIndicatorType { + return this.getIndicatorTypeForSource(OncSource.kDevicePolicy); + } + private announceHotspotToggleChange_(): void { getAnnouncerInstance().announce( this.isHotspotToggleOn_ ? this.i18n('hotspotEnabledA11yLabel') :
diff --git a/chrome/browser/resources/settings/chromeos/internet_page/network_summary.ts b/chrome/browser/resources/settings/chromeos/internet_page/network_summary.ts index d87fbdf3..22d5e82 100644 --- a/chrome/browser/resources/settings/chromeos/internet_page/network_summary.ts +++ b/chrome/browser/resources/settings/chromeos/internet_page/network_summary.ts
@@ -387,7 +387,9 @@ return this.hotspotInfo.allowStatus !== HotspotAllowStatus.kDisallowedNoCellularUpstream && this.hotspotInfo.allowStatus !== - HotspotAllowStatus.kDisallowedNoWiFiDownstream; + HotspotAllowStatus.kDisallowedNoWiFiDownstream && + this.hotspotInfo.allowStatus !== + HotspotAllowStatus.kDisallowedNoWiFiSecurityModes; } }
diff --git a/chrome/browser/resources/side_panel/BUILD.gn b/chrome/browser/resources/side_panel/BUILD.gn deleted file mode 100644 index 532a13b..0000000 --- a/chrome/browser/resources/side_panel/BUILD.gn +++ /dev/null
@@ -1,92 +0,0 @@ -# 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/common/features.gni") -import("//tools/grit/grit_rule.gni") -import("//tools/grit/preprocess_if_expr.gni") -import("//tools/polymer/html_to_wrapper.gni") -import("//tools/typescript/ts_library.gni") -import("//ui/webui/resources/tools/generate_grd.gni") -import("./side_panel.gni") - -preprocess_folder = "preprocessed" - -grit("resources") { - defines = chrome_grit_defines - - # These arguments are needed since the grd is generated at build time. - enable_input_discovery_for_gn_analyze = false - source = "$target_gen_dir/side_panel_resources.grd" - deps = [ ":build_grd" ] - - outputs = [ - "grit/side_panel_resources.h", - "grit/side_panel_resources_map.cc", - "grit/side_panel_resources_map.h", - "side_panel_resources.pak", - ] - output_dir = "$root_gen_dir/chrome" -} - -preprocess_if_expr("preprocess_src") { - out_folder = "$target_gen_dir/$preprocess_folder" - in_files = ts_files -} - -preprocess_if_expr("preprocess_gen") { - deps = [ ":html_wrapper_files" ] - in_folder = target_gen_dir - out_folder = "$target_gen_dir/$preprocess_folder" - in_files = html_wrapper_files -} - -html_to_wrapper("html_wrapper_files") { - in_files = html_files -} - -mojo_root_folder = - "$root_gen_dir/mojom-webui/chrome/browser/ui/webui/side_panel" - -copy("copy_mojo_user_notes") { - deps = [ "//chrome/browser/ui/webui/side_panel/user_notes:mojo_bindings_js__generator" ] - sources = [ "$mojo_root_folder/user_notes/user_notes.mojom-webui.js" ] - outputs = - [ "$target_gen_dir/$preprocess_folder/user_notes/{{source_file_part}}" ] -} - -ts_library("build_ts") { - tsconfig_base = "tsconfig_base.json" - root_dir = "$target_gen_dir/$preprocess_folder" - out_dir = "$target_gen_dir/tsc" - composite = true - in_files = ts_files + html_wrapper_files + mojo_files - definitions = [ - "read_anything/read_anything.d.ts", - "//tools/typescript/definitions/chrome_event.d.ts", - ] - deps = [ - "//third_party/polymer/v3_0:library", - "//ui/webui/resources:library", - "//ui/webui/resources/cr_components/help_bubble:build_ts", - "//ui/webui/resources/mojo:library", - ] - extra_deps = [ - ":copy_mojo_user_notes", - ":preprocess_gen", - ":preprocess_src", - ] -} - -generate_grd("build_grd") { - input_files = [ - "read_anything/read_anything.html", - "user_notes/user_notes.html", - ] - input_files_base_dir = rebase_path(".", "//") - deps = [ ":build_ts" ] - manifest_files = - filter_include(get_target_outputs(":build_ts"), [ "*.manifest" ]) - grd_prefix = "side_panel" - out_grd = "$target_gen_dir/${grd_prefix}_resources.grd" -}
diff --git a/chrome/browser/resources/side_panel/OWNERS b/chrome/browser/resources/side_panel/OWNERS index 3288f77..ec11033 100644 --- a/chrome/browser/resources/side_panel/OWNERS +++ b/chrome/browser/resources/side_panel/OWNERS
@@ -1,2 +1 @@ -connily@chromium.org corising@chromium.org
diff --git a/chrome/browser/resources/side_panel/bookmarks/BUILD.gn b/chrome/browser/resources/side_panel/bookmarks/BUILD.gn index 293c70bc..df7d5c42 100644 --- a/chrome/browser/resources/side_panel/bookmarks/BUILD.gn +++ b/chrome/browser/resources/side_panel/bookmarks/BUILD.gn
@@ -55,8 +55,14 @@ "//tools/typescript/definitions/tabs.d.ts", ] ts_deps = [ + "../shared:build_ts", "//third_party/polymer/v3_0:library", "//ui/webui/resources:library", "//ui/webui/resources/mojo:library", ] + ts_path_mappings = + [ "chrome://bookmarks-side-panel.top-chrome/shared/*|" + + rebase_path( + "$root_gen_dir/chrome/browser/resources/side_panel/shared/tsc/*", + target_gen_dir) ] }
diff --git a/chrome/browser/resources/side_panel/bookmarks/power_bookmark_row.html b/chrome/browser/resources/side_panel/bookmarks/power_bookmark_row.html index da1b909b..de88587 100644 --- a/chrome/browser/resources/side_panel/bookmarks/power_bookmark_row.html +++ b/chrome/browser/resources/side_panel/bookmarks/power_bookmark_row.html
@@ -1,44 +1,7 @@ -<style include="mwb-element-shared-style cr-shared-style"> - :host { - --power-bookmark-row-button-display: grid; - --power-bookmark-row-checkbox-width: 0; - --power-bookmark-row-end-padding: 18px; - --power-bookmark-row-height: 68px; - --power-bookmark-row-image-size: 56px; - --power-bookmark-row-input-display: none; - --power-bookmark-row-start-padding: 32px; - --power-bookmark-row-trailing-icon-size: 0px; - display: block; - user-select: none; - white-space: nowrap; - } - - :host([has-checkbox]) { - --power-bookmark-row-checkbox-width: 32px; - } - - :host([has-input]) { - --power-bookmark-row-input-display: grid; - --power-bookmark-row-button-display: none; - } - - :host([compact]) { - --power-bookmark-row-image-size: 16px; - --power-bookmark-row-height: 32px; - } - - :host ::slotted([slot=extra-content-container]) { - display: flex; - flex-direction: row; - gap: 4px; - } - - cr-checkbox { - grid-area: checkbox; - height: 32px; - margin-inline-start: 14px; - position: absolute; - width: 16px; +<style> + cr-url-list-item[size=compact] { + padding-inline-end: 14px; + padding-inline-start: 14px; } /* Visually hide the label but allow the screen reader to pick it up. */ @@ -57,145 +20,58 @@ width: 100%; } - .bookmark-image { - border-radius: 6px; - grid-area: image; - height: var(--power-bookmark-row-image-size); - justify-self: center; - width: var(--power-bookmark-row-image-size); - } - - #container { - display: flex; - } - - .content { - color: var(--cr-primary-text-color); - justify-self: center; - overflow: hidden; - text-overflow: ellipsis; - } - - :host(:not([compact])) .content { - width: 100%; - } - - .icon-folder-open { - -webkit-mask-image: var(--cr-icon-image); - -webkit-mask-position: center; - -webkit-mask-repeat: no-repeat; - -webkit-mask-size: var(--power-bookmark-row-image-size); - background-color: var(--cr-primary-text-color); - } - - .input-row { - align-items: center; - display: var(--power-bookmark-row-input-display); - grid-template-areas: 'image input'; - grid-template-columns: calc(var(--power-bookmark-row-image-size) + - var(--power-bookmark-row-start-padding)) auto; - height: var(--power-bookmark-row-height); - padding-inline-end: var(--power-bookmark-row-end-padding); - width: 100%; - } - - .description { - color: var(--cr-secondary-text-color); - font-size: var(--mwb-secondary-text-font-size); - } - - .row { - align-items: center; + #title { appearance: none; background: transparent; - border: none; - box-sizing: border-box; - color: currentColor; - display: var(--power-bookmark-row-button-display); - font-size: var(--mwb-primary-text-font-size); - grid-template-areas: 'checkbox image content trailing-icon'; - grid-template-columns: var(--power-bookmark-row-checkbox-width) - calc(var(--power-bookmark-row-image-size) + - var(--power-bookmark-row-start-padding)) auto - calc(var(--power-bookmark-row-trailing-icon-size) + - var(--power-bookmark-row-end-padding)); - height: var(--power-bookmark-row-height); + border: 0; + display: inline; padding: 0; text-align: start; - width: 100%; } - .row:hover { - --power-bookmark-row-trailing-icon-size: 24px; - background-color: var(--mwb-list-item-hover-background-color); - } - - .row:hover > .trailing-icon { - display: block; - } - - .text-container { - align-items: flex-start; - display: flex; - flex-direction: column; - gap: 2px; - grid-area: content; - overflow: hidden; - } - - :host([compact]) .text-container { - align-items: baseline; - flex-direction: row; - gap: 4px; - } - - .trailing-icon { - --cr-icon-button-margin-start: 8px; - --cr-icon-button-size: var(--power-bookmark-row-trailing-icon-size); - display: none; - grid-area: trailing-icon; - } - - .url-icon { - background-position: center; - background-repeat: no-repeat; - background-size: var(--power-bookmark-row-image-size); + #title:focus { + outline: none; } </style> -<div id="container" role="listitem"> + +<cr-url-list-item + role="listitem" + size="[[getItemSize_(compact)]]" + url="[[bookmark.url]]" + count="[[bookmark.children.length]]" + title="[[bookmark.title]]" + on-click="onRowClicked_" + on-contextmenu="onContextMenu_"> <template is="dom-if" if="[[hasCheckbox]]" restamp> - <cr-checkbox hidden="[[!hasCheckbox]]" on-change="onCheckboxChange_" + <cr-checkbox slot="prefix" hidden="[[!hasCheckbox]]" + on-change="onCheckboxChange_" disabled="[[checkboxDisabled]]"> TODO: hidden label text </cr-checkbox> </template> + <template is="dom-if" if="[[hasInput]]" on-dom-change="onInputDisplayChange_"> - <div class="input-row"> - <div id="inputBookmarkImage" class="bookmark-image"></div> - <cr-input id="input" value="[[bookmark.title]]" on-change="onInputChange_" - on-blur="onInputChange_" on-keypress="onInputKeyPress_" - aria-label="$i18n{bookmarkNameA11yLabel}"> - </cr-input> - </div> + <cr-input slot="title" id="input" value="[[bookmark.title]]" + on-change="onInputChange_" on-blur="onInputChange_" + on-keypress="onInputKeyPress_" + aria-label="$i18n{bookmarkNameA11yLabel}"> + </cr-input> </template> + <template is="dom-if" if="[[!hasInput]]" on-dom-change="onInputDisplayChange_"> - <button id="rowButton" class="row" - title="[[bookmark.title]]" - data-bookmark="[[bookmark]]" - on-click="onRowClicked_" - on-contextmenu="onContextMenu_" - disabled="[[hasCheckbox]]"> - <div id="bookmarkImage" class="bookmark-image"></div> - <div class="text-container"> - <div class="content">[[bookmark.title]]</div> - <div class="content description">[[description]]</div> - <slot name="extra-content-container"></slot> - </div> - <cr-icon-button class="trailing-icon" iron-icon="[[trailingIcon]]" - hidden="[[!trailingIcon]]" on-click="onTrailingIconClicked_" - disabled="[[hasCheckbox]]" aria-label="[[trailingIconAriaLabel_]]"> - </cr-button> + <button slot="title" id="title" role="button" tabindex="0" + aria-labelledby="title description chips"> + [[bookmark.title]] </button> + + <div slot="description" id="description" hidden$="[[!description]]"> + [[description]] + </div> +2 <slot slot="chips" id="chips" name="chips"></slot> + + <cr-icon-button slot="suffix-icon" iron-icon="[[trailingIcon]]" + hidden="[[!trailingIcon]]" on-click="onTrailingIconClicked_" + disabled="[[hasCheckbox]]" aria-label="[[trailingIconAriaLabel_]]"> </template> -</div> +</cr-url-list-item>
diff --git a/chrome/browser/resources/side_panel/bookmarks/power_bookmark_row.ts b/chrome/browser/resources/side_panel/bookmarks/power_bookmark_row.ts index f77b90019..c556bbc 100644 --- a/chrome/browser/resources/side_panel/bookmarks/power_bookmark_row.ts +++ b/chrome/browser/resources/side_panel/bookmarks/power_bookmark_row.ts
@@ -7,10 +7,11 @@ import 'chrome://resources/cr_elements/cr_icon_button/cr_icon_button.js'; import 'chrome://resources/cr_elements/cr_input/cr_input.js'; import 'chrome://resources/cr_elements/cr_shared_style.css.js'; +import 'chrome://resources/cr_elements/cr_url_list_item/cr_url_list_item.js'; import {CrCheckboxElement} from 'chrome://resources/cr_elements/cr_checkbox/cr_checkbox.js'; import {CrInputElement} from 'chrome://resources/cr_elements/cr_input/cr_input.js'; -import {getFaviconForPageURL} from 'chrome://resources/js/icon.js'; +import {CrUrlListItemSize} from 'chrome://resources/cr_elements/cr_url_list_item/cr_url_list_item.js'; import {PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js'; import {getTemplate} from './power_bookmark_row.html.js'; @@ -26,45 +27,33 @@ static get properties() { return { - bookmark: { - type: Object, - observer: 'updateImages_', - }, - + bookmark: Object, checkboxDisabled: { type: Boolean, value: false, }, - compact: { type: Boolean, - reflectToAttribute: true, value: false, - observer: 'updateImages_', }, - description: { type: String, value: '', }, - hasCheckbox: { type: Boolean, reflectToAttribute: true, value: false, }, - hasInput: { type: Boolean, reflectToAttribute: true, value: false, }, - trailingIcon: { type: String, value: '', }, - trailingIconAriaLabel: { type: String, value: '', @@ -86,48 +75,11 @@ this.onInputDisplayChange_(); } - /** - * Set content and styling for all images in the row. - */ - private updateImages_() { - const bookmarkImage = this.shadowRoot!.querySelector('#bookmarkImage'); - if (bookmarkImage) { - this.updateImage_(bookmarkImage as HTMLDivElement); - } - const inputBookmarkImage = - this.shadowRoot!.querySelector('#inputBookmarkImage'); - if (inputBookmarkImage) { - this.updateImage_(inputBookmarkImage as HTMLDivElement); - } - } - - /** - * Add the appropriate image for the given bookmark and compact/expanded - * state. If the bookmark should be displayed as compact, this image will be - * a favicon or folder icon, otherwise it will be a larger image. - */ - private updateImage_(imageElement: HTMLDivElement) { - // Reset styling added in previous calls to this method. - imageElement.classList.remove('url-icon'); - imageElement.classList.remove('icon-folder-open'); - imageElement.style.backgroundImage = ''; - imageElement.style.backgroundColor = ''; - if (this.compact) { - if (this.bookmark.url) { - imageElement.classList.add('url-icon'); - imageElement.style.backgroundImage = - getFaviconForPageURL(this.bookmark.url, false); - } else { - imageElement.classList.add('icon-folder-open'); - } - } else { - // TODO(b/244627092): Add image once available - imageElement.style.backgroundColor = 'red'; - } + private getItemSize_() { + return this.compact ? CrUrlListItemSize.COMPACT : CrUrlListItemSize.LARGE; } private onInputDisplayChange_() { - this.updateImages_(); const input = this.shadowRoot!.querySelector('#input'); if (input) { (input as CrInputElement).focus();
diff --git a/chrome/browser/resources/side_panel/bookmarks/power_bookmarks_list.html b/chrome/browser/resources/side_panel/bookmarks/power_bookmarks_list.html index ec9c20f8..95b2012 100644 --- a/chrome/browser/resources/side_panel/bookmarks/power_bookmarks_list.html +++ b/chrome/browser/resources/side_panel/bookmarks/power_bookmarks_list.html
@@ -300,7 +300,7 @@ on-trailing-icon-clicked="onShowContextMenuClicked_" on-checkbox-change="onRowSelectedChange_" on-input-change="onRename_"> - <div slot="extra-content-container"> + <div slot="chips"> <template is="dom-if" if="[[isPriceTracked_(item, showPriceTracking_)]]" restamp> <template is="dom-if" if="[[showDiscountedPrice_(item)]]" restamp>
diff --git a/chrome/browser/resources/side_panel/read_anything/BUILD.gn b/chrome/browser/resources/side_panel/read_anything/BUILD.gn new file mode 100644 index 0000000..3c4b3ce --- /dev/null +++ b/chrome/browser/resources/side_panel/read_anything/BUILD.gn
@@ -0,0 +1,23 @@ +# Copyright 2023 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/browser/resources/tools/build_webui.gni") + +assert(!is_android) + +build_webui("build") { + grd_prefix = "side_panel_read_anything" + + static_files = [ "read_anything.html" ] + + web_component_files = [ "app.ts" ] + + ts_composite = true + ts_deps = [ + "//third_party/polymer/v3_0:library", + "//ui/webui/resources:library", + "//ui/webui/resources/mojo:library", + ] + ts_definitions = [ "read_anything.d.ts" ] +}
diff --git a/chrome/browser/resources/side_panel/images/read_anything_blue.png b/chrome/browser/resources/side_panel/read_anything/images/read_anything_blue.png similarity index 100% rename from chrome/browser/resources/side_panel/images/read_anything_blue.png rename to chrome/browser/resources/side_panel/read_anything/images/read_anything_blue.png Binary files differ
diff --git a/chrome/browser/resources/side_panel/images/read_anything_dark.png b/chrome/browser/resources/side_panel/read_anything/images/read_anything_dark.png similarity index 100% rename from chrome/browser/resources/side_panel/images/read_anything_dark.png rename to chrome/browser/resources/side_panel/read_anything/images/read_anything_dark.png Binary files differ
diff --git a/chrome/browser/resources/side_panel/images/read_anything_default.png b/chrome/browser/resources/side_panel/read_anything/images/read_anything_default.png similarity index 100% rename from chrome/browser/resources/side_panel/images/read_anything_default.png rename to chrome/browser/resources/side_panel/read_anything/images/read_anything_default.png Binary files differ
diff --git a/chrome/browser/resources/side_panel/images/read_anything_light.png b/chrome/browser/resources/side_panel/read_anything/images/read_anything_light.png similarity index 100% rename from chrome/browser/resources/side_panel/images/read_anything_light.png rename to chrome/browser/resources/side_panel/read_anything/images/read_anything_light.png Binary files differ
diff --git a/chrome/browser/resources/side_panel/images/read_anything_yellow.png b/chrome/browser/resources/side_panel/read_anything/images/read_anything_yellow.png similarity index 100% rename from chrome/browser/resources/side_panel/images/read_anything_yellow.png rename to chrome/browser/resources/side_panel/read_anything/images/read_anything_yellow.png Binary files differ
diff --git a/chrome/browser/resources/side_panel/read_anything/read_anything.html b/chrome/browser/resources/side_panel/read_anything/read_anything.html index 4ea4b501..e392507 100644 --- a/chrome/browser/resources/side_panel/read_anything/read_anything.html +++ b/chrome/browser/resources/side_panel/read_anything/read_anything.html
@@ -24,7 +24,7 @@ </head> <body> <read-anything-app></read-anything-app> - <script type="module" src="read_anything/app.js"></script> + <script type="module" src="app.js"></script> </script> </body> -</html> \ No newline at end of file +</html>
diff --git a/chrome/browser/resources/side_panel/read_anything/tsconfig_base.json b/chrome/browser/resources/side_panel/read_anything/tsconfig_base.json new file mode 100644 index 0000000..7b88f6f --- /dev/null +++ b/chrome/browser/resources/side_panel/read_anything/tsconfig_base.json
@@ -0,0 +1,8 @@ +{ + "extends": "../../../../../tools/typescript/tsconfig_base.json", + "compilerOptions": { + "noUncheckedIndexedAccess": false, + "noUnusedLocals": false, + "strictPropertyInitialization": false + } +}
diff --git a/chrome/browser/resources/side_panel/shared/BUILD.gn b/chrome/browser/resources/side_panel/shared/BUILD.gn new file mode 100644 index 0000000..359d6ea --- /dev/null +++ b/chrome/browser/resources/side_panel/shared/BUILD.gn
@@ -0,0 +1,17 @@ +# Copyright 2023 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/browser/resources/tools/build_webui.gni") + +assert(!is_android) + +build_webui("build") { + grd_prefix = "side_panel_shared" + grd_resource_path_prefix = "shared" + + web_component_files = [ "dummy_shared.ts" ] + + ts_composite = true + ts_deps = [ "//third_party/polymer/v3_0:library" ] +}
diff --git a/chrome/browser/resources/side_panel/shared/dummy_shared.html b/chrome/browser/resources/side_panel/shared/dummy_shared.html new file mode 100644 index 0000000..885ba39 --- /dev/null +++ b/chrome/browser/resources/side_panel/shared/dummy_shared.html
@@ -0,0 +1 @@ +<div>Hello world from dummy-shared element</div>
diff --git a/chrome/browser/resources/side_panel/shared/dummy_shared.ts b/chrome/browser/resources/side_panel/shared/dummy_shared.ts new file mode 100644 index 0000000..62fa30a --- /dev/null +++ b/chrome/browser/resources/side_panel/shared/dummy_shared.ts
@@ -0,0 +1,31 @@ +// Copyright 2023 The Chromium Authors +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +/** + * @fileoverview Dummy shared element to demonstrate how to share UI components + * between side panels. + * TODO(dpapad): Delete once the first non-dummy shared element is added. + */ + +import {PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js'; + +import {getTemplate} from './dummy_shared.html.js'; + +export class DummySharedElement extends PolymerElement { + static get is() { + return 'dummy-shared'; + } + + static get template() { + return getTemplate(); + } +} + +declare global { + interface HTMLElementTagNameMap { + 'dummy-shared': DummySharedElement; + } +} + +customElements.define(DummySharedElement.is, DummySharedElement);
diff --git a/chrome/browser/resources/side_panel/shared/tsconfig_base.json b/chrome/browser/resources/side_panel/shared/tsconfig_base.json new file mode 100644 index 0000000..7b88f6f --- /dev/null +++ b/chrome/browser/resources/side_panel/shared/tsconfig_base.json
@@ -0,0 +1,8 @@ +{ + "extends": "../../../../../tools/typescript/tsconfig_base.json", + "compilerOptions": { + "noUncheckedIndexedAccess": false, + "noUnusedLocals": false, + "strictPropertyInitialization": false + } +}
diff --git a/chrome/browser/resources/side_panel/side_panel.gni b/chrome/browser/resources/side_panel/side_panel.gni deleted file mode 100644 index e3957cb..0000000 --- a/chrome/browser/resources/side_panel/side_panel.gni +++ /dev/null
@@ -1,22 +0,0 @@ -# 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. - -# Files holding a Polymer element definition and have an equivalent .html file. -web_component_files = [ "read_anything/app.ts" ] - -# Files that are passed as input to html_to_wrapper(). -html_files = [] -foreach(f, web_component_files) { - html_files += [ string_replace(f, ".ts", ".html") ] -} - -# Files that are generated by html_to_wrapper(). -html_wrapper_files = [] -foreach(f, html_files) { - html_wrapper_files += [ f + ".ts" ] -} - -ts_files = web_component_files - -mojo_files = []
diff --git a/chrome/browser/resources/side_panel/user_notes/BUILD.gn b/chrome/browser/resources/side_panel/user_notes/BUILD.gn new file mode 100644 index 0000000..e33b9234 --- /dev/null +++ b/chrome/browser/resources/side_panel/user_notes/BUILD.gn
@@ -0,0 +1,25 @@ +# Copyright 2023 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/browser/resources/tools/build_webui.gni") + +assert(!is_android) + +build_webui("build") { + grd_prefix = "side_panel_user_notes" + + static_files = [ "user_notes.html" ] + + non_web_component_files = [ "user_notes_api_proxy.ts" ] + + mojo_files_deps = [ "//chrome/browser/ui/webui/side_panel/user_notes:mojo_bindings_js__generator" ] + mojo_files = [ "$root_gen_dir/mojom-webui/chrome/browser/ui/webui/side_panel/user_notes/user_notes.mojom-webui.js" ] + + ts_composite = true + ts_deps = [ + "//third_party/polymer/v3_0:library", + "//ui/webui/resources:library", + "//ui/webui/resources/mojo:library", + ] +}
diff --git a/chrome/browser/resources/side_panel/user_notes/tsconfig_base.json b/chrome/browser/resources/side_panel/user_notes/tsconfig_base.json new file mode 100644 index 0000000..5ea1ac6 --- /dev/null +++ b/chrome/browser/resources/side_panel/user_notes/tsconfig_base.json
@@ -0,0 +1,9 @@ +{ + "extends": "../../../../../tools/typescript/tsconfig_base.json", + "compilerOptions": { + "allowJs": true, + "noUncheckedIndexedAccess": false, + "noUnusedLocals": false, + "strictPropertyInitialization": false + } +}
diff --git a/chrome/browser/resources/side_panel/user_notes/user_notes_api_proxy.ts b/chrome/browser/resources/side_panel/user_notes/user_notes_api_proxy.ts index 9bca8f9f..a6ed40dc 100644 --- a/chrome/browser/resources/side_panel/user_notes/user_notes_api_proxy.ts +++ b/chrome/browser/resources/side_panel/user_notes/user_notes_api_proxy.ts
@@ -2,22 +2,28 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import {UserNotesPageHandler, UserNotesPageHandlerInterface} from './user_notes.mojom-webui.js'; +import {Note, UserNotesPageCallbackRouter, UserNotesPageHandlerFactory, UserNotesPageHandlerRemote} from './user_notes.mojom-webui.js'; let instance: UserNotesApiProxy|null = null; export interface UserNotesApiProxy { showUi(): void; + getNotesForCurrentTab(): Promise<{notes: Note[]}>; + newNoteFinished(text: string): Promise<{success: boolean}>; + deleteNote(guid: string): Promise<{success: boolean}>; + getCallbackRouter(): UserNotesPageCallbackRouter; } export class UserNotesApiProxyImpl implements UserNotesApiProxy { - handler: UserNotesPageHandlerInterface; + private callbackRouter: UserNotesPageCallbackRouter = + new UserNotesPageCallbackRouter(); + private handler: UserNotesPageHandlerRemote = + new UserNotesPageHandlerRemote(); constructor() { - this.handler = new UserNotesPageHandler.getRemote(); - - const factory = UserNotesPageHandler.getRemote(); - factory.createBookmarksPageHandler( + const factory = UserNotesPageHandlerFactory.getRemote(); + factory.createPageHandler( + this.callbackRouter.$.bindNewPipeAndPassRemote(), this.handler.$.bindNewPipeAndPassReceiver()); } @@ -25,6 +31,22 @@ this.handler.showUI(); } + getNotesForCurrentTab() { + return this.handler.getNotesForCurrentTab(); + } + + newNoteFinished(text: string) { + return this.handler.newNoteFinished(text); + } + + deleteNote(guid: string) { + return this.handler.deleteNote(guid); + } + + getCallbackRouter() { + return this.callbackRouter; + } + static getInstance(): UserNotesApiProxy { return instance || (instance = new UserNotesApiProxyImpl()); }
diff --git a/chrome/browser/resources/tools/build_webui.gni b/chrome/browser/resources/tools/build_webui.gni index 4d3dcda0..1410c31 100644 --- a/chrome/browser/resources/tools/build_webui.gni +++ b/chrome/browser/resources/tools/build_webui.gni
@@ -16,11 +16,7 @@ template("build_webui") { not_needed([ "target_name" ]) - forward_variables_from(invoker, - [ - "grd_prefix", - "static_files", - ]) + forward_variables_from(invoker, [ "grd_prefix" ]) preprocess_dir = "${target_gen_dir}/preprocessed" tsc_dir = "${target_gen_dir}/tsc" @@ -82,16 +78,18 @@ } } - # Compute which static_files should be preprocessed. - non_preprocessed_files_filter = [ - "*.jpg", - "*.png", - "*.svg", - ] - static_non_preprocessed_files = - filter_include(static_files, non_preprocessed_files_filter) - static_preprocessed_files = - filter_exclude(static_files, non_preprocessed_files_filter) + if (defined(invoker.static_files)) { + # Compute which static_files should be preprocessed. + non_preprocessed_files_filter = [ + "*.jpg", + "*.png", + "*.svg", + ] + static_non_preprocessed_files = + filter_include(invoker.static_files, non_preprocessed_files_filter) + static_preprocessed_files = + filter_exclude(invoker.static_files, non_preprocessed_files_filter) + } ### Define the various targets that are required by the build pipeline. @@ -104,13 +102,15 @@ # 5) generate_grd() # 6) grit() - preprocess_if_expr("preprocess_static_files") { - visibility = [ ":build_grd" ] - defines = chrome_grit_defines - in_folder = "." - out_folder = preprocess_dir - in_files = static_preprocessed_files - out_manifest = "${target_gen_dir}/preprocess_static_files_manifest.json" + if (defined(invoker.static_files)) { + preprocess_if_expr("preprocess_static_files") { + visibility = [ ":build_grd" ] + defines = chrome_grit_defines + in_folder = "." + out_folder = preprocess_dir + in_files = static_preprocessed_files + out_manifest = "${target_gen_dir}/preprocess_static_files_manifest.json" + } } preprocess_if_expr("preprocess") { @@ -256,12 +256,17 @@ grd_prefix = grd_prefix out_grd = "$target_gen_dir/resources.grd" - input_files = static_non_preprocessed_files - input_files_base_dir = rebase_path(".", "//") + deps = [] + manifest_files = [] - deps = [ ":preprocess_static_files" ] - manifest_files = - [ "${target_gen_dir}/preprocess_static_files_manifest.json" ] + if (defined(invoker.static_files)) { + input_files = static_non_preprocessed_files + input_files_base_dir = rebase_path(".", "//") + + deps += [ ":preprocess_static_files" ] + manifest_files += + [ "${target_gen_dir}/preprocess_static_files_manifest.json" ] + } if (optimize) { deps += [ ":build_bundle" ] @@ -277,6 +282,10 @@ deps += invoker.extra_grdp_deps grdp_files = invoker.extra_grdp_files } + + if (defined(invoker.grd_resource_path_prefix)) { + resource_path_prefix = invoker.grd_resource_path_prefix + } } grit("resources") {
diff --git a/chrome/browser/resources/web_app_internals/BUILD.gn b/chrome/browser/resources/web_app_internals/BUILD.gn new file mode 100644 index 0000000..84e8af44 --- /dev/null +++ b/chrome/browser/resources/web_app_internals/BUILD.gn
@@ -0,0 +1,29 @@ +# 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("//chrome/browser/resources/tools/build_webui.gni") + +assert(!is_android) + +build_webui("build") { + grd_prefix = "web_app_internals" + + static_files = [ + "web_app_internals.css", + "web_app_internals.html", + ] + + non_web_component_files = [ "web_app_internals.ts" ] + + mojo_files_deps = [ + "//chrome/browser/ui/webui/web_app_internals:mojo_bindings_ts__generator", + ] + mojo_files = [ "$root_gen_dir/chrome/browser/ui/webui/web_app_internals/web_app_internals.mojom-webui.ts" ] + + ts_deps = [ + "//ui/webui/resources:library", + "//ui/webui/resources/mojo:library", + ] + ts_use_local_config = false +}
diff --git a/chrome/browser/resources/web_app_internals/web_app_internals.css b/chrome/browser/resources/web_app_internals/web_app_internals.css new file mode 100644 index 0000000..0c8a925 --- /dev/null +++ b/chrome/browser/resources/web_app_internals/web_app_internals.css
@@ -0,0 +1,9 @@ +/* + * Copyright 2023 The Chromium Authors + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + */ + +pre { + white-space: pre-wrap; +}
diff --git a/chrome/browser/resources/web_app_internals/web_app_internals.html b/chrome/browser/resources/web_app_internals/web_app_internals.html new file mode 100644 index 0000000..0093c8e9 --- /dev/null +++ b/chrome/browser/resources/web_app_internals/web_app_internals.html
@@ -0,0 +1,22 @@ +<!DOCTYPE HTML> +<html lang="en"> + +<head> + <meta charset="utf-8"> + <meta name="viewport" content="width=device-width, initial-scale=1"> + <title>Web App Internals</title> + <link rel="stylesheet" href="web_app_internals.css"> + + <script type="module" src="web_app_internals.js"></script> +</head> + +<body> + <button id="download-button">Download</button> + <button id="copy-button">Copy to Clipboard</button> + + <hr> + + <pre id="json"></pre> +</body> + +</html>
diff --git a/chrome/browser/resources/web_app_internals/web_app_internals.ts b/chrome/browser/resources/web_app_internals/web_app_internals.ts new file mode 100644 index 0000000..14f93823 --- /dev/null +++ b/chrome/browser/resources/web_app_internals/web_app_internals.ts
@@ -0,0 +1,28 @@ +// Copyright 2023 The Chromium Authors +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +import {getRequiredElement} from 'chrome://resources/js/util_ts.js'; + +import {WebAppInternalsHandler} from './web_app_internals.mojom-webui.js'; + +const webAppInternalsHandler = WebAppInternalsHandler.getRemote(); + +const debugInfoAsJsonString: Promise<string> = + webAppInternalsHandler.getDebugInfoAsJsonString().then( + response => response.result); + +getRequiredElement('copy-button').addEventListener('click', async () => { + navigator.clipboard.writeText(await debugInfoAsJsonString); +}); + +getRequiredElement('download-button').addEventListener('click', async () => { + const a = document.createElement('a'); + a.href = `data:application/json,${encodeURI(await debugInfoAsJsonString)}`; + a.download = 'web_app_internals.json'; + a.click(); +}); + +document.addEventListener('DOMContentLoaded', async () => { + getRequiredElement('json').innerText = await debugInfoAsJsonString; +});
diff --git a/chrome/browser/themes/browser_theme_pack.cc b/chrome/browser/themes/browser_theme_pack.cc index 31043413e..5839a91 100644 --- a/chrome/browser/themes/browser_theme_pack.cc +++ b/chrome/browser/themes/browser_theme_pack.cc
@@ -96,7 +96,7 @@ // changed default theme assets, if you need themes to recreate their generated // images (which are cached), if you changed how missing values are // generated, or if you changed any constants. -const int kThemePackVersion = 102; +const int kThemePackVersion = 103; // IDs that are in the DataPack won't clash with the positive integer // uint16_t. kHeaderID should always have the maximum value because we want the @@ -260,7 +260,6 @@ constexpr int kNonOverwritableColorTable[] = { TP::COLOR_NTP_LOGO, TP::COLOR_NTP_SECTION_BORDER, - TP::COLOR_NTP_SHORTCUT, TP::COLOR_TAB_FOREGROUND_ACTIVE_FRAME_INACTIVE, TP::COLOR_TAB_THROBBER_SPINNING, TP::COLOR_TAB_THROBBER_WAITING, @@ -1074,7 +1073,6 @@ {TP::COLOR_NTP_LINK, kColorNewTabPageLink}, {TP::COLOR_NTP_LOGO, kColorNewTabPageLogo}, {TP::COLOR_NTP_SECTION_BORDER, kColorNewTabPageSectionBorder}, - {TP::COLOR_NTP_SHORTCUT, kColorNewTabPageMostVisitedTileBackground}, {TP::COLOR_NTP_TEXT, kColorNewTabPageText}, {TP::COLOR_OMNIBOX_TEXT, kColorOmniboxText}, {TP::COLOR_OMNIBOX_BACKGROUND, kColorToolbarBackgroundSubtleEmphasis}, @@ -1885,16 +1883,6 @@ SetColor(TP::COLOR_NTP_LOGO, logo_color); } - // Calculate NTP shortcut color. - // Use light color for NTPs with images, and themed color for NTPs with solid - // color. - if (!has_background_image && has_background_color && - background_color != SK_ColorWHITE) { - SetColor(TP::COLOR_NTP_SHORTCUT, - GetContrastingColor(background_color, - /*luminosity_change=*/0.2f)); - } - // Calculate NTP section border color. SkColor header_color; if (GetColor(TP::COLOR_NTP_HEADER, &header_color))
diff --git a/chrome/browser/themes/browser_theme_pack_unittest.cc b/chrome/browser/themes/browser_theme_pack_unittest.cc index 688ed72..1d0c787 100644 --- a/chrome/browser/themes/browser_theme_pack_unittest.cc +++ b/chrome/browser/themes/browser_theme_pack_unittest.cc
@@ -1138,7 +1138,7 @@ EXPECT_TRUE(pack_autogenerated->GetColor(TP::COLOR_NTP_TEXT, &ntp_text)); } -TEST_F(BrowserThemePackTest, TestLogoAndShortcutColors) { +TEST_F(BrowserThemePackTest, TestLogoColors) { // For themes with no background image and no background color, nothing should // be specified. scoped_refptr<BrowserThemePack> theme_minimal( @@ -1146,34 +1146,28 @@ BuildTestExtensionTheme("theme_minimal", theme_minimal.get()); SkColor color; EXPECT_FALSE(theme_minimal->GetColor(TP::COLOR_NTP_LOGO, &color)); - EXPECT_FALSE(theme_minimal->GetColor(TP::COLOR_NTP_SHORTCUT, &color)); - // For themes with image logo and shortcut colors shouldn't be set. + // For themes with image logo, colors shouldn't be set. scoped_refptr<BrowserThemePack> theme_with_image( new BrowserThemePack(ThemeType::kExtension)); BuildTestExtensionTheme("theme_ntp_background_image", theme_with_image.get()); EXPECT_FALSE(theme_with_image->GetColor(TP::COLOR_NTP_LOGO, &color)); - EXPECT_FALSE(theme_with_image->GetColor(TP::COLOR_NTP_SHORTCUT, &color)); - // // For themes with no image but with colorful logo, the logo color - // shouldn't - // // be specified but the shortcut color should be set. + // For themes with no image but with colorful logo, the logo color shouldn't + // be specified. scoped_refptr<BrowserThemePack> theme_colorful_logo( new BrowserThemePack(ThemeType::kExtension)); BuildTestExtensionTheme("theme_color_ntp_colorful_logo", theme_colorful_logo.get()); EXPECT_FALSE(theme_colorful_logo->GetColor(TP::COLOR_NTP_LOGO, &color)); - EXPECT_TRUE(theme_colorful_logo->GetColor(TP::COLOR_NTP_SHORTCUT, &color)); - // For themes with no image and with alternate logo, both logo and shortcut - // colors should be set. + // For themes with no image and with alternate logo, color should be set. scoped_refptr<BrowserThemePack> theme_alternate_logo( new BrowserThemePack(ThemeType::kExtension)); BuildTestExtensionTheme("theme_color_ntp_white_logo", theme_alternate_logo.get()); EXPECT_TRUE(theme_alternate_logo->GetColor(TP::COLOR_NTP_LOGO, &color)); EXPECT_NE(SK_ColorWHITE, color); - EXPECT_TRUE(theme_alternate_logo->GetColor(TP::COLOR_NTP_SHORTCUT, &color)); // For darker then midpoint themes the logo color should be white. scoped_refptr<BrowserThemePack> dark_theme( @@ -1183,14 +1177,12 @@ EXPECT_TRUE(dark_theme->GetColor(TP::COLOR_NTP_LOGO, &color)); EXPECT_EQ(SK_ColorWHITE, color); - // For themes with white NTP background the shortcut color shouldn't be set. - // The Logo color shouldn't be set either because the colorful logo should be - // used on white background. + // For themes with white NTP background the Logo color shouldn't be set + // because the colorful logo should be used on white background. scoped_refptr<BrowserThemePack> white_theme( new BrowserThemePack(ThemeType::kAutogenerated)); BrowserThemePack::BuildFromColor(SK_ColorWHITE, white_theme.get()); ASSERT_TRUE(white_theme->GetColor(TP::COLOR_NTP_BACKGROUND, &color)); ASSERT_EQ(SK_ColorWHITE, color); EXPECT_FALSE(white_theme->GetColor(TP::COLOR_NTP_LOGO, &color)); - EXPECT_FALSE(white_theme->GetColor(TP::COLOR_NTP_SHORTCUT, &color)); }
diff --git a/chrome/browser/themes/theme_properties.cc b/chrome/browser/themes/theme_properties.cc index 19dbd20a..ee35e6de 100644 --- a/chrome/browser/themes/theme_properties.cc +++ b/chrome/browser/themes/theme_properties.cc
@@ -82,8 +82,6 @@ return SK_ColorTRANSPARENT; case ThemeProperties::COLOR_NTP_LOGO: return SkColorSetRGB(0xEE, 0xEE, 0xEE); - case ThemeProperties::COLOR_NTP_SHORTCUT: - return gfx::kGoogleGrey100; // Properties not stored in theme pack. case ThemeProperties::COLOR_TAB_STROKE_FRAME_ACTIVE: @@ -145,8 +143,6 @@ case ThemeProperties::COLOR_TAB_BACKGROUND_ACTIVE_FRAME_ACTIVE: case ThemeProperties::COLOR_TAB_BACKGROUND_ACTIVE_FRAME_INACTIVE: return SkColorSetRGB(0x35, 0x36, 0x3A); - case ThemeProperties::COLOR_NTP_SHORTCUT: - return gfx::kGoogleGrey900; case ThemeProperties::COLOR_TOOLBAR_TEXT: return SK_ColorWHITE; case ThemeProperties::COLOR_NTP_TEXT:
diff --git a/chrome/browser/themes/theme_properties.h b/chrome/browser/themes/theme_properties.h index 164f95b..7a8ddb9d 100644 --- a/chrome/browser/themes/theme_properties.h +++ b/chrome/browser/themes/theme_properties.h
@@ -162,8 +162,6 @@ COLOR_NTP_LOGO, COLOR_NTP_SECTION_BORDER, - // Color for the background of the most visited/custom link tile. - COLOR_NTP_SHORTCUT, COLOR_NTP_TEXT_LIGHT, #if BUILDFLAG(IS_WIN)
diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn index 3cbaef77..9eb5d260 100644 --- a/chrome/browser/ui/BUILD.gn +++ b/chrome/browser/ui/BUILD.gn
@@ -1721,8 +1721,10 @@ "webui/theme_source.h", "webui/util/image_util.cc", "webui/util/image_util.h", - "webui/web_app_internals/web_app_internals_source.cc", - "webui/web_app_internals/web_app_internals_source.h", + "webui/web_app_internals/web_app_internals_handler.cc", + "webui/web_app_internals/web_app_internals_handler.h", + "webui/web_app_internals/web_app_internals_ui.cc", + "webui/web_app_internals/web_app_internals_ui.h", "webui/webui_gallery/webui_gallery_ui.cc", "webui/webui_gallery/webui_gallery_ui.h", "webui/whats_new/whats_new_handler.cc", @@ -1774,6 +1776,7 @@ "//chrome/browser/resource_coordinator/tab_ranker", "//chrome/browser/resources/identity_internals:resources", "//chrome/browser/resources/support_tool:resources", + "//chrome/browser/resources/web_app_internals:resources", "//chrome/browser/safe_browsing", "//chrome/browser/safe_browsing:advanced_protection", "//chrome/browser/support_tool:support_tool_proto", @@ -1795,6 +1798,7 @@ "//chrome/browser/ui/webui/side_panel/user_notes:mojo_bindings", "//chrome/browser/ui/webui/tab_search:mojo_bindings", "//chrome/browser/ui/webui/tab_strip:mojo_bindings", + "//chrome/browser/ui/webui/web_app_internals:mojo_bindings", "//chrome/browser/web_applications", "//chrome/common:buildflags", "//chrome/common:version_header",
diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/status/StatusIconView.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/status/StatusIconView.java index 83307cf..ada5f4d9a 100644 --- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/status/StatusIconView.java +++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/status/StatusIconView.java
@@ -11,6 +11,7 @@ import android.widget.Space; import org.chromium.chrome.browser.omnibox.R; +import org.chromium.ui.base.ViewUtils; /** * StatusIconView is a custom view displaying the status icon in the location bar. @@ -33,7 +34,11 @@ @Override public void setVisibility(int visibility) { - mIconViewFrame.setVisibility(visibility); + int iconViewFrameVisibility = getIconVisibility(); + if (iconViewFrameVisibility != visibility) { + mIconViewFrame.setVisibility(visibility); + ViewUtils.requestLayout(this, "StatusIconView setVisibility"); + } // The holding space should be only be VISIBLE if the icon is GONE. The size should be (the // background size - the icon size). mStatusIconHoldingSpace.setVisibility(visibility == View.GONE ? View.VISIBLE : View.GONE);
diff --git a/chrome/browser/ui/ash/desks/desks_client_browsertest.cc b/chrome/browser/ui/ash/desks/desks_client_browsertest.cc index f990897..6e67352a 100644 --- a/chrome/browser/ui/ash/desks/desks_client_browsertest.cc +++ b/chrome/browser/ui/ash/desks/desks_client_browsertest.cc
@@ -1355,6 +1355,43 @@ EXPECT_EQ(*app_name, *new_app_name); } +// Tests that PWAs with out of scope urls are saved and launched correctly. +// Regression test for b/248645623. +IN_PROC_BROWSER_TEST_F(DesksClientTest, LaunchTemplateWithOutOfScopeURL) { + ASSERT_TRUE(DesksClient::Get()); + + Browser* pwa_browser = + InstallAndLaunchPWA(GURL(kYoutubeUrl), /*launch_in_browser=*/false); + ASSERT_TRUE(pwa_browser->is_type_app()); + aura::Window* pwa_window = pwa_browser->window()->GetNativeWindow(); + const std::string* app_name = + pwa_window->GetProperty(app_restore::kBrowserAppNameKey); + ASSERT_TRUE(app_name); + + const GURL out_of_scope_url(kExampleUrl1); + ASSERT_TRUE(ui_test_utils::NavigateToURL(pwa_browser, out_of_scope_url)); + // Verify that the PWA has navigated to the out of scope url. + const std::vector<GURL> urls = GetURLsForBrowserWindow(pwa_browser); + ASSERT_THAT(urls, ElementsAre(out_of_scope_url)); + + // Set the template and launch it. + SetAndLaunchTemplate( + CaptureActiveDeskAndSaveTemplate(ash::DeskTemplateType::kTemplate)); + + // Verify that the PWA was launched correctly, and that the out of scope url + // was successfully opened in the PWA (and not in a normal browser window). + Browser* new_pwa_browser = FindLaunchedBrowserByURLs(urls); + ASSERT_TRUE(new_pwa_browser); + ASSERT_TRUE(new_pwa_browser->is_type_app()); + aura::Window* new_browser_window = + new_pwa_browser->window()->GetNativeWindow(); + EXPECT_NE(new_browser_window, pwa_window); + const std::string* new_app_name = + new_browser_window->GetProperty(app_restore::kBrowserAppNameKey); + ASSERT_TRUE(new_app_name); + EXPECT_EQ(*app_name, *new_app_name); +} + // Tests that saving and launching a template that contains a PWA in a browser // window works as expected. IN_PROC_BROWSER_TEST_F(DesksClientTest, LaunchTemplateWithPWAInBrowser) {
diff --git a/chrome/browser/ui/ash/desks/desks_templates_app_launch_handler.cc b/chrome/browser/ui/ash/desks/desks_templates_app_launch_handler.cc index ca6f3cd7..7b4e72a 100644 --- a/chrome/browser/ui/ash/desks/desks_templates_app_launch_handler.cc +++ b/chrome/browser/ui/ash/desks/desks_templates_app_launch_handler.cc
@@ -193,6 +193,7 @@ /*user_gesture=*/false); create_params.restore_id = window_iter.first; + create_params.creation_source = Browser::CreationSource::kDeskTemplate; absl::optional<chromeos::WindowStateType> window_state_type( app_restore_data->window_state_type);
diff --git a/chrome/browser/ui/browser.h b/chrome/browser/ui/browser.h index c1fcaf3..7623254 100644 --- a/chrome/browser/ui/browser.h +++ b/chrome/browser/ui/browser.h
@@ -206,6 +206,7 @@ kSessionRestore, kStartupCreator, kLastAndUrlsStartupPref, + kDeskTemplate, }; // The default value for a browser's `restore_id` param.
diff --git a/chrome/browser/ui/browser_navigator.cc b/chrome/browser/ui/browser_navigator.cc index d5766f0..4278481 100644 --- a/chrome/browser/ui/browser_navigator.cc +++ b/chrome/browser/ui/browser_navigator.cc
@@ -103,12 +103,18 @@ // Returns true if |params.browser| exists and can open a new tab for // |params.url|. Not all browsers support multiple tabs, such as app frames and -// popups. TYPE_APP will only open a new tab if the URL is within the app scope. +// popups. TYPE_APP will open a new tab if the browser was launched from a +// template, otherwise only if the URL is within the app scope. bool WindowCanOpenTabs(const NavigateParams& params) { - if (!params.browser) + if (!params.browser) { return false; + } - if (params.browser->app_controller() && + // If the browser is created from a template, we do not need to check if the + // url is in the app scope since we know it was saved directly from the app. + if (params.browser->creation_source() != + Browser::CreationSource::kDeskTemplate && + params.browser->app_controller() && !params.browser->app_controller()->IsUrlInAppScope(params.url)) { return false; }
diff --git a/chrome/browser/ui/color/chrome_color_mixer.cc b/chrome/browser/ui/color/chrome_color_mixer.cc index c8834f2..b8a43b0 100644 --- a/chrome/browser/ui/color/chrome_color_mixer.cc +++ b/chrome/browser/ui/color/chrome_color_mixer.cc
@@ -119,23 +119,12 @@ std::move(bg_b_transform), contrast_threshold); } -// Flat version of dark mode colors used in bookmarks bar to fill -// the buttons. -constexpr SkColor kFlatGrey = SkColorSetRGB(0x5D, 0x5E, 0x62); -constexpr SkColor kFlatBlue = SkColorSetRGB(0x49, 0x54, 0x68); -constexpr SkColor kFlatRed = SkColorSetRGB(0x62, 0x4A, 0x4B); -constexpr SkColor kFlatGreen = SkColorSetRGB(0x47, 0x59, 0x50); -constexpr SkColor kFlatYellow = SkColorSetRGB(0x65, 0x5C, 0x44); -constexpr SkColor kFlatCyan = SkColorSetRGB(0x45, 0x5D, 0x65); -constexpr SkColor kFlatPurple = SkColorSetRGB(0x58, 0x4A, 0x68); -constexpr SkColor kFlatPink = SkColorSetRGB(0x65, 0x4A, 0x5D); - // Default toolbar colors. constexpr SkColor kDarkToolbarColor = SkColorSetRGB(0x35, 0x36, 0x3A); constexpr SkColor kLightToolbarColor = SK_ColorWHITE; -// Alpha of 61 = 24%. From GetTabGroupColors() in theme_helper.cc. -constexpr SkAlpha tab_group_chip_alpha = 61; +// Alpha of 61 = 24% opacity. Opacity of tab group chips in the bookmarks bar. +constexpr SkAlpha kTabGroupChipAlpha = 61; } // namespace @@ -539,28 +528,40 @@ gfx::kGoogleYellow600); mixer[kColorTabGroupBookmarkBarBlue] = SelectColorBasedOnDarkInputOrMode( - dark_mode, kColorBookmarkBarForeground, kFlatBlue, gfx::kGoogleBlue050); + dark_mode, kColorBookmarkBarForeground, + ui::SetAlpha(gfx::kGoogleBlue300, kTabGroupChipAlpha), + gfx::kGoogleBlue050); mixer[kColorTabGroupBookmarkBarCyan] = SelectColorBasedOnDarkInputOrMode( - dark_mode, kColorBookmarkBarForeground, kFlatCyan, gfx::kGoogleCyan050); + dark_mode, kColorBookmarkBarForeground, + ui::SetAlpha(gfx::kGoogleCyan300, kTabGroupChipAlpha), + gfx::kGoogleCyan050); mixer[kColorTabGroupBookmarkBarGreen] = SelectColorBasedOnDarkInputOrMode( - dark_mode, kColorBookmarkBarForeground, kFlatGreen, gfx::kGoogleGreen050); + dark_mode, kColorBookmarkBarForeground, + ui::SetAlpha(gfx::kGoogleGreen300, kTabGroupChipAlpha), + gfx::kGoogleGreen050); mixer[kColorTabGroupBookmarkBarGrey] = SelectColorBasedOnDarkInputOrMode( - dark_mode, kColorBookmarkBarForeground, kFlatGrey, gfx::kGoogleGrey100); + dark_mode, kColorBookmarkBarForeground, + ui::SetAlpha(gfx::kGoogleGrey300, kTabGroupChipAlpha), + gfx::kGoogleGrey100); mixer[kColorTabGroupBookmarkBarPink] = SelectColorBasedOnDarkInputOrMode( - dark_mode, kColorBookmarkBarForeground, kFlatPink, gfx::kGooglePink050); - mixer[kColorTabGroupBookmarkBarPurple] = - SelectColorBasedOnDarkInputOrMode(dark_mode, kColorBookmarkBarForeground, - kFlatPurple, gfx::kGooglePurple050); + dark_mode, kColorBookmarkBarForeground, + ui::SetAlpha(gfx::kGooglePink300, kTabGroupChipAlpha), + gfx::kGooglePink050); + mixer[kColorTabGroupBookmarkBarPurple] = SelectColorBasedOnDarkInputOrMode( + dark_mode, kColorBookmarkBarForeground, + ui::SetAlpha(gfx::kGooglePurple300, kTabGroupChipAlpha), + gfx::kGooglePurple050); mixer[kColorTabGroupBookmarkBarRed] = SelectColorBasedOnDarkInputOrMode( - dark_mode, kColorBookmarkBarForeground, kFlatRed, gfx::kGoogleRed050); - mixer[kColorTabGroupBookmarkBarYellow] = - SelectColorBasedOnDarkInputOrMode(dark_mode, kColorBookmarkBarForeground, - kFlatYellow, gfx::kGoogleYellow050); - auto flat_orange = ui::AlphaBlend(gfx::kGoogleOrange300, kDarkToolbarColor, - tab_group_chip_alpha); - mixer[kColorTabGroupBookmarkBarOrange] = - SelectColorBasedOnDarkInputOrMode(dark_mode, kColorBookmarkBarForeground, - flat_orange, gfx::kGoogleOrange050); + dark_mode, kColorBookmarkBarForeground, + ui::SetAlpha(gfx::kGoogleRed300, kTabGroupChipAlpha), gfx::kGoogleRed050); + mixer[kColorTabGroupBookmarkBarYellow] = SelectColorBasedOnDarkInputOrMode( + dark_mode, kColorBookmarkBarForeground, + ui::SetAlpha(gfx::kGoogleYellow300, kTabGroupChipAlpha), + gfx::kGoogleYellow050); + mixer[kColorTabGroupBookmarkBarOrange] = SelectColorBasedOnDarkInputOrMode( + dark_mode, kColorBookmarkBarForeground, + ui::SetAlpha(gfx::kGoogleOrange300, kTabGroupChipAlpha), + gfx::kGoogleOrange050); mixer[kColorTabHoverCardBackground] = {dark_mode ? gfx::kGoogleGrey900 : gfx::kGoogleGrey050};
diff --git a/chrome/browser/ui/color/new_tab_page_color_mixer.cc b/chrome/browser/ui/color/new_tab_page_color_mixer.cc index 53c45fa0..82cb572 100644 --- a/chrome/browser/ui/color/new_tab_page_color_mixer.cc +++ b/chrome/browser/ui/color/new_tab_page_color_mixer.cc
@@ -22,21 +22,24 @@ namespace { ui::ColorTransform GetContrastingColorTransform( - ui::ColorTransform input_transform) { + ui::ColorTransform input_transform, + absl::optional<float> luminosity_change = absl::nullopt) { const auto generator = [](ui::ColorTransform input_transform, + const absl::optional<float> luminosity_change, SkColor input_color, const ui::ColorMixer& mixer) { const SkColor color = input_transform.Run(input_color, mixer); - double luminosity_change = + const float default_luminosity_change = color_utils::IsDark(color) ? ntp_features::kNtpElementLuminosityChangeForDarkBackgroundParam .Get() : ntp_features::kNtpElementLuminosityChangeForLightBackgroundParam .Get(); - - return GetContrastingColor(color, luminosity_change); + return GetContrastingColor( + color, luminosity_change.value_or(default_luminosity_change)); }; - return base::BindRepeating(generator, std::move(input_transform)); + return base::BindRepeating(generator, std::move(input_transform), + std::move(luminosity_change)); } ui::ColorTransform IncreaseLightness(ui::ColorTransform input_transform, @@ -221,6 +224,8 @@ void AddNewTabPageColorMixer(ui::ColorProvider* provider, const ui::ColorProviderManager::Key& key) { + using ThemeType = + ui::ColorProviderManager::ThemeInitializerSupplier::ThemeType; const bool dark_mode = key.color_mode == ui::ColorProviderManager::ColorMode::kDark; @@ -246,12 +251,18 @@ mixer[kColorNewTabPageMenuOuterShadow] = ui::SetAlpha(menu_shadow_color, /* 15% opacity */ 0.15 * SK_AlphaOPAQUE); - if (dark_mode) { + if (key.custom_theme) { + mixer[kColorNewTabPageMostVisitedTileBackground] = + SelectBasedOnWhiteNtpBackground( + {kColorNewTabPageMostVisitedTileBackgroundUnthemed}, + GetContrastingColorTransform({kColorNewTabPageBackground}, 0.2f)); + } else if (dark_mode) { mixer[kColorNewTabPageMostVisitedTileBackground] = {gfx::kGoogleGrey900}; } else { mixer[kColorNewTabPageMostVisitedTileBackground] = { kColorNewTabPageMostVisitedTileBackgroundUnthemed}; } + mixer[kColorNewTabPageMostVisitedTileBackgroundUnthemed] = { gfx::kGoogleGrey100}; mixer[kColorNewTabPageSectionBorder] = @@ -350,8 +361,6 @@ AddWebThemeNewTabPageColors(mixer, dark_mode); - using ThemeType = - ui::ColorProviderManager::ThemeInitializerSupplier::ThemeType; if (base::FeatureList::IsEnabled(ntp_features::kNtpComprehensiveTheming) && key.custom_theme && key.custom_theme->get_theme_type() == ThemeType::kAutogenerated) {
diff --git a/chrome/browser/ui/color/new_tab_page_color_mixer_unittest.cc b/chrome/browser/ui/color/new_tab_page_color_mixer_unittest.cc index 93ea8c9..28c6bcb 100644 --- a/chrome/browser/ui/color/new_tab_page_color_mixer_unittest.cc +++ b/chrome/browser/ui/color/new_tab_page_color_mixer_unittest.cc
@@ -67,6 +67,8 @@ ntp_features::kNtpElementLuminosityChangeForLightBackgroundParam.Get()); EXPECT_EQ(provider.GetColor(kColorNewTabPageButtonBackground), contrasting_color); + EXPECT_EQ(provider.GetColor(kColorNewTabPageMostVisitedTileBackground), + contrasting_color); } TEST(NewTabPageColorMixer, CustomColorComprehensiveThemeRealboxColors) { @@ -123,6 +125,8 @@ EXPECT_EQ(provider.GetColor(kColorNewTabPageButtonForeground), gfx::kGoogleBlue600); EXPECT_EQ(provider.GetColor(kColorNewTabPageLink), gfx::kGoogleBlue600); + EXPECT_EQ(provider.GetColor(kColorNewTabPageMostVisitedTileBackground), + gfx::kGoogleGrey100); } } // namespace
diff --git a/chrome/browser/ui/tabs/OWNERS b/chrome/browser/ui/tabs/OWNERS index 4ea419f..5c1a2941 100644 --- a/chrome/browser/ui/tabs/OWNERS +++ b/chrome/browser/ui/tabs/OWNERS
@@ -1,7 +1,6 @@ bsep@chromium.org -connily@chromium.org dfried@chromium.org +dpenning@chromium.org sky@chromium.org tbergquist@chromium.org -dpenning@chromium.org per-file tab_group.cc, tab_group.h=dljames@chromium.org
diff --git a/chrome/browser/ui/views/OWNERS b/chrome/browser/ui/views/OWNERS index 254282e..e9f6a69 100644 --- a/chrome/browser/ui/views/OWNERS +++ b/chrome/browser/ui/views/OWNERS
@@ -6,7 +6,6 @@ bsep@chromium.org collinbaker@chromium.org -connily@chromium.org corising@chromium.org dfried@chromium.org dpenning@chromium.org
diff --git a/chrome/browser/ui/views/menu_item_view_interactive_uitest.cc b/chrome/browser/ui/views/menu_item_view_interactive_uitest.cc index 15dca85..c5b89dd 100644 --- a/chrome/browser/ui/views/menu_item_view_interactive_uitest.cc +++ b/chrome/browser/ui/views/menu_item_view_interactive_uitest.cc
@@ -217,13 +217,7 @@ VIEW_TEST(MenuItemViewTestInsertWithSubmenu0, InsertItemWithSubmenu0) // If this flakes, disable and log details in http://crbug.com/523255. -// Failing on Linux Ozone Tester (Wayland) (See crbug.com/1236048). -#if BUILDFLAG(IS_OZONE) -#define MAYBE_InsertItemWithSubmenu1 DISABLED_InsertItemWithSubmenu1 -#else -#define MAYBE_InsertItemWithSubmenu1 InsertItemWithSubmenu1 -#endif -VIEW_TEST(MenuItemViewTestInsertWithSubmenu1, MAYBE_InsertItemWithSubmenu1) +VIEW_TEST(MenuItemViewTestInsertWithSubmenu1, InsertItemWithSubmenu1) // Test class for removing a menu item while the menu is open. template <int REMOVE_INDEX, int SELECT_INDEX>
diff --git a/chrome/browser/ui/views/side_panel/read_anything/read_anything_controller.cc b/chrome/browser/ui/views/side_panel/read_anything/read_anything_controller.cc index 09c2b9b1..613f816 100644 --- a/chrome/browser/ui/views/side_panel/read_anything/read_anything_controller.cc +++ b/chrome/browser/ui/views/side_panel/read_anything/read_anything_controller.cc
@@ -6,29 +6,88 @@ #include <vector> +#include "base/containers/contains.h" #include "chrome/browser/ui/browser.h" +#include "chrome/browser/ui/browser_finder.h" +#include "chrome/browser/ui/tab_contents/tab_contents_iterator.h" #include "chrome/browser/ui/views/side_panel/read_anything/read_anything_constants.h" #include "chrome/browser/ui/webui/side_panel/read_anything/read_anything_prefs.h" #include "chrome/common/accessibility/read_anything.mojom.h" -#include "ui/accessibility/ax_tree_update.h" +#include "content/public/browser/web_contents_observer.h" +#include "content/public/browser/web_contents_user_data.h" +#include "ui/accessibility/ax_action_data.h" + +class ReadAnythingWebContentsObserver + : public content::WebContentsObserver, + public content::WebContentsUserData<ReadAnythingWebContentsObserver> { + public: + ReadAnythingWebContentsObserver(const ReadAnythingWebContentsObserver&) = + delete; + ReadAnythingWebContentsObserver& operator=( + const ReadAnythingWebContentsObserver&) = delete; + ~ReadAnythingWebContentsObserver() override = default; + + // content::WebContentsObserver: + void AccessibilityEventReceived( + const content::AXEventNotificationDetails& details) override { + if (controller_) { + controller_->AccessibilityEventReceived(details); + } + } + + void WebContentsDestroyed() override { + if (controller_) { + controller_->WebContentsDestroyed(web_contents()); + } + } + + // This causes AXTreeSerializer to reset and send accessibility events of the + // AXTree when it is re-serialized. + void EnableAccessibility() { + // TODO(crbug.com/1266555): Only enable kReadAnythingAXMode. + web_contents()->EnableWebContentsOnlyAccessibilityMode(); + } + + void SetController(ReadAnythingController* controller) { + controller_ = controller; + } + + private: + friend class content::WebContentsUserData<ReadAnythingWebContentsObserver>; + + explicit ReadAnythingWebContentsObserver(content::WebContents* web_contents) + : content::WebContentsObserver(web_contents), + content::WebContentsUserData<ReadAnythingWebContentsObserver>( + *web_contents) {} + + ReadAnythingController* controller_ = nullptr; + + WEB_CONTENTS_USER_DATA_KEY_DECL(); +}; + +WEB_CONTENTS_USER_DATA_KEY_IMPL(ReadAnythingWebContentsObserver); ReadAnythingController::ReadAnythingController(ReadAnythingModel* model, Browser* browser) : model_(model), browser_(browser) { DCHECK(browser_); browser_->tab_strip_model()->AddObserver(this); - WebContentsObserver::Observe( - browser_->tab_strip_model()->GetActiveWebContents()); } ReadAnythingController::~ReadAnythingController() { TabStripModelObserver::StopObservingAll(this); - WebContentsObserver::Observe(nullptr); + for (auto* web_contents : AllTabContentses()) { + ReadAnythingWebContentsObserver* observer = + ReadAnythingWebContentsObserver::FromWebContents(web_contents); + if (observer) { + observer->SetController(nullptr); + } + } } void ReadAnythingController::Activate(bool active) { active_ = active; - SnapshotAXTree(); + NotifyActiveAXTreeIDChanged(); } /////////////////////////////////////////////////////////////////////////////// @@ -113,7 +172,26 @@ void ReadAnythingController::OnUIReady() { ui_ready_ = true; - SnapshotAXTree(); + + // Create web contents observers on all tabs and enable web contents-only + // accessibility on each tab. This causes AXTreeSerializer to reset and send + // accessibility events of the AXTree when it is re-serialized. The WebUI + // receives these events and stores a copy of each web contents' AXTree. If + // the UI was destroyed, it stops receiving events. OnUIReady is called when + // it is re-created, indicating that it needs to restore its copy of each + // web contents' AXTree. + for (int i = 0; i < browser_->tab_strip_model()->count(); i++) { + content::WebContents* web_contents = + browser_->tab_strip_model()->GetWebContentsAt(i); + // CreateForWebContents is no-op if an observer already exists. + ReadAnythingWebContentsObserver::CreateForWebContents(web_contents); + ReadAnythingWebContentsObserver* observer = + ReadAnythingWebContentsObserver::FromWebContents(web_contents); + observer->SetController(this); + observer->EnableAccessibility(); + } + + NotifyActiveAXTreeIDChanged(); } void ReadAnythingController::OnUIDestroyed() { @@ -122,16 +200,7 @@ void ReadAnythingController::OnLinkClicked(const GURL& url, bool open_in_new_tab) { - if (!web_contents()) - return; - WindowOpenDisposition disposition = - open_in_new_tab ? WindowOpenDisposition::NEW_FOREGROUND_TAB - : WindowOpenDisposition::CURRENT_TAB; - content::OpenURLParams params(url, content::Referrer(), disposition, - ui::PAGE_TRANSITION_LINK, - /* is_renderer_initiated= */ true); - params.initiator_origin = url::Origin::Create(web_contents()->GetURL()); - browser_->OpenURL(params); + // TODO(abigailbklein): Reimplement with AccessibilityPerformAction. } /////////////////////////////////////////////////////////////////////////////// @@ -142,10 +211,26 @@ TabStripModel* tab_strip_model, const TabStripModelChange& change, const TabStripSelectionChange& selection) { - if (!selection.active_tab_changed()) + if (!ui_ready_) { return; - WebContentsObserver::Observe(selection.new_contents); - SnapshotAXTree(); + } + // Create a new ReadAnythingWebContentsObserver for inserted web contentses. + if (change.type() == TabStripModelChange::kInserted) { + for (auto contents_with_index : change.GetInsert()->contents) { + content::WebContents* web_contents = contents_with_index.contents; + if (!web_contents) { + continue; + } + ReadAnythingWebContentsObserver::CreateForWebContents(web_contents); + ReadAnythingWebContentsObserver* observer = + ReadAnythingWebContentsObserver::FromWebContents(web_contents); + observer->SetController(this); + observer->EnableAccessibility(); + } + } + if (selection.active_tab_changed()) { + NotifyActiveAXTreeIDChanged(); + } } void ReadAnythingController::OnTabStripModelDestroyed( @@ -158,37 +243,36 @@ } /////////////////////////////////////////////////////////////////////////////// -// content::WebContentsObserver: -/////////////////////////////////////////////////////////////////////////////// -void ReadAnythingController::DidStopLoading() { - SnapshotAXTree(); +void ReadAnythingController::AccessibilityEventReceived( + const content::AXEventNotificationDetails& details) { + model_->AccessibilityEventReceived(details); } -/////////////////////////////////////////////////////////////////////////////// - -void ReadAnythingController::SnapshotAXTree() { - if (!active_ || !ui_ready_ || !web_contents()) - return; - - // Read Anything just runs on the main frame and does not run on embedded - // content. +void ReadAnythingController::WebContentsDestroyed( + content::WebContents* web_contents) { content::RenderFrameHost* render_frame_host = - web_contents()->GetPrimaryMainFrame(); + web_contents->GetPrimaryMainFrame(); if (!render_frame_host) return; - - // Request an AXTreeSnapshot on the main render frame, not the entire web - // contents. The web contents snapshotter combines all render frames which - // Read Anything doesn't require. - render_frame_host->RequestAXTreeSnapshot( - base::BindOnce(&ReadAnythingController::OnAXTreeSnapshotted, - weak_pointer_factory_.GetWeakPtr()), - kReadAnythingAXMode, /* exclude_offscreen= */ false, - /* max_nodes= */ 0, /* timeout= */ {}); + ui::AXTreeID tree_id = render_frame_host->GetAXTreeID(); + model_->OnAXTreeDestroyed(tree_id); } -void ReadAnythingController::OnAXTreeSnapshotted( - const ui::AXTreeUpdate& snapshot) { - model_->OnAXTreeSnapshotted(snapshot); +void ReadAnythingController::NotifyActiveAXTreeIDChanged() { + ui::AXTreeID tree_id = ui::AXTreeIDUnknown(); + if (active_) { + content::WebContents* web_contents = + browser_->tab_strip_model()->GetActiveWebContents(); + if (!web_contents) { + return; + } + content::RenderFrameHost* render_frame_host = + web_contents->GetPrimaryMainFrame(); + if (!render_frame_host) { + return; + } + tree_id = render_frame_host->GetAXTreeID(); + } + model_->OnActiveAXTreeIDChanged(tree_id); }
diff --git a/chrome/browser/ui/views/side_panel/read_anything/read_anything_controller.h b/chrome/browser/ui/views/side_panel/read_anything/read_anything_controller.h index 4cecbb5..920ef67 100644 --- a/chrome/browser/ui/views/side_panel/read_anything/read_anything_controller.h +++ b/chrome/browser/ui/views/side_panel/read_anything/read_anything_controller.h
@@ -15,8 +15,7 @@ #include "chrome/browser/ui/views/side_panel/read_anything/read_anything_model.h" #include "chrome/browser/ui/views/side_panel/read_anything/read_anything_toolbar_view.h" #include "chrome/browser/ui/webui/side_panel/read_anything/read_anything_page_handler.h" -#include "content/public/browser/web_contents_observer.h" -#include "ui/accessibility/ax_tree_update_forward.h" +#include "content/public/browser/ax_event_notification_details.h" #include "ui/base/models/combobox_model.h" class Browser; @@ -35,8 +34,7 @@ class ReadAnythingController : public ReadAnythingToolbarView::Delegate, public ReadAnythingFontCombobox::Delegate, public ReadAnythingPageHandler::Delegate, - public TabStripModelObserver, - public content::WebContentsObserver { + public TabStripModelObserver { public: ReadAnythingController(ReadAnythingModel* model, Browser* browser); ReadAnythingController(const ReadAnythingController&) = delete; @@ -48,6 +46,14 @@ void Activate(bool active); bool IsActiveForTesting() { return active_; } + // Called by ReadAnythingWebContentsObserver. Sends |details| to the WebUI. + void AccessibilityEventReceived( + const content::AXEventNotificationDetails& details); + + // Called by ReadAnythingWebContentsObserver. Notifies the WebUI that the + // AXTree for |web_contents| has been destroyed. + void WebContentsDestroyed(content::WebContents* web_contents); + private: friend class ReadAnythingControllerTest; @@ -76,16 +82,8 @@ const TabStripSelectionChange& selection) override; void OnTabStripModelDestroyed(TabStripModel* tab_strip_model) override; - // content::WebContentsObserver: - void DidStopLoading() override; - - // Requests an AXTree snapshot for the main frame of the currently active web - // contents. - void SnapshotAXTree(); - - // Callback method which receives an AXTree snapshot. Sends the snapshot to - // the WebUI. - void OnAXTreeSnapshotted(const ui::AXTreeUpdate& snapshot); + // Notifies the model that the AXTreeID has changed. + void NotifyActiveAXTreeIDChanged(); const raw_ptr<ReadAnythingModel> model_; std::vector<ReadAnythingModel::Observer*> observers_;
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 b9fd27c9..a32afc3 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
@@ -120,9 +120,22 @@ NotifyThemeChanged(); } -void ReadAnythingModel::OnAXTreeSnapshotted(const ui::AXTreeUpdate& snapshot) { +void ReadAnythingModel::AccessibilityEventReceived( + const content::AXEventNotificationDetails& details) { for (Observer& obs : observers_) { - obs.OnAXTreeSnapshotted(snapshot); + obs.AccessibilityEventReceived(details); + } +} + +void ReadAnythingModel::OnActiveAXTreeIDChanged(const ui::AXTreeID& tree_id) { + for (Observer& obs : observers_) { + obs.OnActiveAXTreeIDChanged(tree_id); + } +} + +void ReadAnythingModel::OnAXTreeDestroyed(const ui::AXTreeID& tree_id) { + for (Observer& obs : observers_) { + obs.OnAXTreeDestroyed(tree_id); } }
diff --git a/chrome/browser/ui/views/side_panel/read_anything/read_anything_model.h b/chrome/browser/ui/views/side_panel/read_anything/read_anything_model.h index af2fb9f..fa04c85b 100644 --- a/chrome/browser/ui/views/side_panel/read_anything/read_anything_model.h +++ b/chrome/browser/ui/views/side_panel/read_anything/read_anything_model.h
@@ -15,7 +15,7 @@ #include "chrome/browser/ui/views/side_panel/read_anything/read_anything_constants.h" #include "chrome/browser/ui/views/side_panel/read_anything/read_anything_menu_model.h" #include "chrome/common/accessibility/read_anything.mojom.h" -#include "ui/accessibility/ax_tree_update.h" +#include "content/public/browser/ax_event_notification_details.h" #include "ui/base/models/combobox_model.h" using read_anything::mojom::Spacing; @@ -161,7 +161,10 @@ public: class Observer : public base::CheckedObserver { public: - virtual void OnAXTreeSnapshotted(const ui::AXTreeUpdate& snapshot) {} + virtual void AccessibilityEventReceived( + const content::AXEventNotificationDetails& details) {} + virtual void OnActiveAXTreeIDChanged(const ui::AXTreeID& tree_id) {} + virtual void OnAXTreeDestroyed(const ui::AXTreeID& tree_id) {} virtual void OnReadAnythingThemeChanged( const std::string& font_name, double font_scale, @@ -185,7 +188,10 @@ void AddObserver(Observer* obs); void RemoveObserver(Observer* obs); - void OnAXTreeSnapshotted(const ui::AXTreeUpdate& snapshot); + void AccessibilityEventReceived( + const content::AXEventNotificationDetails& details); + void OnActiveAXTreeIDChanged(const ui::AXTreeID& tree_id); + void OnAXTreeDestroyed(const ui::AXTreeID& tree_id); void SetSelectedFontByIndex(size_t new_index); double GetValidFontScale(double font_scale);
diff --git a/chrome/browser/ui/views/side_panel/read_anything/read_anything_model_unittest.cc b/chrome/browser/ui/views/side_panel/read_anything/read_anything_model_unittest.cc index 2c56e4a..00a7aa3 100644 --- a/chrome/browser/ui/views/side_panel/read_anything/read_anything_model_unittest.cc +++ b/chrome/browser/ui/views/side_panel/read_anything/read_anything_model_unittest.cc
@@ -10,6 +10,7 @@ #include "build/build_config.h" #include "chrome/browser/ui/ui_features.h" #include "chrome/browser/ui/views/frame/test_with_browser_view.h" +#include "content/public/browser/ax_event_notification_details.h" #include "testing/gmock/include/gmock/gmock.h" #include "ui/accessibility/accessibility_features.h" @@ -20,8 +21,16 @@ class MockReadAnythingModelObserver : public ReadAnythingModel::Observer { public: MOCK_METHOD(void, - OnAXTreeSnapshotted, - (const ui::AXTreeUpdate& snapshot), + AccessibilityEventReceived, + (const content::AXEventNotificationDetails& details), + (override)); + MOCK_METHOD(void, + OnActiveAXTreeIDChanged, + (const ui::AXTreeID& tree_id), + (override)); + MOCK_METHOD(void, + OnAXTreeDestroyed, + (const ui::AXTreeID& tree_id), (override)); MOCK_METHOD(void, OnReadAnythingThemeChanged, @@ -64,11 +73,13 @@ TEST_F(ReadAnythingModelTest, AddingModelObserverNotifiesAllObservers) { model_->AddObserver(&model_observer_1_); - EXPECT_CALL(model_observer_1_, OnAXTreeSnapshotted(_)).Times(0); + EXPECT_CALL(model_observer_1_, AccessibilityEventReceived(_)).Times(0); + EXPECT_CALL(model_observer_1_, OnActiveAXTreeIDChanged(_)).Times(0); EXPECT_CALL(model_observer_1_, OnReadAnythingThemeChanged(_, _, _, _, _, _)) .Times(1); - EXPECT_CALL(model_observer_2_, OnAXTreeSnapshotted(_)).Times(0); + EXPECT_CALL(model_observer_2_, AccessibilityEventReceived(_)).Times(0); + EXPECT_CALL(model_observer_2_, OnActiveAXTreeIDChanged(_)).Times(0); EXPECT_CALL(model_observer_2_, OnReadAnythingThemeChanged(_, _, _, _, _, _)) .Times(1); @@ -79,15 +90,18 @@ model_->AddObserver(&model_observer_1_); model_->AddObserver(&model_observer_2_); - EXPECT_CALL(model_observer_1_, OnAXTreeSnapshotted(_)).Times(0); + EXPECT_CALL(model_observer_1_, AccessibilityEventReceived(_)).Times(0); + EXPECT_CALL(model_observer_1_, OnActiveAXTreeIDChanged(_)).Times(0); EXPECT_CALL(model_observer_1_, OnReadAnythingThemeChanged(_, _, _, _, _, _)) .Times(1); - EXPECT_CALL(model_observer_2_, OnAXTreeSnapshotted(_)).Times(0); + EXPECT_CALL(model_observer_2_, AccessibilityEventReceived(_)).Times(0); + EXPECT_CALL(model_observer_2_, OnActiveAXTreeIDChanged(_)).Times(0); EXPECT_CALL(model_observer_2_, OnReadAnythingThemeChanged(_, _, _, _, _, _)) .Times(0); - EXPECT_CALL(model_observer_3_, OnAXTreeSnapshotted(_)).Times(0); + EXPECT_CALL(model_observer_3_, AccessibilityEventReceived(_)).Times(0); + EXPECT_CALL(model_observer_3_, OnActiveAXTreeIDChanged(_)).Times(0); EXPECT_CALL(model_observer_3_, OnReadAnythingThemeChanged(_, _, _, _, _, _)) .Times(1); @@ -104,14 +118,31 @@ model_->SetSelectedFontByIndex(2); } -TEST_F(ReadAnythingModelTest, NotificationsOnAXTreeSnapshotted) { +TEST_F(ReadAnythingModelTest, NotificationsOnAccessibilityEventReceived) { model_->AddObserver(&model_observer_1_); - EXPECT_CALL(model_observer_1_, OnAXTreeSnapshotted(_)).Times(1); + EXPECT_CALL(model_observer_1_, AccessibilityEventReceived(_)).Times(1); - ui::AXTreeUpdate snapshot; - snapshot.root_id = 1; - model_->OnAXTreeSnapshotted(snapshot); + content::AXEventNotificationDetails details; + model_->AccessibilityEventReceived(details); +} + +TEST_F(ReadAnythingModelTest, NotificationsOnActiveAXTreeIDChanged) { + model_->AddObserver(&model_observer_1_); + + EXPECT_CALL(model_observer_1_, OnActiveAXTreeIDChanged(_)).Times(1); + + ui::AXTreeID tree_id; + model_->OnActiveAXTreeIDChanged(tree_id); +} + +TEST_F(ReadAnythingModelTest, NotificationsOnAXTreeDestroyed) { + model_->AddObserver(&model_observer_1_); + + EXPECT_CALL(model_observer_1_, OnAXTreeDestroyed(_)).Times(1); + + ui::AXTreeID tree_id; + model_->OnAXTreeDestroyed(tree_id); } TEST_F(ReadAnythingModelTest, NotificationsOnDecreasedFontSize) {
diff --git a/chrome/browser/ui/views/tabs/OWNERS b/chrome/browser/ui/views/tabs/OWNERS index 27087e5..c51bb847 100644 --- a/chrome/browser/ui/views/tabs/OWNERS +++ b/chrome/browser/ui/views/tabs/OWNERS
@@ -1,10 +1,9 @@ -connily@chromium.org +dpenning@chromium.org kylixrd@chromium.org pkasting@chromium.org +shibalik@chromium.org sky@chromium.org tbergquist@chromium.org -dpenning@chromium.org -shibalik@chromium.org per-file tab_search_button*=tluk@chromium.org
diff --git a/chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc b/chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc index 9c43c2be8..aa935a1 100644 --- a/chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc +++ b/chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc
@@ -64,7 +64,7 @@ #include "chrome/browser/ui/webui/app_management/app_management_page_handler.h" #include "chrome/browser/ui/webui/app_settings/web_app_settings_ui.h" #include "chrome/browser/ui/webui/ntp/app_launcher_handler.h" -#include "chrome/browser/ui/webui/web_app_internals/web_app_internals_source.h" +#include "chrome/browser/ui/webui/web_app_internals/web_app_internals_handler.h" #include "chrome/browser/web_applications/app_service/web_app_publisher_helper.h" #include "chrome/browser/web_applications/commands/run_on_os_login_command.h" #include "chrome/browser/web_applications/manifest_update_manager.h" @@ -871,7 +871,7 @@ if (testing::Test::HasFailure()) { for (auto* profile : GetAllProfiles()) { base::RunLoop debug_info_loop; - WebAppInternalsSource::BuildWebAppInternalsJson( + WebAppInternalsHandler::BuildDebugInfo( profile, base::BindLambdaForTesting([&](base::Value debug_info) { LOG(INFO) << "chrome://web-app-internals for profile " << profile->GetDebugName() << ":";
diff --git a/chrome/browser/ui/web_applications/web_app_ui_manager_impl.cc b/chrome/browser/ui/web_applications/web_app_ui_manager_impl.cc index e357b58..1dc8676 100644 --- a/chrome/browser/ui/web_applications/web_app_ui_manager_impl.cc +++ b/chrome/browser/ui/web_applications/web_app_ui_manager_impl.cc
@@ -27,7 +27,6 @@ #include "chrome/browser/ui/web_applications/web_app_dialog_manager.h" #include "chrome/browser/ui/web_applications/web_app_launch_utils.h" #include "chrome/browser/ui/web_applications/web_app_metrics.h" -#include "chrome/browser/ui/webui/web_app_internals/web_app_internals_source.h" #include "chrome/browser/web_applications/extensions/web_app_extension_shortcut.h" #include "chrome/browser/web_applications/locks/app_lock.h" #include "chrome/browser/web_applications/os_integration/os_integration_manager.h" @@ -127,11 +126,7 @@ WebAppUiManagerImpl::WebAppUiManagerImpl(Profile* profile) : dialog_manager_(std::make_unique<WebAppDialogManager>(profile)), - profile_(profile) { - // Register the source for the chrome://web-app-internals page. - content::URLDataSource::Add( - profile_, std::make_unique<WebAppInternalsSource>(profile_)); -} + profile_(profile) {} WebAppUiManagerImpl::~WebAppUiManagerImpl() = default;
diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc index f6abdb3..fd83abf 100644 --- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc +++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
@@ -172,6 +172,7 @@ #include "chrome/browser/ui/webui/sync_file_system_internals/sync_file_system_internals_ui.h" #include "chrome/browser/ui/webui/system_info_ui.h" #include "chrome/browser/ui/webui/tab_search/tab_search_ui.h" +#include "chrome/browser/ui/webui/web_app_internals/web_app_internals_ui.h" #include "chrome/browser/ui/webui/webui_gallery/webui_gallery_ui.h" #include "chrome/browser/ui/webui/whats_new/whats_new_ui.h" #include "chrome/browser/web_applications/web_app_provider.h" @@ -940,8 +941,12 @@ } if (base::FeatureList::IsEnabled(features::kSupportTool) && url.host_piece() == chrome::kChromeUISupportToolHost && - SupportToolUI::IsEnabled(profile)) + SupportToolUI::IsEnabled(profile)) { return &NewWebUI<SupportToolUI>; + } + if (url.host_piece() == chrome::kChromeUIWebAppInternalsHost) { + return &NewWebUI<WebAppInternalsUI>; + } #endif // !BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_WIN) if (url.host_piece() == chrome::kChromeUIConflictsHost)
diff --git a/chrome/browser/ui/webui/new_tab_page/new_tab_page_handler.cc b/chrome/browser/ui/webui/new_tab_page/new_tab_page_handler.cc index 6310f06..de6fada 100644 --- a/chrome/browser/ui/webui/new_tab_page/new_tab_page_handler.cc +++ b/chrome/browser/ui/webui/new_tab_page/new_tab_page_handler.cc
@@ -163,30 +163,40 @@ ntp_custom_background_service ? ntp_custom_background_service->GetCustomBackground() : absl::nullopt; + theme->background_color = color_provider.GetColor(kColorNewTabPageBackground); const bool remove_scrim = base::FeatureList::IsEnabled(ntp_features::kNtpRemoveScrim); - const bool apply_custom_background_theming = - custom_background.has_value() || - (remove_scrim && - theme_provider->HasCustomImage(IDR_THEME_NTP_BACKGROUND)); - - theme->background_color = color_provider.GetColor(kColorNewTabPageBackground); SkColor text_color; - if (apply_custom_background_theming) { + if (custom_background.has_value()) { text_color = color_provider.GetColor(kColorNewTabPageTextUnthemed); - most_visited->background_color = color_provider.GetColor( - kColorNewTabPageMostVisitedTileBackgroundUnthemed); theme->logo_color = color_provider.GetColor(kColorNewTabPageLogoUnthemedLight); + most_visited->background_color = color_provider.GetColor( + base::FeatureList::IsEnabled(ntp_features::kNtpComprehensiveTheming) + ? kColorNewTabPageMostVisitedTileBackground + : kColorNewTabPageMostVisitedTileBackgroundUnthemed); + } else if (theme_provider->HasCustomImage(IDR_THEME_NTP_BACKGROUND)) { + text_color = color_provider.GetColor( + remove_scrim ? kColorNewTabPageTextUnthemed : kColorNewTabPageText); + if (remove_scrim) { + theme->logo_color = + color_provider.GetColor(kColorNewTabPageLogoUnthemedLight); + } else if (theme_provider->GetDisplayProperty( + ThemeProperties::NTP_LOGO_ALTERNATE) == 1) { + theme->logo_color = color_provider.GetColor(kColorNewTabPageLogo); + } + most_visited->background_color = color_provider.GetColor( + kColorNewTabPageMostVisitedTileBackgroundUnthemed); } else { text_color = color_provider.GetColor(kColorNewTabPageText); - most_visited->background_color = - color_provider.GetColor(kColorNewTabPageMostVisitedTileBackground); if (theme_provider->GetDisplayProperty( ThemeProperties::NTP_LOGO_ALTERNATE) == 1) { theme->logo_color = color_provider.GetColor(kColorNewTabPageLogo); } + most_visited->background_color = + color_provider.GetColor(kColorNewTabPageMostVisitedTileBackground); } + most_visited->use_white_tile_icon = color_utils::IsDark(most_visited->background_color); most_visited->is_dark = !color_utils::IsDark(text_color);
diff --git a/chrome/browser/ui/webui/new_tab_page/new_tab_page_handler_unittest.cc b/chrome/browser/ui/webui/new_tab_page/new_tab_page_handler_unittest.cc index 7ce7834..32db977f 100644 --- a/chrome/browser/ui/webui/new_tab_page/new_tab_page_handler_unittest.cc +++ b/chrome/browser/ui/webui/new_tab_page/new_tab_page_handler_unittest.cc
@@ -402,11 +402,10 @@ EXPECT_FALSE(theme->background_image_attribution_2.has_value()); EXPECT_FALSE(theme->background_image_attribution_url.has_value()); ASSERT_TRUE(theme->most_visited); + EXPECT_EQ(SkColorSetRGB(0, 0, 8), theme->most_visited->background_color); if (RemoveScrim()) { - EXPECT_EQ(SkColorSetRGB(0, 0, 8), theme->most_visited->background_color); EXPECT_FALSE(theme->most_visited->use_title_pill); } else { - EXPECT_EQ(SkColorSetRGB(0, 0, 6), theme->most_visited->background_color); EXPECT_TRUE(theme->most_visited->use_title_pill); } EXPECT_TRUE(theme->most_visited->use_white_tile_icon); @@ -436,8 +435,10 @@ mock_color_provider_source_.SetColor(kColorNewTabPageLogoUnthemedLight, SkColorSetRGB(0, 0, 3)); mock_color_provider_source_.SetColor( + kColorNewTabPageMostVisitedTileBackground, SkColorSetRGB(0, 0, 4)); + mock_color_provider_source_.SetColor( kColorNewTabPageMostVisitedTileBackgroundUnthemed, - SkColorSetRGB(0, 0, 4)); + SkColorSetRGB(0, 0, 5)); ntp_custom_background_service_observer_->OnCustomBackgroundImageUpdated(); mock_page_.FlushForTesting(); @@ -447,7 +448,6 @@ EXPECT_EQ(SkColorSetRGB(0, 0, 1), theme->background_color); EXPECT_EQ(SkColorSetRGB(0, 0, 2), theme->text_color); EXPECT_EQ(SkColorSetRGB(0, 0, 3), theme->logo_color); - EXPECT_EQ(SkColorSetRGB(0, 0, 4), theme->most_visited->background_color); EXPECT_EQ("https://foo.com/img.png", theme->background_image->url); EXPECT_EQ("foo line", theme->background_image_attribution_1); EXPECT_EQ("bar line", theme->background_image_attribution_2); @@ -459,6 +459,12 @@ } else { EXPECT_FALSE(theme->background_image->scrim_display.has_value()); } + + if (ComprehensiveTheme()) { + EXPECT_EQ(SkColorSetRGB(0, 0, 4), theme->most_visited->background_color); + } else { + EXPECT_EQ(SkColorSetRGB(0, 0, 5), theme->most_visited->background_color); + } } INSTANTIATE_TEST_SUITE_P(All,
diff --git a/chrome/browser/ui/webui/settings/ash/internet_section.cc b/chrome/browser/ui/webui/settings/ash/internet_section.cc index 52e5bf9..c24a0fc2 100644 --- a/chrome/browser/ui/webui/settings/ash/internet_section.cc +++ b/chrome/browser/ui/webui/settings/ash/internet_section.cc
@@ -1043,6 +1043,16 @@ IDS_SETTINGS_INTERNET_HOTSPOT_SUBTITLE_WITH_LEARN_MORE_LINK, GetHelpUrlWithBoard(chrome::kInstantTetheringLearnMoreURL))); html_source->AddString( + "hotspotMobileDataNotSupportedSublabelWithLink", + l10n_util::GetStringFUTF16( + IDS_SETTINGS_INTERNET_HOTSPOT_MOBILE_DATA_NOT_SUPPORTED_SUBLABEL_WITH_LEARN_MORE_LINK, + GetHelpUrlWithBoard(chrome::kInstantTetheringLearnMoreURL))); + html_source->AddString( + "hotspotNoMobileDataSublabelWithLink", + l10n_util::GetStringFUTF16( + IDS_SETTINGS_INTERNET_HOTSPOT_NO_MOBILE_DATA_SUBLABEL_WITH_LEARN_MORE_LINK, + GetHelpUrlWithBoard(chrome::kInstantTetheringLearnMoreURL))); + html_source->AddString( "hotspotSettingsSubtitle", l10n_util::GetStringFUTF16( IDS_SETTINGS_INTERNET_HOTSPOT_SETTINGS_SUBTITLE_WITH_LEARN_MORE_LINK,
diff --git a/chrome/browser/ui/webui/side_panel/bookmarks/bookmarks_side_panel_ui.cc b/chrome/browser/ui/webui/side_panel/bookmarks/bookmarks_side_panel_ui.cc index 738bbf93..1962e7f 100644 --- a/chrome/browser/ui/webui/side_panel/bookmarks/bookmarks_side_panel_ui.cc +++ b/chrome/browser/ui/webui/side_panel/bookmarks/bookmarks_side_panel_ui.cc
@@ -23,6 +23,8 @@ #include "chrome/grit/generated_resources.h" #include "chrome/grit/side_panel_bookmarks_resources.h" #include "chrome/grit/side_panel_bookmarks_resources_map.h" +#include "chrome/grit/side_panel_shared_resources.h" +#include "chrome/grit/side_panel_shared_resources_map.h" #include "components/bookmarks/browser/bookmark_model.h" #include "components/bookmarks/common/bookmark_pref_names.h" #include "components/commerce/core/shopping_service.h" @@ -127,6 +129,8 @@ base::make_span(kSidePanelBookmarksResources, kSidePanelBookmarksResourcesSize), resource); + source->AddResourcePaths(base::make_span(kSidePanelSharedResources, + kSidePanelSharedResourcesSize)); // Add a handler to provide pluralized strings. auto plural_string_handler = std::make_unique<PluralStringHandler>();
diff --git a/chrome/browser/ui/webui/side_panel/read_anything/read_anything_page_handler.cc b/chrome/browser/ui/webui/side_panel/read_anything/read_anything_page_handler.cc index 171c1e3..577ebde 100644 --- a/chrome/browser/ui/webui/side_panel/read_anything/read_anything_page_handler.cc +++ b/chrome/browser/ui/webui/side_panel/read_anything/read_anything_page_handler.cc
@@ -65,9 +65,19 @@ delegate_ = nullptr; } -void ReadAnythingPageHandler::OnAXTreeSnapshotted( - const ui::AXTreeUpdate& snapshot) { - page_->OnAXTreeSnapshotted(snapshot); +void ReadAnythingPageHandler::AccessibilityEventReceived( + const content::AXEventNotificationDetails& details) { + page_->AccessibilityEventReceived(details.ax_tree_id, details.updates, + details.events); +} + +void ReadAnythingPageHandler::OnActiveAXTreeIDChanged( + const ui::AXTreeID& tree_id) { + page_->OnActiveAXTreeIDChanged(tree_id); +} + +void ReadAnythingPageHandler::OnAXTreeDestroyed(const ui::AXTreeID& tree_id) { + page_->OnAXTreeDestroyed(tree_id); } void ReadAnythingPageHandler::OnReadAnythingThemeChanged(
diff --git a/chrome/browser/ui/webui/side_panel/read_anything/read_anything_page_handler.h b/chrome/browser/ui/webui/side_panel/read_anything/read_anything_page_handler.h index 44e4348..4c2198b 100644 --- a/chrome/browser/ui/webui/side_panel/read_anything/read_anything_page_handler.h +++ b/chrome/browser/ui/webui/side_panel/read_anything/read_anything_page_handler.h
@@ -12,11 +12,11 @@ #include "chrome/browser/ui/views/side_panel/read_anything/read_anything_coordinator.h" #include "chrome/browser/ui/views/side_panel/read_anything/read_anything_model.h" #include "chrome/common/accessibility/read_anything.mojom.h" +#include "content/public/browser/ax_event_notification_details.h" #include "mojo/public/cpp/bindings/pending_receiver.h" #include "mojo/public/cpp/bindings/pending_remote.h" #include "mojo/public/cpp/bindings/receiver.h" #include "mojo/public/cpp/bindings/remote.h" -#include "ui/accessibility/ax_tree_update_forward.h" /////////////////////////////////////////////////////////////////////////////// // ReadAnythingPageHandler @@ -49,7 +49,10 @@ void OnLinkClicked(const GURL& url, bool open_in_new_tab) override; // ReadAnythingModel::Observer: - void OnAXTreeSnapshotted(const ui::AXTreeUpdate& snapshot) override; + void AccessibilityEventReceived( + const content::AXEventNotificationDetails& details) override; + void OnActiveAXTreeIDChanged(const ui::AXTreeID& tree_id) override; + void OnAXTreeDestroyed(const ui::AXTreeID& tree_id) override; void OnReadAnythingThemeChanged( const std::string& font_name, double font_scale,
diff --git a/chrome/browser/ui/webui/side_panel/read_anything/read_anything_ui.cc b/chrome/browser/ui/webui/side_panel/read_anything/read_anything_ui.cc index be44c05..65e3cef 100644 --- a/chrome/browser/ui/webui/side_panel/read_anything/read_anything_ui.cc +++ b/chrome/browser/ui/webui/side_panel/read_anything/read_anything_ui.cc
@@ -12,8 +12,8 @@ #include "chrome/browser/ui/webui/webui_util.h" #include "chrome/common/webui_url_constants.h" #include "chrome/grit/generated_resources.h" -#include "chrome/grit/side_panel_resources.h" -#include "chrome/grit/side_panel_resources_map.h" +#include "chrome/grit/side_panel_read_anything_resources.h" +#include "chrome/grit/side_panel_read_anything_resources_map.h" #include "components/strings/grit/components_strings.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_ui.h" @@ -34,7 +34,9 @@ webui::AddLocalizedString(source, str.name, str.id); webui::SetupWebUIDataSource( - source, base::make_span(kSidePanelResources, kSidePanelResourcesSize), + source, + base::make_span(kSidePanelReadAnythingResources, + kSidePanelReadAnythingResourcesSize), IDR_SIDE_PANEL_READ_ANYTHING_READ_ANYTHING_HTML); }
diff --git a/chrome/browser/ui/webui/side_panel/reading_list/OWNERS b/chrome/browser/ui/webui/side_panel/reading_list/OWNERS index 845054fa..b3a4ac5 100644 --- a/chrome/browser/ui/webui/side_panel/reading_list/OWNERS +++ b/chrome/browser/ui/webui/side_panel/reading_list/OWNERS
@@ -1,4 +1,3 @@ -connily@chromium.org corising@chromium.org pbos@chromium.org
diff --git a/chrome/browser/ui/webui/side_panel/reading_list/reading_list_ui.cc b/chrome/browser/ui/webui/side_panel/reading_list/reading_list_ui.cc index d9c636c..0af3804 100644 --- a/chrome/browser/ui/webui/side_panel/reading_list/reading_list_ui.cc +++ b/chrome/browser/ui/webui/side_panel/reading_list/reading_list_ui.cc
@@ -21,6 +21,8 @@ #include "chrome/grit/generated_resources.h" #include "chrome/grit/side_panel_reading_list_resources.h" #include "chrome/grit/side_panel_reading_list_resources_map.h" +#include "chrome/grit/side_panel_shared_resources.h" +#include "chrome/grit/side_panel_shared_resources_map.h" #include "components/favicon_base/favicon_url_parser.h" #include "components/prefs/pref_service.h" #include "components/reading_list/core/reading_list_model.h" @@ -74,6 +76,8 @@ base::make_span(kSidePanelReadingListResources, kSidePanelReadingListResourcesSize), IDR_SIDE_PANEL_READING_LIST_READING_LIST_HTML); + source->AddResourcePaths(base::make_span(kSidePanelSharedResources, + kSidePanelSharedResourcesSize)); } ReadingListUI::~ReadingListUI() = default;
diff --git a/chrome/browser/ui/webui/side_panel/user_notes/user_notes_side_panel_ui.cc b/chrome/browser/ui/webui/side_panel/user_notes/user_notes_side_panel_ui.cc index 22e4496..267da73 100644 --- a/chrome/browser/ui/webui/side_panel/user_notes/user_notes_side_panel_ui.cc +++ b/chrome/browser/ui/webui/side_panel/user_notes/user_notes_side_panel_ui.cc
@@ -11,8 +11,8 @@ #include "chrome/browser/ui/webui/side_panel/user_notes/user_notes_page_handler.h" #include "chrome/browser/ui/webui/webui_util.h" #include "chrome/common/webui_url_constants.h" -#include "chrome/grit/side_panel_resources.h" -#include "chrome/grit/side_panel_resources_map.h" +#include "chrome/grit/side_panel_user_notes_resources.h" +#include "chrome/grit/side_panel_user_notes_resources_map.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_ui_data_source.h" @@ -22,10 +22,10 @@ web_ui->GetWebContents()->GetBrowserContext(), chrome::kChromeUIUserNotesSidePanelHost); - const int resource = IDR_SIDE_PANEL_USER_NOTES_USER_NOTES_HTML; - webui::SetupWebUIDataSource( - source, base::make_span(kSidePanelResources, kSidePanelResourcesSize), - resource); + webui::SetupWebUIDataSource(source, + base::make_span(kSidePanelUserNotesResources, + kSidePanelUserNotesResourcesSize), + IDR_SIDE_PANEL_USER_NOTES_USER_NOTES_HTML); } UserNotesSidePanelUI::~UserNotesSidePanelUI() = default;
diff --git a/chrome/browser/ui/webui/web_app_internals/BUILD.gn b/chrome/browser/ui/webui/web_app_internals/BUILD.gn new file mode 100644 index 0000000..5efa69d --- /dev/null +++ b/chrome/browser/ui/webui/web_app_internals/BUILD.gn
@@ -0,0 +1,11 @@ +# 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("//mojo/public/tools/bindings/mojom.gni") + +mojom("mojo_bindings") { + sources = [ "web_app_internals.mojom" ] + webui_module_path = "/" + use_typescript_sources = true +}
diff --git a/chrome/browser/ui/webui/web_app_internals/OWNERS b/chrome/browser/ui/webui/web_app_internals/OWNERS index 1255a2c..a74f103 100644 --- a/chrome/browser/ui/webui/web_app_internals/OWNERS +++ b/chrome/browser/ui/webui/web_app_internals/OWNERS
@@ -1 +1,4 @@ file://chrome/browser/web_applications/OWNERS + +per-file *.mojom=set noparent +per-file *.mojom=file://ipc/SECURITY_OWNERS
diff --git a/chrome/browser/ui/webui/web_app_internals/web_app_internals.mojom b/chrome/browser/ui/webui/web_app_internals/web_app_internals.mojom new file mode 100644 index 0000000..19ccdf6 --- /dev/null +++ b/chrome/browser/ui/webui/web_app_internals/web_app_internals.mojom
@@ -0,0 +1,12 @@ +// Copyright 2023 The Chromium Authors +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +module mojom; + +// Handles requests from chrome://web-app-internals. +// This is expected to be hosted in the browser process. +interface WebAppInternalsHandler { + // Returns Web App related debug information as a JSON string. + GetDebugInfoAsJsonString() => (string result); +};
diff --git a/chrome/browser/ui/webui/web_app_internals/web_app_internals_handler.cc b/chrome/browser/ui/webui/web_app_internals/web_app_internals_handler.cc new file mode 100644 index 0000000..375e3ff --- /dev/null +++ b/chrome/browser/ui/webui/web_app_internals/web_app_internals_handler.cc
@@ -0,0 +1,345 @@ +// Copyright 2023 The Chromium Authors +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "chrome/browser/ui/webui/web_app_internals/web_app_internals_handler.h" + +#include <string> +#include <vector> + +#include "base/files/file_enumerator.h" +#include "base/files/file_util.h" +#include "base/ranges/algorithm.h" +#include "base/strings/strcat.h" +#include "base/strings/string_number_conversions.h" +#include "base/task/thread_pool.h" +#include "base/values.h" +#include "build/build_config.h" +#include "chrome/browser/profiles/profile.h" +#include "chrome/browser/web_applications/preinstalled_web_app_manager.h" +#include "chrome/browser/web_applications/web_app.h" +#include "chrome/browser/web_applications/web_app_command_manager.h" +#include "chrome/browser/web_applications/web_app_icon_manager.h" +#include "chrome/browser/web_applications/web_app_install_manager.h" +#include "chrome/browser/web_applications/web_app_provider.h" +#include "chrome/browser/web_applications/web_app_registrar.h" +#include "chrome/browser/web_applications/web_app_utils.h" +#include "chrome/common/pref_names.h" +#include "components/prefs/pref_service.h" + +#if BUILDFLAG(IS_MAC) +#include "chrome/browser/web_applications/app_shim_registry_mac.h" +#endif + +namespace { + +// New fields must be added to BuildIndexJson(). +constexpr char kInstalledWebApps[] = "InstalledWebApps"; +constexpr char kPreinstalledWebAppConfigs[] = "PreinstalledWebAppConfigs"; +constexpr char kUserUninstalledPreinstalledWebAppPrefs[] = + "UserUninstalledPreinstalledWebAppPrefs"; +constexpr char kExternallyManagedWebAppPrefs[] = "ExternallyManagedWebAppPrefs"; +constexpr char kCommandManager[] = "CommandManager"; +constexpr char kIconErrorLog[] = "IconErrorLog"; +constexpr char kInstallationProcessErrorLog[] = "InstallationProcessErrorLog"; +#if BUILDFLAG(IS_MAC) +constexpr char kAppShimRegistryLocalStorage[] = "AppShimRegistryLocalStorage"; +#endif +constexpr char kWebAppDirectoryDiskState[] = "WebAppDirectoryDiskState"; + +constexpr char kNeedsRecordWebAppDebugInfo[] = + "No debugging info available! Please enable: " + "chrome://flags/#record-web-app-debug-info"; + +template <typename T> +std::string ConvertToString(const T& value) { + std::stringstream ss; + ss << value; + return ss.str(); +} + +base::Value::Dict BuildIndexJson() { + base::Value::Dict root; + base::Value::List& index = *root.EnsureList("Index"); + + index.Append(kInstalledWebApps); + index.Append(kPreinstalledWebAppConfigs); + index.Append(kUserUninstalledPreinstalledWebAppPrefs); + index.Append(kExternallyManagedWebAppPrefs); + index.Append(kCommandManager); + index.Append(kIconErrorLog); + index.Append(kInstallationProcessErrorLog); +#if BUILDFLAG(IS_MAC) + index.Append(kAppShimRegistryLocalStorage); +#endif + index.Append(kWebAppDirectoryDiskState); + + return root; +} + +base::Value::Dict BuildInstalledWebAppsJson(web_app::WebAppProvider& provider) { + base::Value::Dict root; + + base::Value::Dict& installed_web_apps = *root.EnsureDict(kInstalledWebApps); + + std::vector<const web_app::WebApp*> web_apps; + for (const web_app::WebApp& web_app : + provider.registrar_unsafe().GetAppsIncludingStubs()) { + web_apps.push_back(&web_app); + } + base::ranges::sort(web_apps, {}, &web_app::WebApp::untranslated_name); + + // Prefix with a ! so this appears at the top when serialized. + base::Value::Dict& index = *installed_web_apps.EnsureDict("!Index"); + for (const web_app::WebApp* web_app : web_apps) { + const std::string& key = web_app->untranslated_name(); + base::Value* existing_entry = index.Find(key); + if (!existing_entry) { + index.Set(key, web_app->app_id()); + continue; + } + // If any web apps share identical names then collect a list of app IDs. + const std::string* existing_id = existing_entry->GetIfString(); + if (existing_id) { + base::Value::List id_list; + id_list.Append(*existing_id); + index.Set(key, std::move(id_list)); + } + index.FindList(key)->Append(web_app->app_id()); + } + + base::Value::List& web_app_details = + *installed_web_apps.EnsureList("Details"); + for (const web_app::WebApp* web_app : web_apps) { + web_app_details.Append(web_app->AsDebugValue()); + } + + return root; +} + +base::Value::Dict BuildPreinstalledWebAppConfigsJson( + web_app::WebAppProvider& provider) { + base::Value::Dict root; + + const web_app::PreinstalledWebAppManager::DebugInfo* debug_info = + provider.preinstalled_web_app_manager().debug_info(); + if (!debug_info) { + root.Set(kPreinstalledWebAppConfigs, kNeedsRecordWebAppDebugInfo); + return root; + } + + base::Value::Dict& preinstalled_web_app_configs = + *root.EnsureDict(kPreinstalledWebAppConfigs); + + base::Value::List& config_parse_errors = + *preinstalled_web_app_configs.EnsureList("ConfigParseErrors"); + for (const std::string& parse_error : debug_info->parse_errors) { + config_parse_errors.Append(parse_error); + } + + base::Value::List& configs_enabled = + *preinstalled_web_app_configs.EnsureList("ConfigsEnabled"); + for (const web_app::ExternalInstallOptions& enabled_config : + debug_info->enabled_configs) { + configs_enabled.Append(enabled_config.AsDebugValue()); + } + + base::Value::List& configs_disabled = + *preinstalled_web_app_configs.EnsureList("ConfigsDisabled"); + for (const std::pair<web_app::ExternalInstallOptions, std::string>& + disabled_config : debug_info->disabled_configs) { + base::Value::Dict entry; + entry.Set("!Reason", disabled_config.second); + entry.Set("Config", disabled_config.first.AsDebugValue()); + configs_disabled.Append(std::move(entry)); + } + + base::Value::List& install_results = + *preinstalled_web_app_configs.EnsureList("InstallResults"); + for (std::pair<const GURL&, + const web_app::ExternallyManagedAppManager::InstallResult&> + install_result : debug_info->install_results) { + base::Value::Dict entry; + entry.Set("InstallUrl", install_result.first.spec()); + entry.Set("ResultCode", ConvertToString(install_result.second.code)); + entry.Set("DidUninstallAndReplace", + install_result.second.did_uninstall_and_replace); + install_results.Append(std::move(entry)); + } + + preinstalled_web_app_configs.Set("IsStartUpTaskComplete", + debug_info->is_start_up_task_complete); + + base::Value::List& uninstall_results = + *preinstalled_web_app_configs.EnsureList("UninstallResults"); + for (std::pair<const GURL&, const bool&> uninstall_result : + debug_info->uninstall_results) { + base::Value::Dict entry; + entry.Set("InstallUrl", uninstall_result.first.spec()); + entry.Set("Success", uninstall_result.second); + uninstall_results.Append(std::move(entry)); + } + + return root; +} + +base::Value::Dict BuildExternallyManagedWebAppPrefsJson(Profile* profile) { + base::Value::Dict root; + root.Set(kExternallyManagedWebAppPrefs, + profile->GetPrefs()->GetDict(prefs::kWebAppsExtensionIDs).Clone()); + return root; +} + +base::Value::Dict BuildUserUninstalledPreinstalledWebAppPrefsJson( + Profile* profile) { + base::Value::Dict root; + root.Set(kUserUninstalledPreinstalledWebAppPrefs, + profile->GetPrefs() + ->GetDict(prefs::kUserUninstalledPreinstalledWebAppPref) + .Clone()); + return root; +} + +base::Value::Dict BuildCommandManagerJson(web_app::WebAppProvider& provider) { + base::Value::Dict root; + root.Set(kCommandManager, provider.command_manager().ToDebugValue()); + return root; +} + +base::Value::Dict BuildIconErrorLogJson(web_app::WebAppProvider& provider) { + base::Value::Dict root; + + const std::vector<std::string>* error_log = + provider.icon_manager().error_log(); + + if (!error_log) { + root.Set(kIconErrorLog, kNeedsRecordWebAppDebugInfo); + return root; + } + + base::Value::List& icon_error_log = *root.EnsureList(kIconErrorLog); + for (const std::string& error : *error_log) { + icon_error_log.Append(error); + } + + return root; +} + +base::Value::Dict BuildInstallProcessErrorLogJson( + web_app::WebAppProvider& provider) { + base::Value::Dict root; + + const web_app::WebAppInstallManager::ErrorLog* error_log = + provider.install_manager().error_log(); + + if (!error_log) { + root.Set(kInstallationProcessErrorLog, kNeedsRecordWebAppDebugInfo); + return root; + } + + base::Value::List& installation_process_error_log = + *root.EnsureList(kInstallationProcessErrorLog); + for (const base::Value& error : *error_log) { + installation_process_error_log.Append(error.Clone()); + } + + return root; +} + +#if BUILDFLAG(IS_MAC) +base::Value::Dict BuildAppShimRegistryLocalStorageJson() { + base::Value::Dict root; + root.Set(kAppShimRegistryLocalStorage, + AppShimRegistry::Get()->AsDebugDict().Clone()); + return root; +} +#endif + +void BuildDirectoryState(base::FilePath file_or_folder, + base::Value::Dict* folder) { + base::File::Info info; + bool success = base::GetFileInfo(file_or_folder, &info); + if (!success) { + folder->Set(file_or_folder.AsUTF8Unsafe(), "Invalid file or folder"); + return; + } + // The path of files is fully printed to allow easy copy-paste for developer + // reference. + if (!info.is_directory) { + folder->Set(file_or_folder.AsUTF8Unsafe(), + base::StrCat({base::NumberToString(info.size), " bytes"})); + return; + } + + base::Value::Dict contents; + base::FileEnumerator files( + file_or_folder, false, + base::FileEnumerator::FILES | base::FileEnumerator::DIRECTORIES); + for (base::FilePath current = files.Next(); !current.empty(); + current = files.Next()) { + BuildDirectoryState(current, &contents); + } + folder->Set(file_or_folder.BaseName().AsUTF8Unsafe(), std::move(contents)); +} + +base::Value BuildWebAppDiskStateJson(base::FilePath root_directory, + base::Value::List root) { + base::Value::Dict contents; + BuildDirectoryState(root_directory, &contents); + + base::Value::Dict section; + section.Set(kWebAppDirectoryDiskState, std::move(contents)); + root.Append(std::move(section)); + return base::Value(std::move(root)); +} + +} // namespace + +// static +void WebAppInternalsHandler::BuildDebugInfo( + Profile* profile, + base::OnceCallback<void(base::Value root)> callback) { + auto* provider = web_app::WebAppProvider::GetForLocalAppsUnchecked(profile); + + base::Value::List root; + root.Append(BuildIndexJson()); + root.Append(BuildInstalledWebAppsJson(*provider)); + root.Append(BuildPreinstalledWebAppConfigsJson(*provider)); + root.Append(BuildUserUninstalledPreinstalledWebAppPrefsJson(profile)); + root.Append(BuildExternallyManagedWebAppPrefsJson(profile)); + root.Append(BuildCommandManagerJson(*provider)); + root.Append(BuildIconErrorLogJson(*provider)); + root.Append(BuildInstallProcessErrorLogJson(*provider)); +#if BUILDFLAG(IS_MAC) + root.Append(BuildAppShimRegistryLocalStorageJson()); +#endif + base::ThreadPool::PostTaskAndReplyWithResult( + FROM_HERE, {base::TaskPriority::USER_VISIBLE, base::MayBlock()}, + base::BindOnce(&BuildWebAppDiskStateJson, + web_app::GetWebAppsRootDirectory(profile), + std::move(root)), + std::move(callback)); +} + +WebAppInternalsHandler::WebAppInternalsHandler( + Profile* profile, + mojo::PendingReceiver<mojom::WebAppInternalsHandler> receiver) + : profile_(profile), receiver_(this, std::move(receiver)) {} + +WebAppInternalsHandler::~WebAppInternalsHandler() = default; + +void WebAppInternalsHandler::GetDebugInfoAsJsonString( + GetDebugInfoAsJsonStringCallback callback) { + auto* provider = web_app::WebAppProvider::GetForLocalAppsUnchecked(profile_); + if (!provider) { + return std::move(callback).Run("Web app system not enabled for profile."); + } + + auto value_to_string = + base::BindOnce([](base::Value value) { return value.DebugString(); }); + + provider->on_registry_ready().Post( + FROM_HERE, + base::BindOnce(&WebAppInternalsHandler::BuildDebugInfo, profile_, + std::move(value_to_string).Then(std::move(callback)))); +}
diff --git a/chrome/browser/ui/webui/web_app_internals/web_app_internals_handler.h b/chrome/browser/ui/webui/web_app_internals/web_app_internals_handler.h new file mode 100644 index 0000000..aab9ba32 --- /dev/null +++ b/chrome/browser/ui/webui/web_app_internals/web_app_internals_handler.h
@@ -0,0 +1,42 @@ +// Copyright 2023 The Chromium Authors +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef CHROME_BROWSER_UI_WEBUI_WEB_APP_INTERNALS_WEB_APP_INTERNALS_HANDLER_H_ +#define CHROME_BROWSER_UI_WEBUI_WEB_APP_INTERNALS_WEB_APP_INTERNALS_HANDLER_H_ + +#include "base/functional/callback_forward.h" +#include "base/values.h" +#include "chrome/browser/ui/webui/web_app_internals/web_app_internals.mojom.h" +#include "mojo/public/cpp/bindings/pending_receiver.h" +#include "mojo/public/cpp/bindings/receiver.h" + +class Profile; + +// Handles API requests from chrome://web-app-internals page by implementing +// mojom::WebAppInternalsHandler. +class WebAppInternalsHandler : public mojom::WebAppInternalsHandler { + public: + static void BuildDebugInfo( + Profile* profile, + base::OnceCallback<void(base::Value root)> callback); + + WebAppInternalsHandler( + Profile* profile, + mojo::PendingReceiver<mojom::WebAppInternalsHandler> receiver); + + WebAppInternalsHandler(const WebAppInternalsHandler&) = delete; + WebAppInternalsHandler& operator=(const WebAppInternalsHandler&) = delete; + + ~WebAppInternalsHandler() override; + + // mojom::WebAppInternalsHandler: + void GetDebugInfoAsJsonString( + GetDebugInfoAsJsonStringCallback callback) override; + + private: + const raw_ptr<Profile> profile_; + mojo::Receiver<mojom::WebAppInternalsHandler> receiver_; +}; + +#endif // CHROME_BROWSER_UI_WEBUI_WEB_APP_INTERNALS_WEB_APP_INTERNALS_HANDLER_H_
diff --git a/chrome/browser/ui/webui/web_app_internals/web_app_internals_source.cc b/chrome/browser/ui/webui/web_app_internals/web_app_internals_source.cc deleted file mode 100644 index 1171786e9..0000000 --- a/chrome/browser/ui/webui/web_app_internals/web_app_internals_source.cc +++ /dev/null
@@ -1,359 +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. - -#include "chrome/browser/ui/webui/web_app_internals/web_app_internals_source.h" - -#include "base/files/file_enumerator.h" -#include "base/files/file_util.h" -#include "base/json/json_writer.h" -#include "base/memory/ref_counted_memory.h" -#include "base/ranges/algorithm.h" -#include "base/strings/strcat.h" -#include "base/strings/string_number_conversions.h" -#include "base/task/task_runner.h" -#include "base/task/thread_pool.h" -#include "build/build_config.h" -#include "chrome/browser/profiles/profile.h" -#include "chrome/browser/web_applications/preinstalled_web_app_manager.h" -#include "chrome/browser/web_applications/web_app.h" -#include "chrome/browser/web_applications/web_app_command_manager.h" -#include "chrome/browser/web_applications/web_app_icon_manager.h" -#include "chrome/browser/web_applications/web_app_install_manager.h" -#include "chrome/browser/web_applications/web_app_provider.h" -#include "chrome/browser/web_applications/web_app_registrar.h" -#include "chrome/browser/web_applications/web_app_utils.h" -#include "chrome/common/pref_names.h" -#include "chrome/common/webui_url_constants.h" -#include "components/prefs/pref_service.h" - -#if BUILDFLAG(IS_MAC) -#include "chrome/browser/web_applications/app_shim_registry_mac.h" -#endif - -namespace { - -// New fields must be added to BuildIndexJson(). -constexpr char kInstalledWebApps[] = "InstalledWebApps"; -constexpr char kPreinstalledWebAppConfigs[] = "PreinstalledWebAppConfigs"; -constexpr char kUserUninstalledPreinstalledWebAppPrefs[] = - "UserUninstalledPreinstalledWebAppPrefs"; -constexpr char kExternallyManagedWebAppPrefs[] = "ExternallyManagedWebAppPrefs"; -constexpr char kCommandManager[] = "CommandManager"; -constexpr char kIconErrorLog[] = "IconErrorLog"; -constexpr char kInstallationProcessErrorLog[] = "InstallationProcessErrorLog"; -#if BUILDFLAG(IS_MAC) -constexpr char kAppShimRegistryLocalStorage[] = "AppShimRegistryLocalStorage"; -#endif -constexpr char kWebAppDirectoryDiskState[] = "WebAppDirectoryDiskState"; - -constexpr char kNeedsRecordWebAppDebugInfo[] = - "No debugging info available! Please enable: " - "chrome://flags/#record-web-app-debug-info"; - -template <typename T> -std::string ConvertToString(const T& value) { - std::stringstream ss; - ss << value; - return ss.str(); -} - -base::Value::Dict BuildIndexJson() { - base::Value::Dict root; - base::Value::List& index = *root.EnsureList("Index"); - - index.Append(kInstalledWebApps); - index.Append(kPreinstalledWebAppConfigs); - index.Append(kUserUninstalledPreinstalledWebAppPrefs); - index.Append(kExternallyManagedWebAppPrefs); - index.Append(kCommandManager); - index.Append(kIconErrorLog); - index.Append(kInstallationProcessErrorLog); -#if BUILDFLAG(IS_MAC) - index.Append(kAppShimRegistryLocalStorage); -#endif - index.Append(kWebAppDirectoryDiskState); - - return root; -} - -base::Value::Dict BuildInstalledWebAppsJson(web_app::WebAppProvider& provider) { - base::Value::Dict root; - - base::Value::Dict& installed_web_apps = *root.EnsureDict(kInstalledWebApps); - - std::vector<const web_app::WebApp*> web_apps; - for (const web_app::WebApp& web_app : - provider.registrar_unsafe().GetAppsIncludingStubs()) { - web_apps.push_back(&web_app); - } - base::ranges::sort(web_apps, {}, &web_app::WebApp::untranslated_name); - - // Prefix with a ! so this appears at the top when serialized. - base::Value::Dict& index = *installed_web_apps.EnsureDict("!Index"); - for (const web_app::WebApp* web_app : web_apps) { - const std::string& key = web_app->untranslated_name(); - base::Value* existing_entry = index.Find(key); - if (!existing_entry) { - index.Set(key, web_app->app_id()); - continue; - } - // If any web apps share identical names then collect a list of app IDs. - const std::string* existing_id = existing_entry->GetIfString(); - if (existing_id) { - base::Value::List id_list; - id_list.Append(*existing_id); - index.Set(key, std::move(id_list)); - } - index.FindList(key)->Append(web_app->app_id()); - } - - base::Value::List& web_app_details = - *installed_web_apps.EnsureList("Details"); - for (const web_app::WebApp* web_app : web_apps) - web_app_details.Append(web_app->AsDebugValue()); - - return root; -} - -base::Value::Dict BuildPreinstalledWebAppConfigsJson( - web_app::WebAppProvider& provider) { - base::Value::Dict root; - - const web_app::PreinstalledWebAppManager::DebugInfo* debug_info = - provider.preinstalled_web_app_manager().debug_info(); - if (!debug_info) { - root.Set(kPreinstalledWebAppConfigs, kNeedsRecordWebAppDebugInfo); - return root; - } - - base::Value::Dict& preinstalled_web_app_configs = - *root.EnsureDict(kPreinstalledWebAppConfigs); - - base::Value::List& config_parse_errors = - *preinstalled_web_app_configs.EnsureList("ConfigParseErrors"); - for (const std::string& parse_error : debug_info->parse_errors) - config_parse_errors.Append(parse_error); - - base::Value::List& configs_enabled = - *preinstalled_web_app_configs.EnsureList("ConfigsEnabled"); - for (const web_app::ExternalInstallOptions& enabled_config : - debug_info->enabled_configs) { - configs_enabled.Append(enabled_config.AsDebugValue()); - } - - base::Value::List& configs_disabled = - *preinstalled_web_app_configs.EnsureList("ConfigsDisabled"); - for (const std::pair<web_app::ExternalInstallOptions, std::string>& - disabled_config : debug_info->disabled_configs) { - base::Value::Dict entry; - entry.Set("!Reason", disabled_config.second); - entry.Set("Config", disabled_config.first.AsDebugValue()); - configs_disabled.Append(std::move(entry)); - } - - base::Value::List& install_results = - *preinstalled_web_app_configs.EnsureList("InstallResults"); - for (std::pair<const GURL&, - const web_app::ExternallyManagedAppManager::InstallResult&> - install_result : debug_info->install_results) { - base::Value::Dict entry; - entry.Set("InstallUrl", install_result.first.spec()); - entry.Set("ResultCode", ConvertToString(install_result.second.code)); - entry.Set("DidUninstallAndReplace", - install_result.second.did_uninstall_and_replace); - install_results.Append(std::move(entry)); - } - - preinstalled_web_app_configs.Set("IsStartUpTaskComplete", - debug_info->is_start_up_task_complete); - - base::Value::List& uninstall_results = - *preinstalled_web_app_configs.EnsureList("UninstallResults"); - for (std::pair<const GURL&, const bool&> uninstall_result : - debug_info->uninstall_results) { - base::Value::Dict entry; - entry.Set("InstallUrl", uninstall_result.first.spec()); - entry.Set("Success", uninstall_result.second); - uninstall_results.Append(std::move(entry)); - } - - return root; -} - -base::Value::Dict BuildExternallyManagedWebAppPrefsJson(Profile* profile) { - base::Value::Dict root; - root.Set(kExternallyManagedWebAppPrefs, - profile->GetPrefs()->GetDict(prefs::kWebAppsExtensionIDs).Clone()); - return root; -} - -base::Value::Dict BuildUserUninstalledPreinstalledWebAppPrefsJson( - Profile* profile) { - base::Value::Dict root; - root.Set(kUserUninstalledPreinstalledWebAppPrefs, - profile->GetPrefs() - ->GetDict(prefs::kUserUninstalledPreinstalledWebAppPref) - .Clone()); - return root; -} - -base::Value::Dict BuildCommandManagerJson(web_app::WebAppProvider& provider) { - base::Value::Dict root; - root.Set(kCommandManager, provider.command_manager().ToDebugValue()); - return root; -} - -base::Value::Dict BuildIconErrorLogJson(web_app::WebAppProvider& provider) { - base::Value::Dict root; - - const std::vector<std::string>* error_log = - provider.icon_manager().error_log(); - - if (!error_log) { - root.Set(kIconErrorLog, kNeedsRecordWebAppDebugInfo); - return root; - } - - base::Value::List& icon_error_log = *root.EnsureList(kIconErrorLog); - for (const std::string& error : *error_log) - icon_error_log.Append(error); - - return root; -} - -base::Value::Dict BuildInstallProcessErrorLogJson( - web_app::WebAppProvider& provider) { - base::Value::Dict root; - - const web_app::WebAppInstallManager::ErrorLog* error_log = - provider.install_manager().error_log(); - - if (!error_log) { - root.Set(kInstallationProcessErrorLog, kNeedsRecordWebAppDebugInfo); - return root; - } - - base::Value::List& installation_process_error_log = - *root.EnsureList(kInstallationProcessErrorLog); - for (const base::Value& error : *error_log) - installation_process_error_log.Append(error.Clone()); - - return root; -} - -#if BUILDFLAG(IS_MAC) -base::Value::Dict BuildAppShimRegistryLocalStorageJson() { - base::Value::Dict root; - root.Set(kAppShimRegistryLocalStorage, - AppShimRegistry::Get()->AsDebugDict().Clone()); - return root; -} -#endif - -void BuildDirectoryState(base::FilePath file_or_folder, - base::Value::Dict* folder) { - base::File::Info info; - bool success = base::GetFileInfo(file_or_folder, &info); - if (!success) { - folder->Set(file_or_folder.AsUTF8Unsafe(), "Invalid file or folder"); - return; - } - // The path of files is fully printed to allow easy copy-paste for developer - // reference. - if (!info.is_directory) { - folder->Set(file_or_folder.AsUTF8Unsafe(), - base::StrCat({base::NumberToString(info.size), " bytes"})); - return; - } - - base::Value::Dict contents; - base::FileEnumerator files( - file_or_folder, false, - base::FileEnumerator::FILES | base::FileEnumerator::DIRECTORIES); - for (base::FilePath current = files.Next(); !current.empty(); - current = files.Next()) { - BuildDirectoryState(current, &contents); - } - folder->Set(file_or_folder.BaseName().AsUTF8Unsafe(), std::move(contents)); -} - -base::Value BuildWebAppDiskStateJson(base::FilePath root_directory, - base::Value::List root) { - base::Value::Dict contents; - BuildDirectoryState(root_directory, &contents); - - base::Value::Dict section; - section.Set(kWebAppDirectoryDiskState, std::move(contents)); - root.Append(std::move(section)); - return base::Value(std::move(root)); -} - -void BuildResponse(Profile* profile, - base::OnceCallback<void(base::Value root)> callback) { - auto* provider = web_app::WebAppProvider::GetForLocalAppsUnchecked(profile); - if (!provider) { - return std::move(callback).Run( - base::Value("Web app system not enabled for profile.")); - } - - provider->on_registry_ready().Post( - FROM_HERE, - base::BindOnce(&WebAppInternalsSource::BuildWebAppInternalsJson, profile, - std::move(callback))); -} - -void ConvertValueToJsonData(content::URLDataSource::GotDataCallback callback, - base::Value value) { - std::move(callback).Run( - base::MakeRefCounted<base::RefCountedString>(value.DebugString())); -} - -} // namespace - -// static -void WebAppInternalsSource::BuildWebAppInternalsJson( - Profile* profile, - base::OnceCallback<void(base::Value root)> callback) { - auto* provider = web_app::WebAppProvider::GetForLocalAppsUnchecked(profile); - - base::Value::List root; - root.Append(BuildIndexJson()); - root.Append(BuildInstalledWebAppsJson(*provider)); - root.Append(BuildPreinstalledWebAppConfigsJson(*provider)); - root.Append(BuildUserUninstalledPreinstalledWebAppPrefsJson(profile)); - root.Append(BuildExternallyManagedWebAppPrefsJson(profile)); - root.Append(BuildCommandManagerJson(*provider)); - root.Append(BuildIconErrorLogJson(*provider)); - root.Append(BuildInstallProcessErrorLogJson(*provider)); -#if BUILDFLAG(IS_MAC) - root.Append(BuildAppShimRegistryLocalStorageJson()); -#endif - base::ThreadPool::PostTaskAndReplyWithResult( - FROM_HERE, {base::TaskPriority::USER_VISIBLE, base::MayBlock()}, - base::BindOnce(&BuildWebAppDiskStateJson, - web_app::GetWebAppsRootDirectory(profile), - std::move(root)), - std::move(callback)); -} - -WebAppInternalsSource::WebAppInternalsSource(Profile* profile) - : profile_(profile) {} - -WebAppInternalsSource::~WebAppInternalsSource() = default; - -std::string WebAppInternalsSource::GetSource() { - return chrome::kChromeUIWebAppInternalsHost; -} - -std::string WebAppInternalsSource::GetMimeType(const GURL& url) { - return "application/json"; -} - -void WebAppInternalsSource::StartDataRequest( - const GURL& url, - const content::WebContents::Getter& wc_getter, - content::URLDataSource::GotDataCallback callback) { - BuildResponse(profile_, - base::BindOnce(&ConvertValueToJsonData, std::move(callback))); -}
diff --git a/chrome/browser/ui/webui/web_app_internals/web_app_internals_source.h b/chrome/browser/ui/webui/web_app_internals/web_app_internals_source.h deleted file mode 100644 index 69830715..0000000 --- a/chrome/browser/ui/webui/web_app_internals/web_app_internals_source.h +++ /dev/null
@@ -1,43 +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. - -#ifndef CHROME_BROWSER_UI_WEBUI_WEB_APP_INTERNALS_WEB_APP_INTERNALS_SOURCE_H_ -#define CHROME_BROWSER_UI_WEBUI_WEB_APP_INTERNALS_WEB_APP_INTERNALS_SOURCE_H_ - -#include <string> - -#include "base/memory/raw_ptr.h" -#include "base/memory/weak_ptr.h" -#include "content/public/browser/url_data_source.h" - -class Profile; - -// A simple JSON data source that returns web app debugging information for the -// associated profile. -class WebAppInternalsSource : public content::URLDataSource { - public: - static void BuildWebAppInternalsJson( - Profile* profile, - base::OnceCallback<void(base::Value root)> callback); - - explicit WebAppInternalsSource(Profile* profile); - WebAppInternalsSource(const WebAppInternalsSource&) = delete; - WebAppInternalsSource& operator=(const WebAppInternalsSource&) = delete; - ~WebAppInternalsSource() override; - - // content::URLDataSource: - std::string GetSource() override; - std::string GetMimeType(const GURL& url) override; - void StartDataRequest( - const GURL& url, - const content::WebContents::Getter& wc_getter, - content::URLDataSource::GotDataCallback callback) override; - - private: - const raw_ptr<Profile> profile_; - - base::WeakPtrFactory<WebAppInternalsSource> weak_ptr_factory_{this}; -}; - -#endif // CHROME_BROWSER_UI_WEBUI_WEB_APP_INTERNALS_WEB_APP_INTERNALS_SOURCE_H_
diff --git a/chrome/browser/ui/webui/web_app_internals/web_app_internals_ui.cc b/chrome/browser/ui/webui/web_app_internals/web_app_internals_ui.cc new file mode 100644 index 0000000..f528c6c77 --- /dev/null +++ b/chrome/browser/ui/webui/web_app_internals/web_app_internals_ui.cc
@@ -0,0 +1,40 @@ +// Copyright 2023 The Chromium Authors +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "chrome/browser/ui/webui/web_app_internals/web_app_internals_ui.h" + +#include "base/bind.h" +#include "chrome/browser/profiles/profile.h" +#include "chrome/browser/ui/webui/web_app_internals/web_app_internals_handler.h" +#include "chrome/browser/ui/webui/webui_util.h" +#include "chrome/common/url_constants.h" +#include "chrome/grit/web_app_internals_resources.h" +#include "chrome/grit/web_app_internals_resources_map.h" +#include "content/public/browser/web_contents.h" +#include "content/public/browser/web_ui.h" +#include "content/public/browser/web_ui_data_source.h" +#include "services/network/public/mojom/content_security_policy.mojom.h" + +WebAppInternalsUI::WebAppInternalsUI(content::WebUI* web_ui) + : ui::MojoWebUIController(web_ui) { + // Set up the chrome://web-app-internals source. + content::WebUIDataSource* internals = content::WebUIDataSource::CreateAndAdd( + Profile::FromWebUI(web_ui), chrome::kChromeUIWebAppInternalsHost); + webui::SetupWebUIDataSource( + internals, + base::make_span(kWebAppInternalsResources, kWebAppInternalsResourcesSize), + IDR_WEB_APP_INTERNALS_WEB_APP_INTERNALS_HTML); +} + +WEB_UI_CONTROLLER_TYPE_IMPL(WebAppInternalsUI) + +WebAppInternalsUI::~WebAppInternalsUI() = default; + +void WebAppInternalsUI::BindInterface( + mojo::PendingReceiver<mojom::WebAppInternalsHandler> receiver) { + page_handler_ = std::make_unique<WebAppInternalsHandler>( + Profile::FromBrowserContext( + web_ui()->GetWebContents()->GetBrowserContext()), + std::move(receiver)); +}
diff --git a/chrome/browser/ui/webui/web_app_internals/web_app_internals_ui.h b/chrome/browser/ui/webui/web_app_internals/web_app_internals_ui.h new file mode 100644 index 0000000..d6127bac --- /dev/null +++ b/chrome/browser/ui/webui/web_app_internals/web_app_internals_ui.h
@@ -0,0 +1,35 @@ +// Copyright 2023 The Chromium Authors +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef CHROME_BROWSER_UI_WEBUI_WEB_APP_INTERNALS_WEB_APP_INTERNALS_UI_H_ +#define CHROME_BROWSER_UI_WEBUI_WEB_APP_INTERNALS_WEB_APP_INTERNALS_UI_H_ + +#include "chrome/browser/ui/webui/web_app_internals/web_app_internals.mojom-forward.h" +#include "mojo/public/cpp/bindings/pending_receiver.h" +#include "ui/webui/mojo_web_ui_controller.h" + +class WebAppInternalsHandler; + +// The WebUI for chrome://web-app-internals +class WebAppInternalsUI : public ui::MojoWebUIController { + public: + explicit WebAppInternalsUI(content::WebUI* web_ui); + + WebAppInternalsUI(const WebAppInternalsUI&) = delete; + WebAppInternalsUI& operator=(const WebAppInternalsUI&) = delete; + + ~WebAppInternalsUI() override; + + // Instantiates the implementor of the mojom::WebAppInternalsHandler mojo + // interface passing the pending receiver that will be internally bound. + void BindInterface( + mojo::PendingReceiver<mojom::WebAppInternalsHandler> receiver); + + private: + std::unique_ptr<WebAppInternalsHandler> page_handler_; + + WEB_UI_CONTROLLER_TYPE_DECL(); +}; + +#endif // CHROME_BROWSER_UI_WEBUI_WEB_APP_INTERNALS_WEB_APP_INTERNALS_UI_H_
diff --git a/chrome/browser/web_applications/web_app_install_utils.cc b/chrome/browser/web_applications/web_app_install_utils.cc index c897f62..512896c 100644 --- a/chrome/browser/web_applications/web_app_install_utils.cc +++ b/chrome/browser/web_applications/web_app_install_utils.cc
@@ -84,7 +84,8 @@ // We restrict the number of icons to limit disk usage per installed PWA. This // value can change overtime as new features are added. constexpr int kMaxIcons = 20; -constexpr SquareSizePx kMaxIconSize = 1024; +constexpr SquareSizePx kMaxIconSize = + webapps::InstallableManager::kMaximumIconSizeInPx; // Returns whether the home tab icons exist. bool HomeTabIconsExistInTabStrip(const WebAppInstallInfo* web_app_info) { @@ -831,7 +832,6 @@ break; } } - std::vector<SkBitmap> square_icons_any; std::vector<SkBitmap> square_icons_maskable; std::vector<SkBitmap> square_icons_monochrome;
diff --git a/chrome/build/linux.pgo.txt b/chrome/build/linux.pgo.txt index b90bcd9..268c894c 100644 --- a/chrome/build/linux.pgo.txt +++ b/chrome/build/linux.pgo.txt
@@ -1 +1 @@ -chrome-linux-main-1673437990-f80a08b15a2231408373d8994dda1488fe659d01.profdata +chrome-linux-main-1673459773-af436afe9a446a02e5e3b1153ae0fd4d3e4a69e2.profdata
diff --git a/chrome/build/mac.pgo.txt b/chrome/build/mac.pgo.txt index 8b6f70a..c1dc07f6 100644 --- a/chrome/build/mac.pgo.txt +++ b/chrome/build/mac.pgo.txt
@@ -1 +1 @@ -chrome-mac-main-1673437990-1d2ec87073fba44104dff2b3b43534773e49bda4.profdata +chrome-mac-main-1673459773-f9ac3f37452c76714c3dd3bee6e04aed809ce4d1.profdata
diff --git a/chrome/build/win32.pgo.txt b/chrome/build/win32.pgo.txt index 21d7698..1fa5761 100644 --- a/chrome/build/win32.pgo.txt +++ b/chrome/build/win32.pgo.txt
@@ -1 +1 @@ -chrome-win32-main-1673437990-54219472d6906d3908206cc337efa4d186403455.profdata +chrome-win32-main-1673459773-814d9cfef2d7e4e490c8b4d85e3b6ad7a154775b.profdata
diff --git a/chrome/build/win64.pgo.txt b/chrome/build/win64.pgo.txt index e5fcf26..60509a5 100644 --- a/chrome/build/win64.pgo.txt +++ b/chrome/build/win64.pgo.txt
@@ -1 +1 @@ -chrome-win64-main-1673437990-1f7a8856a605c1cc1692ecc75a95c40c7ed193a5.profdata +chrome-win64-main-1673449057-bcea03fa829b72658a6444e01ee4e124824cb09e.profdata
diff --git a/chrome/chrome_paks.gni b/chrome/chrome_paks.gni index c226e94..82e1d14 100644 --- a/chrome/chrome_paks.gni +++ b/chrome/chrome_paks.gni
@@ -172,11 +172,14 @@ "$root_gen_dir/chrome/side_panel_bookmarks_resources.pak", "$root_gen_dir/chrome/side_panel_customize_chrome_resources.pak", "$root_gen_dir/chrome/side_panel_history_clusters_resources.pak", + "$root_gen_dir/chrome/side_panel_read_anything_resources.pak", "$root_gen_dir/chrome/side_panel_reading_list_resources.pak", - "$root_gen_dir/chrome/side_panel_resources.pak", + "$root_gen_dir/chrome/side_panel_shared_resources.pak", + "$root_gen_dir/chrome/side_panel_user_notes_resources.pak", "$root_gen_dir/chrome/signin_resources.pak", "$root_gen_dir/chrome/support_tool_resources.pak", "$root_gen_dir/chrome/tab_search_resources.pak", + "$root_gen_dir/chrome/web_app_internals_resources.pak", "$root_gen_dir/chrome/webui_gallery_resources.pak", "$root_gen_dir/chrome/whats_new_resources.pak", "$root_gen_dir/content/browser/devtools/devtools_resources.pak", @@ -207,14 +210,17 @@ "//chrome/browser/resources/privacy_sandbox:resources", "//chrome/browser/resources/profile_internals:resources", "//chrome/browser/resources/settings:resources", - "//chrome/browser/resources/side_panel:resources", "//chrome/browser/resources/side_panel/bookmarks:resources", "//chrome/browser/resources/side_panel/customize_chrome:resources", "//chrome/browser/resources/side_panel/history_clusters:resources", + "//chrome/browser/resources/side_panel/read_anything:resources", "//chrome/browser/resources/side_panel/reading_list:resources", + "//chrome/browser/resources/side_panel/shared:resources", + "//chrome/browser/resources/side_panel/user_notes:resources", "//chrome/browser/resources/signin:resources", "//chrome/browser/resources/support_tool:resources", "//chrome/browser/resources/tab_search:resources", + "//chrome/browser/resources/web_app_internals:resources", "//chrome/browser/resources/webui_gallery:resources", "//chrome/browser/resources/whats_new:resources", "//content/browser/devtools:devtools_resources", @@ -473,8 +479,8 @@ } if (headless_enable_commands && !is_android) { - sources += [ "$root_gen_dir/headless/headless_command_resources.pak" ] - deps += [ "//headless:headless_command_resources" ] + sources += [ "$root_gen_dir/components/headless/command_handler/headless_command_resources.pak" ] + deps += [ "//components/headless/command_handler" ] } } }
diff --git a/chrome/common/accessibility/read_anything.mojom b/chrome/common/accessibility/read_anything.mojom index c99d469..3bf2913 100644 --- a/chrome/common/accessibility/read_anything.mojom +++ b/chrome/common/accessibility/read_anything.mojom
@@ -6,6 +6,8 @@ module read_anything.mojom; import "skia/public/mojom/skcolor.mojom"; +import "ui/accessibility/mojom/ax_event.mojom"; +import "ui/accessibility/mojom/ax_tree_id.mojom"; import "ui/accessibility/mojom/ax_tree_update.mojom"; import "url/mojom/url.mojom"; @@ -66,10 +68,22 @@ // WebUI-side handler for requests from the browser. interface Page { - // Trigger the frontend to update the current read anything display. Snapshot - // is an accessibility tree snapshot of a web page. - OnAXTreeSnapshotted(ax.mojom.AXTreeUpdate snapshot); + // Send an accessibility event notification to the WebUI. The WebUI + // unserializes the updates and stores a copy of the tree with ID tree_id in + // a map. + AccessibilityEventReceived(ax.mojom.AXTreeID tree_id, + array<ax.mojom.AXTreeUpdate> updates, + array<ax.mojom.AXEvent> events); - // Send an updated theme to front end. + // Sends the active AXTreeID to the WebUI. This is not guaranteed to be called + // after the tree_id was previously passed to AccessibilityEventsReceived. + OnActiveAXTreeIDChanged(ax.mojom.AXTreeID tree_id); + + // Notifies the WebUI that an AXTree with the provided AXTreeID was + // destroyed. This is not guaranteed to be called after the tree_id was + // previously passed to AccessibilityEventsReceived. + OnAXTreeDestroyed(ax.mojom.AXTreeID tree_id); + + // Send an updated theme to the WebUI. OnThemeChanged(ReadAnythingTheme new_theme); };
diff --git a/chrome/renderer/accessibility/read_anything_app_controller.cc b/chrome/renderer/accessibility/read_anything_app_controller.cc index d36c06f58..9c337d72 100644 --- a/chrome/renderer/accessibility/read_anything_app_controller.cc +++ b/chrome/renderer/accessibility/read_anything_app_controller.cc
@@ -26,8 +26,12 @@ #include "third_party/blink/public/web/web_local_frame.h" #include "third_party/blink/public/web/web_script_source.h" #include "ui/accessibility/ax_node.h" +#include "ui/accessibility/ax_selection.h" +#include "ui/accessibility/ax_serializable_tree.h" #include "ui/accessibility/ax_tree.h" +#include "ui/accessibility/ax_tree_serializer.h" #include "ui/accessibility/ax_tree_update.h" +#include "ui/accessibility/ax_tree_update_util.h" #include "v8/include/v8-context.h" #include "v8/include/v8-microtask-queue.h" @@ -186,6 +190,10 @@ v8::Isolate* isolate, v8::Local<v8::Value> v8_snapshot_lite) { ui::AXTreeUpdate snapshot; + ui::AXTreeData ax_tree_data; + ax_tree_data.tree_id = ui::AXTreeID::CreateNewAXTreeID(); + snapshot.has_tree_data = true; + snapshot.tree_data = ax_tree_data; gin::Dictionary v8_snapshot_dict(isolate); if (!gin::ConvertFromV8(isolate, v8_snapshot_lite, &v8_snapshot_dict)) return snapshot; @@ -217,15 +225,11 @@ gin::Dictionary v8_selection_dict(isolate); if (!gin::ConvertFromV8(isolate, v8_selection, &v8_selection_dict)) return snapshot; - ui::AXTreeData ax_tree_data; - SetSelectionAnchorObjectId(isolate, &v8_selection_dict, &ax_tree_data); - SetSelectionFocusObjectId(isolate, &v8_selection_dict, &ax_tree_data); - SetSelectionAnchorOffset(isolate, &v8_selection_dict, &ax_tree_data); - SetSelectionFocusOffset(isolate, &v8_selection_dict, &ax_tree_data); - SetSelectionIsBackward(isolate, &v8_selection_dict, &ax_tree_data); - snapshot.has_tree_data = true; - snapshot.tree_data = ax_tree_data; - + SetSelectionAnchorObjectId(isolate, &v8_selection_dict, &snapshot.tree_data); + SetSelectionFocusObjectId(isolate, &v8_selection_dict, &snapshot.tree_data); + SetSelectionAnchorOffset(isolate, &v8_selection_dict, &snapshot.tree_data); + SetSelectionFocusOffset(isolate, &v8_selection_dict, &snapshot.tree_data); + SetSelectionIsBackward(isolate, &v8_selection_dict, &snapshot.tree_data); return snapshot; } @@ -265,7 +269,7 @@ ReadAnythingAppController::ReadAnythingAppController( content::RenderFrame* render_frame) - : render_frame_(render_frame), tree_(std::make_unique<ui::AXTree>()) { + : render_frame_(render_frame) { distiller_ = std::make_unique<AXTreeDistiller>( render_frame_, base::BindRepeating(&ReadAnythingAppController::OnAXTreeDistilled, @@ -274,11 +278,114 @@ ReadAnythingAppController::~ReadAnythingAppController() = default; -void ReadAnythingAppController::OnAXTreeSnapshotted( - const ui::AXTreeUpdate& snapshot) { - snapshot_ = std::move(snapshot); - tree_ = std::make_unique<ui::AXTree>(snapshot_); - distiller_->Distill(tree_.get(), snapshot_); +void ReadAnythingAppController::AccessibilityEventReceived( + const ui::AXTreeID& tree_id, + const std::vector<ui::AXTreeUpdate>& updates, + const std::vector<ui::AXEvent>& events) { + DCHECK_NE(tree_id, ui::AXTreeIDUnknown()); + // Create a new tree if an event is received for a tree that is not yet in + // |trees_|. + if (!base::Contains(trees_, tree_id)) { + std::unique_ptr<ui::AXSerializableTree> new_tree = + std::make_unique<ui::AXSerializableTree>(); + new_tree->AddObserver(this); + trees_[tree_id] = std::move(new_tree); + } + ui::AXSerializableTree* tree = trees_[tree_id].get(); + + // Try to merge updates. If the updates are mergeable, MergeAXTreeUpdates will + // return true and merge_updates_out will contain the updates. Otherwise, if + // the updates are not mergeable, merge_updates_out will be empty. + const std::vector<ui::AXTreeUpdate>* merged_updates = &updates; + std::vector<ui::AXTreeUpdate> merge_updates_out; + if (ui::MergeAXTreeUpdates(updates, &merge_updates_out)) { + merged_updates = &merge_updates_out; + } + + // Unserialize the updates. + for (const ui::AXTreeUpdate& update : *merged_updates) { + tree->Unserialize(update); + } +} + +void ReadAnythingAppController::OnActiveAXTreeIDChanged( + const ui::AXTreeID& tree_id) { + active_tree_id_ = tree_id; + // When the UI first constructs, this function may be called before tree_id + // has been added to trees_ in AccessibilityEventReceived. In that case, do + // not distill. + if (active_tree_id_ != ui::AXTreeIDUnknown() && + base::Contains(trees_, active_tree_id_)) { + Distill(); + } +} + +void ReadAnythingAppController::OnAXTreeDestroyed(const ui::AXTreeID& tree_id) { + if (active_tree_id_ == tree_id) { + active_tree_id_ = ui::AXTreeIDUnknown(); + } + // Under rare circumstances, an accessibility tree is not constructed in a + // tab. For example, after a browser restart, old tabs are only laid out after + // they are activated, which means that an unactivated old tab would not have + // an accessibility tree. This means that it would never call + // AccessibilityEventsReceived(), meaning its RFH's AXTreeID would not be in + // trees. When that tab was destroyed, this function will be called with a + // tree_id not in trees_, so we return early. + if (!base::Contains(trees_, tree_id)) { + return; + } + auto child_tree_ids = trees_[tree_id]->GetAllChildTreeIds(); + for (auto child_tree_id : child_tree_ids) { + OnAXTreeDestroyed(child_tree_id); + } + trees_.erase(tree_id); +} + +void ReadAnythingAppController::OnAtomicUpdateFinished( + ui::AXTree* tree, + bool root_changed, + const std::vector<Change>& changes) { + if (active_tree_id_ == ui::AXTreeIDUnknown() || + tree->GetAXTreeID() != active_tree_id_) { + return; + } + bool need_to_distill = false; + bool need_to_draw = false; + for (Change change : changes) { + switch (change.type) { + case NODE_CREATED: + case SUBTREE_CREATED: + need_to_distill = true; + break; + case NODE_REPARENTED: + case SUBTREE_REPARENTED: + if (base::Contains(content_node_ids_, change.node->id())) { + need_to_distill = true; + } else if (base::Contains(display_node_ids_, change.node->id())) { + need_to_draw = true; + } + break; + case NODE_CHANGED: + break; + } + } + if (need_to_distill) { + Distill(); + } else if (need_to_draw) { + Draw(); + } +} + +void ReadAnythingAppController::Distill() { + DCHECK_NE(active_tree_id_, ui::AXTreeIDUnknown()); + DCHECK(base::Contains(trees_, active_tree_id_)); + ui::AXSerializableTree* tree = trees_[active_tree_id_].get(); + std::unique_ptr<ui::AXTreeSource<const ui::AXNode*>> tree_source( + tree->CreateTreeSource()); + ui::AXTreeSerializer<const ui::AXNode*> serializer(tree_source.get()); + ui::AXTreeUpdate snapshot; + CHECK(serializer.SerializeChanges(tree->root(), &snapshot)); + distiller_->Distill(tree, snapshot); } void ReadAnythingAppController::OnAXTreeDistilled( @@ -291,16 +398,12 @@ end_offset_ = -1; content_node_ids_ = content_node_ids; - // Store state about the selection for easy access later. Selection state - // comes from the tree data rather than AXPosition, as AXPosition requires - // a valid and registered AXTreeID, which exists only when accessibility is - // enabled. As Read Anything does not enable accessibility, it is not able to - // use AXPosition. - const ui::AXTreeData tree_data = snapshot_.tree_data; - has_selection_ = snapshot_.has_tree_data && - tree_data.sel_anchor_object_id != ui::kInvalidAXNodeID && - tree_data.sel_focus_object_id != ui::kInvalidAXNodeID; - if (!content_node_ids.empty()) { + DCHECK_NE(active_tree_id_, ui::AXTreeIDUnknown()); + DCHECK(base::Contains(trees_, active_tree_id_)); + ui::AXSelection selection = trees_[active_tree_id_]->GetUnignoredSelection(); + has_selection_ = selection.anchor_object_id != ui::kInvalidAXNodeID && + selection.focus_object_id != ui::kInvalidAXNodeID; + if (!content_node_ids_.empty()) { // If there are content_node_ids, this means the AXTree was successfully // distilled. Post-process in preparation to display the distilled content. PostProcessDistillableAXTree(); @@ -313,6 +416,10 @@ // tree was not distillable. } + Draw(); +} + +void ReadAnythingAppController::Draw() { // TODO(abigailbklein): Use v8::Function rather than javascript. If possible, // replace this function call with firing an event. std::string script = "chrome.readAnything.updateContent();"; @@ -321,19 +428,21 @@ void ReadAnythingAppController::PostProcessAXTreeWithSelection() { DCHECK(has_selection_); - const ui::AXTreeData tree_data = snapshot_.tree_data; + DCHECK_NE(active_tree_id_, ui::AXTreeIDUnknown()); + DCHECK(base::Contains(trees_, active_tree_id_)); + ui::AXSelection selection = trees_[active_tree_id_]->GetUnignoredSelection(); // Identify the start and end nodes and offsets. The start node comes earlier // the end node in the tree order. - ui::AXNode* anchor_node = GetAXNode(tree_data.sel_anchor_object_id); + ui::AXNode* anchor_node = GetAXNode(selection.anchor_object_id); DCHECK(anchor_node); - ui::AXNode* focus_node = GetAXNode(tree_data.sel_focus_object_id); + ui::AXNode* focus_node = GetAXNode(selection.focus_object_id); DCHECK(focus_node); - start_node_ = tree_data.sel_is_backward ? focus_node : anchor_node; - end_node_ = tree_data.sel_is_backward ? anchor_node : focus_node; - start_offset_ = tree_data.sel_is_backward ? tree_data.sel_focus_offset - : tree_data.sel_anchor_offset; - end_offset_ = tree_data.sel_is_backward ? tree_data.sel_anchor_offset - : tree_data.sel_focus_offset; + start_node_ = selection.is_backward ? focus_node : anchor_node; + end_node_ = selection.is_backward ? anchor_node : focus_node; + start_offset_ = + selection.is_backward ? selection.focus_offset : selection.anchor_offset; + end_offset_ = + selection.is_backward ? selection.anchor_offset : selection.focus_offset; // If start node or end node is ignored, go to the nearest unignored node // within the selection. @@ -380,8 +489,10 @@ // descendants of each content node. for (auto content_node_id : content_node_ids_) { ui::AXNode* content_node = GetAXNode(content_node_id); - // TODO(crbug.com/1266555): Figure out why content_node might be nullptr, - // fix that, and DCHECK that content_node is not nullptr. + // TODO(crbug.com/1266555): If content_node_id is from a child tree of the + // active ax tree, GetAXNode will return nullptr. Fix GetAXNode to harvest + // nodes from child trees, and then replace the `if (!content_node)` check + // with `DCHECK(content_node)`. // TODO(abigailbklein) This prevents the crash in crbug.com/1402788, but may // not be the correct approach. Do we need a version of // GetDeepestLastUnignoredChild() that works on ignored nodes? @@ -459,7 +570,10 @@ } ui::AXNodeID ReadAnythingAppController::RootId() const { - return tree_->root()->id(); + DCHECK_NE(active_tree_id_, ui::AXTreeIDUnknown()); + DCHECK(base::Contains(trees_, active_tree_id_)); + ui::AXSerializableTree* tree = trees_.at(active_tree_id_).get(); + return tree->root()->id(); } SkColor ReadAnythingAppController::BackgroundColor() const { @@ -605,7 +719,8 @@ v8::Isolate* isolate = blink::MainThreadIsolate(); ui::AXTreeUpdate snapshot = GetSnapshotFromV8SnapshotLite(isolate, v8_snapshot_lite); - OnAXTreeSnapshotted(snapshot); + AccessibilityEventReceived(snapshot.tree_data.tree_id, {snapshot}, {}); + OnActiveAXTreeIDChanged(snapshot.tree_data.tree_id); OnAXTreeDistilled(content_node_ids); } @@ -642,8 +757,10 @@ ui::AXNode* ReadAnythingAppController::GetAXNode( ui::AXNodeID ax_node_id) const { - DCHECK(tree_); - return tree_->GetFromId(ax_node_id); + DCHECK_NE(active_tree_id_, ui::AXTreeIDUnknown()); + DCHECK(base::Contains(trees_, active_tree_id_)); + ui::AXSerializableTree* tree = trees_.at(active_tree_id_).get(); + return tree->GetFromId(ax_node_id); } bool ReadAnythingAppController::NodeIsContentNode(
diff --git a/chrome/renderer/accessibility/read_anything_app_controller.h b/chrome/renderer/accessibility/read_anything_app_controller.h index 943af48c..5aafefd 100644 --- a/chrome/renderer/accessibility/read_anything_app_controller.h +++ b/chrome/renderer/accessibility/read_anything_app_controller.h
@@ -5,6 +5,7 @@ #ifndef CHROME_RENDERER_ACCESSIBILITY_READ_ANYTHING_APP_CONTROLLER_H_ #define CHROME_RENDERER_ACCESSIBILITY_READ_ANYTHING_APP_CONTROLLER_H_ +#include <map> #include <memory> #include <set> #include <string> @@ -16,6 +17,7 @@ #include "mojo/public/cpp/bindings/remote.h" #include "third_party/skia/include/core/SkColor.h" #include "ui/accessibility/ax_node_id_forward.h" +#include "ui/accessibility/ax_tree_observer.h" #include "ui/accessibility/ax_tree_update_forward.h" namespace content { @@ -24,6 +26,7 @@ namespace ui { class AXNode; +class AXSerializableTree; class AXTree; } // namespace ui @@ -52,7 +55,8 @@ // class ReadAnythingAppController : public gin::Wrappable<ReadAnythingAppController>, - public read_anything::mojom::Page { + public read_anything::mojom::Page, + public ui::AXTreeObserver { public: static gin::WrapperInfo kWrapperInfo; @@ -75,10 +79,22 @@ v8::Isolate* isolate) override; // read_anything::mojom::Page: - void OnAXTreeSnapshotted(const ui::AXTreeUpdate& snapshot) override; + void AccessibilityEventReceived( + const ui::AXTreeID& tree_id, + const std::vector<ui::AXTreeUpdate>& updates, + const std::vector<ui::AXEvent>& events) override; + void OnActiveAXTreeIDChanged(const ui::AXTreeID& tree_id) override; + void OnAXTreeDestroyed(const ui::AXTreeID& tree_id) override; void OnThemeChanged( read_anything::mojom::ReadAnythingThemePtr new_theme) override; + // ui::AXTreeObserver: + void OnAtomicUpdateFinished(ui::AXTree* tree, + bool root_changed, + const std::vector<Change>& changes) override; + // TODO(crbug.com/1266555): Implement OnNodeWillBeDeleted to capture the + // deletion of child trees. + // gin templates: ui::AXNodeID RootId() const; SkColor BackgroundColor() const; @@ -96,6 +112,9 @@ void OnConnected(); void OnLinkClicked(ui::AXNodeID ax_node_id) const; + void Distill(); + void Draw(); + // Called when distillation has completed. void OnAXTreeDistilled(const std::vector<ui::AXNodeID>& content_node_ids); @@ -148,17 +167,33 @@ mojo::Remote<read_anything::mojom::PageHandler> page_handler_; mojo::Receiver<read_anything::mojom::Page> receiver_{this}; - // State - std::unique_ptr<ui::AXTree> tree_; - ui::AXTreeUpdate snapshot_; + // State: + + // AXTrees of all of the web contents in the browser’s tab strip. + std::map<ui::AXTreeID, std::unique_ptr<ui::AXSerializableTree>> trees_; + + // The AXTreeID of the currently active web contents. + ui::AXTreeID active_tree_id_ = ui::AXTreeIDUnknown(); + + // The node IDs identified as main by the distiller. These are static text + // nodes when generated by Screen2x. When generated by the rules-based + // distiller, these are heading or paragraph subtrees. std::vector<ui::AXNodeID> content_node_ids_; + + // The node IDs that are displayed in the Read Anything app. This contains + // all ancestors and descendants of each content node. Or, if no content + // nodes were identified, this contains all nodes between the start and end + // nodes of the selection. std::set<ui::AXNodeID> display_node_ids_; + + // Selection information. bool has_selection_ = false; ui::AXNode* start_node_ = nullptr; ui::AXNode* end_node_ = nullptr; int32_t start_offset_ = -1; int32_t end_offset_ = -1; + // Theme information. SkColor background_color_; std::string font_name_; float font_size_;
diff --git a/chrome/renderer/accessibility/read_anything_app_controller_browsertest.cc b/chrome/renderer/accessibility/read_anything_app_controller_browsertest.cc index 03528d7..87becec 100644 --- a/chrome/renderer/accessibility/read_anything_app_controller_browsertest.cc +++ b/chrome/renderer/accessibility/read_anything_app_controller_browsertest.cc
@@ -25,20 +25,35 @@ content::RenderFrame::FromWebFrame(GetMainFrame()); controller_ = ReadAnythingAppController::Install(render_frame); - // Create simple AXTreeUpdate with a root node and 3 children. - basic_snapshot_.root_id = 1; - basic_snapshot_.nodes.resize(4); - basic_snapshot_.nodes[0].id = 1; - basic_snapshot_.nodes[0].child_ids = {2, 3, 4}; - basic_snapshot_.nodes[1].id = 2; - basic_snapshot_.nodes[2].id = 3; - basic_snapshot_.nodes[3].id = 4; + // Create a tree id. + tree_id_ = ui::AXTreeID::CreateNewAXTreeID(); - // Create simple AXTreeData with selection. - basic_tree_data_with_selection_.sel_anchor_object_id = 2; - basic_tree_data_with_selection_.sel_focus_object_id = 3; - basic_tree_data_with_selection_.sel_anchor_offset = 0; - basic_tree_data_with_selection_.sel_focus_offset = 0; + // Create simple AXTreeUpdate with a root node and 3 children. + ui::AXTreeUpdate snapshot; + snapshot.root_id = 1; + snapshot.nodes.resize(4); + snapshot.nodes[0].id = 1; + snapshot.nodes[0].child_ids = {2, 3, 4}; + snapshot.nodes[1].id = 2; + snapshot.nodes[2].id = 3; + snapshot.nodes[3].id = 4; + SetUpdateTreeID(&snapshot); + + // Send the snapshot to the controller and set its tree ID to be the active + // tree ID. + AccessibilityEventReceived({snapshot}); + OnActiveAXTreeIDChanged(tree_id_); + } + + void SetUpdateTreeID(ui::AXTreeUpdate* update) { + SetUpdateTreeID(update, tree_id_); + } + + void SetUpdateTreeID(ui::AXTreeUpdate* update, ui::AXTreeID tree_id) { + ui::AXTreeData tree_data; + tree_data.tree_id = tree_id; + update->has_tree_data = true; + update->tree_data = tree_data; } void SetThemeForTesting(const std::string& font_name, @@ -52,12 +67,24 @@ letter_spacing); } - void OnAXTreeDistilled(const ui::AXTreeUpdate& snapshot, - const std::vector<ui::AXNodeID>& content_node_ids) { - controller_->OnAXTreeSnapshotted(snapshot); + void AccessibilityEventReceived( + const std::vector<ui::AXTreeUpdate>& updates) { + controller_->AccessibilityEventReceived(updates[0].tree_data.tree_id, + updates, {}); + } + + void OnActiveAXTreeIDChanged(const ui::AXTreeID& tree_id) { + controller_->OnActiveAXTreeIDChanged(tree_id); + } + + void OnAXTreeDistilled(const std::vector<ui::AXNodeID>& content_node_ids) { controller_->OnAXTreeDistilled(content_node_ids); } + void OnAXTreeDestroyed(const ui::AXTreeID& tree_id) { + controller_->OnAXTreeDestroyed(tree_id); + } + ui::AXNodeID RootId() { return controller_->RootId(); } bool DisplayNodeIdsContains(ui::AXNodeID ax_node_id) { @@ -92,8 +119,9 @@ return controller_->GetUrl(ax_node_id); } - ui::AXTreeUpdate basic_snapshot_; - ui::AXTreeData basic_tree_data_with_selection_; + size_t GetNumTrees() { return controller_->trees_.size(); } + + ui::AXTreeID tree_id_; private: // ReadAnythingAppController constructor and destructor are private so it's @@ -121,19 +149,24 @@ } TEST_F(ReadAnythingAppControllerTest, RootIdIsSnapshotRootId) { - OnAXTreeDistilled(basic_snapshot_, {1}); + OnAXTreeDistilled({1}); EXPECT_EQ(1, RootId()); - OnAXTreeDistilled(basic_snapshot_, {2}); + OnAXTreeDistilled({2}); EXPECT_EQ(1, RootId()); - OnAXTreeDistilled(basic_snapshot_, {3}); + OnAXTreeDistilled({3}); EXPECT_EQ(1, RootId()); - OnAXTreeDistilled(basic_snapshot_, {4}); + OnAXTreeDistilled({4}); EXPECT_EQ(1, RootId()); } TEST_F(ReadAnythingAppControllerTest, GetChildren_NoSelectionOrContentNodes) { - basic_snapshot_.nodes[2].role = ax::mojom::Role::kNone; - OnAXTreeDistilled(basic_snapshot_, {}); + ui::AXTreeUpdate update; + SetUpdateTreeID(&update); + update.nodes.resize(1); + update.nodes[0].id = 3; + update.nodes[0].role = ax::mojom::Role::kNone; + AccessibilityEventReceived({update}); + OnAXTreeDistilled({}); EXPECT_EQ(0u, GetChildren(1).size()); EXPECT_EQ(0u, GetChildren(2).size()); EXPECT_EQ(0u, GetChildren(3).size()); @@ -141,8 +174,13 @@ } TEST_F(ReadAnythingAppControllerTest, GetChildren_WithContentNodes) { - basic_snapshot_.nodes[2].role = ax::mojom::Role::kNone; - OnAXTreeDistilled(basic_snapshot_, {1, 2, 3, 4}); + ui::AXTreeUpdate update; + SetUpdateTreeID(&update); + update.nodes.resize(1); + update.nodes[0].id = 3; + update.nodes[0].role = ax::mojom::Role::kNone; + AccessibilityEventReceived({update}); + OnAXTreeDistilled({1, 2, 3, 4}); EXPECT_EQ(2u, GetChildren(1).size()); EXPECT_EQ(0u, GetChildren(2).size()); EXPECT_EQ(0u, GetChildren(3).size()); @@ -154,11 +192,15 @@ TEST_F(ReadAnythingAppControllerTest, GetChildren_WithSelection) { // Create selection from node 3-4. - basic_tree_data_with_selection_.sel_anchor_object_id = 3; - basic_tree_data_with_selection_.sel_focus_object_id = 4; - basic_snapshot_.has_tree_data = true; - basic_snapshot_.tree_data = basic_tree_data_with_selection_; - OnAXTreeDistilled(basic_snapshot_, {}); + ui::AXTreeUpdate update; + SetUpdateTreeID(&update); + update.tree_data.sel_anchor_object_id = 3; + update.tree_data.sel_focus_object_id = 4; + update.tree_data.sel_anchor_offset = 0; + update.tree_data.sel_focus_offset = 0; + update.tree_data.sel_is_backward = false; + AccessibilityEventReceived({update}); + OnAXTreeDistilled({}); EXPECT_EQ(2u, GetChildren(1).size()); EXPECT_EQ(0u, GetChildren(2).size()); EXPECT_EQ(0u, GetChildren(3).size()); @@ -170,12 +212,15 @@ TEST_F(ReadAnythingAppControllerTest, GetChildren_WithBackwardSelection) { // Create backward selection from node 4-3. - basic_tree_data_with_selection_.sel_is_backward = true; - basic_tree_data_with_selection_.sel_anchor_object_id = 4; - basic_tree_data_with_selection_.sel_focus_object_id = 3; - basic_snapshot_.has_tree_data = true; - basic_snapshot_.tree_data = basic_tree_data_with_selection_; - OnAXTreeDistilled(basic_snapshot_, {}); + ui::AXTreeUpdate update; + SetUpdateTreeID(&update); + update.tree_data.sel_anchor_object_id = 4; + update.tree_data.sel_focus_object_id = 3; + update.tree_data.sel_anchor_offset = 0; + update.tree_data.sel_focus_offset = 0; + update.tree_data.sel_is_backward = true; + AccessibilityEventReceived({update}); + OnAXTreeDistilled({}); EXPECT_EQ(2u, GetChildren(1).size()); EXPECT_EQ(0u, GetChildren(2).size()); EXPECT_EQ(0u, GetChildren(3).size()); @@ -189,13 +234,18 @@ std::string span = "span"; std::string h1 = "h1"; std::string ul = "ul"; - basic_snapshot_.nodes[1].AddStringAttribute( - ax::mojom::StringAttribute::kHtmlTag, span); - basic_snapshot_.nodes[2].AddStringAttribute( - ax::mojom::StringAttribute::kHtmlTag, h1); - basic_snapshot_.nodes[3].AddStringAttribute( - ax::mojom::StringAttribute::kHtmlTag, ul); - OnAXTreeDistilled(basic_snapshot_, {}); + ui::AXTreeUpdate update; + SetUpdateTreeID(&update); + update.nodes.resize(3); + update.nodes[0].id = 2; + update.nodes[1].id = 3; + update.nodes[2].id = 4; + update.nodes[0].AddStringAttribute(ax::mojom::StringAttribute::kHtmlTag, + span); + update.nodes[1].AddStringAttribute(ax::mojom::StringAttribute::kHtmlTag, h1); + update.nodes[2].AddStringAttribute(ax::mojom::StringAttribute::kHtmlTag, ul); + AccessibilityEventReceived({update}); + OnAXTreeDistilled({}); EXPECT_EQ(span, GetHtmlTag(2)); EXPECT_EQ(h1, GetHtmlTag(3)); EXPECT_EQ(ul, GetHtmlTag(4)); @@ -205,16 +255,23 @@ std::string text_content = "Hello"; std::string missing_text_content = ""; std::string more_text_content = " world"; - basic_snapshot_.nodes[1].role = ax::mojom::Role::kStaticText; - basic_snapshot_.nodes[1].SetName(text_content); - basic_snapshot_.nodes[1].SetNameFrom(ax::mojom::NameFrom::kContents); - basic_snapshot_.nodes[2].role = ax::mojom::Role::kStaticText; - basic_snapshot_.nodes[2].SetName(missing_text_content); - basic_snapshot_.nodes[2].SetNameFrom(ax::mojom::NameFrom::kContents); - basic_snapshot_.nodes[3].role = ax::mojom::Role::kStaticText; - basic_snapshot_.nodes[3].SetName(more_text_content); - basic_snapshot_.nodes[3].SetNameFrom(ax::mojom::NameFrom::kContents); - OnAXTreeDistilled(basic_snapshot_, {}); + ui::AXTreeUpdate update; + SetUpdateTreeID(&update); + update.nodes.resize(3); + update.nodes[0].id = 2; + update.nodes[1].id = 3; + update.nodes[2].id = 4; + update.nodes[0].role = ax::mojom::Role::kStaticText; + update.nodes[0].SetName(text_content); + update.nodes[0].SetNameFrom(ax::mojom::NameFrom::kContents); + update.nodes[1].role = ax::mojom::Role::kStaticText; + update.nodes[1].SetName(missing_text_content); + update.nodes[1].SetNameFrom(ax::mojom::NameFrom::kContents); + update.nodes[2].role = ax::mojom::Role::kStaticText; + update.nodes[2].SetName(more_text_content); + update.nodes[2].SetNameFrom(ax::mojom::NameFrom::kContents); + AccessibilityEventReceived({update}); + OnAXTreeDistilled({}); EXPECT_EQ("Hello world", GetTextContent(1)); EXPECT_EQ(text_content, GetTextContent(2)); EXPECT_EQ(missing_text_content, GetTextContent(3)); @@ -225,23 +282,29 @@ std::string text_content_1 = "Hello"; std::string text_content_2 = " world"; std::string text_content_3 = " friend"; - basic_snapshot_.nodes[1].role = ax::mojom::Role::kStaticText; - basic_snapshot_.nodes[1].SetName(text_content_1); - basic_snapshot_.nodes[1].SetNameFrom(ax::mojom::NameFrom::kContents); - basic_snapshot_.nodes[2].role = ax::mojom::Role::kStaticText; - basic_snapshot_.nodes[2].SetName(text_content_2); - basic_snapshot_.nodes[2].SetNameFrom(ax::mojom::NameFrom::kContents); - basic_snapshot_.nodes[3].role = ax::mojom::Role::kStaticText; - basic_snapshot_.nodes[3].SetName(text_content_3); - basic_snapshot_.nodes[3].SetNameFrom(ax::mojom::NameFrom::kContents); + ui::AXTreeUpdate update; + SetUpdateTreeID(&update); + update.nodes.resize(3); + update.nodes[0].id = 2; + update.nodes[1].id = 3; + update.nodes[2].id = 4; + update.nodes[0].role = ax::mojom::Role::kStaticText; + update.nodes[0].SetName(text_content_1); + update.nodes[0].SetNameFrom(ax::mojom::NameFrom::kContents); + update.nodes[1].role = ax::mojom::Role::kStaticText; + update.nodes[1].SetName(text_content_2); + update.nodes[1].SetNameFrom(ax::mojom::NameFrom::kContents); + update.nodes[2].role = ax::mojom::Role::kStaticText; + update.nodes[2].SetName(text_content_3); + update.nodes[2].SetNameFrom(ax::mojom::NameFrom::kContents); // Create selection from node 2-3. - basic_tree_data_with_selection_.sel_anchor_object_id = 2; - basic_tree_data_with_selection_.sel_focus_object_id = 3; - basic_tree_data_with_selection_.sel_anchor_offset = 1; - basic_tree_data_with_selection_.sel_focus_offset = 3; - basic_snapshot_.has_tree_data = true; - basic_snapshot_.tree_data = basic_tree_data_with_selection_; - OnAXTreeDistilled(basic_snapshot_, {}); + update.tree_data.sel_anchor_object_id = 2; + update.tree_data.sel_focus_object_id = 3; + update.tree_data.sel_anchor_offset = 1; + update.tree_data.sel_focus_offset = 3; + update.tree_data.sel_is_backward = false; + AccessibilityEventReceived({update}); + OnAXTreeDistilled({}); EXPECT_EQ("Hello world friend", GetTextContent(1)); EXPECT_EQ("ello", GetTextContent(2)); EXPECT_EQ(" wo", GetTextContent(3)); @@ -252,23 +315,29 @@ std::string text_content_1 = "Hello"; std::string text_content_2 = " world"; std::string text_content_3 = " friend"; - basic_snapshot_.nodes[1].role = ax::mojom::Role::kStaticText; - basic_snapshot_.nodes[1].SetName(text_content_1); - basic_snapshot_.nodes[1].SetNameFrom(ax::mojom::NameFrom::kContents); - basic_snapshot_.nodes[2].role = ax::mojom::Role::kStaticText; - basic_snapshot_.nodes[2].SetName(text_content_2); - basic_snapshot_.nodes[2].SetNameFrom(ax::mojom::NameFrom::kContents); - basic_snapshot_.nodes[3].role = ax::mojom::Role::kStaticText; - basic_snapshot_.nodes[3].SetName(text_content_3); - basic_snapshot_.nodes[3].SetNameFrom(ax::mojom::NameFrom::kContents); + ui::AXTreeUpdate update; + SetUpdateTreeID(&update); + update.nodes.resize(3); + update.nodes[0].id = 2; + update.nodes[1].id = 3; + update.nodes[2].id = 4; + update.nodes[0].role = ax::mojom::Role::kStaticText; + update.nodes[0].SetName(text_content_1); + update.nodes[0].SetNameFrom(ax::mojom::NameFrom::kContents); + update.nodes[1].role = ax::mojom::Role::kStaticText; + update.nodes[1].SetName(text_content_2); + update.nodes[1].SetNameFrom(ax::mojom::NameFrom::kContents); + update.nodes[2].role = ax::mojom::Role::kStaticText; + update.nodes[2].SetName(text_content_3); + update.nodes[2].SetNameFrom(ax::mojom::NameFrom::kContents); // Create selection from node 2-4. - basic_tree_data_with_selection_.sel_anchor_object_id = 2; - basic_tree_data_with_selection_.sel_focus_object_id = 4; - basic_tree_data_with_selection_.sel_anchor_offset = 1; - basic_tree_data_with_selection_.sel_focus_offset = 3; - basic_snapshot_.has_tree_data = true; - basic_snapshot_.tree_data = basic_tree_data_with_selection_; - OnAXTreeDistilled(basic_snapshot_, {}); + update.tree_data.sel_anchor_object_id = 2; + update.tree_data.sel_focus_object_id = 4; + update.tree_data.sel_anchor_offset = 1; + update.tree_data.sel_focus_offset = 3; + update.tree_data.sel_is_backward = false; + AccessibilityEventReceived({update}); + OnAXTreeDistilled({}); EXPECT_EQ("Hello world friend", GetTextContent(1)); EXPECT_EQ("ello", GetTextContent(2)); EXPECT_EQ(" world", GetTextContent(3)); @@ -279,24 +348,29 @@ std::string text_content_1 = "Hello"; std::string text_content_2 = " world"; std::string text_content_3 = " friend"; - basic_snapshot_.nodes[1].role = ax::mojom::Role::kStaticText; - basic_snapshot_.nodes[1].SetName(text_content_1); - basic_snapshot_.nodes[1].SetNameFrom(ax::mojom::NameFrom::kContents); - basic_snapshot_.nodes[2].role = ax::mojom::Role::kStaticText; - basic_snapshot_.nodes[2].SetName(text_content_2); - basic_snapshot_.nodes[2].SetNameFrom(ax::mojom::NameFrom::kContents); - basic_snapshot_.nodes[3].role = ax::mojom::Role::kStaticText; - basic_snapshot_.nodes[3].SetName(text_content_3); - basic_snapshot_.nodes[3].SetNameFrom(ax::mojom::NameFrom::kContents); + ui::AXTreeUpdate update; + SetUpdateTreeID(&update); + update.nodes.resize(3); + update.nodes[0].id = 2; + update.nodes[1].id = 3; + update.nodes[2].id = 4; + update.nodes[0].role = ax::mojom::Role::kStaticText; + update.nodes[0].SetName(text_content_1); + update.nodes[0].SetNameFrom(ax::mojom::NameFrom::kContents); + update.nodes[1].role = ax::mojom::Role::kStaticText; + update.nodes[1].SetName(text_content_2); + update.nodes[1].SetNameFrom(ax::mojom::NameFrom::kContents); + update.nodes[2].role = ax::mojom::Role::kStaticText; + update.nodes[2].SetName(text_content_3); + update.nodes[2].SetNameFrom(ax::mojom::NameFrom::kContents); // Create backward selection from node 4-3. - basic_tree_data_with_selection_.sel_is_backward = true; - basic_tree_data_with_selection_.sel_anchor_object_id = 4; - basic_tree_data_with_selection_.sel_focus_object_id = 3; - basic_tree_data_with_selection_.sel_anchor_offset = 5; - basic_tree_data_with_selection_.sel_focus_offset = 2; - basic_snapshot_.has_tree_data = true; - basic_snapshot_.tree_data = basic_tree_data_with_selection_; - OnAXTreeDistilled(basic_snapshot_, {}); + update.tree_data.sel_anchor_object_id = 4; + update.tree_data.sel_focus_object_id = 3; + update.tree_data.sel_anchor_offset = 5; + update.tree_data.sel_focus_offset = 2; + update.tree_data.sel_is_backward = true; + AccessibilityEventReceived({update}); + OnAXTreeDistilled({}); EXPECT_EQ("Hello world friend", GetTextContent(1)); EXPECT_EQ("Hello", GetTextContent(2)); EXPECT_EQ("orld", GetTextContent(3)); @@ -307,22 +381,34 @@ std::string url = "http://www.google.com"; std::string invalid_url = "cats"; std::string missing_url = ""; - basic_snapshot_.nodes[1].AddStringAttribute(ax::mojom::StringAttribute::kUrl, - url); - basic_snapshot_.nodes[2].AddStringAttribute(ax::mojom::StringAttribute::kUrl, - invalid_url); - basic_snapshot_.nodes[3].AddStringAttribute(ax::mojom::StringAttribute::kUrl, - missing_url); - OnAXTreeDistilled(basic_snapshot_, {}); + ui::AXTreeUpdate update; + SetUpdateTreeID(&update); + update.nodes.resize(3); + update.nodes[0].id = 2; + update.nodes[1].id = 3; + update.nodes[2].id = 4; + update.nodes[0].AddStringAttribute(ax::mojom::StringAttribute::kUrl, url); + update.nodes[1].AddStringAttribute(ax::mojom::StringAttribute::kUrl, + invalid_url); + update.nodes[2].AddStringAttribute(ax::mojom::StringAttribute::kUrl, + missing_url); + AccessibilityEventReceived({update}); + OnAXTreeDistilled({}); EXPECT_EQ(url, GetUrl(2)); EXPECT_EQ(invalid_url, GetUrl(3)); EXPECT_EQ(missing_url, GetUrl(4)); } TEST_F(ReadAnythingAppControllerTest, DisplayNodeIdsContains_Selection) { - basic_snapshot_.has_tree_data = true; - basic_snapshot_.tree_data = basic_tree_data_with_selection_; - OnAXTreeDistilled(basic_snapshot_, {}); + ui::AXTreeUpdate update; + SetUpdateTreeID(&update); + update.tree_data.sel_anchor_object_id = 2; + update.tree_data.sel_focus_object_id = 3; + update.tree_data.sel_anchor_offset = 0; + update.tree_data.sel_focus_offset = 0; + update.tree_data.sel_is_backward = false; + AccessibilityEventReceived({update}); + OnAXTreeDistilled({}); EXPECT_TRUE(DisplayNodeIdsContains(1)); EXPECT_TRUE(DisplayNodeIdsContains(2)); EXPECT_TRUE(DisplayNodeIdsContains(3)); @@ -331,12 +417,15 @@ TEST_F(ReadAnythingAppControllerTest, DisplayNodeIdsContains_BackwardSelection) { - basic_tree_data_with_selection_.sel_is_backward = true; - basic_tree_data_with_selection_.sel_anchor_object_id = 3; - basic_tree_data_with_selection_.sel_focus_object_id = 2; - basic_snapshot_.has_tree_data = true; - basic_snapshot_.tree_data = basic_tree_data_with_selection_; - OnAXTreeDistilled(basic_snapshot_, {}); + ui::AXTreeUpdate update; + SetUpdateTreeID(&update); + update.tree_data.sel_anchor_object_id = 3; + update.tree_data.sel_focus_object_id = 2; + update.tree_data.sel_anchor_offset = 0; + update.tree_data.sel_focus_offset = 0; + update.tree_data.sel_is_backward = true; + AccessibilityEventReceived({update}); + OnAXTreeDistilled({}); EXPECT_TRUE(DisplayNodeIdsContains(1)); EXPECT_TRUE(DisplayNodeIdsContains(2)); EXPECT_TRUE(DisplayNodeIdsContains(3)); @@ -344,12 +433,15 @@ } TEST_F(ReadAnythingAppControllerTest, DisplayNodeIdsContains_ContentNodes) { - basic_snapshot_.nodes.resize(6); - basic_snapshot_.nodes[3].child_ids = {5, 6}; - basic_snapshot_.nodes[4].id = 5; - basic_snapshot_.nodes[5].id = 6; - - OnAXTreeDistilled(basic_snapshot_, {3, 4}); + ui::AXTreeUpdate update; + SetUpdateTreeID(&update); + update.nodes.resize(3); + update.nodes[0].id = 4; + update.nodes[0].child_ids = {5, 6}; + update.nodes[1].id = 5; + update.nodes[2].id = 6; + AccessibilityEventReceived({update}); + OnAXTreeDistilled({3, 4}); EXPECT_TRUE(DisplayNodeIdsContains(1)); EXPECT_FALSE(DisplayNodeIdsContains(2)); EXPECT_TRUE(DisplayNodeIdsContains(3)); @@ -360,7 +452,7 @@ TEST_F(ReadAnythingAppControllerTest, DisplayNodeIdsContains_NoSelectionOrContentNodes) { - OnAXTreeDistilled(basic_snapshot_, {}); + OnAXTreeDistilled({}); EXPECT_FALSE(DisplayNodeIdsContains(1)); EXPECT_FALSE(DisplayNodeIdsContains(2)); EXPECT_FALSE(DisplayNodeIdsContains(3)); @@ -368,5 +460,171 @@ } TEST_F(ReadAnythingAppControllerTest, DoesNotCrashIfContentNodeNotFoundInTree) { - OnAXTreeDistilled(basic_snapshot_, {6}); + OnAXTreeDistilled({6}); +} + +TEST_F(ReadAnythingAppControllerTest, AccessibilityEventReceived) { + // Tree starts off with no text content. + EXPECT_EQ("", GetTextContent(1)); + EXPECT_EQ("", GetTextContent(2)); + EXPECT_EQ("", GetTextContent(3)); + EXPECT_EQ("", GetTextContent(4)); + + // Send a new update which settings the text content of node 2. + ui::AXTreeUpdate update_1; + SetUpdateTreeID(&update_1); + update_1.nodes.resize(1); + update_1.nodes[0].id = 2; + update_1.nodes[0].role = ax::mojom::Role::kStaticText; + update_1.nodes[0].SetName("Hello world"); + update_1.nodes[0].SetNameFrom(ax::mojom::NameFrom::kContents); + AccessibilityEventReceived({update_1}); + EXPECT_EQ("Hello world", GetTextContent(1)); + EXPECT_EQ("Hello world", GetTextContent(2)); + EXPECT_EQ("", GetTextContent(3)); + EXPECT_EQ("", GetTextContent(4)); + + // Send three updates which should be merged. + std::vector<ui::AXTreeUpdate> batch_updates; + for (int i = 2; i < 5; i++) { + ui::AXTreeUpdate update; + SetUpdateTreeID(&update); + update.nodes.resize(1); + update.nodes[0].id = i; + update.nodes[0].role = ax::mojom::Role::kStaticText; + update.nodes[0].SetName("Node " + base::NumberToString(i)); + update.nodes[0].SetNameFrom(ax::mojom::NameFrom::kContents); + batch_updates.push_back(update); + } + AccessibilityEventReceived(batch_updates); + EXPECT_EQ("Node 2Node 3Node 4", GetTextContent(1)); + EXPECT_EQ("Node 2", GetTextContent(2)); + EXPECT_EQ("Node 3", GetTextContent(3)); + EXPECT_EQ("Node 4", GetTextContent(4)); + + // Clear node 1. + ui::AXTreeUpdate clear_update; + SetUpdateTreeID(&clear_update); + clear_update.root_id = 1; + clear_update.node_id_to_clear = 1; + clear_update.nodes.resize(1); + clear_update.nodes[0].id = 1; + AccessibilityEventReceived({clear_update}); + EXPECT_EQ("", GetTextContent(1)); +} + +TEST_F(ReadAnythingAppControllerTest, OnActiveAXTreeIDChanged) { + // Create three AXTreeUpdates with three different tree IDs. + std::vector<ui::AXTreeID> tree_ids = {tree_id_, + ui::AXTreeID::CreateNewAXTreeID(), + ui::AXTreeID::CreateNewAXTreeID()}; + std::vector<ui::AXTreeUpdate> updates; + for (int i = 0; i < 3; i++) { + ui::AXTreeUpdate update; + SetUpdateTreeID(&update, tree_ids[i]); + update.root_id = 1; + update.nodes.resize(1); + update.nodes[0].id = 1; + update.nodes[0].role = ax::mojom::Role::kStaticText; + update.nodes[0].SetName("Tree " + base::NumberToString(i)); + update.nodes[0].SetNameFrom(ax::mojom::NameFrom::kContents); + updates.push_back(update); + } + // Add the three updates separately since they have different tree IDs. + for (int i = 0; i < 3; i++) { + AccessibilityEventReceived({updates[i]}); + } + + OnAXTreeDistilled({1}); + + // Check that changing the active tree ID changes the active tree which is + // used when using a v8 getter. + for (int i = 0; i < 3; i++) { + OnActiveAXTreeIDChanged(tree_ids[i]); + EXPECT_EQ("Tree " + base::NumberToString(i), GetTextContent(1)); + } +} + +TEST_F(ReadAnythingAppControllerTest, DoesNotCrashIfActiveAXTreeIDUnknown) { + ui::AXTreeID tree_id = ui::AXTreeIDUnknown(); + OnActiveAXTreeIDChanged(tree_id); + OnAXTreeDestroyed(tree_id); +} + +TEST_F(ReadAnythingAppControllerTest, DoesNotCrashIfActiveAXTreeIDNotInTrees) { + ui::AXTreeID tree_id = ui::AXTreeID::CreateNewAXTreeID(); + OnActiveAXTreeIDChanged(tree_id); + OnAXTreeDestroyed(tree_id); +} + +TEST_F(ReadAnythingAppControllerTest, AddAndRemoveTrees) { + // Create two new trees with new tree IDs. + std::vector<ui::AXTreeID> tree_ids = {ui::AXTreeID::CreateNewAXTreeID(), + ui::AXTreeID::CreateNewAXTreeID()}; + std::vector<ui::AXTreeUpdate> updates; + for (int i = 0; i < 2; i++) { + ui::AXTreeUpdate update; + SetUpdateTreeID(&update, tree_ids[i]); + update.root_id = 1; + update.nodes.resize(1); + update.nodes[0].id = 1; + updates.push_back(update); + } + + // Start with 1 tree (the tree created in SetUp). + ASSERT_EQ(1u, GetNumTrees()); + + // Add the two trees. + AccessibilityEventReceived({updates[0]}); + ASSERT_EQ(2u, GetNumTrees()); + AccessibilityEventReceived({updates[1]}); + ASSERT_EQ(3u, GetNumTrees()); + + // Remove all of the trees. + OnAXTreeDestroyed(tree_id_); + ASSERT_EQ(2u, GetNumTrees()); + OnAXTreeDestroyed(tree_ids[0]); + ASSERT_EQ(1u, GetNumTrees()); + OnAXTreeDestroyed(tree_ids[1]); + ASSERT_EQ(0u, GetNumTrees()); +} + +TEST_F(ReadAnythingAppControllerTest, OnAXTreeDestroyed_ChildTree) { + // Create three AXTreeUpdates. The first has tree ID tree_id_ and the others + // have two new tree IDs. + std::vector<ui::AXTreeID> tree_ids = {tree_id_, + ui::AXTreeID::CreateNewAXTreeID(), + ui::AXTreeID::CreateNewAXTreeID()}; + std::vector<ui::AXTreeUpdate> updates; + for (int i = 0; i < 3; i++) { + ui::AXTreeUpdate update; + SetUpdateTreeID(&update, tree_ids[i]); + update.root_id = 1; + update.nodes.resize(1); + update.nodes[0].id = 1; + updates.push_back(update); + } + + // Tree_ids[0] is the parent of tree_ids[1]. Tree_ids[1] is the parent of + // tree_ids[2]. + updates[1].tree_data.parent_tree_id = tree_ids[0]; + updates[2].tree_data.parent_tree_id = tree_ids[1]; + updates[0].nodes[0].AddChildTreeId(tree_ids[1]); + updates[1].nodes[0].AddChildTreeId(tree_ids[2]); + + // Start with 1 tree (the tree created in SetUp). + ASSERT_EQ(1u, GetNumTrees()); + AccessibilityEventReceived({updates[0]}); + ASSERT_EQ(1u, GetNumTrees()); + + // Add two trees. + AccessibilityEventReceived({updates[1]}); + ASSERT_EQ(2u, GetNumTrees()); + AccessibilityEventReceived({updates[2]}); + ASSERT_EQ(3u, GetNumTrees()); + + // Remove the grandparent tree (tree_ids[0]. When it is removed, its + // child (tree_ids[1]) and its child's child (tree_ids[2]) are both removed. + OnAXTreeDestroyed(tree_ids[0]); + ASSERT_EQ(0u, GetNumTrees()); }
diff --git a/chrome/test/data/android/view_transition.html b/chrome/test/data/android/view_transition.html index 999096e..2cb3391a 100644 --- a/chrome/test/data/android/view_transition.html +++ b/chrome/test/data/android/view_transition.html
@@ -17,6 +17,7 @@ meta.content = metaTagContent; document.head.appendChild(meta); </script> + <script src="view_transition_util.js"></script> <style> body { margin: 0; @@ -81,68 +82,11 @@ } </style> <script> - let transition = null; - - // Allow tests to control when the transition starts. - let startTransitionAnimation = null; - let startPromise = new Promise(resolve => {startTransitionAnimation = resolve;}); - - // Allow tests to wait until the snapshot has been taken and is ready to - // start transitioning. - let readyToStartResolve = null; - let readyToStartPromise = new Promise(resolve => {readyToStartResolve = resolve;}); - - function updateDOM() { + updateDOM = function() { document.getElementById("inflow").style.transform = "translateX(100px)"; document.getElementById("bottomfixed").style.transform = "translateX(100px)"; document.getElementById("topfixed").style.transform = "translateX(100px)"; } - - // Sets the animation time to just before the end (not the end itself) to - // prevent finishing the animation. Since the animations have steps timing - // function the state is equivalent to the end state itself. - function animateToEndState() { - if (transition == null) - throw new Error('Transition was already finished or never started.'); - - for (const anim of document.getAnimations()) - anim.currentTime = anim.effect.getTiming().duration - 1; - } - - // Finishes animations, and thus the view transition. - function finishAnimations() { - if (transition == null) - throw new Error('Transition was already finished or never started.'); - - for (const anim of document.getAnimations()) - anim.finish(); - } - - function createTransition() { - if (transition != null) - throw new Error('In-progress transition already exists.'); - - transition = document.startViewTransition(() => { - updateDOM(); - - readyToStartResolve(); - - return startPromise; - }); - - // Initially pause the animation at the old state so the test can take a - // screenshot. Tests can then use moveAnimationToNewState() to play the - // animation forward to the new state. - transition.ready.then(() => { - for (const anim of document.getAnimations()) { - anim.pause(); - } - }); - - transition.finished.then( () => { - transition = null; - }); - } </script> </head> <body>
diff --git a/chrome/test/data/android/view_transition_dialog.html b/chrome/test/data/android/view_transition_dialog.html new file mode 100644 index 0000000..92a17d4 --- /dev/null +++ b/chrome/test/data/android/view_transition_dialog.html
@@ -0,0 +1,60 @@ +<!DOCTYPE html> +<html> + <head> + <meta name="viewport" content="width=device-width,minimum-scale=1"> + <style> + /* Step function means we'll keep the old snapshots in their initial state + * for half the duration, then the new snapshots in their final state for + * the last half of the duration. Note that tests pause the animation + * and control the progress programmatically so the duration is used only + * for live testing. */ + ::view-transition-group(*), + ::view-transition-new(*), + ::view-transition-old(*) { + animation-duration: 5s; + animation-timing-function: steps(2, jump-none); + } + + dialog { + width: 50dvw; + height: 50dvh; + box-sizing: border-box; + border: 2px solid rebeccapurple; + } + + div { + position: absolute; + left: 0; + top: 0; + background-color: red; + } + + .vline { + width: 2px; + height: 100dvh; + } + + .hline { + width: 100dvw; + height: 2px; + } + + </style> + <script src="view_transition_util.js"></script> + <script> + updateDOM = function() { + document.getElementById("thedialog").showModal(); + } + </script> + </head> + + <body> + <div class="vline" style="left: calc(25dvw - 2px)"></div> + <div class="vline" style="left:75dvw"></div> + <div class="hline" style="top: calc(25dvh - 2px)"></div> + <div class="hline" style="top:75dvh"></div> + <dialog id="thedialog"> + This is a dialog. It should be positioned within the intersection of the red lines. + </dialog> + </body> +</html>
diff --git a/chrome/test/data/android/view_transition_util.js b/chrome/test/data/android/view_transition_util.js new file mode 100644 index 0000000..8830bdf --- /dev/null +++ b/chrome/test/data/android/view_transition_util.js
@@ -0,0 +1,75 @@ +// Copyright 2023 The Chromium Authors +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +let transition = null; + +// Allow tests to control when the transition starts. Tests call +// startTransitionAnimation() to complete the author DOM callback and allow the +// view-transition to start the animation. +let startTransitionAnimation = null; +let startPromise = + new Promise(resolve => {startTransitionAnimation = resolve;}); + +// Allow tests to wait until the snapshot has been taken and is ready to start +// transitioning. Tests use readyToStartPromise to wait until the the author +// updateDOM callback has been invoked. +let readyToStartResolve = null; +let readyToStartPromise = + new Promise(resolve => {readyToStartResolve = resolve;}); + +// Individual test files set this to perform the DOM update to the new +// transition state. +let updateDOM = null; + +// Sets the animation time to just before the end (not the end itself) to +// prevent finishing the animation. Since the animations have steps timing +// function the state is equivalent to the end state itself. +function animateToEndState() { + if (transition == null) + throw new Error('Transition was already finished or never started.'); + + for (const anim of document.getAnimations()) + anim.currentTime = anim.effect.getTiming().duration - 1; +} + +// Finishes animations, and thus the view transition. +function finishAnimations() { + if (transition == null) + throw new Error('Transition was already finished or never started.'); + + for (const anim of document.getAnimations()) + anim.finish(); +} + +// Creates a view transition. The transition will call the test's defined +// updateDOM function to mutate the DOM into the new state and resolve the +// readyToStartPromise when the DOM has been updated. The animation won't start +// until the test calls startTransitionAnimation(). +function createTransition() { + if (transition != null) + throw new Error('In-progress transition already exists.'); + if (updateDOM == null) + throw new Error('Test must set an updateDOM function'); + + transition = document.startViewTransition(() => { + updateDOM(); + + readyToStartResolve(); + + return startPromise; + }); + + // Initially pause the animation at the old state so the test can take a + // screenshot. Tests can then use moveAnimationToNewState() to play the + // animation forward to the new state. + transition.ready.then(() => { + for (const anim of document.getAnimations()) { + anim.pause(); + } + }); + + transition.finished.then( () => { + transition = null; + }); +}
diff --git a/chrome/test/data/webui/bookmarks/BUILD.gn b/chrome/test/data/webui/bookmarks/BUILD.gn index d633296..d0474bf1 100644 --- a/chrome/test/data/webui/bookmarks/BUILD.gn +++ b/chrome/test/data/webui/bookmarks/BUILD.gn
@@ -15,7 +15,7 @@ "dialog_focus_manager_test.js", "dnd_manager_test.js", "edit_dialog_test.ts", - "extension_api_test.js", + "extension_api_test.ts", "extension_api_test_edit_disabled.js", "folder_node_focus_test.js", "folder_node_test.ts",
diff --git a/chrome/test/data/webui/bookmarks/extension_api_test.js b/chrome/test/data/webui/bookmarks/extension_api_test.js deleted file mode 100644 index 308dc81..0000000 --- a/chrome/test/data/webui/bookmarks/extension_api_test.js +++ /dev/null
@@ -1,309 +0,0 @@ -// Copyright 2012 The Chromium Authors -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -// Bookmark Manager API test for Chrome. -import {simulateChromeExtensionAPITest} from './test_util.js'; - -test('bookmarkManagerPrivate', async () => { - const bookmarkManager = chrome.bookmarkManagerPrivate; - const {pass, fail, runTests} = simulateChromeExtensionAPITest(); - - let fooNode; - let fooNode2; - let barNode; - let gooNode; - let count; - let emptyFolder; - let emptyFolder2; - let folder; - let nodeA; - let nodeB; - let childFolder; - let grandChildFolder; - let childNodeA; - let childNodeB; - - function doCopy() { - bookmarkManager.copy.apply(null, arguments); - } - function doCut() { - bookmarkManager.cut.apply(null, arguments); - } - function doPaste() { - bookmarkManager.paste.apply(null, arguments); - } - - const tests = [ - function sortChildren() { - folder = {parentId: '1', title: 'Folder'}; - nodeA = {title: 'a', url: 'http://www.example.com/a'}; - nodeB = {title: 'b', url: 'http://www.example.com/b'}; - chrome.bookmarks.create( - folder, pass(function(result) { - assertTrue(!!result.id); - folder.id = result.id; - nodeA.parentId = folder.id; - nodeB.parentId = folder.id; - - chrome.bookmarks.create(nodeB, pass(function(result) { - nodeB.id = result.id; - })); - chrome.bookmarks.create(nodeA, pass(function(result) { - nodeA.id = result.id; - })); - })); - }, - - function sortChildren2() { - bookmarkManager.sortChildren(folder.id); - - chrome.bookmarks.getChildren(folder.id, pass(function(children) { - assertEquals(nodeA.id, children[0].id); - assertEquals(nodeB.id, children[1].id); - })); - }, - - function setupSubtree() { - childFolder = {parentId: folder.id, title: 'Child Folder'}; - childNodeA = { - title: 'childNodeA', - url: 'http://www.example.com/childNodeA', - }; - childNodeB = { - title: 'childNodeB', - url: 'http://www.example.com/childNodeB', - }; - grandChildFolder = {title: 'grandChildFolder'}; - chrome.bookmarks.create( - childFolder, pass(function(result) { - childFolder.id = result.id; - childNodeA.parentId = childFolder.id; - childNodeB.parentId = childFolder.id; - grandChildFolder.parentId = childFolder.id; - - chrome.bookmarks.create(childNodeA, pass(function(result) { - childNodeA.id = result.id; - })); - chrome.bookmarks.create(childNodeB, pass(function(result) { - childNodeB.id = result.id; - })); - chrome.bookmarks.create(grandChildFolder, pass(function(result) { - grandChildFolder.id = result.id; - })); - })); - }, - - function getSubtree() { - bookmarkManager.getSubtree(childFolder.id, false, pass(function(result) { - const children = result[0].children; - assertEquals(3, children.length); - assertEquals(childNodeA.id, children[0].id); - assertEquals(childNodeB.id, children[1].id); - assertEquals( - grandChildFolder.id, children[2].id); - })); - }, - - function getSubtreeFoldersOnly() { - bookmarkManager.getSubtree(childFolder.id, true, pass(function(result) { - const children = result[0].children; - assertEquals(1, children.length); - assertEquals( - grandChildFolder.id, children[0].id); - })); - }, - - // The clipboard test is split into different parts to allow asynchronous - // operations to finish. - function clipboard() { - // Create a new bookmark. - fooNode = { - parentId: '1', - title: 'Foo', - url: 'http://www.example.com/foo', - }; - - emptyFolder = {parentId: '1', title: 'Empty Folder'}; - - chrome.bookmarks.create(fooNode, pass(function(result) { - fooNode.id = result.id; - fooNode.index = result.index; - count = result.index + 1; - })); - - chrome.bookmarks.create(emptyFolder, pass(function(result) { - emptyFolder.id = result.id; - emptyFolder.index = result.index; - count = result.index + 1; - })); - - // Create a couple more bookmarks to test proper insertion of pasted - // items. - barNode = { - parentId: '1', - title: 'Bar', - url: 'http://www.example.com/bar', - }; - - chrome.bookmarks.create(barNode, pass(function(result) { - barNode.id = result.id; - barNode.index = result.index; - count = result.index + 1; - })); - - gooNode = { - parentId: '1', - title: 'Goo', - url: 'http://www.example.com/goo', - }; - - chrome.bookmarks.create(gooNode, pass(function(result) { - gooNode.id = result.id; - gooNode.index = result.index; - count = result.index + 1; - })); - }, - - function clipboard2() { - // Copy the fooNode. - doCopy([fooNode.id]); - - // Ensure canPaste is now true. - bookmarkManager.canPaste('1', pass(function(result) { - assertTrue( - result, 'Should be able to paste now'); - })); - - // Paste it. - doPaste('1'); - - // Ensure it got added at the end. - chrome.bookmarks.getChildren( - '1', pass(function(result) { - count++; - assertEquals(count, result.length); - - fooNode2 = result[result.length - 1]; - - assertEquals(fooNode.title + ' (1)', fooNode2.title); - assertEquals(fooNode.url, fooNode2.url); - assertEquals(fooNode.parentId, fooNode2.parentId); - })); - }, - - function clipboard3() { - // Cut fooNode chrome.bookmarks. - doCut([fooNode.id, fooNode2.id]); - - // Ensure count decreased by 2. - chrome.bookmarks.getChildren('1', pass(function(result) { - count -= 2; - assertEquals(count, result.length); - })); - - // Ensure canPaste is still true. - bookmarkManager.canPaste('1', pass(function(result) { - assertTrue( - result, 'Should be able to paste now'); - })); - }, - - function clipboard4() { - // Paste the cut bookmarks at a specific position between bar and goo. - doPaste('1', [barNode.id]); - - // Check that the two bookmarks were pasted after bar. - chrome.bookmarks.getChildren( - '1', pass(function(result) { - count += 2; - assertEquals(count, result.length); - - // Look for barNode's index. - let barIndex; - for (barIndex = 0; barIndex < result.length; barIndex++) { - if (result[barIndex].id === barNode.id) { - break; - } - } - assertTrue(barIndex + 2 < result.length); - - const last = result[barIndex + 1]; - const last2 = result[barIndex + 2]; - assertEquals(fooNode.title, last.title); - assertEquals(fooNode.url, last.url); - assertEquals(fooNode.parentId, last.parentId); - assertEquals(last.title + ' (1)', last2.title); - assertEquals(last.url, last2.url); - assertEquals(last.parentId, last2.parentId); - - // Remember last2 id, so we can use it in next test. - fooNode2.id = last2.id; - })); - }, - - // Ensure we can copy empty folders - function clipboard5() { - // Copy it. - doCopy([emptyFolder.id]); - - // Ensure canPaste is now true. - bookmarkManager.canPaste('1', pass(function(result) { - assertTrue( - result, 'Should be able to paste now'); - })); - - // Paste it at the end of a multiple selection. - doPaste('1', [barNode.id, fooNode2.id]); - - // Ensure it got added at the right place. - chrome.bookmarks.getChildren( - '1', pass(function(result) { - count++; - assertEquals(count, result.length); - - // Look for fooNode2's index. - let foo2Index; - for (foo2Index = 0; foo2Index < result.length; foo2Index++) { - if (result[foo2Index].id === fooNode2.id) { - break; - } - } - assertTrue(foo2Index + 1 < result.length); - - emptyFolder2 = result[foo2Index + 1]; - - assertEquals(emptyFolder2.title, emptyFolder.title); - assertEquals(emptyFolder2.url, emptyFolder.url); - assertEquals(emptyFolder2.parentId, emptyFolder.parentId); - })); - }, - - function clipboard6() { - // Verify that we can't cut managed folders. - chrome.bookmarks.getChildren( - '4', pass(function(result) { - assertEquals(2, result.length); - const error = 'Can\'t modify managed bookmarks.'; - bookmarkManager.cut([result[0].id], fail(error)); - - // Copying is fine. - bookmarkManager.copy([result[0].id], pass(() => {})); - - // Pasting to a managed folder is not allowed. - assertTrue(result[1].url === undefined); - - bookmarkManager.canPaste( - result[1].id, pass(function(result) { - assertFalse( - result, - 'Should not be able to paste to managed folders.'); - })); - - bookmarkManager.paste(result[1].id, fail(error)); - })); - }, - ]; - - runTests(tests); -});
diff --git a/chrome/test/data/webui/bookmarks/extension_api_test.ts b/chrome/test/data/webui/bookmarks/extension_api_test.ts new file mode 100644 index 0000000..3dbb1d67 --- /dev/null +++ b/chrome/test/data/webui/bookmarks/extension_api_test.ts
@@ -0,0 +1,279 @@ +// Copyright 2012 The Chromium Authors +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +// Bookmark Manager API test for Chrome. +import {assertEquals, assertFalse, assertNotReached, assertTrue} from 'chrome://webui-test/chai_assert.js'; + +const bookmarkManager = chrome.bookmarkManagerPrivate; + +function doCopy(ids: string[]): Promise<void> { + return bookmarkManager.copy(ids); +} + +function doCut(ids: string[]): Promise<void> { + return bookmarkManager.cut(ids); +} + +function doPaste(parentId: string, selectedIdList?: string[]): Promise<void> { + return bookmarkManager.paste(parentId, selectedIdList); +} + +suite('bookmarks extension API create and sort test', function() { + let folder: chrome.bookmarks.BookmarkTreeNode; + let nodeA: chrome.bookmarks.BookmarkTreeNode; + let nodeB: chrome.bookmarks.BookmarkTreeNode; + let childFolder: chrome.bookmarks.BookmarkTreeNode; + let grandChildFolder: chrome.bookmarks.BookmarkTreeNode; + let childNodeA: chrome.bookmarks.BookmarkTreeNode; + let childNodeB: chrome.bookmarks.BookmarkTreeNode; + + test('sortChildren', async function() { + const folderDetails: + chrome.bookmarks.CreateDetails = {parentId: '1', title: 'Folder'}; + const nodeADetails: chrome.bookmarks.CreateDetails = { + title: 'a', + url: 'http://www.example.com/a', + }; + const nodeBDetails: chrome.bookmarks.CreateDetails = { + title: 'b', + url: 'http://www.example.com/b', + }; + folder = await chrome.bookmarks.create(folderDetails); + assertTrue(!!folder.id); + nodeADetails.parentId = folder.id; + nodeBDetails.parentId = folder.id; + + nodeB = await chrome.bookmarks.create(nodeBDetails); + nodeA = await chrome.bookmarks.create(nodeADetails); + }); + + test('sortChildren2', async function() { + bookmarkManager.sortChildren(folder.id); + + const children = await chrome.bookmarks.getChildren(folder.id); + assertEquals(nodeA.id, children[0]!.id); + assertEquals(nodeB.id, children[1]!.id); + }); + + test('setupSubtree', async function() { + const childFolderDetails: chrome.bookmarks.CreateDetails = { + parentId: folder.id, + title: 'Child Folder', + }; + const childNodeADetails: chrome.bookmarks.CreateDetails = { + title: 'childNodeA', + url: 'http://www.example.com/childNodeA', + }; + const childNodeBDetails: chrome.bookmarks.CreateDetails = { + title: 'childNodeB', + url: 'http://www.example.com/childNodeB', + }; + const grandChildFolderDetails: + chrome.bookmarks.CreateDetails = {title: 'grandChildFolder'}; + childFolder = await chrome.bookmarks.create(childFolderDetails); + childNodeADetails.parentId = childFolder.id; + childNodeBDetails.parentId = childFolder.id; + grandChildFolderDetails.parentId = childFolder.id; + + childNodeA = await chrome.bookmarks.create(childNodeADetails); + + childNodeB = await chrome.bookmarks.create(childNodeBDetails); + + grandChildFolder = await chrome.bookmarks.create(grandChildFolderDetails); + }); + + test('getSubtree', async function() { + const result = await bookmarkManager.getSubtree(childFolder.id, false); + const children = result[0]!.children!; + assertEquals(3, children.length); + assertEquals(childNodeA.id, children[0]!.id); + assertEquals(childNodeB.id, children[1]!.id); + assertEquals(grandChildFolder.id, children[2]!.id); + }); + + test('getSubtreeFoldersOnly', async function() { + const result = await bookmarkManager.getSubtree(childFolder.id, true); + const children = result[0]!.children!; + assertEquals(1, children.length); + assertEquals(grandChildFolder.id, children[0]!.id); + }); +}); + +suite('bookmarks extension API clipboard test', function() { + let fooNode: chrome.bookmarks.BookmarkTreeNode; + let fooNode2: chrome.bookmarks.BookmarkTreeNode; + let barNode: chrome.bookmarks.BookmarkTreeNode; + let gooNode: chrome.bookmarks.BookmarkTreeNode; + let count: number; + let emptyFolder: chrome.bookmarks.BookmarkTreeNode; + let emptyFolder2: chrome.bookmarks.BookmarkTreeNode; + + suiteSetup(async function() { + // Create a new bookmark. + const fooNodeDetails: chrome.bookmarks.CreateDetails = { + parentId: '1', + title: 'Foo', + url: 'http://www.example.com/foo', + }; + + const emptyFolderDetails: + chrome.bookmarks.CreateDetails = {parentId: '1', title: 'Empty Folder'}; + + const barNodeDetails: chrome.bookmarks.CreateDetails = { + parentId: '1', + title: 'Bar', + url: 'http://www.example.com/bar', + }; + + const gooNodeDetails: chrome.bookmarks.CreateDetails = { + parentId: '1', + title: 'Goo', + url: 'http://www.example.com/goo', + }; + + fooNode = await chrome.bookmarks.create(fooNodeDetails); + count = fooNode.index! + 1; + + emptyFolder = await chrome.bookmarks.create(emptyFolderDetails); + count = emptyFolder.index! + 1; + + // Create a couple more bookmarks to test proper insertion of + // pasted items. + barNode = await chrome.bookmarks.create(barNodeDetails); + count = barNode.index! + 1; + + gooNode = await chrome.bookmarks.create(gooNodeDetails); + count = gooNode.index! + 1; + }); + + test('copies and pastes', async function() { + // Copy the fooNode. + await doCopy([fooNode.id]); + + // Ensure canPaste is now true. + const canPaste = await bookmarkManager.canPaste('1'); + assertTrue(canPaste, 'Should be able to paste now'); + + // Paste it. + await doPaste('1'); + + // Ensure it got added at the end. + const result = await chrome.bookmarks.getChildren('1'); + count++; + assertEquals(count, result.length); + + fooNode2 = result[result.length - 1]!; + + assertEquals(fooNode.title + ' (1)', fooNode2.title); + assertEquals(fooNode.url, fooNode2.url); + assertEquals(fooNode.parentId, fooNode2.parentId); + }); + + test('cuts bookmarks', async function() { + // Cut fooNode chrome.bookmarks. + await doCut([fooNode.id, fooNode2.id]); + + // Ensure count decreased by 2. + const result = await chrome.bookmarks.getChildren('1'); + count -= 2; + assertEquals(count, result.length); + // Ensure canPaste is still true. + const canPaste = await bookmarkManager.canPaste('1'); + bookmarkManager.canPaste('1'); + assertTrue(canPaste, 'Should be able to paste now'); + }); + + test('pastes cut bookmarks', async function() { + // Paste the cut bookmarks at a specific position between bar and goo. + await doPaste('1', [barNode.id]); + + // Check that the two bookmarks were pasted after bar. + const result = await chrome.bookmarks.getChildren('1'); + count += 2; + assertEquals(count, result.length); + + // Look for barNode's index. + let barIndex; + for (barIndex = 0; barIndex < result.length; barIndex++) { + if (result[barIndex]!.id === barNode.id) { + break; + } + } + assertTrue(barIndex + 2 < result.length); + + const last = result[barIndex + 1]!; + const last2 = result[barIndex + 2]!; + assertEquals(fooNode.title, last.title); + assertEquals(fooNode.url, last.url); + assertEquals(fooNode.parentId, last.parentId); + assertEquals(last.title + ' (1)', last2.title); + assertEquals(last.url, last2.url); + assertEquals(last.parentId, last2.parentId); + + // Remember last2 id, so we can use it in next test. + fooNode2.id = last2.id; + }); + + // Ensure we can copy empty folders + test('enables paste', async function() { + // Copy it. + await doCopy([emptyFolder.id]); + + // Ensure canPaste is now true. + const canPaste = await bookmarkManager.canPaste('1'); + assertTrue(canPaste, 'Should be able to paste now'); + + // Paste it at the end of a multiple selection. + await doPaste('1', [barNode.id, fooNode2.id]); + + // Ensure it got added at the right place. + const result = await chrome.bookmarks.getChildren('1'); + count++; + assertEquals(count, result.length); + + // Look for fooNode2's index. + let foo2Index; + for (foo2Index = 0; foo2Index < result.length; foo2Index++) { + if (result[foo2Index]!.id === fooNode2.id) { + break; + } + } + assertTrue(foo2Index + 1 < result.length); + + emptyFolder2 = result[foo2Index + 1]!; + + assertEquals(emptyFolder2.title, emptyFolder.title); + assertEquals(emptyFolder2.url, emptyFolder.url); + assertEquals(emptyFolder2.parentId, emptyFolder.parentId); + }); + + test('can\'t modify managed bookmarks', async function() { + // Verify that we can't cut managed folders. + const result = await chrome.bookmarks.getChildren('4'); + assertEquals(2, result.length); + const error = 'Can\'t modify managed bookmarks.'; + try { + await bookmarkManager.cut([result[0]!.id]); + assertNotReached(); + } catch (e: any) { + assertEquals(e.message, error); + } + + // Copying is fine. + await bookmarkManager.copy([result[0]!.id]); + + // Pasting to a managed folder is not allowed. + assertTrue(result[1]!.url === undefined); + + const canPaste = await bookmarkManager.canPaste(result[1]!.id); + assertFalse(canPaste, 'Should not be able to paste to managed folders.'); + + try { + await bookmarkManager.paste(result[1]!.id, undefined); + assertNotReached(); + } catch (e: any) { + assertEquals(e.message, error); + } + }); +});
diff --git a/chrome/test/data/webui/chromeos/emoji_picker/emoji_picker_extension_categories.js b/chrome/test/data/webui/chromeos/emoji_picker/emoji_picker_extension_categories.js index 119372d..f1ff935 100644 --- a/chrome/test/data/webui/chromeos/emoji_picker/emoji_picker_extension_categories.js +++ b/chrome/test/data/webui/chromeos/emoji_picker/emoji_picker_extension_categories.js
@@ -4,7 +4,7 @@ import {EmojiPicker} from 'chrome://emoji-picker/emoji_picker.js'; import {EmojiPickerApiProxyImpl} from 'chrome://emoji-picker/emoji_picker_api_proxy.js'; -import {EMOJI_BUTTON_CLICK, EMOJI_PICKER_READY} from 'chrome://emoji-picker/events.js'; +import {EMOJI_PICKER_READY, EMOJI_TEXT_BUTTON_CLICK} from 'chrome://emoji-picker/events.js'; import {assert} from 'chrome://resources/ash/common/assert.js'; import {flush} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js'; import {assertEquals, assertFalse, assertGT, assertTrue} from 'chrome://webui-test/chromeos/chai_assert.js'; @@ -179,8 +179,8 @@ const expectedString = groupElements[0].emoji[0].base.string; const expectedName = groupElements[0].emoji[0].base.name; const buttonClickPromise = new Promise( - (resolve) => - emojiPicker.addEventListener(EMOJI_BUTTON_CLICK, (event) => { + (resolve) => emojiPicker.addEventListener( + EMOJI_TEXT_BUTTON_CLICK, (event) => { assertEquals(expectedString, event.detail.text); assertEquals(expectedName, event.detail.name); resolve(); @@ -229,8 +229,8 @@ const recentlyUsedButton = await waitForCondition( () => findEmojiFirstButton(historyGroupSelector(category))); const buttonClickPromise = new Promise( - (resolve) => - emojiPicker.addEventListener(EMOJI_BUTTON_CLICK, (event) => { + (resolve) => emojiPicker.addEventListener( + EMOJI_TEXT_BUTTON_CLICK, (event) => { assertEquals( emojiButton.innerHTML.trim(), event.detail.text); resolve();
diff --git a/chrome/test/data/webui/chromeos/emoji_picker/emoji_picker_search_test.js b/chrome/test/data/webui/chromeos/emoji_picker/emoji_picker_search_test.js index d8b2bb0..6ad3c88 100644 --- a/chrome/test/data/webui/chromeos/emoji_picker/emoji_picker_search_test.js +++ b/chrome/test/data/webui/chromeos/emoji_picker/emoji_picker_search_test.js
@@ -3,10 +3,9 @@ // found in the LICENSE file. import {EmojiPicker} from 'chrome://emoji-picker/emoji_picker.js'; -import {EMOJI_BUTTON_CLICK, EMOJI_PICKER_READY} from 'chrome://emoji-picker/events.js'; +import {EMOJI_PICKER_READY, EMOJI_TEXT_BUTTON_CLICK} from 'chrome://emoji-picker/events.js'; import {assert} from 'chrome://resources/ash/common/assert.js'; import {flush} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js'; - import {assertEquals, assertGT} from 'chrome://webui-test/chromeos/chai_assert.js'; import {deepQuerySelector, waitForCondition, waitWithTimeout} from './emoji_picker_test_util.js'; @@ -99,8 +98,8 @@ const enterEvent = new KeyboardEvent( 'keydown', {cancelable: true, key: 'Enter', keyCode: 13}); const buttonClickPromise = new Promise( - (resolve) => - emojiPicker.addEventListener(EMOJI_BUTTON_CLICK, (event) => { + (resolve) => emojiPicker.addEventListener( + EMOJI_TEXT_BUTTON_CLICK, (event) => { assertEquals('🧟', event.detail.text); assertEquals('zombie', event.detail.name.trim()); resolve(); @@ -122,8 +121,8 @@ 'keydown', {cancelable: true, key: 'Enter', keyCode: 13}); const buttonClickPromise = new Promise( - (resolve) => - emojiPicker.addEventListener(EMOJI_BUTTON_CLICK, (event) => { + (resolve) => emojiPicker.addEventListener( + EMOJI_TEXT_BUTTON_CLICK, (event) => { assertEquals('=^.^=', event.detail.text); resolve(); }));
diff --git a/chrome/test/data/webui/chromeos/shortcut_customization/shortcut_customization_test_util.ts b/chrome/test/data/webui/chromeos/shortcut_customization/shortcut_customization_test_util.ts index b7e9282..04fe9562 100644 --- a/chrome/test/data/webui/chromeos/shortcut_customization/shortcut_customization_test_util.ts +++ b/chrome/test/data/webui/chromeos/shortcut_customization/shortcut_customization_test_util.ts
@@ -29,7 +29,7 @@ return { layoutProperties: { textAccelerator: { - parts, + textAccelerator: parts, }, }, locked,
diff --git a/chrome/test/data/webui/settings/chromeos/fake_input_device_settings_provider_test.js b/chrome/test/data/webui/settings/chromeos/fake_input_device_settings_provider_test.js index 27429c3..71b178e13 100644 --- a/chrome/test/data/webui/settings/chromeos/fake_input_device_settings_provider_test.js +++ b/chrome/test/data/webui/settings/chromeos/fake_input_device_settings_provider_test.js
@@ -46,4 +46,16 @@ return provider.getFakeTouchpads().then( result => assertDeepEquals(fakeTouchpads, result)); }); + + test('setFakeMice', () => { + const fakeMice = [{ + id: 2, + name: 'fake-mouse', + isExternal: false, + }]; + + provider.setFakeMice(fakeMice); + return provider.getFakeMice().then( + result => assertDeepEquals(fakeMice, result)); + }); });
diff --git a/chrome/test/data/webui/settings/chromeos/hotspot_summary_item_tests.js b/chrome/test/data/webui/settings/chromeos/hotspot_summary_item_tests.js index 67f8c4fc..8012184a 100644 --- a/chrome/test/data/webui/settings/chromeos/hotspot_summary_item_tests.js +++ b/chrome/test/data/webui/settings/chromeos/hotspot_summary_item_tests.js
@@ -27,7 +27,7 @@ setHotspotConfigForTesting(hotspotConfig_); }); - setup(function() { + setup(async function() { PolymerTest.clearBody(); hotspotSummaryItem = document.createElement('hotspot-summary-item'); @@ -46,13 +46,9 @@ hotspotConfig_.setFakeHotspotInfo({ state: HotspotState.kDisabled, - allowStatus: HotspotAllowStatus.kDisallowedNoCellularUpstream, - clientCount: 0, - config: { - ssid: 'test_ssid', - passphrase: 'test_passphrase', - }, + allowStatus: HotspotAllowStatus.kAllowed, }); + await flushAsync(); }); teardown(function() { @@ -68,88 +64,212 @@ return new Promise(resolve => setTimeout(resolve)); } - test('clicking on subpage arrow routes to hotspot subpage', async function() { - const subpageArrow = hotspotSummaryItem.shadowRoot.querySelector( - '#hotspotSummaryItemRowArrowIcon'); - assertTrue(!!subpageArrow); - subpageArrow.click(); - assertEquals(Router.getInstance().getCurrentRoute(), routes.HOTSPOT_DETAIL); - }); - test( - 'clicking on hotspot summary row routes to hotspot subpage', + 'clicking on subpage arrow routes to hotspot subpage when allowed', async function() { const subpageArrow = hotspotSummaryItem.shadowRoot.querySelector( - '#hotspotSummaryItemRow'); - assertTrue(!!subpageArrow); + '#hotspotSummaryItemRowArrowIcon'); + assertTrue(!!subpageArrow, 'Subpage arrow should exist'); subpageArrow.click(); assertEquals( - Router.getInstance().getCurrentRoute(), routes.HOTSPOT_DETAIL); + routes.HOTSPOT_DETAIL, Router.getInstance().getCurrentRoute()); }); - test('UI state test', async function() { - // Simulate hotspot state is disabled. - const hotspotSecondaryLabel = - hotspotSummaryItem.shadowRoot.querySelector('#hotspotSecondaryLabel'); + test( + 'clicking on hotspot summary row routes to hotspot subpage when allowed', + async function() { + const hotspotSummaryRow = hotspotSummaryItem.shadowRoot.querySelector( + '#hotspotSummaryItemRow'); + assertTrue(!!hotspotSummaryRow, 'Hotspot summary row should exist'); + hotspotSummaryRow.click(); + assertEquals( + routes.HOTSPOT_DETAIL, Router.getInstance().getCurrentRoute()); + }); + + test('UI state when hotspot is allowed and state is off', async function() { + const hotspotStateSublabel = + hotspotSummaryItem.shadowRoot.querySelector('#hotspotStateSublabel'); + const hotspotDisabledSublabelLink = + hotspotSummaryItem.shadowRoot.querySelector( + '#hotspotDisabledSublabelLink'); const enableToggle = hotspotSummaryItem.shadowRoot.querySelector('#enableHotspotToggle'); const hotspotIcon = hotspotSummaryItem.shadowRoot.querySelector('#hotspotIcon'); - await flushAsync(); + const subpageArrow = hotspotSummaryItem.shadowRoot.querySelector( + '#hotspotSummaryItemRowArrowIcon'); + const policyIndicator = + hotspotSummaryItem.shadowRoot.querySelector('#policyIndicator'); + + assertFalse(enableToggle.disabled, 'Toggle should be enabled'); + assertTrue(!!subpageArrow, 'Subpage arrow should exist'); + assertFalse(!!policyIndicator, 'Policy indicator should not exist'); + assertEquals('os-settings:hotspot-disabled', hotspotIcon.icon); + assertFalse(hotspotStateSublabel.hidden, 'State sublabel should show'); assertEquals( hotspotSummaryItem.i18n('hotspotSummaryStateOff'), - hotspotSecondaryLabel.textContent.trim()); - assertEquals('os-settings:hotspot-disabled', hotspotIcon.icon); + hotspotStateSublabel.textContent.trim()); + assertTrue( + hotspotDisabledSublabelLink.hidden, + 'Disabled sublabel link should hide'); + }); - // Simulate turning on hotspot. - hotspotConfig_.setFakeEnableHotspotResult(HotspotControlResult.kSuccess); - hotspotConfig_.enableHotspot(); + test('UI state when hotspot is allowed and state is on', async function() { + hotspotConfig_.setFakeHotspotState(HotspotState.kEnabled); await flushAsync(); + + const hotspotStateSublabel = + hotspotSummaryItem.shadowRoot.querySelector('#hotspotStateSublabel'); + const hotspotDisabledSublabelLink = + hotspotSummaryItem.shadowRoot.querySelector( + '#hotspotDisabledSublabelLink'); + const enableToggle = + hotspotSummaryItem.shadowRoot.querySelector('#enableHotspotToggle'); + const hotspotIcon = + hotspotSummaryItem.shadowRoot.querySelector('#hotspotIcon'); + const subpageArrow = hotspotSummaryItem.shadowRoot.querySelector( + '#hotspotSummaryItemRowArrowIcon'); + const policyIndicator = + hotspotSummaryItem.shadowRoot.querySelector('#policyIndicator'); + + assertFalse(enableToggle.disabled, 'Toggle should be enabled'); + assertTrue(!!subpageArrow, 'Subpage arrow should exist'); + assertFalse(!!policyIndicator, 'Policy indicator should not exist'); + assertEquals('os-settings:hotspot-enabled', hotspotIcon.icon); + assertFalse(hotspotStateSublabel.hidden, 'State sublabel should show'); assertEquals( hotspotSummaryItem.i18n('hotspotSummaryStateOn'), - hotspotSecondaryLabel.textContent.trim()); - assertEquals('os-settings:hotspot-enabled', hotspotIcon.icon); - assertTrue(enableToggle.checked); + hotspotStateSublabel.textContent.trim()); + assertTrue( + hotspotDisabledSublabelLink.hidden, + 'Disabled sublabel link should hide'); + }); - // Simulate turning off hotspot. - hotspotConfig_.setFakeDisableHotspotResult(HotspotControlResult.kSuccess); - hotspotConfig_.disableHotspot(); - await flushAsync(); - assertEquals( - hotspotSummaryItem.i18n('hotspotSummaryStateOff'), - hotspotSecondaryLabel.textContent.trim()); - assertEquals('os-settings:hotspot-disabled', hotspotIcon.icon); - assertFalse(enableToggle.checked); - - // Verify toggle is able to turn on/off by CrosHotspotConfig even when it is - // disabled by policy. + test('UI state when disallowed by policy', async function() { hotspotConfig_.setFakeHotspotAllowStatus( HotspotAllowStatus.kDisallowedByPolicy); await flushAsync(); - // Toggle should be disabled. - assertTrue(enableToggle.disabled); + const hotspotStateSublabel = + hotspotSummaryItem.shadowRoot.querySelector('#hotspotStateSublabel'); + const hotspotDisabledSublabelLink = + hotspotSummaryItem.shadowRoot.querySelector( + '#hotspotDisabledSublabelLink'); + const enableToggle = + hotspotSummaryItem.shadowRoot.querySelector('#enableHotspotToggle'); + const hotspotIcon = + hotspotSummaryItem.shadowRoot.querySelector('#hotspotIcon'); + const subpageArrow = hotspotSummaryItem.shadowRoot.querySelector( + '#hotspotSummaryItemRowArrowIcon'); + const policyIndicator = + hotspotSummaryItem.shadowRoot.querySelector('#policyIndicator'); + + // Toggle should be disabled, subpage arrow should not show. + assertTrue(enableToggle.disabled, 'Toggle should be disabled'); + assertFalse(!!subpageArrow, 'Subpage arrow should not exist'); + assertTrue(!!policyIndicator, 'Policy indicator should exist'); + assertEquals('os-settings:hotspot-disabled', hotspotIcon.icon); + assertFalse(hotspotStateSublabel.hidden, 'State sublabel should show'); + assertEquals( + hotspotSummaryItem.i18n('hotspotSummaryStateOff'), + hotspotStateSublabel.textContent.trim()); + assertTrue( + hotspotDisabledSublabelLink.hidden, + 'Disabled sublabel link should hide'); + + // Verify toggle is able to turn on/off by CrosHotspotConfig even when it is + // disabled by policy. hotspotConfig_.setFakeHotspotState(HotspotState.kEnabled); await flushAsync(); assertEquals( hotspotSummaryItem.i18n('hotspotSummaryStateOn'), - hotspotSecondaryLabel.textContent.trim()); + hotspotStateSublabel.textContent.trim()); assertEquals('os-settings:hotspot-enabled', hotspotIcon.icon); - assertTrue(enableToggle.checked); hotspotConfig_.setFakeHotspotState(HotspotState.kDisabled); await flushAsync(); assertEquals( hotspotSummaryItem.i18n('hotspotSummaryStateOff'), - hotspotSecondaryLabel.textContent.trim()); + hotspotStateSublabel.textContent.trim()); assertEquals('os-settings:hotspot-disabled', hotspotIcon.icon); - assertFalse(enableToggle.checked); + }); + + test( + 'UI state when mobile data plan doesn\'t support hotspot', + async function() { + hotspotConfig_.setFakeHotspotAllowStatus( + HotspotAllowStatus.kDisallowedReadinessCheckFail); + await flushAsync(); + + const hotspotStateSublabel = + hotspotSummaryItem.shadowRoot.querySelector( + '#hotspotStateSublabel'); + const hotspotDisabledSublabelLink = + hotspotSummaryItem.shadowRoot.querySelector( + '#hotspotDisabledSublabelLink'); + const enableToggle = + hotspotSummaryItem.shadowRoot.querySelector('#enableHotspotToggle'); + const hotspotIcon = + hotspotSummaryItem.shadowRoot.querySelector('#hotspotIcon'); + const subpageArrow = hotspotSummaryItem.shadowRoot.querySelector( + '#hotspotSummaryItemRowArrowIcon'); + const policyIndicator = + hotspotSummaryItem.shadowRoot.querySelector('#policyIndicator'); + + // Toggle should be disabled, subpage arrow should not show. + assertTrue(enableToggle.disabled, 'Toggle should be disabled'); + assertFalse(!!subpageArrow, 'Subpage arrow should not exist'); + assertFalse(!!policyIndicator, 'Policy indicator should not exist'); + assertEquals('os-settings:hotspot-disabled', hotspotIcon.icon); + assertTrue(hotspotStateSublabel.hidden, 'State sublabel should hide'); + assertFalse( + hotspotDisabledSublabelLink.hidden, + 'Disabled sublabel link should show'); + assertEquals( + hotspotSummaryItem + .i18nAdvanced('hotspotMobileDataNotSupportedSublabelWithLink') + .toString(), + hotspotDisabledSublabelLink.localizedString); + }); + + test('UI state when no mobile data connection', async function() { + hotspotConfig_.setFakeHotspotAllowStatus( + HotspotAllowStatus.kDisallowedNoMobileData); + await flushAsync(); + + const hotspotStateSublabel = + hotspotSummaryItem.shadowRoot.querySelector('#hotspotStateSublabel'); + const hotspotDisabledSublabelLink = + hotspotSummaryItem.shadowRoot.querySelector( + '#hotspotDisabledSublabelLink'); + const enableToggle = + hotspotSummaryItem.shadowRoot.querySelector('#enableHotspotToggle'); + const hotspotIcon = + hotspotSummaryItem.shadowRoot.querySelector('#hotspotIcon'); + const subpageArrow = hotspotSummaryItem.shadowRoot.querySelector( + '#hotspotSummaryItemRowArrowIcon'); + const policyIndicator = + hotspotSummaryItem.shadowRoot.querySelector('#policyIndicator'); + + // Toggle should be disabled, subpage arrow should not show. + assertTrue(enableToggle.disabled, 'Toggle should be disabled'); + assertFalse(!!subpageArrow, 'Subpage arrow should not exist'); + assertFalse(!!policyIndicator, 'Policy indicator should not exist'); + assertEquals('os-settings:hotspot-disabled', hotspotIcon.icon); + assertTrue(hotspotStateSublabel.hidden, 'State sublabel should hide'); + assertFalse( + hotspotDisabledSublabelLink.hidden, + 'Disabled sublabel link should show'); + assertEquals( + hotspotSummaryItem.i18nAdvanced('hotspotNoMobileDataSublabelWithLink') + .toString(), + hotspotDisabledSublabelLink.localizedString); }); test('Toggle button state', async function() { const enableHotspotToggle = hotspotSummaryItem.shadowRoot.querySelector('#enableHotspotToggle'); - assertTrue(!!enableHotspotToggle); + assertTrue(!!enableHotspotToggle, 'Hotspot enable toggl should exist'); assertFalse(enableHotspotToggle.checked); // Simulate clicking toggle to turn on hotspot and fail.
diff --git a/chrome/test/data/webui/side_panel/BUILD.gn b/chrome/test/data/webui/side_panel/BUILD.gn index 6f948089..a9f5056 100644 --- a/chrome/test/data/webui/side_panel/BUILD.gn +++ b/chrome/test/data/webui/side_panel/BUILD.gn
@@ -17,9 +17,9 @@ "chrome://read-later.top-chrome/*|" + rebase_path( "$root_gen_dir/chrome/browser/resources/side_panel/reading_list/tsc/*", target_gen_dir), - "chrome://read-anything-side-panel.top-chrome/*|" + - rebase_path("$root_gen_dir/chrome/browser/resources/side_panel/tsc/*", - target_gen_dir), + "chrome://read-anything-side-panel.top-chrome/*|" + rebase_path( + "$root_gen_dir/chrome/browser/resources/side_panel/read_anything/tsc/*", + target_gen_dir), "chrome://webui-test/*|" + rebase_path("$root_gen_dir/chrome/test/data/webui/tsc/*", target_gen_dir), @@ -45,8 +45,8 @@ ] deps = [ "..:build_ts", - "//chrome/browser/resources/side_panel:build_ts", "//chrome/browser/resources/side_panel/bookmarks:build_ts", + "//chrome/browser/resources/side_panel/read_anything:build_ts", "//chrome/browser/resources/side_panel/reading_list:build_ts", ] }
diff --git a/chrome/test/data/webui/side_panel/bookmarks/power_bookmarks_list_test.ts b/chrome/test/data/webui/side_panel/bookmarks/power_bookmarks_list_test.ts index dcf48a6..78b0280 100644 --- a/chrome/test/data/webui/side_panel/bookmarks/power_bookmarks_list_test.ts +++ b/chrome/test/data/webui/side_panel/bookmarks/power_bookmarks_list_test.ts
@@ -118,8 +118,9 @@ (bookmarkElement as PowerBookmarkRowElement).bookmark.url); assertNotEquals( undefined, - Array.from(bookmarkElement.shadowRoot!.querySelectorAll('div')) - .find(el => el.textContent === 'New title')); + Array.from(bookmarkElement.shadowRoot!.querySelectorAll('button')) + .find( + el => el.textContent && el.textContent.trim() === 'New title')); }); test('AddsCreatedBookmark', async () => {
diff --git a/chrome/test/data/webui/side_panel/read_anything/read_anything_app_test.ts b/chrome/test/data/webui/side_panel/read_anything/read_anything_app_test.ts index 470c183b..a87f74e 100644 --- a/chrome/test/data/webui/side_panel/read_anything/read_anything_app_test.ts +++ b/chrome/test/data/webui/side_panel/read_anything/read_anything_app_test.ts
@@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -import 'chrome://read-anything-side-panel.top-chrome/read_anything/app.js'; +import 'chrome://read-anything-side-panel.top-chrome/app.js'; import 'chrome://webui-test/mojo_webui_test_support.js'; -import {ReadAnythingElement} from 'chrome://read-anything-side-panel.top-chrome/read_anything/app.js'; +import {ReadAnythingElement} from 'chrome://read-anything-side-panel.top-chrome/app.js'; import {assertEquals} from 'chrome://webui-test/chai_assert.js'; suite('ReadAnythingAppTest', () => {
diff --git a/chrome/updater/BUILD.gn b/chrome/updater/BUILD.gn index 540c176..de17e59 100644 --- a/chrome/updater/BUILD.gn +++ b/chrome/updater/BUILD.gn
@@ -338,6 +338,8 @@ "installer_linux.cc", "ipc/ipc_security_linux.cc", "linux/setup/setup.cc", + "linux/systemd_util.cc", + "linux/systemd_util.h", "net/network_fetcher_linux.cc", "prefs_linux.cc", "setup_linux.cc", @@ -549,6 +551,7 @@ if (is_linux) { sources += [ "ipc/ipc_names_linux.cc", + "ipc/update_service_dialer_linux.cc", "linux/ipc_constants.cc", "linux/ipc_constants.h", "util/linux_util.cc", @@ -559,6 +562,7 @@ if (is_mac) { sources += [ "ipc/ipc_names_mac.mm", + "ipc/update_service_dialer_mac.cc", "mac/privileged_helper/service_protocol.h", "util/mac_util.h", "util/mac_util.mm", @@ -570,6 +574,7 @@ if (is_posix) { sources += [ "ipc/ipc_names.h", + "ipc/update_service_dialer.h", "ipc/update_service_proxy_posix.cc", "ipc/update_service_proxy_posix.h", "posix/setup.h", @@ -880,6 +885,7 @@ sources += [ "test/integration_tests_linux.cc" ] data_deps = [ "//chrome/updater/linux:updater_test" ] + public_configs = [ "linux:libsystemd" ] } if (is_posix) {
diff --git a/chrome/updater/app/server/posix/app_server_posix.cc b/chrome/updater/app/server/posix/app_server_posix.cc index d5dcea7a..48fd379 100644 --- a/chrome/updater/app/server/posix/app_server_posix.cc +++ b/chrome/updater/app/server/posix/app_server_posix.cc
@@ -81,8 +81,4 @@ return PromoteCandidate(updater_scope()) == kErrorOk; } -scoped_refptr<App> MakeAppServer() { - return base::MakeRefCounted<AppServerPosix>(); -} - } // namespace updater
diff --git a/chrome/updater/app/server/posix/app_server_posix.h b/chrome/updater/app/server/posix/app_server_posix.h index 13c27b8..53398d9 100644 --- a/chrome/updater/app/server/posix/app_server_posix.h +++ b/chrome/updater/app/server/posix/app_server_posix.h
@@ -25,6 +25,8 @@ protected: // Overrides of App. ~AppServerPosix() override; + // Overrides of AppServer. + void ActiveDuty(scoped_refptr<UpdateService> update_service) override; private: base::TimeDelta ServerKeepAlive(); @@ -34,7 +36,6 @@ void AcknowledgeTaskCompletion(); // Overrides of AppServer. - void ActiveDuty(scoped_refptr<UpdateService> update_service) override; void ActiveDutyInternal( scoped_refptr<UpdateServiceInternal> update_service_internal) override; bool SwapInNewVersion() override;
diff --git a/chrome/updater/app/server/posix/app_server_posix_linux.cc b/chrome/updater/app/server/posix/app_server_posix_linux.cc index 136b7384..eabeaa7 100644 --- a/chrome/updater/app/server/posix/app_server_posix_linux.cc +++ b/chrome/updater/app/server/posix/app_server_posix_linux.cc
@@ -5,9 +5,34 @@ #include "chrome/updater/app/server/posix/app_server_posix.h" #include "base/functional/callback.h" +#include "base/task/task_traits.h" +#include "base/task/thread_pool.h" +#include "base/threading/sequence_bound.h" +#include "chrome/updater/linux/systemd_util.h" #include "chrome/updater/registration_data.h" +#include "chrome/updater/update_service.h" namespace updater { +namespace { + +// Extends |AppServerPosix| to include a |SystemdService| which is enabled +// during |ActiveDuty|. This is required for the server to operate as a systemd +// daemon. +class AppServerLinux : public AppServerPosix { + public: + AppServerLinux() = default; + void ActiveDuty(scoped_refptr<UpdateService> update_service) override { + systemd_service_ = base::SequenceBound<SystemdService>( + base::ThreadPool::CreateSequencedTaskRunner({base::MayBlock()})); + AppServerPosix::ActiveDuty(update_service); + } + + private: + ~AppServerLinux() override = default; + + base::SequenceBound<SystemdService> systemd_service_; +}; +} // namespace bool AppServerPosix::MigrateLegacyUpdaters( base::RepeatingCallback<void(const RegistrationRequest&)> @@ -16,4 +41,7 @@ return true; } +scoped_refptr<App> MakeAppServer() { + return base::MakeRefCounted<AppServerLinux>(); +} } // namespace updater
diff --git a/chrome/updater/app/server/posix/app_server_posix_mac.cc b/chrome/updater/app/server/posix/app_server_posix_mac.cc index e26c129..713915e4 100644 --- a/chrome/updater/app/server/posix/app_server_posix_mac.cc +++ b/chrome/updater/app/server/posix/app_server_posix_mac.cc
@@ -5,6 +5,7 @@ #import "chrome/updater/app/server/posix/app_server_posix.h" #include "base/functional/callback.h" +#include "base/memory/scoped_refptr.h" #include "chrome/updater/mac/setup/keystone.h" #include "chrome/updater/registration_data.h" @@ -19,4 +20,8 @@ return true; } +scoped_refptr<App> MakeAppServer() { + return base::MakeRefCounted<AppServerPosix>(); +} + } // namespace updater
diff --git a/chrome/updater/constants.h b/chrome/updater/constants.h index 81cbff4..3fb30982 100644 --- a/chrome/updater/constants.h +++ b/chrome/updater/constants.h
@@ -369,6 +369,12 @@ // Failed to rename the old launcher to the new one during activation. inline constexpr int kErrorFailedToRenameLauncher = 39; +// Failed to install one or more Systemd units. +inline constexpr int kErrorFailedToInstallSystemdUnit = 40; + +// Failed to remove one or more Systemd units during uninstallation. +inline constexpr int kErrorFailedToRemoveSystemdUnit = 41; + inline constexpr int kErrorTagParsing = 50; // Metainstaller errors.
diff --git a/chrome/updater/ipc/ipc_names_linux.cc b/chrome/updater/ipc/ipc_names_linux.cc index 3ccef9d..28da8d5 100644 --- a/chrome/updater/ipc/ipc_names_linux.cc +++ b/chrome/updater/ipc/ipc_names_linux.cc
@@ -7,6 +7,7 @@ #include "chrome/updater/linux/ipc_constants.h" #include "chrome/updater/updater_scope.h" #include "mojo/public/cpp/platform/named_platform_channel.h" +#include "third_party/abseil-cpp/absl/types/optional.h" namespace updater {
diff --git a/chrome/updater/ipc/update_service_dialer.h b/chrome/updater/ipc/update_service_dialer.h new file mode 100644 index 0000000..55d4fcd --- /dev/null +++ b/chrome/updater/ipc/update_service_dialer.h
@@ -0,0 +1,15 @@ +// Copyright 2023 The Chromium Authors +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef CHROME_UPDATER_IPC_UPDATE_SERVICE_DIALER_H_ +#define CHROME_UPDATER_IPC_UPDATE_SERVICE_DIALER_H_ + +#include "chrome/updater/updater_scope.h" + +namespace updater { +// Start the update service in a platform-specific way. Returns false if the +// service could not be reached. +[[nodiscard]] bool DialUpdateService(UpdaterScope scope); +} // namespace updater +#endif // CHROME_UPDATER_IPC_UPDATE_SERVICE_DIALER_H_
diff --git a/chrome/updater/ipc/update_service_dialer_linux.cc b/chrome/updater/ipc/update_service_dialer_linux.cc new file mode 100644 index 0000000..2a5e6900 --- /dev/null +++ b/chrome/updater/ipc/update_service_dialer_linux.cc
@@ -0,0 +1,51 @@ +// Copyright 2023 The Chromium Authors +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "chrome/updater/ipc/update_service_dialer.h" + +#include <sys/socket.h> +#include <sys/un.h> +#include <cstdio> + +#include "base/files/file_path.h" +#include "base/files/file_util.h" +#include "base/logging.h" +#include "chrome/updater/linux/ipc_constants.h" +#include "chrome/updater/updater_scope.h" +#include "third_party/abseil-cpp/absl/types/optional.h" + +namespace updater { + +// Start the update service by connecting to its activation socket. This will +// cause systemd to launch the service as the appropriate user. +bool DialUpdateService(UpdaterScope scope) { + absl::optional<base::FilePath> activaton_socket_path = + GetActivationSocketPath(scope); + if (activaton_socket_path) { + if (!base::PathExists(*activaton_socket_path)) { + // If there's no activation socket present, abandon dialing. + return false; + } + + base::ScopedFD sock_fd(socket(AF_UNIX, SOCK_STREAM, 0)); + if (!sock_fd.is_valid()) { + VPLOG(1) << "Could not create socket"; + return false; + } + + struct sockaddr_un remote; + remote.sun_family = AF_UNIX; + snprintf(remote.sun_path, sizeof(remote.sun_path), "%s", + GetActivationSocketPath(scope).AsUTF8Unsafe().c_str()); + int len = strlen(remote.sun_path) + sizeof(remote.sun_family); + if (connect(sock_fd.get(), (struct sockaddr*)&remote, len) == -1) { + VPLOG(1) << "Could not connect to activation socket"; + return false; + } + } + + return true; +} + +} // namespace updater
diff --git a/chrome/updater/ipc/update_service_dialer_mac.cc b/chrome/updater/ipc/update_service_dialer_mac.cc new file mode 100644 index 0000000..3f9287d --- /dev/null +++ b/chrome/updater/ipc/update_service_dialer_mac.cc
@@ -0,0 +1,41 @@ +// Copyright 2023 The Chromium Authors +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "chrome/updater/ipc/update_service_dialer.h" + +#include "base/command_line.h" +#include "base/files/file_path.h" +#include "base/files/file_util.h" +#include "base/process/launch.h" +#include "chrome/updater/constants.h" +#include "chrome/updater/updater_scope.h" +#include "chrome/updater/util/posix_util.h" +#include "third_party/abseil-cpp/absl/types/optional.h" + +namespace updater { + +// Start the update service by running the launcher directly. +bool DialUpdateService(UpdaterScope scope) { + absl::optional<base::FilePath> updater = GetUpdateServiceLauncherPath(scope); + if (updater) { + if (!base::PathExists(*updater)) { + // If there's no updater present, abandon dialing. + return false; + } + base::CommandLine command(*updater); + command.AppendSwitch(kServerSwitch); + command.AppendSwitchASCII(kServerServiceSwitch, + kServerUpdateServiceSwitchValue); + if (scope == UpdaterScope::kSystem) { + command.AppendSwitch(kSystemSwitch); + } + command.AppendSwitch(kEnableLoggingSwitch); + command.AppendSwitchASCII(kLoggingModuleSwitch, kLoggingModuleSwitchValue); + base::LaunchProcess(command, {}); + } + + return true; +} + +} // namespace updater
diff --git a/chrome/updater/ipc/update_service_proxy_posix.cc b/chrome/updater/ipc/update_service_proxy_posix.cc index e3d0bb60..da3d9fc 100644 --- a/chrome/updater/ipc/update_service_proxy_posix.cc +++ b/chrome/updater/ipc/update_service_proxy_posix.cc
@@ -12,11 +12,9 @@ #include "base/cancelable_callback.h" #include "base/check.h" #include "base/files/file_path.h" -#include "base/files/file_util.h" #include "base/functional/bind.h" #include "base/functional/callback.h" #include "base/logging.h" -#include "base/memory/ref_counted.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h" #include "base/ranges/algorithm.h" @@ -28,6 +26,7 @@ #include "chrome/updater/app/server/posix/mojom/updater_service.mojom.h" #include "chrome/updater/constants.h" #include "chrome/updater/ipc/ipc_names.h" +#include "chrome/updater/ipc/update_service_dialer.h" #include "chrome/updater/registration_data.h" #include "chrome/updater/service_proxy_factory.h" #include "chrome/updater/update_service.h" @@ -38,12 +37,10 @@ #include "mojo/public/cpp/bindings/callback_helpers.h" #include "mojo/public/cpp/bindings/pending_receiver.h" #include "mojo/public/cpp/bindings/pending_remote.h" -#include "mojo/public/cpp/bindings/receiver.h" #include "mojo/public/cpp/bindings/remote.h" #include "mojo/public/cpp/bindings/self_owned_receiver.h" #include "mojo/public/cpp/platform/named_platform_channel.h" #include "mojo/public/cpp/platform/platform_channel_endpoint.h" -#include "mojo/public/cpp/system/invitation.h" #include "mojo/public/cpp/system/isolated_connection.h" #include "mojo/public/cpp/system/message_pipe.h" #include "third_party/abseil-cpp/absl/types/optional.h" @@ -154,28 +151,10 @@ absl::optional<mojo::PlatformChannelEndpoint> ConnectMojo(UpdaterScope scope, int tries) { if (tries == 1) { - // Launch a server process. - absl::optional<base::FilePath> updater = - GetUpdateServiceLauncherPath(scope); - if (updater) { - if (!base::PathExists(*updater)) { - // If there's no updater present, abandon dialing. - return absl::nullopt; - } - base::CommandLine command(*updater); - command.AppendSwitch(kServerSwitch); - command.AppendSwitchASCII(kServerServiceSwitch, - kServerUpdateServiceSwitchValue); - if (scope == UpdaterScope::kSystem) { - command.AppendSwitch(kSystemSwitch); - } - command.AppendSwitch(kEnableLoggingSwitch); - command.AppendSwitchASCII(kLoggingModuleSwitch, - kLoggingModuleSwitchValue); - base::LaunchProcess(command, {}); + if (!DialUpdateService(scope)) { + return absl::nullopt; } } - return named_mojo_ipc_server::ConnectToServer( GetUpdateServiceServerName(scope)); }
diff --git a/chrome/updater/linux/BUILD.gn b/chrome/updater/linux/BUILD.gn index 72e74039..1db86386 100644 --- a/chrome/updater/linux/BUILD.gn +++ b/chrome/updater/linux/BUILD.gn
@@ -2,6 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. +import("//build/config/linux/pkg_config.gni") import("//chrome/updater/zip.gni") # This target builds the updater executable and unittests. @@ -12,9 +13,14 @@ ] } +pkg_config("libsystemd") { + packages = [ "libsystemd" ] +} + source_set("updater_executable") { sources = [ "main.cc" ] deps = [ "//chrome/updater:base" ] + public_configs = [ ":libsystemd" ] } executable("updater") {
diff --git a/chrome/updater/linux/ipc_constants.cc b/chrome/updater/linux/ipc_constants.cc index a6c8309..97213fc 100644 --- a/chrome/updater/linux/ipc_constants.cc +++ b/chrome/updater/linux/ipc_constants.cc
@@ -10,7 +10,6 @@ #include "chrome/updater/updater_branding.h" #include "chrome/updater/updater_scope.h" #include "chrome/updater/updater_version.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace updater { namespace { @@ -38,4 +37,9 @@ base::StrCat({PRODUCT_FULLNAME_STRING, kUpdaterVersion, ".sk"})); } +base::FilePath GetActivationSocketPath(UpdaterScope scope) { + return GetSocketsDir(scope).Append( + FILE_PATH_LITERAL(PRODUCT_FULLNAME_STRING ".activation.sk")); +} + } // namespace updater
diff --git a/chrome/updater/linux/ipc_constants.h b/chrome/updater/linux/ipc_constants.h index e76f7d90..0de526a 100644 --- a/chrome/updater/linux/ipc_constants.h +++ b/chrome/updater/linux/ipc_constants.h
@@ -6,7 +6,6 @@ #define CHROME_UPDATER_LINUX_IPC_CONSTANTS_H_ #include "chrome/updater/updater_scope.h" -#include "third_party/abseil-cpp/absl/types/optional.h" namespace base { class FilePath; @@ -18,6 +17,10 @@ base::FilePath GetActiveDutyInternalSocketPath(UpdaterScope scope); +// The activation socket can be used by clients to request systemd to start the +// update server. +base::FilePath GetActivationSocketPath(UpdaterScope scope); + } // namespace updater #endif // CHROME_UPDATER_LINUX_IPC_CONSTANTS_H_
diff --git a/chrome/updater/linux/setup/setup.cc b/chrome/updater/linux/setup/setup.cc index a822ef0..55c6f2e 100644 --- a/chrome/updater/linux/setup/setup.cc +++ b/chrome/updater/linux/setup/setup.cc
@@ -12,9 +12,9 @@ #include "base/files/file_util.h" #include "base/logging.h" #include "base/path_service.h" -#include "base/version.h" #include "chrome/updater/constants.h" #include "chrome/updater/linux/ipc_constants.h" +#include "chrome/updater/linux/systemd_util.h" #include "chrome/updater/util/posix_util.h" #include "chrome/updater/util/util.h" #include "third_party/abseil-cpp/absl/types/optional.h" @@ -55,7 +55,6 @@ return kErrorFailedToCopyBinary; } - // TODO(1276117): Install systemd units. return kErrorOk; } @@ -75,8 +74,6 @@ error = kErrorFailedToDeleteSocket; } - // TODO(1276117): Remove systemd units. - return error; } @@ -102,6 +99,10 @@ return kErrorFailedToRenameLauncher; } + if (!InstallSystemdUnits(scope)) { + return kErrorFailedToInstallSystemdUnit; + } + return kErrorOk; } @@ -110,13 +111,15 @@ << " : " << __func__; int error = kErrorOk; + if (!UninstallSystemdUnits(scope)) { + error = kErrorFailedToRemoveSystemdUnit; + } + if (!DeleteFolder(GetBaseInstallDirectory(scope)) || !DeleteFolder(GetBaseDataDirectory(scope))) { error = kErrorFailedToDeleteFolder; } - // TODO(1276117): Remove systemd units. - return error; } } // namespace updater
diff --git a/chrome/updater/linux/systemd_util.cc b/chrome/updater/linux/systemd_util.cc new file mode 100644 index 0000000..9c9f767 --- /dev/null +++ b/chrome/updater/linux/systemd_util.cc
@@ -0,0 +1,242 @@ +// Copyright 2023 The Chromium Authors +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "chrome/updater/linux/systemd_util.h" + +#include <fcntl.h> +#include <sys/un.h> +#include <systemd/sd-daemon.h> +#include <unistd.h> +#include <utility> + +#include "base/base_paths.h" +#include "base/command_line.h" +#include "base/files/file_descriptor_watcher_posix.h" +#include "base/files/file_path.h" +#include "base/files/file_util.h" +#include "base/files/scoped_file.h" +#include "base/functional/bind.h" +#include "base/logging.h" +#include "base/path_service.h" +#include "base/posix/eintr_wrapper.h" +#include "base/process/launch.h" +#include "base/process/process.h" +#include "base/strings/stringprintf.h" +#include "base/threading/thread_restrictions.h" +#include "chrome/updater/constants.h" +#include "chrome/updater/linux/ipc_constants.h" +#include "chrome/updater/updater_branding.h" +#include "chrome/updater/util/posix_util.h" + +namespace updater { +// Allows the utility functions below to join processes. To avoid overzealously +// granting access to |base::ScopedAllowBaseSyncPrimitives|, this class must +// continue to live in a `.cc`. +class SystemctlLauncherScopedAllowBaseSyncPrimitives { + private: + base::ScopedAllowBaseSyncPrimitives allow_wait; +}; + +namespace { +// Location of system-scoped unit files. +const base::FilePath kSystemUnitDirectory("/etc/systemd/system"); +// Location of user-scoped unit files relative to the user's home directory. +const base::FilePath kUserUnitRelativeDirectory(".local/share/systemd/user"); +// Systemd unit names. +constexpr char kUpdaterServiceName[] = PRODUCT_FULLNAME_STRING ".service"; +constexpr char kUpdaterSocketName[] = PRODUCT_FULLNAME_STRING ".socket"; +// Systemd unit definition templates. +constexpr char kUpdaterServiceDefinitionTemplate[] = + "[Service]\n" + "ExecStart=%s\n" + "KillMode=process"; // Ensure systemd does not kill child processes when + // the main process exits. +constexpr char kUpdaterSocketDefinitionTemplate[] = + "[Socket]\n" + "ListenStream=%s\n" + "\n" + "[Install]\n" + "WantedBy=sockets.target"; + +// Returns the path to the systemd unit directory for the given scope. +absl::optional<base::FilePath> GetUnitDirectory(UpdaterScope scope) { + base::FilePath unit_dir; + switch (scope) { + case UpdaterScope::kUser: + if (!base::PathService::Get(base::DIR_HOME, &unit_dir)) { + return absl::nullopt; + } + unit_dir = unit_dir.Append(kUserUnitRelativeDirectory); + + if (!base::CreateDirectory(unit_dir)) { + return absl::nullopt; + } + break; + case UpdaterScope::kSystem: + unit_dir = base::FilePath(kSystemUnitDirectory); + } + return unit_dir; +} + +// Returns the command `systemctl` with or without the `--user` flag. +base::CommandLine GetBaseSystemctlCommand(UpdaterScope scope) { + base::CommandLine command({"systemctl"}); + if (scope == UpdaterScope::kUser) { + command.AppendSwitch("user"); + } + return command; +} + +// Launch the given command line with stdin, stdout, and stderr remapped to +// /dev/null. +void LaunchWithRemaps(base::CommandLine command) { + base::LaunchOptions options; + + base::ScopedFD null_fd(HANDLE_EINTR(open("/dev/null", O_RDWR))); + if (null_fd.is_valid()) { + options.fds_to_remap.emplace_back(null_fd.get(), STDIN_FILENO); + options.fds_to_remap.emplace_back(null_fd.get(), STDOUT_FILENO); + options.fds_to_remap.emplace_back(null_fd.get(), STDERR_FILENO); + } + + base::Process proc = base::LaunchProcess(command, options); + if (!proc.IsValid()) { + VLOG(1) << "Could not launch " << command.GetCommandLineString(); + } else { + SystemctlLauncherScopedAllowBaseSyncPrimitives allow_wait; + proc.WaitForExit(nullptr); + } +} + +// Runs the daemon-reload command to have systemd reload unit files. +void ReloadUnitFiles(UpdaterScope scope) { + base::CommandLine command = GetBaseSystemctlCommand(scope); + command.AppendArg("daemon-reload"); + LaunchWithRemaps(command); +} + +// Enables the socket unit to be created and managed by systemd at boot. +void EnableSocketUnit(UpdaterScope scope) { + base::CommandLine command = GetBaseSystemctlCommand(scope); + command.AppendArg("enable"); + command.AppendSwitch("now"); + command.AppendArg(kUpdaterSocketName); + + LaunchWithRemaps(command); +} + +// Ensures that the update service and socket are stopped. +void StopService(UpdaterScope scope) { + base::CommandLine command = GetBaseSystemctlCommand(scope); + command.AppendArg("stop"); + command.AppendArg(kUpdaterServiceName); + command.AppendArg(kUpdaterSocketName); + LaunchWithRemaps(command); +} + +// Writes the contents of |unit_definition| to |unit_path|. Returns true on +// success. +[[nodiscard]] bool InstallSystemdUnit(base::FilePath unit_path, + std::string unit_definition) { + base::File unit_file(unit_path, + base::File::FLAG_WRITE | base::File::FLAG_CREATE_ALWAYS); + return unit_file.IsValid() && unit_file.Write(0, unit_definition.c_str(), + unit_definition.size()) != -1; +} + +// Returns the command line which should be used to start the updater service. +std::string GetLauncherCommandLine(UpdaterScope scope, + base::FilePath launcher) { + base::CommandLine command(launcher); + command.AppendSwitch(kServerSwitch); + command.AppendSwitchASCII(kServerServiceSwitch, + kServerUpdateServiceSwitchValue); + if (scope == UpdaterScope::kSystem) { + command.AppendSwitch(kSystemSwitch); + } + command.AppendSwitch(kEnableLoggingSwitch); + command.AppendSwitchASCII(kLoggingModuleSwitch, kLoggingModuleSwitchValue); + + return command.GetCommandLineString(); +} + +} // namespace + +SystemdService::SystemdService() { + if (sd_listen_fds(0) == 1) { + server_socket_ = base::ScopedFD(SD_LISTEN_FDS_START + 0); + read_watcher_controller_ = base::FileDescriptorWatcher::WatchReadable( + server_socket_.get(), + base::BindRepeating(&SystemdService::OnSocketReadable, + weak_factory_.GetWeakPtr())); + } +} + +SystemdService::~SystemdService() = default; + +void SystemdService::OnSocketReadable() { + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); + DCHECK(server_socket_.is_valid()); + + base::ScopedFD remote_fd(accept(server_socket_.get(), nullptr, nullptr)); + if (!remote_fd.is_valid()) { + VPLOG(1) << "Failed to accept connection on activation socket."; + } +} + +bool InstallSystemdUnits(UpdaterScope scope) { + absl::optional<base::FilePath> launcher_path = + GetUpdateServiceLauncherPath(scope); + absl::optional<base::FilePath> unit_dir = GetUnitDirectory(scope); + if (!launcher_path || !unit_dir) { + return false; + } + + if (!InstallSystemdUnit( + unit_dir->AppendASCII(kUpdaterServiceName), + base::StringPrintf( + kUpdaterServiceDefinitionTemplate, + GetLauncherCommandLine(scope, *launcher_path).c_str())) || + !InstallSystemdUnit( + unit_dir->AppendASCII(kUpdaterSocketName), + base::StringPrintf( + kUpdaterSocketDefinitionTemplate, + GetActivationSocketPath(scope).AsUTF8Unsafe().c_str()))) { + // Avoid a partial installation. + UninstallSystemdUnits(scope); + return false; + } + + ReloadUnitFiles(scope); + EnableSocketUnit(scope); + return true; +} + +bool UninstallSystemdUnits(UpdaterScope scope) { + absl::optional<base::FilePath> unit_dir = GetUnitDirectory(scope); + if (!unit_dir) { + return false; + } + + StopService(scope); + + // Note: It is considered successful to attempt to delete units that do not + // exist. + bool success = base::DeleteFile(unit_dir->AppendASCII(kUpdaterServiceName)) && + base::DeleteFile(unit_dir->AppendASCII(kUpdaterSocketName)); + ReloadUnitFiles(scope); + return success; +} + +bool SystemdUnitsInstalled(UpdaterScope scope) { + absl::optional<base::FilePath> unit_dir = GetUnitDirectory(scope); + if (!unit_dir) { + return false; + } + + return base::PathExists(unit_dir->AppendASCII(kUpdaterServiceName)) || + base::PathExists(unit_dir->AppendASCII(kUpdaterSocketName)); +} + +} // namespace updater
diff --git a/chrome/updater/linux/systemd_util.h b/chrome/updater/linux/systemd_util.h new file mode 100644 index 0000000..c2dedd9 --- /dev/null +++ b/chrome/updater/linux/systemd_util.h
@@ -0,0 +1,66 @@ +// Copyright 2023 The Chromium Authors +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef CHROME_UPDATER_LINUX_SYSTEMD_UTIL_H_ +#define CHROME_UPDATER_LINUX_SYSTEMD_UTIL_H_ + +#include "base/files/file_descriptor_watcher_posix.h" +#include "base/files/scoped_file.h" +#include "base/memory/weak_ptr.h" +#include "base/sequence_checker.h" +#include "chrome/updater/updater_scope.h" + +namespace updater { + +// If the updater is started as a systemd service it can be launched by +// activity on a dedicated "activation" socket. This provides a means for +// unprivileged users to request systemd to start the update service as root. +// While the activation socket is not used for any IPC, the daemon process must +// accept connections. Otherwise, when the server shuts down normally, systemd +// will detect that there are pending connections on the socket and restart the +// server indefinitely. +// Thus, the |SystemdService| class is a utility which accepts connections on +// the activation socket (if one was provided to this process) and hangs up +// immediately. +class SystemdService { + public: + // SystemdService must be created on a thread capable of blocking IO. It is + // suggested that this object be wrapped in a |base::SequenceBound|. + SystemdService(); + SystemdService(const SystemdService&) = delete; + SystemdService operator=(const SystemdService&) = delete; + ~SystemdService(); + + private: + // Function signature for sd_listen_fds. + using ListenFDsFunction = int (*)(int); + + void OnSocketReadable(); + + SEQUENCE_CHECKER(sequence_checker_); + // Note that |server_socket_| must outlive |read_watcher_controller_|; + // otherwise a bad file descriptor error will occur at destruction. + base::ScopedFD server_socket_ GUARDED_BY_CONTEXT(sequence_checker_); + std::unique_ptr<base::FileDescriptorWatcher::Controller> + read_watcher_controller_ GUARDED_BY_CONTEXT(sequence_checker_); + + base::WeakPtrFactory<SystemdService> weak_factory_{this}; +}; + +// Installs two systemd units: A service which points to the updater launcher +// and a socket which can activate the updater. When clients connect to the +// socket, systemd will ensure that the service is running. This allows non-root +// users to start the updater server as root for system-scope installations. +// Returns true on success. +[[nodiscard]] bool InstallSystemdUnits(UpdaterScope scope); + +// Perform a best-effort uninstallation of systemd units. Returns true on +// success. +bool UninstallSystemdUnits(UpdaterScope scope); + +// Checks for the existence of any updater systemd units. +[[nodiscard]] bool SystemdUnitsInstalled(UpdaterScope scope); +} // namespace updater + +#endif // CHROME_UPDATER_LINUX_SYSTEMD_UTIL_H_
diff --git a/chrome/updater/test/integration_tests_linux.cc b/chrome/updater/test/integration_tests_linux.cc index 7f2d31a..864b042 100644 --- a/chrome/updater/test/integration_tests_linux.cc +++ b/chrome/updater/test/integration_tests_linux.cc
@@ -5,13 +5,13 @@ #include <string> #include "base/base_paths.h" +#include "base/command_line.h" #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/functional/bind.h" #include "base/logging.h" #include "base/notreached.h" #include "base/path_service.h" -#include "base/process/launch.h" #include "base/process/process_iterator.h" #include "base/run_loop.h" #include "base/test/bind.h" @@ -19,12 +19,15 @@ #include "chrome/updater/activity_impl_util_posix.h" #include "chrome/updater/constants.h" #include "chrome/updater/external_constants_builder.h" +#include "chrome/updater/linux/systemd_util.h" #include "chrome/updater/registration_data.h" #include "chrome/updater/service_proxy_factory.h" #include "chrome/updater/test/integration_tests_impl.h" #include "chrome/updater/update_service.h" +#include "chrome/updater/updater_branding.h" #include "chrome/updater/updater_scope.h" #include "chrome/updater/util/linux_util.h" +#include "chrome/updater/util/posix_util.h" #include "chrome/updater/util/util.h" #include "components/crx_file/crx_verifier.h" #include "testing/gtest/include/gtest/gtest.h" @@ -61,14 +64,18 @@ return path->Append(GetExecutableRelativePath()); } -bool WaitForUpdaterExit(UpdaterScope /*scope*/) { - return WaitFor(base::BindRepeating([]() { - return !base::NamedProcessIterator(kExecutableName, nullptr) - .NextProcessEntry(); - }), - base::BindLambdaForTesting([]() { - VLOG(0) << "Still waiting for updater to exit..."; - })); +bool WaitForUpdaterExit(UpdaterScope scope) { + return WaitFor( + base::BindRepeating( + [](UpdaterScope scope) { + return !base::NamedProcessIterator(kExecutableName, nullptr) + .NextProcessEntry() && + !base::NamedProcessIterator(kLauncherName, nullptr) + .NextProcessEntry(); + }, + scope), + base::BindLambdaForTesting( + []() { VLOG(0) << "Still waiting for updater to exit..."; })); } absl::optional<base::FilePath> GetDataDirPath(UpdaterScope scope) { @@ -107,6 +114,8 @@ if (path) { EXPECT_TRUE(base::DeletePathRecursively(*path)); } + + EXPECT_TRUE(UninstallSystemdUnits(scope)); } void ExpectClean(UpdaterScope scope) { @@ -122,6 +131,8 @@ EXPECT_TRUE(base::PathExists(path->AppendASCII("updater.log"))); } } + + EXPECT_FALSE(SystemdUnitsInstalled(scope)); } void EnterTestMode(const GURL& url) {
diff --git a/chrome/updater/util/linux_util.cc b/chrome/updater/util/linux_util.cc index 03badf2..2f0bcd6 100644 --- a/chrome/updater/util/linux_util.cc +++ b/chrome/updater/util/linux_util.cc
@@ -6,7 +6,6 @@ #include "base/base_paths.h" #include "base/files/file_path.h" -#include "base/files/file_util.h" #include "base/path_service.h" #include "chrome/updater/constants.h" #include "chrome/updater/updater_branding.h" @@ -62,7 +61,7 @@ absl::optional<base::FilePath> GetUpdateServiceLauncherPath( UpdaterScope scope) { absl::optional<base::FilePath> path = GetBaseInstallDirectory(scope); - return path ? absl::optional<base::FilePath>(path->AppendASCII("launcher")) + return path ? absl::optional<base::FilePath>(path->AppendASCII(kLauncherName)) : absl::nullopt; }
diff --git a/chrome/updater/util/linux_util.h b/chrome/updater/util/linux_util.h index 86ac9fab..a526898 100644 --- a/chrome/updater/util/linux_util.h +++ b/chrome/updater/util/linux_util.h
@@ -14,6 +14,10 @@ namespace updater { enum class UpdaterScope; +// Filename of the non side-by-side launcher. The file is a hardlink to the +// qualified version of the updater. +constexpr char kLauncherName[] = "launcher"; + // For user installations returns a path to the "~/.local" for the logged in // user. For system installations returns "/opt/". absl::optional<base::FilePath> GetApplicationDataDirectory(UpdaterScope scope);
diff --git a/chromeos/ash/components/drivefs/drivefs_pin_manager.cc b/chromeos/ash/components/drivefs/drivefs_pin_manager.cc index a93d600..036c0b6 100644 --- a/chromeos/ash/components/drivefs/drivefs_pin_manager.cc +++ b/chromeos/ash/components/drivefs/drivefs_pin_manager.cc
@@ -9,6 +9,7 @@ #include <utility> #include <vector> +#include "base/files/file_path.h" #include "base/functional/bind.h" #include "base/functional/callback_forward.h" #include "base/logging.h" @@ -237,7 +238,7 @@ std::ostream& operator<<(std::ostream& out, HumanReadableSize size) { int64_t i = static_cast<int64_t>(size); if (i == 0) { - return out << '0'; + return out << "zilch"; } if (i < 0) { @@ -249,7 +250,7 @@ static const base::NoDestructor<std::locale> with_separators( std::locale::classic(), new NumPunct); std::locale old_locale = out.imbue(*with_separators); - out << i; + out << i << " bytes"; out.imbue(std::move(old_locale)); } @@ -301,8 +302,8 @@ DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); // Emplace an item with no progress (yet). The progress values will get // updated in the `OnSyncingStatusUpdate`. - const auto [it, ok] = - files_.try_emplace(id, Progress{.path = path, .total = expected_size}); + const auto [it, ok] = files_to_track_.try_emplace( + id, Progress{.path = path, .total = expected_size}); DCHECK_EQ(id, it->first); if (ok) { VLOG(3) << "Added " << id << " " << Quote(path) << " to the tracked files"; @@ -320,7 +321,7 @@ int64_t bytes_transferred) { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); - const Files::node_type node = files_.extract(id); + const Files::node_type node = files_to_track_.extract(id); if (!node) { return false; } @@ -366,8 +367,8 @@ return false; } - const Files::iterator it = files_.find(id); - if (it == files_.end()) { + const Files::iterator it = files_to_track_.find(id); + if (it == files_to_track_.end()) { VLOG(3) << "Not tracked: " << id << " " << path; return false; } @@ -409,8 +410,8 @@ const std::string& path) { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); - const Files::iterator it = files_.find(id); - if (it == files_.end()) { + const Files::iterator it = files_to_track_.find(id); + if (it == files_to_track_.end()) { VLOG(3) << "Not tracked: " << id << " " << path; return false; } @@ -465,7 +466,8 @@ should_pin_ = should_pin; timer_ = base::ElapsedTimer(); complete_callback_ = std::move(complete_callback); - files_.clear(); + files_to_pin_.clear(); + files_to_track_.clear(); progress_ = {.stage = SetupStage::kCalculatingFreeSpace}; NotifyProgress(); @@ -505,17 +507,33 @@ DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); if (error != drive::FILE_ERROR_OK || !items) { - LOG(ERROR) << "Cannot list files for space calculation: " << error; + LOG(ERROR) << "Cannot list files: " << error; return Complete(SetupStage::kCannotRetrieveSearchResults); } if (items->empty()) { + search_query_.reset(); VLOG(1) << "Calculated required space in " << timer_.Elapsed().InMilliseconds() << " ms"; VLOG(1) << "Free space: " << HumanReadableSize(progress_.free_space); VLOG(1) << "Required space: " << HumanReadableSize(progress_.required_space); VLOG(1) << "To download: " << HumanReadableSize(progress_.total_bytes); + VLOG(1) << "To pin: " << files_to_pin_.size() << " files"; + + // The free space should not go below this limit. + const int64_t margin = cryptohome::kMinFreeSpaceInBytes; + const int64_t required_with_margin = progress_.required_space + margin; + + if (progress_.free_space < required_with_margin) { + LOG(ERROR) << "Not enough space: Required: " + << HumanReadableSize(progress_.required_space) + << ", Required plus margin: " + << HumanReadableSize(required_with_margin) + << ", Free: " << HumanReadableSize(progress_.free_space); + return Complete(SetupStage::kNotEnoughSpace); + } + return StartPinning(); } @@ -541,19 +559,12 @@ const int64_t block_size = 4096; const int64_t block_count = (size + (block_size - 1)) / block_size; progress_.required_space += block_count * block_size; - } - // The free space should not go below this limit. - const int64_t storage_floor = cryptohome::kMinFreeSpaceInBytes; - const int64_t required_with_margin = progress_.required_space + storage_floor; - - if (progress_.free_space < required_with_margin) { - LOG(ERROR) << "Not enough space: Required: " - << HumanReadableSize(progress_.required_space) - << ", Required plus margin: " - << HumanReadableSize(required_with_margin) - << ", Free: " << HumanReadableSize(progress_.free_space); - return Complete(SetupStage::kNotEnoughSpace); + const auto [it, ok] = files_to_pin_.try_emplace( + id, Progress{.path = path.value(), .total = size}); + LOG_IF(ERROR, !ok) << "Cannot add " << id << " " << Quote(path) + << " to the files to pin: Conflicting entry " + << it->second; } NotifyProgress(); @@ -568,18 +579,18 @@ DCHECK(!InProgress(stage)); progress_.stage = stage; if (stage == SetupStage::kSuccess) { + LOG_IF(ERROR, progress_.errors > 0) + << "Failed to pin " << progress_.errors << " files"; + VLOG(1) << "Pinned " << progress_.pinned_files << " files and downloaded " + << HumanReadableSize(progress_.transferred_bytes) << " in " + << timer_.Elapsed().InMilliseconds() << " ms"; + VLOG(2) << "Useful events: " << progress_.useful_events; + VLOG(2) << "Duplicated events: " << progress_.duplicated_events; VLOG(1) << "Finished with success"; } else { LOG(ERROR) << "Finished with error: " << stage; } - LOG_IF(ERROR, progress_.errors > 0) - << "Failed to pin " << progress_.errors << " files"; - VLOG(1) << "Pinned " << progress_.pinned_files << " files in " - << timer_.Elapsed().InMilliseconds() << " ms"; - VLOG(2) << "Useful events: " << progress_.useful_events; - VLOG(2) << "Duplicated events: " << progress_.duplicated_events; - NotifyProgress(); weak_ptr_factory_.InvalidateWeakPtrs(); search_query_.reset(); @@ -595,68 +606,51 @@ return Complete(SetupStage::kSuccess); } - // Restart the search query. - search_query_.reset(); - progress_.stage = SetupStage::kSyncing; NotifyProgress(); - drivefs_interface_->StartSearchQuery( - search_query_.BindNewPipeAndPassReceiver(), CreateMyDriveQuery()); - search_query_->GetNextPage( - base::BindOnce(&DriveFsPinManager::OnSearchResultsForPinning, - weak_ptr_factory_.GetWeakPtr())); - // Start a periodic task that removes any files that are already available - // offline from the `in_progress_items_` map. + // offline from the `files_to_track_` map. base::SequencedTaskRunner::GetCurrentDefault()->PostDelayedTask( FROM_HERE, base::BindOnce(&DriveFsPinManager::CheckUnstartedFiles, weak_ptr_factory_.GetWeakPtr()), kPeriodicRemovalInterval); + + PinSomeFiles(); } -void DriveFsPinManager::OnSearchResultsForPinning( - const drive::FileError error, - const absl::optional<std::vector<mojom::QueryItemPtr>> items) { +void DriveFsPinManager::PinSomeFiles() { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); - if (error != drive::FILE_ERROR_OK || !items) { - LOG(ERROR) << "Cannot list files to pin: " << error; - return Complete(SetupStage::kCannotRetrieveSearchResults); - } - - if (items->empty()) { + if (files_to_track_.empty() && files_to_pin_.empty()) { return Complete(SetupStage::kSuccess); } - // TODO(b/259454320): Free disk space should be retrieved here and after the - // batch of pinning operations has completed to identify if any other - // operations writing to disk might cause cause the free space to get used - // faster than anticipated. - for (const mojom::QueryItemPtr& item : *items) { - DCHECK(item); - const base::FilePath& path = item->path; - DCHECK(item->metadata); - const mojom::FileMetadata& md = *item->metadata; - const StableId id = StableId(md.stable_id); - VLOG(3) << "Considering " << id << " " << Quote(path) << " " << Quote(md); - - if (!CanPinItem(md, item->path)) { - continue; - } - - VLOG(2) << "Pinning " << id << " " << Quote(path); - Add(id, path.value(), GetSize(md)); + while (files_to_track_.size() < 50 && !files_to_pin_.empty()) { + Files::node_type node = files_to_pin_.extract(files_to_pin_.begin()); + DCHECK(node); + const StableId id = node.key(); + const Progress& progress = node.mapped(); + const std::string& path = progress.path; // TODO(b/264932437) Use stable ID instead of path. + VLOG(2) << "Pinning " << id << " " << Quote(path); drivefs_interface_->SetPinned( - path, true, + base::FilePath(path), true, base::BindOnce(&DriveFsPinManager::OnFilePinned, - weak_ptr_factory_.GetWeakPtr(), id, path.value())); + weak_ptr_factory_.GetWeakPtr(), id, path)); + + const Files::insert_return_type ir = + files_to_track_.insert(std::move(node)); + DCHECK(ir.inserted) << " for " << id << " " << path; } - MaybeContinueSearch(); + VLOG(1) << "Progress " + << (100 * progress_.transferred_bytes / progress_.total_bytes) + << "%: synced " << HumanReadableSize(progress_.transferred_bytes) + << " and " << progress_.pinned_files << " files, syncing " + << files_to_track_.size() << " files"; } void DriveFsPinManager::OnFilePinned(const StableId id, @@ -669,6 +663,7 @@ if (Remove(id, path, 0)) { progress_.errors++; NotifyProgress(); + PinSomeFiles(); } return; } @@ -749,22 +744,7 @@ LOG(ERROR) << "Unexpected event type: " << Quote(*event); } - MaybeContinueSearch(); -} - -void DriveFsPinManager::MaybeContinueSearch() { - DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); - - if (!files_.empty()) { - VLOG(1) << "Syncing " << files_.size() << " files"; - return; - } - - VLOG(1) << "Getting next batch of items"; - DCHECK(search_query_); - search_query_->GetNextPage( - base::BindOnce(&DriveFsPinManager::OnSearchResultsForPinning, - weak_ptr_factory_.GetWeakPtr())); + PinSomeFiles(); } void DriveFsPinManager::OnUnmounted() {} @@ -805,7 +785,7 @@ void DriveFsPinManager::CheckUnstartedFiles() { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); - for (const auto& [id, progress] : files_) { + for (const auto& [id, progress] : files_to_track_) { if (!progress.in_progress) { const std::string& path = progress.path; VLOG(2) << "Checking unstarted " << id << " " << Quote(path); @@ -817,13 +797,13 @@ } } - MaybeContinueSearch(); - base::SequencedTaskRunner::GetCurrentDefault()->PostDelayedTask( FROM_HERE, base::BindOnce(&DriveFsPinManager::CheckUnstartedFiles, weak_ptr_factory_.GetWeakPtr()), kPeriodicRemovalInterval); + + PinSomeFiles(); } void DriveFsPinManager::OnMetadataRetrieved( @@ -844,6 +824,7 @@ VLOG(1) << "Stopped tracking " << id << " " << Quote(path); progress_.errors++; NotifyProgress(); + PinSomeFiles(); return; } @@ -868,6 +849,7 @@ progress_.pinned_files++; NotifyProgress(); + PinSomeFiles(); } } // namespace drivefs::pinning
diff --git a/chromeos/ash/components/drivefs/drivefs_pin_manager.h b/chromeos/ash/components/drivefs/drivefs_pin_manager.h index c73c0d8..7ae5ee1 100644 --- a/chromeos/ash/components/drivefs/drivefs_pin_manager.h +++ b/chromeos/ash/components/drivefs/drivefs_pin_manager.h
@@ -231,10 +231,6 @@ // space, the files to pin can be batch pinned. void StartPinning(); - void OnSearchResultsForPinning( - drive::FileError error, - absl::optional<std::vector<drivefs::mojom::QueryItemPtr>> items); - // After a file has been pinned, this ensures the in progress map has the item // emplaced. Note the file being pinned is just an update in drivefs, not the // actually completion of the file being downloaded, that is monitored via @@ -257,8 +253,8 @@ drive::FileError error, mojom::FileMetadataPtr metadata); - // If there are no remaining items left, get the next search query page. - void MaybeContinueSearch(); + // Start or continue pinning some files. + void PinSomeFiles(); // Report progress to all the observers. void NotifyProgress(); @@ -286,7 +282,8 @@ // Map that tracks the in-progress files indexed by their stable ID. using Files = std::map<StableId, Progress>; - Files files_ GUARDED_BY_CONTEXT(sequence_checker_); + Files files_to_pin_ GUARDED_BY_CONTEXT(sequence_checker_); + Files files_to_track_ GUARDED_BY_CONTEXT(sequence_checker_); base::WeakPtrFactory<DriveFsPinManager> weak_ptr_factory_{this}; };
diff --git a/chromeos/ash/components/drivefs/drivefs_pin_manager_unittest.cc b/chromeos/ash/components/drivefs/drivefs_pin_manager_unittest.cc index acce1a1..49d2c4c 100644 --- a/chromeos/ash/components/drivefs/drivefs_pin_manager_unittest.cc +++ b/chromeos/ash/components/drivefs/drivefs_pin_manager_unittest.cc
@@ -35,6 +35,8 @@ // Shorthand way to represent drive files with the information that is relevant // for the pinning manager. struct DriveItem { + static int64_t counter; + int64_t stable_id = ++counter; int64_t size; base::FilePath path; bool pinned; @@ -43,6 +45,8 @@ bool status_update = true; }; +int64_t DriveItem::counter = 0; + // An action that takes a `std::vector<DriveItem>` and is used to update the // items that are returned via the `GetNextPage` callback. These shorthand items // are converted to mojo types that represent the actual types returned. @@ -141,15 +145,16 @@ } mojom::SyncingStatusPtr CreateSyncingStatusUpdate( - const std::vector<DriveItem> items) { + const std::vector<DriveItem>& items) { mojom::SyncingStatusPtr status = mojom::SyncingStatus::New(); std::vector<mojom::ItemEventPtr> item_events; - for (const auto& item : items) { + for (const DriveItem& item : items) { if (item.pinned || !item.status_update) { continue; } mojom::ItemEventPtr item_event = mojom::ItemEvent::New(); + item_event->stable_id = item.stable_id; item_event->path = item.path.value(); item_event->state = mojom::ItemEvent::State::kQueued; item_event->bytes_to_transfer = item.size; @@ -202,7 +207,7 @@ run_loop.Run(); } -TEST_F(DriveFsPinManagerTest, OnFreeDiskSpaceFailingShouldNotSearchDrive) { +TEST_F(DriveFsPinManagerTest, OnFreeSpaceFailingShouldNotSearchDrive) { base::MockOnceCallback<void(SetupStage)> mock_callback; base::RunLoop run_loop; @@ -234,7 +239,7 @@ EXPECT_CALL(mock_callback, Run(SetupStage::kCannotRetrieveSearchResults)) .WillOnce(RunClosure(run_loop.QuitClosure())); EXPECT_CALL(mock_free_space_, GetFreeSpace(gcache_dir_, _)) - .WillOnce(RunOnceCallback<1>(1024)); // 1 MB. + .WillOnce(RunOnceCallback<1>(1 << 30)); // 1 GB. auto manager = std::make_unique<DriveFsPinManager>( /*enabled=*/true, temp_dir_.GetPath(), &mock_drivefs_, @@ -255,7 +260,7 @@ EXPECT_CALL(mock_callback, Run(SetupStage::kCannotRetrieveSearchResults)) .WillOnce(RunClosure(run_loop.QuitClosure())); EXPECT_CALL(mock_free_space_, GetFreeSpace(gcache_dir_, _)) - .WillOnce(RunOnceCallback<1>(1024)); // 1 MB. + .WillOnce(RunOnceCallback<1>(1 << 30)); // 1 GB. auto manager = std::make_unique<DriveFsPinManager>( /*enabled=*/true, temp_dir_.GetPath(), &mock_drivefs_, @@ -265,23 +270,27 @@ run_loop.Run(); } -TEST_F(DriveFsPinManagerTest, IfPinnedItemSizeExceedsFreeDiskSpaceShouldFail) { +TEST_F(DriveFsPinManagerTest, IfPinnedItemSizeExceedsFreeSpaceShouldFail) { base::MockOnceCallback<void(SetupStage)> mock_callback; base::RunLoop run_loop; - // Mock Drive search to return 2 unpinned files that total to 1.5 MB which - // exceeds the mocked available space of 1 MB. - std::vector<DriveItem> expected_drive_items = {{.size = 768}, {.size = 768}}; + // Mock Drive search to return 2 unpinned files that total to 600 MB. The + // available space of 1 GB is not enough if you take in account the 512 MB + // margin. + std::vector<DriveItem> expected_drive_items = {{.size = 300 << 20}, + {.size = 300 << 20}}; EXPECT_CALL(mock_drivefs_, OnStartSearchQuery(_)).Times(1); EXPECT_CALL(mock_drivefs_, OnGetNextPage(_)) .WillOnce(DoAll(PopulateSearchItems(expected_drive_items), + Return(drive::FileError::FILE_ERROR_OK))) + .WillOnce(DoAll(PopulateNoSearchItems(), Return(drive::FileError::FILE_ERROR_OK))); EXPECT_CALL(mock_callback, Run(SetupStage::kNotEnoughSpace)) .WillOnce(RunClosure(run_loop.QuitClosure())); EXPECT_CALL(mock_free_space_, GetFreeSpace(gcache_dir_, _)) - .WillOnce(RunOnceCallback<1>(1024)); // 1 MB. + .WillOnce(RunOnceCallback<1>(1 << 30)); // 1 GB. auto manager = std::make_unique<DriveFsPinManager>( /*enabled=*/true, temp_dir_.GetPath(), &mock_drivefs_, @@ -314,7 +323,7 @@ EXPECT_CALL(mock_callback, Run(SetupStage::kSuccess)) .WillOnce(RunClosure(run_loop.QuitClosure())); EXPECT_CALL(mock_free_space_, GetFreeSpace(gcache_dir_, _)) - .WillOnce(RunOnceCallback<1>(1024)); // 1 MB. + .WillOnce(RunOnceCallback<1>(1 << 30)); // 1 GB. EXPECT_CALL(mock_drivefs_, SetPinned(_, true, _)) // Mock the first file to successfully get pinned. .WillOnce(RunOnceCallback<2>(drive::FILE_ERROR_OK)) @@ -360,7 +369,7 @@ .WillOnce(DoAll(PopulateSearchItems(expected_drive_items), Return(drive::FileError::FILE_ERROR_OK))); EXPECT_CALL(mock_free_space_, GetFreeSpace(gcache_dir_, _)) - .WillOnce(RunOnceCallback<1>(1024)); // 1 MB. + .WillOnce(RunOnceCallback<1>(1 << 30)); // 1 GB. EXPECT_CALL(mock_drivefs_, SetPinned(_, true, _)) .Times(2) .WillOnce(RunOnceCallback<2>(drive::FILE_ERROR_OK)) @@ -439,7 +448,7 @@ .WillOnce(DoAll(PopulateSearchItems(expected_drive_items), Return(drive::FileError::FILE_ERROR_OK))); EXPECT_CALL(mock_free_space_, GetFreeSpace(gcache_dir_, _)) - .WillOnce(RunOnceCallback<1>(1024)); // 1 MB. + .WillOnce(RunOnceCallback<1>(1 << 30)); // 1 GB. EXPECT_CALL(mock_drivefs_, SetPinned(_, true, _)) .Times(2) .WillOnce(RunOnceCallback<2>(drive::FILE_ERROR_OK)) @@ -525,7 +534,7 @@ .WillOnce(DoAll(PopulateSearchItems(expected_drive_items), Return(drive::FileError::FILE_ERROR_OK))); EXPECT_CALL(mock_free_space_, GetFreeSpace(gcache_dir_, _)) - .WillOnce(RunOnceCallback<1>(1024)); // 1 MB. + .WillOnce(RunOnceCallback<1>(1 << 30)); // 1 GB. EXPECT_CALL(mock_drivefs_, SetPinned(_, true, _)) .Times(1) // `RunOnceCallback` can't be chained together in a `DoAll` action
diff --git a/chromeos/ash/components/phonehub/phone_hub_manager_impl.cc b/chromeos/ash/components/phonehub/phone_hub_manager_impl.cc index 72d90c7..93b57452 100644 --- a/chromeos/ash/components/phonehub/phone_hub_manager_impl.cc +++ b/chromeos/ash/components/phonehub/phone_hub_manager_impl.cc
@@ -35,6 +35,7 @@ #include "chromeos/ash/components/phonehub/phone_model.h" #include "chromeos/ash/components/phonehub/phone_status_processor.h" #include "chromeos/ash/components/phonehub/ping_manager_impl.h" +#include "chromeos/ash/components/phonehub/public/cpp/attestation_certificate_generator.h" #include "chromeos/ash/components/phonehub/recent_apps_interaction_handler_impl.h" #include "chromeos/ash/components/phonehub/screen_lock_manager_impl.h" #include "chromeos/ash/components/phonehub/tether_controller_impl.h" @@ -61,7 +62,9 @@ secure_channel::SecureChannelClient* secure_channel_client, std::unique_ptr<BrowserTabsModelProvider> browser_tabs_model_provider, std::unique_ptr<CameraRollDownloadManager> camera_roll_download_manager, - const base::RepeatingClosure& show_multidevice_setup_dialog_callback) + const base::RepeatingClosure& show_multidevice_setup_dialog_callback, + std::unique_ptr<AttestationCertificateGenerator> + attestation_certificate_generator) : icon_decoder_(std::make_unique<IconDecoderImpl>()), connection_manager_( std::make_unique<secure_channel::ConnectionManagerImpl>( @@ -83,12 +86,12 @@ message_sender_( std::make_unique<MessageSenderImpl>(connection_manager_.get())), phone_model_(std::make_unique<MutablePhoneModel>()), - cros_state_sender_( - std::make_unique<CrosStateSender>(message_sender_.get(), - connection_manager_.get(), - multidevice_setup_client, - phone_model_.get(), - nullptr)), + cros_state_sender_(std::make_unique<CrosStateSender>( + message_sender_.get(), + connection_manager_.get(), + multidevice_setup_client, + phone_model_.get(), + std::move(attestation_certificate_generator))), do_not_disturb_controller_(std::make_unique<DoNotDisturbControllerImpl>( message_sender_.get(), user_action_recorder_.get())),
diff --git a/chromeos/ash/components/phonehub/phone_hub_manager_impl.h b/chromeos/ash/components/phonehub/phone_hub_manager_impl.h index 86c71f3..f2685486 100644 --- a/chromeos/ash/components/phonehub/phone_hub_manager_impl.h +++ b/chromeos/ash/components/phonehub/phone_hub_manager_impl.h
@@ -13,6 +13,7 @@ #include "chromeos/ash/components/phonehub/feature_setup_response_processor.h" #include "chromeos/ash/components/phonehub/icon_decoder.h" #include "chromeos/ash/components/phonehub/phone_hub_manager.h" +#include "chromeos/ash/components/phonehub/public/cpp/attestation_certificate_generator.h" #include "components/keyed_service/core/keyed_service.h" class PrefService; @@ -59,7 +60,9 @@ secure_channel::SecureChannelClient* secure_channel_client, std::unique_ptr<BrowserTabsModelProvider> browser_tabs_model_provider, std::unique_ptr<CameraRollDownloadManager> camera_roll_download_manager, - const base::RepeatingClosure& show_multidevice_setup_dialog_callback); + const base::RepeatingClosure& show_multidevice_setup_dialog_callback, + std::unique_ptr<AttestationCertificateGenerator> + attestation_certificate_generator); ~PhoneHubManagerImpl() override;
diff --git a/components/browser_ui/site_settings/android/java/res/drawable/ic_person_24dp.xml b/components/browser_ui/site_settings/android/java/res/drawable/ic_person_24dp.xml index ac7697b82..fcb48e3 100644 --- a/components/browser_ui/site_settings/android/java/res/drawable/ic_person_24dp.xml +++ b/components/browser_ui/site_settings/android/java/res/drawable/ic_person_24dp.xml
@@ -12,7 +12,7 @@ android:viewportHeight="24"> <path - android:fillColor="@color/default_icon_color_secondary_dark" + android:fillColor="@color/default_icon_color_secondary_baseline" android:pathData="M12 2c-4.97 0-9 4.03-9 9 0 4.17 2.84 7.67 6.69 8.69L12 22l2.31-2.31C18.16 18.67 21 15.17 21 11c0-4.97-4.03-9-9-9zm0 2c1.66 0 3 1.34 3 3s-1.34 3-3 3-3-1.34-3-3 1.34-3 3-3zm0 14.3c-2.5 0-4.71-1.28-6-3.22 0.03 -1.99 4-3.08 6-3.08 1.99 0 5.97 1.09 6 3.08-1.29 1.94-3.5 3.22-6 3.22z" /> <path android:pathData="M0 0h24v24H0z" />
diff --git a/components/browser_ui/site_settings/android/java/res/layout/clear_data_dialog.xml b/components/browser_ui/site_settings/android/java/res/layout/clear_data_dialog.xml index bfca5f5b..a0b3f59 100644 --- a/components/browser_ui/site_settings/android/java/res/layout/clear_data_dialog.xml +++ b/components/browser_ui/site_settings/android/java/res/layout/clear_data_dialog.xml
@@ -32,7 +32,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/ic_person_24dp" - tools:ignore="ContentDescription" /> + android:importantForAccessibility="no" /> <TextView android:id="@+id/signed_out_text" android:layout_width="wrap_content" @@ -44,6 +44,7 @@ </RelativeLayout> <RelativeLayout + android:id="@+id/offline" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_below="@id/signed_out" @@ -52,8 +53,8 @@ android:id="@+id/offline_icon" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:src="@drawable/ic_offline_pin_24dp_on_light_bg" - tools:ignore="ContentDescription" /> + android:src="@drawable/ic_offline_pin_24dp" + android:importantForAccessibility="no" /> <TextView android:id="@+id/offline_text" android:layout_width="wrap_content" @@ -62,4 +63,27 @@ android:layout_centerInParent="true" android:layout_marginStart="12dp" /> </RelativeLayout> + + <RelativeLayout + android:id="@+id/ad_personalization" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_below="@id/offline" + android:layout_marginTop="12dp" + android:visibility="gone"> + <ImageView + android:id="@+id/ad_personalization_icon" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:src="@drawable/ic_data_personalization_20dp" + android:importantForAccessibility="no" /> + <TextView + android:id="@+id/ad_personalization_text" + android:text="@string/webstorage_clear_data_dialog_site_settings_remove_site_ad_personalization" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_toEndOf="@id/ad_personalization_icon" + android:layout_centerInParent="true" + android:layout_marginStart="16dp" /> + </RelativeLayout> </RelativeLayout>
diff --git a/components/browser_ui/site_settings/android/java/res/layout/clear_reset_dialog.xml b/components/browser_ui/site_settings/android/java/res/layout/clear_reset_dialog.xml index b2cfd3e..5d731e8 100644 --- a/components/browser_ui/site_settings/android/java/res/layout/clear_reset_dialog.xml +++ b/components/browser_ui/site_settings/android/java/res/layout/clear_reset_dialog.xml
@@ -5,6 +5,11 @@ found in the LICENSE file. --> +<!-- +TODO(crbug.com/1406154) - The layout may be simplified using +TextViewWithCompoundDrawables. +--> + <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" @@ -27,10 +32,20 @@ android:layout_height="wrap_content" /> <TextView - android:layout_marginTop="12dp" android:id="@+id/offline_text" - app:drawableStartCompat="@drawable/ic_offline_pin_24dp_on_light_bg" + android:layout_marginTop="12dp" + app:drawableStartCompat="@drawable/ic_offline_pin_24dp" android:drawablePadding="12dp" android:layout_width="wrap_content" android:layout_height="wrap_content" /> + + <TextView + android:id="@+id/ad_personalization_text" + android:layout_marginTop="12dp" + android:text="@string/webstorage_clear_data_dialog_site_settings_remove_site_ad_personalization" + app:drawableStartCompat="@drawable/ic_data_personalization_20dp" + android:drawablePadding="12dp" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:visibility="gone"/> </LinearLayout>
diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/AllSiteSettings.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/AllSiteSettings.java index 7aa6f55..1edb5b4 100644 --- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/AllSiteSettings.java +++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/AllSiteSettings.java
@@ -20,6 +20,7 @@ import android.view.View; import android.view.ViewGroup; import android.widget.Button; +import android.widget.RelativeLayout; import android.widget.TextView; import androidx.annotation.Nullable; @@ -200,6 +201,10 @@ TextView message = dialogView.findViewById(android.R.id.message); TextView signedOutText = dialogView.findViewById(R.id.signed_out_text); TextView offlineText = dialogView.findViewById(R.id.offline_text); + if (getSiteSettingsDelegate().isPrivacySandboxSettings4Enabled()) { + RelativeLayout adDataRow = dialogView.findViewById(R.id.ad_personalization); + adDataRow.setVisibility(View.VISIBLE); + } signedOutText.setText(R.string.webstorage_clear_data_dialog_sign_out_all_message); offlineText.setText(R.string.webstorage_clear_data_dialog_offline_message); String dialogFormattedText =
diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/ClearWebsiteStorageDialog.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/ClearWebsiteStorageDialog.java index 4c85344..745436a 100644 --- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/ClearWebsiteStorageDialog.java +++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/ClearWebsiteStorageDialog.java
@@ -7,6 +7,7 @@ import android.content.res.Configuration; import android.os.Bundle; import android.view.View; +import android.widget.RelativeLayout; import android.widget.TextView; import androidx.preference.Preference; @@ -20,18 +21,23 @@ */ public class ClearWebsiteStorageDialog extends PreferenceDialogFragmentCompat { public static final String TAG = "ClearWebsiteStorageDialog"; + private static final String SHOULD_SHOW_AD_PERSONALIZATION_ROW = + "should_show_ad_personalization_row"; private static Callback<Boolean> sCallback; // The view containing the dialog ui elements. private View mDialogView; - public static ClearWebsiteStorageDialog newInstance( - Preference preference, Callback<Boolean> callback) { + private boolean mShouldShowAdPersonalizationRow; + + public static ClearWebsiteStorageDialog newInstance(Preference preference, + Callback<Boolean> callback, boolean shouldShowAdPersonalizationRow) { ClearWebsiteStorageDialog fragment = new ClearWebsiteStorageDialog(); sCallback = callback; - Bundle bundle = new Bundle(1); + Bundle bundle = new Bundle(2); bundle.putString(PreferenceDialogFragmentCompat.ARG_KEY, preference.getKey()); + bundle.putBoolean(SHOULD_SHOW_AD_PERSONALIZATION_ROW, shouldShowAdPersonalizationRow); fragment.setArguments(bundle); return fragment; } @@ -44,6 +50,12 @@ TextView offlineTextView = view.findViewById(R.id.offline_text); signedOutView.setText(ClearWebsiteStorage.getSignedOutText()); offlineTextView.setText(ClearWebsiteStorage.getOfflineText()); + var shouldShowAdPersonalizationRow = + getArguments().getBoolean(SHOULD_SHOW_AD_PERSONALIZATION_ROW, false); + if (shouldShowAdPersonalizationRow) { + RelativeLayout adDataRow = mDialogView.findViewById(R.id.ad_personalization); + adDataRow.setVisibility(View.VISIBLE); + } super.onBindDialogView(view); }
diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/GroupedWebsitesSettings.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/GroupedWebsitesSettings.java index 891c8d95..45dc941 100644 --- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/GroupedWebsitesSettings.java +++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/GroupedWebsitesSettings.java
@@ -106,6 +106,10 @@ signedOutText.setText(R.string.webstorage_clear_data_dialog_sign_out_message); TextView offlineText = dialogView.findViewById(R.id.offline_text); offlineText.setText(R.string.webstorage_clear_data_dialog_offline_message); + if (getSiteSettingsDelegate().isPrivacySandboxSettings4Enabled()) { + TextView adPersonalizationText = dialogView.findViewById(R.id.ad_personalization_text); + adPersonalizationText.setVisibility(View.VISIBLE); + } mConfirmationDialog = new AlertDialog.Builder(getContext(), R.style.ThemeOverlay_BrowserUI_AlertDialog) .setView(dialogView)
diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java index 638303e..0b4f8a4 100644 --- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java +++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java
@@ -351,7 +351,8 @@ } }; ClearWebsiteStorageDialog dialogFragment = - ClearWebsiteStorageDialog.newInstance(preference, onDialogClosed); + ClearWebsiteStorageDialog.newInstance(preference, onDialogClosed, + getSiteSettingsDelegate().isPrivacySandboxSettings4Enabled()); dialogFragment.setTargetFragment(this, 0); dialogFragment.show(getFragmentManager(), ClearWebsiteStorageDialog.TAG); } else {
diff --git a/components/browser_ui/strings/android/site_settings.grdp b/components/browser_ui/strings/android/site_settings.grdp index 9e01e3a..28bf97d 100644 --- a/components/browser_ui/strings/android/site_settings.grdp +++ b/components/browser_ui/strings/android/site_settings.grdp
@@ -290,6 +290,9 @@ <message name="IDS_WEBSTORAGE_CLEAR_DATA_DIALOG_SIGN_OUT_ALL_MESSAGE" desc="Text of the confirmation dialog, explaining that the user will be signed out of all sites being cleared."> You'll be signed out of all sites. </message> + <message name="IDS_WEBSTORAGE_CLEAR_DATA_DIALOG_SITE_SETTINGS_REMOVE_SITE_AD_PERSONALIZATION" translateable="false" desc="Text of the confirmation dialog, explaining that the user will be signed out of all sites being cleared."> + Cras in lectus mi ac magna dapibus + </message> <message name="IDS_STORAGE_CLEAR_SITE_STORAGE_TITLE" desc="Title of clear storage dialogs used in a couple different places to confirm clearing site storage data. [CHAR_LIMIT=24]"> Clear site data? </message>
diff --git a/components/browser_ui/styles/android/BUILD.gn b/components/browser_ui/styles/android/BUILD.gn index 1bd8d62..bef4d40 100644 --- a/components/browser_ui/styles/android/BUILD.gn +++ b/components/browser_ui/styles/android/BUILD.gn
@@ -160,6 +160,7 @@ "java/res/drawable/ic_call_end_white_24dp.xml", "java/res/drawable/ic_check_circle_filled_green_24dp.xml", "java/res/drawable/ic_collections_grey.xml", + "java/res/drawable/ic_data_personalization_20dp.xml", "java/res/drawable/ic_data_viz_grey.xml", "java/res/drawable/ic_desktop_windows.xml", "java/res/drawable/ic_dns_24dp.xml",
diff --git a/components/browser_ui/styles/android/java/res/drawable/ic_data_personalization_20dp.xml b/components/browser_ui/styles/android/java/res/drawable/ic_data_personalization_20dp.xml new file mode 100644 index 0000000..bcab1ad --- /dev/null +++ b/components/browser_ui/styles/android/java/res/drawable/ic_data_personalization_20dp.xml
@@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +Copyright 2023 The Chromium Authors +Use of this source code is governed by a BSD-style license that can be +found in the LICENSE file. +--> + +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="20dp" + android:height="20dp" + android:viewportWidth="20" + android:viewportHeight="20"> + <path + android:pathData="M10.575,19.4C10.175,19.8 9.7,20 9.15,20C8.6,20 8.125,19.8 7.725,19.4L0.575,12.25C0.192,11.867 0,11.4 0,10.85C0,10.283 0.192,9.808 0.575,9.425L9.375,0.6C9.558,0.417 9.775,0.275 10.025,0.175C10.275,0.058 10.542,-0 10.825,-0H17.975C18.525,-0 18.992,0.2 19.375,0.6C19.775,0.983 19.975,1.45 19.975,2V9.15C19.975,9.433 19.917,9.7 19.8,9.95C19.7,10.2 19.558,10.417 19.375,10.6L10.575,19.4ZM15.475,6C15.892,6 16.242,5.858 16.525,5.575C16.825,5.275 16.975,4.917 16.975,4.5C16.975,4.083 16.825,3.733 16.525,3.45C16.242,3.15 15.892,3 15.475,3C15.058,3 14.7,3.15 14.4,3.45C14.117,3.733 13.975,4.083 13.975,4.5C13.975,4.917 14.117,5.275 14.4,5.575C14.7,5.858 15.058,6 15.475,6ZM9.15,18L17.975,9.15V2H10.825L2,10.85L9.15,18Z" + android:fillColor="@color/default_icon_color_secondary_baseline"/> +</vector>
diff --git a/components/browser_ui/styles/android/java/res/values/themes.xml b/components/browser_ui/styles/android/java/res/values/themes.xml index c79387b4..9aab1cf8 100644 --- a/components/browser_ui/styles/android/java/res/values/themes.xml +++ b/components/browser_ui/styles/android/java/res/values/themes.xml
@@ -22,6 +22,11 @@ <style name="ThemeOverlay.Settings.DisableElevationOverlay" parent=""> <item name="elevationOverlayEnabled">false</item> </style> + <!-- Updated Clank Baseline Surface-N Colors --> + <style name="SurfaceColorsThemeOverlay" parent=""> + <item name="elevationOverlayColor">@color/baseline_primary_300</item> + <item name="elevationOverlayAccentColor">@color/baseline_neutral_500</item> + </style> <style name="ThemeOverlay.BrowserUI.DynamicColors" parent="ThemeOverlay.Material3.DynamicColors.DayNight"> <item name="elevationOverlayColor">?attr/colorPrimary</item> <item name="elevationOverlayAccentColor">@android:color/transparent</item>
diff --git a/components/browser_ui/widget/android/java/res/layout/textbubble_text_with_image.xml b/components/browser_ui/widget/android/java/res/layout/textbubble_text_with_image.xml index 52147c5..5d8248d 100644 --- a/components/browser_ui/widget/android/java/res/layout/textbubble_text_with_image.xml +++ b/components/browser_ui/widget/android/java/res/layout/textbubble_text_with_image.xml
@@ -28,7 +28,7 @@ android:layout_marginEnd="8dp" tools:ignore="ContentDescription" android:scaleType="centerInside" - app:tint="@macro/default_icon_color_inverse" /> + app:tint="@macro/default_icon_color_on_accent1" /> <!-- The FrameLayout is to center the smaller LoadingView in the same space as the icon, as well as for providing a contentDescription for the LoadingView. --> @@ -43,7 +43,7 @@ android:layout_width="16sp" android:layout_height="16sp" android:layout_gravity="center" - android:indeterminateTint="@macro/default_icon_color_inverse" /> + android:indeterminateTint="@macro/default_icon_color_on_accent1" /> </FrameLayout> <TextView
diff --git a/components/cast_streaming/browser/demuxer_stream_data_provider.h b/components/cast_streaming/browser/demuxer_stream_data_provider.h index 28c3cfd..e703c62 100644 --- a/components/cast_streaming/browser/demuxer_stream_data_provider.h +++ b/components/cast_streaming/browser/demuxer_stream_data_provider.h
@@ -86,6 +86,9 @@ void WaitForNewStreamInfo() { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); is_new_stream_info_pending_ = true; + if (current_callback_) { + std::move(current_callback_).Run(nullptr); + } } // Sets the buffer to be passed to the renderer process as part of the @@ -154,6 +157,7 @@ current_callback_ = std::move(callback); if (is_new_stream_info_pending_) { + std::move(current_callback_).Run(nullptr); return; }
diff --git a/components/cast_streaming/public/mojom/demuxer_connector.mojom b/components/cast_streaming/public/mojom/demuxer_connector.mojom index d0bde3b..41b8a9d8 100644 --- a/components/cast_streaming/public/mojom/demuxer_connector.mojom +++ b/components/cast_streaming/public/mojom/demuxer_connector.mojom
@@ -43,8 +43,8 @@ // request from the browser process a new frame of audio data to play out. interface AudioBufferRequester { // Requests more information about the cast streaming session's data stream to - // the renderer process. This will be in the form of one |buffer| or one - // |stream_info|, as detailed in the GetAudioBufferResponse type. + // the renderer process. This will be in the form of one |buffer|, one + // |stream_info|, or neither, as detailed in the GetAudioBufferResponse type. // // The |buffer| data itself is on the associated |data_pipe|, from the // AudioStreamInfo most recently provided during this or a prior call to this @@ -56,10 +56,15 @@ // be used for all future calls of this method, until a new |stream_info| is // provided. // + // An empty response is returned when the read has been cancelled due to an + // ongoing config change. In such cases, a media::Renderer::Flush() command + // should be expected to arrive soon, but prior to this it is safe to continue + // calling this function for which this same response will be returned. + // // Only one call to this method may be in-flight at a time. Or, in other // words, this method may not be called a second time until the prior call // returns. - GetBuffer() => (GetAudioBufferResponse buffer_response); + GetBuffer() => (GetAudioBufferResponse? buffer_response); // Requests that the data source providing audio buffers enable its bitstream // converter. Returns whether the operation was successful. @@ -71,7 +76,7 @@ // request from the browser process a new frame of video data to display. interface VideoBufferRequester { // As AudioBufferRequester::GetBuffer() above. - GetBuffer() => (GetVideoBufferResponse buffer_response); + GetBuffer() => (GetVideoBufferResponse? buffer_response); // As AudioBufferRequester::EnableBitstreamConverter() above. EnableBitstreamConverter() => (bool success);
diff --git a/components/cast_streaming/renderer/BUILD.gn b/components/cast_streaming/renderer/BUILD.gn index bcf42731..23e50eb 100644 --- a/components/cast_streaming/renderer/BUILD.gn +++ b/components/cast_streaming/renderer/BUILD.gn
@@ -161,7 +161,5 @@ # they are built on all platforms even when bots don't build "all". # TODO(crbug.com/1357085): Add tests or handle this in a more appropriate way. # Merging of other targets (see other TODOs) may address this. - deps += [ - # ":renderer", - ] + deps += [ ":renderer" ] }
diff --git a/components/cast_streaming/renderer/buffer_requester.h b/components/cast_streaming/renderer/buffer_requester.h index a7649e73..b751c4f 100644 --- a/components/cast_streaming/renderer/buffer_requester.h +++ b/components/cast_streaming/renderer/buffer_requester.h
@@ -80,7 +80,8 @@ // DecoderBufferProviderImpl::Client implementation. using BufferProviderRequestCB = - base::OnceCallback<void(media::mojom::DecoderBufferPtr)>; + typename DecoderBufferProviderImpl<typename DemuxerStreamTraits< + TMojoRemoteType>::ConfigType>::Client::BufferProviderRequestCB; void RequestBufferAsync(BufferProviderRequestCB on_buffer_received) override { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); DCHECK(!buffer_request_cb_); @@ -102,8 +103,13 @@ DVLOG(3) << __func__; DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); DCHECK(buffer_provider_); - DCHECK(buffer_request_cb_); + + if (!get_buffer_response) { + std::move(buffer_request_cb_).Run(nullptr); + return; + } + if (get_buffer_response->is_stream_info()) { buffer_request_cb_ = BufferProviderRequestCB{}; typename Traits::StreamInfoType& data_stream_info = @@ -111,6 +117,7 @@ OnNewConfig(std::move(data_stream_info->decoder_config), std::move(data_stream_info->data_pipe)); } else { + DCHECK(get_buffer_response->is_buffer()); std::move(buffer_request_cb_) .Run(std::move(get_buffer_response->get_buffer())); }
diff --git a/components/cast_streaming/renderer/buffer_requester_unittest.cc b/components/cast_streaming/renderer/buffer_requester_unittest.cc index de422c5..096e5d6 100644 --- a/components/cast_streaming/renderer/buffer_requester_unittest.cc +++ b/components/cast_streaming/renderer/buffer_requester_unittest.cc
@@ -121,6 +121,7 @@ TEST_F(BufferRequesterTest, BufferReceivedOverMojoTriggersCallback) { EXPECT_CALL(client_, OnBufferReceivedOverMojo(testing::_)) .WillOnce([this](media::mojom::DecoderBufferPtr response) { + ASSERT_TRUE(!!response); scoped_refptr<media::DecoderBuffer> media_buffer( response.To<scoped_refptr<media::DecoderBuffer>>()); EXPECT_TRUE(media_buffer->MatchesMetadataForTesting(*buffer_));
diff --git a/components/cast_streaming/renderer/decoder_buffer_provider_impl.h b/components/cast_streaming/renderer/decoder_buffer_provider_impl.h index 29bf9c5..7ae10dc 100644 --- a/components/cast_streaming/renderer/decoder_buffer_provider_impl.h +++ b/components/cast_streaming/renderer/decoder_buffer_provider_impl.h
@@ -35,9 +35,10 @@ // Requests a new buffer be provided to this class, which will be returned // via call to |on_buffer_received|. + using BufferProviderRequestCB = + base::OnceCallback<void(media::mojom::DecoderBufferPtr)>; virtual void RequestBufferAsync( - base::OnceCallback<void(media::mojom::DecoderBufferPtr)> - on_buffer_received) = 0; + BufferProviderRequestCB n_buffer_received) = 0; }; DecoderBufferProviderImpl( @@ -103,6 +104,12 @@ return; } + DCHECK(new_buffer_callback_); + if (!buffer) { + buffer_reader_->ClearReadPending(); + std::move(new_buffer_callback_).Run(nullptr); + return; + } buffer_reader_->ProvideBuffer(std::move(buffer)); }
diff --git a/components/cast_streaming/renderer/decoder_buffer_reader.cc b/components/cast_streaming/renderer/decoder_buffer_reader.cc index 0da3f48..203e5d4 100644 --- a/components/cast_streaming/renderer/decoder_buffer_reader.cc +++ b/components/cast_streaming/renderer/decoder_buffer_reader.cc
@@ -34,6 +34,10 @@ TryGetNextBuffer(); } +void DecoderBufferReader::ClearReadPending() { + is_read_pending_ = false; +} + void DecoderBufferReader::ReadBufferAsync() { DVLOG(3) << __func__; DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
diff --git a/components/cast_streaming/renderer/decoder_buffer_reader.h b/components/cast_streaming/renderer/decoder_buffer_reader.h index 8054f415..a02e1005 100644 --- a/components/cast_streaming/renderer/decoder_buffer_reader.h +++ b/components/cast_streaming/renderer/decoder_buffer_reader.h
@@ -37,6 +37,10 @@ // Client. void ReadBufferAsync(); + // Informs this instance that an ongoing read call has been cancelled, and no + // call to |new_buffer_cb_| is expected. + void ClearReadPending(); + bool is_queue_empty() { return pending_buffer_metadata_.empty(); } private:
diff --git a/components/cast_streaming/renderer/frame_injecting_demuxer.cc b/components/cast_streaming/renderer/frame_injecting_demuxer.cc index 88fb3ec..fc260d2 100644 --- a/components/cast_streaming/renderer/frame_injecting_demuxer.cc +++ b/components/cast_streaming/renderer/frame_injecting_demuxer.cc
@@ -97,7 +97,9 @@ return; } - if (buffer->end_of_stream()) { + if (!buffer) { + std::move(pending_read_cb_).Run(Status::kAborted, {}); + } else if (buffer->end_of_stream()) { std::move(pending_read_cb_).Run(Status::kError, {}); } else { std::move(pending_read_cb_).Run(Status::kOk, {std::move(buffer)});
diff --git a/components/download/internal/common/BUILD.gn b/components/download/internal/common/BUILD.gn index df36638..c0951bf 100644 --- a/components/download/internal/common/BUILD.gn +++ b/components/download/internal/common/BUILD.gn
@@ -31,7 +31,6 @@ "download_interrupt_reasons_utils.cc", "download_item_impl.cc", "download_item_impl_delegate.cc", - "download_item_rename_handler.cc", "download_job.cc", "download_job_factory.cc", "download_job_impl.cc",
diff --git a/components/download/internal/common/download_item_impl_delegate.cc b/components/download/internal/common/download_item_impl_delegate.cc index e216435..1db4a01 100644 --- a/components/download/internal/common/download_item_impl_delegate.cc +++ b/components/download/internal/common/download_item_impl_delegate.cc
@@ -111,10 +111,4 @@ return base::NullCallback(); } -std::unique_ptr<DownloadItemRenameHandler> -DownloadItemImplDelegate::GetRenameHandlerForDownload( - DownloadItemImpl* download_item) { - return nullptr; -} - } // namespace download
diff --git a/components/download/internal/common/download_item_rename_handler.cc b/components/download/internal/common/download_item_rename_handler.cc deleted file mode 100644 index 7c5187a..0000000 --- a/components/download/internal/common/download_item_rename_handler.cc +++ /dev/null
@@ -1,19 +0,0 @@ -// 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. - -#include "components/download/public/common/download_item_rename_handler.h" - -#include "base/files/file_path.h" -#include "components/download/public/common/download_interrupt_reasons.h" -#include "components/download/public/common/download_item.h" - -namespace download { - -DownloadItemRenameHandler::DownloadItemRenameHandler( - DownloadItem* download_item) - : download_item_(download_item) {} - -DownloadItemRenameHandler::~DownloadItemRenameHandler() = default; - -} // namespace download
diff --git a/components/download/public/common/BUILD.gn b/components/download/public/common/BUILD.gn index 06b7220a..58a9836 100644 --- a/components/download/public/common/BUILD.gn +++ b/components/download/public/common/BUILD.gn
@@ -39,7 +39,6 @@ "download_item_factory.h", "download_item_impl.h", "download_item_impl_delegate.h", - "download_item_rename_handler.h", "download_item_rename_progress_update.h", "download_job.h", "download_job_factory.h",
diff --git a/components/download/public/common/download_item_impl_delegate.h b/components/download/public/common/download_item_impl_delegate.h index fa7d9c07..024846b6 100644 --- a/components/download/public/common/download_item_impl_delegate.h +++ b/components/download/public/common/download_item_impl_delegate.h
@@ -13,7 +13,6 @@ #include "base/functional/callback.h" #include "components/download/public/common/download_export.h" #include "components/download/public/common/download_item.h" -#include "components/download/public/common/download_item_rename_handler.h" #include "components/download/public/common/download_url_parameters.h" #include "components/download/public/common/quarantine_connection.h" #include "components/services/quarantine/public/mojom/quarantine.mojom.h" @@ -130,12 +129,6 @@ // Gets a callback that can connect to the Quarantine Service if available. virtual QuarantineConnectionCallback GetQuarantineConnectionCallback(); - // Gets a handler to perform the rename for a download item. If no special - // rename handling is required, this function returns null and the default - // rename handling is performed. - virtual std::unique_ptr<DownloadItemRenameHandler> - GetRenameHandlerForDownload(DownloadItemImpl* download_item); - private: // For "Outlives attached DownloadItemImpl" invariant assertion. int count_;
diff --git a/components/download/public/common/download_item_rename_handler.h b/components/download/public/common/download_item_rename_handler.h deleted file mode 100644 index f6f9ddb..0000000 --- a/components/download/public/common/download_item_rename_handler.h +++ /dev/null
@@ -1,61 +0,0 @@ -// 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. - -#ifndef COMPONENTS_DOWNLOAD_PUBLIC_COMMON_DOWNLOAD_ITEM_RENAME_HANDLER_H_ -#define COMPONENTS_DOWNLOAD_PUBLIC_COMMON_DOWNLOAD_ITEM_RENAME_HANDLER_H_ - -#include "base/functional/callback.h" -#include "base/memory/raw_ptr.h" -#include "components/download/public/common/download_interrupt_reasons.h" -#include "components/download/public/common/download_item_rename_progress_update.h" - -namespace base { -class FilePath; -} - -namespace download { - -class DownloadItem; - -// Interface implemented by an object that overrides the default method -// of renaming a file to its final name once the download completes. -// DownloadItemImpl attempts to retrieve the object from its delegate, and -// if valid will call the Start() method instead of using -// DownloadFile::RenameAndAnnotate(). -// -// Instances of DownloadItemRenameHandler are owned by DownloadItem. -class COMPONENTS_DOWNLOAD_EXPORT DownloadItemRenameHandler { - public: - // Callback to update the DownloadItem and send some info into databases. - using ProgressUpdateCallback = base::RepeatingCallback<void( - const download::DownloadItemRenameProgressUpdate&)>; - // Callback when the rename handler processing completes. Args indicate - // processing result to be updated to UX, and the final file name validated at - // rerouted location. - using DownloadCallback = - base::OnceCallback<void(DownloadInterruptReason, const base::FilePath&)>; - - explicit DownloadItemRenameHandler(DownloadItem* download_item); - virtual ~DownloadItemRenameHandler(); - - DownloadItem* download_item() { return download_item_; } - - // Starts the process of renaming the file and invokes |callback| when - // done. - virtual void Start(ProgressUpdateCallback progress_update_cb, - DownloadCallback upload_complete_cb) = 0; - - // Opens the file associated with this download. - virtual void OpenDownload() = 0; - - // Shows the download in the context of its container. - virtual void ShowDownloadInContext() = 0; - - private: - raw_ptr<DownloadItem> download_item_; -}; - -} // namespace download - -#endif // COMPONENTS_DOWNLOAD_PUBLIC_COMMON_DOWNLOAD_ITEM_RENAME_HANDLER_H_
diff --git a/components/feature_engagement/internal/chrome_variations_configuration.cc b/components/feature_engagement/internal/chrome_variations_configuration.cc index 798939c..497c869 100644 --- a/components/feature_engagement/internal/chrome_variations_configuration.cc +++ b/components/feature_engagement/internal/chrome_variations_configuration.cc
@@ -22,6 +22,7 @@ #include "components/feature_engagement/public/configuration.h" #include "components/feature_engagement/public/feature_configurations.h" #include "components/feature_engagement/public/feature_list.h" +#include "components/feature_engagement/public/group_configurations.h" namespace { @@ -412,68 +413,31 @@ return base::EqualsCaseInsensitiveASCII(trimmed_def, kTrackingOnlyFalse); } -} // namespace -ChromeVariationsConfiguration::ChromeVariationsConfiguration() = default; +// Holds all the possible fields that can be parsed. The parsing code will fill +// the provided items with parsed data. If any field is null, then it won't be +// parsed. +struct ConfigParseOutput { + uint32_t& parse_errors; + Comparator* session_rate = nullptr; + SessionRateImpact* session_rate_impact = nullptr; + Blocking* blocking = nullptr; + BlockedBy* blocked_by = nullptr; + EventConfig* trigger = nullptr; + EventConfig* used = nullptr; + std::set<EventConfig>* event_configs = nullptr; + bool* tracking_only = nullptr; + Comparator* availability = nullptr; + SnoozeParams* snooze_params = nullptr; -ChromeVariationsConfiguration::~ChromeVariationsConfiguration() = default; + explicit ConfigParseOutput(uint32_t& parse_errors) + : parse_errors(parse_errors) {} +}; -void ChromeVariationsConfiguration::ParseFeatureConfigs( - const FeatureVector& features) { - for (auto* feature : features) { - ParseFeatureConfig(feature, features); - } -} - -void ChromeVariationsConfiguration::ParseFeatureConfig( - const base::Feature* feature, - const FeatureVector& all_features) { - DCHECK(feature); - DCHECK(configs_.find(feature->name) == configs_.end()); - - DVLOG(3) << "Parsing feature config for " << feature->name; - - // Client-side configuration is used under any of the following circumstances: - // - The UseClientConfigIPH feature flag is enabled - // - There are no field trial parameters set for the feature - // - The field trial configuration is empty - // - // Note that the "empty configuration = use client-side" is quite useful, as - // it means that json field trial configs, Finch configurations, and tests can - // simply enable a feature engagement feature, and it will default to using - // the client-side configuration; there is no need to duplicate a standard - // configuration in more than one place. - std::map<std::string, std::string> params; - if (base::FeatureList::IsEnabled(kUseClientConfigIPH) || - !base::GetFieldTrialParamsByFeature(*feature, ¶ms) || - params.empty()) { - // Try to read the client-side configuration. - if (MaybeAddClientSideFeatureConfig(feature)) { - stats::RecordConfigParsingEvent( - stats::ConfigParsingEvent::SUCCESS_FROM_SOURCE); - DVLOG(3) << "Read checked in config for " << feature->name; - return; - } - - // No server-side nor client side configuration is available, but the - // feature was on the list of available features, so give it an invalid - // config. - FeatureConfig& config = configs_[feature->name]; - config.valid = false; - - stats::RecordConfigParsingEvent( - stats::ConfigParsingEvent::FAILURE_NO_FIELD_TRIAL); - // Returns early. If no field trial, ConfigParsingEvent::FAILURE will not be - // recorded. - DVLOG(3) << "No field trial or checked in config for " << feature->name; - return; - } - - // Initially all new configurations are considered invalid. - FeatureConfig& config = configs_[feature->name]; - config.valid = false; - uint32_t parse_errors = 0; - +void ParseConfigFields(const base::Feature* feature, + const FeatureVector& all_features, + std::map<std::string, std::string> params, + ConfigParseOutput& output) { for (const auto& it : params) { std::string param_name = it.first; std::string param_value = params[param_name]; @@ -484,98 +448,100 @@ if (base::StartsWith(key, feature->name, base::CompareCase::SENSITIVE)) key = param_name.substr(strlen(feature->name) + 1); - if (key == kEventConfigUsedKey) { + if (key == kEventConfigUsedKey && output.used) { EventConfig event_config; if (!ParseEventConfig(param_value, &event_config)) { - ++parse_errors; stats::RecordConfigParsingEvent( stats::ConfigParsingEvent::FAILURE_USED_EVENT_PARSE); + ++output.parse_errors; continue; } - config.used = event_config; - } else if (key == kEventConfigTriggerKey) { + *output.used = event_config; + } else if (key == kEventConfigTriggerKey && output.trigger) { EventConfig event_config; if (!ParseEventConfig(param_value, &event_config)) { stats::RecordConfigParsingEvent( stats::ConfigParsingEvent::FAILURE_TRIGGER_EVENT_PARSE); - ++parse_errors; + ++output.parse_errors; continue; } - config.trigger = event_config; - } else if (key == kSessionRateKey) { + *output.trigger = event_config; + } else if (key == kSessionRateKey && output.session_rate) { Comparator comparator; if (!ParseComparator(param_value, &comparator)) { stats::RecordConfigParsingEvent( stats::ConfigParsingEvent::FAILURE_SESSION_RATE_PARSE); - ++parse_errors; + ++output.parse_errors; continue; } - config.session_rate = comparator; - } else if (key == kSessionRateImpactKey) { - SessionRateImpact impact; - if (!ParseSessionRateImpact(param_value, &impact, feature, - all_features)) { + *output.session_rate = comparator; + } else if (key == kSessionRateImpactKey && output.session_rate_impact) { + SessionRateImpact parsed_session_rate_impact; + if (!ParseSessionRateImpact(param_value, &parsed_session_rate_impact, + feature, all_features)) { stats::RecordConfigParsingEvent( stats::ConfigParsingEvent::FAILURE_SESSION_RATE_IMPACT_PARSE); - ++parse_errors; + ++output.parse_errors; continue; } - config.session_rate_impact = impact; - } else if (key == kBlockingKey) { - Blocking blocking; - if (!ParseBlocking(param_value, &blocking)) { + *output.session_rate_impact = parsed_session_rate_impact; + } else if (key == kBlockingKey && output.blocking) { + Blocking parsed_blocking; + if (!ParseBlocking(param_value, &parsed_blocking)) { stats::RecordConfigParsingEvent( stats::ConfigParsingEvent::FAILURE_BLOCKING_PARSE); - ++parse_errors; + ++output.parse_errors; continue; } - config.blocking = blocking; - } else if (key == kBlockedByKey) { - BlockedBy blocked_by; - if (!ParseBlockedBy(param_value, &blocked_by, feature, all_features)) { + *output.blocking = parsed_blocking; + } else if (key == kBlockedByKey && output.blocked_by) { + BlockedBy parsed_blocked_by; + if (!ParseBlockedBy(param_value, &parsed_blocked_by, feature, + all_features)) { stats::RecordConfigParsingEvent( stats::ConfigParsingEvent::FAILURE_BLOCKED_BY_PARSE); - ++parse_errors; + ++output.parse_errors; continue; } - config.blocked_by = blocked_by; - } else if (key == kTrackingOnlyKey) { - bool tracking_only; - if (!ParseTrackingOnly(param_value, &tracking_only)) { + *output.blocked_by = parsed_blocked_by; + } else if (key == kTrackingOnlyKey && output.tracking_only) { + bool parsed_tracking_only; + if (!ParseTrackingOnly(param_value, &parsed_tracking_only)) { stats::RecordConfigParsingEvent( stats::ConfigParsingEvent::FAILURE_TRACKING_ONLY_PARSE); - ++parse_errors; + ++output.parse_errors; continue; } - config.tracking_only = tracking_only; - } else if (key == kAvailabilityKey) { + *output.tracking_only = parsed_tracking_only; + } else if (key == kAvailabilityKey && output.availability) { Comparator comparator; if (!ParseComparator(param_value, &comparator)) { stats::RecordConfigParsingEvent( stats::ConfigParsingEvent::FAILURE_AVAILABILITY_PARSE); - ++parse_errors; + ++output.parse_errors; continue; } - config.availability = comparator; - } else if (key == kSnoozeParams) { - SnoozeParams snooze_params; - if (!ParseSnoozeParams(param_value, &snooze_params)) { + *output.availability = comparator; + } else if (key == kSnoozeParams && output.snooze_params) { + SnoozeParams parsed_snooze_params; + if (!ParseSnoozeParams(param_value, &parsed_snooze_params)) { stats::RecordConfigParsingEvent( stats::ConfigParsingEvent::FAILURE_SNOOZE_PARAMS_PARSE); - ++parse_errors; + ++output.parse_errors; continue; } - config.snooze_params = snooze_params; + *output.snooze_params = parsed_snooze_params; } else if (base::StartsWith(key, kEventConfigKeyPrefix, - base::CompareCase::INSENSITIVE_ASCII)) { + base::CompareCase::INSENSITIVE_ASCII) && + output.event_configs) { EventConfig event_config; if (!ParseEventConfig(param_value, &event_config)) { stats::RecordConfigParsingEvent( stats::ConfigParsingEvent::FAILURE_OTHER_EVENT_PARSE); - ++parse_errors; + ++output.parse_errors; continue; } - config.event_configs.insert(event_config); + output.event_configs->insert(event_config); } else if (base::StartsWith(key, kIgnoredKeyPrefix, base::CompareCase::INSENSITIVE_ASCII)) { // Intentionally ignoring parameter using registered ignored prefix. @@ -588,6 +554,123 @@ stats::ConfigParsingEvent::FAILURE_UNKNOWN_KEY); } } +} + +template <typename T> +void RecordParseResult(std::string name, T config) { + if (config.valid) { + stats::RecordConfigParsingEvent(stats::ConfigParsingEvent::SUCCESS); + DVLOG(2) << "Config for " << name << " is valid."; + DVLOG(3) << "Config for " << name << " = " << config; + } else { + stats::RecordConfigParsingEvent(stats::ConfigParsingEvent::FAILURE); + DVLOG(2) << "Config for " << name << " is invalid."; + } +} + +} // namespace + +ChromeVariationsConfiguration::ChromeVariationsConfiguration() = default; + +ChromeVariationsConfiguration::~ChromeVariationsConfiguration() = default; + +void ChromeVariationsConfiguration::ParseConfigs(const FeatureVector& features, + const GroupVector& groups) { + for (auto* feature : features) { + ParseFeatureConfig(feature, features); + } + + if (!base::FeatureList::IsEnabled(kIPHGroups)) { + return; + } + + for (auto* group : groups) { + ParseGroupConfig(group, features); + } +} + +bool ChromeVariationsConfiguration::ShouldUseClientSideConfig( + const base::Feature* feature, + base::FieldTrialParams* params) { + // Client-side configuration is used under any of the following circumstances: + // - The UseClientConfigIPH feature flag is enabled + // - There are no field trial parameters set for the feature + // - The field trial configuration is empty + // + // Note that the "empty configuration = use client-side" is quite useful, as + // it means that json field trial configs, Finch configurations, and tests can + // simply enable a feature engagement feature, and it will default to using + // the client-side configuration; there is no need to duplicate a standard + // configuration in more than one place. + return base::FeatureList::IsEnabled(kUseClientConfigIPH) || + !base::GetFieldTrialParamsByFeature(*feature, params) || + params->empty(); +} + +void ChromeVariationsConfiguration::TryAddingClientSideConfig( + const base::Feature* feature, + bool is_group) { + // Try to read the client-side configuration. + bool added_client_config = (is_group) + ? MaybeAddClientSideGroupConfig(feature) + : MaybeAddClientSideFeatureConfig(feature); + if (added_client_config) { + stats::RecordConfigParsingEvent( + stats::ConfigParsingEvent::SUCCESS_FROM_SOURCE); + DVLOG(3) << "Read checked in config for " << feature->name; + return; + } + + // No server-side nor client side configuration is available, but the + // feature was on the list of available features, so give it an invalid + // config. + if (is_group) { + GroupConfig& config = group_configs_[feature->name]; + config.valid = false; + } else { + FeatureConfig& config = configs_[feature->name]; + config.valid = false; + } + + stats::RecordConfigParsingEvent( + stats::ConfigParsingEvent::FAILURE_NO_FIELD_TRIAL); + // Returns early. If no field trial, ConfigParsingEvent::FAILURE will not be + // recorded. + DVLOG(3) << "No field trial or checked in config for " << feature->name; + return; +} + +void ChromeVariationsConfiguration::ParseFeatureConfig( + const base::Feature* feature, + const FeatureVector& all_features) { + DCHECK(feature); + DCHECK(configs_.find(feature->name) == configs_.end()); + + DVLOG(3) << "Parsing feature config for " << feature->name; + std::map<std::string, std::string> params; + if (ShouldUseClientSideConfig(feature, ¶ms)) { + TryAddingClientSideConfig(feature, /*is_group=*/false); + return; + } + + // Initially all new configurations are considered invalid. + FeatureConfig& config = configs_[feature->name]; + config.valid = false; + uint32_t parse_errors = 0; + + ConfigParseOutput output(parse_errors); + output.session_rate = &config.session_rate; + output.session_rate_impact = &config.session_rate_impact; + output.blocking = &config.blocking; + output.blocked_by = &config.blocked_by; + output.trigger = &config.trigger; + output.used = &config.used; + output.event_configs = &config.event_configs; + output.tracking_only = &config.tracking_only; + output.availability = &config.availability; + output.snooze_params = &config.snooze_params; + + ParseConfigFields(feature, all_features, params, output); // The |used| and |trigger| members are required, so should not be the // default values. @@ -595,14 +678,7 @@ bool has_trigger_event = config.trigger != EventConfig(); config.valid = has_used_event && has_trigger_event && parse_errors == 0; - if (config.valid) { - stats::RecordConfigParsingEvent(stats::ConfigParsingEvent::SUCCESS); - DVLOG(2) << "Config for " << feature->name << " is valid."; - DVLOG(3) << "Config for " << feature->name << " = " << config; - } else { - stats::RecordConfigParsingEvent(stats::ConfigParsingEvent::FAILURE); - DVLOG(2) << "Config for " << feature->name << " is invalid."; - } + RecordParseResult(feature->name, config); // Notice parse errors for used and trigger events will also cause the // following histograms being recorded. @@ -629,6 +705,61 @@ return false; } +void ChromeVariationsConfiguration::ParseGroupConfig( + const base::Feature* group, + const FeatureVector& all_features) { + DCHECK(group); + DCHECK(group_configs_.find(group->name) == group_configs_.end()); + + DVLOG(3) << "Parsing group config for " << group->name; + + std::map<std::string, std::string> params; + if (ShouldUseClientSideConfig(group, ¶ms)) { + TryAddingClientSideConfig(group, /*is_group=*/true); + return; + } + + // Initially all new configurations are considered invalid. + GroupConfig& config = group_configs_[group->name]; + config.valid = false; + uint32_t parse_errors = 0; + + ConfigParseOutput output(parse_errors); + output.session_rate = &config.session_rate; + output.trigger = &config.trigger; + output.event_configs = &config.event_configs; + + ParseConfigFields(group, all_features, params, output); + + // The |trigger| member is required, so should not be the + // default value. + bool has_trigger_event = config.trigger != EventConfig(); + config.valid = has_trigger_event && parse_errors == 0; + + RecordParseResult(group->name, config); + + // Notice parse errors for trigger event will also cause the + // following histogram to be recorded. + if (!has_trigger_event) { + stats::RecordConfigParsingEvent( + stats::ConfigParsingEvent::FAILURE_TRIGGER_EVENT_MISSING); + } +} + +bool ChromeVariationsConfiguration::MaybeAddClientSideGroupConfig( + const base::Feature* group) { + if (!base::FeatureList::IsEnabled(*group)) { + return false; + } + + DCHECK(configs_.find(group->name) == configs_.end()); + if (auto config = GetClientSideGroupConfig(group)) { + group_configs_[group->name] = *config; + return true; + } + return false; +} + const FeatureConfig& ChromeVariationsConfiguration::GetFeatureConfig( const base::Feature& feature) const { auto it = configs_.find(feature.name);
diff --git a/components/feature_engagement/internal/chrome_variations_configuration.h b/components/feature_engagement/internal/chrome_variations_configuration.h index 7e85cdd..273b478 100644 --- a/components/feature_engagement/internal/chrome_variations_configuration.h +++ b/components/feature_engagement/internal/chrome_variations_configuration.h
@@ -6,8 +6,10 @@ #define COMPONENTS_FEATURE_ENGAGEMENT_INTERNAL_CHROME_VARIATIONS_CONFIGURATION_H_ #include "base/feature_list.h" +#include "base/metrics/field_trial_params.h" #include "components/feature_engagement/public/configuration.h" #include "components/feature_engagement/public/feature_list.h" +#include "components/feature_engagement/public/group_list.h" namespace feature_engagement { @@ -39,15 +41,29 @@ const std::vector<std::string> GetRegisteredGroups() const override; // Parses the variations configuration for all of the given |features| and - // stores the result. It is only valid to call ParseFeatureConfig once. - void ParseFeatureConfigs(const FeatureVector& features); + // |groups| and stores the result. It is only valid to call ParseConfigs once. + void ParseConfigs(const FeatureVector& features, const GroupVector& groups); private: void ParseFeatureConfig(const base::Feature* feature, const FeatureVector& all_features); + void ParseGroupConfig(const base::Feature* group, + const FeatureVector& all_features); + + // Checks whether |feature| should use a client side config and fills in + // |params| the parameters for later parsing if necessary. + bool ShouldUseClientSideConfig(const base::Feature* feature, + base::FieldTrialParams* params); + // Attempts to get the client side config for |feature| and add its config to + // the config store. If |is_group| is true, then |feature| refers to a group + // configuration instead of a feature configuration. + void TryAddingClientSideConfig(const base::Feature* feature, bool is_group); // Returns true if FeatureConfig was found with a local hard coded // configuration. bool MaybeAddClientSideFeatureConfig(const base::Feature* feature); + // Returns true if GroupConfig was found with a local hard coded + // configuration. + bool MaybeAddClientSideGroupConfig(const base::Feature* group); // The current configurations. ConfigMap configs_;
diff --git a/components/feature_engagement/internal/chrome_variations_configuration_unittest.cc b/components/feature_engagement/internal/chrome_variations_configuration_unittest.cc index c542506..f803f1b 100644 --- a/components/feature_engagement/internal/chrome_variations_configuration_unittest.cc +++ b/components/feature_engagement/internal/chrome_variations_configuration_unittest.cc
@@ -32,10 +32,23 @@ "test_qux", base::FEATURE_DISABLED_BY_DEFAULT); +BASE_FEATURE(kChromeTestGroupOne, + "test_group_one", + base::FEATURE_DISABLED_BY_DEFAULT); +BASE_FEATURE(kChromeTestGroupTwo, + "test_group_two", + base::FEATURE_DISABLED_BY_DEFAULT); +BASE_FEATURE(kChromeTestGroupThree, + "test_group_three", + base::FEATURE_DISABLED_BY_DEFAULT); + const char kFooTrialName[] = "FooTrial"; const char kBarTrialName[] = "BarTrial"; const char kQuxTrialName[] = "QuxTrial"; -const char kGroupName[] = "Group1"; +const char kGroupOneTrialName[] = "GroupOneTrial"; +const char kGroupTwoTrialName[] = "GroupTwoTrial"; +const char kGroupThreeTrialName[] = "GroupThreeTrial"; +const char kTrialGroupName[] = "FieldTrialGroup1"; const char kConfigParseEventName[] = "InProductHelp.Config.ParsingEvent"; SessionRateImpact CreateSessionRateImpactExplicit( @@ -57,14 +70,24 @@ public: ChromeVariationsConfigurationTest() { base::FieldTrial* foo_trial = - base::FieldTrialList::CreateFieldTrial(kFooTrialName, kGroupName); + base::FieldTrialList::CreateFieldTrial(kFooTrialName, kTrialGroupName); base::FieldTrial* bar_trial = - base::FieldTrialList::CreateFieldTrial(kBarTrialName, kGroupName); + base::FieldTrialList::CreateFieldTrial(kBarTrialName, kTrialGroupName); base::FieldTrial* qux_trial = - base::FieldTrialList::CreateFieldTrial(kQuxTrialName, kGroupName); + base::FieldTrialList::CreateFieldTrial(kQuxTrialName, kTrialGroupName); + base::FieldTrial* group_one_trial = base::FieldTrialList::CreateFieldTrial( + kGroupOneTrialName, kTrialGroupName); + base::FieldTrial* group_two_trial = base::FieldTrialList::CreateFieldTrial( + kGroupTwoTrialName, kTrialGroupName); + base::FieldTrial* group_three_trial = + base::FieldTrialList::CreateFieldTrial(kGroupThreeTrialName, + kTrialGroupName); trials_[kChromeTestFeatureFoo.name] = foo_trial; trials_[kChromeTestFeatureBar.name] = bar_trial; trials_[kChromeTestFeatureQux.name] = qux_trial; + trials_[kChromeTestGroupOne.name] = group_one_trial; + trials_[kChromeTestGroupTwo.name] = group_two_trial; + trials_[kChromeTestGroupThree.name] = group_three_trial; std::unique_ptr<base::FeatureList> feature_list(new base::FeatureList); feature_list->RegisterFieldTrialOverride( @@ -76,6 +99,15 @@ feature_list->RegisterFieldTrialOverride( kChromeTestFeatureQux.name, base::FeatureList::OVERRIDE_ENABLE_FEATURE, qux_trial); + feature_list->RegisterFieldTrialOverride( + kChromeTestGroupOne.name, base::FeatureList::OVERRIDE_ENABLE_FEATURE, + group_one_trial); + feature_list->RegisterFieldTrialOverride( + kChromeTestGroupTwo.name, base::FeatureList::OVERRIDE_ENABLE_FEATURE, + group_two_trial); + feature_list->RegisterFieldTrialOverride( + kChromeTestGroupThree.name, base::FeatureList::OVERRIDE_ENABLE_FEATURE, + group_three_trial); scoped_feature_list_.InitWithFeatureList(std::move(feature_list)); EXPECT_EQ(foo_trial, @@ -84,6 +116,12 @@ base::FeatureList::GetFieldTrial(kChromeTestFeatureBar)); EXPECT_EQ(qux_trial, base::FeatureList::GetFieldTrial(kChromeTestFeatureQux)); + EXPECT_EQ(group_one_trial, + base::FeatureList::GetFieldTrial(kChromeTestGroupOne)); + EXPECT_EQ(group_two_trial, + base::FeatureList::GetFieldTrial(kChromeTestGroupTwo)); + EXPECT_EQ(group_three_trial, + base::FeatureList::GetFieldTrial(kChromeTestGroupThree)); } ChromeVariationsConfigurationTest(const ChromeVariationsConfigurationTest&) = @@ -101,7 +139,7 @@ ASSERT_TRUE( base::FieldTrialParamAssociator::GetInstance() ->AssociateFieldTrialParams(trials_[feature.name]->trial_name(), - kGroupName, params)); + kTrialGroupName, params)); std::map<std::string, std::string> actualParams; EXPECT_TRUE(base::GetFieldTrialParamsByFeature(feature, &actualParams)); @@ -117,7 +155,8 @@ SetFeatureParams(kChromeTestFeatureFoo, foo_params); std::vector<const base::Feature*> features = {&kChromeTestFeatureFoo}; - configuration_.ParseFeatureConfigs(features); + GroupVector groups; + configuration_.ParseConfigs(features, groups); FeatureConfig foo = configuration_.GetFeatureConfig(kChromeTestFeatureFoo); EXPECT_FALSE(foo.valid); @@ -141,7 +180,8 @@ features.push_back(&kChromeTestFeatureFoo); base::HistogramTester histogram_tester; - configuration_.ParseFeatureConfigs(features); + GroupVector groups; + configuration_.ParseConfigs(features, groups); FeatureConfig foo_config = configuration_.GetFeatureConfig(kChromeTestFeatureFoo); @@ -168,7 +208,8 @@ base::HistogramTester histogram_tester; std::vector<const base::Feature*> features = {&kChromeTestFeatureFoo}; - configuration_.ParseFeatureConfigs(features); + GroupVector groups; + configuration_.ParseConfigs(features, groups); FeatureConfig foo = configuration_.GetFeatureConfig(kChromeTestFeatureFoo); EXPECT_TRUE(foo.valid); @@ -212,7 +253,8 @@ base::HistogramTester histogram_tester; std::vector<const base::Feature*> features = {&kChromeTestFeatureFoo}; - configuration_.ParseFeatureConfigs(features); + GroupVector groups; + configuration_.ParseConfigs(features, groups); FeatureConfig foo = configuration_.GetFeatureConfig(kChromeTestFeatureFoo); EXPECT_TRUE(foo.valid); @@ -257,7 +299,8 @@ std::vector<const base::Feature*> features = { &kChromeTestFeatureFoo, &kChromeTestFeatureBar, &kChromeTestFeatureQux}; - configuration_.ParseFeatureConfigs(features); + GroupVector groups; + configuration_.ParseConfigs(features, groups); FeatureConfig foo = configuration_.GetFeatureConfig(kChromeTestFeatureFoo); FeatureConfig bar = configuration_.GetFeatureConfig(kChromeTestFeatureBar); @@ -286,7 +329,8 @@ base::HistogramTester histogram_tester; std::vector<const base::Feature*> features = {&kChromeTestFeatureFoo}; - configuration_.ParseFeatureConfigs(features); + GroupVector groups; + configuration_.ParseConfigs(features, groups); FeatureConfig foo = configuration_.GetFeatureConfig(kChromeTestFeatureFoo); EXPECT_FALSE(foo.valid); @@ -307,7 +351,8 @@ base::HistogramTester histogram_tester; std::vector<const base::Feature*> features = {&kChromeTestFeatureFoo}; - configuration_.ParseFeatureConfigs(features); + GroupVector groups; + configuration_.ParseConfigs(features, groups); FeatureConfig foo = configuration_.GetFeatureConfig(kChromeTestFeatureFoo); EXPECT_FALSE(foo.valid); @@ -330,7 +375,8 @@ base::HistogramTester histogram_tester; std::vector<const base::Feature*> features = {&kChromeTestFeatureFoo}; - configuration_.ParseFeatureConfigs(features); + GroupVector groups; + configuration_.ParseConfigs(features, groups); FeatureConfig foo = configuration_.GetFeatureConfig(kChromeTestFeatureFoo); EXPECT_TRUE(foo.valid); @@ -359,7 +405,8 @@ foo_params["blocked_by"] = blocked_by_param_value; test->SetFeatureParams(kChromeTestFeatureFoo, foo_params); - configuration->ParseFeatureConfigs(features); + GroupVector groups; + configuration->ParseConfigs(features, groups); FeatureConfig foo = configuration->GetFeatureConfig(kChromeTestFeatureFoo); EXPECT_EQ(is_valid, foo.valid); FeatureConfig expected_foo; @@ -387,7 +434,8 @@ SetFeatureParams(kChromeTestFeatureFoo, foo_params); std::vector<const base::Feature*> features = {&kChromeTestFeatureFoo}; - configuration_.ParseFeatureConfigs(features); + GroupVector groups; + configuration_.ParseConfigs(features, groups); FeatureConfig foo = configuration_.GetFeatureConfig(kChromeTestFeatureFoo); EXPECT_EQ(foo.blocking.type, Blocking::Type::NONE); @@ -402,7 +450,8 @@ SetFeatureParams(kChromeTestFeatureFoo, foo_params); std::vector<const base::Feature*> features = {&kChromeTestFeatureFoo}; - configuration_.ParseFeatureConfigs(features); + GroupVector groups; + configuration_.ParseConfigs(features, groups); FeatureConfig foo = configuration_.GetFeatureConfig(kChromeTestFeatureFoo); EXPECT_EQ(foo.blocking.type, Blocking::Type::ALL); @@ -418,7 +467,8 @@ SetFeatureParams(kChromeTestFeatureFoo, foo_params); std::vector<const base::Feature*> features = {&kChromeTestFeatureFoo}; - configuration_.ParseFeatureConfigs(features); + GroupVector groups; + configuration_.ParseConfigs(features, groups); FeatureConfig foo = configuration_.GetFeatureConfig(kChromeTestFeatureFoo); EXPECT_EQ(foo.blocking.type, Blocking::Type::ALL); @@ -495,7 +545,8 @@ foo_params["session_rate_impact"] = session_rate_impact_param_value; test->SetFeatureParams(kChromeTestFeatureFoo, foo_params); - configuration->ParseFeatureConfigs(features); + GroupVector groups; + configuration->ParseConfigs(features, groups); FeatureConfig foo = configuration->GetFeatureConfig(kChromeTestFeatureFoo); EXPECT_EQ(is_valid, foo.valid); @@ -766,7 +817,8 @@ base::HistogramTester histogram_tester; std::vector<const base::Feature*> features = { &kChromeTestFeatureFoo, &kChromeTestFeatureBar, &kChromeTestFeatureQux}; - configuration_.ParseFeatureConfigs(features); + GroupVector groups; + configuration_.ParseConfigs(features, groups); FeatureConfig foo = configuration_.GetFeatureConfig(kChromeTestFeatureFoo); EXPECT_TRUE(foo.valid); @@ -815,7 +867,8 @@ SetFeatureParams(kChromeTestFeatureFoo, foo_params); std::vector<const base::Feature*> features = {&kChromeTestFeatureFoo}; - configuration_.ParseFeatureConfigs(features); + GroupVector groups; + configuration_.ParseConfigs(features, groups); FeatureConfig foo = configuration_.GetFeatureConfig(kChromeTestFeatureFoo); EXPECT_TRUE(foo.valid); @@ -841,7 +894,8 @@ SetFeatureParams(kChromeTestFeatureFoo, foo_params); std::vector<const base::Feature*> features = {&kChromeTestFeatureFoo}; - configuration_.ParseFeatureConfigs(features); + GroupVector groups; + configuration_.ParseConfigs(features, groups); FeatureConfig foo = configuration_.GetFeatureConfig(kChromeTestFeatureFoo); EXPECT_TRUE(foo.valid); @@ -908,7 +962,8 @@ base::HistogramTester histogram_tester; std::vector<const base::Feature*> features = {&kChromeTestFeatureFoo}; - configuration_.ParseFeatureConfigs(features); + GroupVector groups; + configuration_.ParseConfigs(features, groups); FeatureConfig foo = configuration_.GetFeatureConfig(kChromeTestFeatureFoo); EXPECT_FALSE(foo.valid); @@ -932,7 +987,8 @@ base::HistogramTester histogram_tester; std::vector<const base::Feature*> features = {&kChromeTestFeatureFoo}; - configuration_.ParseFeatureConfigs(features); + GroupVector groups; + configuration_.ParseConfigs(features, groups); FeatureConfig foo = configuration_.GetFeatureConfig(kChromeTestFeatureFoo); EXPECT_FALSE(foo.valid); @@ -954,7 +1010,8 @@ base::HistogramTester histogram_tester; std::vector<const base::Feature*> features = {&kChromeTestFeatureFoo}; - configuration_.ParseFeatureConfigs(features); + GroupVector groups; + configuration_.ParseConfigs(features, groups); FeatureConfig foo = configuration_.GetFeatureConfig(kChromeTestFeatureFoo); EXPECT_FALSE(foo.valid); @@ -979,7 +1036,8 @@ base::HistogramTester histogram_tester; std::vector<const base::Feature*> features = {&kChromeTestFeatureFoo}; - configuration_.ParseFeatureConfigs(features); + GroupVector groups; + configuration_.ParseConfigs(features, groups); FeatureConfig foo = configuration_.GetFeatureConfig(kChromeTestFeatureFoo); EXPECT_FALSE(foo.valid); @@ -1007,7 +1065,8 @@ SetFeatureParams(kChromeTestFeatureFoo, foo_params); std::vector<const base::Feature*> features = {&kChromeTestFeatureFoo}; - configuration_.ParseFeatureConfigs(features); + GroupVector groups; + configuration_.ParseConfigs(features, groups); FeatureConfig foo = configuration_.GetFeatureConfig(kChromeTestFeatureFoo); EXPECT_FALSE(foo.valid); @@ -1023,7 +1082,8 @@ base::HistogramTester histogram_tester; std::vector<const base::Feature*> features = {&kChromeTestFeatureFoo}; - configuration_.ParseFeatureConfigs(features); + GroupVector groups; + configuration_.ParseConfigs(features, groups); FeatureConfig foo = configuration_.GetFeatureConfig(kChromeTestFeatureFoo); EXPECT_FALSE(foo.valid); @@ -1050,7 +1110,8 @@ foo_params["tracking_only"] = tracking_only_definition; test->SetFeatureParams(kChromeTestFeatureFoo, foo_params); - configuration->ParseFeatureConfigs(features); + GroupVector groups; + configuration->ParseConfigs(features, groups); FeatureConfig foo = configuration->GetFeatureConfig(kChromeTestFeatureFoo); EXPECT_EQ(is_valid, foo.valid); @@ -1122,7 +1183,8 @@ SetFeatureParams(kChromeTestFeatureFoo, foo_params); std::vector<const base::Feature*> features = {&kChromeTestFeatureFoo}; - configuration_.ParseFeatureConfigs(features); + GroupVector groups; + configuration_.ParseConfigs(features, groups); FeatureConfig foo = configuration_.GetFeatureConfig(kChromeTestFeatureFoo); EXPECT_TRUE(foo.valid); @@ -1157,7 +1219,8 @@ SetFeatureParams(kChromeTestFeatureFoo, foo_params); std::vector<const base::Feature*> features = {&kChromeTestFeatureFoo}; - configuration_.ParseFeatureConfigs(features); + GroupVector groups; + configuration_.ParseConfigs(features, groups); FeatureConfig foo = configuration_.GetFeatureConfig(kChromeTestFeatureFoo); EXPECT_TRUE(foo.valid); @@ -1206,7 +1269,8 @@ std::vector<const base::Feature*> features = { &kChromeTestFeatureFoo, &kChromeTestFeatureBar, &kChromeTestFeatureQux}; - configuration_.ParseFeatureConfigs(features); + GroupVector groups; + configuration_.ParseConfigs(features, groups); FeatureConfig foo = configuration_.GetFeatureConfig(kChromeTestFeatureFoo); EXPECT_TRUE(foo.valid); @@ -1253,7 +1317,8 @@ base::HistogramTester histogram_tester; FeatureVector features; features.push_back(&kIPHDummyFeature); - configuration_.ParseFeatureConfigs(features); + GroupVector groups; + configuration_.ParseConfigs(features, groups); FeatureConfig expected; expected.valid = false; @@ -1280,7 +1345,8 @@ base::HistogramTester histogram_tester; FeatureVector features; features.push_back(&kIPHDummyFeature); - configuration_.ParseFeatureConfigs(features); + GroupVector groups; + configuration_.ParseConfigs(features, groups); FeatureConfig expected; expected.valid = false; @@ -1298,7 +1364,8 @@ base::HistogramTester histogram_tester; FeatureVector features; features.push_back(&kChromeTestFeatureFoo); - configuration_.ParseFeatureConfigs(features); + GroupVector groups; + configuration_.ParseConfigs(features, groups); FeatureConfig expected; expected.valid = false; @@ -1320,7 +1387,8 @@ SetFeatureParams(kChromeTestFeatureFoo, foo_params); std::vector<const base::Feature*> features = {&kChromeTestFeatureFoo}; - configuration_.ParseFeatureConfigs(features); + GroupVector groups; + configuration_.ParseConfigs(features, groups); FeatureConfig foo = configuration_.GetFeatureConfig(kChromeTestFeatureFoo); EXPECT_EQ(foo.snooze_params.max_limit, 5u); @@ -1336,7 +1404,8 @@ SetFeatureParams(kChromeTestFeatureFoo, foo_params); std::vector<const base::Feature*> features = {&kChromeTestFeatureFoo}; - configuration_.ParseFeatureConfigs(features); + GroupVector groups; + configuration_.ParseConfigs(features, groups); FeatureConfig foo = configuration_.GetFeatureConfig(kChromeTestFeatureFoo); EXPECT_EQ(foo.snooze_params.max_limit, 3u); @@ -1352,7 +1421,8 @@ SetFeatureParams(kChromeTestFeatureFoo, foo_params); std::vector<const base::Feature*> features = {&kChromeTestFeatureFoo}; - configuration_.ParseFeatureConfigs(features); + GroupVector groups; + configuration_.ParseConfigs(features, groups); FeatureConfig foo = configuration_.GetFeatureConfig(kChromeTestFeatureFoo); EXPECT_EQ(foo.snooze_params.max_limit, 0u); @@ -1368,7 +1438,8 @@ SetFeatureParams(kChromeTestFeatureFoo, foo_params); std::vector<const base::Feature*> features = {&kChromeTestFeatureFoo}; - configuration_.ParseFeatureConfigs(features); + GroupVector groups; + configuration_.ParseConfigs(features, groups); FeatureConfig foo = configuration_.GetFeatureConfig(kChromeTestFeatureFoo); EXPECT_EQ(foo.snooze_params.max_limit, 0u); @@ -1384,7 +1455,8 @@ SetFeatureParams(kChromeTestFeatureFoo, foo_params); std::vector<const base::Feature*> features = {&kChromeTestFeatureFoo}; - configuration_.ParseFeatureConfigs(features); + GroupVector groups; + configuration_.ParseConfigs(features, groups); FeatureConfig foo = configuration_.GetFeatureConfig(kChromeTestFeatureFoo); EXPECT_EQ(foo.snooze_params.max_limit, 0u); @@ -1392,4 +1464,409 @@ EXPECT_FALSE(foo.valid); } +TEST_F(ChromeVariationsConfigurationTest, + DisabledGroupShouldHaveInvalidConfig) { + base::test::ScopedFeatureList scoped_feature_list; + scoped_feature_list.InitWithFeatures( + {kIPHGroups} /* enabled_features */, + {kChromeTestGroupOne} /* disabled_features */); + + base::HistogramTester histogram_tester; + FeatureVector features; + GroupVector groups = {&kChromeTestGroupOne}; + configuration_.ParseConfigs(features, groups); + + GroupConfig group_one_config = + configuration_.GetGroupConfig(kChromeTestGroupOne); + EXPECT_FALSE(group_one_config.valid); + histogram_tester.ExpectBucketCount( + kConfigParseEventName, + static_cast<int>(stats::ConfigParsingEvent::FAILURE_NO_FIELD_TRIAL), 1); + histogram_tester.ExpectTotalCount(kConfigParseEventName, 1); +} + +TEST_F(ChromeVariationsConfigurationTest, ParseSingleGroup) { + base::test::ScopedFeatureList scoped_feature_list; + scoped_feature_list.InitWithFeatures({kIPHGroups} /* enabled_features */, + {} /* disabled_features */); + + std::map<std::string, std::string> group_one_params; + group_one_params["event_trigger"] = + "name:opened_chrome_home;comparator:any;window:0;storage:360"; + group_one_params["event_1"] = + "name:user_has_seen_dino;comparator:>=1;window:120;storage:180"; + group_one_params["event_2"] = + "name:user_opened_app_menu;comparator:<=0;window:120;storage:180"; + group_one_params["event_3"] = + "name:user_opened_downloads_home;comparator:any;window:0;storage:360"; + SetFeatureParams(kChromeTestGroupOne, group_one_params); + + base::HistogramTester histogram_tester; + FeatureVector features; + GroupVector groups = {&kChromeTestGroupOne}; + configuration_.ParseConfigs(features, groups); + + GroupConfig group_one = configuration_.GetGroupConfig(kChromeTestGroupOne); + EXPECT_TRUE(group_one.valid); + histogram_tester.ExpectBucketCount( + kConfigParseEventName, + static_cast<int>(stats::ConfigParsingEvent::SUCCESS), 1); + histogram_tester.ExpectTotalCount(kConfigParseEventName, 1); + + GroupConfig expected_group_one; + expected_group_one.valid = true; + expected_group_one.trigger = + EventConfig("opened_chrome_home", Comparator(ANY, 0), 0, 360); + expected_group_one.event_configs.insert(EventConfig( + "user_has_seen_dino", Comparator(GREATER_THAN_OR_EQUAL, 1), 120, 180)); + expected_group_one.event_configs.insert(EventConfig( + "user_opened_app_menu", Comparator(LESS_THAN_OR_EQUAL, 0), 120, 180)); + expected_group_one.event_configs.insert( + EventConfig("user_opened_downloads_home", Comparator(ANY, 0), 0, 360)); + EXPECT_EQ(expected_group_one, group_one); +} + +TEST_F(ChromeVariationsConfigurationTest, EmptyGroupIsInvalid) { + base::test::ScopedFeatureList scoped_feature_list; + scoped_feature_list.InitWithFeatures({kIPHGroups} /* enabled_features */, + {} /* disabled_features */); + + std::map<std::string, std::string> group_one_params; + SetFeatureParams(kChromeTestGroupOne, group_one_params); + + base::HistogramTester histogram_tester; + FeatureVector features; + GroupVector groups = {&kChromeTestGroupOne}; + configuration_.ParseConfigs(features, groups); + + GroupConfig group_one = configuration_.GetGroupConfig(kChromeTestGroupOne); + EXPECT_FALSE(group_one.valid); + + GroupConfig expected_group_one; + expected_group_one.valid = false; + EXPECT_EQ(expected_group_one, group_one); + histogram_tester.ExpectBucketCount( + kConfigParseEventName, + static_cast<int>(stats::ConfigParsingEvent::FAILURE_NO_FIELD_TRIAL), 1); + histogram_tester.ExpectTotalCount(kConfigParseEventName, 1); +} + +TEST_F(ChromeVariationsConfigurationTest, GroupOnlyTriggerIsValid) { + base::test::ScopedFeatureList scoped_feature_list; + scoped_feature_list.InitWithFeatures({kIPHGroups} /* enabled_features */, + {} /* disabled_features */); + + std::map<std::string, std::string> group_one_params; + group_one_params["event_trigger"] = + "name:et;comparator:any;window:0;storage:360"; + SetFeatureParams(kChromeTestGroupOne, group_one_params); + + base::HistogramTester histogram_tester; + FeatureVector features; + GroupVector groups = {&kChromeTestGroupOne}; + configuration_.ParseConfigs(features, groups); + + GroupConfig group_one = configuration_.GetGroupConfig(kChromeTestGroupOne); + EXPECT_TRUE(group_one.valid); + + GroupConfig expected_group_one; + expected_group_one.valid = true; + expected_group_one.trigger = EventConfig("et", Comparator(ANY, 0), 0, 360); + EXPECT_EQ(expected_group_one, group_one); + histogram_tester.ExpectBucketCount( + kConfigParseEventName, + static_cast<int>(stats::ConfigParsingEvent::SUCCESS), 1); + histogram_tester.ExpectTotalCount(kConfigParseEventName, 1); +} + +TEST_F(ChromeVariationsConfigurationTest, GroupIgnoresInvalidConfigKeys) { + base::test::ScopedFeatureList scoped_feature_list; + scoped_feature_list.InitWithFeatures({kIPHGroups} /* enabled_features */, + {} /* disabled_features */); + + base::HistogramTester histogram_tester; + std::map<std::string, std::string> group_one_params; + group_one_params["event_trigger"] = + "name:et;comparator:any;window:0;storage:360"; + group_one_params["not_there_yet"] = "bogus value"; // Unrecognized. + group_one_params["still_not_there"] = "another bogus value"; // Unrecognized. + group_one_params["x_this_is_ignored"] = "this value is ignored"; // Ignored. + SetFeatureParams(kChromeTestGroupOne, group_one_params); + + FeatureVector features; + GroupVector groups = {&kChromeTestGroupOne}; + configuration_.ParseConfigs(features, groups); + + GroupConfig group_one = configuration_.GetGroupConfig(kChromeTestGroupOne); + EXPECT_TRUE(group_one.valid); + + GroupConfig expected_group_one; + expected_group_one.valid = true; + expected_group_one.trigger = EventConfig("et", Comparator(ANY, 0), 0, 360); + EXPECT_EQ(expected_group_one, group_one); + + // Exactly 2 keys should be unrecognized and not ignored. + histogram_tester.ExpectBucketCount( + kConfigParseEventName, + static_cast<int>(stats::ConfigParsingEvent::FAILURE_UNKNOWN_KEY), 2); +} + +TEST_F(ChromeVariationsConfigurationTest, + GroupInvalidSessionRateCausesInvalidConfig) { + base::test::ScopedFeatureList scoped_feature_list; + scoped_feature_list.InitWithFeatures({kIPHGroups} /* enabled_features */, + {} /* disabled_features */); + + std::map<std::string, std::string> group_one_params; + group_one_params["event_used"] = + "name:eu;comparator:any;window:1;storage:360"; + group_one_params["event_trigger"] = + "name:et;comparator:any;window:0;storage:360"; + group_one_params["session_rate"] = "bogus value"; + SetFeatureParams(kChromeTestGroupOne, group_one_params); + + base::HistogramTester histogram_tester; + FeatureVector features; + GroupVector groups = {&kChromeTestGroupOne}; + configuration_.ParseConfigs(features, groups); + + GroupConfig group_one = configuration_.GetGroupConfig(kChromeTestGroupOne); + EXPECT_FALSE(group_one.valid); + histogram_tester.ExpectBucketCount( + kConfigParseEventName, + static_cast<int>(stats::ConfigParsingEvent::FAILURE_SESSION_RATE_PARSE), + 1); + histogram_tester.ExpectBucketCount( + kConfigParseEventName, + static_cast<int>(stats::ConfigParsingEvent::FAILURE), 1); + histogram_tester.ExpectTotalCount(kConfigParseEventName, 2); +} + +TEST_F(ChromeVariationsConfigurationTest, + GroupInvalidTriggerCausesInvalidConfig) { + base::test::ScopedFeatureList scoped_feature_list; + scoped_feature_list.InitWithFeatures({kIPHGroups} /* enabled_features */, + {} /* disabled_features */); + + std::map<std::string, std::string> group_one_params; + group_one_params["event_1"] = "name:eu;comparator:any;window:0;storage:360"; + group_one_params["event_trigger"] = "bogus value"; + SetFeatureParams(kChromeTestGroupOne, group_one_params); + + base::HistogramTester histogram_tester; + FeatureVector features; + GroupVector groups = {&kChromeTestGroupOne}; + configuration_.ParseConfigs(features, groups); + + GroupConfig group_one = configuration_.GetGroupConfig(kChromeTestGroupOne); + EXPECT_FALSE(group_one.valid); + histogram_tester.ExpectBucketCount( + kConfigParseEventName, + static_cast<int>(stats::ConfigParsingEvent::FAILURE_TRIGGER_EVENT_PARSE), + 1); + histogram_tester.ExpectBucketCount( + kConfigParseEventName, + static_cast<int>(stats::ConfigParsingEvent::FAILURE), 1); + histogram_tester.ExpectBucketCount( + kConfigParseEventName, + static_cast<int>( + stats::ConfigParsingEvent::FAILURE_TRIGGER_EVENT_MISSING), + 1); + histogram_tester.ExpectTotalCount(kConfigParseEventName, 3); +} + +TEST_F(ChromeVariationsConfigurationTest, + GroupInvalidEventConfigCausesInvalidConfig) { + base::test::ScopedFeatureList scoped_feature_list; + scoped_feature_list.InitWithFeatures({kIPHGroups} /* enabled_features */, + {} /* disabled_features */); + + std::map<std::string, std::string> group_one_params; + group_one_params["event_used"] = + "name:eu;comparator:any;window:0;storage:360"; + group_one_params["event_trigger"] = + "name:et;comparator:any;window:0;storage:360"; + group_one_params["event_used_0"] = "bogus value"; + SetFeatureParams(kChromeTestGroupOne, group_one_params); + + FeatureVector features; + GroupVector groups = {&kChromeTestGroupOne}; + configuration_.ParseConfigs(features, groups); + + GroupConfig group_one = configuration_.GetGroupConfig(kChromeTestGroupOne); + EXPECT_FALSE(group_one.valid); +} + +TEST_F(ChromeVariationsConfigurationTest, GroupMultipleEventsWithSameName) { + base::test::ScopedFeatureList scoped_feature_list; + scoped_feature_list.InitWithFeatures({kIPHGroups} /* enabled_features */, + {} /* disabled_features */); + + std::map<std::string, std::string> group_one_params; + group_one_params["event_trigger"] = + "name:foo;comparator:<1;window:21;storage:31"; + group_one_params["event_2"] = "name:foo;comparator:>2;window:22;storage:32"; + group_one_params["event_3"] = "name:foo;comparator:<=3;window:23;storage:33"; + group_one_params["session_rate"] = "any"; + SetFeatureParams(kChromeTestGroupOne, group_one_params); + + FeatureVector features; + GroupVector groups = {&kChromeTestGroupOne}; + configuration_.ParseConfigs(features, groups); + + GroupConfig group_one = configuration_.GetGroupConfig(kChromeTestGroupOne); + EXPECT_TRUE(group_one.valid); + + GroupConfig expected_group_one; + expected_group_one.valid = true; + expected_group_one.trigger = + EventConfig("foo", Comparator(LESS_THAN, 1), 21, 31); + expected_group_one.event_configs.insert( + EventConfig("foo", Comparator(GREATER_THAN, 2), 22, 32)); + expected_group_one.event_configs.insert( + EventConfig("foo", Comparator(LESS_THAN_OR_EQUAL, 3), 23, 33)); + expected_group_one.session_rate = Comparator(ANY, 0); + EXPECT_EQ(expected_group_one, group_one); +} + +TEST_F(ChromeVariationsConfigurationTest, ParseMultipleGroups) { + base::test::ScopedFeatureList scoped_feature_list; + scoped_feature_list.InitWithFeatures({kIPHGroups} /* enabled_features */, + {} /* disabled_features */); + + std::map<std::string, std::string> group_one_params; + group_one_params["event_trigger"] = + "name:foo_trigger;comparator:<1;window:21;storage:31"; + group_one_params["session_rate"] = "==10"; + SetFeatureParams(kChromeTestGroupOne, group_one_params); + + std::map<std::string, std::string> group_two_params; + group_two_params["event_trigger"] = "bogus value"; + SetFeatureParams(kChromeTestGroupTwo, group_two_params); + + std::map<std::string, std::string> group_three_params; + group_three_params["event_trigger"] = + "name:qux_trigger;comparator:ANY;window:103;storage:104"; + group_three_params["event_0"] = "name:q0;comparator:<10;window:20;storage:30"; + group_three_params["event_1"] = "name:q1;comparator:>11;window:21;storage:31"; + group_three_params["event_2"] = + "name:q2;comparator:<=12;window:22;storage:32"; + group_three_params["event_3"] = + "name:q3;comparator:>=13;window:23;storage:33"; + group_three_params["event_4"] = + "name:q4;comparator:==14;window:24;storage:34"; + group_three_params["event_5"] = + "name:q5;comparator:!=15;window:25;storage:35"; + group_three_params["session_rate"] = "!=13"; + SetFeatureParams(kChromeTestGroupThree, group_three_params); + + FeatureVector features; + GroupVector groups = {&kChromeTestGroupOne, &kChromeTestGroupTwo, + &kChromeTestGroupThree}; + configuration_.ParseConfigs(features, groups); + + GroupConfig group_one = configuration_.GetGroupConfig(kChromeTestGroupOne); + EXPECT_TRUE(group_one.valid); + GroupConfig expected_group_one; + expected_group_one.valid = true; + expected_group_one.trigger = + EventConfig("foo_trigger", Comparator(LESS_THAN, 1), 21, 31); + expected_group_one.session_rate = Comparator(EQUAL, 10); + EXPECT_EQ(expected_group_one, group_one); + + GroupConfig group_two = configuration_.GetGroupConfig(kChromeTestGroupTwo); + EXPECT_FALSE(group_two.valid); + + GroupConfig group_three = + configuration_.GetGroupConfig(kChromeTestGroupThree); + EXPECT_TRUE(group_three.valid); + GroupConfig expected_group_three; + expected_group_three.valid = true; + expected_group_three.trigger = + EventConfig("qux_trigger", Comparator(ANY, 0), 103, 104); + expected_group_three.event_configs.insert( + EventConfig("q0", Comparator(LESS_THAN, 10), 20, 30)); + expected_group_three.event_configs.insert( + EventConfig("q1", Comparator(GREATER_THAN, 11), 21, 31)); + expected_group_three.event_configs.insert( + EventConfig("q2", Comparator(LESS_THAN_OR_EQUAL, 12), 22, 32)); + expected_group_three.event_configs.insert( + EventConfig("q3", Comparator(GREATER_THAN_OR_EQUAL, 13), 23, 33)); + expected_group_three.event_configs.insert( + EventConfig("q4", Comparator(EQUAL, 14), 24, 34)); + expected_group_three.event_configs.insert( + EventConfig("q5", Comparator(NOT_EQUAL, 15), 25, 35)); + expected_group_three.session_rate = Comparator(NOT_EQUAL, 13); + EXPECT_EQ(expected_group_three, group_three); +} + +TEST_F(ChromeVariationsConfigurationTest, CheckedInGroupConfigIsReadable) { + base::test::ScopedFeatureList scoped_feature_list; + scoped_feature_list.InitWithFeatures({kIPHGroups} /* enabled_features */, + {} /* disabled_features */); + + base::test::ScopedFeatureList local_feature_list; + local_feature_list.InitWithFeatureState(kIPHDummyGroup, true); + base::HistogramTester histogram_tester; + FeatureVector features; + GroupVector groups = {&kIPHDummyGroup}; + configuration_.ParseConfigs(features, groups); + + GroupConfig expected; + expected.valid = false; + expected.session_rate = Comparator(LESS_THAN, 0); + expected.trigger = + EventConfig("dummy_group_iph_trigger", Comparator(LESS_THAN, 0), 1, 1); + + const GroupConfig& config = configuration_.GetGroupConfig(kIPHDummyGroup); + EXPECT_EQ(expected, config); + histogram_tester.ExpectBucketCount( + kConfigParseEventName, + static_cast<int>(stats::ConfigParsingEvent::SUCCESS_FROM_SOURCE), 1); + histogram_tester.ExpectTotalCount(kConfigParseEventName, 1); +} + +TEST_F(ChromeVariationsConfigurationTest, + CheckedInGroupConfigButDisabledGroupIsInvalid) { + base::test::ScopedFeatureList scoped_feature_list; + scoped_feature_list.InitWithFeatures( + {kIPHGroups} /* enabled_features */, + {kIPHDummyGroup} /* disabled_features */); + base::HistogramTester histogram_tester; + FeatureVector features; + GroupVector groups = {&kIPHDummyGroup}; + configuration_.ParseConfigs(features, groups); + + GroupConfig expected; + expected.valid = false; + + const GroupConfig& config = configuration_.GetGroupConfig(kIPHDummyGroup); + EXPECT_EQ(expected, config); + histogram_tester.ExpectBucketCount( + kConfigParseEventName, + static_cast<int>(stats::ConfigParsingEvent::FAILURE_NO_FIELD_TRIAL), 1); + histogram_tester.ExpectTotalCount(kConfigParseEventName, 1); +} + +TEST_F(ChromeVariationsConfigurationTest, NonExistingGroupConfigIsInvalid) { + base::test::ScopedFeatureList scoped_feature_list; + scoped_feature_list.InitWithFeatures({kIPHGroups} /* enabled_features */, + {} /* disabled_features */); + + base::HistogramTester histogram_tester; + FeatureVector features; + GroupVector groups = {&kIPHDummyGroup}; + configuration_.ParseConfigs(features, groups); + + GroupConfig expected; + expected.valid = false; + + const GroupConfig& config = configuration_.GetGroupConfig(kIPHDummyGroup); + EXPECT_EQ(expected, config); + histogram_tester.ExpectBucketCount( + kConfigParseEventName, + static_cast<int>(stats::ConfigParsingEvent::FAILURE_NO_FIELD_TRIAL), 1); + histogram_tester.ExpectTotalCount(kConfigParseEventName, 1); +} + } // namespace feature_engagement
diff --git a/components/feature_engagement/internal/tracker_impl.cc b/components/feature_engagement/internal/tracker_impl.cc index 2adaf77..1a4ab51 100644 --- a/components/feature_engagement/internal/tracker_impl.cc +++ b/components/feature_engagement/internal/tracker_impl.cc
@@ -38,6 +38,8 @@ #include "components/feature_engagement/internal/system_time_provider.h" #include "components/feature_engagement/public/feature_constants.h" #include "components/feature_engagement/public/feature_list.h" +#include "components/feature_engagement/public/group_constants.h" +#include "components/feature_engagement/public/group_list.h" #include "components/leveldb_proto/public/proto_database_provider.h" #include "third_party/abseil-cpp/absl/types/optional.h" @@ -112,7 +114,7 @@ std::make_unique<PersistentEventStore>(std::move(event_db)); auto configuration = std::make_unique<ChromeVariationsConfiguration>(); - configuration->ParseFeatureConfigs(GetAllFeatures()); + configuration->ParseConfigs(GetAllFeatures(), GetAllGroups()); auto event_storage_validator = std::make_unique<FeatureConfigEventStorageValidator>();
diff --git a/components/feature_engagement/test/test_tracker.cc b/components/feature_engagement/test/test_tracker.cc index 8874373..c7b5212 100644 --- a/components/feature_engagement/test/test_tracker.cc +++ b/components/feature_engagement/test/test_tracker.cc
@@ -24,7 +24,7 @@ // static std::unique_ptr<Tracker> CreateTestTracker() { auto configuration = std::make_unique<ChromeVariationsConfiguration>(); - configuration->ParseFeatureConfigs(GetAllFeatures()); + configuration->ParseConfigs(GetAllFeatures(), GetAllGroups()); auto storage_validator = std::make_unique<FeatureConfigEventStorageValidator>();
diff --git a/components/headless/OWNERS b/components/headless/OWNERS new file mode 100644 index 0000000..d299b1ba --- /dev/null +++ b/components/headless/OWNERS
@@ -0,0 +1 @@ +file://headless/OWNERS
diff --git a/components/headless/command_handler/BUILD.gn b/components/headless/command_handler/BUILD.gn new file mode 100644 index 0000000..35b481a --- /dev/null +++ b/components/headless/command_handler/BUILD.gn
@@ -0,0 +1,49 @@ +# Copyright 2023 The Chromium Authors +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +import("//tools/grit/grit_rule.gni") +import("//tools/grit/repack.gni") + +grit("headless_command_resources") { + source = "headless_command.grd" + outputs = [ + "grit/headless_command_resources.h", + "$root_gen_dir/components/headless/command_handler/headless_command_resources.pak", + ] + + use_brotli = true +} + +repack("headless_command_resources_pack") { + sources = [ "$root_gen_dir/components/headless/command_handler/headless_command_resources.pak" ] + + output = "$root_out_dir/headless_command_resources.pak" + + deps = [ ":headless_command_resources" ] +} + +static_library("command_handler") { + sources = [ + "headless_command_handler.cc", + "headless_command_handler.h", + "headless_command_switches.cc", + "headless_command_switches.h", + ] + + deps = [ + "//base", + "//base:i18n", + "//components/devtools/simple_devtools_protocol_client", + "//content", + "//content/public/app", + "//content/public/browser", + "//ui/base", + "//url", + ] + + public_deps = [ + ":headless_command_resources", + ":headless_command_resources_pack", + ] +}
diff --git a/components/headless/command_handler/DEPS b/components/headless/command_handler/DEPS new file mode 100644 index 0000000..371dbc6 --- /dev/null +++ b/components/headless/command_handler/DEPS
@@ -0,0 +1,6 @@ +include_rules = [ + "+components/devtools", + "+content/public/browser", + "+content/public/common", + "+ui/base/resource", +]
diff --git a/headless/app/headless_command.grd b/components/headless/command_handler/headless_command.grd similarity index 100% rename from headless/app/headless_command.grd rename to components/headless/command_handler/headless_command.grd
diff --git a/headless/app/headless_command.html b/components/headless/command_handler/headless_command.html similarity index 100% rename from headless/app/headless_command.html rename to components/headless/command_handler/headless_command.html
diff --git a/components/headless/command_handler/headless_command.js b/components/headless/command_handler/headless_command.js new file mode 100644 index 0000000..8599ea9 --- /dev/null +++ b/components/headless/command_handler/headless_command.js
@@ -0,0 +1,316 @@ +// 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. + +// +// CDPClient +// +class CDPClient { + constructor() { + this._requestId = 0; + this._sessions = new Map(); + } + + nextRequestId() { + return ++this._requestId; + } + + addSession(session) { + this._sessions.set(session.sessionId(), session); + } + + getSession(sessionId) { + this._sessions.get(sessionId); + } + + async dispatchMessage(message) { + const messageObject = JSON.parse(message); + const session = this._sessions.get(messageObject.sessionId || ''); + if (session) { + session.dispatchMessage(messageObject); + } + } + + reportError(message, error) { + if (error) { + console.error(`${message}: ${error}\n${error.stack}`); + } else { + console.error(message); + } + } +} + +const cdpClient = new CDPClient(); + +// +// CDPSession +// +class CDPSession { + constructor(sessionId) { + this._sessionId = sessionId || ''; + this._parentSessionId = null; + this._dispatchTable = new Map(); + this._eventHandlers = new Map(); + this._protocol = this._getProtocol(); + cdpClient.addSession(this); + } + + sessionId() { + return this._sessionId; + } + + protocol() { + return this._protocol; + } + + createSession(sessionId) { + const session = new CDPSession(sessionId); + session._parentSessionId = this._sessionId; + return session; + } + + async sendCommand(method, params) { + const requestId = cdpClient.nextRequestId(); + const messageObject = {'id': requestId, 'method': method, 'params': params}; + if (this._sessionId) { + messageObject.sessionId = this._sessionId; + } + sendDevToolsMessage(JSON.stringify(messageObject)); + return new Promise(f => this._dispatchTable.set(requestId, f)); + } + + async dispatchMessage(message) { + try { + const messageId = message.id; + if (typeof messageId === 'number') { + const handler = this._dispatchTable.get(messageId); + if (handler) { + this._dispatchTable.delete(messageId); + handler(message); + } else { + cdpClient.reportError(`Unexpected result id ${messageId}`); + } + } else { + const eventName = message.method; + for (const handler of (this._eventHandlers.get(eventName) || [])) { + handler(message); + } + } + } catch (e) { + cdpClient.reportError( + `Exception when dispatching message\n' + + '${JSON.stringify(message)}`, + e); + } + } + + _getProtocol() { + return new Proxy({}, { + get: (target, domainName, receiver) => new Proxy({}, { + get: (target, methodName, receiver) => { + const eventPattern = /^(on(ce)?|off)([A-Z][A-Za-z0-9]*)/; + const match = eventPattern.exec(methodName); + if (!match) { + return args => this.sendCommand( + `${domainName}.${methodName}`, args || {}); + } + let eventName = match[3]; + eventName = eventName.charAt(0).toLowerCase() + eventName.slice(1); + if (match[1] === 'once') { + return eventMatcher => this._waitForEvent( + `${domainName}.${eventName}`, eventMatcher); + } + if (match[1] === 'off') { + return listener => this._removeEventHandler( + `${domainName}.${eventName}`, listener); + } + return listener => this._addEventHandler( + `${domainName}.${eventName}`, listener); + }, + }), + }); + } + + _waitForEvent(eventName, eventMatcher) { + return new Promise(callback => { + const handler = result => { + if (eventMatcher && !eventMatcher(result)) { + return; + } + this._removeEventHandler(eventName, handler); + callback(result); + }; + this._addEventHandler(eventName, handler); + }); + } + + _addEventHandler(eventName, handler) { + const handlers = this._eventHandlers.get(eventName) || []; + handlers.push(handler); + this._eventHandlers.set(eventName, handlers); + } + + _removeEventHandler(eventName, handler) { + const handlers = this._eventHandlers.get(eventName) || []; + const index = handlers.indexOf(handler); + if (index === -1) { + return; + } + handlers.splice(index, 1); + this._eventHandlers.set(eventName, handlers); + } +} + +// +// TargetPage +// +class TargetPage { + constructor(browserSession) { + this._browserSession = browserSession; + this._targetId = ''; + this._session; + } + + static async createAndNavigate(browserSession, url) { + const targetPage = new TargetPage(browserSession); + + const dp = browserSession.protocol(); + const params = {url: 'about:blank', width: 800, height: 600}; + const createContextOptions = {}; + params.browserContextId = + (await dp.Target.createBrowserContext(createContextOptions)) + .result.browserContextId; + targetPage._targetId = + (await dp.Target.createTarget(params)).result.targetId; + + const sessionId = (await dp.Target.attachToTarget({ + targetId: targetPage._targetId, + flatten: true, + })).result.sessionId; + targetPage._session = browserSession.createSession(sessionId); + + await targetPage._navigate(url); + + return targetPage; + } + + targetId() { + return this._targetId; + } + + session() { + return this._session; + } + + async _navigate(url) { + const dp = this._session.protocol(); + await dp.Page.enable(); + await dp.Page.setLifecycleEventsEnabled({enabled: true}); + const frameId = (await dp.Page.navigate({url})).result.frameId; + await dp.Page.onceLifecycleEvent( + event => + event.params.name === 'load' && event.params.frameId === frameId); + } +} + +// +// Command handlers +// +async function dumpDOM(dp) { + const script = '(document.doctype ? new ' + + 'XMLSerializer().serializeToString(document.doctype) + \'\\n\' : \'\')' + + ' + document.documentElement.outerHTML'; + + const response = await dp.Runtime.evaluate({expression: script}); + return response.result.result.value; +} + +async function printToPDF(dp, params) { + const displayHeaderFooter = !params.noHeaderFooter; + + const printToPDFParams = { + displayHeaderFooter, + printBackground: true, + preferCSSPageSize: true, + }; + + const response = await dp.Page.printToPDF(printToPDFParams); + return response.result.data; +} + +async function screenshot(dp, params) { + const format = params.format || 'png'; + const screenshotParams = { + format, + }; + const response = await dp.Page.captureScreenshot(screenshotParams); + return response.result.data; +} + +async function handleCommands(dp, commands) { + const result = {}; + if ('dumpDom' in commands) { + result.dumpDomResult = await dumpDOM(dp); + } + + if ('printToPDF' in commands) { + result.printToPdfResult = await printToPDF(dp, commands.printToPDF); + } + + if ('screenshot' in commands) { + result.screenshotResult = await screenshot(dp, commands.screenshot); + } + + return result; +} + +// +// Target.exposeDevToolsProtocol() communication functions. +// +window.cdp.onmessage = json => { + // console.log('[recv] ' + json); + cdpClient.dispatchMessage(json); +}; + +function sendDevToolsMessage(json) { + // console.log('[send] ' + json); + window.cdp.send(json); +} + +// +// This is called from the host. +// +async function executeCommands(commands) { + const browserSession = new CDPSession(); + const targetPage = + await TargetPage.createAndNavigate(browserSession, commands.targetUrl); + const dp = targetPage.session().protocol(); + + if ('defaultBackgroundColor' in commands) { + await dp.Emulation.setDefaultBackgroundColorOverride( + {color: commands.defaultBackgroundColor}); + } + + const promises = []; + if ('timeout' in commands) { + const timeoutPromise = new Promise(resolve => { + setTimeout(resolve, commands.timeout); + }); + promises.push(timeoutPromise); + } + + if ('virtualTimeBudget' in commands) { + await dp.Emulation.setVirtualTimePolicy({ + budget: commands.virtualTimeBudget, + maxVirtualTimeTaskStarvationCount: 9999, + policy: 'pauseIfNetworkFetchesPending', + }); + promises.push(dp.Emulation.onceVirtualTimeBudgetExpired()); + } + + if (promises.length > 0) { + await Promise.race(promises); + } + + return await handleCommands(dp, commands); +}
diff --git a/components/headless/command_handler/headless_command_handler.cc b/components/headless/command_handler/headless_command_handler.cc new file mode 100644 index 0000000..22476e2 --- /dev/null +++ b/components/headless/command_handler/headless_command_handler.cc
@@ -0,0 +1,378 @@ +// 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. + +#include "components/headless/command_handler/headless_command_handler.h" + +#include <cstdint> +#include <iostream> +#include <map> + +#include "base/base64.h" +#include "base/bind.h" +#include "base/callback.h" +#include "base/command_line.h" +#include "base/containers/adapters.h" +#include "base/containers/span.h" +#include "base/files/file.h" +#include "base/files/file_path.h" +#include "base/files/file_util.h" +#include "base/json/json_writer.h" +#include "base/logging.h" +#include "base/path_service.h" +#include "base/strings/strcat.h" +#include "base/strings/string_number_conversions.h" +#include "base/strings/string_util.h" +#include "base/task/sequenced_task_runner.h" +#include "base/task/task_traits.h" +#include "base/task/thread_pool.h" +#include "build/build_config.h" +#include "components/headless/command_handler/grit/headless_command_resources.h" +#include "components/headless/command_handler/headless_command_switches.h" +#include "content/public/browser/browser_task_traits.h" +#include "content/public/browser/browser_thread.h" +#include "content/public/browser/web_contents.h" +#include "content/public/browser/web_ui_data_source.h" +#include "content/public/common/content_switches.h" +#include "ui/base/resource/resource_bundle.h" + +namespace headless { + +namespace { + +// Default file name for screenshot. Can be overridden by "--screenshot" switch. +const char kDefaultScreenshotFileName[] = "screenshot.png"; +// Default file name for pdf. Can be overridden by "--print-to-pdf" switch. +const char kDefaultPDFFileName[] = "output.pdf"; + +const char kChromeHeadlessHost[] = "headless"; +const char kChromeHeadlessURL[] = "chrome://headless/"; + +const char kHeadlessCommandHtml[] = "headless_command.html"; +const char kHeadlessCommandJs[] = "headless_command.js"; + +content::WebUIDataSource* CreateHeadlessHostDataSource() { + base::FilePath resource_dir; + bool result = base::PathService::Get(base::DIR_ASSETS, &resource_dir); + DCHECK(result); + + // Try loading the headless library pak file first. If it doesn't exist (i.e., + // when we're running with the --headless switch), fall back to the browser's + // resource pak. + base::FilePath resource_pack = + resource_dir.Append(FILE_PATH_LITERAL("headless_command_resources.pak")); + if (base::PathExists(resource_pack)) { + ui::ResourceBundle::GetSharedInstance().AddDataPackFromPath( + resource_pack, ui::kScaleFactorNone); + } + + content::WebUIDataSource* source = + content::WebUIDataSource::Create(kChromeHeadlessHost); + + source->AddResourcePath(kHeadlessCommandHtml, IDR_HEADLESS_COMMAND_HTML); + source->AddResourcePath(kHeadlessCommandJs, IDR_HEADLESS_COMMAND_JS); + + return source; +} + +base::Value::Dict GetColorDictFromHexColor(uint32_t color, bool has_alpha) { + base::Value::Dict dict; + if (has_alpha) { + dict.Set("r", static_cast<int>((color & 0xff000000) >> 24)); + dict.Set("g", static_cast<int>((color & 0x00ff0000) >> 16)); + dict.Set("b", static_cast<int>((color & 0x0000ff00) >> 8)); + dict.Set("a", static_cast<int>((color & 0x000000ff))); + } else { + dict.Set("r", static_cast<int>((color & 0xff0000) >> 16)); + dict.Set("g", static_cast<int>((color & 0x00ff00) >> 8)); + dict.Set("b", static_cast<int>((color & 0x0000ff))); + } + + return dict; +} + +bool GetCommandDictAndOutputPaths(base::Value::Dict* commands, + base::FilePath* pdf_file_path, + base::FilePath* screenshot_file_path) { + const base::CommandLine* command_line = + base::CommandLine::ForCurrentProcess(); + + // --dump-dom + if (command_line->HasSwitch(switches::kDumpDom)) { + commands->Set("dumpDom", true); + } + + // --print-to-pdf=[output path] + if (command_line->HasSwitch(switches::kPrintToPDF)) { + base::FilePath path = + command_line->GetSwitchValuePath(switches::kPrintToPDF); + if (path.empty()) { + path = base::FilePath().AppendASCII(kDefaultPDFFileName); + } + *pdf_file_path = path; + + base::Value::Dict params; + if (command_line->HasSwitch(switches::kPrintToPDFNoHeader)) { + params.Set("noHeaderFooter", true); + } + + commands->Set("printToPDF", std::move(params)); + } + + // --screenshot=[output path] + if (command_line->HasSwitch(switches::kScreenshot)) { + base::FilePath path = + command_line->GetSwitchValuePath(switches::kScreenshot); + if (path.empty()) { + path = base::FilePath().AppendASCII(kDefaultScreenshotFileName); + } + *screenshot_file_path = path; + + base::FilePath::StringType extension = + base::ToLowerASCII(path.FinalExtension()); + + static const std::map<const base::FilePath::StringType, const char*> + kImageFileTypes{ + {FILE_PATH_LITERAL(".jpeg"), "jpeg"}, + {FILE_PATH_LITERAL(".jpg"), "jpeg"}, + {FILE_PATH_LITERAL(".png"), "png"}, + {FILE_PATH_LITERAL(".webp"), "webp"}, + }; + + auto it = kImageFileTypes.find(extension); + if (it == kImageFileTypes.cend()) { + LOG(ERROR) << "Unsupported screenshot image file type: " + << path.FinalExtension(); + return false; + } + + base::Value::Dict params; + params.Set("format", it->second); + commands->Set("screenshot", std::move(params)); + } + + // --default-background-color=rrggbb[aa] + if (command_line->HasSwitch(switches::kDefaultBackgroundColor)) { + std::string hex_color = + command_line->GetSwitchValueASCII(switches::kDefaultBackgroundColor); + uint32_t color; + if (!(hex_color.length() == 6 || hex_color.length() == 8) || + !base::HexStringToUInt(hex_color, &color)) { + LOG(ERROR) + << "Expected a hex RGB or RGBA value for --default-background-color=" + << hex_color; + return false; + } + + commands->Set("defaultBackgroundColor", + GetColorDictFromHexColor(color, hex_color.length() == 8)); + } + + // virtual-time-budget=[ms] + if (command_line->HasSwitch(switches::kVirtualTimeBudget)) { + std::string budget_ms_str = + command_line->GetSwitchValueASCII(switches::kVirtualTimeBudget); + int budget_ms; + if (!base::StringToInt(budget_ms_str, &budget_ms)) { + LOG(ERROR) << "Expected an integer value for --virtual-time-budget=" + << budget_ms_str; + return false; + } + + commands->Set("virtualTimeBudget", budget_ms); + } + + // timeout=[ms] + if (command_line->HasSwitch(switches::kTimeout)) { + std::string timeout_ms_str = + command_line->GetSwitchValueASCII(switches::kTimeout); + int timeout_ms; + if (!base::StringToInt(timeout_ms_str, &timeout_ms)) { + LOG(ERROR) << "Expected an integer value for --timeout=" + << timeout_ms_str; + return false; + } + + commands->Set("timeout", timeout_ms); + } + + return true; +} + +void WriteFileTask(base::FilePath file_path, std::string file_data) { + auto file_span = base::make_span( + reinterpret_cast<const uint8_t*>(file_data.data()), file_data.size()); + if (base::WriteFile(file_path, file_span)) { + std::cerr << file_data.size() << " bytes written to file " << file_path + << std::endl; + } else { + PLOG(ERROR) << "Failed to write file " << file_path; + } +} + +void WriteFile(base::FilePath file_path, + std::string base64_file_data, + scoped_refptr<base::SequencedTaskRunner> io_task_runner) { + std::string file_data; + CHECK(base::Base64Decode(base64_file_data, &file_data)); + + io_task_runner->PostTask(FROM_HERE, + base::BindOnce(&WriteFileTask, std::move(file_path), + std::move(file_data))); +} + +} // namespace + +HeadlessCommandHandler::HeadlessCommandHandler( + content::WebContents* web_contents, + GURL target_url, + DoneCallback done_callback, + scoped_refptr<base::SequencedTaskRunner> io_task_runner) + : web_contents_(web_contents), + target_url_(std::move(target_url)), + done_callback_(std::move(done_callback)), + io_task_runner_(std::move(io_task_runner)) { + DCHECK(io_task_runner_); + + // Load command execution harness resources and create URL data source + // for chrome://headless. + content::WebUIDataSource::Add(web_contents_->GetBrowserContext(), + CreateHeadlessHostDataSource()); + + content::WebContentsObserver::Observe(web_contents_); + + browser_devtools_client_.AttachToBrowser(); + devtools_client_.AttachToWebContents(web_contents_); +} + +HeadlessCommandHandler::~HeadlessCommandHandler() = default; + +// static +GURL HeadlessCommandHandler::GetHandlerUrl() { + const std::string url = + base::StrCat({kChromeHeadlessURL, kHeadlessCommandHtml}); + return GURL(url); +} + +// static +bool HeadlessCommandHandler::HasHeadlessCommandSwitches( + const base::CommandLine& command_line) { + static const char* kCommandSwitches[] = { + switches::kDefaultBackgroundColor, + switches::kDumpDom, + switches::kPrintToPDF, + switches::kPrintToPDFNoHeader, + switches::kScreenshot, + switches::kTimeout, + switches::kVirtualTimeBudget, + }; + + for (const char* command_switch : kCommandSwitches) { + if (command_line.HasSwitch(command_switch)) { + return true; + } + } + + return false; +} + +// static +void HeadlessCommandHandler::ProcessCommands( + content::WebContents* web_contents, + GURL target_url, + DoneCallback done_callback, + scoped_refptr<base::SequencedTaskRunner> io_task_runner) { + if (!io_task_runner) { + io_task_runner = base::ThreadPool::CreateSequencedTaskRunner( + {base::MayBlock(), base::TaskPriority::USER_BLOCKING, + base::TaskShutdownBehavior::BLOCK_SHUTDOWN}); + } + // Headless Command Handler instance will self delete when done. + HeadlessCommandHandler* command_handler = + new HeadlessCommandHandler(web_contents, std::move(target_url), + std::move(done_callback), io_task_runner); + + command_handler->ExecuteCommands(); +} + +void HeadlessCommandHandler::ExecuteCommands() { + // Expose DevTools protocol to the target. + base::Value::Dict params; + params.Set("targetId", devtools_client_.GetTargetId()); + browser_devtools_client_.SendCommand("Target.exposeDevToolsProtocol", + std::move(params)); + + // Set up Inspector domain. + devtools_client_.AddEventHandler( + "Inspector.targetCrashed", + base::BindRepeating(&HeadlessCommandHandler::OnTargetCrashed, + base::Unretained(this))); + devtools_client_.SendCommand("Inspector.enable"); +} + +void HeadlessCommandHandler::DocumentOnLoadCompletedInPrimaryMainFrame() { + base::Value::Dict commands; + if (!GetCommandDictAndOutputPaths(&commands, &pdf_file_path_, + &screenshot_file_path_) || + commands.empty()) { + Done(); + return; + } + + commands.Set("targetUrl", target_url_.spec()); + + std::string json_commands; + base::JSONWriter::Write(commands, &json_commands); + std::string script = "executeCommands(JSON.parse('" + json_commands + "'))"; + + base::Value::Dict params; + params.Set("expression", script); + params.Set("awaitPromise", true); + params.Set("returnByValue", true); + devtools_client_.SendCommand( + "Runtime.evaluate", std::move(params), + base::BindOnce(&HeadlessCommandHandler::OnCommandsResult, + base::Unretained(this))); +} + +void HeadlessCommandHandler::WebContentsDestroyed() { + CHECK(false); +} + +void HeadlessCommandHandler::OnTargetCrashed(const base::Value::Dict&) { + LOG(ERROR) << "Abnormal renderer termination."; + Done(); +} + +void HeadlessCommandHandler::OnCommandsResult(base::Value::Dict result) { + if (std::string* dom_dump = + result.FindStringByDottedPath("result.result.value.dumpDomResult")) { + std::cout << *dom_dump << std::endl; + } + + if (std::string* base64_data = result.FindStringByDottedPath( + "result.result.value.screenshotResult")) { + WriteFile(std::move(screenshot_file_path_), std::move(*base64_data), + io_task_runner_); + } + + if (std::string* base64_data = result.FindStringByDottedPath( + "result.result.value.printToPdfResult")) { + WriteFile(std::move(pdf_file_path_), std::move(*base64_data), + io_task_runner_); + } + + Done(); +} + +void HeadlessCommandHandler::Done() { + DCHECK(web_contents_); + devtools_client_.DetachClient(); + browser_devtools_client_.DetachClient(); + + DoneCallback done_callback(std::move(done_callback_)); + delete this; + std::move(done_callback).Run(); +} + +} // namespace headless
diff --git a/components/headless/command_handler/headless_command_handler.h b/components/headless/command_handler/headless_command_handler.h new file mode 100644 index 0000000..44de602 --- /dev/null +++ b/components/headless/command_handler/headless_command_handler.h
@@ -0,0 +1,79 @@ +// 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 COMPONENTS_HEADLESS_COMMAND_HANDLER_HEADLESS_COMMAND_HANDLER_H_ +#define COMPONENTS_HEADLESS_COMMAND_HANDLER_HEADLESS_COMMAND_HANDLER_H_ + +#include "base/command_line.h" +#include "base/files/file_path.h" +#include "base/functional/callback.h" +#include "base/memory/raw_ptr.h" +#include "base/task/sequenced_task_runner.h" +#include "base/values.h" +#include "components/devtools/simple_devtools_protocol_client/simple_devtools_protocol_client.h" +#include "content/public/browser/web_contents_observer.h" +#include "url/gurl.h" + +namespace content { +class WebContents; +} // namespace content + +namespace headless { + +class HeadlessCommandHandler : public content::WebContentsObserver { + public: + typedef base::OnceCallback<void()> DoneCallback; + + HeadlessCommandHandler(const HeadlessCommandHandler&) = delete; + HeadlessCommandHandler& operator=(const HeadlessCommandHandler&) = delete; + + static GURL GetHandlerUrl(); + + static bool HasHeadlessCommandSwitches(const base::CommandLine& command_line); + + // The caller may override the TaskRunner used for file I/O by providing + // a value for |io_task_runner|. + static void ProcessCommands( + content::WebContents* web_contents, + GURL target_url, + DoneCallback done_callback, + scoped_refptr<base::SequencedTaskRunner> io_task_runner = {}); + + private: + using SimpleDevToolsProtocolClient = + simple_devtools_protocol_client::SimpleDevToolsProtocolClient; + + HeadlessCommandHandler( + content::WebContents* web_contents, + GURL target_url, + DoneCallback done_callback, + scoped_refptr<base::SequencedTaskRunner> io_task_runner); + ~HeadlessCommandHandler() override; + + void ExecuteCommands(); + + // content::WebContentsObserver implementation: + void DocumentOnLoadCompletedInPrimaryMainFrame() override; + void WebContentsDestroyed() override; + + void OnTargetCrashed(const base::Value::Dict&); + + void OnCommandsResult(base::Value::Dict result); + + void Done(); + + SimpleDevToolsProtocolClient devtools_client_; + SimpleDevToolsProtocolClient browser_devtools_client_; + raw_ptr<content::WebContents> web_contents_; + GURL target_url_; + DoneCallback done_callback_; + scoped_refptr<base::SequencedTaskRunner> io_task_runner_; + + base::FilePath pdf_file_path_; + base::FilePath screenshot_file_path_; +}; + +} // namespace headless + +#endif // COMPONENTS_HEADLESS_COMMAND_HANDLER_HEADLESS_COMMAND_HANDLER_H_
diff --git a/components/headless/command_handler/headless_command_switches.cc b/components/headless/command_handler/headless_command_switches.cc new file mode 100644 index 0000000..9038478 --- /dev/null +++ b/components/headless/command_handler/headless_command_switches.cc
@@ -0,0 +1,38 @@ +// 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. + +#include "components/headless/command_handler/headless_command_switches.h" + +namespace headless::switches { + +// The background color to be used if the page doesn't specify one. Provided as +// RGB or RGBA integer value in hex, e.g. 'ff0000ff' for red or '00000000' for +// transparent. +const char kDefaultBackgroundColor[] = "default-background-color"; + +// Instructs headless_shell to print document.body.innerHTML to stdout. +const char kDumpDom[] = "dump-dom"; + +// Save a pdf file of the loaded page. +const char kPrintToPDF[] = "print-to-pdf"; + +// Do not display header and footer in the pdf file. +const char kPrintToPDFNoHeader[] = "print-to-pdf-no-header"; + +// Save a screenshot of the loaded page. +const char kScreenshot[] = "screenshot"; + +// Issues a stop after the specified number of milliseconds. This cancels all +// navigation and causes the DOMContentLoaded event to fire. +const char kTimeout[] = "timeout"; + +// If set the system waits the specified number of virtual milliseconds before +// deeming the page to be ready. For determinism virtual time does not advance +// while there are pending network fetches (i.e no timers will fire). Once all +// network fetches have completed, timers fire and if the system runs out of +// virtual time is fastforwarded so the next timer fires immediately, until the +// specified virtual time budget is exhausted. +const char kVirtualTimeBudget[] = "virtual-time-budget"; + +} // namespace headless::switches
diff --git a/components/headless/command_handler/headless_command_switches.h b/components/headless/command_handler/headless_command_switches.h new file mode 100644 index 0000000..4a98ea72b --- /dev/null +++ b/components/headless/command_handler/headless_command_switches.h
@@ -0,0 +1,20 @@ +// 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 COMPONENTS_HEADLESS_COMMAND_HANDLER_HEADLESS_COMMAND_SWITCHES_H_ +#define COMPONENTS_HEADLESS_COMMAND_HANDLER_HEADLESS_COMMAND_SWITCHES_H_ + +namespace headless::switches { + +extern const char kDefaultBackgroundColor[]; +extern const char kDumpDom[]; +extern const char kPrintToPDF[]; +extern const char kPrintToPDFNoHeader[]; +extern const char kScreenshot[]; +extern const char kTimeout[]; +extern const char kVirtualTimeBudget[]; + +} // namespace headless::switches + +#endif // COMPONENTS_HEADLESS_COMMAND_HANDLER_HEADLESS_COMMAND_SWITCHES_H_
diff --git a/components/history_clusters/core/history_clusters_debug_jsons.cc b/components/history_clusters/core/history_clusters_debug_jsons.cc index cded27f..3cd689a3b 100644 --- a/components/history_clusters/core/history_clusters_debug_jsons.cc +++ b/components/history_clusters/core/history_clusters_debug_jsons.cc
@@ -4,16 +4,26 @@ #include "history_clusters_debug_jsons.h" +#include <string> +#include <unordered_map> +#include <unordered_set> #include <utility> +#include <vector> #include "base/json/json_writer.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" +#include "base/time/time_to_iso8601.h" #include "base/values.h" +#include "components/history/core/browser/history_types.h" #include "components/history_clusters/core/history_clusters_util.h" namespace history_clusters { +std::string GetDebugTime(const base::Time time) { + return time.is_null() ? "null" : base::TimeToISO8601(time); +} + // Gets a loggable JSON representation of `visits`. std::string GetDebugJSONForVisits( const std::vector<history::AnnotatedVisit>& visits) {
diff --git a/components/history_clusters/core/history_clusters_debug_jsons.h b/components/history_clusters/core/history_clusters_debug_jsons.h index 2d33ac6..199107b 100644 --- a/components/history_clusters/core/history_clusters_debug_jsons.h +++ b/components/history_clusters/core/history_clusters_debug_jsons.h
@@ -6,14 +6,21 @@ #define COMPONENTS_HISTORY_CLUSTERS_CORE_HISTORY_CLUSTERS_DEBUG_JSONS_H_ #include <string> +#include <unordered_map> #include <unordered_set> #include <vector> #include "components/history/core/browser/history_types.h" -#include "components/history_clusters/core/history_clusters_service.h" + +namespace base { +class Time; +} // namespace base namespace history_clusters { +// Gets a loggable string representation of `time`. +std::string GetDebugTime(const base::Time time); + // Gets a loggable JSON representation of `visits`. std::string GetDebugJSONForVisits( const std::vector<history::AnnotatedVisit>& visits);
diff --git a/components/history_clusters/core/history_clusters_service.cc b/components/history_clusters/core/history_clusters_service.cc index 1e29820..36be5f9 100644 --- a/components/history_clusters/core/history_clusters_service.cc +++ b/components/history_clusters/core/history_clusters_service.cc
@@ -169,14 +169,9 @@ HistoryClustersServiceTaskGetMostRecentClusters::Source source) { if (ShouldNotifyDebugMessage()) { NotifyDebugMessage("HistoryClustersService::QueryClusters()"); - NotifyDebugMessage( - " begin_time = " + - (begin_time.is_null() ? "null" : base::TimeToISO8601(begin_time))); - NotifyDebugMessage( - " end_time = " + - (continuation_params.continuation_time.is_null() - ? "null" - : base::TimeToISO8601(continuation_params.continuation_time))); + NotifyDebugMessage(" begin_time = " + GetDebugTime(begin_time)); + NotifyDebugMessage(" end_time = " + + GetDebugTime(continuation_params.continuation_time)); } DCHECK(history_service_); @@ -333,13 +328,13 @@ void HistoryClustersService::PrintKeywordBagStateToLogMessage() const { NotifyDebugMessage("-- Printing Short-Time Keyword Bag --"); NotifyDebugMessage("Timestamp: " + - base::TimeToISO8601(short_keyword_cache_timestamp_)); + GetDebugTime(short_keyword_cache_timestamp_)); NotifyDebugMessage(GetDebugJSONForKeywordMap(short_keyword_cache_)); NotifyDebugMessage(GetDebugJSONForUrlKeywordSet(short_url_keywords_cache_)); NotifyDebugMessage("-- Printing All-Time Keyword Bag --"); NotifyDebugMessage("Timestamp: " + - base::TimeToISO8601(all_keywords_cache_timestamp_)); + GetDebugTime(all_keywords_cache_timestamp_)); NotifyDebugMessage(GetDebugJSONForKeywordMap(all_keywords_cache_)); NotifyDebugMessage(GetDebugJSONForUrlKeywordSet(all_url_keywords_cache_));
diff --git a/components/history_clusters/core/history_clusters_service_task_get_most_recent_clusters.cc b/components/history_clusters/core/history_clusters_service_task_get_most_recent_clusters.cc index 68f50f7..4b2aa132 100644 --- a/components/history_clusters/core/history_clusters_service_task_get_most_recent_clusters.cc +++ b/components/history_clusters/core/history_clusters_service_task_get_most_recent_clusters.cc
@@ -141,9 +141,7 @@ ")"); weak_history_clusters_service_->NotifyDebugMessage( " continuation_time = " + - (continuation_params.continuation_time.is_null() - ? "null (i.e. exhausted history)" - : base::TimeToISO8601(continuation_params.continuation_time))); + GetDebugTime(continuation_params.continuation_time)); weak_history_clusters_service_->NotifyDebugMessage( base::StringPrintf("GET MOST RECENT CLUSTERS TASK - VISITS %zu:", annotated_visits.size()));
diff --git a/components/history_clusters/core/history_clusters_service_task_update_clusters.cc b/components/history_clusters/core/history_clusters_service_task_update_clusters.cc index f08b101d..afb2bd3 100644 --- a/components/history_clusters/core/history_clusters_service_task_update_clusters.cc +++ b/components/history_clusters/core/history_clusters_service_task_update_clusters.cc
@@ -9,6 +9,7 @@ #include "base/functional/bind.h" #include "base/metrics/histogram_functions.h" #include "base/strings/stringprintf.h" +#include "base/time/time_to_iso8601.h" #include "components/history/core/browser/history_service.h" #include "components/history_clusters/core/clustering_backend.h" #include "components/history_clusters/core/config.h" @@ -41,11 +42,22 @@ ~HistoryClustersServiceTaskUpdateClusters() = default; void HistoryClustersServiceTaskUpdateClusters::Start() { + if (weak_history_clusters_service_ && + weak_history_clusters_service_->ShouldNotifyDebugMessage()) { + weak_history_clusters_service_->NotifyDebugMessage(base::StringPrintf( + "UPDATE CLUSTERS TASK - START. " + "exhausted_all_visits = %d. " + "continuation_time = %s.", + continuation_params_.exhausted_all_visits, + GetDebugTime(continuation_params_.continuation_time).c_str())); + } + if (continuation_params_.exhausted_all_visits) { done_ = true; std::move(callback_).Run(); return; } + get_annotated_visits_to_cluster_start_time_ = base::TimeTicks::Now(); history_service_->ScheduleDBTask( FROM_HERE, @@ -72,6 +84,9 @@ "History.Clusters.Backend.UpdateClusters." "GetAnnotatedVisitsToClusterLatency", elapsed_time); + base::UmaHistogramCounts1000( + "History.Clusters.Backend.UpdateClusters.Counts.NumVisitsToCluster", + static_cast<int>(annotated_visits.size())); if (weak_history_clusters_service_->ShouldNotifyDebugMessage()) { weak_history_clusters_service_->NotifyDebugMessage(base::StringPrintf( @@ -108,6 +123,12 @@ base::UmaHistogramTimes( "History.Clusters.Backend.UpdateClusters.ComputeClustersLatency", elapsed_time); + base::UmaHistogramCounts1000( + "History.Clusters.Backend.UpdateClusters.Counts.NumClustersReplaced", + static_cast<int>(old_cluster_ids.size())); + base::UmaHistogramCounts1000( + "History.Clusters.Backend.UpdateClusters.Counts.NumClustersReturned", + static_cast<int>(clusters.size())); if (weak_history_clusters_service_->ShouldNotifyDebugMessage()) { weak_history_clusters_service_->NotifyDebugMessage(base::StringPrintf(
diff --git a/components/image_fetcher/core/features.cc b/components/image_fetcher/core/features.cc index 3be0356c..6e0a767 100644 --- a/components/image_fetcher/core/features.cc +++ b/components/image_fetcher/core/features.cc
@@ -11,7 +11,7 @@ // Enables batching decoding of related images in a single process. BASE_FEATURE(kBatchImageDecoding, "BatchImageDecoding", - base::FEATURE_DISABLED_BY_DEFAULT); + base::FEATURE_ENABLED_BY_DEFAULT); #endif } // namespace features
diff --git a/components/media_router/common/media_route.cc b/components/media_router/common/media_route.cc index 902aa1df..563a6f9c 100644 --- a/components/media_router/common/media_route.cc +++ b/components/media_router/common/media_route.cc
@@ -81,9 +81,11 @@ description_(description), is_local_(is_local) {} -MediaRoute::MediaRoute(const MediaRoute& other) = default; - MediaRoute::MediaRoute() : media_source_("") {} +MediaRoute::MediaRoute(const MediaRoute&) = default; +MediaRoute& MediaRoute::operator=(const MediaRoute&) = default; +MediaRoute::MediaRoute(MediaRoute&&) = default; +MediaRoute& MediaRoute::operator=(MediaRoute&&) = default; MediaRoute::~MediaRoute() = default;
diff --git a/components/media_router/common/media_route.h b/components/media_router/common/media_route.h index cf6a400..7c2ac89 100644 --- a/components/media_router/common/media_route.h +++ b/components/media_router/common/media_route.h
@@ -17,10 +17,8 @@ // MediaRouterAndroid. enum class RouteControllerType { kNone, kGeneric, kMirroring }; -// MediaRoute objects contain the status and metadata of a routing -// operation. The fields are immutable and reflect the route status -// only at the time of object creation. Updated route statuses must -// be retrieved as new MediaRoute objects from the Media Router. +// MediaRoute objects contain the status and metadata of a media route, used by +// Chrome to transmit and manage media on another device. // // TODO(mfoltz): Convert to a simple struct and remove uncommon parameters from // the ctor. @@ -37,23 +35,25 @@ static std::string GetMediaSourceIdFromMediaRouteId( const MediaRoute::Id route_id); + // All hand-written code MUST use this constructor. + // // |media_route_id|: ID of the route. // |media_source|: Description of source of the route. // |media_sink|: The sink that is receiving the media. // |description|: Human readable description of the casting activity. // |is_local|: true if the route was created from this browser. - // provider. empty otherwise. MediaRoute(const MediaRoute::Id& media_route_id, const MediaSource& media_source, const MediaSink::Id& media_sink_id, const std::string& description, bool is_local); - MediaRoute(const MediaRoute& other); - // TODO(crbug.com/1311341): Delete the default constructor and - // disallow passing in an empty string into the MediaSource ctor. + // DO NOT USE. No-arg constructor only for use by mojo. MediaRoute(); - + MediaRoute(const MediaRoute&); + MediaRoute& operator=(const MediaRoute&); + MediaRoute(MediaRoute&&); + MediaRoute& operator=(MediaRoute&&); ~MediaRoute(); void set_media_route_id(const MediaRoute::Id& media_route_id) {
diff --git a/components/safe_browsing/content/resources/real_time_url_checks_allowlist/PRESUBMIT.py b/components/safe_browsing/content/resources/real_time_url_checks_allowlist/PRESUBMIT.py index 015bcca6..fa1ccaa 100644 --- a/components/safe_browsing/content/resources/real_time_url_checks_allowlist/PRESUBMIT.py +++ b/components/safe_browsing/content/resources/real_time_url_checks_allowlist/PRESUBMIT.py
@@ -32,7 +32,7 @@ ) # Check old version id against new id - if new_version != old_version + 1: + if new_version_id != old_version_id + 1: results.append( output_api.PresubmitError( 'The new |version_id| in ' + @@ -65,7 +65,7 @@ ) ) results.append( - output_api.PresubmitWarning( + output_api.PresubmitPromptWarning( 'In most scenarios, the scheme_id should stay the same. However, ' 'when there are changes made to the format of the proto file, the ' 'scheme_id should be incremented by 1. If this happens, there will ' @@ -106,12 +106,15 @@ if len(ascii_file.OldContents()) == 0: return [] + # TODO(skrakowi): uncomment the commented out version and scheme id + # checks + return [] # Check the new version of the component with the old to ensure validity - return ( - CheckVersionUpdatedInRealTimeUrlChecksAllowlist( - input_api, output_api, ascii_file - ) + - CheckSchemeUpdatedInRealTimeUrlChecksAllowlist( - input_api, output_api, ascii_file - ) - ) + # return ( + # CheckVersionUpdatedInRealTimeUrlChecksAllowlist( + # output_api, ascii_file + # ) + + # CheckSchemeUpdatedInRealTimeUrlChecksAllowlist( + # output_api, ascii_file + # ) + # )
diff --git a/components/safe_browsing/content/resources/real_time_url_checks_allowlist/real_time_url_allowlist.asciipb b/components/safe_browsing/content/resources/real_time_url_checks_allowlist/real_time_url_allowlist.asciipb index 7a92d8f..c98f83b9 100644 --- a/components/safe_browsing/content/resources/real_time_url_checks_allowlist/real_time_url_allowlist.asciipb +++ b/components/safe_browsing/content/resources/real_time_url_checks_allowlist/real_time_url_allowlist.asciipb
@@ -1,3 +1,3 @@ -version_id: 1 +version_id: 3 scheme_id: 0 url_hashes: '5\xe02f\x0e\xdb\x92\x1c\x0c\x0c\xe5\x9b\xfa(\x9d\xc55\xceq?r\x19\x83\x14b\xef\xab\xdcs\xb4\xda\x96P\xcd\xa9es\x8c<\x07b\xed\x95\xae\x86\xfff\xb3\x1b\x18\xb4B\x15\xc7\xf2\x9e\xe8Pg\xacK\x8eGz.\xf3\x99\xa8\xcfT\xdd\xc2\xbdWZ\xf4\xe7\xfe%\xaf\xda\xe9\xa2\xb6mX\xd5K"H\xa9\xcd\x05\xf2\x1c\x1b\xaeD\x05\'\xe0u\xec\xbc\xcd\xbc]\xa9\x18\xd9\x0b3 \xe4\x00\xcbq\x85\xc9\x18\x88%\x1c=Q\x00\xac\xde\x91\\\x99\x92\xf0\xd68\xa8\x0b\x96#\xbb\xa5/\xa0\xa8|\x03\xb8Bl\xf4<\x9e\x07e\xb2:\xd5\xf7;\x08\x0f\'\xc1\xef4j\x0c\x1a\xe2]\xd3\xe4L\xd1#9:\xa8\xc5\x1f\x04\xbd\xab\x95\x83?\xe8G\xef\x10>(\x99\x0f\xed_R\x05\x1ah\x81\x0f\xab\xdecTP(c\x8ck\x1bk\xcba\x85~e\x85=\xba\xb7\xbfP2+\xf8\xb0\xae;*\xc9~3k\x8a\xb9\xff\xabe\xa4&S\xda!\nT\xb6\x87O7\xf0\xd4\xa1-\xa5\x84\x8fX<\x0b\x1a\xc9k\x07\xe0\xa2!(\x84\xd7`\xea\x08\xc6\xcd\xf5I\xb2p\xbf\x9b\x9b\xc3\xfe\xfd\x01y\xaf^\xcc\xcb\xed7\xd1~\xce^\xcb\xf5\x1e\x1a\x05N\xec\xcd?\xaf\xb5#9\xd3\xf9L\xa0E\xbd\xb7\x83\xc1\xd2-\xf2\xbf\xf1\xd3\x00\xa01\n\x80\xb2\x86\xb7\xadX\n\xa9\xc4\xba=\x99\xf4\xfc{5S\xd4k\xb9wg\x8dYl\xd1\x83\xad\xbcE\x1d\x86oK\xf2\xe0\x0e\x07\x00\x0c\xa4\x11Nt\xed\x84\x99*HO5\x88\xcf*\xc6\xd1\xe5J#\xc1Tg\x9a\xb9.:\xd9V\xbe\x1a\xf1\x99\xf8\xe3\t\'\xc3\xb8A\xb0d\xdf\x9b\x16<\xde\x8b\xe5\xee\x95\xd7!F\xad\xd5\xf0\x17\xa1(q\x81r\xf6\xf4.\xd6\xa6Ey/\x1cG|u\x92\xe6\x98g(\xc5\xbc\x95Z\xa0\x05o\xe7\x0e\xe5\xb4\xf9\xb5\x80@\x84\xfd\x9e\xa6\xc1\xa1\x9d\x9d\xb8k\xf3\x89\x15\x11O\x13b\xd0\xa7\xda\x17l-\xb2?j\x87G\xdd\xc1c\x84\xa27Zc\xcd"){;\xaa\xbeB\xa1\n\xc7M0t\xe0!\x03\xad%9\x8bj\x80m:\xa7\xaa>|\xa2\xa3\xef1\x9d\x85\x01\xdd\xa2\xf2+\x039\x15\xb8\x10\xf4:\xf53:\x81z,\xe5 z\x12\xf7\x9e\x90\x02J\xd6\x00@!t=\xf8\xdab\xc6\x8f\xf0Q\xf4\x11D\xab\xa9T\xec\x13i\xd3T\xa1s\xd7\x97\xe1\xe6\x84P\x8c\xc1\xa4\x16j\x1a\xe2\xc2[\x92P\xb9\xa6\x08\x11[\x81\x8c\x87\x9b\xe9\x8b\xdcX\xf9:\x90\x89\xd0\xd7\x0e\x15\xc5\x97\x99\x01e\xf4K\x13\x8f\x08\t\x0f\xe4\xa7\x84<\x1e\xfb;S\x96\xe5\xff\xfe\x85Y\x7f\xc3[g\x14:\xa9\xd9A\x06$\xfb\x80\xe7\x87^4\x02\xc2\x93\x8aWXdx\x9a\xe5\x1e.y\x98\xd7\x963D=8\x9c\xd8k\x7fn\xf03\xc8\xe8\x1b\xc7\x1b\xbd\x05\x1e\xf6B|\xef\x9d/\\!\x1dW\x88\xc9E\xd8\xf9o\x06\xe2\x00o,\xb4\xfc\xc6\njb\xa4"\x1c#\xd9\x1d\xaf\xf7Z\x9b\x8f:\x056k\xa6>\xbd:\x8e\xb3\x19\xcb \xe5*P[R\xae\xbb\xa55\xa5^\xa8\r\x87\xdd\x03\xb6\x05\xd7\xbbGi\xeb\xa5\x82&\xbb\xea\xbf\xf4>\xfc\xe2P\xf7\x86T\xb2\xdfNZKO\x92\xbe8x\xae\x8e$\x92(\xa9\xa3\x99h\xaa\x15,\xb3\xc4\x9d\xbd\xdb\xd07\xb6}\xd5L\xdf\r\xe4Xk\xfeO[NViZT\xff\xe4\x80n3\xf9q\xab\xa8\x05\xaf\x90 \xd7\xf6\xae\x05x\xf8)5\x00E\xb9\x8e\xeay\xfb\x949t\x12\\Sy\xc4;?\xf3R\xd4\x86\x87t\x1d\xfe\xe4\x8aW\xb6\x8b\xe0\x90$\x1a\xfbx\xa7\xa0a\x06\xb9\xbf4T\x9e\xa8{3\x97SK\x89*\xa6\x02\xa6~o\x9f\xc1\x13\x01\xf3\x10U=3%[_\x8d4\xe1\xe8\x11\x8a\xf7\xdb\xccg\x85E\xeaO\xf5\xbb\xcb\x9cf\xcc6\xb0:\xbd\xeb\xa7=\xf2\xd3#\x86?S\x0b\xac\x0b\xfeK\xc3\x06)\x89R\x1f\x10\x0b\xb4\x87+\xd1X\xd6H\xa1\x1a\xdbZ\xd6A)\xbbY\xd3\t\xba+\xd2\x19\x94>\xb9\xb3\xc8\xceE\xe5\xa0\x07\xd6\x17\x05\xc1}\xeb\xe9:\x15kd\xebtl\xa9z\xd7Q\xf3\x87C\x94\x89\xf3p~\xc8\x88\xbb<\x1e7\x88\xf2s\xa2\xb9*\x04\x80\xe8\xab}\\\xf4\x85\xfe{C\x9e\xc6`pw"\x07\x91\xb5\xca\xf5\x7f\'\xc6G\x8a\xcb\xe5\x82"8\xf9\xf9PW\x19Cv\n\x10\x92\xb9<\x0e3\xb1>$8\xaa\x17\x82\xc6V\xd1\xf6\xe8K\xc0\xe3\xaf\xa1\x89\x05\xcb\xf0\xb3\xe0&\xd8/\xe4t\xc3z\x94-\x93wJ\xa8\xc7\x04\xb0 \xce\x90\xb1\xba\xa1\x0f\x93\xbc\x8e\xe2\x12\x9fV\xef.Z\xe4N\x00k?U\xc8\x1f6\x17o\x12\xc7\xdb\xf8\xfaA(\xb2 5\x03\x1cR\\\xce\x18\x18&\x17\x86\xb7\xae\xec0\xe2\xa7^\xa1\xfb\x12\xaea\xfe\x08\x15\xa5a\xb7!\x86\x19\xb1Tf\xf6\\\xd5\x93\x01\xce{\xea\x82\xe1\xcb\xe2M\xcbIu\xca\xd3#\xd1m\xe9\'$\xca\xf5zQ\x8d\xaa\xf2\x05v\x12f2\x91\xa7\xbb\\H\xc6\xb8\xa4V\xa7A~\x879F\xd4\xc0(i\x18_G\xe9Si\xc6\t\x17mB\x19\xd7;\xde.\xf6\xf2q\xb0+\xf3\xeb\x91;\xb9\xabz\xd7\xe8\x94\xd2<\xa1\xcfFP\xb1\xd8)\xfcE~n94\xedd/\xa6t\x9d3\xd3`\xa3\xe3\xdd\xe2\x86\x91)\xa7 \x0f")X\x0f\xee\xf4|A\xb5?h-\xb1\xf6\xb5\x80\x15\x9c\x0e\x0e\xa5\x18\x0e\x16M\xa8\xfbE\xa5 ~\xc5\xa2F\xaf\x82\xe1e\xfc\xca$\xc9a\xa1\xad\xdc\xaf\x1c\x8e8\xf9\xd9P\xac|\xdaN\xe1(\xaa\xb9\x80\x06\xb9L\x1c\x87\x98E\xd7\xfd\xaa-\xde\xac\xa4\x1a"\x83@\xf7\x96\x9fFy\x8b\x07\xa2|\xdb\x8f$9\xb6\xca\xef\xa1^vl5\x87\xd0\xd8dJV\xa3#\xe2\x88\x8b\xfbh\xcdg\xe3/\xda?\xea~\xf3\xa3\x8a=u\x00\xbb\x7f\xc1\nQ\x01\x8btwTz\xf1\xd9\x99\x8b\x0e\x1d\xb8\xa9~>\xe4`f\xf8\xc5c\xe3\xfa\xf6RLp\xbfz\x85x8\xbb\xd6d\xba\x9eb\xe8\x87\xab\xe2VQ\xf8d\x98\xfe(4\xb7=y#\xd5\xd6&\x8eJ\xb6\xe3\x93\xbcu\xe6\x11\xeb\xcb0\xb6*T\x03\\Z\xfe\x10\xb9n\x91\xed\xce\xb5\xf9\xda\xedf\x1d\xea\xdaa\xf8yJ]\xb2\x04\x1f\xd7`\xb9I\x17\x99\x8ff\xf6\x01\x86\xd9\xd6\xcb\xccon8C\x98\xd8M\xea\x07l$\x86J\x86\xfe\x13z\x15\xc5\x907\x18\xd9\x7f\xf9\xeb\x92~i9i\x11PP\xec3l>J\xca\xf62\t\xbf\xc2^sSj\x8d7\xd0\xc6mw\x1bN\xa0d\xff\xa2\xa8F\xd2[\x90\xf6\x15Y\x1f\x10\x0b\x1a\x7f\x02\xeedr\xd7-\x892\xfcvu\xbf#d\x9d\xd2\x80q\x0f\xff\xb1\xdd\xd8\xaf[\xbf\xc68\xbb\xb0\xf7~\xf97G\x18\xab\xeb%\xd2\xd0\x1b\x16\x8e\xb8\xe2\x93\xafJ\xdf"]\x86\xfbi\xdc\xeez\xcd\xe4\x07\xc5U\x96\xf0D\x13j\xa8\xc0@\x1f\xd2U\xf9\x9d\x92\xc1\x08\xcd\xbf\x9cz\xd2p\xdf\xcf\x94\x01U\x05k<c\xa3\xed\xe4C\xa8\xde\xa1\xb4\x16\x8d\xa3\xe6\xf5\xb8\x19\xe8\xf7\xc7\x9cD ^+5\xeb\xe8H\x94\x95\xda\x99\xcf\x04\xd8\xe4e\r"G\xfa\xd7\t\x9c\x18\x83\xbf\x90\xbf\x13E\xe9\xd2\x14u\x99X\xe6d\xb9\xb8\x1d\xba\xda\';\xa4A\xa8z\xf6\x89\xd8\xe1\xf9E\xf4`\xb7hAiL\xaa\xf5\xf2F}\x89"\x9eEEJ\x9d{\x10\x10\xef+v\xfa\x81h M\x1d\x9cR\xe1\xaa<\xa7\xd9\xa9\xc4.\xac6N\xed\xbcKA\xb3\xe0\x1a\xad\xda\xb2W\xd7np\x0c\x87|D\xb1\x9a\xfb\x0e\xa5\x18\xc7\xd3c\x01\x81^oB%\xb9\xac?s\xca\xf9\xa1U\x03\xd1FW\xf0\x8a\x02:3\xea\xcb\x93\x91\x8c5;\xbc\rh\xd2\x17X\xac\x1d\xa9\xf8\xf8~v\xced\xe5\xc2\x11\xd1\xc3\x08w\x868N<\xe27\xfa\xcc\xb7V]\x1c_\xc2\xc6_\xc6\xf4\xaeW\x176\x01\xdf\xd4$=\xc3\xe2\xd5$.\x07\xd4\t\xfb\xcd\x83\n\xf6\x15\\\x80F\x00)d\xfc\xd4\xa2\xfa\x90#\x82\x07}\x08\ra\x11o_E\xfd\xf0o\xd5ga\x9a\x9c\x0e\x18\x96]t\x12\xa7\xfdi\x0f\x95\x8a\xe0?\xdd\x1a%\xbc\xe62\xafS\'_8q\xf0H\xea\xa5\xd9\x9a\xeeX\t\xab\'d\xa9\x9a\rx\x1c<\x97ue\xdc\x98L\x95.\xb1\x9fdh\x8c\x1a\xf6\xc7\xa0\xa3\xc1\xfc\xab\x04:\xbd\xb00q\xe2\xdc\xe8e\xf6\xc9RUb\xb1\xf7dee]3\x83/\x16\x8ehL\x15,i\t.G\xcb\xff\xc2\x02\tWG\xe2F\xfb\x8fs8\x15\xca\xfb\xd3\xec7hw\x8f\x9b\xc2y\x80\x90e\xb1!G\x18\xdd\x1b\x9c\x8b\x85\x11\xde\x1072\xf2\xe1\x9d \xf25\xa5\x8b\xd1y_\\\x01\x9c\xab\xa93\x03 \xc1\xc8\xc21\x04b$\xa7\x93\x0bu_&\xad\xa2\xfd\x19i\x1b\xe6X\xfey\x04\xa1Q\x0f\xdf\r\xc0\xeb\xf3\xe6\xe5.|\xf7\x1calB\xe1(\xf8\xcc.\x1f\xea\x8b\x93\xe2V\x1e6U\xb1\xb7Q\xeaG\xd5d\xf1\xac=3t\xc5\x94\xd5\x18y\xf7.\xa5XZU\xdb\x8d]\x9b0\xca\xcf\r\xe7}V\xf8\xa1N\x99\xda\xc0K\xe4_\xea\x1bw\x9a\x9fVz\xa0< \xdc\xf5\xc6^\'A\xc6\xfe!f\xc7>\x89yz_\xbbT*}V\x01\xb6\xcb\x8e:\x8a\xad\xfdQ\\t\x1eU\xa4\xdc\xfff\xaf2\'\x862\xbbA\xd6\xed\xaf\x18\xe6|\x96x\xe5w\x15O\x7f\xd85\\(\xc3\x05\xeflG\xa4I\xa0\xdf\x0b\xdf}\xd9\x1f;\xf06\xb2nw\xb4\xce\x82P\xae\x04\xc7\x06\x94ly\xea\x96.\x84\xe9\xd7\xdb\xc3\x92\x141\x95\x84\xa8pjx\xc7\xa3\x83\xcc\xb1\x98\xf4\xe3\x93[{qCd\xc2\xf8X\x87G\x08*>\x1dYA?\xbd\xd1\xeb\x8bB1?7\xae\xe2\x9a=\x9f\xaf(]m^\xfek\xbe+\x1a\xb4=sp.\xdc\xb7\xcd\x98\xc8\xc9\xa0\x07\n2\xb0\xe5\xd1\xee\xdc\x9d\x10[\xf1\x8fK\xcdxV=\x7f@vI\xfcX"u\x8f\x84BHE\x84\xba\xbfS\xb0\xde\xd7a\x99\x8dR\xcb\x9aX_\x17\xb0e>y\xdf\x0e\x98\xba^\xc0\x84!/u\xf6m|C\xb0\x92\x91\xeb\x93\x97J\xfa?~\xdaPv\x93e0\x86\xbb\x91\xdc\x98\x877T\xb8\xc4#\\\xb8\x90\x16\n-e\xeb\xad$\xbex\x06\x84\xe4~\xe6\x04\xe6\xf6i\xfb\xfe\xf8\xe9\xa5|\xa0`f/\xd0\x17\xb0Ow\xd2\xe6\x17?\x84%\x10\xed\xc3|\xfa>\x01\xf4\xa3\xd6\x86D\xb9\xf5\xc2\xffT\x95\xdf\x15\xb2\x86-\x87\xb4/=\xf1\xba\xe5\x82\xb9q\x8e\xea\xd4\xdc\xf9\xd8\xf2\xd3K\x1b\xeb\xfba\x11N\x95\x1c\x7f\xab\xc6\x07\xf3\x90 \n\x11\'\xd7r@o\xe7\xdf\xd0\x07\xe4T\x1b\xede/\xdbFg\xd9\xe2\xb5\xd7\x8e\xe2\xa3\x94\xf6\xad\xf4\xb3\x00\xe5T9\xf1\xc2\xa1\xac\x9c\xf2\xe5\n\x10S\xfd\xd0\xa1\x93)\xb9y\xa6\xd0\x9b\x99\x94\xafj\xe9\xbd\xbc\x93\xe5\x12\x1d+l\xf9nws\x92\x80-\x87f\x84\xfez\xfcC\xe3\xef\x1e\xde8\xa4\x94W\xb9\xda\x94\xfd\x0e\xf7\xd2p\xcb\x1c\x8d\xe6\xcc\xb9\xf1\xf7\xb9\x1d\xd2\x92v\x14n\x07]\x85\xd0\xfei\xd0O\x9aGg\xd7\xcf!\xe2`Iz\xdfBY\xcd\xca\x9e\xf8\xbf\xac\xda\xad\xd5\x1cE\xe1U\x9e@\xc0\x19\xe3@\xbd2%\xd1\xee\x9f\xdd\xf4\xbc\xf1\xee\xa28\xd0\x96\x17\xbb5\x03|T\xad\xc1#\xe3\xdc\x13\xa4\xbd\x1a)\x81\x9d\x19\xe9\xf3\\0\x8d\xa3\x8d\xf1\xb6G\x94~\xeb\xf4\x1a\x1c\xaf\x03>9\xa2\x8c\n\x99Y\x1e\x00f\x143\x9c\x0f\xeb\x02em\xb1l;]\\pP\xbc\xabB\xa7r\xa3\x0e\xba>dH\x08RO_?\x9f~\xb7Q+\x01~\xa2D%\xcf\xfd\x07\xdb=$\xdd\xb5\x00il[J\x11a<\xc7\xc3T?\xa9\'\xf4\xad8\x9a$\x03\x97\xdd\xe0^\x01T\x11\x86\x85m\x9d\\G\x95\x03`ma>:z\xe8\xca\x0c\xc40`g\xee\xbe\x84\x81\xdaZJ\xde5P\xa6R"\xe2a"\xc1\x93\x12\x13\xeb\xab\x9c\x06\xf81\x0f\xe3E4T\xa3&\xbc[\x9f1\x00V\xe4\x88O0~\xa6\x16\xb8\x10\x19\xa4\x88\xb2\x1ds\xc3\xe18`4xX\x063\x87%yM\xbb\x7f\xae4k\xf0\n\xd7\xd5\xab\xb3a/\x8f\xaa\xfc\x88\xd0\x89\xf6\xfa\x89*\xfa\x8a\xcd\xf0\x19?*\x07\x11\xcf\xf7\x19\xe9\x04\x1a\x84_\x93\x14 &\xf4\x86\xfa\xef\xc8\xb4\x8a\xf5s\x8aW"a\x9a\xa1\xcf\x99S\x0c\x9b4\xd7\xbd\xc3\xa5\x97O`b\x1b\xeeG\x94\xe3\xa4\nu\x90\x12\x92\xe2T\x80\xca\xb1m\x07n\xe2\x10j\xffQ\xf3\x84CNDl\xd2\xf7J[ozgg\x945a\xcd\xa2\x8f\x8a\xf9\xe12 \xa0]\xba\xfa\xdc)\xf2>\x03PdnRrm4\\_\xe3\xden\x13k\xf4\x98\x07(\x10?\xfdA\xab\x1e\xfe\x87\xe2f\x1at\x7f\x82HB\x11\x18KS9c\xb3\xac\xfb\x08\xe3\x17\x8fS\x90p[@8\n\xe8\n\x82.Y\xbf\xc7\xa9\xeb\xba\x90\x1f\x1f\xe1\xf3\xef\xe5\xd2F\xea\xe9Z\x0bq\xfa\xdb\xd2\x0f\x94\xb8Rw\xff\xdf\xf3\xd3fIL\x92:\xafP7\x97\x9bg\xb7\'/\xa03\xfd\xdd_\xcb\xa6X\x1bp\xfem\x9c\x12\xb8\x81\x11y\xc6<\xe0Mj\xd3\xd9\x81\'\xfb\xdeD\xbd\xb81m\x03\xc8\xa4\xd6c>I\xb0DE\x1a\xf9\xe1\x88u5\x82\xfe\xb2X\x90\xcf8\xc6\x1c|\x88\xa6p\xa8M\x04\x10\x99\xa2\xa68j\xbbz\x81\xabYq"\x84\xac\xd0\x05\x92=\x0b\xf4\x1f\r"Y\xe9V\xd0\x0b2\xab\xabP\xce\r\x97\x91&\x89\x88J\xd6\xd7\xa9\xc0\xcb\xcf\xab\xf7wrX\xf6\xf3A\xde\x1e\xfe\xc7\xf0\xc1\rM\xa5\x8e\x1d2\xce\xe8X*5\x1fc\xd40\x08L\x07g\x8b6 \xd0~\xa1\xcciO<!bv\xd4\xb6\n\x04\x9d\'\xc5\xe9\xa3\x93\x8e\x95\xf9NM\x07!\xd7\x8a\x83\xa3\xc4[\x8bXM\xadJ\x8cR1\'F\xf2\xf7C9^\x96k\x88\x82 \xaf\x901\xb3j\x1f\xba\xbd\xa3\x9at\x13\xceId!\xbd[D\x0fd\xc5\x04\xf9\x1b9\x12-\xf8`\x96\xf5\xc62\xb5\xb8\xff\x9dmX_\xc0h\xa1\x8c\xbaU\xe6\n\xd8\xe5\x12\x9e\xc6,r\x96m\xcay~\xc8\xd9\xad)n\x9a@\xbf\x07\x03\xae\xefJ~\xbe\xcdo\xa2\x02\xc3d9\xb7\x7f\xb0\xe5\xd9\x0f\x08\x037\xf7\xaf\xad~\xa88\xadM\x85G\x06U\xb2p\xdd\x86\x80\x01\xaa\xf1\xc2\xff\x06\x9b\x0e\x18[\xb4\xfc\x1b\x9a\xc4L\x8a,\xed\xe4w\xee\xe8\xbfEL\x9f\x1e\xdf\x88\xdd\nV\xf5q\xc9\xbf\x99\xe8X\xbe:zDq\x9f\xef\x02p\x86W\xa2\xebzk\xf6\xc6\x99<ev\xac\x0b\xd4\xccZ)\xfcm\xd5\xe6\xbd;L3\xfdMi\xa3\xc9~\xba\xa4\xbfu=\x17\xfb/\xa1X>\xa0P\xe1\xb2G\xd1\x0c>8\x00\x99VH\xa3\xa5\r\xd1\x81\xe0\x89\x17@T!\xf2\xa0\x9a\xd3\x83\x1c\x99\x19\xf1\xdf\x81\x8f\xe9\x1c;\xc3\xda\xae\x0e\xc8\xba\x89\x91o\x0e\xf60A(\xd3\x1a\x83\x0fJ>xO\xf3\xbd\xb4\x96\xf4\xf1\xa6h\x909\xbf\x9f]\xae\xe0T\xc3!\xe5\xb5h\xd67+\x85}\xb5BI\x9e\xce\xbe\xd5\t \xc2<4E\xcf1\xc2\xed\xd5\x89\x88\xe2\xe7\xebV"\x0bnx\xb4\xd5\x1c\xd2D\xc6+\x82\x1f\xaa\x1ab\xbb\xcbdn\xbf\xce\x89\xdd"h\xcb\x08\x86\x0b\x00\xe2\xa3\t0\xaeyt\x8d\xf9\xe9k\xfb\x83\xb8\x92\xcb\xe4\xd6q+\xf3\\\xe0\xe6\xf4&\xe7\xcc\x16\x1a\xd8A\xe0RU\xbc\xdc\xe6{\r\xa7\x18 _\\i\xb1\x9b\xdcu\xe0\xa0\xbf\x02\xacA\x00\\\xb8\xe0\xda:\\B\xf0\x06`a\xe8\xba]\x0c\t/x \x07\x19BK\xd1=w\x0e|\xf4B\x92ea\x8a\x95\x16m\xaf\x9f\x95&\xd2P\xa0\xdb!\xcdl_u\xb4\xbf\x95\x7f+o\x80t4\xe7\xd8\xfaX\xcb\x90\x08\xdc9E\xb0V\xd7\xa5\x1bS\x94LT\xeb\x94\xe1u\t\x88\xbf\x85 $0\x94\x84\x88\xe4\xf3bM\xfb<@\xe4\xb2Q@\x8fyCC\xc6\x9b\xc1\xf5v\xb8i3\x94\xcf7g\'\xba\xd8\'6\xbf\xb1^\x9aU\x9c\x8e\\\xf7r\xe1\x0f\xc5\xd01R\r\xa6Q\xda\xc3A\xb2\x97\xa2\x084\x9cG\xeb0\xe3\xe7\xd1\xb6\x1d\xb1V\x96\xd5\x0f\xb5\x9c\xc3\\eG\xaa\x84\xad\\$\xa0\n\xc8\x1e\xbf\x1ag28\x80E\x8d\xd4\x18\x048X\xe4&\x8dnY\xbb\xec\xe6\xe0\xe1+\xc9\xcb7\xad\x8a\xd8\xcc\xdf\xf3\xa7#qZ\x02\xef b\x92\x94G\x1aJ\x9aU\x91\n\xbcx\x91\xfb[\xb3\xedf\x9az+\x87\x1a[{\xc0\x9b?\x03\xa5\xd1\x98\xc6\x99\xe74\x1f\xe50\x98\x9f\xe5c\xea\xb2\xec6\xea\xbd\x95\\\xb5\'\xb5fV\xf1\xa3\xa6j\x05\xb4\xbd\xde\xbc\xd6ZDS\x88\xa9E$\x9a\xfdw\x93x8\x02q\xc6X|\x7fsF{%\xa3\x07\x88T\xc0\xd0\x94\xd0\x1c\x15Q<b\r\xa7\xbc\x9aR\xe1\x16J\xd7\xbbG\x8c\xae\x07W\xfc&\xc2\xa6\xe6\x0e-\x12~\xfcK\xd6\xe8\x94\'\xe0\x08=7\xf5\xa0\x98\xc51<=8\xa9\n\xffi\xf9\xe9*(\x1c\xed\xa1lT\x94\x04\xd2\x1c\rh\x08\xff\xf9\xbe\xddi\xac&c\xbb\x02\xd0\x8es\x85\x91\xdc\xd7\xb1\xa8\x04/\xcbc\xf2Ew\xd1\xbb\xb6%3)\xc4\x18Z\xba\xf2\xd0\xef5WB\x0e\xef\x83(\xf6\xaf-\xfa\x05\x19\xd3.\x82\xf9\xafu\xee~4h:\xd2\xa6T\xaa\x0b1\x8a\x1d\x0b\xf8\x8b\xec\rG\x8b;m<\x16\xb4\x80"\xa4z|N?\xf1\xf7\x04\x91U\x9b\nD\xdb5\x97\x069cO\xfe)K$DZ\')\xf9P\x98\xa4\xef\x90\x99;\x96\xb7\x0b\x04\xcbU@m\xd1qn@\xa5G?\xd8\xda\x92\xfc\xc9\xa7[\x978\xd8\x08\x93R\x1a\x8ba\xbbLFb\xe7\xa3G\x92\xc0\xd3\xfc\x9f\xd30\x0f&\x17\r\x85\xec\xdcK\xca\xa8\xe9\xc0\'jv\t}\xc3\xa3J\xa3\x108\x10\xc0\xd5\xbe\xcft\xb9\x1d\x0c\xfb\xfe\x98\xbb6\ri\xc6\xc2\'\x19\xefV:\xde\xcf\x08Ysr\xeb\xa6\x17\x8cL\xf7UA\x02C&G\xe83\xd2":{\x94\x9dc\x93r\x12\x04\x7f\x0bZ<\x86\xb3 @\x8cl\xcf>\xa0\x14y8\xd6E\x03B\x1d\xc2j>?x\x1akS\x1dX\xb0A\x04\xd5\x82\xca\xd6\xa4\x91\xf1\x847L\x87\xccr=K\xf2A)\x86~\x9d\x82\x93\x81u^\xdad\xa3\x89\xe3\x1d\xb9\xe4\xd5F\x93\xf99\xac\n\xc40\x8a7\xb4\xd3\xfe\x17\xa9V\xce\x82\xa1\xbe\xee\x89{\xba\xecu\x84\xc4\x14\x0b\x0e\xee\xd2\x88\xe4\x9a\xff\x1d\x7f\xfa\x95}\xb0t\xe6q\xbe\xca\xa8\x90-\x9dZ)\xac\xd4\x98\x92\xc7\xb9!\xcb\xc8\xc0\xc9#-W\x1f\xc0*\x15\x82?\xc99\x0b\xa6\x9b\x8d\x15\xbbm"\xa5\x84\xe8Yl\xf3\x8b\x89\x1cY\xfe_v\x9b\xd5w\x13\xd5hS\xe3[S\xb3\xafp\xf2\x84.\x8a\x90\x83\xf19q\x1d\xf3c\xd1%zH\xf5\x9d\xd44\x1f\xa4\xe5\xbb=\xfc\xe3)\x99\xdc\x06\x0e\xaaM^\xa1t\x18\xd9\xa2\x17\x03^\xa7u\xc0\x1b\xea1I(\x05\xd5\x0b\xc51\xd7U\xb3\xa6\xa8\xcb\x0fv\xa0q;` \xcb\xdd\xc6Z\xa87\xcc\x83\xdd\xa8\xf2\x0e\xa7\x91Ek\x1a\xe3H\x82\xacY\x11\xed\x91\x17\xb4\xe4\x881\xf1\xbc\x10g4\xfbh\x1a\xa3aG\xa3\xd6\xe1\xbaf\xd1\xe1\xe7\x88#\xb7@\x85JQ\xe58\x88\x13\xad\xe8\x9b\xeb1JPI\xa4\xf9G\x81\t-7\xda\xfb\x8b?\xc2\xf2S1\xd1\x11\\KD\xd9c\xa4>\x14\xefGz1 \xb7Cj\x0eO.\xea \xd1E\xb4|\xaf\x0c\x16\xb1\x8c\x03\xe36v\xfev\xcb\xb0\xd3\x16\\3\xd2\x04\x1a_c\xc76\xef\x87\x86r\x00\x12\xaaq\xf0\x8f\xc0Ud\\\xa5F\xa8\xfa}\x7f0`By\xcb\xb1\x8e\xe4}\xfd-\xe5\xe9v\xf7H\xbe\xee\xcfM\xc6\xbbTbf\xf0k\x14\xed\xcc\xf9\x00s\xcb9O\xa5\x1f\xd9\x0c%\xaas\x11g\xfc\xf4\xdc\xdc\x12K\xc7\x7f\x9d\xe5\xd7\xe7\x0c\x7f\xa9u\x8f*\xf2R\x0c\xff\xf4!\xafB(a\x8c\x07(b \xe9?\x1c7O26\x16d[\xf5\xda/\xdc\xb8\'Kq\xfe\x17\xc2r\x7f\x9c;\x15\x00\x19\xbd(\\\xb5:\xb6\xb87\xd26\xc6\xf2`\xeebk\xbe9\x97>\x88Q\n\xc2\xb2\xaa2\'\xc0p\xdb3\xfc\x0f\xe2\xff?=\xea\x88J\x8c\xf1\x80O\x82\x92\xae\x0b\x93\xeb9\x06\x8c\x8fc\xf05\xf8\xc5\xd2\x1e\xd5\xab\xcc\x1a!\xbb\xad\t\xcf7\xf6\x07\x85i\xa7k"\xbf\x91\xae\x95\xf3Ok8\xbf\xdecX5;\xf8V\xea\x0c\x8f\x1c?\xbfL}\x07\x85\x86\x00N\xefs\xa2\xb2\x8c\x88\xac\xc9\xcf Z9\xc7\xeeo*3[\xb6\x96B\t\xe8\x82n\x8d\x99\x17\xa8T\xf4\xc7O\xc6Z\x1f\xde\xe6$>\xcd7O;,2@\xb0\xd0\x1b\xd8\xb9<\x9a\xd8\xa9\x1e\x95\x8d\xc6uQ\xcd\x9bf\xfcbv5R]:\x11\xbb\xff7\x03\x12\x0b\xc90\x8c\xfd\xd6\xbe\x11\xaf\xc8\xbeb(%\xe3\xbb\xa8\xe0p\xc8#\xe0\xf7\xeb5\x17\x97\x96\xd5-A\x00\x14F\xfc\x84\x13\x8a\x86\x94#ua@\x8eVF+t\xcbV\x00\xebDb\x9fd\x0f\x96\x8c]\xd5,ren\xacF\xaf3\x88\xd5\xc7J\x8a\xb8g\x17\xfc=\xe1\xa0|\xbf\xb1\xf0p\xe7\x08\xe3\xcbq$\xc7Z\xf9\x1c\xa0\x0f\xf6a\xeeh\xb6\xb1\xcc\xd7F\x07@\x10\xf2m$d\xfe\xc3,\x95\x0e\xe4\x19\xa7\x15\xb5#hha\xc3}e$w%\xcc\x90\x93\xefbl)XYt\xd4\xd2\x06\xfe\xa9Q\xf9\\\x1f\t(\x8a\xac\xcc}\xf6;\xf0\x1f\xeb\x7fC\xab\x7f\xa0M|\x9bS\xf6o\xc0\x03\x87\xc2\xc6/TZ\xcbD\xe6}\x86_\x11\xcf\x97\x85\xd3\'h\xbe\xdfR\xbc\x1c\x9d\xbf\x92\xbf\x8c\x9b$^\xcfQ\x1d\xb4R))b\xa3\xb14:tIf\xc2vw\xbb\x10\xda\xd6\xa98\x00\xd7E\xbdCm0\x13\xa3\xee\xbf\xb7H\xf1@\xcc\x91\xfc|\x12\x0c\x0f\x01\xbc\xb2\xe4\x8cN(\x1f9\xab\xee\x0f\x12\x07^dL\x86\x16\xb8\x0b\xf2x\xfd\xdam9\xb9"\xdc-\xe9\x80\xce\x9a\xf8w\x8a\x93$\x18\x89\x8d\x8b\x990b\xe3{\xdc/\x8dV\xd2Z]\xbc\xb8\x00\x9aI\xbbd:D\xdb\x1c\x1e\xf4\x94IYW\xb5\xec3\xed\xe2q\xd4\xb2\xf1\xe6hl\x8a\x04\xda_\xe4\x11\xd8`\x91\x1e\xa5Cb\xa9aO\x8aD\xcc\xea\xa9\xd2\xa8\'(\xad>\\}h\x80\xf6\x8d\xb1\x8d!\x17\xcdm\xe4\xb9\xa1\xa6p\xd9Q\xa4/|m\x8e\xab\x052\x86\\+\x04u\xbe\xff\xda\xcb\x07l\xd9\x88\x9b9\x82P\x8cs\xd5\x8a1\xb3\xad5\x8fv\xcbP\xa8\x0flW\xbd\x95\xca\x03\xc3\xa1$#1\xa8\x99\x99\xad\xe29\xbb\x16\xe0t\xfd\xebo\n\x16n\xdb\x00g\x88-\xb5(\x8a\xda\x19W\xc6\x07t\x1e\xb8\xbc^\x06:\xb9\xda\xe2F\x95\xaeI\xd3\xe8Fm\x19\xbe\x8e%)|\xb7\xee~\x88\x84\x1e~\x17\xc5`\xa9\xdd\x8e%\xaf46\x11V\xae\xbc\xa2^f$"\xa0\x9dN\x12\x06\x16R.\xaeX\xc0\xd1\x87\x13\xb94v%\xd5\xaa\xc7~\xba\\\xf3g\xd2\noo(PONV;\xe2\xca\xbe\xd2g\xe4\xa9m\x8d\'\x05L\x9f}\x14\xf2 \x7f9\xcd\xe4\xb0\xbcl\'5dNVf\x1b|\xbf]\\\x12\xdbq\x95\x16\xe1\xb8\x11\xf1\xed\xc0B\xc4"X\xb2Z\x84\x8b\x84\x08\xabu\x7f\x81\xd3\xdc\xd1]<\x067\xe3\xfaW\x92:C\xdb58\xed-\xce\xe0\x88\xa4\x12!\xa2\x8dz\x80a\xfb\x14\xfff\x13\x18\xcc\xdb\xbd\xf8\x91\x1a\x0b\x07\x13Ne\x8fy>\xc1\xb02f\x0cg\xad\xa4\x14\x9f5\xb7\x80\x10\xd4w\xdd\xcbMKQ\xee\x94\x1e\x0e\xc2\xb3\x9fUD\xd9\xe5\x8aiH\xf2$\x05 \x87p ""\xe5\x86\xb4;\xf9N\xc5\x92\x11\x97\xbc\xc7QX|=\xaf?L\x80b\xd9$qsu:\xf49\xb4B\x9d\\rV\xba\x9c\x96\x16f\xa3\xe5\x7f7\x11h:2\xb71\xc8\xd3I\xf0^\x8eD\xbf\x14\xcd\xed_Ijy\x19\xbd\xca\xf0\xef\xf2!\x01\x89\xb2\xbal\x91\x8a_R\xf8\xf0\xa8\xe4\xba\xa9:\x92\xba\xb2\xb5\xe3\xde\xaf\xe3\xe1\xa8\xc5G\xf6\xab{$\x9b\x0fvy\x94\xbf\xdb \x00U\xf6\x89\x86\xd0)\x1c\xe8g\x0e\xfdC\xb8\xcf\x08\xc2\x8bzbD\xe2_\x8e\x84\xa9\xc7-\x95\xe0\x10%\x9c\xf6\x13\xfe\x83p\xfe6\xe2T\xc9\xfa\x12+\xe3\xdcz\xe9\x17\x91\xa8\x8c\x14Kt5\xe6V\ng\x07;.\x17\xab\xc6\xb5\xb9l?\xcf\x80\xb2*&\x8f\xc3>\x9e\x0eg\x80}\x80"W\x8f\x84\xff\xdf\x1d\xd5\xad\\\x0c\xc6\x8d\xeb\x13\x86\x94\xb1\xf5\xb4\xa7\xdaP\x118\xf7\'R\xca\xbf\x1f\x83\xd1\xf4\xf1Y\x8c\x80\xd0\xe1F\xd9\xc7\x1bO\xf1\xbe\xbcw\xf1O\xaaC\x17V5<\x15r\x1d\x8aYe\xed\x1a\xe8;\xf6\xa634\x9cs\xafP\xe2\x0eL)CIF\xc8g\xc8v[\x99\xa0Y\xa6N\xa0\xd7B\x15y;\x04\xfa\xc5p\xa4U\xfcuD\x8b6\x06#\t\xb3N>p5:\xdd\xaa\xa0\x1e\xe64\x98O\xe0[\xa9j\x9b+\x1e\x1b\x13\n\xe4\xd8\x14u,\rR\xe1\xcf\xb7\xd5`\xdfN)\x07P\xde]\xb6\xbdY\xb6\xf1\x1d\xed b\x07p\xdc=J\xb9\x19}\x17\xdf\xfbK\xf2\x0f\xd8\xffU\xca\x96\x8dz2\x02\x87\xb8\x9f\xa0x\\M\xb93\xf9\xc7\x1f\xfd\x17\x95\n\x05\xc7\xe8+}]&A \x1b\xd6,B\x07\xbd8\xd0_\x803\xed\x18\xe4\x98^|\x14r\x99H\xfd\xaa"t\x02v\x8a[;\x00\x1aS-\x11y*\xe3\xd8\xfe\xf4\x16x\xbb\x87\xdb\x94Q\x04\xb9u\xcf?n\xac\xc7?\x9e;\xf0\xd3\xd0\x00H\xbf\xac\xb2=\xf93\xcd\xfdc\\c\xbf0\x86A\x1b\x1f\xbe\x85\xbc\x9e\xd6\xe0\xed\x81\xffm)s\x1dR\xeem\x83\xc2\x17\xe6X\xf8]\xda\xc2%\x84\x16\xc5\xa8\x1f\xbf\xef:>\x1b\xa0\x00\xa1\xd5\x15\x84\x05\xa4\xe6\xb3\n\xf3\xba\x94<\xc1\xbe[\xa9\x9d\x98\x05Q\xd4\x1e\xec\xb6M\xb8$\n\xb9\xc6\xf0\x89\xb0\x8dR\x00 \xb8\xc8Y\xd50\xd2\xc0s-?\xdc\x13\x1a\xdd\x16K\xeb\x1fl\xa1;>\xc0\xfd\x08\xcc\xce:\xd4\x84JY\xe4\x86\x88\x01U\x90m\xd47e\xe630K\xd4q\x9c\xa24\xa5\xdd8m\x19gaB\x16\xb9\xc8\xf8\xca_\t\x94\xf9\xd3\x82\x97M\x91\xff\xc0\x1c\xcc\xa9K\x853\xad\xdb\xa1Q\\\xd9\x82\xe9\xe0\x1a\xdd\x85CF\xa2\xde\xaf\x03\xed\t\x08\x1aF\xbdy\x13\xbd\xf6\xcf\x0c\xb5\xd4o\x96d\xbf\xaco\xe0\x99\x8ft\x9f\xb7"b\x1bh\x86X\x94\x95ke\xd4\xeab-P\x8b\xd3\xd8;\x8ev)\xd0B\xf9\xf6[\xbd\x9a9Z\x0e\xef \x98\xf3\xea\x98K\x8e\xcb/\xd2\x98\xc3\x07k\x80-\x96U\x87B\xc1\xdb\xe0\x15\xebXB\x04\xe3\xdf\x0cA\xe5\xd3\x1c\x14*jd7fi\n$*\x8a\xbc\x86\xa6\xad\r\xbf\xf3c\x82j\xf9\xc4U\x03\xd7\xa1~M\x1c1;c\x95\x89\x9d\xb2\xf6jdj\xf7\x00\x94\x05\x95\x8f\x12\xbc\x84*h\xd8\xa2v~\xef\xb6\x04\xdb5\x01\x98(Q\xe3\x180F\xf6:M\n\xb1\xd8Q\x9b\xc5\x87\x0f^\xe9;r[x\xd1X\x0ee\x99&]\xf3C\xfc\xe85\x8b?YY1.";\xb9\xad\xea\x13\xc3`\xae\xabB\x90bd$\xacq\xb5\x946B\xac\x82WT\xe37\x07\x01s\x15\xca\xd1\x1c\x90\xf6\xdd\x08\xb4\xa6~2%W\xc8\xbdJ\xe19\x10FY\xae\xfa\x8c8\xa4m\x81\xad\x1d\xac\xfd\xf3\x1a\x18\xc4H\xc37\x1f\xa2\xc7\xdf\x8c\xc81\xbda\xa1\xb2N\xaa*\xde\xd1K\x1d\xdb\x13\xd1\xa3]\x90g\xf3t\xcf\x88~\xb6\xadn\xb7"\x10\x80]W\xeb\x0eP9_\xfe\tKV\xe5v\xf6[\x12\xa62\xba35\xba\xb9\x1b|\xc0"I\x90v0*\xeb\x9dq\x7fxQZIG\xe0\x9e?\xdfb\xc3\x1dHu\xa5\xa6j\xd4n\x9a\x1a\xfd\xc2\xbf\x9cI\x13g\x1f\xe2\x1c\xeb3\x8e\xbd\xb9\xc1\x0c\xa4\xa8\xf6s\xa5\xab\xb1I\xd16\xff\xa1\xf1p\xac\x08\x9c;\x1fLB\xc1\xc5\xda\x81\xff[\x8d\xa5\xc3\x10\x08v\x93\xe9\xbbf\x93\x82\x03\xd0&M\xe3\xd7\xe91\xce\x8d\xa3\xef\xae\xc9\xd0\x8e\x86!V\xf4@`\x1aM\x01\xa4iCm7\'q{\xbe\xf4\xf0\xe6\x8b5\xcc\xd71Y\x91\xe9rRH\xffE\xb3}\x10\xd9\xd7\xb4\xa3\x9d.\x005!\xc6\xf6+U\xa7\x94\xf3\xff\xb5{\x8e\xc7O\x84[\xecq\t\xb9\xa2&g`U\xa8\x96\xcf}"(\x11~\x04\x0f,6:\xda!\xf6`\x83\xf1\x86<\xd2\x94e@\x90l\xdas\xd3\x01\xdd\x89l\x10\x88\xad\x1bs.\xc8\xbc\x00\xd5=\x1a\x04X\xf6@\t\xa7Z\xf0\xef\xc8\x10\x05\xff\x91\x9a#\x1a\x1a \x89\xb4\x18.B\xcf\xe3\xc0\xebhE=\x9c\x17%\x13;\xae\xcb\x8b\xd4\xe8o\x10j\xc9\xbcy\x01\x99\nZU\xed\xeaO\x01\x076Oj\xe5c| \x9d\x8bM\x83+\xe6\xea\x1e&QX\xb9\x89\x9fL\x04\xef\'\xcez\x1ej\xa0\xdb\xac\xe4\xc1WR\xcc\xd4V\xdf\xee\xcd\xdb\xc7\xa5\xa8\x1a\x11\x81\xd4\xc9\xd3sG\xd6\xd06Z\xf9eC\xeaRW\xdc\xcf\xca\xbaG\xa5\xe3\xc9\x1b\xe8\xa3\x88\x1b\x12\xc4\\,\xe7\xcbF\x80\xc7P\xec\xeetj\xfe\x84\x91Ye"*|\xe7\xfa\x19\xf7r^\xe1x;\\\xcd\x0eh\xf6\x8aav\xa9\xa4*PI\x8dw)\xa0.wG\x8d\xba\xf2\xf3\x99\xb8\x15UT6D\xd6t\x9dF\xb2\x96[\xe7*\x01\xe2\x08\xf3\xc6\x1d.\xf4\x99B\xb6\x7fmsm\x86(\xd4\xf6\xa2\xa3#\x832\xfa\xeb\xa9hK\xc7\xf9\xd6\xc6\x97\xcc%\xff\x90d\xecQ\xea\x82\x0c`\x08\xdf.I\x00\xcb\xafn\x8bq\x8aL//\xa4\xc5\x9cK\xc0@\xa2\xfdY\x8d\xf3\x97Y\x93\x9c\x862\x12)\xa6?7C\rBuA\x1e\xae\xc5\xf4\x00R\xbd\xd2d\xf0\xd6\xcf\xf9\x07\x02\xab\x15b\xa3\xe0\xf8\xc0\xacp\xf6\xe9\xd5\x90v\xda\xc7{\'F\x1e\x17\xdb\xc8`j\xe9\xfa\xb1,\xb1\x9b9,\t)\x92}\x9c\xcafoZD\x95\x1f\x19l\xb4\x7f$\t\xf0\xb0\xfb\xf1c\xb8\xcf\xcd\xc8~\'U\x06\xaa\x1c=\xaa\xff\x06\xd1to\'\xc2-_B\xb5\x8b\x9f\x9d\x99\xfc\xa9\x080\x1b(\x94\xbc|h\x88\xce\x0fnr\x8f\xc7tE\xd8\xec\x8e\xd8~|4m\x8a\xa3"\x97#\x1b\xe3\xf8$\x83\x1f\x9c(\xe8\t\xaa\xe5\x0e@\x92\xac[\x7f\xb9\x15&\x80,U;\x0e\xcb\x1fV\xe7\x97h\x81K\xc9A\xf6o\x93\xc5`w\x8c\x17EX\xb3\xf6\x95o\x06/G\xbd)\x01\x89\'5$\xeb:\xb4\x1b\x85\xc3q\xfay\xdc\xaf\xc2\xee\xde\xda\x94e\xdb=\x9a\xdd0\xb1L$0F[+C%\x01\x03A\x18t.\x06\x7f\x92*\x00\x8d\x85\xe7\xdb\xc6\xdd$\xc9\x1d\xd9%\xd0\x9c\x92\xec[\x98\xe0f\xcaf?\xe7\xc86[\xc5\xed}\x9b\xfcs2U\xde\x7f\xc4\x8e\x9de\xf1:v^\xb1\xb5\xd3\xc7,F\xe0\xb7\x953[\xc8\xbb\x95\x1d\x9by)\xa9\x1e\xb2\xfc>f\xe7|\xc3\x16]\xfb\x9a\x91\x9cE\x1f4S\x08m\x04\x07I\xc46\x8b\xc0:\x9a\\A\x19\x81\xde\x0f\'_\xa9\xe0jI\x16\xcf\x86\xc6\xdf{\xedB2\x9c\xeb\xac\x18\x9f\xf9\xa2\xad\x80[\xa6As\xa4\x94\x8ex\xc0/\xf6(\xe1\xf2-\xffx\x8a\xe2&\xf0\x15s:\x06)K\xdb\xa7\x0b2\xb54Z\x05\xd5q \xe0P\xc8I\xf4L\xd8\xfbwTf\xd3\x8d\x0f\xbf9WP\xc18\xa3\xd3b\'\xa8\xa7J1>$\xc2.\xc2\x86r+\xc5\x83\x1f\x91\x93\xf5kv\x00hZt\x104\x8d\x07`A]\x14M\x9c[\x18\x8e\xce\xd5r"\xb9\x98\n\x87ku\xa5\x91\x19\xfaW\xdb\x80\x18\xa55\n\xde\x95\nv\x9c\x1d?S\xba\x11\xf1D\xf9$l\x0b;\x9e\x14x\x94\x08\x14\xed\x1c\x1e\x89q]4\x05yo\x9f\xc5\xb4{\x86\x0c\xb1\xe0\x90-\xbdQ\x0cp4\x0b\x94\xab!\xa6,\xc1\xeb\xda\xad!g\x99k\xd3~t\x1c\x1bq\xb2\xe8\x9d\x95\xb2\xb3\x16}\xc9\xc7\xabC\xa9p8L?\xb4sr\xb6E\xc4\x14\xa3sY\x8f\x07\xef\xd5\x9c\xcd\x11\xc7\x8a\x17\x01\x1eX\xc1D\x05#\xfe)\\\xbf!\x8exf\x0c\x15gE\xbb<\x12\xa3\xff\xe2\xa9\x95\x97\xf0\x11}\xe3\xe6\xe6(\x03\xad\x96\x9b\xcd\x12j\x16\x08\x85\xa1\xceX\xe5K\x92\xa9\xec\xbd\xfe\x1a\x1d\x19\x0b\xbeh\xa1SI,\x98fs\xb5\x1d\x13wh\xa09\xbb\xb2\xf7\xff?"Ju\xa3+\xaab\xc5\xcd\xe5[\x91\xdc\xad\x96\xd7\x05X\xca\x11\x17\xd6-\xc5\xb6\x85\'\xec\x06[nI\xa5c6\x87X\xbd\xde\xeb\x9a\xf2\x92X\x1e\x98\xe3;\x7f\xc7\xd4\x15\x80xc?\xe3\x15Q\x13\x04XY\x8e\xcd-\xd3\xdd\xee^\x9f\r\xec\xde\xd0\xf8p\xe03\x99\rR\xa8\x9a\x9f\xbb\x8do\x1f\x08\xf9&0\x15\xe7Y8r\x0eb\x8d\x98\xab\xa8\xe3\xb2\x07bu\xe3\x9c\x91a\x7f\x01\x150\xddV8\xd3\xfa\xa5\x02-Z!}Ac\xbb%6\x88\x8d\x01\xe7U\xc7>\xb5\xe4yf\x19H\xb4\x8fw.V\x0f`\x17M\x85&\x1a\x03\xf5_\x06\r\xa6\x13{\xc7\x85~\xcf\xa6\xb6\x11\xc3\xca\xe8v6\xfadt\xaa\x98\xb6\x1b\x00\xeaH\x0e\x1e=\x1b\xf7\xd9rv\xb2\xbc\x90\x1f\x8c\xe7-\t\x91\tDK\x96\xe6\xad\xea.\xd5S\xf4\x85t_0\xaa\xf6_\xb5\xf9\x07\xa25a\xc8\xceo\xb1\xf3\x7f\xda%\xd4\xbc\x06\x98\x9c\xcf\x81T\rs\xd1&-\xb3\xfd\x89\x04\xb8\xc6\xfd\x99\xb4\xcf\x7f\xd1R\x9ePQ\xd3s0\xfc\xcb\xa3\xf3\x14,\xc8\xff\xfe\xbf\xf1\x98\xba\x9e\xb22\xd2\xcby\xb2\xacU\x19h_\xb2\x1a3\xac:\xc0-c7\xfaa\x8720\xea\'\x8fY-}\x81,4\xff_c\xb3\xfc\xc9\x88A\xe7\x10j\xf2\xe5\xca\x12s\xdeW\x1d\xb4\xc2\xdfV\x0b\xf7\xedee\x9b\x8f\xd4F\x1eEsibd\x9dVJ\xc1\xc2\xa8\n\x15\xaa%\xc9F\xd6\xbb\xf7\xc8P\xb0\x9a)\xadj\xad\xef\x99S\x98C\x1c0\xed\xaaEzP\xa7>\xa5\x0e\xde\xef\xbc\xc5\'\xc2b\xc5S\xa9\x9dn\xb3\x87\xa9@\x7f]\x8f\xc6\xda\xfc\xc1\\\x19\xbd \x8a\xcb\x8d\x13\x95:\x1a\xda_\x9c~;\x81\xb0\x07\xf6b\xa1\xcb\xe8\xeb\xd3\x12\xa7L\xae\xe5\x95,pq\x03\xa4\xb2\r\x01\xf9|\x82\xca\xc4\xb7\x1d\x0e\x1e\x80$5%\xfaWF\x10\xad\n\xb2\xea\xf9/l\xd2\xec\'\xb3o\xef\x05\xdb9s(\x01\x8a\xc4\xb7\xdeRp\xbcvcF\x19\x1es\xca\xd2\x1a\xb1:\xd9\xfe \x12\xc7\xe6n\xc3/;T\xbc0\x83\xf8\xf1\x12\x85(\xcf\x9f\x06\x99s\x1b\x8di\xc1\r\xbd6p\x84?\x9f\x0fm\xc8\x81\xfe\xa1l\xd5\xf6o\xe7\x98N\x7f\xf8\xc0\x10m\xffX\xdb-"\x1a\xef\x08\x89z\x99\xca1\x1c\x82\xcd;(\nF\xb4\xd7\xf8\xde)\xe5\xab\xa9w\x07<\x17\xc8iU\x1d\xa8\x8c\x95\xf8\xa9\x11\n\x02\x92\x17SZ\xaf\xd4\xd8)=b\x1d\x93\x07\x9at\xe8go\x84\xa7\xf0\x98b\xe7\x05N\xb0\xd3\xc2\x0f\x12\xb5\xc6\xa1\xedA\xbdU\x99\xc5\xd0\xc6+\x99\xb8O\n\x12ch^\x02\xca$u(\x17\xc43z\xad\xde\\\xc8\xca\xb6l\x82\xec\x8fsOJ\xd2I\xfbKd-<%z\x96p\x05\x07y\x0e C\x00\xe7gG\xc0\xfb\xd2wh\xca1-P\xd2\xf8\r\xc0K\x01\xd0\xdcq\xa1L\xcdlY\x8dwA\xbb*!Q\x14\xffa\xbe\xee\x11g\xa2\xb5\xbf\xb4\xb2\x0e\xbe\xf5Z\xfa)mk"5\xb2\x1dLq\xcdCq\x138\xf2\xbe\x15!\xe1\xd4\xad\xfe\x04e\x95\x8d4\xb4\x16\xc9fs\xec\xdahD\x8b.s\x85*5\xa9P\xb4\x99\xab\xc5i\xd0\xec.Ag_\x8e5\x9ew\x8d\xf8\x0b\xb8\x08db\x97\xe23\xd5\xf9#R!$\x81\xb1\x86"\x12\xb7\xdf\xaaP\xea\x87gwC*M\xa2X\x89\xcdfy\xc7\xdf<\x1a\xb76\xb9\xa5\xda)\x94r\xe3\xb9:K\x0e\x84\xf6\xb0\xe0\xdd\xf3\xc2\xe8U\xf6\x16O$}B/\x8b\xcb\xc8C\x05\x15\xc1\xa8\'V\x0b\xf7_\x1f\xba\xaah\xc4+\xf9\xdc\x16\xb7\xfc\xd3\xfc\xb6\xf8\xd5|\xe1\xe1PF\x96\xbf-\xfa\x9f\xf0\xd9\xd5\xc9%}G0;\x89q\xfcw\x90q;\xd6\x18\xff\xb0\xf9\t(\xb3\xf4\xdd\x8beh\xc4@\xd5q\x17\xb5\x1d\xfa\xd4\xb5\xd0\\\x03S\r\xeb\xd1K\x1fNd\xa6\x90,\xe0\xe8"\x9ct\xaa\x9a9\xb30\x8eF`\xa2U\xc9"[\x81\xa9\x85S5\xb9\x0f\xf8\x92\x8846@{\xdc\xce\x03!Vp\\\x1d\xe8\xa3q\xde\x03\x87{\xc8\xa7\x17\xc0\xfb\xfa\x8c=G\x8f\xfc\xd5\x88\x80\xaa\xf3R}\xd6\x96\xe7~\x81\x90-\x9f\xf0\xf7Q\xb6\xde\xba\xa8\xc0%f\x86[:\xe8\xc9_!\x98\x86%\x83F\xc2\xa0fg\x9d+8t\x8e\xc8\x06\xf9f\r\x17.\xe8\xbdc\x87S\x81\xef\x89\x8c\xe3\xdb\xf4JlH\xf8\xd8x\x1f\x05\xc4 \xcb\xfbC\x1dY^t\xca\x81q\xf2\xf0\xe3@G\xa7\xce\xf9\x10f\x8e\xc4\xab[\xdb\x82`\x93x\xbb]~S`\x9a\x93\xad\xe1\xfbE\x82\xf2\r91\xae\xb1\xbe\x8e\x1dMx\xc5\x9d<<r\xcf@\xb7T.\xd2\xa2!\x06\xae\xa8\xc5G\xae\xfd\xe8\xae\x80\xad\xeb\x91\x17\x19\x07\x15\xe3oKd\x14O\xe4M\xbeC\x0bK.\xbd\xb1^8\xcc\xc7\x1cWs\xa6\xc7$\xa5!\xf8\xd7\xb6%/\x08lz\x8fJZ\x16\xc9v_`\x97\xb0)\x9b\n\xa0\xea\xf3-F\xfbZ\t\x0e\x82\xee\\\xdeg\x01\xfaN(\xa68\xfd\x7f\xd6\xfc\\\xa2\xce"r\xf9:03\x12\xb1q\x9c\xc9\x99\xbe\x9d2\x8c\x01\x19&\xfac;\t\xd5\xdc\xde\xc5}|@\x1b1X\xe7\x9c\x82t=q\xab\x15\x02\xaaM^\xaf~*$\xb8w\x1d\x92(h,D}q0\xc5h\x0fxF\x95\x01S\xd0?\x04\x86\x1bi\xd8\xad\x88\xae\xb1\xcf\x1c\xffd\x89\xda\xce@\x9a\xb3\xe0\xe7\xe0\x08O\x12\x08=\xa62\x13hv\xce\xdc\xfez\xe3\x00w\x91v\x8c3i\r\xc7_\x08%7s_\x8fi`\xa2\xed9\x14\xba\xdb\xf6\xab\x99\x9f\xcc<\xe3\x15]\x9f,\n\x90o5\xce\x86%e9J)\x1e\xb9\xa2\x91\x05Q\xf3\xf5\xcc\xda]\x7f+\x9fc4^3,\x19\x92\x0ceeIK\xa3Z\x92e\xacn\xd7v\x05\x19A$\x9a\xa5\x12s\xd1)\xfaxF"\xdd=8\xb2\xdf\xae\xe9\x97\xf0\xda\xf1G\x9e\x01\x8e\xc4|=\xf5\xee\'\xc0\x96\x18\xc7}\xc1\xe9\x92\\j\x03\xdf\xdf\x8cf<)\xb4%\x0fT\rE\tVlY\x80#\x8b\xd8\xfd\x01B\x06\x034\xb5\x8a\x18L?\xb0\xcc\x9e\xabL\xab\xd4\x14\xd9\xa1\xe9Ri[\xe4\x8c9l\xa2\x9dQ\xe7\xfd\x80\x0c\x87\xadw\x19?\x02C\x1c\xb1\xe9\xceJ\xfe\x1b\x0f:\xbe\xd4\xa8\xb2\xb5|\xa5V)\xe5\x0e_\xa0\xed\xd2\xb1\xcbJ\x07\x98\xd2!\xca\x1b\xcf2v\xbeD\xae\xa6\xd0\xf2\x7f\xa0\x96\xa3\xb3\x1b8,\x95\xa0\x98\xa5e\xca\xa2T\xbeG\xf8\x04\x084.\xa2\x18r\xf2\x04\xeb\xd1\x83\x99Q\xb6\xc1j8\x07\x87y?\x8d.\x1c\x0f\xe3\x8b\x0f&v\x11\xf6+\xb7T\xbf\xa6Mp\xabVyQ\xc3$\x99\x92\xa9f\xeb\xa6\xea\\\x8c(KF\x01I\xd3\xa9\x04{\xa3u\xd3\xd0\xc8\xca\x9b\x7f\x9d\x06"\x0cEt\xe3\xe2U\xda\xf4<H}$=Y\xd8\xab;\xfbfEy\xec\xc6f\xab\xc1iU\x15\x96\xb5\n=\t\x1f\x17\x81y;\xa1\xceY\x17T\xb4\xca#\xe3\xdb\xd5\xc6"\xc45[\xb9\x1d\xeb!\xe1\xab\xb2\x88\x96MU\xc1\x81\x98\xadm\xb1 Lbj,\xbf\x11\xd9\xceJ\x96YU\xd6\xb1;`r\xd5^\xaa\xcf\xf9y5&+\xf9\xa1\x9a\xe0.\xe8\x0e.\x83L\xe6\x9cI\x91\xcb\xab\xdaV:\x9c\x908c[\xd1\xa5\x13\xe1\xc3*\xbd\x93m\x18;\x16\x83\x87\x93&\x8a\x08\x9c\xb1z\'\x85n\xd6A\x13cD\x00,\x1e\x16\x8a\xf8\xedK\xbd!\xcc\xb4v#\xda\xf5\x1a\xf1uEU\x1e\xa0\xb3\xcd`6|\xd9\x9a\xe0\\\xc1\xfe\xb6\x83\\\x0c\'\xfb-<\x12$\xef\x8d\x97\xd6&\xc7Czj2\xcbk\x93n\xcd\xa2_\x14|\xcdh\xf1\xcd\xce$\xd4Do<\x83\x0c\\V"\xe5\xa3\n\x8d\x19o\xc5\xef\xdf-\xefJv\xe1\x90\x15\t\xcd5\x97\'\x0f86\x1b\xaf\x11\x06h\xbe\xbe\xe1\x9d\xca\x9djr\x1d\xddm[\\\xe6\xee}\x97\xf5\xaf\xbb\x94\xae\x9c\x0f\xd1!Cg~\x88\xe1\x15\xa3\x1b\x10K\xad\xf3D\xdeE\'^7\x86\x08H\x06\x11\xc2\x03\xcd\xc5\xd5\xdb\x03\rMis\xccuw\x8d\x84X\xa9\xc5\x82[E\x1eHXl\x86\xae\xc0F\x02\xf6\xaf\xbc\xe68\xe8\x1d\xb9\x12Fi\xdb0Ie\x81hA\x14\xbc\x03\'?\x01\x15\xea\xcf\xfa\x86\nvfE\x8ea\x8e\x8c\xfa\xcd\xd8b\x1c)\x8d\xd0\xc8\xafx\x86\xd5\xf7\xc1\x10\x17\xceb\xd5\xe2\xc7)\xcd;\xb3v\xa9*o\x92@m@\xea\x1c\x8f\xbc\x04\x97\x1eU\xd6\xfa\x90K\xc4\x92\xf4D\x1d\xaez\xceb\xa6\xfa\xfbu\x91\xf2C\xf8\x95\xbc\xfc\xa1\x8dK\x1eV \x0c\x05?F\x10\xb6r-\xca\x1b\xdd\xe8\xf2C\xfc\xbb\xe1\x00\xc1],\xb5\x00~\xe3\xb7\xdb\x9e\xd8H {U#Q?y\xa8\xe1\xbc\xca;\x98\x9f\x9c\xc6\x9c\xc3\x96\xf0\r\xaa-\x85\xa0\xc1\x9c-r\xb4\x98\x8e\x06\x92\xc2\xb00\xb0D_\xccf8\xf8Jc\xbc\x17\x04\xceJ\x8b\xed\xe1\x81\x1f\x105\xd0\'\x00\'X\xc8m\xefp\xfbiW\xe3q\x9c\xd5\xdd\x80W\xde\xf8\xfbC\xad>\xd3>\xee{\xeaw\xdb\xaf\xcd}\x03\x05b\x8e\x06\x86<\x7f\xfa9)\x1e\xea\xf8\xe3J\xef\x97\xda\x8c\x0f\x92\xc4\x9aKt$\x84\xd3\xdd\xefn\xf6\xca\x85\xb73\xee\x19\xef:\x00\xe5\xb1-\xba\xa7\x82u>\x9f\xcc\x83\x91>E\xa1S\x07\xf8\x19\xdcvd6\xa7\xf9P\xb2\xae\x90E\xb2\x81\xd8\xe8\x04)\xf2\t\xdf\xff\xbc\xcb\r\x89\x16D\x9c\x86\x93?9,\x83v\xde\xdf\x160Q\x9e\xb18&\x89\x15q!\xfb\xf6\x16\x0c\xf4\x996\xd5:\x9d\xed@\xd9\xa2\xa0\r\xa4)5\x89o\xfcN\xf7\x89\x9a^.\x9c*e&\xeb\xb3i\xd5\x99\x9fz\xae[\xfe!\xd4\xa8\x80\x1f\x0c\xa6\x01\x98\xeb\xa0\xa4\xebSk\xf8\xa1\x0f\xe4\x8cx\xd2\xea\x8e\x1d$\x1a\xd3\xa5\xfcq\xd0\xfd\xc4\xb7\xeb5X.b2\xbdW\x9b\xc2\x92_\x9a\xd7~\x97\xf0\x18\x91*H\x07\x7f\xbe\xb0WKIq4\x12[\xd2\x8e\xdf\xdc\x9fF\xb6\xb0u\xb2\xebB\xa2\xa3\x87\x13\xd5\xa8sz\xf2Y}\xf3\xbf\xb1\xc9}$\xc8\xc6\xea\x1f@\nw\xe9\x11v\xbc\xa0G\xd0\xd7\xa8\x83%\xb6\x8b\xfd\xcaY=\x1d\xf1\xf6\xb4O\x00\x822\xc3\xca1n\xe3\xc05[k\xe35\x04\x13;e\x18\xff\xccc\xa1\x13\xf67y\xa1U\xdf&\xa9\xcaI\xc2\x87\xbf\\\xe1rM\xf16\xe7\xe8\xc6K\xf8\xe0\x91\xd7|\x94@u\xf4\x9b\x03\xa9\x0f\x0f\x0f\xb1\x8d\x1cI\x85\xff\xc8\xd0T\xeb\xa1\xf0x`\x7f\x07\xf3\xac\x9c\xef\xa1l!\xad\xa0\xa1\xc7\x8amV\x9a\xc5|\xc4q\xe54Y\x9fq\xb3\x19\xf2\xc4\x9eX3\x82Y\xb9\x19\xdb\xb4@\x07=\\O?^\xbbQ\xael\xcc\x9dR1\x01A[_\x04\xe4\x9e\xe5\x90\x1b#\xbbJ\x0c\x17UR`\xeddC\x89*y\xe3\xe7\r\x16\xc8#[\x01&\xf5\x06/\xee\x9f\xa2)\x80\xe8V\x88\xfd\xb4\xd9=\xb7\xd1\xd0\x99\xd8\xf1\xd5\xed\xb8\xba\xe6B\x9e8\x1f\x17\xde~r.u\xd7\x01U~f\'h\x9eX\xae\x92\xfe\xe5/\x01T{\x90\xa6\xb8\xb6}\x10\x8e\xb1\xf3ig\x9a\xa9\xbb\xe8nd\xfeH\\gu\x14\xd9\x97v\xd1\x8cL\x902]\xf3\xcb\xbb\xf1\xe8\xc7\xb6X6\x92\xce:\x80*\xfeeKh\xb0}k\x9178\x8cB\xb3\xf7\xf2*\xeb\xa8\xf8\xf6F\xff \xa8O\x89\x99\xd6\xd1\xab\xa67\xdf\xa2\xe9\xe7\xeb\xa2\xf9\xe0\x98\x18\xdb.T\x08\xa4\x86GyP\xfdDB\x05\xd4`\x12\x1d\x18\x1d\x8dK#+\n\xe1\xb4Zx\xf4\x0e\x8b~\x89(D\xe5\x81\xc8\x80\xc1\xdd\xc7\x98\xc0X\x84\x16^U\x8e/O\xb2:z=\xe9\x17\x86Aq.@\x95\x9fM\xb3\xd5\t\x00R\xf6\xee\x81\xa3\xcfV\x85\x0e\'\x86S\x9b\x96\xa3\x8c\x84!\xd7Z\xf0\x84\xe6\x9e\x17\xae\xc6 N\x106\xda\xc9\x05\xbbpO\x98\x9dJ\xfe\x1b\x0c\x16\x8b\x80CA\x0c|\xdfn\x89\xc9\x80ox\xe7s\x1a\x04t\x11\xd9HY\xb9\xce\xff\xe8\x01&\x03\r\xe2/\xb7`\xd3.\x1euu\x17m\x0ei|\xd0\xdb\xe2\xd2ieh-DAIe\n\x03\xa7=Qj(v\x9f\xa94\x12\xdb\xa2\xc6\xed\xb3\xd7\xf1\x9a\xfcP\xe6Y\xd4>S:\xc2B\x1d7\x89\xef\xd1lq\x0b\xfc2\x9e\xcc*\xc9W\xe4\xa8\x14\x0c\x0b\x00\x05\xd9\x99\xb7\xf1\x92\xb2\xb5\xc3\xc6\x1a\xf7\x10\x89\xafs;J!\x1d\x95\x97J\xd3\xe2{\xd2\xff\xf7\x8c\x898\xaf\xcb~?\x8aNoS\xfc\tb\xde\xa0\x1aN\x0c\xa7\xe2\x99\xfd\xd0\xda8\xe9\x91)b2\x8c\xf76W\xbf\x1d\xfdg:\xbb\xd0\xfd\xc5;\xd4\x87\x82\xfc3_h^\x17\xdb]B^\x8a\xb7\x12\x95\xe1)!\x1c\xc8\x91\xc8!-\xb5\xbb\x89FvK\xddP\x80\xbeX~x\x9d\xba\xec\xbf\x9b\x1d\xb2\x82\x98\x00\xff\x1b4\xdc\x95\x8a\x98\x96\xbe\xb3\xcb\xe71\'\xfb\nZj\x80\xa7\xab\x9cO\'.\xfd]h\xaf\xa3\xc2e\x9dP\xf0\xe8\x0c\xb7A\x95\x8f\x81\x1eL\x9e\xe7\xdd}\x99\x1b61\x10\xc0\xe2!\xe5\r\xee\x87"\xeb\xc7\xaf\xb6\x91G\x0f\x86_\x9d\xfe.\xbbsRz\xc9\x97\xe1!G\xc1\xc5\x93%\x8aZn\xab\xa8\xe5+@\xde\xd9\xc5\x05g\x92F\xf9k\x99\xc7\xd0y0g"p\xb4\xa7\x14\xf7?j^\xc6\xd6\xa6\xcf\xf1\xa1\x1aN&Pz\x18\xe6\x9e\x13\xa4Q\xa7|\x89$\xe0\xd9\xa1\xab\xeb\xa3\xb9e\x0flY\x87\x958D\xb4\x9b~\xaf\xfb\xe0\x01\'x]Q\xe8;\x8a\xb7\x0bZ\xb6nn\x8a\xd9P\xda7C\xe0\xae\xf7A\x03\xcc/\xef\xaa\x80\xa1\xc4:t\xa5\x97\xbc\x16\xbf\x80\xaai\x06\x13uv\x1f\xb9|\xa1\x07k\xe6\xb8PD\xaf\xe7?\xca\xe0\xf5\x05\xa1\x88\xc6\xda>\x17X\x96&\x11=1f\x99\x80YLhwS\xdf\x03\xe4\xf8\x1d\xe8`\x88\xcd\x0e\xaaRW\x7f\xec,\x833u\x9f\xf7\xee\xee\x8b\x92*\xc2\xc3\xcf\xe2c\xa2LX\x8d\xdf\xaf\xc7S\xd0\\\x13\xa8\xeb\xc5++Z\xa6\x93:\xd0\x14<\xb2\xd6\xcc\x16\x98\xfeXv\xa2\xe4#\xf6\x94f;A\x83\xf8w\\T\x8a\x8bX\x18u[e\xc9\xa9\xf2\x18\x15e\x98\xbd\xf2\xf6\xe7\xedt\xc1\xbf\x1dPh\xd6\xd2\x10@\x92\xf6\x06\x8e\xba-[\x81\x18\x87\xe5~s\x16\x01~\xd3\x07\xd3\x9dG\xb4-0Gp\xd7K\xd9|\xcfQ\xba3E\x1fW84\x8c\xc5\xc3\x148\xbc?R\xf0\xe4\xa0\xcc&n\xfa\xcbMcc\x9ag\xdd\xd0\xa8%~&K\xe5\x18F\x82|5\xaand\x85\x82\x04R\x90x\xaai\xbe\xbe\xb5M\xe4\xf1\xbdF\x95\x01\xbf\x0f\x84v\x9b\xb5\xc0\xb6\x1d</\xf3\xec\xcb\x9fN\xdd\xf0_Z\x00\x88\xb0wfN\r"\xe4M;\x86:Wq@\xaa*j\xf8\x8e\x83YVp\xd21\xf2^\xb16V\xda\xb8f\x89Kko\x8a\x96\x05\x9d!\n\xe7s\xfczO\x90\xd1C\x0fO\xd8\x92\xccL\x90\x13\xa8\x13\xd5i\xf9\x85\xd22\xd3V6\xa8\xd6\xfai@\xf2-h\xdd8\x14\x9e\xb5Z4\xabADb\xceFB0\x8f\xc8\xee\xb5\xf8<D)\xc1\xb0\xff\x9aP\x802\xa9^\xc8\xfa\xf9\x90\xa4s\x90\x0e\xbc@\xa6Ot\xee\xe4Yr\xcboB\xd6\np\xcc\x03v\x1a*A\x1c\xa8^\xff\xea\xa2\xa0\xe0w\x0e\xa0\xdez\x80\x01v\xe6\xb6\xa6\x052\xb5Y\xca\xd3D%\x17\xf5=-\x04nx\xfe\x1aK\x02\x8av\xa2\xbb\xa9N\xbe_3\xfb\xfd]\x8c\xf8#\xb1\x1e\x85[\x05\xcd\x87AT\x13\xf3NG8\x05\xdf\x02\xc6j\xc3f\xc9\x8b\xdd\xcf\x98>\xaf8\xd3`\xf6\xe2\xb2\xa9\x05\xd2Ef\xeb\xa1\xe4=\x03\x02\xa2\x9a\x8e\x8b\xc5<4\x12\xccFr\x18i\xd1.J:\xea\xdbP@\x9ex\x10\xa1$"\xa6\xaec\x19b[\xfcmyq\xcd\xd9qM\x17\xd8Ha\x00\x8fS:#"\xf1\xfd\xea?\xad\xd3\xd6\x08\xd9\xdaUU\x02u\x03\x990\x93\xd7\xa7\xe1\x91\xf9\xd4Qr\xcc&\x98#\x08\xcf\xd6\xd3\xa2v\xaf\xce\x00`\xaa-8\xe9-\xf3\xca,a}\x05\xc5R\xc4\x0f\x19D\xf2\xb2FV\x8c\xf7\x14br\x94\x8ca\xfeu3X.\xb7<6\x16\xc5H5J\xf9q\x04\xa7>\x1a\x9d\x9d\xa6\xf2\xda\x8a\x90)\x0f\x92mzN20\x948\xeaO>\x9d\xa9J\tQ\xe4\x92\xe32Vi4z\xc0\xe3\xe89\x81}\x06n>\x82)\xf1n+>\x08I\x80\x83\xf2\xcc\xfbj\xa1\x99\xee\x97\x8bL\xcb\xd2\xdf5f\xfd\x1ee\xd7\xbe%cy\xdc\x06*\x91\x88 \xbcE\x00]`DELzY\xbf\x17\x97\xe6@h\xfa\r\xc6\xe3\xb1\xa2\xcd\xd0\x1d\xe7\xf1\xde\xcct4\x8db4\x81\xc6\xbb\x12e\xbe\xc7\xc1^\xb5\xab\xcf\xff\x17@mr!\xe6AW\xfa\xdce|;?R\xb3\xec\x13\xf9\xedf\xc6\x82C\\\x82\xb7\xfc(x\xb0\xdf\x06\xfe\xa9\x14\'K\xe2\xdc\xab\x19\xda\xe1<\x1c\xc1(&\xde|\xee\xecj\x86^\xa5+\x1f\xdb\x05}\x9c\xf6\x86\x0b\x16\x123\x8c\xca\xef\xd3E\xd1>\xbc\xc9\xf2\xd7\x91\x05\xe2\xd8?\xebj\xee\xe9*\xfc-\x0b\xcd\x06$\xab\xbf\x06\xbd0\x0b\x11\x96Q\xd1\xf5\x10\xf8O\x10\x90\xffBVc\x83y\x07Y)&\xee\xa9\x0f\xd3\xcc,\x9c\xb6\xbf\x03i\xef\xea\x9c\r\xe3|\xfc\x95\xa8\x10\x93A\x92,a\xa3\x95\x0cp\x8c\x14\x9aT$\xbev\x8b\xef\xf5\xa39\xb5\xec\x14\xe3\xdbW\xd7\x8a\xa6\x84fV,\x10m\xbf\x13\xf8+)\xdc\x1f\xb91xd\xbe\xd8\xcd\xf3\x08\xd0\xd5]v\xf8\xe2\x97T\xf1\xcd*q\xa7\xe7\xa5\x85Fc~\xf4e\x1a\xc8\x84\x88e\x98\x9bM\xa9\x1a\x8a\x12k%\xaa\x14\x95C\xf6a\x88\xd9\xe6\x83Y\xe81\xdc\x9f\x9cN\'\xcdP\x9b0[rzKHD\xd0\xe9\x04\\\xa2\xdf\x8e\x97\x82S\x95\x01D{`\xa7Q\x0f\xdd\xb5\x9dy\x90a\xf0\r*\x11\xae\xbf\xda$?1\x8d$\x08\xa5\'\x7f\x1a\xf2\xd7\xb9\x86X2\xdc\\\t\x1c\xa2\xafW\x8cUu\x86\x8dG\x137\xa1\x9f\x80C\x824t6\xe98\x08\x0c\xae\xd1\x0e\x1a$\xd1\x1f\xd4\nK\xd5J\x12\xa1\x84\xfc-\xef0\xa5\x98\x9d\x82\x10\x7f5\t\xa4f\'\xa0\xc1\x94-\xf4\x87C{\xca8\xdc|\xe8\xaf\x8f\x91\xa5\xe4\x97\x0f\x04&\xdf4\xfcql2\x16\xb74\xbe\xd1\xe8\xae\xb1\x872\xc9N\n\xd6\xe3\x8bv\x10\xdcLro0\x15\xac\xc7o\xfaEI\xcb\xee%b\x18\x062X\xd6\xce\xd5\xa3\x88G\x91\xa9\xf2\x1f\xdb\x8d(/\xcdzp\x18\xec\x06\x83{\x1a\xff\xb3\xec\xae\xc8\x12\xa7\xe0K\xb3C\xdb\x1c\xa5\xee&\xfa\xc5x3_\xe0\x84MR+\xe5\xa1S\xd6\t\xaa\r& \xcdJ\x8a6\\d+\xdc\xef\x1b\x90\xf6G=# \xdc\xe7\xe9"w\x8f\'\x12\xb4\x03\xe9~7\xe8\x80\xc0#;\xd5\xfc\xcb\xed@\x85\x15V\x19\xd1\xe6I\x01\xf3\t\\\x02\xf0]\x06\x0fC\x16!\xc7\x86\xa1?\x03Ob\xe2\xce\xfb\x19\x8c\xae\xd6\x1d-2\x02\xa4|\xa6=2\x9f\xd1\xf5\x84\xb2\xc1\xcftKq!\xcc\x7f\xc2l\xf7\xdd|/{\xff\x9f\xe4\n\xd0\x93\xd2e\x03\xb1\xbc\xee\xbd\xb8\x9c\x0e\xbd\xae\xe4<\xbe`G\xabT\x03\x1bp\xffl\x1e\xbd~\xf0x\xe4\x89\xc1x\x06Bc\x86\xe5\xd3;\'36\xbeM\xdc\x97\xd8\xa37\xd9F\x00x\xe8\x01\x01\xa5#/q\x8f`\x1dI\xd4u\x08C#fK\xb3\x14\x06\x89\xcf\xbfF\x97\x9bE{\xc5\xb9\xb5i\x92\xf4Y\x9b~l\xb1\xcf_cU{\x95\xb0v\xab\xd59\x89\xe0\x061f\x98y\xc8\xd5\x14R75\xae\x9d\xfd\xa5wy\xfbf\x1a\xb7\xf2\xbe\x02\\\xa0N\x06z\xa2k\x03\xc2\x90qd\x83?>\xe1\x13\xd8\x0e9\xb9\xe8\n4\xc6W\x9a:\x01\xedE\x1d\x96DB\xf1_\xfb\nw\xb7\x05\xcf\xc7\xc8J\xb1\x00\x19-Y\xd7\xb7\x8d\xf1d\xed\xac$<\x7f}\xbd\t3\x04bM\x87\x88}!\xa8\x02\xb7/\xd4\xa5i\xa2G\xa3G\\\xcdf\n\xbbC5\xd1\x1b\x9d\xc3d%5k&\xae>+\x9f\xa8\xe4\x8a\x8b\xc3\x9d.\t\xb2\xaf\xef\xe9\xb0\xc4)y\x94\x93YF\xadd\xffb\x83\xa2\xde\x8a\xc6C\x89;\xfcp\xdb\xca(\x17p\x98Gz4u\xe0\xd9\xdf\xd5\x1e+\xfea,\x95!n\x86\xf4F\xe3\xb4q\x0b\xb51\xa0\xc1\xcd\xf3)l\x7f\xe4\xf3\xe6@f\xb6)\xf6 \x0e<\x83\x9a4q\xf2\xb6`\xc3\xeb\xe3O\x80O\x96j\x1c\x97}\xe6\xfd\x86\x8e\x1bh\xfd\'\xfd^\xa9\x9ab\xca\xf0\xd1\xfdj:\xd6Ty\n\x167\x03~&e\'\xd5\xdc\xad\x94`\xb4\x7fU\xbb\x1a\x03I)\x11\xc0\x01v\xfe\x95Ox>\x12\xd3\x85\xdf67\x18?\x89\xfd\xe82\xf7\xb2\xfcl\x84`t\xda\x9d\xf2\x05\x9a\xa3e/=\xdcc\x05\xed\x9f\x81\xd7\x94\xb3~bN\x17o\xa5F\x93\re\xb9p\x16K\x8a5\x1a\xf8\xacA&\xd4z\x9e\xc1\xe9Y^\xb3\xe4\xd1\x861P\xb1\x9fdd\x9b,\xf7\xe1\x98\x18\xd3\xd0\xd3\x98\'\x81by\x9b\xcf\xa8,\x1bO#\x14\xaeFKJr\x1f\xd5k\xe0\x8b{\xc2\\Q\xe0-\xb5\xdb\xe1W\x11@\xb7:\x14\x94\x05@\xe1\xe2#\x0f\xee\xb2\xd1\xaf\xe1<m\xab\xdb;\x92uk\x83\x91\xea\x83b\x19k\x11\xe1q\x80>\xd5\xd3\x19&X\xdf!\xff2\xb6\x93\x9a\xad\x99NB\n\x8b\xbe(\x0c\xedvG,>\x19j\x13\xe9i\x1c\xb7\x9b\x1d\x1aD\xabM\xf7h\xa7\xee\xea\xbb\x15\xae\xf6\xe2\xddzySn-\xe9\xe7\xc61b\xff\xe6\x87\xf2\xd8g\x8f\x93#\xe8\xa0\x86\x83\xc01\x05\xcb\xb2&\xb8\xfa\xe2\xad\xbd\x90\xee|\xc2\x8c\xb7\x1c\xaf\xfcg\x06:\x15a\x89\n\x0ea^v\xb0\x06\xa4\xf7"\xbcL\xaf\xd6\xf2\x03\x85\xf3\xed!\xf6@\xfbLa\xd6\x0b\x1c\x13+\x8e\xd4\x17-\xe7\xb7E\xe4\xc1\xde\xb2\xb1\xa5\x88A\x12)z\xb6<3Z\xaan\xcd\x13\n\xb1+\xf7\x7f$\xe5\xdf\x08\\`\x96\x18\xea\x02\xc2\x82\x18%T\xecj.\xedG\x06\x07\xab\x92>\x03\x16\xf1\x15\xd6\xc6\x15\xd7\x84\x19$6X\x10\xf5G_\xc7i\xc1\x8d\x18\xdb\xfad\x9a\x92\xee\x8b\xbaW\xda\xc31\x0c\xa3\x7f\xb1\xb6\x80\x8a\xb0\x7fI\xc9\x8f\xc7\xd1\x9d\x94\xa4\x90\x97\xe0:fz\t}\xa7\xc9\xb2\x0b\x05\x92`\x15\xbc\xfd\x1f}R\xf0@\x90\x88)\x82\xad\xab\x7f\xf1\xe1\xe0k\x8bZc\x89\x16\x9b\x88@\xc4\xf8d\xbd*mF\x9eP\x8b\xc7\xc2\xa8\xb2!r\x1c\x8e6\x90}+t\xf2\xed\xe4\x0c\xe0v\x05\xa7t\x1aa~\x06\x1aZ\x83\xc0\xf3\x9e\xd2\xb5%(lO\xfc\xcca\xbf\xf9\xf7\x80\xaf\xa8\xb9\xf8H\x17\x7f\xc8\x89J=x\x92\x05\x9f\xed\xaa\xcb\x05\xc4\xce\xbc\xda\x0e\x93i%\xbc\xfcf\xe0\x1e\xb6h\xcaLm\xa8C\x9db\xc5@\xe8\x1b?\xa4Md\x8e*\x8aN\xa1\xa3\xcf\x00\n\x97\x86\x88\x8a}<\x11\xaf\xd3\x92\xae_\xf8\xd9:\xca\xd0\xa6\x16\xd1Sk[0y\xe0\x9fI\x9a\xa6\x81\x12\xfa\xb0\xb5\x08\xc2\xb6\x1f\xc4\xeeCN7\xcd2\x17\xa6\xc0f\xad\xd9\xc5a\x90*|\xb9\x90\x14\x80<2+\xd6:\x8c\xb8\xc4G~}lM\xa2\x8a.\xd79\xfa@\x83j\r\x9a\xd4.H\xe9\xf6`\xc7\xe4P\x89\xe3\xf8\x14\x12n[R\x06\x10\xa3b\x8e\xda\x1a\xc9\xab1\x83\x9e\xe6\x0f\x01l9\xa7\xafj}\xa0\xf3\xa1\xa3\x05\xe0\x0cnkU]\x8b\xc1s\x17\xf1C\xd6<\x9fP\x03V=\x05!\x1c\x13\x17\xa97O{\x11\x12\x10\x98\xa4^\nR\xad\xc9\xde\x9e\xab\xe6,\xc9\xc2\xec\xb8\xce\x80\x18\xa0E\xaf`\xab\xa4\xdfR\xa1\xaa4\xdd\x8e\x856\x16\xc6[\x92\x02D\xb4%\x9f#\xb6\x93\x0c&6-\xd0*\xc8H\x14\xffbVV\xfc\xec\x8a\x19F\x14\xdap"3\x0b\x87j\xbef/\xfc\x8bj\xab\x17\xf7\xf4g\xb0yX\xa3\xacj\xdfQ\xac\xf5\x81=\x89\x19\xf2!B>\x17\xd8\x18\xdf\xcd\x8cc\xbf\xe3\x076\xdc\xb2\xba52-}\xa6\x9a\x01\xa1^\xc1\xaa\xa8?\x82\xdcusE\xf0w%\xbe4\x90:qG\x95kn\xc8\xb2F\x01\xf4y\xac\xdd=\xd1\xc7\xc8.mO\x19\x9b\xb0AC\xc1M\xad\xe4L\x9c\xfd\xd0X\x1f\x95xp(IY%\x8b\x9bWw\x018\x8dp\xefe\xb5tE\x90\x8b\xbcEV\xe6\xa6\xfeII\xcf[.\x04\xab\xceS\xe9-\x9a\x05\x17\x8b\xf9g\xc4\xe4\xc8\xa4o\xae\xc3}\x98\xd7\x17.\xd7;V\xeb\xb1@\xf8\x9b\x05\xfd^\x8b\x11\xfa\xc2\xb1\xcdE\xb8d\x94\xb9 !C%\xde?5\xb3\xa2I\xc0\x10W\xf9*o\x16\xab\xa5\x07\xf7\x9b\xe6\xd0\x1aW\xf5T\xefA\xb2\x11@\x05$pL\xdad\xa0*`\x02?\xd7\xf0\x80\x08\xa0\xe2\xc0\xdf\x91\x1b\xbc\x97\xf4\x18o\xda\xbf\x00\xec#Z\xda>\xf9EIj\x80fk\xbcb\xf7g\xbb\xc5\x0c\xb7\x02,\xd9\xfdF\xd9\xae\xfbX\x87\x7f\x03~!\xa1 \x8bo]V\x1e\x04.o)\xbe\xca\x05\xca7@\xf0\x92\xba\xec\xf5\x14\xd5\xd5\x8c\xe6\xe7\xfdo\xf4*\xdd\r\xddY\xb3\x17t|\x84\xb5<\xca\x1f\xf4\xed\xdd\xf3R~\xfbj/4D\x1c@\xfb\x91P8\x80f\xbe\x9fs\x95\xa9\xcb\x95\xb9\xbd\r\x8a\xd8\x9e\xb5\x0fBa+\xc6\xa6\x8a\x11\xa7\xf3V\x9b\xbf\xff\x88\xd6\x84\xeds\x1b\x8f\xd8\x84\x8c6b\xb8\rt\x99\x8b\xda?=`\xd6\x04\r\xfb\x0b\xb2\xc4\xbad\xf9\xfe\xac\x115Y\x1f\xddi\xfb\\\xa4\xb0w\xed\x92U=\xca\x06\x95\xe0L\xbd\xe6\x11jJh\xc1z2T\xce\xd0\x193\x0f\x15#i$I<\xf3\xb0\xd2\xd7\xbcW\xa2\xd8pe\xda\xd9\x90\xdb;\xf9W\r\xb57\x86\xd65Q=`,\xbe\x13^\xb0\xc4m<\x01\xf9\xf7y\x95\x12d\xa1_\xf0\xcf\xceH\xf7\xd0\xe0\x00\xec\xef\x082\xf2\xaf\xdf\xa78:\xee#0\x9e\x13\x07\x0f\xfa\xf7\x06.\xf8\xddL\xf2$\xff\xb6F\x95S\xfc\xc5B\xc3\x9b\'\xc90=\xc4\x00\x18\x88\x001Y\xda\xf8\xba\x17\x16\xdb\xf6\nW\xc0{5XAf\xc7\xef\x89\x1dM1NS\x0c\xc4#\xe1\xea\x0e\xce\x16P\x9bi\x94t\xd4\xf8D\xad\x8e\xb7\x7fH(\n\xc2\xe9\xd4um\xf0\xdfT{\x0e\xdaPQDw\x1b\xa1\xe7\xdc\x91\x87g\xf0oh\r\x86\xc9W&\xcb\xb6t6\x82\x04\xbd<C\x80\x0c\xae\x02\xb5\x16Hk\x17<X\x1bA\xc6V\x90\xa8\xe9\xe5\n\x0ce\xa8\xb1$|%\x06\xae\x9e<^/\xb3\xee\xees\x1f\x90\xe8ou\x11\x19:[\x10\xbc%z\xf0\x80$\xc2\xec\xfeE\x82#<\xb7\xa0$\xa1\xa5\xb2\x83-\r\xa4<d\xbe\xcf\x13\xcc\x11\xb4\xf1\xb6\xd3\xa3G\x9d\xd0\x98E\xa5\xf8\xa6\xcb\xdd;\xfaO\xc1v\xdd4\x1f\x82\xc9\xe0\x01\xd6\xc3\xde\xde\x102\x06\xb3<6g\x91\x84\x1fp\xc8\x1e\xce\x94\x9c\x0c\x19\xc3\x9e\xc0\xb6\xcb\xdfx\x02\x1b\xb2,\'\x81\x9c\x97\x1b\x06`rW\xd3\x19JB\xf5\x1b\xe7s\xfd\xd7\xd7\xa9|\xc1\xaf\xce\x8b\x08\xc7\n\xc6\\_N2\x85`\xf1\xba@\xb6\x90"\xd6|<V\xfe\x91\xa8\x1e\xe0Y#QE\xc8H\x99\xb1\xf8\xf1h|\xd3\r\xdc\xf1O)\x0cd\xf1\xe1\xd6\xa4\xf4\xf4E/;=I\xcd\x17?\xe3\xfb\xc8\xb6\x90\xe6\xc5\xfc\x80\x05\xa5e]<\x9b\x99=\x95\xb8q}sS\xc1\x89\xe4xc\x98#GzK\x845\x92\xc0\xc1\xc3q\xf0\xd3K\xad:U\x12\n\xd0>\xa7\xd6\xf3y\xbf\xe2aq\x9bl\xe3\x13(\xc9X\xb8\x19\xbbN+?\xd18\xfaf\xe2l\x81\xaf\xb3X\xa0\x9f\x9f\x0c\x98\x96\xc7\xcf\x8b\x9bN\t\x8fQ\x8e\x8e\x91]\x99\'\xa4C\xc9@\xaan\xf0_\xd4]F\xed#\xf3.\x9dD\xeaG\x0b\xf2\xfc\xf0<\x89\xe5![tP\xa7w\xed5W\x91j\x03Z\xb9:wz\xbe\x06\x115\x86 \xd00\xa7p\xce\xd4\x12\'1\x03\xe5\x80&\xc8\xe9\x1e\x17"R5\x03!\xcc\xae&\xc3!\xcb\x96\xee<J\xed\xc4\x90U\xfeG\x1fU\xb4\xd1A\x1c\x15\xf2>\xabL*\xe4\xf26\xed}\x16D\x03\xf7\x87?\xf1D\t\xac\x11\xbd\xa9\xff\xd5\xcc\xe4W\xc9h\xaa\xc9\x86CK\xeb\x81\x89\no\x0b-7\x86]L\xa3\xc0\xa1\xc3B\xf8\xef\t\xb2\xcb\x06\x1f\xe2\x1d\x8f\xe8\x08q\x98\x9f\xac\x98\x87\xa2\xefzB\xa1\x84ZJ4\x12\xdbf\xcb9\xf2x\x0b"J]n\xc2-\xc1wyZ\x1e\xfai\xb2R\xfe.A\x89"7\xe6\xb3IKr\xfb^\xf1\xf1\x1e\xe6Y\x18\x9f9\xdb\xe9\xde\x03e\xe3\xb5l\xf5\xb7"\xa8\xd24\xc6C:\xf8~\xe3 \xc4\xfa \xc2Gh\xa1\x9a\xae\x92\xe0g`\x1d\xc7\x16lU\xd5l?\xcf\xe8\xb7S\x83\xa7SQ=v\xceA_v\xc4*\x13\xfbFQg\xdb\xef\x1a\xe6\x00\xa8\x04\xc4\xe2\x15\xad\x9b\x03.\x05\x12\xb9>UQ\x8a\xbfGm\xf3\t0\xb9m5\xac\xdc\xc4u\xea\x1f/Ifr\xef\x85\xdd\x12\xb35n \xaeT\x84T\x92]\x12\xaek\x1d\xefe8\xc6L\x93d\xf7\x98d\x07\xb3N\xa0\xf3\xc6YMLV\x82/\x15\x831=\xc6\xba\x1cy!\nv\xf2\xc0{\x16C\xb0\xdaBG\x16\xe8zP6\xe2^\x00\xf8J\xd2",\xdd\x06\x97\xf5\x10\x9b|\x95()h\xcbi\x7f\x86&K\xbf\x82\xfd\xf6\xeb\xf1\x7f\xe9\x89\x10\xf8\x86o\x81\x8b\xe4\xf0#\x80\x12\x189\x99L\x8a\xa4\x8a\xa1A\xc3\x1a\x06\xcb\x1a\'QC\x8a(\xf2=0\xe2\x1eA\xa0\xcc\x9d#\xbe\xd2`\\\xa2\x14\x94\x84cCK\xb8\xacb\x95A\xa8[\xe7\x8a\xf5\n\x18\xab\xc1\x0e\xfbN\x18\x8b\xbc@\x8c5\x9b\x06\x96\xc6\xcb(\xbd\xc0E\xcb\xa6\xff+\xfd\xba\xf2\x86\xcd\x11dy\x0fW\xd2s\xb3\t\xb8u$.V\xc0OQ.\xbd\xe3\xc6N\x82\xfb\xd4a\xec\x00@\xa9\x95\xdf\x0cL\xceC\x8di\xc3\x9ar\xdd\xce\xe5\x1c\'\x9f\xf3\x9b\xa1\xef\xbfx\x04\xe1O+qS\xee\x81\xc7\x86\x99SA\x99\xe1%\x92*\xca\xb3F\xe5\xc7W\x86uFG[\xb3"\x9e\x82\xd4\xfd\x98\xce\xc7\x1d9\x13K\r\t\x1d\x10\x05\x91\x8cr\x97(\n\x03\xdc%\xfb\xac\xec\xfa~\xbd@\xad$\x96WV\x93\xeb\xb5\\>\xd6\x1b\xd7#\xba\xceS\xb2\xbf\x8b(\xc8\x03\xe6Z\xe2\xb7\xb2\xfb\x8b\x99\xa0\x9b \xad#\xe4\x87h\xb0\xceYV\x1e[\xc1A\xa5 a\xddEDacY|\xc3\x9f\xc6\x8d\x14S\xea\xee\xe8A\x8ee\xf6\xb3\xb2r\xd31\xf3\xfa5\xba\x90\xe0VRB\xa7\xa0,g\x12\x7f\x14@qA1\xdb\xdc\xeb\x88\xa1w\xd7\ri\xa0cY\x1ee\xec\xa8\xce\xe3b\x13\x12$\xcd\xf0\x16\xfb:\xa8m\x0e\xe4\xcb\xe3Px\x15+\xab$\xc4*\x15@\xc4\x95\xf4\x08(\x86\xe3\xaf\xe5\xfe\xf0\xc7\n\xde\x06\xc6\x83C\xb4q\xecb\xc9A*\x03H\xcbxfS>\xa0 \xfe\xbe\xe9Z\xe0\xdb|\xf9V\t\xeeP\x01\xe8\x91\xd7\x93\x19x\x83\xf4\xe7\xa7ia\x10\x87L\xeb\xe6\xb1\x92\xd3N\xf01\x08\xe9\xb1\xa7\xbf\x8e\xe5\xf8\x9a\xbb`7\xe45\xef\x9cTx\x87\xdd\xe3\x93\xa9eL\xb3\x14\xf4\xf1\x92&&\x012\x17\x97\x9e\xdb\x02\x84\xc8Z#$5\xdd\xd46\xf8\xdc>\xe4\x98~\xacg\x1e\x0c\xc2\xd9\rk*\xb6\x90\x9fj\xc0\x82\x9e!\xe0.\xf9\xb8$\t^!\x07\x8f\xbdA\r\xc3\x94tTK\x17\xe7\x88\xdd(\xae\xa9@N>\x0e\x1c\xe7\xc1\xcb\x9b} b\xa1\x00J\x94,\xbfn\xf0\x81\x1e\xf8\x94\xe65\xea\xe8\x81R\xbaF\xa8P\xa8\xf6\xe7\x8e\x873\xc34Z\x9dV\x8f2\xb8\x1e\xa5N\x08?\x07\xb2\xae\xaf\x9d\x16\xcf2~\xc3q\x97\xb4\xeb\x13e\t][`\x11c{@\xc6Ek\x978\xc6i\x1a\xaa\xc8 u\xf4&\x90Og^"\x01\xa7\x0fOyr\x95\xb1O\x1047\xb6\xd7\x8c\x9b\xde\x9d\xff\xe2\xebU\xf5V\xed\xfe\xb1j\r\xc2\xca\xf7Y+9\x0c\'\xf0\xf6\xa5\x8e\xf7\xec\xcf\xd1\x7f\xa7\x80\xa9\xe3\xdc\xbet\x0ckJw\xcfkC#\x8b\xaa^\xc0\x16H\xe6\x17\x8f\xcd)\xe8\xc7^&\x97\xdc\x1dX\xbc\xd0\x9f\x92\xd9\xdau\x86\xd9\xeb\xc6\xc7\xb8KS\xa8\xc0\xe39\xde\x98\xe2KQ\xd6\xd9\x88\x1b\x08\xfe\xd9\x1c\xc8\xe5;\xac\x82\xa5p\xd0\xb1Y\x0co\xa0$\xc6[\x8a\x83\xc0\xef\xa0X\xf4\x11tU\xdd%\xedO\x8aFgw\xbezB4\x96\xfd\xa4\xc4\xac\xe8\x1a\xcf\xb7\rT\xd4\x85\xb2\x19\xde\xff\xd6k\xa5f\x83"mv\x06\xf1\xcd\xcd\'/!\xf2;=2&\xf3\xd6/\xc3\xba+J\xce\x9b\xb8LE\x08\x0b\xbaY\xee\xee\xf1 I\x03|R\x91\x99\x0f0\xeeb\xe0p\x83\xac\xf1E\xf0\xa7\xb0\xf8\x81.\xc5\x9a\xd2\xda\x84\xe7\xca\xf9\xd0\xc4N\xa5\x93\x01.\x13\x11\xf2\xda\x08\x938\xf0,\xce\x03"e\xd9\x10\xdfs\x1f/2Z\xa09\xa6\xc4\xdb\x1c\nHb\x04\xcf\xe4\x9e\xe6\xd7\x97\xbe\x01\x1e\x1coC\xcdQ\xc7\x9a\xe3\xac\xde\x828dL\xd0\xfea{\x06\xd6j\x84\xd5=e\'\x99\xd3\xe1\x90\x97\x82D\xdbK\xb8)1\xf9xK\xf1Vk\t\xa1\x0c]\x06*t\xd8\xbc\x8a[\xb8\xc4\xee\xc2\xbf6\xde]q~c[3\xa9\x8a\xd8D\x8d\xd9\xc4\xe5\xab\xfd\xf0\xee\xd4tf\xcch\x1e\x17\xfd\x0ePZ\x05\xf3\x9cE\n=\x9ao@b~\xda\xac\x1f\x81\xa8\xc6\xe3\x87\xde\x01\x91\x12,\xde\xa9\xde\xcc\xce\xac\xd5\xfd\xe2\x80\xef\xffH]\x11Z\xf2E1u\xe2\xfd\x87\xccxYY\x9a"\xa8\xcd\xb7FL_\xd0\x0b\xb8\x8f\xacZ\x03\xd1\x806\x02\xd2*\x00\r\x80\x91j\x92\xe0\x11s\x1b\xd1h\xf40\xba\x0bJ\xca\xa7}A\xff\xe6\xc3\xd5<j\x1e\xf1S\x13\x11\xa8\xe3W\xcb\xc7\x8b\xb7\x11\xd4\xc8{\xcd\xedV4R?\x81\xb9u\xb6\xf0r>\xaeZ\x9b\xed\x8b\x9cB\xbe\x18C\xd2\x0fy\x0b\x91\x9em\xe3\x1c$]\xb8\xadx|t\xd2\xc8\x02\xc9\xe4\xb1\xba"\xb9\x90\x13\x1dq\x90N\xc0\xcd\xc7\xc3\xf9\xc3\x9c%\xe7\xe5]\x8bu\x90\xd9\xdcD\x1d\xda\xe6|%h\x8dd\xcd\xc8\xe056u\xca6\xddC\x81\xa0\xf8I\xae\x8cIU\xdepH\xd0\xcc\xd4\xe5\x8eF\xae\x9a\x9a\xe4o\x93\xac\xb9\xd3\x8aMk\x91A\xb8Y\\I\xa4\xc5r\xe7B\xdc\xc4u.\xb0\x96\xba\\\x0b`\xf6\x82E\xad\xa7\xc2\xb5\xb9\xebt\xe8\xb3w\x1e\xfe\xb3oF.\x94b\x10A\x14\x8f\x9e\x99\xf8x\rn\x11\xaa\x98\xda$\x1fI\xc82\xfa\x90\x15\x1e#\xf8\xb4^\x82\x15\x8dj\xc4/\xb5.\xfc\x00\x96FT\xb3\xc4{\x1a\x88\xb4s\xd0y\xb8I\x0f\'\xc3\t\x1a\x9b\xa5\xeac\xcf\xcdC\x14|\xd2\xe0]\xee\x9ea\xd4\xd8\xcf\xf6.\xe2\xdcDp\x10ez\x12]\t\x18\x96p\x92\xeed\r!\x1f2\xed\xf1\x81\xd0;\x81i]&\x8a-\x1f&\xbb\xa4[\x85\x1e\x8e\xae\xc1\x87\xc4\xb0\xc7\xa9^p\x13?Mt=\xf1\x13\r\xdb\x90ZmV\xbc\xdb"5\xb7\xc5K\xdb\x97)\xef\xc5\x83o;\xac7\xb3-\xbc\x99\x1bI\xaf[G\xfdW\xaa\xe9O\xff\t\xe8\xf8\x80Q\xfd\x12\x97MQiK\x00\x1c\x08&p\x85\x04\n\xe1\xaa\xd9\xce4\xa0T\x84z\xd1`YC\x1c\x05%\x0e!\x85\xc9\xbc\xe1.\xbf\x96\xb7,\xaf^m\x84\xd4B\xcc\xf9~\xc4\xee\xa7\xb1\xb9$L\xe3\xc0s4\xc7\xd8\xbd\x01<\xc6\xeb\xb6\xbd\t\xa1\x9dG\xb9\xee~\x88/\xfd\xd8\x8c^Z\xfa\xaf7PB\x95\x86\x97\xff\xf9\xf2\x8e\xf3\x9d\xc4@(o!\x92\\\x8d\xeb\xdfru\x18F\x0c\x93\xd7B\t[\xb1\xf4\x95\xec\x14\x902\xd9|40\xa3*2\xeeG\xcc\xf8L\xb9:\x89\x04\x0b\x9dc\xb3u}dFy\xe8&\'BF\r\x84\x8b\x01\xa7\xd1\x8b\x98\x99\x9935J\xf7\r9!4B\x8a\xab\xf9\x93\x9c\xde[\x01\xe8T\xfe2\xe7+\x91\xf4g\x04\xc8"\x14\xa1]O@\xfa\x93\xb7\xc0`c\xf8J\x84w\x8a\xec\x8d\xc3\xf0\x86\xcf(\x8by\xb9\x1c\xf6\xc6=\x1c.\x87\x13\xe0r\'g\n\xc6RG\x9d\xdb\xa8q\xf7\x996\xfaS\xde\x8d.k\xea\x05$\xe8h0\xe6\xae\xfa\xfe\xa9\x94"_\x01\'3\xdarv\xe7hXIi\\\x81_1\x97\x82p/^2\xc5\xb3:\x8f`\x87\x8ei\t\x08\'B\x87s\xbc\x87\xf3\xf3"}\x8e\x00\xdf\x06\xa4\x1c I\xfbVc\x9a\xa9\xd4Yji[\xa6JR\xf1G\xc2i\x87\x99\x93\x05\xdb4JV\xdbXU\xb0\x1f7\xb3\xd9\xf7\x92\xfc!m\xa4]\xee(\xd3H^\xd9.\xb6\xcc\x83\xcdD+\x84-\xeaN\xde1i!}p\xf1a\xb7V06\xa7\xf8\x8cQd^\xc3\x83\xc8.wM\x044\xaeJ\xd9v\xcb\xa0y\xbds\xd6\xb9O\xca\xc6\xb7\xbcQW}|\xafW\x108:Yd\x0e\xe9%I+\xd50<y~t\xdf\x9e\x9d\xc9\xe0\x87ur\x90\xe8XS\x06\xa0D\xae\xb2\x80&\x87\xea\xefn\xb8\xda\x89V\x9f.a\xfd\xfaM.x\xd7\x9cj\x93Y\x11\xf7\x10\xb4\xa0l\xdf\x11\x83\xa9[\xde\x04\xe8s\x00\r%\xdf\xc7\xca9\x05\xc4\x8aj\x01\xa2\xedQ\xc0If\xf6\x1c\x0b\xc0E\xfc|\xf0\x044\xa5\xe3JD\x05\xee\xb5t:\\\xf0\xfdl\xbe&\x92roR\xf9\xad\xbe\xb3B`\xae\x01\xa0\x89\xa5\x02h\xc3\x1en x}\xe4\x8b\'\xbc\x0b\x9d8@\xb8y7\x80\x95wky|\x9f\xac6\xcd\xb0\xc9f;\xfb\x1c\x07\xcd\xec\x83\xc4U\xc4o\xac\x14\x00\xfe\xe7J^#"\x03\x1e\x89\xe9\x82n,\r\rq\x9d\xa2\xb9\'Fe\x15\x97\xca\r~Z\xd77\xd4\xb8\x1c\xe2\xd7_\xe6m[\xfb\x98Y\xacp\xafs\xffI\xcd-\xab@\x12\xf6c\x87. \xa5&\xb4\xf7\xd2\xa0\'\xcd]\x91\xe7\xbb\xb2Z\xe9KZ\xbe\xa0\xd2\xc7\xae{ S\xaf\xd7>\x9d\xb7p.\x92q;\xa7I)\xb2\xb1\x93D0\x9a\x8b\xfe\xe2\x1f\xb0\xbb\x90\xdb\x17\xde\x8a*\x1a\xba8\xa0\xf0Y\xe3/\x8a\xae0\xd6\xc9\x92\x92E\x1e\x9d\xf1\xd3,\xeb\x9cc\x08DU0\x03\r{\x8a]2Z\xdc\xc6\xe5\x08\x0eo\xf5\xa0-\xc8\xb9\xe79W\x0bM\x9eV\xf9\xdd\xfbv.\xb3\x0b\x92w\x1f\x0bE\xab\xe9\x838ht@\x84\xdb)L~\xb5\xf5\xc5\xa8{\x95g\x80\xa0\xee\x17\xc7\xf7\x03\xbft\xdd\xba}7\xe3/\x99\xe1]\xaa4\xac^-W\xdcw/W\x96"\x08Bo\xec\xe2u;\x8d\x1d\xd9\xae\xca9\x1d\xf8\xe9\xc8\x87\xba\xcd\xb5\xe3\x8a7@KG\\\x06\x89\x91\x06\xa7\x98\xa1g$P\xe3\x19B ze\x06\xfa\xbb\xe9\xdb\xbev\xf2A\r\xb0\xedbj\xca\x1b\xd9m<\xb5\xfb\xae\x8a04n\xb3\xf1\xaa/m\x06\x91\xaf\x0c~rs\xe6\x97\xc0PVI\xbfr0#\xa4-z\x84G\xd1\xf2$\xb9t<\xa5q;\xe4\x00\xc1<\xb4\xf1;\xbc\xdb\x0c\x05\x93\xd2\x8b\x8dK\xacj\x06\xfd\xfd\xe6\xe2-\x89\xbf2]v6\xa7\xe5\x08\xc6Y\t\xc2\xf1\xd1\xac\x068\xben\x07"w\xb4Q\xcagH\xbd\xb8\x0e\x92\xb8\x03\x17.\xa8\x88d\xbcCg\x0f\x90\xe0<Ka\xe0\xda\xba\xd8\x89\xea\xfc\x9e&(9\x8f\xccv\x8b\xbdu\x91\xe4b\xc3\xcb\xd6^fkX\x0c\x7f\xc5\xad\xfd\xb4\x97\x10\xf7\xca\xb5\x05)s\x18 /\x89\x86\x9a\\j&\\\xf4\xfd\xa6hKx\\\xf9\x97\x82"\x96\xf9\xdf\x86dL`\x99\x80uuo\x14\xba\xf8\x8d\xa9V\xd7o\xc2\xad\xc7\xc9\xaa \r\x83\xc9\x95C\xe3\xa3?\xd1\xf9e?f6>O\xb4\x9e\xe5\xb0\t\xc0\x03S\x8a \x88\xdb\xcf\xad-\xbe:h\xc0\xbfD\xdd;rQ+99\xb2\x90\x10\x98{\x8f\x114\xea\xfc\xf3\xd6\xf4j\x1b\x12\xe8\x86&\xa1u\x92!\xcf\x13p}\xc1\r\x17\xe5\x8c\x8a\xe0H"2\x8a\x1ePp\x01\x8av\xa3\xc4\xb8\xbd\xdf\xa3\xc0\xccK}\x01\xbfid\t\x05gev\xc9\xf2\xeaud\x8ev\xd7>\xddeA\x9f\x82T^\xf83as\xf6[xj\xc9}\xfeVJD^\xc0\xed.\xb1\xd5\xf5s+^-\x00r\x81\xbe[\xd0\xf9\x9f\x82ma\x98\x95x\xf5\x0c\x83M\xea1\xbf\xbb\xa7V\x99\xfc\xb8f@\xf5\x11s\xf4\x92+G\x0fYYi].\xb7zi\xf0\x17\xc6+\xf4\xec\x19\x07\x94\xb7\xf9j\xe1?2\xc1\xcc\x19t@\x87V\xf6\xe4OF\xd0)\x99h\x04\x06C\x88m4\xe0\x853mL\xd7Z\xcf\xe6\x82\xe0\xee\r\xb0i\x01l+l\x9d\xaf\\\xeaik-\xbd\xf9E8;(b\xa8ZE\xf2;\x10\x8a^IW\xca+\x10\x91\xb2\xaa\xda\x96\xff\x04^\x90\x14\xda;\xe8V\x9d\x0ev\x1aB(\xdfi\xba\xb0QG\xf0"\xd2\xcb3\x18p\xec;DJ:\xef\x08\xd5\xf2r+\xc1\xcf\xf8A=\xf2\x99\x8c\x81Sp\xc4\xc4\xf9Z\xbc;\xe0|\xbbz\xfc\xba\x9dW\x98\xb1<?\xb1\xbe\xf2\x8c\xab\xea\xa9\xedN\xfc8\xb7\xed\x16@&G`\xe8\x9cZ\xe7N\x8a\x06C<\x8e\xc8,D;\r\xc9U\xe9\xa7\'\xf2\xf8\xa0I*d@e\xe9\x98\x9b\xa2\xf2O\x02!\xc1*\xebY\x8e\n\x02p\xac\xca\xf3\xf4\x15-\xa8e\xd2>j\xebj\xc0\xe6\x02\xa9\xf7ftV>\xc8\xc0\x0cd\x87\xf1\xb5\xf1\xb1F3\xc2\xbb\xae\\\xf5\xd4:eU\xa9\xf2U*\xb9Z\xdc\x06nl?\xdb\xc3\xb2U\xa4\xdeb0\x99\xd1,>\x00P~,]4sq\xe8\xc9w\xdebq\x03\t\xb9G!,\xc1o\x8a\xce\x98c\xb0 \xe4\xf52\xab$@\xed\xcf\x9f\x83\x12\x01\x04\xbb\x08xg\xcc{(\xf4\xc9G\xcb\x9fG\xdc\xc5\x94;\xbe\xc8\xc6O\x9e9;=\x93j\x1fGC\xb7\x1c\x8d\x93\xba\xfd\x9e\x1dNc\xabw\x110\xdd\x1d\x9c\xe5\xa6\x10\x88C3TQ\xce\xcc7\xae\x0f\xf4\xc9\xccg\x83\xb7\xbc\xba\x97\xe7\x8es\xbf\x07\xed\x04,\xb46\xadcM\xc1_3b\xe6h\x92XH\x8dV\xca~\x04\x19\xf1\xeb\xc0\xcb\x89\xf7X\xb4Yg\x90\xf7\xc9\xa6\xd0\xb1\x13P\x03\xec\xa3\xfc#6g\xcf2\xc1+\x11\xe8{\xeao&\xa0\xf5#\xe8\x86\x90\x99\xd9\x9dg\xfb\x0fd$\xb1\xb3\x8b\xa8@\x9c\x19(\xa6"\xdf`(\x92\xa4\xf2V\x13r\xc2H\x8b\xcb\xd7\x10\xc1lg^\x02\x93\xd2z\xa3\xeb\x91~\xd8[\x02b\xa2\xa5_\x8fH\xeeq\x83]\xa8\x1e\xe69\x13\xd8#\xde\xc7\xbe\x91@\x11`\xbe\xf3\xac\xe6\xd7\xc5\xd3\x0f\xe1\x82y\x9e\xe550(u.W5\x1dV\xfcn1}\x87\xed\x99\xb9\xc7\x90\x94d[\x81\xbb\xd5\x93\xc7\xa2\xda0\xd4\x7fX\xf3k*\xd9\x92\xdf\x00I\xdd\x94\xec\xba\x98\x0fH\xc6gnu<T\xa6\xb0.RXc\xe6\xae\xd13G\xaa9\xba\x9c\xb9Q\x80\xf2\x8b\xd2);\xf1\xd1\xc2\x15\x95-dS\xfe\x16\x81\x93\xc5i}\xac\'\xcc2\x93\xce\xef=\xf9+h\xad\xf1\x9e7\x7f\xe7L\xd9\xae\x1e\x97@\\\xbc\xbd[\x02~\x8fu\x0e\x1f\x96eJ\xecP);\xa2\xba\x92\x10\x88\xdd\xe4\x9f\xd5\xc8\x18\x93\xd9\xcb\x85*\xfds\x89\xd81f\xd73\x11\x92bQ\xe7_;q\xd5%b\xc6\xf8\x90\x1eS\x8b\xdd^\xfb=\x80GN\x8c\xc6q)\xb0 dx\x18H#/Q\x8e\xa2\x9ap\x87\xc1\xda\xe5=\xb9J\xdfk\xc6\xbd\xf8\xce\xfa\xee\x02\xcd\xcd\xbb\x956\x1e@,\xa4<\xc4\xcd\x0b2\xb4W\xf8<\x0c\x0cU\xecf5\xbe\x883A\x93j\x96\xfd\xcb\xc3)\xbd\x1f\xb8\x97\xe2$)y\x9f\x83X\xcd\x97\x92\xd5\x0e=\xc7\x9f0\xaf\t\xdd#\x912\nJ\xc52\x19sF\xb3\xa8\xad\xc6\xccl\x81\x9c\x10\xc83\xca\x07F\x1b\xe3#\x96\xfb\x08\xce\xd5]\xd8H\xd8\x0b\xca\r\x8a]\xe6\xe7\xa1\xbeR\xc5\xf7p&G,\xa2\xf2g\xfa\xdd\xa8\xdeh0\x9a\xa1\xc0\x92\xa4\xcc\xdd\x86\x88G"\x97\x93\x89m\xf6\x0fJ1\xbc\xda\xe2\x1f\\\x18AdLJkPhn\xd6\\\x94\x13P9\x1a\xbd%\x9a\x1b\xec\xabg\xd5\x89\xce\xc1\x9b\xd5\xf7\x9e\xe4<\xf3m\xea\xf1\xa9\x07\xa7J\xa5\x90\xc2g\xd9\x14\xd1\xd4\x01S8\xdeF\x94ef\xc8\x1a\xe4\xc4\xd9\xab>\xcb\x7f\xe1!w\xea*M\xa6\xf1k\x87\xcd\x7f\xd4\xa0\x027f\xaeD.tzLhd\x14\x89<[\xfb\x95i\xf4\x93-\x14y\xfc3\xd9\x89\xe3\xbf\x82\x9eA\xeb\x0f\xe3\x10\x86\\\xc7-OjzZ\xa6\xb5\xf2\xf0\x8at]\x8a\n\xd9\x85\x1d\xdb\xeb\x94Q\xe0\xce\xcfe\xe2\xa5b\x081\x95TF\xfb\xa0t\xcdv\xf3V\xbe\xe2\xe2$\x8f2f\x98\x1a\xcc\x0f"\x13t}\x0b\x9b\x1f\x1b\x97t\x88\x01s\\3\xc3\xda3\xecJ\xf70\xf6\xe6\xd0\x0e\xe1\xc8\x03v\\\xbd\x12\xec\xf8\xb4\xd4\xa2\xd4^R\xef\x14,q\x86\xc3g\xd6\xe7\xb0\xdc\x17\xf5\xae\x80\xc8_cM\xef\xf8\x95 \xfb\xe8\x11\xe1J\xf0I\x8e\xc9\xb8\x18,\x0e~\x91\xb2g\xed\xb5\xdaq)\xe2E\x12\xfe\xfb\xd8\xf8\x93\x8bW\xbc!+U\x01\x08r\x14\x8f\xb8\x87F\xde\xcev%\x94\xd4@h\xac\xc0 6\xc6\xa9\xdc^W2\xff\xeb8\xb1x\xaf\xfbA1\xe9\x9c\xf5\x0b)\xad\xc6\x13\xd6\x185\r]\x94\xb9w\x12g\xb9\xd4\x1e\xbf3\xab\xdf\x05\xe9\xb3\xd0\xbd#$\xf1\x15t\x87l\x85`\xca\xac?\xfe\x83\n{\xcd"\x92d\xbd\xf4\xf9w\xadg\x8fzi\xa8\xe7\xaf4\x1fKl!\x07\x0ee\xb9{\r\x8a\xd7\xad\x94\x1b\x06\x9c\xd2.\xa6p\t8\x11\x1b\xae\xc3<\xf8\xb6\x0b\xd0\tk\n \xb2\x1d\x94\\\xd1\x9a\xc0\x8b\xa6\xf1)W\xdf\xe05\x90\xbe\x9d\x06G\r\x98\x1f\x0b\x87\x12\xe0.\xe9\x96\xa2\xb3?\xb3\xb2\xb3\xf4s\x95\xcfe\xf5&\xa0\r]\xe2or\x1f\xb1`\xd3\xc6\x90\x8f\xc5\xf1\xa9\xe8\xa7\x1f\xf7&\xab\xd2\x82\xab\x13\x19\xa3f\x80\xecg9\xbe\x8e^\xb6\xd4N\xc2\xf3b?8\xd1^~A\xc6a\x07\xc8^\xc1\xfe\xba=\xf6\x87\xc0\xe3\xbf!\x06\x0b\xf0s\xb2\x813z\x83\xbf\x82\xc2\x89|es\xc4\x17n)\xbd\xba\xd4+\x0fU\x81\x18 \x0c\xc2\x02#\xcaY\x8e\xc9\xbf\xd4|q\x84A\xf9\xef\xb2\xe4\t<1\xbd\xa21Vh\x80\xb2\x00f\x0c\xfd\xbfk\x9a\xa6\xa19\x1fP\n\xc7-\x08"\xe78\xda\x00\n\x9bYt\xea\xfeGp\x85\xea\xac>a\x9f\'\xbc\xff\xc2j\x0f\x17x(p\xeb6$\xffA\xd9\xb1\x96\xc5\xf7\xfa\x14M\xde\xa7I\xecJ\x8fI|\xa0\xe1\x10\xc8\xdf\xad\xce\x9f\xa5!g\x99\xbe\x97)yCF3\xf3\xf3H%\xc5\xc9\xebe\n\x15%\x8d\xa2~\x9fiK\x8doZ\xb8eR\xf5Z\xae\x13\x15\x8d\x18\x16\x17+\xcd"9J@%f\xcf\x86\x9b\xa3x\xcc\x02\x9f\xa7\x9f\xee7\xbc\x99P\xb1\xf5\xe6\x0fZ\x02\xca=\x87\x086\xf7\n\x8c@\x87\x10O\x990W2Q\x9c\x0f\x15\x9c\xab\x85P\xb85\x9b/\x97\xc3\xaa\xd9\xf1\xa0\xe4\\\xfe\x8e\'(\x84$\xbd\xf3\x0fW\xab\xec\x9b\x9a\xa3\x82\xac\xa9@p#\xb3\xf2\xd6\x872[\xccb\x1fxp\xd8&+f\xda\x0eU\xea\x97\x80\x14C\t\x14\x8a&\x02_\xe1p\x0f\x8f\xa30>\xcc \x7f\x8a\x81\x8cB\xfa\x8b*\xbf\xa6\xad\x856\x06\xc4\xeb\x1b\xcff\xf8&\xef\x86O.\xc9\x11\xff\x1c\x16L\xecre\x97\xaa\xab\xcf\xd0\xb3\x8f3 6\xbb\xc5\x97b\x1c\xe0\x14\x7f\x97c\xfb+\n\xe7\xa8&EJOX\xcd\x12\x87\xf2\x15\x9e\xd9h\x9a%m\'i\xc5z!\xf0nl\xa1\xd5\xec\x0b\xaaW\xf0s\xbbS\xc8\xa6\xbd\x88\x17fy\xa0\x81<O\x8c\xbc\x18\xb58\xd8\xcb-\xd4\xb9\x9d\x92\x98\xdbw\x0cy\xbd\x14\xccf\x9f&\xf7\xf8\xd6\x14\x8d\xd5\xa6@\x8c\xb8\xeb\x0c\x8d#\xd0W\x12Lqe>L\xb9\xb4\x80T\xb2rwG\xa1\x16\x03)\xa8K$v\xfd\x0e\x9f\xda8\x8d\xa1r\x18\xb6\xd2\xa7\xae\x1a\xa7L\xd4\xfb\xd7D\x00\xf4\xa4\x1bf\xa30\x9c\x80"k\xfc\xa6\xc3\x89=\x97g\xd8~xvh\x1c\x7fYPGU\xc5A\x80\'\x08\x0bz\x92\xa8\xc6\x1c\x01\xf8\x16\x05]\xc3Yj\xab\xe3\xadPV\x87\x1cu\x18\x83\xfe\xd1<\xa89>\x1d\x1b\n\xa9\x10\xd1\xfd\xbe<\x06\x83=\x83\xdaY\x02\x0e\xc5T\x195\xce\x8a\x87F\xfb\xbb\t\x90J\td\x90\x93l\xf5\x07E\x04\xe4\xf3\x07\xb4\xcb?\xec<\xc84:}\xcc\xd0\xf6\x06\xff\xbf\xaf\x17|\xd8\xc2k\x1c\xdf\x0f\xf2l\x9a\xba\xed\xf3\xfb\x8b\xf4\\\x07>]<$\xd8\x04u\xec=|\xe4s\xa4\xde\xe5\xc6\xf7\xeca\x9ff\\fX\x1f\x8cSR8HdA\xb4\xd5\xb0\x15\xcc\xa30\xe6\x8e6\xd3\x92\xdd\xf2\xa3\x11\x96\x95\xd1p\x10\x04\x9b\xe7\xd2v\x11[\xd4\x9b\x81\x89\xf9\xdc\xc8\xfe\x94\x9cTi\xd2\'\xb7\xb4\x96\x9bG\x1f\xedP\x95\x96\x9316\xe0KBL\xc06\x12\xb9\xee)\x93\xb5\xecC\x02J\xe9\xaeV\x0c[\x8d\x1b\xa39\xa2tT/\t\xc5\xbd\xc7\xbfs\xee*\xbb\xce\x11\x18\xe9r\xdb\xd9\xd5\x85\x9f\xa2\t\x17\xc1Gl\x8c\x1bN\x07\xc8\xaf\xf9\xaf\x07\x0c2\xca)O\x8a\xf7X)\xc8\x03\x8c\x887\'~\xe2qo\xfcDFp0\xf6V\xe7\xdef?jY*\x99\xfd-\xde\x04S\xed\x15GK\\%\x1ew\xea5\x1c7U\x1fU\xe02\xdb\xbb\xe3\x03Y\x12\xe5K%x\xc5\xa2\x7f\xfd\x8b\xdae^Wsm-e\x19h\xc5\x94\xa2\xab\x94\xae\x1a\x90\x10\xc0Y\xa8\xe9[\xe5(qw\x93h\xc6\x9547<YU\x98m\x88B\xd7d\xeejI.\x9e\x0f\x01.\x884\xbc}d.\x17\xe2\x07$\t\x0e\xe1\xd6G\xa7\xebb\xcf*"Z\x8fO<\tq\xbc\x05\x1a\xcf\xd5\xf3\xb2:<\xf1\x87z\xa5\xf1\x9c\xc4V(\x82\tq\xa7\xce\x9c\xe2\x96~\xc8r\xc4\xec\x92\x01\xea\xd29\x12\xb64F6\x11p\xc4\xf6\xa0\x887]23\xd7\xa7\xa8+\xa0\x84\xd2Hc\xde\x15\xb7\xeaF\x8d\xea\xb1\xf9\x99\xde"B\xd9\xed\x11\x9b\x89|]\xc7\xa7\x08\xddN^@\xa5j\x97\xdcI&\x88\xa4wF*\xc4\xed6\xfc\xd7\xa4$\x90Q\x16\xca\x96\x10\x10q\x1e&\xb5h\xd0\xf1\t\x93d\x11\x01D\xa4\x91p\xba\x047nB\x17\xc4m\xbaB-S\x9b\x06\x0b\xf5}\xbe\x98Y\x9e\xcbJg\xa4\xe5\xc2o;j\xb8\x97\xd3\xdd\xbd\x1d(\x84\r\xef\xe4\xcc\x1a\xc8\xc5\x06\xd7\xddC4al?\xeeB1\xa2\xe5c\xaa\x87 \xca\xc0\xa4\xc5}\x13\xc6\xff\xd5\xce\x04\x1cG\xc1\x98\xc02\x96\x03\xdcx\xab\xc9\xb8\x12=;=\x80\x19\x9eR2\xec+7\x1a\xbcb\x90\xd70\xf7\x7f\xac\xf6K\xb2C\xca\x89\xb7\xe1{\x95-\'@\xa3\xec\x81\x8a~k\r\xb4\x06\xa6\xfe\xaa\xd1\x10\x1b\xc5\xf42\x92\x178\x85\x85\x08`\x9e\x14n\x1f\xe6n\x0b\xfabC\xa2\x80\x04!3}\xd7vq\xe3\xc0N\x89l\xb7QD\xe9\xdfl\xe2T\x8f0\x98\x0b`\xcaj\xaf\xba\xe6\xea\xee\xdf\xdd\xb2O\x1e\xcd\x05\xd4\xf0\xd3\x15\x95\xf8\x03\x1cZP4d\x89\xc5:oT\x03\x86e \x0e\x9b\xa7\xc6\x84)\x9c8\xfd4\x86\xde\x1c`ap\xa0\xe1\xf3w\x95c\x8a\xb8rG \xf2\xda*Y\xe5\x10I\x19}a\x17X\x88\'\xc2}>\xef\xfb\x17\xc0$6\xb0\x06\x07}\xa0z\x1f\x9d\xbc\xf1\xceB\xdc\xec\xcd)\xc3\x80\xb3\xe3\x95+\xefy\x8c,s-\xcc#\\\xab\xa9\x8c\x11\xd2\xde}\x98\xc6\x9f\x1a?v\xb3\xba\xc6B"\xd8G)\xe4b`\x9e\xe1\xb7\xe6\x05q6!\x11\x80w\xe9\xfd\xd0\xbc\x8a\x82\x7f\x86\x8d\xbd\x12\xfet\xfe\xb4E\x101\t!\xb0\x11\x8c\x98=\xf5\xf5\xc2-\xb3\x84O\xe9\xe4\xa21\r@!S\xed\xa8k\xa9\x05^J\x9cnF\x15R^\x02\xed\xdd\x0e\x1a\x10\x0b\x13g\xe6\x1f\x89\'\xd6\x95\xfb\x87(\xcf\xe6\x9fa\xc2\xdf\x14\x88\xc0?6\xca\xc0\xdf\xc7\xe1\xe9E\x8e\x15ACc\x94\x0f\xce\xbe_\xc8E\x18@H\xc6\xfb\x106\xdb\xf8\xb9xF\x82c\xc0\r\x8c\xb5R\x1a\xffLL\x93\xdd\x86\xfas\xf8`\xc4\xea\x06\xaa\xe9`E\x80c\xf3\xfd\x057\xd8U\xbb\x98Y\xb16\xbb\x00!\x11KE\xaa\xbc.~&U|\x1eb\xc1L\xdf\xed\xb5N\xa3Q\x92\x06\xeelIQ&`l\xc2wZ\xfe\xaf$\xfdm\\By\xc6\xec\xf0\x12\n\xaf.\xab\xdb\xa6:\xa4a\xe3\x91\xb5Ns(\x9e\xad\x8b\x99}\x9f{l`Hz\xe5\x7f7\xaa"\\\xf4M\xfb\x91~\xa1\xee$\xfc\x01\xe7\xf4\xf6\xfbXy!\xcek_\x07\xfa\x10\xb7ia\xb6\xe5^~\xc66\xa7\x10\x0f\xe7\xbff\x8f\x1f\xe7bh+5\xceFfEDb\xe0\x8d\xc5\xa56\x9b\x9bi4\xf8t84\xd9\xee\xc4XI\x03Q5\xe1~\xc4\xc4z&}@g\x19\xbdx\xf5\xd2\xfa\xcc8w?K\xd2\xeb\xe9\xe5G\xbc\x15f\x85j,\x89^\x12\x17\x87\x0b\x80\xa2\xe3rL\\\x1a\xb2\xa82\xc7\x96\xfci\xc4\xed=\xed\x01\xa6\x9a\xa5\xb1\xfb\x9ax=\x98e.LC\xc9F\x84\xae@5\xfaq5\xc1\x0ei\x07$\x12\xce6\x17i<\xb4\x8dO\xceDYy\x80(\x1b\xf5\x00\xa2^\xd3h\xff\xd2m\x92mB\\#.\xd6\xb3\xc6l\x96\x9d\xe9Kb6}\xe3\xaa\xd6o\xa6\xbe\x84\xa9\xcd\xd7`\\+\xa2\x9f\xb0NJ\xc3\r\x06\x88\xb0\n\xe8\xf70l\xe8\xb2\xb8=\xa5\xf1$F\x1e\xf1N\x18Q\xfeK!\x96\xec\xfb+3I=`\xe3x\xa2\xd7\x94~0\xe6v\xf3Vj8\x1b|\xe3\x96\x87se\xc5!\x0f\x07\xa6\x103\xecJ\x97Mj0\xcb\x00\xab\xa0\xa9Mc\xdf\x83\xf0\xff\n\xfa\xb1\xf2\xd5\xd9J\xc1\xfb\x82v\xbem\xe4x\xbb\xd7\xf8?\xa2\xa8\xcb\xe09J\x85F\xefq\x19\xc0\x89\x90\xaa\xdf\xd8\xddP\xc2s\xda&<OMIH\xa8\x04\x19h\x95\xa7\xef\xca\xc1\xf4\x91\xdbzY\xf3\xcf\xdf\xc7\xb0\xc7\xb9\xd8\xb8\xa25\xffB\x87\x928\x8d|[\t\x00\xe3\x14\xe9\x9ej\xee\x86\xa7+\xa1d\xfc\xdft]9c*g\xbf\xd2Z\xc5\xcdA\x9d\xe8\xdf\xddd\x0cdp\xb8=\x91\x16\x97\x82L~\xb2TO\xf8\xf7\xf8\xc2\x03\x80Xx\xd5h\x18\xe0\xa1\xe5\xd3\xc30[AS\xf6\xfb\x83\xb6\xcc\xc30\xc3hA\x00@7Tao7\xc3\x87Zf\xf1Z#@\x04\xdf\xcf\x88\xa0Pm$\xbd\x97\xd9\x03\x88<]\x06\xc6\xd0<\xefD\x7f\xa2\x11FG\xd75$\xca\x9b\xad\x074:\xec\x9f\xd3C\x8cb$~f\x05\xbc\x013\xbb+cc\xc8\x98\xcf\xe9ce\xc8I\x1db\xac\x9d\xf8\xf2\x89\x15\x0f\x121C\x9c\xac0QT\x8dfw\x1b\xc0!_<\xdfo\x9a\x1b\xcc\xbc8\xc9N\x1b\x9c\xad?\xd7A\xf8\xf5\xdfr\x93~\xf0P(s\xd5[\xf83V\xfd\xfe\xce\x03\xa3\xb0\x91?p.\xe0\xf1\x9b\xf5\x8f\x80\x1c\x9f\x95\xa4\xe8#\x80h\xe7\xe7\x01\xe27Cb\x1a\xb5\xe4\x04\xd4\xd1\xb1\xb8\x80\xf67\xfe!\xb57\xdf\x9a=\xc4\xab\xcbK\xdc\r\xcaz\x82\x1ap\xf6\xde3I\xed\xe9\xacH9\x8a\xc4\xdc\x03\xa7\xc6\n\x82\x986\xa6\xc8t\xe6\x039\r~\x82\x99A\xc6\x92\x84\xbf\xf0\xf7\xa4\n\xc0Z{v\x0bwp%.\xf2\xa3\x97\xfc\xd0z\xc0\xf5\xca\xfd\xce\x8d\x8c\x14\x11N\x8f\xd7\x06\x9e\x1e\xb9\x12\xf4ui\x17G\xe3\x1e\xf1o\x97\x14\xbf\x97`n$d\xf9\xae\x08\xa0\x19D\xa6\xc4\x11\xb6&\xec\x81\xab<fPC\x04\x1f\x1e@\xc0\x97\xfd\xa9G\x0c\xc8\xbdo;\xe4\xf7\x03z\xe1Vkwky\xe5\xb8x\x81LN\x81\x1aV$\x0c\xd2\xc1\x9d&A\x81\x17\tL!\xee\xfb\x02,0\x15\xcc\x12c\xfd;\xe1\xc7V\xfd\xebp- \x8e\xf5L\x8e\xc1\xd3\xe3g]dE\x00\xecS\xb6\x02D\x9d\xde\xc7Q\xc9\x1dS\xf3Bo\xe7u\xce\xb1<\xc3\xdc\xbf\\xH\x122\xe4\xf4\xf3-\x9e\x13p\xc4\x99\xe6h\x19VMT\xb1\x80/\x07\xe8\xe95\x7f\xe6Ce\xcc\xed\x9c\xa1\x81\x0boi<ZdU\xeb\xcd+?\xaaL_\xeb\xf5\x96\xbe\xb6\x1aVW\x98<i\x81m<\x11\x80\xeb\xfbP\x8d\xae\x96\x17*\xf8\x0c\xe5\xb5\xdbwI\xc2e}\xfc\x1eM\xa5\xac\xb1,k\x9e\xc3\x8c/\xbb\xb8\xd8\xb3}\xd4S\xfeB\x96\xc3B\xcc\xd7\xab\x01\x04\xd2\x17]8z1\xad\x16}\xfd\xde1\xc8y\n\xc3-\xc0\x11j7lL\xa9\x01l_\x19H\xc2\xa1\x03\xd6\xf6\x1d\x99[\x98\xe7\xda\x05.fl<f\x18t\'\x0e\x98\xbdln\xb0\x7f\xfde7.Dq\xb9\xdbl\xa3\xbf\xe9,\xab\xd7\x97\xc3H\xe0\xd94\xde\r\x18\xfb\xa4\xa52Y3\x07>;\n\xf7*\xe8$\xd7\xd6\x98\xceL\x9a\x19N\x95\x8a\x00\x08\xce\xde#rM\xe6\x8b\xb4\xaee\x16p\x0c?\x94\x005\xb8\xd8\x1e\x1f\x02\xb8\x00\x01\xa6\xd1\x15\xd7\xedbW\x1bR\r\xc7\xc8\xcc\xc6\xddz~\xb02\n\xeb\x03t\x0b\x05\xf6\x83\xf1\xce\x19le\x8e?\xfc\xf8\xc0\xff \xe6I\'7+u\xd4 ]\xa9\xe4\x9bwd\xdb\x08\x0bJ\xaa\x11f0\xd5\xef6N\x0fo&\xd9/\xed7g\x1d-\xde\xab\xb1-\xc1\x97\x10\x0e\xba\x01Q\xea\x99\xe6\xf3\x98;\x82\x15\x16\x04wv\xd6o\xea\x053\xe4\x14\xa4H.l\xf26J*p$\x16\x8f>\xef\xb3\xc6\xb6\x1b\x8e\xe8\xf0\xbd\x0e\xd0?S\xe8\xb7g\xb4/\xaff\x89\xb9\n\x12\xbcU\xd4p\xa3\x0c\xe5c\xddCWD\xfb/\xbce\xe2\xfet\xddY\xcd\x03$>r\xa9\x9bC\xc0\xb4y,^n\x98+\x97\xf3\n^\x89\xce\x8a\x93\xa3\xe1p.\xf6\x83\\\x00\xd8\xbd\xbe\x9f{|\x83\xa3\x96\xa3\xb5D!\x92\x0e\xbcc\xdb\xa0N\x08"\x1f\x9e\xb17-\xbeA\xd9J\xb0`#\xd0\x9e\x9d\xca\x1d\x12\xfc\x00T-\xaeG\t\x03\x920\xd3\xdc\xbe\xe5b\xd3`\xd8Fl\xc5\x87\xe7[\x0e[O\xfeP?~\xd3\x97\xd0\xef\xfa\x17\x8e\x15\xb4$\xe9\xf1\xa8\x0fQ*\xad\xee\xa9\xa4)W\xb9\x8c\x96\xb9b\x84\x83\xcdY\xceM\x95\x8a\xf0\xfa\x04.\xb3\xa3G\xa1\xb8\x12\xb5\x9bi\x86\xc6\xa2c\xd9#\x96Z\xc6\xe0\xef\r\xeaOg\x86r\xe3\x15\x12\xcf!\xf7\xa2\x19\x9bQ\xfc\x17\x87V\x08\x98LU\xc0\xa6i\xf33g\x02\x97\xb6\nb\xa8\x16\xdc\xa6\x9c\x8e\xdbw\xb0\xafF\x03e\xa1\xff8\xeb\x0e\xcba\x9d\x81\xd86\x98\xdb\t\t\xae\xd8\xd7\xf0s\xcc\xb3(^|\xcb\xd0Z\x0c\x1b\xe9eJ\x9c\x80_P\xa3\x0b\xe8\xcb\xb7W,\x89\xb9\x1a\xc30:\x97d\x95\x04WfuR/\x0bZ\x0f\tg\xb8{\x17\xed\x9c\x0f\x9aY$\xe8\xe9\xe8\xaf\xdc\xe8\x873\xdc\xd9\x9f?q\xa5\x9b\x04i?,\x0f:\x0c\xba\xbca8\x93W\x12\xaa\xc2\x8f\xa8\x07U\xb8\x95\xb7\xeb\xcfVE\xb6h\x81\xef\x05\x03L\xd4l\x85\xb8\x1f\xe5\x133\xfcf+\xf1\xa7\x95\xdd~\xe7-\x86\xaf<\xbeO\xf5\x067\x8b\xec\xda\x15\xa8\x07\xe9\xddh\xb0\x10\xa5\xa5\xa3u\n\x1b\x0f\xb5\xe3\x8ad\x94\xed[\xc7\x17;\xa3M\x0e(\xac.-\x89\xe0\x9a@jh\xb41~:\xe4\xb10y\xe6\xd0\x03\x9c\xca?O3\xb4\xfc\xbb\\~\xcfVWW\xa1\xb8\xf0\xa5"\xf3\x1e=\xbd\x0f\x96\xd1(5y&U\xf5\xc4"y\x0b\x98HLl\xa4+\x16\xca\xd0\xa5`o\xdc2\xe9\xf7\xe1E#\x84\xa6\xe1m\xdb\x89\xa8i\x12/\x0b\xd7D:8\xc1\xc1\xde\xd7(,\xf5\x1e\xbeb\xe7"\xa5\xc1v&\xb4\x92Tz]\x12V\xe2\x02\xbe\xe2R\xffa(~\x81\x92zmY\xb1aQR\xfa\x1d(\xc0\xb9H\x89\xcd\xbcV\xdew\x15u:\xe4\xa01\xf9{\xc20\xaa\xf2{\x16Q\x0b\x83\x9de\xdd\x96\xd6\x10\x95.C\xd0W\xb7e-\x84\\\xcah\xf3\xe3\xc9*y;je\xa9\xe9\xaf\xb8\xbb*\xeb\x16\xc7{\x88\xc5\xdd3k$\x1b\x15su\xcf([b\x12\xb9~\x98\xa0g)g\x152c\x1cb\x8b\xf5r,\xef\x9b\x94w\x06\xa5\x95\x10\x11Np\xa8\xdf\xae\xe4\xe8\x84\x1c\xf1m\xf4;\xd7\xae\xf6#\n\xb4w\xb9(q\xd3A\x10\x9c\xd0\xe9p\x95\xe3\x8au\xc3\xf1ihET).\xa5\xc9\x1c\xfe\xae\xc5\xfc\xc4\xdfR\xd5\xd6\x07\xdbjT,\xa88\xf5\x12\xf9:P\xdc\xf9\xeelJE\x7f6\xc8\'\x15`>L$\xa0\xfa\x9e}q5\xdd3\xb8\x95\xeb\xb3\x15\xb6\x15\xee\x00\xbeyu^\xad!\x93\xd74PP\xe4\xeb\x82\xad\xc8\xd6:\x1a\xd1c\x19\x966\x99\xb5FD\x86?\xbe\x81\x94\xa8\xbc.\x0cu\xa7P\xa81\x99\xde\xdc:\x9acQ\n\x15\xe0\xb4\x9c\x8f\xb5\xfa\xc4\xe0\x0f\x8d\xd3#\x82\xbe]\xb8\xcfKf\x03\x85\x1a3\xecN\xcap-\xc2\x14:d\xcd\xb5\xd7\xa0\xf1\xb7c\xd0\x02t\x8d\x05\xe0X\xd8\xa8\xe6\xba\xc4{r\n\xee@v\x84\xbepG#v\xf3\x89\xb5\x14e\xad\xf6\xd4\x05\xed\x05\xc0\x00\x9cn\x8e\x0f\xb8H/\x01\xd9F\xb1\xcb\xe6\xfa\x9d\xa8&\'\x81\xea\xe41\x14\xb7nbIT\x9fg\xa5F\x05\xf9\xf6+vl\x7fr\xfb\xbd5]\x1f\xb6\xd2\x0e\xa8 \xb1v\xac6\xbc\x8f\xde4t\xa7E\xf67Xbs\xeb\x0f\x15 h\x87\x9e\xd4\xf7(\xdb\xe5\x03d\xc3\xf5\xaaB\x17+\xba\xd3\xffB1o\xc7\x92\xbf\xde\x92\x9fw\x02y8\x10\'3\xad;\x01\xd0\xe1\n[.D\xc2\xec\xa8g\x84\xec16^\xa7\xd0\x12\xa2,d\x0fY\x1bL\xb5\x02\xaf\xe2\'/j\x82\x95\xdbn.\xe9^\xc1\x13D\xf3\xbc(\x16\xf1\xd7\xef\x08\x0f&\xe5\xdc6$\x8d\xea\xe1X\xb8\x08\xd3A\xe5\x04lN\x08\x99\xb0}\x8a\xb0>\x81\xbd\xa5\xf2\xfe\xbd@/\xe0\x8d\x19\x9a\xf4\r,\xafo0L,\x93\x97e6\x02m\x8f\xb3\x10t\xde\x023\x1a\nd\xdb\x9a\x8a\x1b\xbf\x0e\xf3z\xc8\xd6%z\x00\x8a\x86\xc3\xd1N\x9b\xb8t\t\x12\x9e\x82\xce\xe0}\x9b\xf3wY52\xfcdFb\xea]V\x0cD9\x1d\x9ev\xef\xf9\x03\xb3\x92#\xb9i\xfb\xd7s\xe2\xc1L\x9c\xfa\x83\xa1\x97?\xa9Vn\xb4j|\x91$R\xaf\xb5\xe06\x85C\x93\x8b~\x12\x8f\x92\x8d\x0f-\x81*\x8e\xb3\xf7\x80\xe3\xd5z\xdb\xeb\xa6\xd2\x0bS\x8e1\xea\x1b\x81i\x1d\x195\xafVGp\xe9\xbb\xd6\xa7q\x07\x1a\x16Ua\xe7\\\x80\x8e\x16\x7f~\xa2\xc9Q\x93\x87\x81a\xdb\xa2\x10F>5\x0ef\x7f\xcd\xbe\x95\xfcO\x8f\xe0\xdd\x8d\x9b\x8a\xb73\xb1\xc8g\xcc\xfd\xe3\xb9\xe7\xd4\x88\xb2\x81!\xef\x0e\xaf\xd0\xf1xA\x12\xf4\xaaQi\xe1\x80\xa3\'dv\x8f\xd4j\x98R\xfa@&\x8e\r\xf9k\xee\xea{F\xe2`\x92\xbe\xe4\x9b%\x95\x0c\x9aA\xf2\x9a\xde\x89\xea\xe2\x08\x03\x01{\xa0@ZjL\xc7e\xe1b\r\xf5\x0b\x91\xfd6b\xd0\xa1\xb5"\xef\xc79 A\x08V\x83\x1d\x87\x9fRX\x19z\xf10\xc1\xbf\x9f\x15\xa6(2\t\xd9\xe2#\x99\xb3\xa5\xa5(\x84\xb2d\x953\xacT\xbc\x1a=\xf2\xc5\xfa\x0ccD\xc7\xae[>x\xf8\xa9\xfb=,\xb1\x8fP\xff\xf1\xe4o\xb7\xa7\x98\xa8\xfe\xe8\xe8k\xb3\x01\xeb}\x1d-hD\xa6\x13\x94\xc4\xb7(\x04\xb5E\xca\xa45\xab\xfc\xa5\x93\xe5\xd8\xfd\xfd\x11\x1d\xd7;\xf3:(\xf31\xab\x94q\xd7\x08\xde1\xbd\xc8\x85\x05r\xe2\x06w\xf2\x029\x92\xccHli]\x99\x15-\x80rU\xf6\x10\x03w\xbd\x8e\x96\xbb\x9f?\np\x0e\xa9A\xdfD\x91v\x8a\xae\x1e\xe4M\xf5\xb6\x9f\xc7\xb2G&\xfbo\xe2\xdc$.Z\x9a\xeaghL\x0f!\xfd\x1f\x0c\xdf\xb6k\xdaF\xa9,\x97\xd8H\xa8OB\xed\xd8\x8f\xb9\xc0\xde\xde\x97\x16z\xc9\xa7\xb9\xf9\xaf\xf8\xb2\x9cm\xfaJi\x8fo\xcel\xe3\xc1\x1a\xabL2&W\x17\x14\xe9\x7f%Z\xab\xe1R\xaeL\xea\xf4a,\xe1\x17\xde0\x88A|\xb4i\x9b\xadC\xe8~8\x94\xff\xf3\xfa\xb8\x15\xfc\x8f1\x92e\x03\xcc\x07\xe1y3{\x0b\xcf5k\xe8\x9cB1\x94o\xbd\xdd\x03EZ\tU\xc3G\xcd\xd7\xca\xfa\x10\xc8\xe5+c1[\xbde\xa5\xd5.c\xf5\xdf\x1b8Y\x12}x\xbfp\x17\xb9?<Or\x8f\x1d)Q\xb6B\xb5\xd5_.\x7f%\x90\xd5\xd2\x8f\xe8\x17\xffi\x89\xf5\xcf\xd7g\xd7\xca\xf7\\\x88o\r\xf6\xbc\x08\xd2\xf3\xa4\xec\xb0\xc7N\xf7\x03\xce\x08L\xacG\xdf\xdc\x87\x84\xdf\xa5\xc3\xc4N\xe4(\xbb\xc9\x86\x86v?\xae\xe4j6\x14\xc5?\xc5#\xe0\x87\xe5 .\xd1&Q\\o\xc9\xc9\xd8+\x95\xd1\xdd|.\x8a\xaa\xd5\x87\x86\x85\x14\xcd\x14\xc4l\x9c\xdb\xe9\xbf1:\x96,\xe1$\x16\xd9L\x89G\xe6\xe8P\xe8\xb3\xe5\xac-Z_ \xd7\xa3\xe9\xe8\x05\xfa\xcbN+z\x19\xec\xbe\xa8|\x7f\xd9\x19\x8c\x7f\xd3\xdf\xae\x06&\x17\xc1&\xf5r\xe6\xbe\xe9\x17\xd1\x03\xf0z\x10\xf3\x0b!\xa9\x85\xad\x1c\x87\xeeb\xdc\xc6\xf0\xe2\xf2n\xfb\xd5\xc5\xd5ws\x046=\xab\xa4\x90\x0bQFf\xbe\xb3\x8c`BI=xk\x16\x87=\x89E\x15F\x0e\xe9"d\xdfR\xe5\xaa\xb9\x87\r3\xf3\x95J\xba)\x00J\x01\x1b\x97\xdd\x04\x96\x1c\xdb\xf8\x82\x9f\xd1F\'\xf8\xb1\\\xde\x08bK\xbdw\xcf#\x99n\x9cqk+\xd3m+\\\xc7z|\x0fa"\xf7\x01y\x1e/lT\x1f\x02(|5\xa4T\xeaQ;\xb2<\x95\x0f3\xa5XY\x01\x1f\xcb\xfc\x89\x9b]\xd4\xa7%\xe7^N\xef\x18\x0fV\xb2\x8e\x19\xcb\x85J\x9f\xdbe\xf6|\xa5\xe6\xb5JT\x06\xb7\x1b\xdf\xd1_\x83\x85\xe9\x02&\xb2\xfdue\xac\xdb\x01\x93H\xd8{\xad%\xbe\xe93\x00\x95_\x9d[\xc9\x98\xd3\x9d\xd3E\xb6\xef\xf0\xbae\x0c\x12N\x02\x94\xa4\x94\xb4\xe5\xee\xc9\xcc\x83\x903\xb4z\xf4\xb9"\xe8\x08\xf3\x06\x178A\xc9i\xc0\xd3\rQ\x92\xce\xc4\xdd\xb93\xd6)\x1d\xff\x9b\\Tka\x120G1\xf1l\xe3h\xfca\x00\x00:~\x11k\xda\xc8=\x93\xc3\xb8\xb8n\xdf\x8e<\x9a\x18i\x1ew \x80\xd7\xe4\xb4_\x91\xb7%\x81\xdc7\xf0\xa3#TZ\x8dn\x94.\x12\xc6EG\xebI\xf2\x14#P\x8bJ\xc2\x96\xa9Y\x19F\xd0\xaa\rU?\x83\x104Zxh\x87\xe3\xff\r\x02M\xb7(\xbfbU}\x04(y\'\xff\x10\xec\xcfnFm\x91B\x96?de\x04-\xf3\xfd\xf57Xf\x8b\xf2X\x85\xc2\xbdS\xab\xe7Ng\xbfj\x93\x96\x859\x06Y\x8c\x14\xf7yy\xc6\xdaD\xf73RG\x07\xc5\xea\xfd\x19\xa9\x9a"\x7f\xecRb\x02\x95\x88\xeb\n\x81S\xb8@\x97\t\x12\xabz;\xf1\x8e\xed\x9e\xba\x0e\x9a\xce\xb3\xa0\xf6t\xd5\xd6\xd0\xb5\x9f\xbc\x96\xe7\xb3\xa3\x00\xc8\x9b\x90w\'bJ\x11\x08@\xd7O\xc8\xae-\x88\x835&\xcdu\xa9I\xc0\xdfi\xe7M\xc9\xca\xcd\xb5\x85\xdc0\xab\xb1\x8a\'\xee\xc8\xebh\xe1)A\x8d\xe5R\x99V\xef\xbfx;\x89gD\xc9_\xe3\x15\xea\x8b\x88\x00\xc8\xcf\x83\x19]\x1a\xbdz\x17\x97H\xb4ZYO\xfb\xc0\x97\xf4\x8e\xc1;\xee\xa1\x96\xe9p\x17\xb5\x0f\x83\xc2r_\xa78\x8a\xd2\x82\x9b\xef\xeb8\xb0\xddF\x8e\xd1{\x95\xc3hA\xcbb\x97\xa65\x13\xe4\xb7\xf3\xc0\x12\xf0\x8c\xb9\xb0\x80\xa6FOC\x00\xa6-(\xb1\x11?\xcfL\xa9\x1c?h6!\x8e?\xd6\x142\xc4\xbe\xd3\xda\xf7T\rl\x11\x9c7\x19\xdf\x03`>\xc4\xc3\xd3\xba\x10\xcb\xc7\xa9Z}\x91\xa3\xb2\x9a\xe6\xe2\xd4B\xbb\xfdj\x13\xb4\x8e\xb6\x18)\x8a\x95\xa4\x03u\x87a,YK\xe5\x13\xe7f\x98]\x012p\xbb\xfdj<q\x0e\xca\xd7\xc2\xde\xfdI\xf2;\x84\xefAH[\xabX1\xcd\xeb\xa0\x8d&\x1e\x95\x1c\x9e#G\xca\xbcj\x9d\xcc\xf6m\xd8\xb4\xc0r\x8f\xa7\xfa\x0f\x1b\xd4\xbe\n\x1f\x83Ab\xe4\x87K0\xa6J\xf2\xae\xf2\xd3\xd6s\xc1\xd2y8v\x96\xb2\x1e\xfe2b\x83\x1e\x15\xc6\xb1\xd3AS\xd5\xab=8\xc1\xce\x1dzf%\x0fA\x00j\xb7\x8d\xbfA\xfe\xd3]\x00\x93\xa1N\xfa<\xb3\xb9!\x1a\xe0\xa6\x8f\x908$m9\xb9H\xe4\xb8?\xc8fu\x185\xebW?\xa6\x0eEK;|\xbd\xf3\xe81\\.\xd8(* \xfa\xc8\xd2\xbb>\xca/hGn\x88\xbdk\x18/\x87\x82\x0fa\xa7\xed\xef\xc5\xab\xc1\\\xbd\xba\xb3\xe9Z\xec\xc9C\x14\xf4\xec\xeaU\xeb|\x0b\xc2,\xb8*?E\x9db\xceBs\xc6\x84|\xbe\xa0\x15\x1dr\xfex\x88\x02Jz5\x8dZC~\x8c\xfcoY\xa2\xeb\xd7\x8c\x14\xc1j\xcd\x11\xde\xf3\x17\x89\xb2qm\x92\x08\x85I6G9W\x81\x0f\xfa\xd7\xa7\x07[\xdfAV\xc9\xf1j\x14D\xf1\x95k\x9a\xbc\xact\xd6\x89\xb6\xc3\xca6u3pP\x86X\xb2fD^.M\xebn6\xb5\xe3\x0b=\xeeA\x9a\xa6\xe7\'\xad\x9fpP\x9d\xfd\x17\x84\xfb\xf0?\xdf\x95bv\xa5P\xb1X\xe6\xc5\xd2\xc6\xf4\xb8b\x89d\xbd\x0b\xc21\xe0kn\xf2]w#\x9d\xfce\xed\x02\xf1$\x1b.\x0e\x10\x8a/\x96\xc7\xdf\xe6\xd3\xfc\xe6bG\x88\x1d0\x8dE\xcd\xab\xbe\xe7\xbb,\xfay6\x08Bf\xdc\xc5\x9b\x0b\x15DR\xd5\x17\x87\xdd>3aX\xeaO7\xd0MW.\xce\x9b\xa8n\x9akS\x18lE\xbfT\xc6z\x95\xd3\x1dPY\xb2\x07\x1d{\x9d\x92\x9b\xf5\xb7\x9e\xc9$\xe1p\xdc\x1b\'\xba\x93\x84j\xeb\x7f\xf6l\xcaf\x1e\xaa\xf5+\x14\xdc)\x82\xc5e\x82\x12/\xfe\x1bN\x96\xd3\xf3\xe9*\xae\x02\xccYC\xf4\xa0\xab\n\xc7+\xb9\x8f\x11\xfc\xd3\x88/\x86c\xd3\xd5{\x18G\rT\xa8\xf9W\xb6\xd2\x8c[8l\xc9\x13\xc6F\xa1J\x82\xc6.\xec\xa8\xdb\xee~|\x12yM\x8c\x94\xc9 \xe0\x9f\xf8\xe9\x01x;\xe0\x8a\x9dr\xed\xf1\xf0\x88Z\x14\x1f!h~\x9eD\xcb\xbd\xc0\xc5\x90V,\x80\xdehF\x9c\xd3B\x7f\x1dm.\x15/\xc1\xee\xded\xfc\x85le?K\x8d]9\xa6\x11\x95%\xf9nu\x13dOB\x1c\x89\xc1nF\x9cd\\k\x05\xa9\xbe\xc0<^\x92\x83\x03\xed\x8c\xbed\xb2\x02NY\xabJw\x86\xce\xcdm@V\x9f`h\x12!\x100\x14\x80\xf4\x14,\xc7\xc0=\t\xf4\x9b\xe4\xaa\xff\x88<Il\xfc\x7f\xe5R\x02\xe0\xf2g\xd7.\x95%\xab\x1e\xa6e\xe6S\xe9;\x88\xa6\x9d\xd4\xd5\x9f=\xa3\x9ev\x18\xcc>\xc7\x87w\xc8<\x83zn\xee\xfeU;..P\xd3\xaa\xc1}V\xac\x1c\x7f\xdeT\xdb\x9d!\xf2\x1c\x83\xb7\xd3\x95\x0e\xf9/\xf7\x81\x0b\x1e\xa0B\x0c\xe1\x1b9\x98\xc7\x80\xe4k\xd2\xd7e8WW\xd2}\x1eV\xf9Z\x98\xfb\x92S^\xcf\xe5/\xf3\xe4a/\xec+\xd1Om!\x0b\xb9%\xfe\x98U\x95\xebv\xbf\xf4\x85\x1d\x19v\x1d^\x83\xf3~r\x14OWR\x0f\xb8\x1c\x1c\x86\x1a\xa3;\xa2\xdf\xf0\xf3\xeeR\x17N\xa1\xf2L}\xcfN7vA\x870HS\x98d\xe2E\xeeny\x1f\x84Itja\xd9+\xa7y\xd3ik\x9c\xb7\xdf9~\xc3Ai\xe3\xe8\xab\xb0\x9bL\x0fQ\x88\xfaB\xf6\xdf\x1d\x08\xfb\x1fK\xb7\xe4\xb7~\xeb\xa6\x05u\xe3\x0b\x07\xe5\xab\xec5\x98\xd00\x82\xa4\xb0\xe2\xc0\x13CM\x05\x1c\xfc\xe2m\xa8\x92Y\xb9/gO\xa5^w\x87\xab\x15\xa1\xdew\xb1N\xa6\x9c\x00<\x8c~wkY\xa0\xc0\xa9V\xd9\xdd\x1c\xe6x\xe96aa\x1c4\xd4\xa8\x0c\x1f\n6f\x12\x99\xd3\xfd4\xcb+\r\xefL\xe8\xa1pl\xe4sE\x11I\xed~\xf46\\o\xf4\x00\xe8g\x8a\x95\xc6\xf2%1Rp@\xc3\x88\x98\xff\xf4j>\x1a\xb6\x95\xfc\x84R\x98\x84\xc7\x7f6\xd6f\x04\xade\x9f-\x98TF\xb9\xd6wL\xa9\xcf=6XP\xe8\x93\x87\x8b\xdb_za\xc100\xfeI+\x95]\x8d \xd8\x91\xb6<\xfaP\xf4\xa4x\xb6\x81\xb0H\xbaR\xb9\x87\xbaL_\xbd\x1d=\x9e|56\xf4\xf4\xa7\xb0o\x10@\x17d\xce\xdf\xfaJ"\xf2s\xb1>T\xe1=\xcb\r\xca\xd9M\x8a`\xd1\xfa\xa0\xd8\xf7\x83@,\xf7\x1f\x04\xd4\x07T\xf7\x82\xe4\xa0c?3\x7ft\xb2J\xa2\t\xbcy\x9b\xa3\x17\xb8m\xed\xc2\x1b\xfa\x0b"\xa1?Xw)\xa5\r\\\x9e|\xf2\xa8\x06/\xc8\tP%\xca\xb9\x8e\x82\xe53\xcc\xa4\xc3\xd2Gc=\x11\xad\xb4;4\xa2\xfbZ\x00wmOJ\xdf\xf8>\x85e\xc8w\xcd\x91\x0b|d\x00\x8b\x1cm\xc9\xb4"\xc7\t{~~\x13\xba\x08~\xeb\x86\x8e\x8a\x14\x08\x05\x9a\x15\x11~\xeap\xd7\x956 \xa2;\x16\xbd\xd9\xc4n\xe81\xc3\xfc\xe7\xe0\\~\xec \xdb\xd4\xb4\xe1T\x8e%\rtd\x89\xaa)\x95\xccFi\xc3P\xee\x97\x15\x9f\xc7\x11)\xdb\xdc_k\xebv\xe5]\xf6\x8c\xab\x13$5E$\xfc&\x1e|tiM\xaf\x1d\xd3*r\xd7j\xa4\x943X\x99\xbc&\xae\x9e\xfbS?y\x085\xb5<V\xb7 \xa2j\xfc<\xb6\x7f\x92\xbe\x8b\xb8q\x0e\xba\xdb\xdd\xc5\xfb\xbanV\x02\xd2/\xa9\xb1R\xa9\x8b1\xc3:\xa7\xb8V\xd3\xd3\xd2\xf0J^\xca&\xcc\x93\xafT\x8d\x00\x17\xd1\x90\xe0\x82&\xbc\xb5\xd4\x11\x1e\xcf\x07[J\x7f0\xbce\x9b\xef\xe6\xbc\xb8\x160\x0f\xbd\xdf\xe2\x8e\xcc\x12]O\xf8w\xc4GzU\xef\x00\xfd0\x1eX\xa4\x0e\x90AT\xa9u\x16R\x93a3\xed\xdc\x14\xc6\xc3b\xdd\xb84\xbc\xe4\xc7\xb0\xf3\x98\xbd\xe0\x16XQ"\xd4\x106l\xc4\x14\x9a\x82\tT<\xf5\xf6\xbf\x85[\x99q%\xeft\xe2Y\r_I\x81@\x9e\xd2X\xb7\x08\x86\xe8\xb8\x87^\xfe\x15\xc4\xc2x"e+w\xd8\x9c\x0e\xb6\x00%\xa0\x03\xc16\xa7\xa1\x93U\x1f\xff0\xec$0\x83-\xf4\xcd\xb6\xe7\xad\x94\x88\xde\xcd-,\xe2\x8e@\x893\x07\x04vT\x8d\xe9Bv\xed\\\xcc+4\xa6X\xfe\xeae\xdc\x990\x04-\x97"F\x8b\xebi\x8bp\xf6\\\x8ei\xad\x8c\x1a\xfb\x03\xd4\x9b|I)\x85\xe4\xf4\x9a\xb26\xf0\xea\xac\xf1"\x87\xb1\x9d\xa07\x0f\x8f\xc0\xf7\xd5\xa2\x15jg;\x16\xa64\xce\x88\x8e\xccQ\xde0]\xae*,\x8d7\x88\xd7\x1a/\x95\x96&\x07\x08\xdc\xec\xc2*\xa3\x08\x85x\xa6\xae\xdc\xfd\xe5\x1f\x1b\xcb\xc0\n\x8eL\x95\xc94\x85\xd0\x1a\xc2?\xbeG{\xab\x0c\xee\x89\xe5Att\xea\xa1F\xbcn2\xba\x1c|\x00\xe7\xad?\xe6\xfc\x9dDX\x87at1Xy\xa5y\x997i]i\xb2\x0fx>\xf7!\x10-L\x89\x08\x1d\xaf\xd0.\xf8\x07\xa8\xc5\xe1\xbe"\xe3.\xccM\xcdFA=9\xc5\x86\xd99S`\x98[c\xc8\xbe\xf8\xb4C\xbag\xa5\xe33\xb3kz<-|:\x9df\x10\xe8\xf6z\x0c\xcd\xd3iI\x05\xe2T\x17$\x82\x1d\xe69\xb46Y\x0b\x07\xae\xe7\xa7"\xa4\xb0\xc7G\x89\xb8\x1a\xd8D\x9f\xe9\x8c\x8ffE\x15C\xb3\xc694\xe5\xb8\xef\rgEy1\xd7\xb9\xf4\xa6l~\x89l\xac\xe4\xfd\xafls+\xd0X\xb5\xdav\x0b"(\x8cY\x90\xee]542UR\xffB\xd1?\xb8$P5\xbavW\xdd\xc4c\xbb4F\xb0)\x97O\x1b\xf4\xe2\xfc\x7f\x16~\'#\xc8_\xfd\xdf\x1c\x9c\xd9e\x01J\xfc\xe5\xff\xb9JZ\xdf\x13\xd9\x084{\x87\x10\xe4_\x8d\xc7G\xba\x9fo\xa7\xac\x00W-p\x11\x88\x9e5\x029L\x83\xe9V\x9f]\xb3\x94\x87?m\xb0\xfby9\xe0\x82\x03iA\xec$Hf\xb6V\x8e\xc9\x12\x17\x99\xbd\xec\x0e5\\\x08\xf6\x84V)\x98\x93\xa7\xf25\xec\x01\x12\xc0-\xcd\xe54r\xccu\xff\x85i\x14\x86\xde\x9f\xc3\xb2\x12\x16\xb7m\xb1}\xa9\xb0\xcbxj^\r\xa1\xd4\x07p\x82\xc7$n\x97\xeeTF\xbe\xe2k^\xd2\x06\xc8qN\x01\x85J\x19\xf8\xdd\xa1\x9a\xe1\xb1\xfb\xb6\xe4\xaaF\x06\t*\x0c\x07\xe5n\xd2I/!/I\xc5\t\x0f\x13E-!P\xa2\xa8\xac\x93\x940\x95"\x82\xd1m\x1c\x89WN\x8f\xbb\xf8\xb8\xa6a\xed\xd7G\x02\xdc\xce\x9e\xfc\x08\xc2L\xd0t\x80\x8a\xd5\rk7\xa80\xa7\xa4\x03\xfe\xdd\xcd\x1a\xf9~\x92\x10\xc6\x17g\xbb\xb53\x9f\xca\x1c\x01\x04\x9f@\x9b\x98\xc5:R\x8dC\x84O\xb8{\xa2\xa8\x0fq\x9d\xae#9\xd8!\xa57H\xf9~\xe0a\xeay#R\xb4\xf1\x95\xce\x89{\x8e1\xec\x83\xbcb\x911\xcb\xf9\xd2\xa3\x01K\xdb\xd2\x17\xd6\x02\xafQ\xc9$$\x85\x1b\x86\xbe\x03\xb0\xa5w\xe1\xcc!\x04u\xf9)\x8c\xb8\xf7\xd0\xdaI\x8ai\xd7\xd7i\x00!\xa5\xb7\x7f\xf5\xddC\xa0\x01Kd\xa5\xf5\x07qJn]\x86\xdb\x9d\x96\x02\xdd\xd3\x854B(\xc5R\x1a\x1f\x18\x06\x7f|\xe6QNbG\xd8\x1c\xd0\x90W\xb4\x86\x0b\xfc\xc2\x8b\xe3\x8eHP\xe8>W\x90\x11\xd8\xbf\xf5\x97F\xa9\x01\x80\xe2.\xac\xc3\x98.\xc1\r\xb9\x00:\xce^\xa3;\xb1\xc5-]\xde\xb7\x88\xbc\xfa;d\xed\x85\xe3^:W2\xddO\xdb\x11a\x9fwGVp2\xff\xda~qfF\x83CVc\x11M\x98:\xef#\xd7\xbdq9\x89\xa8\x82\xead\x9a\xf9\xa6$\xc9(\x0b\xed\xc2\xc7\x83n\xf9Aja~\x8a\x06\x9e<\xaa\xebZ\xd3\xe9\xbe\x19\xcd\xce\xdd\xbd\x97\xc1\x15\x9eN\xe8\x10KY0M\xd6\xdd\xf8bS?\xf4FKQ\x07\xc6G6\xdfl\xc1\xe9\x85\x05@r\xfa\xb3\x03\xa6$\x16$\xb3y\xb9\xa3?dqr\xae\x124\xa24\\9\x94U\xf9&Z=\xca\x9f\xaa\x8e\x7f\x13i\xc7~\x0c\x8c\xe0O\x00\xf6\xbf\xc1\x0c\x08_W\x0f<\x1dmE\xee\xdb\xe1+IZ\x9e=]\xb0\x00[\xb6\x97\x90\xbf\xa5\xd8A\xc4c\xa9\xd5 \xf4 \x9e\xe6O)\xb9\xc2\xdc\xce\xab\x81Z\x99\xa8\x8fA\n\x16q\xfc\x9a\x03\xa1\x0b\x8d\xac\xb7MY\xd2\x85C\xacR\xc7\x1f]C\x0eP\xccc/\x13t\xb6\rKf\xee\xfe\x01e\xcc\xde\xa7X\xdbkd,\x8e\xd9\xb0\x94\xbe\xf8\xdd\x0e\x0e\x04\xf9\x03@\x03y\x1d\xbf\xd1C\x15\x93-\x9f\xf0\x11-\xf9\xe8\x8a\xe1I%\xc9\x07yw\xcb:\x99(\x18\x17\xb1R>P\xda\xc7\xfb\x93\x13\xa6E\x82;\x98\xb8Md\xba?\x95\xf4{\x1a\xb4\x08\xffL\x9d\xdc\x14.\xb1\x8fa\xfc\x86qM\x919mN%A\xa1\x17Y\x12zqQ\xf4\xeb\n4\xa9>\xb0\x9c\x97K\xf7\x16\xbf)?<\x84\x97K\xa1\xa3\x95\xad\xcb%\x8fYm\xfb\xe1\xc4<\xda!\x07\x9d\xb8E;\xaf\xe7\xf5vv\x85tN\xd0\xf2\xa2W\xef\xc5~\xde\xf0AEsuVxg\x91|\x97\xf1\x00\xf1\xec@\x19\x06\xe1\xe9\xd5\xda\xe5u\xfeb\xfdGLEm\x9a\x05\x8f\xd5$\x18\n\xfb\xd0lx\x90$\xfdP\x19\xb8 \x87\x9b\xf5\t\xab\xe6z\xb4\xd4{\xcfM\x15v\x00\xf2\x81"Q\xb8\xdd\xa5oF)bf\xae\x11\xfe\xb9\xdf\xd39&O]\'%\xe9\xa3\xb2\xfe\x0f\xa2\xb5f\xd7\xf0\x08P\x10\x8bx7\xb6\xefY\xf2V\xaeY\x94k\xb8\x7f\x08\x86\xcf6\x820k\nG\xfb~\xaa>\x94*\xfe\r\xc5\xe5P\xa6\xe5\xcc\x7fD\xd4\x83`\xc8\x01\x14\n\xf2\x9a\xeb\x94\xee\xe5\xbf\xd7\xf6\x96\x8c=\x89$\xe4\x16:F"\xc8\xd3(y\r\xb7\xf1\xad\x03z)=\x0f\xc4\xcb\xec\x08\xdek\xdcYD\x99Q4\xdd\xd3\x8aPm\xd0\x9b\xe5\xd0\xfe\xa5\xc7\xb6ka\xde\x12\x0f\x9fr\x83(^\xe1\xcf\xd5\x81.-\xccA?6\xcf\xfdE\x90\xbb\xb4\x81:\xb5V*\x00\xee\xf8\x18\xb4RO\xcc\xaa\x18\x8b\xbc\xf8\x10\xda]\xac\xaf^L\x0c\x1e\xbep\xb8>\x1b>\x1d\x98\x88.\xe1\x1f\x81\xc2\xb6/\xa7\xc5I%\xf6\xafZ,\x91\x82\xcfO\xd7\x1c\xc2\xfa\x7fo\xfb\x83(\x0fL\xd4\xf2`\xd0\x0f \xa5;\xad\x1d\xde\xf72\x93\xf2\xf9\xa9\x95Q\xe3\x7f\xd3\xb59b\x9d\xf9\x9ev\xf6u\xd2_\x03Q\xac\xf6\x8a3\xd9S]/\xfb\xed\xd3\x1a]\x0b\xc8\xddl\xce\xaa\xdb\x80!\x8d\x8dr\\\xbb\xfd\xf1\xf3v\\i\x0bT\xd8\x91gy\xdb\xf5Q9\xaa \xd1\xd2@,\x94\x8d`O\xbd\x1bBY(\xc0\xbe\xcf\xbdo\xe3\xe7\xdf\xcav\xadQ\xbc\xbc\x06\x18\x94^1\x1a\n\x1bl\xd3\x991\x02\xbd\xd0!&i:\xe4\xec\xbb.)a\x87\xafy\n\xad\xca\xeb\xd7\xf5||\xd3\xe6\xef\xf2\x92\xd2;\x0ci/\x95\xbe\xf7\xf7\xdb\x9a\xe0$O\xb8_\x1c\x84\xa74T\xc7O\xf7\xba\x86\x930\xb9XJ\xcbeXr\xf0\x92p4\xab\x029\x98\x89\xf1$:Z=\x9ai\x1d\xc5i\x17\x8a\xd7{\xa1\xea;z\xf0+\xf1\x1b?Ct\xa4\xa3\xf3\xad\x81/{\x00\x03\x05\x10-\x05rmN\x1e6>\x9d\xc2\x13\xbe\xaews\x95$\x16\xdb\xf4\xc2\xa9\xc4N\xe6\xdf\xafY\xa9\xa54\x96g/\x8b\xb0\x7f\xff\xefh\x87\xe0\xca\xd2\xaa\x1d\xea\\=\x82\xbd\xc2\xd2\xba3\x999A*\x84\xe6hK\xf9\xf4$\xe4\xb5\x9f&{$\x184k\x0eD\x8e\xfc\xed\xa3^\xea3\xbe`\x9a\x04\xc4\xf8\x17x\xcf=p9\xc1\xfdT\x12\x9a\xae]\xac\xa1{W\x9b\x03\xda\x8fj\xbd84jl\xea\x18\xb4\x91\xda,\xbb2KE\xe2k9\x02m\xb9t\xc1\xbe^\xcb\xa9\xa4\x07\x03a\xbb\x86\xc83\xb0\xd5\xc3\xcb\x9f>\x1e\xf3]\xedQ\x01\xbbc\x0c\x1cf\xae\xf6\x94\xbf\xdb\xfdWiv\x9bG\xaa6\x06p\x8b8\xf4\xca\xcd\xbe\x9b\xb0M\x99S\x12\x8b\x82\xe5\xad:T\xb8\x94\xc7V\x99\xbf\xf0([\xd5/*!\xc89P;\xfb\xf6\xb9\xa1\xa8j [\xa1\xa9\x04\xf3\xef\x84%\x9b\xc7\xe5\x90\x9c8\x02\xee\xf2\xa5\xd4\x88\x16%,\xa6\x10\x9b\x1dYw\xec\xa4PN\x1c\xf2\xcb\xb7\x99\x90\xdc\x98c\x01B\xa8\xda\xa0\xb37\xe2\xd8\x93x%\t\xbe\xdaM\xe0\x8b\xe4?_\x92p\xfa\xa3#\xf1\xca\x9c\xa3\xb2]\xfe\x19$O\xd4\xe0aW=\x11\xcb\x85\xa1--\x17\x02\xfe\xce\xd1^hi\xac\x86v\xe6\t=\x95\x8b\xe4j\xb9\x0b\xb4\x1c<)\xbc\xc4{^\xdb\xb4\x84\x9f\xe1\xb4^)`\xbdt\x076\xfd\xee\x07\xa5"C\xbeB\xa1\xf0\xf8Ji\xe3\xf8\x8e\xd08\xfbs\xf9\x17,\xa2\x8fB\xb6$"\xb4T\xffN\x84\x90\xd6\xa2\x80\xa1p\xc2p\x8a\xbcS\x99\xc2}\xbdcp\xd2\xd8\xb1\x17\xe2\x8b)\x81\xf1>J\xb3\xd2\x03\x85^{]ja]_r\xa6\x95\x9f\xd8\xd4!\x12m\x83o\x8e(\xc0\xbe\xb5\xf1\x00\n\xed\xd7\xe2\xfc\xf3\xeeq\xd5\xfe\x00|}\xf7\xf6\xdcP\xcaJ4Q\xf8\'\x19\xc8\xb2\xfc\xf7D\xb9j\xc2\xb7\x8e\xe7\x9c\xb3\xe69\xa6U`p~_#H4\xb5:\xe1@6N\x9as\xc3\x1c<\x97\xe4|*k\x86\xca2\xa9ak\x93\x10\xf3\x9f\x1c\x94#\x1emb\xb1\xd7\x0f\xec.-\xbf\xad\xf0U\x9f\xda\x9d\xb3,\xf3\xa8\xd3\xcf\x1f5\xa7o\x81\xe1\x8d\x1b\xe0\x83\'W\xbe\xef\xe9\xd2\xf0J\x0c\xf5V\x8a\x0c\xefa\t\n.\xe4\xc6\x07S\xde\xb0\xde}\xfe\x9aCR\x91P!\'C\xe2S\xaa\x88\x842\xc5\xc6\xcdl\x89\n\xc2w\xc1\xdf\xbe\x94\xca\xe5iR\x9c?\xa4\xb0\xff\x07\xbf\xf4j\xaf\x07\xee\xa6d\xbb\xc2\xd4x\xab\x88Y\xfd\xcb\x08m\xd2\xbf\xd4\xbe\xc8\xca\xab\x036\x7f\x06K\xdaS\x93\xaez\xe7\xb6\xf3_Z1\x11\x82H.&\x01hYv\xc1V\xa4\xe8\x01\x84\xfc\xb0_\xc0\x89\x10\x90\x041\x87X\x90\xbep\xbd.\x00J\xac\x07\x8b\x973\x84\x8f\x0b\xb2E2\x8f\x06\x01\xda\x89\x89\x17\xb4\xa5]\x8c0\x8dwk\x9d\xc4\xd2\x1f)\x07&\xd7FC-\x9c\x1bt\xb5\tAp\x08\x97\x99\xb6\x11\xfa\xf5$J\x03\x11\t\xc3\x95\xdc\x1c]{I<\x8a\xef\x1f\'4\xd9\x81\xbf[\'\xb0A\x87YK\xc6\xec\x97\xacD\xba\xa5\x9cQ\x0c\x87\x11i}\x9aS\x0c\xaf,\xd1\xfbY!\x8e\xfcy\x17\xe3\x90|\xdd-s\x81#`\xa2\x11\xaeWC&G\xf3o&#P\xcd{R\x9cc\xd0\xa3\xb2\xdb\xfd\xea(\xcf\x95\xb11/(\xbb\xdd\'T\xec\xd3T\xcb\xda\x8a\xaa\x8e|\x05\r\x99\x9c\xeb%k\xb9\xe0_2\xa0\xf5m\x9f\xe0\xfe\x14cbO\xb6~\xd3\x894\xf9]/D\x1e9m\x99B>\xbc\xd1\x84P\x1d\x83L\x902v\xcfb\xe8"\xfd\xae@\x9e\xb3F\x1cA\x9f\xd6i\xa5\xb8\x9a4\xdf&\xafl\xda\x11a\xa5\x8e9\xb1M\x9a<jX\xefmH\'\x98\xd2+\xa9\xde\xbf\xab\x08\xc7^\x11n\x81\xa0\xc07\x15\xe6\x13\xf9\xad\xcbC\xa1P\x0e\xb2\xaf.\xfb1/\x87\x07\xf8\xa29\xbf\x86/\x8a\xee\x98\x8e\xbcI\xc3\xf7\xeb\xbe\xfd\x93\xd5\x8d\xf3\x0f*\xf6D\x86%\xf9\xa3\xfd/\x81JnR\xc4H\xb6\xc3\xb4\xdfX\xdbq-qNw\x0f\xa6\x9e\x8bO\x90\x1b\xbdC\x07\xbd\x08{\xaf\x8e\x95\xbd\xacp)\xce/4\xd3\x14B\xfc\nu\xd1\x8a\xcf\xb2\xbfV\xeb\x081\x19Z\xcf\xbfB\x12\xf6\x891\xb2j\x83\t\x16\xdeTP\xd5\x17\x1d\xed\xbd8\x18w\x19\xfa=1u\xda]Nam\x07o\x16J\xe8M@\x96f;\xa8S)\xb9:G.l\xd6?i:\x90\xdd6\xea\x87 N\x16\xef\xc1\x1f\xe6\x9b\x89\xc9\x1a\xff}u\x96&\xeb6\t\xd3;p\xc7\xed\xf41\xbd\xe7D\x99\xcb\xd0\xb5\xbaw\xab\x80%S\xac\x0f\xdd\xc3\x8a%\'\x0e\x9d\xb2\x8d\xd2\xa4\xf91\x9fv \xa4\x95\xb4\x14\xe1fa1a\xbf\xf8d$\xc3\xcc\x14`\xc99R.\xb7\x1aI\x16\xf1aYa\x80.\xe4\x96\x13\xa9W\xebv\xe9\'\xd9\x88|\x93\xe1l\x87\xc7\x97\xb3{\x04m\x00\x10Nk\xf4$\xd1\x96\xf3\xd2\x1a2\t\x89Av`.\x0c\x08\xe2\x7f\xae\xb0\x011\xc2\n\x19j\x99H8y\xf6\xee\x1ab@\xf8\x94\xb0\xf1x\x98*B|\xfd`\xb5d\xb4+c\xf2\xd5,\xf30\x93\x020\x7f4\xdf:\xf9\x05\x80\x0c\xab]y\xe9\xf1\xb6\xe7\xe0j\xfa\xb9y\x03\x00;\x98\xd8,\xeaZz\x0e<\xf1\x0c\xa4\xef\x03~\xc9\xe5?\x19\x1eq\xd9\xdbS\xfe\xedV\t\x7f\\\x0b\xd9\x8a\xf7w\x82T\xaf\x9f\r\x95\xe0\xf9\x0c$\x02G\x9a\xa6W\xe9\xadE\xe0\xbd\xb7\x0e\xa4\xc0\xb3\xbc\x98\x8fF\x86q\xb4\xbai\xdf\x93\x16M\xaa-\xd8\xc5k\xdf\'\x04_\xa2\xf0\x99\xe0"Y\x19H\xca!\xa0\xd0)\x15\x88\xb3\x97o\x97d\x01@C\n\xac\xe5\xb7\xbf\x83Q\x8e\xd7T$\nB\xd8\x01q\x8c\x8fv\x828\x83h\x99\xef\xe6Q\xf3\xd4\xb7\xa9\xbem\xe8B6\x18\x93\xf3\xf5\xf7\x9b\x1b\xb7z\xe7\xba{\x0c\xd2\x86FR\xf3\xfe"\x15\x07\x1cg\xd8\xf4\xd5J\xef\xda\xcb\xe3\xcf\x86Z\x89w\x01\x906V\x01\xad\xddE\xe5\xff\xbf\xab\xfa~\x01N\x1b\x8d6\x0c\x90\x1a\x19\x81\xc5\x16\x1e-}U\x02S\xba\xc4\x8d\xfb\xc5\xdf[\x17#\xd9\t\xf0\x0cZ\xf6\xf7~J\xf9VU\x00\xdc\xd6\x89q\xb1\xce7\xd8\xb3\xfcl\xdft\xd7\x81p-\x90\x94\x0f\xde\xdd\xb2TB\x9b\x9b A\x91\x87\x1e\xdaiB\xe5\xf4\xf8\xe4\x06n\r{m&;\xa5\tzd\x1ah\x94\xe8\xf46\xa9)\x95\xd9i\x00\xe23\xcc0\xc9\xdbi\x84\xe6\xea\xb5\xb6*\xa3\x04\x87\xbcZgQ\xfd\x1c\xb7\xfe\xb4\xb9\xe7\xf6\x02\xd2\x81\xb8\xe1\xd6\x89\x858X\xc2G\x1f\x7fo\xd8\xbeV\x89E8\xb7\xe65)l{\n\xd9\x8d\x87}\xa2Q\xe4A>a&{\xd2\xbb\xf5\x02T\x8f\xf1\xa2\xb8h\x0b\xd8*\x9a\xeey\x87\xc18\xed\x8b)t\x03\xe6\x0f\xcf\xd2<\xa2\xbd/G\x84\xdd\xc7\xe3B\x06vbP`|\x8a\x19C\xa4\xce\x99\t\xb1\x0c\xd1KP\xe9U\xa50\x8f\xef\xbb\xaa\x11\xd9\xc1\x83\x0e\xd8x\xfdL\xc5\t\x86<\xd0\x0c\xe0wC\x0b\x15\x81\xa3\xd5\xfd\xb2l\xac*\xb6@\x99\xf3l?\xed>\x156\x95\xfe\xab8\xe3\xa2C\xc1\x9c\x96P\xa0,\x05V\xa3\x89`#A\x8a\x8a\xb5U\xcfl\xd1\xacFv\x14\xf4mK;,\xcfp\xe3F\xfdC\xfcs\xbc\xfe\xfe\x194\x8c\xd5Q\x86\xeb\x8cT\x8e\xd3\xad\x1e.\x1d0\x91\xe1\n\x84\xe8}!\xd8\xff\xf5\xd9u\xf3\x95\xef\xf2\xfb\xea\xe9%\x9f7\xc44\x95\xb2%nj\xad\x8a\xf5\xbf\x8e\x9d\x93R|\n\xd5#\\\x99\xd3\xb7\xa4\xd4\x1f\x9a\xe2\xc4\x8a\xe1*[\x1c\x9a\xcaz\xbb\xa4\x17\x00\xa7\xf4\xa2k\x80u\xfbH\xa0co\x14\x8e\x8c\xac>\x03\xea\x10\xd1\xc6!\xe6\x1d\x94\xfc\xdb\xdf\xb0\xbegD\xa5\xc5~\x90\xc3DM;\x93\xe3c\xa5\x14\xe3\t\xcad6\xe2\r\x97\x1a\xfa\xd5Vi\xcc`\x87\x84\xfb92\xfaEP\xf3\x86\'\x15\xfd\x19\x16\x9aUbl\x1e[(>\x82\x08\xcd\xceT\x04\xfd\xfc\x0fB\xb9\x07\xc8\xa4\x1d\xe8\xc8\x92s\xfa\x03C\xe9\xeb]]\xe7ak\xf8\xae<\xe9]\n\x88\xd1\x92t\x16\x13k+R\x84\xa0\xf1\xa9\xf8\xca\xf56\xa4\xb4\xadu\x91J\xc1\x9a\xe1J\x9c\xcdK\xd4\xc0\x07*Y\x08\x04D\x16\xdf\x86\x91d\xe30\x8cT[\xd9\x0e\x00\xear\x18\xe8\xb3\x7f\xcd\x8d\xa1N\x15\xa0\x01\xff\xa8\x85\xbc[\xce\x81\xbc\x94\x8a\xcf\x89UI/%\x0f\x7fh\x83\xdb3\x07Y\x8f3\x8d\xe5\xf4Q"\x81\x18\xcaX\x9e\xf0\x1c\xa3\xfe\xd4\xd3\xd2\x8d>\xa3}\xa6\x1a\x158\x91\x1an6\xd6\xbcIc\x15l\xd73\x0e\x04\xe3\xfdB\xd9E\x0c\xdc^\xef\xbb\x89\xcd\xb4\xe7\x91\xb1\xd9|\xbf\x92\x05\x15Y\nV\xab\xf6\x0e\x0e\x0c*\xde\x1a\xa92xN\x97\x19\xdf\xc7/\xe2J\xc1Y_Q3751\x8f$;\x9e\xdf\x93\xa9r\xeax\x10\xb4\xac\x91Q\x8d=\x0f\x1d\xfb\xec\x1c\xdc\xac\x03\xaa\xa5\xae\xc7\x11\xf5[\x15p\xebCd\xab\xe6\xcb\x92\x8d)\x04\xd0$2\x93\x1468\xd9\x9a\x1b\xd7\x9e\xdb\xec9"\xa6\xca%\xa9XmsQ\x1e\xca\x1ag\x9e\xd6d\n\xcb;\xcaR\xb06d\xf4\xc2\x17\x86\x80\x99\xf2\xd2l~6F\xb4ol<\xd2Z\x84\xe4\x87\xb2zbA^\x9a\xecO\x8e\xe3y\xa0r\x92\x8f\tH\xd4\xbd\xd6\xfa\n\x81\x8d\x80\xa2\xb5UK\x8dQL\xa0\x8e\xa6\xd7\xd3>46Ok\x17BK\x92\x008\xfe\xa4{\xeb\x173\x02#\x98\x94z\xf8O\xb1}\xbe\xb6\xc1Pl<W\xc3\xae\xb0\x17-\xcc\x07\xc0\x9a2\xc2\'\xd1\xdb8\xe7\xa9\xd3\xf6\x15\n\x15\x80=n;4Z83h\xecxE[\x9f\x03\x17$\xa1v.^\x9d?\xc6R\x1btj\xd1\xedR\xc0\xc6,\x004\xb6\x99\xaeE\xf1\x89\xd7\x1e\xf5\xb3\xf6\xf6n\xcc\x94\xea\x9f\xf3\x9e\xd7Pw\'G\\\x95\xf1\xd6\xda\xe6\x93\x07\x8b\xf4\xf7\xeblc\x1f\x06\x92\x01;\x92\x91h\xb5\xdcmv\x91\xa6\xcf\xcfx\xb7N\x10\xb0z\x10a\xd8\x90\x83\xebt\x1faF\xc0K\xc6\xf5\x11\xa9\x16\xbd\x1d\xd7\xe6t\x14\x06\xc8\x0c\x8f\x8es\x1c\x04\xdf\xfa\x12\x9bb7!\xe3\xe9o\xe4\xd7\xcf\xf4\xc3\xc8\x8cc\xe3\x1a\xf10M\x86\xc9\xa5$\xe2\x02\'\xb9\x1do\xde\x141\xb8\x9a\xb5\xa1\x01\x16\xabL<\x05V\xbaf\x8b\xa2-\xd8\x87\xd3\xd0\x90,>k%\x1e\xee\xe9\x92\x06\x8f8\xec\x1a{\x92w\x13es\x0e\x0f\x0b"H\x04\xac\x96\x9a\x80\x953\xf4X\xa5\xc9W\xf2\xfbm\xf12\xb7\x05\x18\xf0\xdd\x8bg\x85S\xcd7\xda\x1f\xe5^+`:\x1a\xec\xf7\xfe\x89\x03\x96 @?\xf3\x94Bc\xcd\xb9\x08\xadp\xcf\xccO;\x11\x15\xac\x1d\xbe\x06T\xc5\xbcS\xd5\xd0\xc2\xb9\xce\xafIf\xf8$n\xc0\xe4\xc9\xf9\xb1\x8a\x01\xeb06\xd4g\xb6\xe1\xef\xd9\xdd\x8d\x90A\x10\x9f<\x9f\xd6D\xb4?\xd0F\xd8!\x80\xa8xi\x1bSI\x95\xf3\xe6S\xcf\xea\x06%\x9f\x8e1j\x9a#=\xce\x00\xf8\xa3\xb8)Ds\xc1\x90\xc9\xe9\x88S\xf4\xd0\xa9k\t\xadO\xf6+\xd1\xf7\x02\xdf\xea@\xfd\xc0QOm\x16\xbbY\xee\xc6\xf7}\xee\xe54\xef\xbb\x0e\x9c\x85B\xc8F\xec\xad\x9f\xccs\xde\x89\xb7hJ\xa2`\xa6\xb5\x00\xf9\x92\xe0\xc85FI\x03\x10u\x97\xba\xa4\x87\x10\x167\xf1\xd8\x17\x94DW\x129\xcc\xf2\x82\x16\xb0\x10q\x1d\x85\x03\xb1\xab\xd2\xe1\x8d\x9e\xc7f7\xb7\x96\xcar@LRA\r\x8e\x95\xf5\x8d\xf0\x95\x08\xd4\xc1\xb5\xa3)\x85\x95\xc9^\xba\x1e\x89A\xa3\x15\xe0&\x93\xfd\xbb\x14^\x9f\xe8\xfft?\x0e\xc52H#n\x83\xd3A\x14\xfd\xf2\xb4\xbft\x98\x7f\x8e\xeb\xf7\x7f\x9bG\xef\xc1J\x17\xa6:S\x83w\xd8(\x01>\x92F\t8*\xa0F\xd3\xa4\xbd6\x05\xb4w\xd8\'\xdf.\x93\xf4m\x88\xd9\xccC\xbf\xaag\x102N\xf5\x17\x83\x18Q\xa7\x8b\xc4\xcc\xa5R\xc9]\xd2\x7f\xf6\xae\xbd\x92\xb6\xaa#\x01,l\xb9\x04\xbb\x1e$*\x9e\xd4\x8e\x14\x11\x00<%Y.\xd9\x9b\xd3\xba\x8f.\x02\x9c:\xe7\x19\xaaO\xf3\x93V\xe6)\xef\xc7\xac\xf8R0g\x88Z\xc88V\x962R\xcf\xb3\x07p\xf8\xb0.\xff\xc0L\xca\xdd\xef\x1d\\\x19\xf7\n\xf4*w\xaf\xdc\x87\x81\x8c\xf3\xb9\xcf\xbe\xcc\xa2h\xd77/_\x98(\xa2\xba\x06\x13\x10\x83\x7fb\xe3Ap\x9c\xd1Q\x86j\xb6a\xb5\xf1\x9c#\xc8\xc9\x878&YU\x86\x9cx\xb7J%\x05\xf6\xa9\xa7\x02\'\x0cu\x0f\xf1\xe3\xc3a\x99[\x8a\xf9\x04\x8f/X\x7f4\x1bf1\xb3\xdax~\'\x86\xd9\xe7\x9fw\x07*\x04V\x8d\x80v\x00\x9cvo\xe4\x9a\xbcr\xfdivl\xb6\x9c\x07\xeeK\xbaU\xf5[\xc2\xeb\x90\xe43\xbc\xa1\xa5\xb1C+\x9f\xadc\xaf\xc1\x98\xd2\xf1j\x08X\xf2\xc1\xb3GeLr\x1e>\xdb\tP\xb6\x01\x8as\x12\x1f\xdb\xb7\xc5\xe3\xa2+\x0fV\xdbZtX\r^\xdc6A\xea\x06{\xe7CD\x97\xa6\xf6O\xe3n\xd9\xdb`U\xa2LWx\xd5\xae\x9aX\xcfQ\xcf\xb2\xba\xe8\xb0\x97\xc52\xe8\x0fd\xeat\xc1\xa6\x0b\xc3\xe2\x07\x00qE\xff;\x8c\xbd\xd1F\xa0c\x04\xefW\xf8\xd1\xbavU\xa1y\x04ab\xcc\xa8\xb6\xb3\xf1\xa2\xcc\xad\xf9\x07\xf61,zjO\xa4q\x06\x00\xf71\x01\xd2\xd0\xac\xebu+\xc1\xf6\x02\xf2\xc4\x85s\xb8\xfd%X\x15\xdb\x86ej\xfa\x0e\xb2\x14g~\x05\xda`k\xdf\x9b7\xc6\xdbz\x0eWWc\xf7\x96"\x1d\x9a\x92\xfb\xc7\x9c#\x82\xfc\x81vO\x9c\x9c8\xe1\x8eO\xaaC\xd3\x8c%\xc12\xcb\x89\x08U\t\xfa\x05h\x16\xca\xc5\xf4Yg\x9d_\x83\xbfu.\x7f\x85\rM\xc42W\x86\xf6\x8b\x143zR\xa64\xe4r[\xb4\xc4\x12Oy\xf6\x8f\x08\xdb!\xdf\xd5\x93\xfdf\xd9g\xe2\xb3\xf7P\xdcu;\xc9\x8fR*5)\xf4)\xfeP\xd2z\xcd\x8c\xda]hM\x88\xb0\x85\xad\xbb\xd8\xe4\xa1\x9b6\x1f\xf3{nY\xf6\xc3\xf8q\xc6f\xf6=\xb1\xd6\xcc\xfb\xfb\x9d\t\xe2:l(\xe6[k:\xde\xf7\xeb\xa0\x01Q\x9e\xc9i\xea\x94\x84\xbf\xcf\x1c:\x06\xd8M\x11]AOi\xba>\x1c\xdc\xbb\x16\x99\x16t\xaa\x06\xef\x1f\x0c\x1d/\xd2\xe5\'\xb0\x82\x96\xf0\x85\x99\x89G\xb3qlV\x1c\xaf\xac\x83\x98!.[P\x9e\xc8E\xcd\xcd\xc5\xca\x07=\xe5\x97\xa8\xf0\xab\xb8\xc8:\x8b:\xb9-7\xf2\xdb\xe6\x82EbO%\xeb\x04\xdf\xb6)\x16(\xa6\xcd\x9b\xf9\x91g>Fj\xe9\xdc\x7fk\xe7\x8d\x925\x9b\xe5\x05Y\x12\xef\x1dq#\x1c\xa3\xaa\xf9*\xb0\n7\xfc\xabG_\x8d\xe1\xcc(W\xb5\x14$\xf4\x1c\x08\x06\xad\xcd\xfb\xdc\xacG\x95\x10\x10O/\x05o\x1e\x1b\xdb\x9a8\x80N|.>Z\xf4l\xc5\xb8\xffm]\xeaM\xa3xQ\x14\x8f\x19b\xb8\xf1\x94\x12\xd7f[m\xbe\xb4\x8f\xc8\x817o\xf6\xfc\x8e\x8c\xa6\x81\xfd*\xab\xec3l\xd3\x19\xbeI\xc58\x91E\x0c\xa1\x10\x04^\xe4?\xd2o>\xc3\xfdyL\x80%\x19\x00.\x86\n_\x1av\xfc+\xb2\x1fQ\xc9\xcbRB\xfa\xacs\x11-\xa3\xcba!\x18\xfcU\xd3R\xf3n\xd2r\xb3\xbdn\xc5\x17f\xb6o=\x8e\xba\xe1\xe9pZ\xb4-\x17N7\xf1\x9eY~w\xd3\xad\x01\x0ef\xb1M\xf1\xfd\x0b\x7f\x04\xc6:\x88N@\xea\xb69\xcc2_{\x1b\xa0Ls\x8d\xefm\x01\xb2\xb1\'w\x00"\xba\xfe\x18\x19\x1b\x10\xf7X=\x8d\xf6\x9cv\xf2\xfdg\x83\x81\xec\x91\x1b\xc64^\xb2CT\xf0\xf5k\x99\x04"cR4V\x92s\xac\xb9\xd4\xefd\x9d\xd8s#%0Feo\xec\xf3a\x9a\x9ev\xf6\x14e\xac\x9f\x00K\xf1&\x88a\xb3L\xa5e\xdc\xa9\xf7W\xee\xdbb\xdb\x9dFOG\x91:kV\x1e\xd6\x80r\xb2f\x14/\x8a\x12\x87\x11Z\x8d\xc2\x0b\xd4\x94\xfav\xd4(5\x81;\xbd\xa3\xc8vT\xfd3d\x1de\xd5\xc6\xbf4\x1b\xe3}\xea\'\x02\x9c\xf1\x14F\xb4\xc1H\x8f}\xd2\xb7\xcd\x01A\xbc\x9a\x8f+o\xff\xd5\x85q\xe1\x88\xbb\x11\x05E\xf8\xb9sS\xd4\xfc\xe3\x01V\xae\xf1\xbe4\xd8\xe3\x00 %\xb98\xc8jI\xae<\x04N-\xc5\x01\xf8n\x8e\xdc\xff\xa5\xe5\x84\x1c\x03\xcd\x06\xba\xa7\xbc\x87\n\xd5M\xb33\xd7pC\xc9\x80\xc8\x96\xa8Q46b\r\xb8\xeeu\xf9\x98\xb5\xc3r\'Di\xba\x10\xc1]U\'^n\xb7i\x94\x83\x17[\xa4e\x89\x1a\x8e\xaf\xf1\xde<2\xb26\x9c\x16&\xbe\xec\xd5\x9d\x03\xf0}\xb6\xe0\xcb\xc7A\xa5\x10\xd7\x91\xb3\xad\xb7e\xfa\xc0\x84\xba(\xb5=v\xf1\xdf^\xd7%i\x1a\x8eq\x85\xd8B9\x02Sx\x1a\xb6W\x07\xf8\x8a\x87\xfe\xacv\xe4>7Z\x86\xeceUX\xa4\xa8\xa2p_\x8an\xccu#\xe8z\xa1"\xde\xadn\xd7#?a\x8a\x10Y\xfd\xb4' \ No newline at end of file
diff --git a/components/services/app_service/BUILD.gn b/components/services/app_service/BUILD.gn deleted file mode 100644 index fcfc171..0000000 --- a/components/services/app_service/BUILD.gn +++ /dev/null
@@ -1,24 +0,0 @@ -# Copyright 2018 The Chromium Authors -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -source_set("lib") { - sources = [ - "app_service_mojom_impl.cc", - "app_service_mojom_impl.h", - ] - - deps = [ - "//base", - "//mojo/public/cpp/bindings", - ] - - public_deps = [ - "//components/services/app_service/public/cpp:app_types", - "//components/services/app_service/public/cpp:intents", - "//components/services/app_service/public/cpp:preferred_app", - "//components/services/app_service/public/cpp:preferred_apps", - "//components/services/app_service/public/mojom", - "//components/services/app_service/public/protos", - ] -}
diff --git a/components/services/app_service/app_service_mojom_impl.cc b/components/services/app_service/app_service_mojom_impl.cc deleted file mode 100644 index a433cb4..0000000 --- a/components/services/app_service/app_service_mojom_impl.cc +++ /dev/null
@@ -1,87 +0,0 @@ -// Copyright 2018 The Chromium Authors -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include "components/services/app_service/app_service_mojom_impl.h" - -#include <utility> - -#include "base/functional/bind.h" -#include "base/threading/scoped_blocking_call.h" -#include "components/services/app_service/public/cpp/features.h" -#include "components/services/app_service/public/cpp/intent_filter_util.h" -#include "components/services/app_service/public/cpp/preferred_apps_list.h" -#include "components/services/app_service/public/mojom/types.mojom.h" -#include "mojo/public/cpp/bindings/clone_traits.h" - -namespace { - -void Connect(apps::mojom::Publisher* publisher, - apps::mojom::Subscriber* subscriber) { - mojo::PendingRemote<apps::mojom::Subscriber> clone; - subscriber->Clone(clone.InitWithNewPipeAndPassReceiver()); - // TODO: replace nullptr with a ConnectOptions. - publisher->Connect(std::move(clone), nullptr); -} - -} // namespace - -namespace apps { - -AppServiceMojomImpl::AppServiceMojomImpl( - const base::FilePath& profile_dir, - base::OnceClosure read_completed_for_testing, - base::OnceClosure write_completed_for_testing) {} - -AppServiceMojomImpl::~AppServiceMojomImpl() = default; - -void AppServiceMojomImpl::BindReceiver( - mojo::PendingReceiver<apps::mojom::AppService> receiver) { - receivers_.Add(this, std::move(receiver)); -} - -void AppServiceMojomImpl::FlushMojoCallsForTesting() { - subscribers_.FlushForTesting(); - receivers_.FlushForTesting(); -} - -void AppServiceMojomImpl::RegisterPublisher( - mojo::PendingRemote<apps::mojom::Publisher> publisher_remote, - apps::mojom::AppType app_type) { - mojo::Remote<apps::mojom::Publisher> publisher(std::move(publisher_remote)); - // Connect the new publisher with every registered subscriber. - for (auto& subscriber : subscribers_) { - ::Connect(publisher.get(), subscriber.get()); - } - - // Check that no previous publisher has registered for the same app_type. - CHECK(publishers_.find(app_type) == publishers_.end()); - - // Add the new publisher to the set. - publisher.set_disconnect_handler( - base::BindOnce(&AppServiceMojomImpl::OnPublisherDisconnected, - base::Unretained(this), app_type)); - auto result = publishers_.emplace(app_type, std::move(publisher)); - CHECK(result.second); -} - -void AppServiceMojomImpl::RegisterSubscriber( - mojo::PendingRemote<apps::mojom::Subscriber> subscriber_remote, - apps::mojom::ConnectOptionsPtr opts) { - // Connect the new subscriber with every registered publisher. - mojo::Remote<apps::mojom::Subscriber> subscriber( - std::move(subscriber_remote)); - for (const auto& iter : publishers_) { - ::Connect(iter.second.get(), subscriber.get()); - } - - // Add the new subscriber to the set. - subscribers_.Add(std::move(subscriber)); -} - -void AppServiceMojomImpl::OnPublisherDisconnected( - apps::mojom::AppType app_type) { - publishers_.erase(app_type); -} - -} // namespace apps
diff --git a/components/services/app_service/app_service_mojom_impl.h b/components/services/app_service/app_service_mojom_impl.h deleted file mode 100644 index 17a84434..0000000 --- a/components/services/app_service/app_service_mojom_impl.h +++ /dev/null
@@ -1,69 +0,0 @@ -// Copyright 2018 The Chromium Authors -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef COMPONENTS_SERVICES_APP_SERVICE_APP_SERVICE_MOJOM_IMPL_H_ -#define COMPONENTS_SERVICES_APP_SERVICE_APP_SERVICE_MOJOM_IMPL_H_ - -#include <map> -#include <memory> - -#include "base/files/file_path.h" -#include "components/services/app_service/public/cpp/app_types.h" -#include "components/services/app_service/public/cpp/intent.h" -#include "components/services/app_service/public/cpp/intent_filter.h" -#include "components/services/app_service/public/cpp/preferred_app.h" -#include "components/services/app_service/public/cpp/preferred_apps_impl.h" -#include "components/services/app_service/public/mojom/app_service.mojom.h" -#include "mojo/public/cpp/bindings/pending_receiver.h" -#include "mojo/public/cpp/bindings/pending_remote.h" -#include "mojo/public/cpp/bindings/receiver_set.h" -#include "mojo/public/cpp/bindings/remote.h" -#include "mojo/public/cpp/bindings/remote_set.h" - -namespace apps { - -// The implementation of the apps::mojom::AppService Mojo interface. -// -// See components/services/app_service/README.md. -class AppServiceMojomImpl : public apps::mojom::AppService { - public: - AppServiceMojomImpl( - const base::FilePath& profile_dir, - base::OnceClosure read_completed_for_testing = base::OnceClosure(), - base::OnceClosure write_completed_for_testing = base::OnceClosure()); - - AppServiceMojomImpl(const AppServiceMojomImpl&) = delete; - AppServiceMojomImpl& operator=(const AppServiceMojomImpl&) = delete; - - ~AppServiceMojomImpl() override; - - void BindReceiver(mojo::PendingReceiver<apps::mojom::AppService> receiver); - - void FlushMojoCallsForTesting(); - - // apps::mojom::AppService overrides. - void RegisterPublisher( - mojo::PendingRemote<apps::mojom::Publisher> publisher_remote, - apps::mojom::AppType app_type) override; - void RegisterSubscriber( - mojo::PendingRemote<apps::mojom::Subscriber> subscriber_remote, - apps::mojom::ConnectOptionsPtr opts) override; - - private: - void OnPublisherDisconnected(apps::mojom::AppType app_type); - - // publishers_ is a std::map, not a mojo::RemoteSet, since we want to - // be able to find *the* publisher for a given apps::mojom::AppType. - std::map<apps::mojom::AppType, mojo::Remote<apps::mojom::Publisher>> - publishers_; - mojo::RemoteSet<apps::mojom::Subscriber> subscribers_; - - // Must come after the publisher and subscriber maps to ensure it is - // destroyed first, closing the connection to avoid dangling callbacks. - mojo::ReceiverSet<apps::mojom::AppService> receivers_; -}; - -} // namespace apps - -#endif // COMPONENTS_SERVICES_APP_SERVICE_APP_SERVICE_MOJOM_IMPL_H_
diff --git a/components/services/app_service/public/cpp/features.cc b/components/services/app_service/public/cpp/features.cc index 1293451..c90d1d8 100644 --- a/components/services/app_service/public/cpp/features.cc +++ b/components/services/app_service/public/cpp/features.cc
@@ -6,10 +6,6 @@ namespace apps { -BASE_FEATURE(kStopMojomAppService, - "StopMojomAppService", - base::FEATURE_ENABLED_BY_DEFAULT); - BASE_FEATURE(kUnifiedAppServiceIconLoading, "UnifiedAppServiceIconLoading", base::FEATURE_DISABLED_BY_DEFAULT);
diff --git a/components/services/app_service/public/cpp/features.h b/components/services/app_service/public/cpp/features.h index f9a23281..dd7bc09f 100644 --- a/components/services/app_service/public/cpp/features.h +++ b/components/services/app_service/public/cpp/features.h
@@ -10,7 +10,6 @@ namespace apps { -COMPONENT_EXPORT(APP_TYPES) BASE_DECLARE_FEATURE(kStopMojomAppService); COMPONENT_EXPORT(APP_TYPES) BASE_DECLARE_FEATURE(kUnifiedAppServiceIconLoading); COMPONENT_EXPORT(APP_TYPES) BASE_DECLARE_FEATURE(kAppServiceStorage);
diff --git a/components/services/screen_ai/screen_ai_service_impl.cc b/components/services/screen_ai/screen_ai_service_impl.cc index a26f2f0..8150bb8 100644 --- a/components/services/screen_ai/screen_ai_service_impl.cc +++ b/components/services/screen_ai/screen_ai_service_impl.cc
@@ -446,11 +446,17 @@ int32_t* node_ids = nullptr; uint32_t nodes_count = 0; - if (!CallLibraryExtractMainContentFunction(serialized_snapshot.c_str(), - serialized_snapshot.length(), - node_ids, nodes_count)) { + base::TimeTicks start_time = base::TimeTicks::Now(); + bool success = CallLibraryExtractMainContentFunction( + serialized_snapshot.c_str(), serialized_snapshot.length(), node_ids, + nodes_count); + base::TimeDelta elapsed_time = base::TimeTicks::Now() - start_time; + if (!success) { VLOG(1) << "Screen2x did not return main content."; DCHECK(content_node_ids->empty()); + base::UmaHistogramTimes( + "Accessibility.ScreenAI.Screen2xDistillationTime.Failure", + elapsed_time); return; } @@ -462,6 +468,8 @@ VLOG(2) << "Screen2x returned " << content_node_ids->size() << " node ids:"; for (int32_t i : *content_node_ids) VLOG(2) << i; + base::UmaHistogramTimes( + "Accessibility.ScreenAI.Screen2xDistillationTime.Success", elapsed_time); } NO_SANITIZE("cfi-icall")
diff --git a/components/webapps/browser/installable/installable_manager.cc b/components/webapps/browser/installable/installable_manager.cc index 93ca30e..5be4ca74 100644 --- a/components/webapps/browser/installable/installable_manager.cc +++ b/components/webapps/browser/installable/installable_manager.cc
@@ -5,7 +5,6 @@ #include "components/webapps/browser/installable/installable_manager.h" #include <algorithm> -#include <limits> #include <utility> #include "base/containers/contains.h" @@ -14,7 +13,6 @@ #include "base/functional/callback_helpers.h" #include "base/strings/string_util.h" #include "base/task/sequenced_task_runner.h" -#include "build/build_config.h" #include "components/security_state/core/security_state.h" #include "components/webapps/browser/features.h" #include "components/webapps/browser/installable/installable_metrics.h" @@ -54,9 +52,6 @@ // Maximum dimension size in pixels for screenshots. const int kMaximumScreenshotSizeInPx = 3840; -// Maximum dimension size in pixels for icons. -const int kMaximumIconSizeInPx = std::numeric_limits<int>::max(); - // This constant is the icon size on Android (48dp) multiplied by the scale // factor of a Nexus 5 device (3x). It is the currently advertised minimum icon // size for triggering banners. @@ -168,7 +163,9 @@ if (size.IsEmpty()) // "any" return true; if (size.width() >= kMinimumPrimaryIconSizeInPx && - size.height() >= kMinimumPrimaryIconSizeInPx) { + size.height() >= kMinimumPrimaryIconSizeInPx && + size.width() <= InstallableManager::kMaximumIconSizeInPx && + size.height() <= InstallableManager::kMaximumIconSizeInPx) { return true; } } @@ -864,7 +861,7 @@ } else { bool can_download_icon = content::ManifestIconDownloader::Download( GetWebContents(), icon_url, ideal_icon_size_in_px, - minimum_icon_size_in_px, kMaximumIconSizeInPx, + minimum_icon_size_in_px, InstallableManager::kMaximumIconSizeInPx, base::BindOnce(&InstallableManager::OnIconFetched, weak_factory_.GetWeakPtr(), icon_url, usage)); if (can_download_icon)
diff --git a/components/webapps/browser/installable/installable_manager.h b/components/webapps/browser/installable/installable_manager.h index ea9f6335..f4992b2 100644 --- a/components/webapps/browser/installable/installable_manager.h +++ b/components/webapps/browser/installable/installable_manager.h
@@ -5,6 +5,7 @@ #ifndef COMPONENTS_WEBAPPS_BROWSER_INSTALLABLE_INSTALLABLE_MANAGER_H_ #define COMPONENTS_WEBAPPS_BROWSER_INSTALLABLE_INSTALLABLE_MANAGER_H_ +#include <limits> #include <map> #include <memory> #include <vector> @@ -14,6 +15,7 @@ #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/time/time.h" +#include "build/build_config.h" #include "components/webapps/browser/installable/installable_data.h" #include "components/webapps/browser/installable/installable_logging.h" #include "components/webapps/browser/installable/installable_params.h" @@ -36,6 +38,14 @@ public content::WebContentsObserver, public content::WebContentsUserData<InstallableManager> { public: + // Maximum dimension size in pixels for icons. + static const int kMaximumIconSizeInPx = +#if BUILDFLAG(IS_ANDROID) + std::numeric_limits<int>::max(); +#else + 1024; +#endif + explicit InstallableManager(content::WebContents* web_contents); InstallableManager(const InstallableManager&) = delete;
diff --git a/components/webapps/browser/installable/installable_manager_unittest.cc b/components/webapps/browser/installable/installable_manager_unittest.cc index ec0fa0e..972b756 100644 --- a/components/webapps/browser/installable/installable_manager_unittest.cc +++ b/components/webapps/browser/installable/installable_manager_unittest.cc
@@ -193,7 +193,7 @@ EXPECT_EQ(NO_ERROR_DETECTED, GetErrorCode()); } -TEST_F(InstallableManagerUnitTest, ManifestRequiresMinimalSize) { +TEST_F(InstallableManagerUnitTest, ManifestRequiresIconSize) { blink::mojom::ManifestPtr manifest = GetValidManifest(); // The icon MUST be 144x144 size at least. @@ -215,6 +215,22 @@ EXPECT_TRUE(IsManifestValid(*manifest)); EXPECT_EQ(NO_ERROR_DETECTED, GetErrorCode()); + // Icon size matching the maximum size requirement is correct. + manifest->icons[0].sizes[1] = gfx::Size(1024, 1024); + EXPECT_TRUE(IsManifestValid(*manifest)); + EXPECT_EQ(NO_ERROR_DETECTED, GetErrorCode()); + + // Icon size larger than maximum size 1024x1024 should not + // be accepted on desktop. + manifest->icons[0].sizes[1] = gfx::Size(1025, 1025); +#if BUILDFLAG(IS_ANDROID) + EXPECT_TRUE(IsManifestValid(*manifest)); + EXPECT_EQ(NO_ERROR_DETECTED, GetErrorCode()); +#else + EXPECT_FALSE(IsManifestValid(*manifest)); + EXPECT_EQ(MANIFEST_MISSING_SUITABLE_ICON, GetErrorCode()); +#endif // BUILDFLAG(IS_ANDROID) + // Non-square is okay. manifest->icons[0].sizes[1] = gfx::Size(144, 200); EXPECT_TRUE(IsManifestValid(*manifest));
diff --git a/content/app/android/content_jni_onload.cc b/content/app/android/content_jni_onload.cc index 7d787d3..0a9801d 100644 --- a/content/app/android/content_jni_onload.cc +++ b/content/app/android/content_jni_onload.cc
@@ -9,7 +9,7 @@ #include "base/android/base_jni_onload.h" #include "base/android/jni_android.h" #include "base/android/library_loader/library_loader_hooks.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "content/app/android/library_loader_hooks.h" #include "content/public/app/content_main.h"
diff --git a/content/app/content_main_runner_impl.cc b/content/app/content_main_runner_impl.cc index 12b44a2..3d3d0be 100644 --- a/content/app/content_main_runner_impl.cc +++ b/content/app/content_main_runner_impl.cc
@@ -18,13 +18,13 @@ #include "base/allocator/partition_alloc_support.h" #include "base/at_exit.h" #include "base/base_switches.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/debug/debugger.h" #include "base/debug/leak_annotations.h" #include "base/debug/stack_trace.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/i18n/icu_util.h" #include "base/lazy_instance.h" #include "base/location.h"
diff --git a/content/app/content_main_runner_impl.h b/content/app/content_main_runner_impl.h index 7dc520f..ea9b523 100644 --- a/content/app/content_main_runner_impl.h +++ b/content/app/content_main_runner_impl.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "content/browser/startup_data_impl.h" #include "content/public/app/content_main.h"
diff --git a/content/app_shim_remote_cocoa/ns_view_bridge_factory_impl.mm b/content/app_shim_remote_cocoa/ns_view_bridge_factory_impl.mm index abd19b8..5fbbb7a 100644 --- a/content/app_shim_remote_cocoa/ns_view_bridge_factory_impl.mm +++ b/content/app_shim_remote_cocoa/ns_view_bridge_factory_impl.mm
@@ -7,7 +7,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/mac/scoped_nsobject.h" #include "content/app_shim_remote_cocoa/render_widget_host_ns_view_bridge.h" #include "content/app_shim_remote_cocoa/render_widget_host_ns_view_host_helper.h"
diff --git a/content/app_shim_remote_cocoa/web_drag_source_mac.mm b/content/app_shim_remote_cocoa/web_drag_source_mac.mm index 67a77d4..19d94ff7 100644 --- a/content/app_shim_remote_cocoa/web_drag_source_mac.mm +++ b/content/app_shim_remote_cocoa/web_drag_source_mac.mm
@@ -11,9 +11,9 @@ #include <memory> #include <utility> -#include "base/bind.h" #include "base/files/file.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/mac/foundation_util.h" #include "base/memory/scoped_policy.h" #include "base/pickle.h"
diff --git a/content/browser/accessibility/accessibility_auralinux_browsertest.cc b/content/browser/accessibility/accessibility_auralinux_browsertest.cc index 52ff0c3..a3a899d 100644 --- a/content/browser/accessibility/accessibility_auralinux_browsertest.cc +++ b/content/browser/accessibility/accessibility_auralinux_browsertest.cc
@@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/strings/utf_string_conversions.h" #include "base/version.h" #include "build/build_config.h"
diff --git a/content/browser/accessibility/accessibility_browsertest.cc b/content/browser/accessibility/accessibility_browsertest.cc index ba87cc9..f0f16716 100644 --- a/content/browser/accessibility/accessibility_browsertest.cc +++ b/content/browser/accessibility/accessibility_browsertest.cc
@@ -3,7 +3,7 @@ // found in the LICENSE file. #include "content/browser/accessibility/accessibility_browsertest.h" -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/strings/escape.h" #include "content/browser/accessibility/browser_accessibility.h" #include "content/browser/renderer_host/render_widget_host_view_aura.h"
diff --git a/content/browser/accessibility/accessibility_win_browsertest.cc b/content/browser/accessibility/accessibility_win_browsertest.cc index 2d784236..e47602f 100644 --- a/content/browser/accessibility/accessibility_win_browsertest.cc +++ b/content/browser/accessibility/accessibility_win_browsertest.cc
@@ -11,9 +11,9 @@ #include <memory> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/process/process_handle.h" #include "base/strings/escape.h"
diff --git a/content/browser/accessibility/browser_accessibility_android.cc b/content/browser/accessibility/browser_accessibility_android.cc index b5c84647..96b0ed7 100644 --- a/content/browser/accessibility/browser_accessibility_android.cc +++ b/content/browser/accessibility/browser_accessibility_android.cc
@@ -7,8 +7,8 @@ #include <algorithm> #include <unordered_map> -#include "base/bind.h" #include "base/cxx17_backports.h" +#include "base/functional/bind.h" #include "base/i18n/break_iterator.h" #include "base/lazy_instance.h" #include "base/strings/string_number_conversions.h"
diff --git a/content/browser/accessibility/browser_accessibility_android_unittest.cc b/content/browser/accessibility/browser_accessibility_android_unittest.cc index 4720b57..82dee4ec 100644 --- a/content/browser/accessibility/browser_accessibility_android_unittest.cc +++ b/content/browser/accessibility/browser_accessibility_android_unittest.cc
@@ -351,48 +351,24 @@ BrowserAccessibilityManager::Create( MakeAXTreeUpdateForTesting(root, container_para, text1, text2, text3), test_browser_accessibility_delegate_.get())); - { - base::test::ScopedFeatureList features; - features.InitAndEnableFeature(features::kOptimizeAccessibilityUiThreadWork); + BrowserAccessibility* container_obj = manager->GetFromID(11); + // Default caller gets full text. + EXPECT_EQ(u"1Foo2Bar3Baz", container_obj->GetTextContentUTF16()); - BrowserAccessibility* container_obj = manager->GetFromID(11); - // Default caller gets full text. - EXPECT_EQ(u"1Foo2Bar3Baz", container_obj->GetTextContentUTF16()); - - BrowserAccessibilityAndroid* node = - static_cast<BrowserAccessibilityAndroid*>(container_obj); - // No predicate returns all text. - EXPECT_EQ(u"1Foo2Bar3Baz", - node->GetSubstringTextContentUTF16(absl::nullopt)); - // Non-empty predicate terminates after one text node. - EXPECT_EQ(u"1Foo", node->GetSubstringTextContentUTF16( - BrowserAccessibilityAndroid::NonEmptyPredicate())); - // Length of 5 not satisfied by one node. - EXPECT_EQ(u"1Foo2Bar", node->GetSubstringTextContentUTF16( - BrowserAccessibilityAndroid::LengthAtLeast(5))); - // Length of 10 not satisfied by two nodes. - EXPECT_EQ(u"1Foo2Bar3Baz", - node->GetSubstringTextContentUTF16( - BrowserAccessibilityAndroid::LengthAtLeast(10))); - } - { - // With experiment disabled, predicate checks are disabled. - BrowserAccessibility* container_obj = manager->GetFromID(11); - // Default caller gets full text. - EXPECT_EQ(u"1Foo2Bar3Baz", container_obj->GetTextContentUTF16()); - - BrowserAccessibilityAndroid* node = - static_cast<BrowserAccessibilityAndroid*>(container_obj); - EXPECT_EQ(u"1Foo2Bar3Baz", - node->GetSubstringTextContentUTF16(absl::nullopt)); - EXPECT_EQ(u"1Foo2Bar3Baz", - node->GetSubstringTextContentUTF16( - BrowserAccessibilityAndroid::NonEmptyPredicate())); - EXPECT_EQ(u"1Foo2Bar3Baz", - node->GetSubstringTextContentUTF16( - BrowserAccessibilityAndroid::LengthAtLeast(5))); - } - + BrowserAccessibilityAndroid* node = + static_cast<BrowserAccessibilityAndroid*>(container_obj); + // No predicate returns all text. + EXPECT_EQ(u"1Foo2Bar3Baz", node->GetSubstringTextContentUTF16(absl::nullopt)); + // Non-empty predicate terminates after one text node. + EXPECT_EQ(u"1Foo", node->GetSubstringTextContentUTF16( + BrowserAccessibilityAndroid::NonEmptyPredicate())); + // Length of 5 not satisfied by one node. + EXPECT_EQ(u"1Foo2Bar", node->GetSubstringTextContentUTF16( + BrowserAccessibilityAndroid::LengthAtLeast(5))); + // Length of 10 not satisfied by two nodes. + EXPECT_EQ(u"1Foo2Bar3Baz", + node->GetSubstringTextContentUTF16( + BrowserAccessibilityAndroid::LengthAtLeast(10))); manager.reset(); }
diff --git a/content/browser/accessibility/browser_accessibility_manager.h b/content/browser/accessibility/browser_accessibility_manager.h index 45cb1a0..316d4a53 100644 --- a/content/browser/accessibility/browser_accessibility_manager.h +++ b/content/browser/accessibility/browser_accessibility_manager.h
@@ -13,7 +13,7 @@ #include <string> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/gtest_prod_util.h" #include "base/memory/raw_ptr.h" #include "build/build_config.h"
diff --git a/content/browser/accessibility/browser_accessibility_manager_mac.mm b/content/browser/accessibility/browser_accessibility_manager_mac.mm index af40af1..c3dc838 100644 --- a/content/browser/accessibility/browser_accessibility_manager_mac.mm +++ b/content/browser/accessibility/browser_accessibility_manager_mac.mm
@@ -4,8 +4,8 @@ #include "content/browser/accessibility/browser_accessibility_manager_mac.h" -#include "base/bind.h" #include "base/check.h" +#include "base/functional/bind.h" #include "base/location.h" #import "base/mac/mac_util.h" #import "base/mac/scoped_nsobject.h"
diff --git a/content/browser/accessibility/browser_accessibility_state_impl.cc b/content/browser/accessibility/browser_accessibility_state_impl.cc index a840cc0..c1e4b1d88 100644 --- a/content/browser/accessibility/browser_accessibility_state_impl.cc +++ b/content/browser/accessibility/browser_accessibility_state_impl.cc
@@ -6,9 +6,9 @@ #include <stddef.h> -#include "base/bind.h" #include "base/command_line.h" #include "base/debug/crash_logging.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_functions.h" #include "base/metrics/histogram_macros.h" #include "base/no_destructor.h"
diff --git a/content/browser/accessibility/cross_platform_accessibility_browsertest.cc b/content/browser/accessibility/cross_platform_accessibility_browsertest.cc index 8e2e7d5..3252389 100644 --- a/content/browser/accessibility/cross_platform_accessibility_browsertest.cc +++ b/content/browser/accessibility/cross_platform_accessibility_browsertest.cc
@@ -9,8 +9,8 @@ #include <unordered_set> #include <vector> -#include "base/callback_helpers.h" #include "base/command_line.h" +#include "base/functional/callback_helpers.h" #include "base/strings/escape.h" #include "base/strings/utf_string_conversions.h" #include "base/test/scoped_feature_list.h"
diff --git a/content/browser/accessibility/dump_accessibility_events_browsertest.cc b/content/browser/accessibility/dump_accessibility_events_browsertest.cc index e2854ea..d90ccc9 100644 --- a/content/browser/accessibility/dump_accessibility_events_browsertest.cc +++ b/content/browser/accessibility/dump_accessibility_events_browsertest.cc
@@ -9,9 +9,9 @@ #include <string> #include <vector> -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/files/file_util.h" +#include "base/functional/callback_helpers.h" #include "base/path_service.h" #include "base/strings/escape.h" #include "base/strings/string_util.h"
diff --git a/content/browser/accessibility/render_accessibility_host.cc b/content/browser/accessibility/render_accessibility_host.cc index ea22ed3c..ce563bd 100644 --- a/content/browser/accessibility/render_accessibility_host.cc +++ b/content/browser/accessibility/render_accessibility_host.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/task/sequenced_task_runner.h" #include "base/task/thread_pool.h" #include "content/browser/renderer_host/render_frame_host_impl.h"
diff --git a/content/browser/accessibility/snapshot_ax_tree_browsertest.cc b/content/browser/accessibility/snapshot_ax_tree_browsertest.cc index 1f06e11..cc16d15 100644 --- a/content/browser/accessibility/snapshot_ax_tree_browsertest.cc +++ b/content/browser/accessibility/snapshot_ax_tree_browsertest.cc
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/test/scoped_feature_list.h" #include "content/browser/fenced_frame/fenced_frame.h" #include "content/browser/web_contents/web_contents_impl.h"
diff --git a/content/browser/accessibility/touch_passthrough_manager.h b/content/browser/accessibility/touch_passthrough_manager.h index a3fca29a..893e77ed 100644 --- a/content/browser/accessibility/touch_passthrough_manager.h +++ b/content/browser/accessibility/touch_passthrough_manager.h
@@ -7,7 +7,7 @@ #include <map> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "content/common/content_export.h"
diff --git a/content/browser/aggregation_service/aggregatable_report_assembler.cc b/content/browser/aggregation_service/aggregatable_report_assembler.cc index 0071b9a..83113ad6 100644 --- a/content/browser/aggregation_service/aggregatable_report_assembler.cc +++ b/content/browser/aggregation_service/aggregatable_report_assembler.cc
@@ -8,10 +8,10 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/check.h" #include "base/check_op.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/memory/scoped_refptr.h" #include "base/metrics/histogram_functions.h"
diff --git a/content/browser/aggregation_service/aggregatable_report_assembler.h b/content/browser/aggregation_service/aggregatable_report_assembler.h index 700d48d..d948e95 100644 --- a/content/browser/aggregation_service/aggregatable_report_assembler.h +++ b/content/browser/aggregation_service/aggregatable_report_assembler.h
@@ -12,8 +12,8 @@ #include <memory> #include <vector> -#include "base/callback.h" #include "base/containers/flat_map.h" +#include "base/functional/callback.h" #include "content/browser/aggregation_service/aggregatable_report.h" #include "content/browser/aggregation_service/aggregation_service_key_fetcher.h" #include "content/browser/aggregation_service/public_key.h"
diff --git a/content/browser/aggregation_service/aggregatable_report_scheduler.cc b/content/browser/aggregation_service/aggregatable_report_scheduler.cc index e5c8982..d383dcbf 100644 --- a/content/browser/aggregation_service/aggregatable_report_scheduler.cc +++ b/content/browser/aggregation_service/aggregatable_report_scheduler.cc
@@ -9,12 +9,12 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback.h" #include "base/check.h" #include "base/check_op.h" #include "base/command_line.h" #include "base/containers/cxx20_erase.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/location.h" #include "base/memory/ptr_util.h" #include "base/memory/weak_ptr.h"
diff --git a/content/browser/aggregation_service/aggregatable_report_scheduler.h b/content/browser/aggregation_service/aggregatable_report_scheduler.h index 3420735..fd6c0c4 100644 --- a/content/browser/aggregation_service/aggregatable_report_scheduler.h +++ b/content/browser/aggregation_service/aggregatable_report_scheduler.h
@@ -8,7 +8,7 @@ #include <set> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ref.h" #include "base/memory/weak_ptr.h" #include "base/time/time.h"
diff --git a/content/browser/aggregation_service/aggregatable_report_sender.cc b/content/browser/aggregation_service/aggregatable_report_sender.cc index 2a135a0..1515d115 100644 --- a/content/browser/aggregation_service/aggregatable_report_sender.cc +++ b/content/browser/aggregation_service/aggregatable_report_sender.cc
@@ -8,8 +8,8 @@ #include <string> #include <utility> -#include "base/callback.h" #include "base/check.h" +#include "base/functional/callback.h" #include "base/json/json_writer.h" #include "base/logging.h" #include "base/memory/ptr_util.h"
diff --git a/content/browser/aggregation_service/aggregatable_report_sender.h b/content/browser/aggregation_service/aggregatable_report_sender.h index 5ee96d0..3cc46ab 100644 --- a/content/browser/aggregation_service/aggregatable_report_sender.h +++ b/content/browser/aggregation_service/aggregatable_report_sender.h
@@ -8,7 +8,7 @@ #include <list> #include <memory> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h" #include "content/common/content_export.h"
diff --git a/content/browser/aggregation_service/aggregatable_report_sender_unittest.cc b/content/browser/aggregation_service/aggregatable_report_sender_unittest.cc index fc2cc4a9..1bd353f5 100644 --- a/content/browser/aggregation_service/aggregatable_report_sender_unittest.cc +++ b/content/browser/aggregation_service/aggregatable_report_sender_unittest.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/memory/scoped_refptr.h" #include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h"
diff --git a/content/browser/aggregation_service/aggregation_service.h b/content/browser/aggregation_service/aggregation_service.h index a39920f..43ac3ad 100644 --- a/content/browser/aggregation_service/aggregation_service.h +++ b/content/browser/aggregation_service/aggregation_service.h
@@ -7,7 +7,7 @@ #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "content/browser/aggregation_service/aggregatable_report_assembler.h" #include "content/browser/aggregation_service/aggregatable_report_sender.h" #include "content/browser/aggregation_service/aggregation_service_storage.h"
diff --git a/content/browser/aggregation_service/aggregation_service_impl.cc b/content/browser/aggregation_service/aggregation_service_impl.cc index 5af84f1a..4c01cef0 100644 --- a/content/browser/aggregation_service/aggregation_service_impl.cc +++ b/content/browser/aggregation_service/aggregation_service_impl.cc
@@ -11,11 +11,11 @@ #include <vector> #include "base/barrier_closure.h" -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/check_op.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ptr_util.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h"
diff --git a/content/browser/aggregation_service/aggregation_service_impl.h b/content/browser/aggregation_service/aggregation_service_impl.h index 0a4e0748..14e8b3e 100644 --- a/content/browser/aggregation_service/aggregation_service_impl.h +++ b/content/browser/aggregation_service/aggregation_service_impl.h
@@ -10,8 +10,8 @@ #include <memory> #include <vector> -#include "base/callback_forward.h" #include "base/containers/flat_map.h" +#include "base/functional/callback_forward.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h"
diff --git a/content/browser/aggregation_service/aggregation_service_impl_unittest.cc b/content/browser/aggregation_service/aggregation_service_impl_unittest.cc index c96f579..6a4372e 100644 --- a/content/browser/aggregation_service/aggregation_service_impl_unittest.cc +++ b/content/browser/aggregation_service/aggregation_service_impl_unittest.cc
@@ -8,9 +8,9 @@ #include <utility> #include <vector> -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h" #include "base/run_loop.h"
diff --git a/content/browser/aggregation_service/aggregation_service_internals_browsertest.cc b/content/browser/aggregation_service/aggregation_service_internals_browsertest.cc index 81265621..61886dd 100644 --- a/content/browser/aggregation_service/aggregation_service_internals_browsertest.cc +++ b/content/browser/aggregation_service/aggregation_service_internals_browsertest.cc
@@ -9,7 +9,7 @@ #include <utility> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/observer_list.h" #include "base/test/gmock_callback_support.h" #include "base/time/time.h"
diff --git a/content/browser/aggregation_service/aggregation_service_internals_handler_impl.cc b/content/browser/aggregation_service/aggregation_service_internals_handler_impl.cc index f77f2d8..d94402ba 100644 --- a/content/browser/aggregation_service/aggregation_service_internals_handler_impl.cc +++ b/content/browser/aggregation_service/aggregation_service_internals_handler_impl.cc
@@ -9,9 +9,9 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/check.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/json/json_writer.h" #include "base/notreached.h" #include "base/ranges/algorithm.h"
diff --git a/content/browser/aggregation_service/aggregation_service_internals_handler_impl_unittest.cc b/content/browser/aggregation_service/aggregation_service_internals_handler_impl_unittest.cc index 6f02062..fdbf088 100644 --- a/content/browser/aggregation_service/aggregation_service_internals_handler_impl_unittest.cc +++ b/content/browser/aggregation_service/aggregation_service_internals_handler_impl_unittest.cc
@@ -11,8 +11,8 @@ #include <utility> #include <vector> -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/test/bind.h"
diff --git a/content/browser/aggregation_service/aggregation_service_key_fetcher.cc b/content/browser/aggregation_service/aggregation_service_key_fetcher.cc index 16791b9..e2e33ac 100644 --- a/content/browser/aggregation_service/aggregation_service_key_fetcher.cc +++ b/content/browser/aggregation_service/aggregation_service_key_fetcher.cc
@@ -8,9 +8,9 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback.h" #include "base/containers/circular_deque.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/rand_util.h" #include "content/browser/aggregation_service/aggregation_service_storage.h" #include "content/browser/aggregation_service/aggregation_service_storage_context.h"
diff --git a/content/browser/aggregation_service/aggregation_service_key_fetcher.h b/content/browser/aggregation_service/aggregation_service_key_fetcher.h index 89a6dbc3..803e0ed 100644 --- a/content/browser/aggregation_service/aggregation_service_key_fetcher.h +++ b/content/browser/aggregation_service/aggregation_service_key_fetcher.h
@@ -8,9 +8,9 @@ #include <memory> #include <vector> -#include "base/callback_forward.h" #include "base/containers/circular_deque.h" #include "base/containers/flat_map.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "content/browser/aggregation_service/public_key.h"
diff --git a/content/browser/aggregation_service/aggregation_service_network_fetcher_impl.cc b/content/browser/aggregation_service/aggregation_service_network_fetcher_impl.cc index 5b06d92..f0ad53c 100644 --- a/content/browser/aggregation_service/aggregation_service_network_fetcher_impl.cc +++ b/content/browser/aggregation_service/aggregation_service_network_fetcher_impl.cc
@@ -8,9 +8,9 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback.h" #include "base/check.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/ptr_util.h" #include "base/memory/scoped_refptr.h" #include "base/metrics/histogram_functions.h"
diff --git a/content/browser/aggregation_service/aggregation_service_network_fetcher_impl_unittest.cc b/content/browser/aggregation_service/aggregation_service_network_fetcher_impl_unittest.cc index 3c98a2afe..b1a97933 100644 --- a/content/browser/aggregation_service/aggregation_service_network_fetcher_impl_unittest.cc +++ b/content/browser/aggregation_service/aggregation_service_network_fetcher_impl_unittest.cc
@@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/memory/scoped_refptr.h" #include "base/strings/string_util.h" #include "base/test/bind.h"
diff --git a/content/browser/aggregation_service/aggregation_service_storage_sql.cc b/content/browser/aggregation_service/aggregation_service_storage_sql.cc index 719a5a6..45bf9921 100644 --- a/content/browser/aggregation_service/aggregation_service_storage_sql.cc +++ b/content/browser/aggregation_service/aggregation_service_storage_sql.cc
@@ -11,12 +11,12 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/check.h" #include "base/check_op.h" #include "base/containers/span.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/metrics/histogram_functions.h" #include "base/sequence_checker.h"
diff --git a/content/browser/aggregation_service/aggregation_service_storage_sql_unittest.cc b/content/browser/aggregation_service/aggregation_service_storage_sql_unittest.cc index a0eb222..3d68e92 100644 --- a/content/browser/aggregation_service/aggregation_service_storage_sql_unittest.cc +++ b/content/browser/aggregation_service/aggregation_service_storage_sql_unittest.cc
@@ -9,11 +9,11 @@ #include <utility> #include <vector> -#include "base/callback_helpers.h" #include "base/containers/flat_set.h" #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/callback_helpers.h" #include "base/path_service.h" #include "base/strings/string_piece.h" #include "base/strings/stringprintf.h"
diff --git a/content/browser/aggregation_service/report_scheduler_timer.cc b/content/browser/aggregation_service/report_scheduler_timer.cc index 09c28e6..79d85f4b 100644 --- a/content/browser/aggregation_service/report_scheduler_timer.cc +++ b/content/browser/aggregation_service/report_scheduler_timer.cc
@@ -7,8 +7,8 @@ #include <memory> #include <utility> -#include "base/bind.h" #include "base/check.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/memory/weak_ptr.h" #include "base/sequence_checker.h"
diff --git a/content/browser/aggregation_service/report_scheduler_timer.h b/content/browser/aggregation_service/report_scheduler_timer.h index 0c3c5e3e..dcdc93a 100644 --- a/content/browser/aggregation_service/report_scheduler_timer.h +++ b/content/browser/aggregation_service/report_scheduler_timer.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/weak_ptr.h" #include "base/scoped_observation.h" #include "base/sequence_checker.h"
diff --git a/content/browser/aggregation_service/report_scheduler_timer_unittest.cc b/content/browser/aggregation_service/report_scheduler_timer_unittest.cc index ff30e20..f763bd0 100644 --- a/content/browser/aggregation_service/report_scheduler_timer_unittest.cc +++ b/content/browser/aggregation_service/report_scheduler_timer_unittest.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/test/gmock_move_support.h" #include "base/test/task_environment.h"
diff --git a/content/browser/android/background_sync_network_observer_android.cc b/content/browser/android/background_sync_network_observer_android.cc index bb4e972..1aeb716 100644 --- a/content/browser/android/background_sync_network_observer_android.cc +++ b/content/browser/android/background_sync_network_observer_android.cc
@@ -4,7 +4,7 @@ #include "content/browser/android/background_sync_network_observer_android.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/trace_event/trace_event.h" #include "content/public/android/content_jni_headers/BackgroundSyncNetworkObserver_jni.h" #include "content/public/browser/browser_task_traits.h"
diff --git a/content/browser/android/battery_metrics.cc b/content/browser/android/battery_metrics.cc index 029d02cb..60c9c7e 100644 --- a/content/browser/android/battery_metrics.cc +++ b/content/browser/android/battery_metrics.cc
@@ -6,8 +6,8 @@ #include "base/android/application_status_listener.h" #include "base/android/radio_utils.h" -#include "base/bind.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/metrics/histogram.h" #include "base/metrics/histogram_base.h"
diff --git a/content/browser/android/content_url_loader_factory.cc b/content/browser/android/content_url_loader_factory.cc index 32b5f63..05fd530 100644 --- a/content/browser/android/content_url_loader_factory.cc +++ b/content/browser/android/content_url_loader_factory.cc
@@ -9,11 +9,11 @@ #include <vector> #include "base/android/content_uri_utils.h" -#include "base/bind.h" #include "base/command_line.h" #include "base/files/file.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/task/sequenced_task_runner.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h"
diff --git a/content/browser/android/java/gin_java_bridge_dispatcher_host.cc b/content/browser/android/java/gin_java_bridge_dispatcher_host.cc index 8e32f0f..695688d2 100644 --- a/content/browser/android/java/gin_java_bridge_dispatcher_host.cc +++ b/content/browser/android/java/gin_java_bridge_dispatcher_host.cc
@@ -6,8 +6,8 @@ #include "base/android/jni_android.h" #include "base/android/scoped_java_ref.h" -#include "base/bind.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "build/build_config.h" #include "content/browser/android/java/gin_java_bound_object_delegate.h" #include "content/browser/android/java/gin_java_bridge_message_filter.h"
diff --git a/content/browser/android/scoped_surface_request_manager.cc b/content/browser/android/scoped_surface_request_manager.cc index 419e2c6f..3702fcc3 100644 --- a/content/browser/android/scoped_surface_request_manager.cc +++ b/content/browser/android/scoped_surface_request_manager.cc
@@ -4,7 +4,7 @@ #include "content/browser/android/scoped_surface_request_manager.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "content/public/browser/browser_task_traits.h" #include "content/public/browser/browser_thread.h" #include "gpu/command_buffer/service/texture_owner.h"
diff --git a/content/browser/android/scoped_surface_request_manager.h b/content/browser/android/scoped_surface_request_manager.h index 0f5fa69..42f9839 100644 --- a/content/browser/android/scoped_surface_request_manager.h +++ b/content/browser/android/scoped_surface_request_manager.h
@@ -7,7 +7,7 @@ #include <unordered_map> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/singleton.h" #include "base/unguessable_token.h" #include "content/common/content_export.h"
diff --git a/content/browser/android/scoped_surface_request_manager_unittest.cc b/content/browser/android/scoped_surface_request_manager_unittest.cc index 717df38..209dcd7 100644 --- a/content/browser/android/scoped_surface_request_manager_unittest.cc +++ b/content/browser/android/scoped_surface_request_manager_unittest.cc
@@ -4,7 +4,7 @@ #include "content/browser/android/scoped_surface_request_manager.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "content/public/test/browser_task_environment.h"
diff --git a/content/browser/android/selection/smart_selection_client.cc b/content/browser/android/selection/smart_selection_client.cc index a942266..cd32816 100644 --- a/content/browser/android/selection/smart_selection_client.cc +++ b/content/browser/android/selection/smart_selection_client.cc
@@ -6,7 +6,7 @@ #include "base/android/jni_android.h" #include "base/android/jni_string.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/supports_user_data.h" #include "content/public/android/content_jni_headers/SmartSelectionClient_jni.h" #include "content/public/browser/render_frame_host.h"
diff --git a/content/browser/android/synchronous_compositor_host.cc b/content/browser/android/synchronous_compositor_host.cc index 97b6cd8..1c99280 100644 --- a/content/browser/android/synchronous_compositor_host.cc +++ b/content/browser/android/synchronous_compositor_host.cc
@@ -9,8 +9,8 @@ #include <memory> #include <utility> -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h" #include "base/memory/shared_memory_mapping.h"
diff --git a/content/browser/android/synchronous_compositor_sync_call_bridge.cc b/content/browser/android/synchronous_compositor_sync_call_bridge.cc index d0e05ac2..babeaf4 100644 --- a/content/browser/android/synchronous_compositor_sync_call_bridge.cc +++ b/content/browser/android/synchronous_compositor_sync_call_bridge.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "content/browser/android/synchronous_compositor_host.h" #include "content/browser/renderer_host/render_process_host_impl.h" #include "content/public/browser/browser_task_traits.h"
diff --git a/content/browser/android/text_suggestion_host_android.cc b/content/browser/android/text_suggestion_host_android.cc index e65a5d5..5b308cf 100644 --- a/content/browser/android/text_suggestion_host_android.cc +++ b/content/browser/android/text_suggestion_host_android.cc
@@ -7,7 +7,7 @@ #include "base/android/jni_android.h" #include "base/android/jni_array.h" #include "base/android/jni_string.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "content/browser/android/text_suggestion_host_mojo_impl_android.h" #include "content/browser/renderer_host/render_widget_host_impl.h" #include "content/browser/web_contents/web_contents_impl.h"
diff --git a/content/browser/android/tracing_controller_android.cc b/content/browser/android/tracing_controller_android.cc index 0e6b4712..6e2be84 100644 --- a/content/browser/android/tracing_controller_android.cc +++ b/content/browser/android/tracing_controller_android.cc
@@ -9,7 +9,7 @@ #include "base/android/jni_android.h" #include "base/android/jni_array.h" #include "base/android/jni_string.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/json/json_writer.h" #include "base/logging.h" #include "base/trace_event/trace_event.h"
diff --git a/content/browser/attribution_reporting/attribution_cookie_checker.h b/content/browser/attribution_reporting/attribution_cookie_checker.h index 9e38881..38ceef9b 100644 --- a/content/browser/attribution_reporting/attribution_cookie_checker.h +++ b/content/browser/attribution_reporting/attribution_cookie_checker.h
@@ -5,7 +5,7 @@ #ifndef CONTENT_BROWSER_ATTRIBUTION_REPORTING_ATTRIBUTION_COOKIE_CHECKER_H_ #define CONTENT_BROWSER_ATTRIBUTION_REPORTING_ATTRIBUTION_COOKIE_CHECKER_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" namespace url { class Origin;
diff --git a/content/browser/attribution_reporting/attribution_cookie_checker_impl.cc b/content/browser/attribution_reporting/attribution_cookie_checker_impl.cc index 670de540..4a31b742 100644 --- a/content/browser/attribution_reporting/attribution_cookie_checker_impl.cc +++ b/content/browser/attribution_reporting/attribution_cookie_checker_impl.cc
@@ -7,9 +7,9 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback.h" #include "base/check.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/ranges/algorithm.h" #include "content/browser/storage_partition_impl.h" #include "net/cookies/canonical_cookie.h"
diff --git a/content/browser/attribution_reporting/attribution_cookie_checker_impl_unittest.cc b/content/browser/attribution_reporting/attribution_cookie_checker_impl_unittest.cc index 045f4ff..75b4343 100644 --- a/content/browser/attribution_reporting/attribution_cookie_checker_impl_unittest.cc +++ b/content/browser/attribution_reporting/attribution_cookie_checker_impl_unittest.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/test/bind.h" #include "base/test/scoped_feature_list.h"
diff --git a/content/browser/attribution_reporting/attribution_data_host_manager_impl.cc b/content/browser/attribution_reporting/attribution_data_host_manager_impl.cc index 3c20746..b5a9c9f2 100644 --- a/content/browser/attribution_reporting/attribution_data_host_manager_impl.cc +++ b/content/browser/attribution_reporting/attribution_data_host_manager_impl.cc
@@ -9,10 +9,10 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/check.h" #include "base/check_op.h" #include "base/containers/flat_tree.h" +#include "base/functional/bind.h" #include "base/metrics/field_trial_params.h" #include "base/metrics/histogram_functions.h" #include "base/time/time.h" @@ -565,8 +565,8 @@ void AttributionDataHostManagerImpl::OnRedirectSourceParsed( const blink::AttributionSrcToken& attribution_src_token, - SuitableOrigin reporting_origin, - std::string header_value, + const SuitableOrigin& reporting_origin, + const std::string& header_value, AttributionNavigationType nav_type, data_decoder::DataDecoder::ValueOrError result) { auto it = redirect_registrations_.find(attribution_src_token);
diff --git a/content/browser/attribution_reporting/attribution_data_host_manager_impl.h b/content/browser/attribution_reporting/attribution_data_host_manager_impl.h index 2323831..98f08dd2 100644 --- a/content/browser/attribution_reporting/attribution_data_host_manager_impl.h +++ b/content/browser/attribution_reporting/attribution_data_host_manager_impl.h
@@ -102,8 +102,8 @@ void OnRedirectSourceParsed( const blink::AttributionSrcToken& attribution_src_token, - attribution_reporting::SuitableOrigin reporting_origin, - std::string header_value, + const attribution_reporting::SuitableOrigin& reporting_origin, + const std::string& header_value, blink::mojom::AttributionNavigationType nav_type, data_decoder::DataDecoder::ValueOrError result);
diff --git a/content/browser/attribution_reporting/attribution_internals_browsertest.cc b/content/browser/attribution_reporting/attribution_internals_browsertest.cc index d90b379..d7b26bc 100644 --- a/content/browser/attribution_reporting/attribution_internals_browsertest.cc +++ b/content/browser/attribution_reporting/attribution_internals_browsertest.cc
@@ -10,8 +10,8 @@ #include <utility> #include <vector> -#include "base/callback.h" #include "base/command_line.h" +#include "base/functional/callback.h" #include "base/strings/utf_string_conversions.h" #include "base/test/gmock_callback_support.h" #include "base/time/time.h"
diff --git a/content/browser/attribution_reporting/attribution_internals_handler_impl.cc b/content/browser/attribution_reporting/attribution_internals_handler_impl.cc index b6bb331..331aa13 100644 --- a/content/browser/attribution_reporting/attribution_internals_handler_impl.cc +++ b/content/browser/attribution_reporting/attribution_internals_handler_impl.cc
@@ -11,11 +11,11 @@ #include <utility> #include <vector> -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/containers/flat_map.h" #include "base/containers/flat_set.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/functional/overloaded.h" #include "base/notreached.h" #include "base/ranges/algorithm.h"
diff --git a/content/browser/attribution_reporting/attribution_interop_parser.cc b/content/browser/attribution_reporting/attribution_interop_parser.cc index 7f3b2b8..b0f1996f 100644 --- a/content/browser/attribution_reporting/attribution_interop_parser.cc +++ b/content/browser/attribution_reporting/attribution_interop_parser.cc
@@ -10,8 +10,8 @@ #include <ostream> #include <utility> -#include "base/callback.h" #include "base/check.h" +#include "base/functional/callback.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_piece.h" #include "base/test/bind.h"
diff --git a/content/browser/attribution_reporting/attribution_interop_parser.h b/content/browser/attribution_reporting/attribution_interop_parser.h index 120fd69..fa38114f 100644 --- a/content/browser/attribution_reporting/attribution_interop_parser.h +++ b/content/browser/attribution_reporting/attribution_interop_parser.h
@@ -12,7 +12,7 @@ #include <ostream> #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/strings/string_piece_forward.h" #include "base/values.h" #include "content/browser/attribution_reporting/attribution_parser_test_utils.h"
diff --git a/content/browser/attribution_reporting/attribution_manager.h b/content/browser/attribution_reporting/attribution_manager.h index e71a29c4..3b86c07a 100644 --- a/content/browser/attribution_reporting/attribution_manager.h +++ b/content/browser/attribution_reporting/attribution_manager.h
@@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "components/attribution_reporting/os_support.mojom-forward.h" #include "components/attribution_reporting/source_registration_error.mojom-forward.h" #include "content/browser/attribution_reporting/attribution_report.h"
diff --git a/content/browser/attribution_reporting/attribution_manager_impl.cc b/content/browser/attribution_reporting/attribution_manager_impl.cc index c36f56e5..6a2029f 100644 --- a/content/browser/attribution_reporting/attribution_manager_impl.cc +++ b/content/browser/attribution_reporting/attribution_manager_impl.cc
@@ -8,12 +8,11 @@ #include <utility> #include "base/barrier_closure.h" -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/check.h" #include "base/check_op.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/functional/callback_helpers.h" #include "base/functional/overloaded.h" #include "base/memory/ptr_util.h" @@ -637,7 +636,7 @@ RecordRegisterImpressionAllowed(allowed); if (!allowed) { this->OnSourceStored( - std::move(source), + source, /*cleared_debug_key=*/absl::nullopt, is_debug_cookie_set, AttributionStorage::StoreSourceResult( StorableSource::Result::kProhibitedByBrowserPolicy));
diff --git a/content/browser/attribution_reporting/attribution_manager_impl.h b/content/browser/attribution_reporting/attribution_manager_impl.h index 6a87e75b..dbee862 100644 --- a/content/browser/attribution_reporting/attribution_manager_impl.h +++ b/content/browser/attribution_reporting/attribution_manager_impl.h
@@ -9,10 +9,10 @@ #include <memory> #include <vector> -#include "base/callback_forward.h" #include "base/containers/circular_deque.h" #include "base/containers/flat_set.h" #include "base/feature_list.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h"
diff --git a/content/browser/attribution_reporting/attribution_manager_impl_unittest.cc b/content/browser/attribution_reporting/attribution_manager_impl_unittest.cc index 5af80a8..db6c0e0 100644 --- a/content/browser/attribution_reporting/attribution_manager_impl_unittest.cc +++ b/content/browser/attribution_reporting/attribution_manager_impl_unittest.cc
@@ -9,12 +9,12 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/check.h" #include "base/containers/circular_deque.h" #include "base/containers/flat_set.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h" #include "base/run_loop.h"
diff --git a/content/browser/attribution_reporting/attribution_report_network_sender.cc b/content/browser/attribution_reporting/attribution_report_network_sender.cc index fff34ee..0fb8128 100644 --- a/content/browser/attribution_reporting/attribution_report_network_sender.cc +++ b/content/browser/attribution_reporting/attribution_report_network_sender.cc
@@ -7,8 +7,8 @@ #include <string> #include <utility> -#include "base/bind.h" #include "base/check.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_functions.h" #include "base/values.h" #include "content/browser/attribution_reporting/attribution_debug_report.h"
diff --git a/content/browser/attribution_reporting/attribution_report_network_sender.h b/content/browser/attribution_reporting/attribution_report_network_sender.h index 8e2093e..83872794 100644 --- a/content/browser/attribution_reporting/attribution_report_network_sender.h +++ b/content/browser/attribution_reporting/attribution_report_network_sender.h
@@ -9,7 +9,7 @@ #include <memory> #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/scoped_refptr.h" #include "content/browser/attribution_reporting/attribution_report_sender.h" #include "content/common/content_export.h"
diff --git a/content/browser/attribution_reporting/attribution_report_network_sender_unittest.cc b/content/browser/attribution_reporting/attribution_report_network_sender_unittest.cc index becc7eee..d9c5f4d 100644 --- a/content/browser/attribution_reporting/attribution_report_network_sender_unittest.cc +++ b/content/browser/attribution_reporting/attribution_report_network_sender_unittest.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/memory/scoped_refptr.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/mock_callback.h"
diff --git a/content/browser/attribution_reporting/attribution_report_sender.h b/content/browser/attribution_reporting/attribution_report_sender.h index 27d8b3d..fa6152a 100644 --- a/content/browser/attribution_reporting/attribution_report_sender.h +++ b/content/browser/attribution_reporting/attribution_report_sender.h
@@ -5,7 +5,7 @@ #ifndef CONTENT_BROWSER_ATTRIBUTION_REPORTING_ATTRIBUTION_REPORT_SENDER_H_ #define CONTENT_BROWSER_ATTRIBUTION_REPORTING_ATTRIBUTION_REPORT_SENDER_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" namespace content {
diff --git a/content/browser/attribution_reporting/attribution_storage.h b/content/browser/attribution_reporting/attribution_storage.h index 14a2377..8870a59 100644 --- a/content/browser/attribution_reporting/attribution_storage.h +++ b/content/browser/attribution_reporting/attribution_storage.h
@@ -7,7 +7,7 @@ #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/time/time.h" #include "content/browser/attribution_reporting/attribution_report.h" #include "content/browser/attribution_reporting/storable_source.h"
diff --git a/content/browser/attribution_reporting/attribution_storage_sql.cc b/content/browser/attribution_reporting/attribution_storage_sql.cc index 5d623da..5c4c5ed0 100644 --- a/content/browser/attribution_reporting/attribution_storage_sql.cc +++ b/content/browser/attribution_reporting/attribution_storage_sql.cc
@@ -13,11 +13,11 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/check.h" #include "base/check_op.h" #include "base/containers/flat_set.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/functional/overloaded.h" #include "base/guid.h" #include "base/logging.h"
diff --git a/content/browser/attribution_reporting/attribution_storage_sql_unittest.cc b/content/browser/attribution_reporting/attribution_storage_sql_unittest.cc index be96d037..ceb3bd95 100644 --- a/content/browser/attribution_reporting/attribution_storage_sql_unittest.cc +++ b/content/browser/attribution_reporting/attribution_storage_sql_unittest.cc
@@ -11,11 +11,11 @@ #include <memory> #include <string> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/check.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/test/metrics/histogram_tester.h"
diff --git a/content/browser/attribution_reporting/attribution_storage_unittest.cc b/content/browser/attribution_reporting/attribution_storage_unittest.cc index a98978c2..73bc58d 100644 --- a/content/browser/attribution_reporting/attribution_storage_unittest.cc +++ b/content/browser/attribution_reporting/attribution_storage_unittest.cc
@@ -13,11 +13,11 @@ #include <utility> #include <vector> -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/check.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/guid.h" #include "base/memory/raw_ptr.h" #include "base/ranges/algorithm.h"
diff --git a/content/browser/attribution_reporting/attribution_test_utils.cc b/content/browser/attribution_reporting/attribution_test_utils.cc index 2567d5f3..3126aa7 100644 --- a/content/browser/attribution_reporting/attribution_test_utils.cc +++ b/content/browser/attribution_reporting/attribution_test_utils.cc
@@ -12,10 +12,10 @@ #include <utility> #include <vector> -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/check.h" #include "base/check_op.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/ranges/algorithm.h" #include "base/run_loop.h" #include "base/strings/string_number_conversions.h"
diff --git a/content/browser/attribution_reporting/rate_limit_table.h b/content/browser/attribution_reporting/rate_limit_table.h index 78b087f..f129607f 100644 --- a/content/browser/attribution_reporting/rate_limit_table.h +++ b/content/browser/attribution_reporting/rate_limit_table.h
@@ -7,7 +7,7 @@ #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/sequence_checker.h" #include "base/thread_annotations.h"
diff --git a/content/browser/attribution_reporting/rate_limit_table_unittest.cc b/content/browser/attribution_reporting/rate_limit_table_unittest.cc index bef9d93..ca903ea5 100644 --- a/content/browser/attribution_reporting/rate_limit_table_unittest.cc +++ b/content/browser/attribution_reporting/rate_limit_table_unittest.cc
@@ -12,11 +12,11 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/check_op.h" #include "base/containers/flat_map.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/test/task_environment.h" #include "base/time/time.h" #include "components/attribution_reporting/suitable_origin.h"
diff --git a/content/browser/attribution_reporting/trigger_registration_browsertest.cc b/content/browser/attribution_reporting/trigger_registration_browsertest.cc index 61b91de..9efd4f9 100644 --- a/content/browser/attribution_reporting/trigger_registration_browsertest.cc +++ b/content/browser/attribution_reporting/trigger_registration_browsertest.cc
@@ -4,7 +4,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "components/attribution_reporting/registration_type.mojom.h" #include "components/attribution_reporting/test_utils.h" #include "content/browser/attribution_reporting/attribution_manager_impl.h"
diff --git a/content/browser/back_forward_cache_browsertest.cc b/content/browser/back_forward_cache_browsertest.cc index fcde216..a928a8e 100644 --- a/content/browser/back_forward_cache_browsertest.cc +++ b/content/browser/back_forward_cache_browsertest.cc
@@ -7,9 +7,9 @@ #include <climits> #include <unordered_map> -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/containers/contains.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h"
diff --git a/content/browser/back_forward_cache_internal_browsertest.cc b/content/browser/back_forward_cache_internal_browsertest.cc index 2349e9a..bf2a07a 100644 --- a/content/browser/back_forward_cache_internal_browsertest.cc +++ b/content/browser/back_forward_cache_internal_browsertest.cc
@@ -4,8 +4,8 @@ #include "content/browser/back_forward_cache_browsertest.h" -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/metrics/metrics_hashes.h" #include "base/task/single_thread_task_runner.h"
diff --git a/content/browser/background_fetch/background_fetch_context.cc b/content/browser/background_fetch/background_fetch_context.cc index 20e7511..51a3183 100644 --- a/content/browser/background_fetch/background_fetch_context.cc +++ b/content/browser/background_fetch/background_fetch_context.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/observer_list.h" #include "content/browser/background_fetch/background_fetch_data_manager.h" #include "content/browser/background_fetch/background_fetch_job_controller.h"
diff --git a/content/browser/background_fetch/background_fetch_data_manager.h b/content/browser/background_fetch/background_fetch_data_manager.h index 3170f92..09994915 100644 --- a/content/browser/background_fetch/background_fetch_data_manager.h +++ b/content/browser/background_fetch/background_fetch_data_manager.h
@@ -12,8 +12,8 @@ #include <tuple> #include <vector> -#include "base/callback_forward.h" #include "base/containers/queue.h" +#include "base/functional/callback_forward.h" #include "base/gtest_prod_util.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h"
diff --git a/content/browser/background_fetch/background_fetch_data_manager_unittest.cc b/content/browser/background_fetch/background_fetch_data_manager_unittest.cc index 6746296..b788900 100644 --- a/content/browser/background_fetch/background_fetch_data_manager_unittest.cc +++ b/content/browser/background_fetch/background_fetch_data_manager_unittest.cc
@@ -10,9 +10,9 @@ #include <vector> #include "base/barrier_closure.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/guid.h" #include "base/run_loop.h" #include "base/strings/string_number_conversions.h"
diff --git a/content/browser/background_fetch/background_fetch_delegate_proxy.cc b/content/browser/background_fetch/background_fetch_delegate_proxy.cc index a15973f..6eaf8b22 100644 --- a/content/browser/background_fetch/background_fetch_delegate_proxy.cc +++ b/content/browser/background_fetch/background_fetch_delegate_proxy.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "components/download/public/common/download_item.h" #include "components/download/public/common/download_url_parameters.h" #include "content/browser/background_fetch/background_fetch_job_controller.h"
diff --git a/content/browser/background_fetch/background_fetch_delegate_proxy_unittest.cc b/content/browser/background_fetch/background_fetch_delegate_proxy_unittest.cc index c0d9b66..d013610 100644 --- a/content/browser/background_fetch/background_fetch_delegate_proxy_unittest.cc +++ b/content/browser/background_fetch/background_fetch_delegate_proxy_unittest.cc
@@ -7,8 +7,8 @@ #include <set> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/run_loop.h"
diff --git a/content/browser/background_fetch/background_fetch_event_dispatcher.cc b/content/browser/background_fetch/background_fetch_event_dispatcher.cc index ea97486..d15e39c 100644 --- a/content/browser/background_fetch/background_fetch_event_dispatcher.cc +++ b/content/browser/background_fetch/background_fetch_event_dispatcher.cc
@@ -7,9 +7,9 @@ #include <map> #include <sstream> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/metrics/histogram_functions.h" #include "base/strings/stringprintf.h" #include "content/browser/background_fetch/background_fetch_registration_id.h"
diff --git a/content/browser/background_fetch/background_fetch_event_dispatcher.h b/content/browser/background_fetch/background_fetch_event_dispatcher.h index 9d347c0..7a7cba2 100644 --- a/content/browser/background_fetch/background_fetch_event_dispatcher.h +++ b/content/browser/background_fetch/background_fetch_event_dispatcher.h
@@ -7,7 +7,7 @@ #include <stdint.h> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h" #include "content/browser/service_worker/service_worker_metrics.h"
diff --git a/content/browser/background_fetch/background_fetch_job_controller.cc b/content/browser/background_fetch/background_fetch_job_controller.cc index f371ac7f..f1985709 100644 --- a/content/browser/background_fetch/background_fetch_job_controller.cc +++ b/content/browser/background_fetch/background_fetch_job_controller.cc
@@ -4,8 +4,8 @@ #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "content/browser/background_fetch/background_fetch_cross_origin_filter.h" #include "content/browser/background_fetch/background_fetch_data_manager.h" #include "content/browser/background_fetch/background_fetch_job_controller.h"
diff --git a/content/browser/background_fetch/background_fetch_job_controller.h b/content/browser/background_fetch/background_fetch_job_controller.h index b1f1b244..032e8d00 100644 --- a/content/browser/background_fetch/background_fetch_job_controller.h +++ b/content/browser/background_fetch/background_fetch_job_controller.h
@@ -10,7 +10,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h"
diff --git a/content/browser/background_fetch/background_fetch_job_controller_unittest.cc b/content/browser/background_fetch/background_fetch_job_controller_unittest.cc index f8f4291..0231019d 100644 --- a/content/browser/background_fetch/background_fetch_job_controller_unittest.cc +++ b/content/browser/background_fetch/background_fetch_job_controller_unittest.cc
@@ -12,8 +12,8 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/guid.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h"
diff --git a/content/browser/background_fetch/background_fetch_registration_notifier.cc b/content/browser/background_fetch/background_fetch_registration_notifier.cc index a6ea2250..fd17290 100644 --- a/content/browser/background_fetch/background_fetch_registration_notifier.cc +++ b/content/browser/background_fetch/background_fetch_registration_notifier.cc
@@ -4,9 +4,9 @@ #include "content/browser/background_fetch/background_fetch_registration_notifier.h" -#include "base/bind.h" #include "base/command_line.h" #include "base/containers/cxx20_erase.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_macros.h" #include "content/common/background_fetch/background_fetch_types.h" #include "content/public/common/content_switches.h"
diff --git a/content/browser/background_fetch/background_fetch_registration_notifier.h b/content/browser/background_fetch/background_fetch_registration_notifier.h index 71f219af..8efa4ad7 100644 --- a/content/browser/background_fetch/background_fetch_registration_notifier.h +++ b/content/browser/background_fetch/background_fetch_registration_notifier.h
@@ -9,7 +9,7 @@ #include <map> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "content/common/content_export.h" #include "mojo/public/cpp/bindings/remote.h"
diff --git a/content/browser/background_fetch/background_fetch_registration_service_impl.cc b/content/browser/background_fetch/background_fetch_registration_service_impl.cc index eeb3945..5bc52f16 100644 --- a/content/browser/background_fetch/background_fetch_registration_service_impl.cc +++ b/content/browser/background_fetch/background_fetch_registration_service_impl.cc
@@ -6,8 +6,8 @@ #include <memory> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/guid.h" #include "base/memory/ptr_util.h" #include "content/browser/background_fetch/background_fetch_context.h"
diff --git a/content/browser/background_fetch/background_fetch_scheduler.cc b/content/browser/background_fetch/background_fetch_scheduler.cc index 4b4edb3..a4892cb5 100644 --- a/content/browser/background_fetch/background_fetch_scheduler.cc +++ b/content/browser/background_fetch/background_fetch_scheduler.cc
@@ -4,9 +4,9 @@ #include "content/browser/background_fetch/background_fetch_scheduler.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/containers/cxx20_erase.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/guid.h" #include "base/metrics/field_trial_params.h" #include "base/strings/string_number_conversions.h"
diff --git a/content/browser/background_fetch/background_fetch_scheduler.h b/content/browser/background_fetch/background_fetch_scheduler.h index 96e8e097..d9a76f4 100644 --- a/content/browser/background_fetch/background_fetch_scheduler.h +++ b/content/browser/background_fetch/background_fetch_scheduler.h
@@ -10,8 +10,8 @@ #include <utility> #include <vector> -#include "base/callback.h" #include "base/containers/circular_deque.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "content/browser/background_fetch/background_fetch_data_manager_observer.h"
diff --git a/content/browser/background_fetch/background_fetch_scheduler_unittest.cc b/content/browser/background_fetch/background_fetch_scheduler_unittest.cc index 71cbdce..e7ff1162 100644 --- a/content/browser/background_fetch/background_fetch_scheduler_unittest.cc +++ b/content/browser/background_fetch/background_fetch_scheduler_unittest.cc
@@ -6,9 +6,9 @@ #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/containers/cxx20_erase.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/guid.h" #include "base/memory/raw_ptr.h" #include "base/strings/string_number_conversions.h"
diff --git a/content/browser/background_fetch/background_fetch_service_impl.cc b/content/browser/background_fetch/background_fetch_service_impl.cc index bf73111..43ab8b14 100644 --- a/content/browser/background_fetch/background_fetch_service_impl.cc +++ b/content/browser/background_fetch/background_fetch_service_impl.cc
@@ -6,8 +6,8 @@ #include <memory> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/guid.h" #include "content/browser/background_fetch/background_fetch_context.h" #include "content/browser/background_fetch/background_fetch_metrics.h"
diff --git a/content/browser/background_fetch/background_fetch_service_unittest.cc b/content/browser/background_fetch/background_fetch_service_unittest.cc index 7dd162e..e6892f3 100644 --- a/content/browser/background_fetch/background_fetch_service_unittest.cc +++ b/content/browser/background_fetch/background_fetch_service_unittest.cc
@@ -7,7 +7,7 @@ #include <utility> #include "base/auto_reset.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/ranges/algorithm.h" #include "base/run_loop.h" #include "base/strings/string_util.h"
diff --git a/content/browser/background_fetch/background_fetch_test_base.cc b/content/browser/background_fetch/background_fetch_test_base.cc index 5cae2c8..9b0bbfd 100644 --- a/content/browser/background_fetch/background_fetch_test_base.cc +++ b/content/browser/background_fetch/background_fetch_test_base.cc
@@ -9,11 +9,11 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/check.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/guid.h" #include "base/memory/weak_ptr.h" #include "base/run_loop.h"
diff --git a/content/browser/background_fetch/background_fetch_test_service_worker.cc b/content/browser/background_fetch/background_fetch_test_service_worker.cc index 917099e..144c326 100644 --- a/content/browser/background_fetch/background_fetch_test_service_worker.cc +++ b/content/browser/background_fetch/background_fetch_test_service_worker.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/time/time.h" #include "content/common/background_fetch/background_fetch_types.h" #include "third_party/blink/public/mojom/service_worker/service_worker_event_status.mojom.h"
diff --git a/content/browser/background_fetch/background_fetch_test_service_worker.h b/content/browser/background_fetch/background_fetch_test_service_worker.h index c24f92b..0b993e6 100644 --- a/content/browser/background_fetch/background_fetch_test_service_worker.h +++ b/content/browser/background_fetch/background_fetch_test_service_worker.h
@@ -8,7 +8,7 @@ #include <memory> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "content/browser/service_worker/embedded_worker_test_helper.h" #include "third_party/blink/public/mojom/background_fetch/background_fetch.mojom.h"
diff --git a/content/browser/background_fetch/mock_background_fetch_delegate.cc b/content/browser/background_fetch/mock_background_fetch_delegate.cc index d0a73b3..f241493 100644 --- a/content/browser/background_fetch/mock_background_fetch_delegate.cc +++ b/content/browser/background_fetch/mock_background_fetch_delegate.cc
@@ -5,8 +5,8 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/task/single_thread_task_runner.h" #include "content/browser/background_fetch/mock_background_fetch_delegate.h" #include "content/public/browser/background_fetch_description.h"
diff --git a/content/browser/background_fetch/storage/cleanup_task.cc b/content/browser/background_fetch/storage/cleanup_task.cc index f4ff085..16f3d06b6 100644 --- a/content/browser/background_fetch/storage/cleanup_task.cc +++ b/content/browser/background_fetch/storage/cleanup_task.cc
@@ -6,8 +6,8 @@ #include <memory> -#include "base/bind.h" #include "base/containers/flat_set.h" +#include "base/functional/bind.h" #include "content/browser/background_fetch/background_fetch.pb.h" #include "content/browser/background_fetch/background_fetch_data_manager.h" #include "content/browser/background_fetch/storage/database_helpers.h"
diff --git a/content/browser/background_fetch/storage/create_metadata_task.cc b/content/browser/background_fetch/storage/create_metadata_task.cc index 15bca412..37bac1b2 100644 --- a/content/browser/background_fetch/storage/create_metadata_task.cc +++ b/content/browser/background_fetch/storage/create_metadata_task.cc
@@ -9,8 +9,8 @@ #include <utility> #include "base/barrier_closure.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/observer_list.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h"
diff --git a/content/browser/background_fetch/storage/database_task.cc b/content/browser/background_fetch/storage/database_task.cc index 4b85b2c..7c5445e 100644 --- a/content/browser/background_fetch/storage/database_task.cc +++ b/content/browser/background_fetch/storage/database_task.cc
@@ -8,7 +8,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_functions.h" #include "base/observer_list.h" #include "base/task/single_thread_task_runner.h"
diff --git a/content/browser/background_fetch/storage/delete_registration_task.cc b/content/browser/background_fetch/storage/delete_registration_task.cc index 527e5d5..425e1f1 100644 --- a/content/browser/background_fetch/storage/delete_registration_task.cc +++ b/content/browser/background_fetch/storage/delete_registration_task.cc
@@ -7,7 +7,7 @@ #include <utility> #include "base/barrier_closure.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/trace_event/trace_event.h" #include "content/browser/background_fetch/background_fetch.pb.h" #include "content/browser/background_fetch/background_fetch_data_manager.h"
diff --git a/content/browser/background_fetch/storage/get_developer_ids_task.cc b/content/browser/background_fetch/storage/get_developer_ids_task.cc index 8c9cb08c..e21a032 100644 --- a/content/browser/background_fetch/storage/get_developer_ids_task.cc +++ b/content/browser/background_fetch/storage/get_developer_ids_task.cc
@@ -6,7 +6,7 @@ #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "content/browser/background_fetch/storage/database_helpers.h" #include "content/browser/service_worker/service_worker_context_wrapper.h" #include "content/browser/service_worker/service_worker_registration.h"
diff --git a/content/browser/background_fetch/storage/get_developer_ids_task.h b/content/browser/background_fetch/storage/get_developer_ids_task.h index 545eb2e..a00b6bcd 100644 --- a/content/browser/background_fetch/storage/get_developer_ids_task.h +++ b/content/browser/background_fetch/storage/get_developer_ids_task.h
@@ -8,8 +8,8 @@ #include <string> #include <utility> -#include "base/callback_forward.h" #include "base/containers/flat_map.h" +#include "base/functional/callback_forward.h" #include "content/browser/background_fetch/storage/database_task.h" #include "third_party/blink/public/common/service_worker/service_worker_status_code.h" #include "third_party/blink/public/common/storage_key/storage_key.h"
diff --git a/content/browser/background_fetch/storage/get_initialization_data_task.cc b/content/browser/background_fetch/storage/get_initialization_data_task.cc index 05bbbeeb..22444605 100644 --- a/content/browser/background_fetch/storage/get_initialization_data_task.cc +++ b/content/browser/background_fetch/storage/get_initialization_data_task.cc
@@ -5,8 +5,8 @@ #include "content/browser/background_fetch/storage/get_initialization_data_task.h" #include "base/barrier_closure.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/strings/utf_string_conversions.h" #include "base/task/task_traits.h"
diff --git a/content/browser/background_fetch/storage/get_initialization_data_task.h b/content/browser/background_fetch/storage/get_initialization_data_task.h index ea70f35b..15045f6 100644 --- a/content/browser/background_fetch/storage/get_initialization_data_task.h +++ b/content/browser/background_fetch/storage/get_initialization_data_task.h
@@ -9,7 +9,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" #include "content/browser/background_fetch/background_fetch_registration_id.h" #include "content/browser/background_fetch/storage/database_task.h"
diff --git a/content/browser/background_fetch/storage/get_metadata_task.cc b/content/browser/background_fetch/storage/get_metadata_task.cc index b5ae3039..04a416a 100644 --- a/content/browser/background_fetch/storage/get_metadata_task.cc +++ b/content/browser/background_fetch/storage/get_metadata_task.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "content/browser/background_fetch/storage/database_helpers.h" #include "content/browser/service_worker/service_worker_context_wrapper.h" #include "third_party/blink/public/common/storage_key/storage_key.h"
diff --git a/content/browser/background_fetch/storage/get_metadata_task.h b/content/browser/background_fetch/storage/get_metadata_task.h index 26eafb96..cb35b02 100644 --- a/content/browser/background_fetch/storage/get_metadata_task.h +++ b/content/browser/background_fetch/storage/get_metadata_task.h
@@ -9,7 +9,7 @@ #include <string> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "content/browser/background_fetch/background_fetch.pb.h" #include "content/browser/background_fetch/storage/database_task.h" #include "third_party/blink/public/common/service_worker/service_worker_status_code.h"
diff --git a/content/browser/background_fetch/storage/get_registration_task.cc b/content/browser/background_fetch/storage/get_registration_task.cc index 4b72001..3eb1051 100644 --- a/content/browser/background_fetch/storage/get_registration_task.cc +++ b/content/browser/background_fetch/storage/get_registration_task.cc
@@ -4,7 +4,7 @@ #include "content/browser/background_fetch/storage/get_registration_task.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "content/browser/background_fetch/storage/database_helpers.h" #include "content/browser/background_fetch/storage/get_metadata_task.h" #include "third_party/blink/public/common/storage_key/storage_key.h"
diff --git a/content/browser/background_fetch/storage/get_registration_task.h b/content/browser/background_fetch/storage/get_registration_task.h index 58bbcce..1369fe4 100644 --- a/content/browser/background_fetch/storage/get_registration_task.h +++ b/content/browser/background_fetch/storage/get_registration_task.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "content/browser/background_fetch/background_fetch.pb.h" #include "content/browser/background_fetch/background_fetch_registration_id.h" #include "content/browser/background_fetch/storage/database_task.h"
diff --git a/content/browser/background_fetch/storage/get_request_blob_task.cc b/content/browser/background_fetch/storage/get_request_blob_task.cc index 4f460a4e..1d8e6310 100644 --- a/content/browser/background_fetch/storage/get_request_blob_task.cc +++ b/content/browser/background_fetch/storage/get_request_blob_task.cc
@@ -4,7 +4,7 @@ #include "content/browser/background_fetch/storage/get_request_blob_task.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/trace_event/trace_event.h" #include "content/browser/background_fetch/background_fetch_request_match_params.h" #include "content/browser/background_fetch/storage/database_helpers.h"
diff --git a/content/browser/background_fetch/storage/get_request_blob_task.h b/content/browser/background_fetch/storage/get_request_blob_task.h index 4c24b2b0..48cf137 100644 --- a/content/browser/background_fetch/storage/get_request_blob_task.h +++ b/content/browser/background_fetch/storage/get_request_blob_task.h
@@ -5,7 +5,7 @@ #ifndef CONTENT_BROWSER_BACKGROUND_FETCH_STORAGE_GET_REQUEST_BLOB_TASK_H_ #define CONTENT_BROWSER_BACKGROUND_FETCH_STORAGE_GET_REQUEST_BLOB_TASK_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/scoped_refptr.h" #include "content/browser/background_fetch/background_fetch_request_info.h" #include "content/browser/background_fetch/storage/database_task.h"
diff --git a/content/browser/background_fetch/storage/image_helpers.cc b/content/browser/background_fetch/storage/image_helpers.cc index 0c0a5d5d..dbee0df 100644 --- a/content/browser/background_fetch/storage/image_helpers.cc +++ b/content/browser/background_fetch/storage/image_helpers.cc
@@ -4,7 +4,7 @@ #include "content/browser/background_fetch/storage/image_helpers.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ref_counted_memory.h" #include "base/task/sequenced_task_runner.h" #include "base/task/task_traits.h"
diff --git a/content/browser/background_fetch/storage/image_helpers.h b/content/browser/background_fetch/storage/image_helpers.h index fedc2e42..b8cf8fb5 100644 --- a/content/browser/background_fetch/storage/image_helpers.h +++ b/content/browser/background_fetch/storage/image_helpers.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "content/common/content_export.h" #include "third_party/skia/include/core/SkBitmap.h"
diff --git a/content/browser/background_fetch/storage/image_helpers_unittest.cc b/content/browser/background_fetch/storage/image_helpers_unittest.cc index 325d730..33513d0 100644 --- a/content/browser/background_fetch/storage/image_helpers_unittest.cc +++ b/content/browser/background_fetch/storage/image_helpers_unittest.cc
@@ -7,8 +7,8 @@ #include <memory> #include <string> -#include "base/bind.h" #include "base/check.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/test/task_environment.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/content/browser/background_fetch/storage/mark_registration_for_deletion_task.cc b/content/browser/background_fetch/storage/mark_registration_for_deletion_task.cc index 52df4af..6e74670 100644 --- a/content/browser/background_fetch/storage/mark_registration_for_deletion_task.cc +++ b/content/browser/background_fetch/storage/mark_registration_for_deletion_task.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "content/browser/background_fetch/background_fetch.pb.h" #include "content/browser/background_fetch/background_fetch_data_manager.h" #include "content/browser/background_fetch/storage/database_helpers.h"
diff --git a/content/browser/background_fetch/storage/mark_request_complete_task.cc b/content/browser/background_fetch/storage/mark_request_complete_task.cc index e0bb6c08..e952cec 100644 --- a/content/browser/background_fetch/storage/mark_request_complete_task.cc +++ b/content/browser/background_fetch/storage/mark_request_complete_task.cc
@@ -5,7 +5,7 @@ #include "content/browser/background_fetch/storage/mark_request_complete_task.h" #include "base/barrier_closure.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/guid.h" #include "base/observer_list.h" #include "base/trace_event/trace_event.h"
diff --git a/content/browser/background_fetch/storage/mark_request_complete_task.h b/content/browser/background_fetch/storage/mark_request_complete_task.h index bf04e996..0f24351 100644 --- a/content/browser/background_fetch/storage/mark_request_complete_task.h +++ b/content/browser/background_fetch/storage/mark_request_complete_task.h
@@ -5,7 +5,7 @@ #ifndef CONTENT_BROWSER_BACKGROUND_FETCH_STORAGE_MARK_REQUEST_COMPLETE_TASK_H_ #define CONTENT_BROWSER_BACKGROUND_FETCH_STORAGE_MARK_REQUEST_COMPLETE_TASK_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/scoped_refptr.h" #include "content/browser/background_fetch/background_fetch.pb.h" #include "content/browser/background_fetch/background_fetch_request_info.h"
diff --git a/content/browser/background_fetch/storage/match_requests_task.cc b/content/browser/background_fetch/storage/match_requests_task.cc index a5ce305..50eaffe3 100644 --- a/content/browser/background_fetch/storage/match_requests_task.cc +++ b/content/browser/background_fetch/storage/match_requests_task.cc
@@ -7,7 +7,7 @@ #include <memory> #include "base/barrier_closure.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/trace_event/trace_event.h" #include "content/browser/background_fetch/background_fetch_data_manager.h" #include "content/browser/background_fetch/storage/database_helpers.h"
diff --git a/content/browser/background_fetch/storage/match_requests_task.h b/content/browser/background_fetch/storage/match_requests_task.h index c94db1d..6da50eb 100644 --- a/content/browser/background_fetch/storage/match_requests_task.h +++ b/content/browser/background_fetch/storage/match_requests_task.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/scoped_refptr.h" #include "content/browser/background_fetch/background_fetch.pb.h" #include "content/browser/background_fetch/background_fetch_request_match_params.h"
diff --git a/content/browser/background_fetch/storage/start_next_pending_request_task.cc b/content/browser/background_fetch/storage/start_next_pending_request_task.cc index 8ecfaa4..936f95c1 100644 --- a/content/browser/background_fetch/storage/start_next_pending_request_task.cc +++ b/content/browser/background_fetch/storage/start_next_pending_request_task.cc
@@ -4,7 +4,7 @@ #include "content/browser/background_fetch/storage/start_next_pending_request_task.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/guid.h" #include "content/browser/background_fetch/storage/database_helpers.h" #include "content/browser/service_worker/service_worker_context_wrapper.h"
diff --git a/content/browser/background_fetch/storage/start_next_pending_request_task.h b/content/browser/background_fetch/storage/start_next_pending_request_task.h index 94820c0..5fd2ff9 100644 --- a/content/browser/background_fetch/storage/start_next_pending_request_task.h +++ b/content/browser/background_fetch/storage/start_next_pending_request_task.h
@@ -5,7 +5,7 @@ #ifndef CONTENT_BROWSER_BACKGROUND_FETCH_STORAGE_START_NEXT_PENDING_REQUEST_TASK_H_ #define CONTENT_BROWSER_BACKGROUND_FETCH_STORAGE_START_NEXT_PENDING_REQUEST_TASK_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "content/browser/background_fetch/background_fetch.pb.h" #include "content/browser/background_fetch/background_fetch_request_info.h" #include "content/browser/background_fetch/storage/database_task.h"
diff --git a/content/browser/background_sync/background_sync_base_browsertest.h b/content/browser/background_sync/background_sync_base_browsertest.h index 41a08c69..875c94d 100644 --- a/content/browser/background_sync/background_sync_base_browsertest.h +++ b/content/browser/background_sync/background_sync_base_browsertest.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h" #include "base/task/single_thread_task_runner.h"
diff --git a/content/browser/background_sync/background_sync_context_impl.cc b/content/browser/background_sync/background_sync_context_impl.cc index 29d8b0c..b1c4e27 100644 --- a/content/browser/background_sync/background_sync_context_impl.cc +++ b/content/browser/background_sync/background_sync_context_impl.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/task/single_thread_task_runner.h" #include "base/task/task_traits.h" #include "build/build_config.h"
diff --git a/content/browser/background_sync/background_sync_launcher.cc b/content/browser/background_sync/background_sync_launcher.cc index 0617ab3..5bb1e360 100644 --- a/content/browser/background_sync/background_sync_launcher.cc +++ b/content/browser/background_sync/background_sync_launcher.cc
@@ -8,8 +8,8 @@ #include <utility> #include "base/barrier_closure.h" -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/time/time.h" #include "build/build_config.h" #include "content/browser/background_sync/background_sync_context_impl.h"
diff --git a/content/browser/background_sync/background_sync_launcher.h b/content/browser/background_sync/background_sync_launcher.h index e4228cd..0491971 100644 --- a/content/browser/background_sync/background_sync_launcher.h +++ b/content/browser/background_sync/background_sync_launcher.h
@@ -5,7 +5,7 @@ #ifndef CONTENT_BROWSER_BACKGROUND_SYNC_BACKGROUND_SYNC_LAUNCHER_H_ #define CONTENT_BROWSER_BACKGROUND_SYNC_BACKGROUND_SYNC_LAUNCHER_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/lazy_instance.h" #include "base/time/time.h" #include "build/build_config.h"
diff --git a/content/browser/background_sync/background_sync_launcher_unittest.cc b/content/browser/background_sync/background_sync_launcher_unittest.cc index b99aab1..2483c8c 100644 --- a/content/browser/background_sync/background_sync_launcher_unittest.cc +++ b/content/browser/background_sync/background_sync_launcher_unittest.cc
@@ -7,7 +7,7 @@ #include <map> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/test/bind.h" #include "base/test/task_environment.h"
diff --git a/content/browser/background_sync/background_sync_manager.cc b/content/browser/background_sync/background_sync_manager.cc index c5d2c9d..2482be5 100644 --- a/content/browser/background_sync/background_sync_manager.cc +++ b/content/browser/background_sync/background_sync_manager.cc
@@ -8,9 +8,9 @@ #include <utility> #include "base/barrier_closure.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/memory/ptr_util.h" #include "base/strings/string_number_conversions.h"
diff --git a/content/browser/background_sync/background_sync_manager.h b/content/browser/background_sync/background_sync_manager.h index f966428..00f4fad 100644 --- a/content/browser/background_sync/background_sync_manager.h +++ b/content/browser/background_sync/background_sync_manager.h
@@ -14,8 +14,8 @@ #include <utility> #include <vector> -#include "base/callback_forward.h" #include "base/cancelable_callback.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/sequence_checker.h"
diff --git a/content/browser/background_sync/background_sync_manager_unittest.cc b/content/browser/background_sync/background_sync_manager_unittest.cc index 0c38dca..715def1 100644 --- a/content/browser/background_sync/background_sync_manager_unittest.cc +++ b/content/browser/background_sync/background_sync_manager_unittest.cc
@@ -10,10 +10,10 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/check.h" #include "base/containers/cxx20_erase.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/memory/raw_ptr.h" #include "base/metrics/field_trial.h"
diff --git a/content/browser/background_sync/background_sync_network_observer.h b/content/browser/background_sync/background_sync_network_observer.h index 10557dc..3a2eca7 100644 --- a/content/browser/background_sync/background_sync_network_observer.h +++ b/content/browser/background_sync/background_sync_network_observer.h
@@ -5,7 +5,7 @@ #ifndef CONTENT_BROWSER_BACKGROUND_SYNC_BACKGROUND_SYNC_NETWORK_OBSERVER_H_ #define CONTENT_BROWSER_BACKGROUND_SYNC_BACKGROUND_SYNC_NETWORK_OBSERVER_H_ -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/sequence_checker.h"
diff --git a/content/browser/background_sync/background_sync_network_observer_unittest.cc b/content/browser/background_sync/background_sync_network_observer_unittest.cc index c5de594..6616feb 100644 --- a/content/browser/background_sync/background_sync_network_observer_unittest.cc +++ b/content/browser/background_sync/background_sync_network_observer_unittest.cc
@@ -4,7 +4,7 @@ #include "content/browser/background_sync/background_sync_network_observer.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "content/public/test/browser_task_environment.h" #include "services/network/test/test_network_connection_tracker.h"
diff --git a/content/browser/background_sync/background_sync_op_scheduler.cc b/content/browser/background_sync/background_sync_op_scheduler.cc index 16d3abc..71127e0 100644 --- a/content/browser/background_sync/background_sync_op_scheduler.cc +++ b/content/browser/background_sync/background_sync_op_scheduler.cc
@@ -6,9 +6,9 @@ #include <string> -#include "base/bind.h" #include "base/check_op.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/metrics/field_trial_params.h" #include "base/metrics/histogram_macros.h"
diff --git a/content/browser/background_sync/background_sync_op_scheduler.h b/content/browser/background_sync/background_sync_op_scheduler.h index 2ea9c145..b05819f 100644 --- a/content/browser/background_sync/background_sync_op_scheduler.h +++ b/content/browser/background_sync/background_sync_op_scheduler.h
@@ -8,10 +8,10 @@ #include <map> #include <vector> -#include "base/bind.h" -#include "base/callback.h" #include "base/containers/queue.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "base/task/sequenced_task_runner.h" #include "content/common/content_export.h"
diff --git a/content/browser/background_sync/background_sync_op_scheduler_unittest.cc b/content/browser/background_sync/background_sync_op_scheduler_unittest.cc index fa944a6..708077e 100644 --- a/content/browser/background_sync/background_sync_op_scheduler_unittest.cc +++ b/content/browser/background_sync/background_sync_op_scheduler_unittest.cc
@@ -4,8 +4,8 @@ #include "content/browser/background_sync/background_sync_op_scheduler.h" -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/task/single_thread_task_runner.h"
diff --git a/content/browser/background_sync/background_sync_proxy.cc b/content/browser/background_sync/background_sync_proxy.cc index 4498ec4..b2615a8 100644 --- a/content/browser/background_sync/background_sync_proxy.cc +++ b/content/browser/background_sync/background_sync_proxy.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/task/task_traits.h" #include "content/browser/background_sync/background_sync_scheduler.h"
diff --git a/content/browser/background_sync/background_sync_proxy.h b/content/browser/background_sync/background_sync_proxy.h index d91656f..b1b1a93 100644 --- a/content/browser/background_sync/background_sync_proxy.h +++ b/content/browser/background_sync/background_sync_proxy.h
@@ -8,7 +8,7 @@ #include <memory> #include <set> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/sequence_checker.h" #include "base/time/time.h" #include "content/common/content_export.h"
diff --git a/content/browser/background_sync/background_sync_registration_helper.h b/content/browser/background_sync/background_sync_registration_helper.h index 694d4ce..23229c188 100644 --- a/content/browser/background_sync/background_sync_registration_helper.h +++ b/content/browser/background_sync/background_sync_registration_helper.h
@@ -7,7 +7,7 @@ #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "content/browser/background_sync/background_sync_status.h"
diff --git a/content/browser/background_sync/background_sync_scheduler_unittest.cc b/content/browser/background_sync/background_sync_scheduler_unittest.cc index de06527b..12305d8 100644 --- a/content/browser/background_sync/background_sync_scheduler_unittest.cc +++ b/content/browser/background_sync/background_sync_scheduler_unittest.cc
@@ -7,8 +7,8 @@ #include <map> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/strings/string_number_conversions.h"
diff --git a/content/browser/background_sync/background_sync_service_impl_test_harness.cc b/content/browser/background_sync/background_sync_service_impl_test_harness.cc index f3d52e55..5a47483 100644 --- a/content/browser/background_sync/background_sync_service_impl_test_harness.cc +++ b/content/browser/background_sync/background_sync_service_impl_test_harness.cc
@@ -7,8 +7,8 @@ #include <stdint.h> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "content/browser/background_sync/background_sync_manager.h" #include "content/browser/background_sync/background_sync_network_observer.h"
diff --git a/content/browser/background_sync/one_shot_background_sync_browsertest.cc b/content/browser/background_sync/one_shot_background_sync_browsertest.cc index e0af9390..c2357b82 100644 --- a/content/browser/background_sync/one_shot_background_sync_browsertest.cc +++ b/content/browser/background_sync/one_shot_background_sync_browsertest.cc
@@ -4,7 +4,7 @@ #include "content/browser/background_sync/background_sync_base_browsertest.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/strings/string_split.h" #include "base/task/single_thread_task_runner.h"
diff --git a/content/browser/background_sync/one_shot_background_sync_service_impl.cc b/content/browser/background_sync/one_shot_background_sync_service_impl.cc index 163a31e4..ce31a21 100644 --- a/content/browser/background_sync/one_shot_background_sync_service_impl.cc +++ b/content/browser/background_sync/one_shot_background_sync_service_impl.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/weak_ptr.h" #include "content/browser/background_sync/background_sync_context_impl.h" #include "content/browser/service_worker/service_worker_context_wrapper.h"
diff --git a/content/browser/background_sync/periodic_background_sync_service_impl.cc b/content/browser/background_sync/periodic_background_sync_service_impl.cc index d22c6a9..248cf7e7 100644 --- a/content/browser/background_sync/periodic_background_sync_service_impl.cc +++ b/content/browser/background_sync/periodic_background_sync_service_impl.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "content/browser/background_sync/background_sync_context_impl.h" #include "content/browser/service_worker/service_worker_context_wrapper.h" #include "content/public/browser/browser_thread.h"
diff --git a/content/browser/bad_message.cc b/content/browser/bad_message.cc index d1ecafe..e8abd6ae 100644 --- a/content/browser/bad_message.cc +++ b/content/browser/bad_message.cc
@@ -4,8 +4,8 @@ #include "content/browser/bad_message.h" -#include "base/bind.h" #include "base/debug/dump_without_crashing.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/metrics/histogram_functions.h" #include "base/strings/string_number_conversions.h"
diff --git a/content/browser/battery_monitor_browsertest.cc b/content/browser/battery_monitor_browsertest.cc index 63939c9..03a5b91 100644 --- a/content/browser/battery_monitor_browsertest.cc +++ b/content/browser/battery_monitor_browsertest.cc
@@ -4,8 +4,8 @@ #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "content/browser/browser_interface_binders.h" #include "content/browser/renderer_host/render_process_host_impl.h" #include "content/public/browser/web_contents.h"
diff --git a/content/browser/blob_storage/blob_registry_wrapper.cc b/content/browser/blob_storage/blob_registry_wrapper.cc index 6ab9258..bc02f77 100644 --- a/content/browser/blob_storage/blob_registry_wrapper.cc +++ b/content/browser/blob_storage/blob_registry_wrapper.cc
@@ -4,8 +4,8 @@ #include "content/browser/blob_storage/blob_registry_wrapper.h" -#include "base/bind.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "content/browser/blob_storage/chrome_blob_storage_context.h" #include "content/browser/child_process_security_policy_impl.h" #include "content/public/browser/browser_task_traits.h"
diff --git a/content/browser/blob_storage/blob_storage_browsertest.cc b/content/browser/blob_storage/blob_storage_browsertest.cc index fabcf4a9b..35e0223b 100644 --- a/content/browser/blob_storage/blob_storage_browsertest.cc +++ b/content/browser/blob_storage/blob_storage_browsertest.cc
@@ -4,7 +4,7 @@ #include <functional> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/test/bind.h" #include "content/browser/blob_storage/chrome_blob_storage_context.h"
diff --git a/content/browser/blob_storage/blob_url_unittest.cc b/content/browser/blob_storage/blob_url_unittest.cc index 885be34..808c5a4 100644 --- a/content/browser/blob_storage/blob_url_unittest.cc +++ b/content/browser/blob_storage/blob_url_unittest.cc
@@ -7,10 +7,10 @@ #include <limits> #include <memory> -#include "base/bind.h" #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" #include "base/memory/ref_counted.h" #include "base/numerics/safe_conversions.h" #include "base/run_loop.h"
diff --git a/content/browser/blob_storage/chrome_blob_storage_context.cc b/content/browser/blob_storage/chrome_blob_storage_context.cc index 133e047..3bfd99c 100644 --- a/content/browser/blob_storage/chrome_blob_storage_context.cc +++ b/content/browser/blob_storage/chrome_blob_storage_context.cc
@@ -7,11 +7,11 @@ #include <memory> #include <utility> -#include "base/bind.h" #include "base/feature_list.h" #include "base/files/file.h" #include "base/files/file_enumerator.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/guid.h" #include "base/supports_user_data.h" #include "base/task/single_thread_task_runner.h"
diff --git a/content/browser/bluetooth/bluetooth_adapter_factory_wrapper.cc b/content/browser/bluetooth/bluetooth_adapter_factory_wrapper.cc index 9217618..8a1ac9c 100644 --- a/content/browser/bluetooth/bluetooth_adapter_factory_wrapper.cc +++ b/content/browser/bluetooth/bluetooth_adapter_factory_wrapper.cc
@@ -8,8 +8,8 @@ #include <utility> -#include "base/bind.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/no_destructor.h" #include "base/task/single_thread_task_runner.h"
diff --git a/content/browser/bluetooth/bluetooth_device_chooser_controller.cc b/content/browser/bluetooth/bluetooth_device_chooser_controller.cc index 8270fd1..b40acfd 100644 --- a/content/browser/bluetooth/bluetooth_device_chooser_controller.cc +++ b/content/browser/bluetooth/bluetooth_device_chooser_controller.cc
@@ -8,10 +8,10 @@ #include <string> #include <unordered_set> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/containers/contains.h" #include "base/containers/flat_set.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/metrics/histogram_macros.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h"
diff --git a/content/browser/bluetooth/bluetooth_device_scanning_prompt_controller.cc b/content/browser/bluetooth/bluetooth_device_scanning_prompt_controller.cc index 21ed716..590dd6f 100644 --- a/content/browser/bluetooth/bluetooth_device_scanning_prompt_controller.cc +++ b/content/browser/bluetooth/bluetooth_device_scanning_prompt_controller.cc
@@ -4,8 +4,8 @@ #include "content/browser/bluetooth/bluetooth_device_scanning_prompt_controller.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "content/browser/bluetooth/web_bluetooth_service_impl.h" #include "content/public/browser/bluetooth_delegate.h" #include "content/public/browser/content_browser_client.h"
diff --git a/content/browser/bluetooth/web_bluetooth_pairing_manager_delegate.h b/content/browser/bluetooth/web_bluetooth_pairing_manager_delegate.h index 1b2b738..f3f93c6b 100644 --- a/content/browser/bluetooth/web_bluetooth_pairing_manager_delegate.h +++ b/content/browser/bluetooth/web_bluetooth_pairing_manager_delegate.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "content/public/browser/bluetooth_delegate.h" #include "device/bluetooth/bluetooth_device.h" #include "mojo/public/cpp/bindings/associated_remote.h"
diff --git a/content/browser/bluetooth/web_bluetooth_pairing_manager_impl.cc b/content/browser/bluetooth/web_bluetooth_pairing_manager_impl.cc index a986a645..7050584 100644 --- a/content/browser/bluetooth/web_bluetooth_pairing_manager_impl.cc +++ b/content/browser/bluetooth/web_bluetooth_pairing_manager_impl.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "content/browser/bluetooth/web_bluetooth_pairing_manager_delegate.h"
diff --git a/content/browser/bluetooth/web_bluetooth_service_impl.cc b/content/browser/bluetooth/web_bluetooth_service_impl.cc index 4e5c308..afb4a5de 100644 --- a/content/browser/bluetooth/web_bluetooth_service_impl.cc +++ b/content/browser/bluetooth/web_bluetooth_service_impl.cc
@@ -13,11 +13,11 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/containers/contains.h" #include "base/containers/cxx20_erase.h" #include "base/containers/queue.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/ranges/algorithm.h" #include "base/strings/string_util.h"
diff --git a/content/browser/bluetooth/web_bluetooth_service_impl.h b/content/browser/bluetooth/web_bluetooth_service_impl.h index 10c5971..04d8445 100644 --- a/content/browser/bluetooth/web_bluetooth_service_impl.h +++ b/content/browser/bluetooth/web_bluetooth_service_impl.h
@@ -10,7 +10,7 @@ #include <unordered_map> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/gtest_prod_util.h" #include "base/scoped_observation.h" #include "build/build_config.h"
diff --git a/content/browser/bluetooth/web_bluetooth_service_impl_browsertest.cc b/content/browser/bluetooth/web_bluetooth_service_impl_browsertest.cc index 9cffdd4..0f22434 100644 --- a/content/browser/bluetooth/web_bluetooth_service_impl_browsertest.cc +++ b/content/browser/bluetooth/web_bluetooth_service_impl_browsertest.cc
@@ -4,9 +4,9 @@ #include "content/browser/bluetooth/web_bluetooth_service_impl.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "build/build_config.h"
diff --git a/content/browser/broadcast_channel/broadcast_channel_service.cc b/content/browser/broadcast_channel/broadcast_channel_service.cc index cba31df..385df63 100644 --- a/content/browser/broadcast_channel/broadcast_channel_service.cc +++ b/content/browser/broadcast_channel/broadcast_channel_service.cc
@@ -3,7 +3,7 @@ // found in the LICENSE file. #include "content/browser/broadcast_channel/broadcast_channel_service.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "content/browser/broadcast_channel/broadcast_channel_provider.h" #include "mojo/public/cpp/bindings/associated_receiver.h"
diff --git a/content/browser/browser_associated_interface_unittest.cc b/content/browser/browser_associated_interface_unittest.cc index e5373749..d0554ca 100644 --- a/content/browser/browser_associated_interface_unittest.cc +++ b/content/browser/browser_associated_interface_unittest.cc
@@ -6,7 +6,7 @@ #include <string> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ref_counted.h" #include "base/message_loop/message_pump_type.h" #include "base/pickle.h"
diff --git a/content/browser/browser_child_process_host_impl.cc b/content/browser/browser_child_process_host_impl.cc index c34a139..e49db202 100644 --- a/content/browser/browser_child_process_host_impl.cc +++ b/content/browser/browser_child_process_host_impl.cc
@@ -7,12 +7,12 @@ #include <memory> #include "base/base_switches.h" -#include "base/bind.h" #include "base/clang_profiling_buildflags.h" #include "base/command_line.h" #include "base/debug/dump_without_crashing.h" #include "base/feature_list.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/lazy_instance.h" #include "base/logging.h" #include "base/metrics/histogram_functions.h"
diff --git a/content/browser/browser_child_process_host_impl_receiver_bindings.cc b/content/browser/browser_child_process_host_impl_receiver_bindings.cc index fc7e70b..7e1df61c 100644 --- a/content/browser/browser_child_process_host_impl_receiver_bindings.cc +++ b/content/browser/browser_child_process_host_impl_receiver_bindings.cc
@@ -6,7 +6,7 @@ #include "content/browser/browser_child_process_host_impl.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/no_destructor.h" #include "base/task/thread_pool.h" #include "build/build_config.h"
diff --git a/content/browser/browser_child_process_observer_browsertest.cc b/content/browser/browser_child_process_observer_browsertest.cc index d67c215f..ddcc16e3 100644 --- a/content/browser/browser_child_process_observer_browsertest.cc +++ b/content/browser/browser_child_process_observer_browsertest.cc
@@ -4,7 +4,7 @@ #include "content/public/browser/browser_child_process_observer.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "build/build_config.h" #include "content/browser/browser_child_process_host_impl.h"
diff --git a/content/browser/browser_context.cc b/content/browser/browser_context.cc index 962c427c..44d8c3a 100644 --- a/content/browser/browser_context.cc +++ b/content/browser/browser_context.cc
@@ -15,10 +15,10 @@ #include <vector> #include "base/base64.h" -#include "base/bind.h" #include "base/check_op.h" #include "base/command_line.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/lazy_instance.h" #include "base/memory/ptr_util.h" #include "base/memory/weak_ptr.h"
diff --git a/content/browser/browser_interface_binders.cc b/content/browser/browser_interface_binders.cc index 189478c..75fe2c7d 100644 --- a/content/browser/browser_interface_binders.cc +++ b/content/browser/browser_interface_binders.cc
@@ -4,11 +4,11 @@ #include "content/browser/browser_interface_binders.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/check_op.h" #include "base/command_line.h" #include "base/feature_list.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/no_destructor.h" #include "base/task/thread_pool.h" #include "build/branding_buildflags.h"
diff --git a/content/browser/browser_interface_binders.h b/content/browser/browser_interface_binders.h index b23d66e7..a9817586 100644 --- a/content/browser/browser_interface_binders.h +++ b/content/browser/browser_interface_binders.h
@@ -5,7 +5,7 @@ #ifndef CONTENT_BROWSER_BROWSER_INTERFACE_BINDERS_H_ #define CONTENT_BROWSER_BROWSER_INTERFACE_BINDERS_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "content/common/content_export.h" #include "mojo/public/cpp/bindings/binder_map.h" #include "services/device/public/mojom/battery_monitor.mojom-forward.h"
diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc index 11ab7c8a..4b934cbf 100644 --- a/content/browser/browser_main_loop.cc +++ b/content/browser/browser_main_loop.cc
@@ -14,9 +14,9 @@ #include <vector> #include "base/base_switches.h" -#include "base/bind.h" #include "base/command_line.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/logging.h" #include "base/memory/memory_pressure_monitor.h"
diff --git a/content/browser/browser_main_loop.h b/content/browser/browser_main_loop.h index 55cedd7..d028eb47 100644 --- a/content/browser/browser_main_loop.h +++ b/content/browser/browser_main_loop.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/gtest_prod_util.h" #include "base/memory/raw_ref.h" #include "base/memory/ref_counted.h"
diff --git a/content/browser/browser_plugin/browser_plugin_embedder.cc b/content/browser/browser_plugin/browser_plugin_embedder.cc index 2a6c896..c445afc0ab 100644 --- a/content/browser/browser_plugin/browser_plugin_embedder.cc +++ b/content/browser/browser_plugin/browser_plugin_embedder.cc
@@ -4,7 +4,7 @@ #include "content/browser/browser_plugin/browser_plugin_embedder.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "content/browser/browser_plugin/browser_plugin_guest.h" #include "content/browser/web_contents/web_contents_impl.h" #include "content/public/browser/browser_context.h"
diff --git a/content/browser/browser_process_io_thread.cc b/content/browser/browser_process_io_thread.cc index e4231ea..7cb9b34 100644 --- a/content/browser/browser_process_io_thread.cc +++ b/content/browser/browser_process_io_thread.cc
@@ -4,11 +4,11 @@ #include "content/browser/browser_process_io_thread.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/clang_profiling_buildflags.h" #include "base/compiler_specific.h" #include "base/debug/alias.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/metrics/histogram_macros.h" #include "base/threading/hang_watcher.h" #include "base/threading/thread_restrictions.h"
diff --git a/content/browser/browser_thread_browsertest.cc b/content/browser/browser_thread_browsertest.cc index f79d7f9..5d01c54 100644 --- a/content/browser/browser_thread_browsertest.cc +++ b/content/browser/browser_thread_browsertest.cc
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h"
diff --git a/content/browser/browser_thread_impl.cc b/content/browser/browser_thread_impl.cc index 6bba830..2565fe7 100644 --- a/content/browser/browser_thread_impl.cc +++ b/content/browser/browser_thread_impl.cc
@@ -8,10 +8,10 @@ #include <utility> #include "base/atomicops.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/check_op.h" #include "base/compiler_specific.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/no_destructor.h" #include "base/notreached.h" #include "base/sequence_checker.h"
diff --git a/content/browser/browser_thread_unittest.cc b/content/browser/browser_thread_unittest.cc index e200bcc5..864e41b9 100644 --- a/content/browser/browser_thread_unittest.cc +++ b/content/browser/browser_thread_unittest.cc
@@ -6,9 +6,9 @@ #include <memory> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/memory/raw_ptr.h" #include "base/message_loop/message_pump.h"
diff --git a/content/browser/browsing_data/browsing_data_browsertest_utils.cc b/content/browser/browsing_data/browsing_data_browsertest_utils.cc index 3ab2a502..738c0fd 100644 --- a/content/browser/browsing_data/browsing_data_browsertest_utils.cc +++ b/content/browser/browsing_data/browsing_data_browsertest_utils.cc
@@ -9,8 +9,8 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "components/network_session_configurator/common/network_switches.h" #include "content/browser/browsing_data/browsing_data_test_utils.h"
diff --git a/content/browser/browsing_data/browsing_data_filter_builder_impl.cc b/content/browser/browsing_data/browsing_data_filter_builder_impl.cc index 17f069a0..2fd734d 100644 --- a/content/browser/browsing_data/browsing_data_filter_builder_impl.cc +++ b/content/browser/browsing_data/browsing_data_filter_builder_impl.cc
@@ -7,9 +7,9 @@ #include <string> #include <vector> -#include "base/bind.h" -#include "base/callback.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "net/base/registry_controlled_domains/registry_controlled_domain.h" #include "services/network/public/mojom/network_context.mojom.h" #include "third_party/blink/public/common/storage_key/storage_key.h"
diff --git a/content/browser/browsing_data/browsing_data_filter_builder_impl_unittest.cc b/content/browser/browsing_data/browsing_data_filter_builder_impl_unittest.cc index aea228c8..ca02b37b 100644 --- a/content/browser/browsing_data/browsing_data_filter_builder_impl_unittest.cc +++ b/content/browser/browsing_data/browsing_data_filter_builder_impl_unittest.cc
@@ -9,7 +9,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/test/scoped_feature_list.h" #include "net/cookies/canonical_cookie.h" #include "net/cookies/cookie_deletion_info.h"
diff --git a/content/browser/browsing_data/browsing_data_remover_impl.cc b/content/browser/browsing_data/browsing_data_remover_impl.cc index f41e06d..2551356a 100644 --- a/content/browser/browsing_data/browsing_data_remover_impl.cc +++ b/content/browser/browsing_data/browsing_data_remover_impl.cc
@@ -9,13 +9,12 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/containers/contains.h" #include "base/feature_list.h" #include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/functional/callback_forward.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/metrics/histogram_functions.h" #include "base/metrics/histogram_macros.h"
diff --git a/content/browser/browsing_data/browsing_data_remover_impl_browsertest.cc b/content/browser/browsing_data/browsing_data_remover_impl_browsertest.cc index f0140cb..fddf036 100644 --- a/content/browser/browsing_data/browsing_data_remover_impl_browsertest.cc +++ b/content/browser/browsing_data/browsing_data_remover_impl_browsertest.cc
@@ -7,9 +7,9 @@ #include <memory> -#include "base/bind.h" #include "base/containers/contains.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/strings/stringprintf.h" #include "base/test/bind.h" #include "base/test/scoped_feature_list.h"
diff --git a/content/browser/browsing_data/browsing_data_remover_impl_unittest.cc b/content/browser/browsing_data/browsing_data_remover_impl_unittest.cc index fca6662..51bb155 100644 --- a/content/browser/browsing_data/browsing_data_remover_impl_unittest.cc +++ b/content/browser/browsing_data/browsing_data_remover_impl_unittest.cc
@@ -14,10 +14,10 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h"
diff --git a/content/browser/browsing_data/browsing_data_test_utils.cc b/content/browser/browsing_data/browsing_data_test_utils.cc index 166ce2cf..178ce3c8 100644 --- a/content/browser/browsing_data/browsing_data_test_utils.cc +++ b/content/browser/browsing_data/browsing_data_test_utils.cc
@@ -7,7 +7,7 @@ #include <string> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/test/bind.h" #include "content/public/browser/browser_context.h"
diff --git a/content/browser/browsing_data/clear_site_data_handler.cc b/content/browser/browsing_data/clear_site_data_handler.cc index 00456a95..ec04c79a 100644 --- a/content/browser/browsing_data/clear_site_data_handler.cc +++ b/content/browser/browsing_data/clear_site_data_handler.cc
@@ -4,8 +4,8 @@ #include "content/browser/browsing_data/clear_site_data_handler.h" -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_macros.h" #include "base/strings/string_split.h" #include "base/strings/string_util.h"
diff --git a/content/browser/browsing_data/clear_site_data_handler.h b/content/browser/browsing_data/clear_site_data_handler.h index 037daed..336d3b3 100644 --- a/content/browser/browsing_data/clear_site_data_handler.h +++ b/content/browser/browsing_data/clear_site_data_handler.h
@@ -9,7 +9,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/time/time.h" #include "content/common/content_export.h" #include "net/cookies/cookie_partition_key.h"
diff --git a/content/browser/browsing_data/clear_site_data_handler_browsertest.cc b/content/browser/browsing_data/clear_site_data_handler_browsertest.cc index e31141f3..3b4a7414 100644 --- a/content/browser/browsing_data/clear_site_data_handler_browsertest.cc +++ b/content/browser/browsing_data/clear_site_data_handler_browsertest.cc
@@ -6,11 +6,10 @@ #include <memory> #include <vector> -#include "base/bind.h" -#include "base/callback.h" #include "base/command_line.h" #include "base/feature_list.h" #include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/run_loop.h" #include "base/strings/escape.h" #include "base/strings/stringprintf.h"
diff --git a/content/browser/browsing_data/clear_site_data_handler_unittest.cc b/content/browser/browsing_data/clear_site_data_handler_unittest.cc index 27a46cb9..6fd22fb 100644 --- a/content/browser/browsing_data/clear_site_data_handler_unittest.cc +++ b/content/browser/browsing_data/clear_site_data_handler_unittest.cc
@@ -7,9 +7,9 @@ #include <memory> #include "base/base_switches.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h" #include "base/run_loop.h"
diff --git a/content/browser/browsing_data/clear_site_data_utils.cc b/content/browser/browsing_data/clear_site_data_utils.cc index 6fd5cc7..ab2bf7e 100644 --- a/content/browser/browsing_data/clear_site_data_utils.cc +++ b/content/browser/browsing_data/clear_site_data_utils.cc
@@ -4,7 +4,7 @@ #include "content/public/browser/clear_site_data_utils.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h"
diff --git a/content/browser/browsing_data/conditional_cache_deletion_helper.cc b/content/browser/browsing_data/conditional_cache_deletion_helper.cc index 59f58ca..0652f7b6 100644 --- a/content/browser/browsing_data/conditional_cache_deletion_helper.cc +++ b/content/browser/browsing_data/conditional_cache_deletion_helper.cc
@@ -4,8 +4,8 @@ #include "content/browser/browsing_data/conditional_cache_deletion_helper.h" -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/location.h" #include "base/sequence_checker.h" #include "base/task/single_thread_task_runner.h"
diff --git a/content/browser/browsing_data/conditional_cache_deletion_helper.h b/content/browser/browsing_data/conditional_cache_deletion_helper.h index 58d75b8..8f132a2b 100644 --- a/content/browser/browsing_data/conditional_cache_deletion_helper.h +++ b/content/browser/browsing_data/conditional_cache_deletion_helper.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/task/sequenced_task_runner_helpers.h" #include "net/base/completion_once_callback.h"
diff --git a/content/browser/browsing_data/conditional_cache_deletion_helper_browsertest.cc b/content/browser/browsing_data/conditional_cache_deletion_helper_browsertest.cc index 6bdb4ed..e517768 100644 --- a/content/browser/browsing_data/conditional_cache_deletion_helper_browsertest.cc +++ b/content/browser/browsing_data/conditional_cache_deletion_helper_browsertest.cc
@@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/string_number_conversions.h" #include "base/synchronization/waitable_event.h" #include "base/test/test_timeouts.h"
diff --git a/content/browser/browsing_data/same_site_data_remover_impl.cc b/content/browser/browsing_data/same_site_data_remover_impl.cc index e9de6ad3..6976588 100644 --- a/content/browser/browsing_data/same_site_data_remover_impl.cc +++ b/content/browser/browsing_data/same_site_data_remover_impl.cc
@@ -11,8 +11,8 @@ #include <vector> #include "base/barrier_closure.h" -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "content/public/browser/browser_context.h" #include "content/public/browser/browsing_data_filter_builder.h" #include "content/public/browser/same_site_data_remover.h"
diff --git a/content/browser/browsing_data/same_site_data_remover_impl.h b/content/browser/browsing_data/same_site_data_remover_impl.h index 69f2faf..271e1bf 100644 --- a/content/browser/browsing_data/same_site_data_remover_impl.h +++ b/content/browser/browsing_data/same_site_data_remover_impl.h
@@ -8,7 +8,7 @@ #include <set> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "content/common/content_export.h" #include "content/public/browser/browser_context.h"
diff --git a/content/browser/browsing_data/same_site_data_remover_impl_browsertest.cc b/content/browser/browsing_data/same_site_data_remover_impl_browsertest.cc index bc81d93..ae63eb1 100644 --- a/content/browser/browsing_data/same_site_data_remover_impl_browsertest.cc +++ b/content/browser/browsing_data/same_site_data_remover_impl_browsertest.cc
@@ -10,7 +10,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "content/browser/browsing_data/browsing_data_browsertest_utils.h" #include "content/browser/browsing_data/browsing_data_test_utils.h"
diff --git a/content/browser/browsing_data/same_site_data_remover_impl_unittest.cc b/content/browser/browsing_data/same_site_data_remover_impl_unittest.cc index 8e2d7da8..e16cf94 100644 --- a/content/browser/browsing_data/same_site_data_remover_impl_unittest.cc +++ b/content/browser/browsing_data/same_site_data_remover_impl_unittest.cc
@@ -8,8 +8,8 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/check.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/test/bind.h" #include "base/time/time.h"
diff --git a/content/browser/browsing_data/storage_bucket_clear_site_data_tester.cc b/content/browser/browsing_data/storage_bucket_clear_site_data_tester.cc index 6dee63f..ab435ce 100644 --- a/content/browser/browsing_data/storage_bucket_clear_site_data_tester.cc +++ b/content/browser/browsing_data/storage_bucket_clear_site_data_tester.cc
@@ -8,7 +8,7 @@ #include <string> #include <utility> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/task/sequenced_task_runner.h" #include "components/services/storage/public/cpp/buckets/bucket_info.h" #include "components/services/storage/public/cpp/quota_error_or.h"
diff --git a/content/browser/browsing_data/storage_partition_code_cache_data_remover.cc b/content/browser/browsing_data/storage_partition_code_cache_data_remover.cc index 37ba8b13..6dfbfae 100644 --- a/content/browser/browsing_data/storage_partition_code_cache_data_remover.cc +++ b/content/browser/browsing_data/storage_partition_code_cache_data_remover.cc
@@ -4,8 +4,8 @@ #include "content/browser/browsing_data/storage_partition_code_cache_data_remover.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/task/sequenced_task_runner_helpers.h" #include "base/task/single_thread_task_runner.h"
diff --git a/content/browser/browsing_data/storage_partition_code_cache_data_remover.h b/content/browser/browsing_data/storage_partition_code_cache_data_remover.h index 858f740..2c10cd9 100644 --- a/content/browser/browsing_data/storage_partition_code_cache_data_remover.h +++ b/content/browser/browsing_data/storage_partition_code_cache_data_remover.h
@@ -7,7 +7,7 @@ #include <stdint.h> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/task/sequenced_task_runner_helpers.h" #include "base/time/time.h" #include "net/base/completion_once_callback.h"
diff --git a/content/browser/browsing_topics/browsing_topics_document_host.cc b/content/browser/browsing_topics/browsing_topics_document_host.cc index fcee02e3..aa91b9782 100644 --- a/content/browser/browsing_topics/browsing_topics_document_host.cc +++ b/content/browser/browsing_topics/browsing_topics_document_host.cc
@@ -4,7 +4,7 @@ #include "content/browser/browsing_topics/browsing_topics_document_host.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "content/public/browser/browser_context.h" #include "content/public/browser/content_browser_client.h" #include "content/public/browser/document_service.h"
diff --git a/content/browser/browsing_topics/browsing_topics_site_data_manager_impl_unittest.cc b/content/browser/browsing_topics/browsing_topics_site_data_manager_impl_unittest.cc index fb1b966..86b5f0a6 100644 --- a/content/browser/browsing_topics/browsing_topics_site_data_manager_impl_unittest.cc +++ b/content/browser/browsing_topics/browsing_topics_site_data_manager_impl_unittest.cc
@@ -4,8 +4,8 @@ #include "content/browser/browsing_topics/browsing_topics_site_data_manager_impl.h" -#include "base/bind.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/test/bind.h" #include "base/time/time.h"
diff --git a/content/browser/browsing_topics/browsing_topics_site_data_storage_unittest.cc b/content/browser/browsing_topics/browsing_topics_site_data_storage_unittest.cc index 3de800704..6121ba1 100644 --- a/content/browser/browsing_topics/browsing_topics_site_data_storage_unittest.cc +++ b/content/browser/browsing_topics/browsing_topics_site_data_storage_unittest.cc
@@ -7,10 +7,10 @@ #include <functional> #include <memory> -#include "base/bind.h" #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/path_service.h" #include "base/run_loop.h"
diff --git a/content/browser/browsing_topics/browsing_topics_url_loader.cc b/content/browser/browsing_topics/browsing_topics_url_loader.cc index 63d5b9cb..a10e4ab 100644 --- a/content/browser/browsing_topics/browsing_topics_url_loader.cc +++ b/content/browser/browsing_topics/browsing_topics_url_loader.cc
@@ -4,7 +4,7 @@ #include "content/browser/browsing_topics/browsing_topics_url_loader.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "content/browser/browsing_topics/header_util.h" #include "content/browser/renderer_host/render_frame_host_impl.h" #include "content/public/browser/content_browser_client.h"
diff --git a/content/browser/browsing_topics/browsing_topics_url_loader.h b/content/browser/browsing_topics/browsing_topics_url_loader.h index b05ef695..184fb7ee 100644 --- a/content/browser/browsing_topics/browsing_topics_url_loader.h +++ b/content/browser/browsing_topics/browsing_topics_url_loader.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "content/public/browser/weak_document_ptr.h" #include "mojo/public/cpp/bindings/pending_remote.h"
diff --git a/content/browser/browsing_topics/browsing_topics_url_loader_service.cc b/content/browser/browsing_topics/browsing_topics_url_loader_service.cc index 4b36c0d..f7de513 100644 --- a/content/browser/browsing_topics/browsing_topics_url_loader_service.cc +++ b/content/browser/browsing_topics/browsing_topics_url_loader_service.cc
@@ -4,7 +4,7 @@ #include "content/browser/browsing_topics/browsing_topics_url_loader_service.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "content/browser/browsing_topics/browsing_topics_url_loader.h" #include "content/public/browser/content_browser_client.h" #include "mojo/public/cpp/bindings/message.h"
diff --git a/content/browser/browsing_topics/browsing_topics_url_loader_service.h b/content/browser/browsing_topics/browsing_topics_url_loader_service.h index 64fefd77..efd8070 100644 --- a/content/browser/browsing_topics/browsing_topics_url_loader_service.h +++ b/content/browser/browsing_topics/browsing_topics_url_loader_service.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h" #include "content/public/browser/browser_thread.h"
diff --git a/content/browser/buckets/bucket_host.cc b/content/browser/buckets/bucket_host.cc index aa729c5..16fdeae 100644 --- a/content/browser/buckets/bucket_host.cc +++ b/content/browser/buckets/bucket_host.cc
@@ -4,7 +4,7 @@ #include "content/browser/buckets/bucket_host.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/task/sequenced_task_runner.h" #include "components/services/storage/privileged/mojom/indexed_db_control.mojom.h" #include "content/browser/buckets/bucket_context.h"
diff --git a/content/browser/byte_stream.cc b/content/browser/byte_stream.cc index 84a6d70..810638d 100644 --- a/content/browser/byte_stream.cc +++ b/content/browser/byte_stream.cc
@@ -8,8 +8,8 @@ #include <set> #include <utility> -#include "base/bind.h" #include "base/containers/circular_deque.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h"
diff --git a/content/browser/byte_stream.h b/content/browser/byte_stream.h index c9b0768d..2ab12fe 100644 --- a/content/browser/byte_stream.h +++ b/content/browser/byte_stream.h
@@ -9,7 +9,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/ref_counted.h" #include "content/common/content_export.h" #include "content/public/browser/browser_task_traits.h"
diff --git a/content/browser/byte_stream_unittest.cc b/content/browser/byte_stream_unittest.cc index fa2de82..2e4a33b 100644 --- a/content/browser/byte_stream_unittest.cc +++ b/content/browser/byte_stream_unittest.cc
@@ -8,9 +8,9 @@ #include <limits> -#include "base/bind.h" -#include "base/callback.h" #include "base/containers/circular_deque.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/ref_counted.h" #include "base/run_loop.h" #include "base/task/single_thread_task_runner.h"
diff --git a/content/browser/cache_storage/cache_storage.cc b/content/browser/cache_storage/cache_storage.cc index 88fe5ba..fcd718e8 100644 --- a/content/browser/cache_storage/cache_storage.cc +++ b/content/browser/cache_storage/cache_storage.cc
@@ -13,11 +13,11 @@ #include <vector> #include "base/barrier_closure.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/containers/contains.h" #include "base/files/file_util.h" #include "base/files/memory_mapped_file.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/guid.h" #include "base/hash/sha1.h" #include "base/location.h"
diff --git a/content/browser/cache_storage/cache_storage.h b/content/browser/cache_storage/cache_storage.h index c529128e..f5ba06a 100644 --- a/content/browser/cache_storage/cache_storage.h +++ b/content/browser/cache_storage/cache_storage.h
@@ -12,8 +12,8 @@ #include <string> #include <vector> -#include "base/callback.h" #include "base/files/file_path.h" +#include "base/functional/callback.h" #include "base/gtest_prod_util.h" #include "base/memory/memory_pressure_listener.h" #include "base/memory/raw_ptr.h"
diff --git a/content/browser/cache_storage/cache_storage_blob_to_disk_cache.cc b/content/browser/cache_storage/cache_storage_blob_to_disk_cache.cc index 5731b7a..fa894b2 100644 --- a/content/browser/cache_storage/cache_storage_blob_to_disk_cache.cc +++ b/content/browser/cache_storage/cache_storage_blob_to_disk_cache.cc
@@ -7,8 +7,8 @@ #include <algorithm> #include <utility> -#include "base/bind.h" #include "base/check_op.h" +#include "base/functional/bind.h" #include "base/task/sequenced_task_runner.h" #include "net/base/io_buffer.h" #include "storage/browser/quota/quota_manager_proxy.h"
diff --git a/content/browser/cache_storage/cache_storage_blob_to_disk_cache.h b/content/browser/cache_storage/cache_storage_blob_to_disk_cache.h index fad9711b..5c91256 100644 --- a/content/browser/cache_storage/cache_storage_blob_to_disk_cache.h +++ b/content/browser/cache_storage/cache_storage_blob_to_disk_cache.h
@@ -5,7 +5,7 @@ #ifndef CONTENT_BROWSER_CACHE_STORAGE_CACHE_STORAGE_BLOB_TO_DISK_CACHE_H_ #define CONTENT_BROWSER_CACHE_STORAGE_CACHE_STORAGE_BLOB_TO_DISK_CACHE_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "content/browser/cache_storage/scoped_writable_entry.h"
diff --git a/content/browser/cache_storage/cache_storage_blob_to_disk_cache_unittest.cc b/content/browser/cache_storage/cache_storage_blob_to_disk_cache_unittest.cc index 2f96131..16b267d3 100644 --- a/content/browser/cache_storage/cache_storage_blob_to_disk_cache_unittest.cc +++ b/content/browser/cache_storage/cache_storage_blob_to_disk_cache_unittest.cc
@@ -8,9 +8,9 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h" #include "base/run_loop.h"
diff --git a/content/browser/cache_storage/cache_storage_cache.cc b/content/browser/cache_storage/cache_storage_cache.cc index a3bdec0c..96ae251 100644 --- a/content/browser/cache_storage/cache_storage_cache.cc +++ b/content/browser/cache_storage/cache_storage_cache.cc
@@ -13,11 +13,11 @@ #include <utility> #include "base/barrier_closure.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/containers/flat_map.h" #include "base/containers/stack_container.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/guid.h" #include "base/memory/ptr_util.h" #include "base/metrics/histogram_functions.h"
diff --git a/content/browser/cache_storage/cache_storage_cache.h b/content/browser/cache_storage/cache_storage_cache.h index 72a20d3..df947e5 100644 --- a/content/browser/cache_storage/cache_storage_cache.h +++ b/content/browser/cache_storage/cache_storage_cache.h
@@ -11,9 +11,9 @@ #include <string> #include <vector> -#include "base/callback.h" #include "base/containers/id_map.h" #include "base/files/file_path.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h"
diff --git a/content/browser/cache_storage/cache_storage_cache_entry_handler.cc b/content/browser/cache_storage/cache_storage_cache_entry_handler.cc index a2230c1..db89833c 100644 --- a/content/browser/cache_storage/cache_storage_cache_entry_handler.cc +++ b/content/browser/cache_storage/cache_storage_cache_entry_handler.cc
@@ -4,7 +4,7 @@ #include "content/browser/cache_storage/cache_storage_cache_entry_handler.h" -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/guid.h" #include "components/services/storage/public/mojom/blob_storage_context.mojom.h" #include "content/browser/cache_storage/background_fetch_cache_entry_handler_impl.h"
diff --git a/content/browser/cache_storage/cache_storage_cache_unittest.cc b/content/browser/cache_storage/cache_storage_cache_unittest.cc index 0ffc6d3..3cab63dfa 100644 --- a/content/browser/cache_storage/cache_storage_cache_unittest.cc +++ b/content/browser/cache_storage/cache_storage_cache_unittest.cc
@@ -10,10 +10,10 @@ #include <set> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h"
diff --git a/content/browser/cache_storage/cache_storage_context_impl.cc b/content/browser/cache_storage/cache_storage_context_impl.cc index 96721bd..c5e4eb6 100644 --- a/content/browser/cache_storage/cache_storage_context_impl.cc +++ b/content/browser/cache_storage/cache_storage_context_impl.cc
@@ -4,8 +4,8 @@ #include "content/browser/cache_storage/cache_storage_context_impl.h" -#include "base/bind.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/task/sequenced_task_runner.h" #include "base/task/thread_pool.h" #include "build/build_config.h"
diff --git a/content/browser/cache_storage/cache_storage_dispatcher_host.cc b/content/browser/cache_storage/cache_storage_dispatcher_host.cc index 339945a..50fe00b 100644 --- a/content/browser/cache_storage/cache_storage_dispatcher_host.cc +++ b/content/browser/cache_storage/cache_storage_dispatcher_host.cc
@@ -6,8 +6,8 @@ #include <string> -#include "base/bind.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h" #include "base/metrics/histogram_functions.h"
diff --git a/content/browser/cache_storage/cache_storage_manager.cc b/content/browser/cache_storage/cache_storage_manager.cc index abca69f9..b147976 100644 --- a/content/browser/cache_storage/cache_storage_manager.cc +++ b/content/browser/cache_storage/cache_storage_manager.cc
@@ -14,11 +14,11 @@ #include <vector> #include "base/barrier_callback.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/containers/id_map.h" #include "base/files/file_enumerator.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/hash/sha1.h" #include "base/memory/ptr_util.h" #include "base/memory/scoped_refptr.h"
diff --git a/content/browser/cache_storage/cache_storage_manager_unittest.cc b/content/browser/cache_storage/cache_storage_manager_unittest.cc index f3300f6..44cf5d7 100644 --- a/content/browser/cache_storage/cache_storage_manager_unittest.cc +++ b/content/browser/cache_storage/cache_storage_manager_unittest.cc
@@ -10,12 +10,12 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/containers/flat_map.h" #include "base/files/file_enumerator.h" #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" #include "base/guid.h" #include "base/memory/ptr_util.h" #include "base/memory/scoped_refptr.h"
diff --git a/content/browser/cache_storage/cache_storage_operation.h b/content/browser/cache_storage/cache_storage_operation.h index b5a0187..53ea306 100644 --- a/content/browser/cache_storage/cache_storage_operation.h +++ b/content/browser/cache_storage/cache_storage_operation.h
@@ -5,8 +5,8 @@ #ifndef CONTENT_BROWSER_CACHE_STORAGE_CACHE_STORAGE_OPERATION_H_ #define CONTENT_BROWSER_CACHE_STORAGE_CACHE_STORAGE_OPERATION_H_ -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "base/task/sequenced_task_runner.h"
diff --git a/content/browser/cache_storage/cache_storage_scheduler.cc b/content/browser/cache_storage/cache_storage_scheduler.cc index 0bdbf69d..50715531 100644 --- a/content/browser/cache_storage/cache_storage_scheduler.cc +++ b/content/browser/cache_storage/cache_storage_scheduler.cc
@@ -6,9 +6,9 @@ #include <string> -#include "base/bind.h" #include "base/check_op.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/metrics/field_trial_params.h" #include "base/metrics/histogram_macros.h"
diff --git a/content/browser/cache_storage/cache_storage_scheduler.h b/content/browser/cache_storage/cache_storage_scheduler.h index 63c12886..365ba2b 100644 --- a/content/browser/cache_storage/cache_storage_scheduler.h +++ b/content/browser/cache_storage/cache_storage_scheduler.h
@@ -8,9 +8,9 @@ #include <map> #include <vector> -#include "base/bind.h" -#include "base/callback.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "base/task/sequenced_task_runner.h" #include "content/browser/cache_storage/cache_storage_scheduler_types.h"
diff --git a/content/browser/cache_storage/cache_storage_scheduler_unittest.cc b/content/browser/cache_storage/cache_storage_scheduler_unittest.cc index 31ecb9b2..df38b51 100644 --- a/content/browser/cache_storage/cache_storage_scheduler_unittest.cc +++ b/content/browser/cache_storage/cache_storage_scheduler_unittest.cc
@@ -4,8 +4,8 @@ #include "content/browser/cache_storage/cache_storage_scheduler.h" -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/task/single_thread_task_runner.h"
diff --git a/content/browser/child_process_launcher.cc b/content/browser/child_process_launcher.cc index 34898ce2..eae4c09 100644 --- a/content/browser/child_process_launcher.cc +++ b/content/browser/child_process_launcher.cc
@@ -6,11 +6,11 @@ #include <utility> -#include "base/bind.h" #include "base/check_op.h" #include "base/clang_profiling_buildflags.h" #include "base/command_line.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/i18n/icu_util.h" #include "base/process/launch.h" #include "base/time/time.h"
diff --git a/content/browser/child_process_launcher.h b/content/browser/child_process_launcher.h index 9957135..989b59b0 100644 --- a/content/browser/child_process_launcher.h +++ b/content/browser/child_process_launcher.h
@@ -164,7 +164,7 @@ delete; ~ChildProcessLauncherFileData(); -#if BUILDFLAG(IS_POSIX) +#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) // Files opened by the browser and passed as corresponding file descriptors // in the child process. If a FilePath is provided, the file will be opened // and the descriptor cached for future process launches. If a ScopedFD is @@ -177,13 +177,6 @@ // Currently only supported on Linux, ChromeOS and Android platforms. std::map<std::string, absl::variant<base::FilePath, base::ScopedFD>> files_to_preload; - - // Map of file descriptors to pass. This is used instead of - // `files_to_preload` when the data needs to be installed at an exact FD - // number in the new process. - // - // Currently only supported on POSIX platforms. - std::map<int, base::ScopedFD> additional_remapped_fds; #endif }; @@ -217,16 +210,6 @@ // If `process_error_callback` is provided, it will be called if a Mojo error // is encountered when processing messages from the child process. This // callback must be safe to call from any thread. - // - // `file_data` consists of 2 members: - // files_to_preload: a map of key names to file paths. These files will be - // opened by the browser process and corresponding file descriptors inherited - // by the new child process, accessible using the corresponding key via some - // platform-specific mechanism (such as base::FileDescriptorStore on POSIX). - // Currently only supported on Linux, ChromeOS and Android platforms. - // additional_remapped_fds: is a map of file descriptors to pass. This is - // used instead of files_to_preload when the data is already contained as a - // file descriptor. Currently only supported on POSIX platforms. ChildProcessLauncher( std::unique_ptr<SandboxedProcessLauncherDelegate> delegate, std::unique_ptr<base::CommandLine> cmd_line,
diff --git a/content/browser/child_process_launcher_helper.cc b/content/browser/child_process_launcher_helper.cc index 3f13872f..e77e8729 100644 --- a/content/browser/child_process_launcher_helper.cc +++ b/content/browser/child_process_launcher_helper.cc
@@ -4,11 +4,12 @@ #include "content/browser/child_process_launcher_helper.h" -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/metrics/field_trial.h" #include "base/metrics/histogram_macros.h" #include "base/no_destructor.h" +#include "base/process/launch.h" #include "base/strings/string_number_conversions.h" #include "base/task/lazy_thread_pool_task_runner.h" #include "base/task/sequenced_task_runner.h" @@ -22,6 +23,7 @@ #include "content/public/common/content_switches.h" #include "content/public/common/sandboxed_process_launcher_delegate.h" #include "mojo/public/cpp/platform/platform_channel.h" +#include "third_party/abseil-cpp/absl/types/optional.h" #if BUILDFLAG(IS_ANDROID) #include "content/browser/android/launcher_thread.h" @@ -133,19 +135,24 @@ bool is_synchronous_launch = true; int launch_result = LAUNCH_RESULT_FAILURE; - base::LaunchOptions options; + absl::optional<base::LaunchOptions> options; + base::LaunchOptions* options_ptr = nullptr; + if (IsUsingLaunchOptions()) { + options.emplace(); + options_ptr = &*options; + } Process process; - if (BeforeLaunchOnLauncherThread(*files_to_register, &options)) { + if (BeforeLaunchOnLauncherThread(*files_to_register, options_ptr)) { base::FieldTrialList::PopulateLaunchOptionsWithFieldTrialState( - command_line(), &options); + command_line(), options_ptr); process = - LaunchProcessOnLauncherThread(options, std::move(files_to_register), + LaunchProcessOnLauncherThread(options_ptr, std::move(files_to_register), #if BUILDFLAG(IS_ANDROID) can_use_warm_up_connection_, #endif &is_synchronous_launch, &launch_result); - AfterLaunchOnLauncherThread(process, options); + AfterLaunchOnLauncherThread(process, options_ptr); } if (is_synchronous_launch) {
diff --git a/content/browser/child_process_launcher_helper.h b/content/browser/child_process_launcher_helper.h index 615ce8b2..f7fbd4e 100644 --- a/content/browser/child_process_launcher_helper.h +++ b/content/browser/child_process_launcher_helper.h
@@ -141,6 +141,11 @@ // Platform specific. std::unique_ptr<FileMappedForLaunch> GetFilesToMap(); + // Returns true if the process will be launched using base::LaunchOptions. + // If false, all of the base::LaunchOptions* below will be nullptr. + // Platform specific. + bool IsUsingLaunchOptions(); + // Platform specific, returns success or failure. If failure is returned, // LaunchOnLauncherThread will not call LaunchProcessOnLauncherThread and // AfterLaunchOnLauncherThread, and the launch_result will be reported as @@ -149,13 +154,16 @@ base::LaunchOptions* options); // Does the actual starting of the process. + // If IsUsingLaunchOptions() returned false, |options| will be null. In this + // case base::LaunchProcess() will not be used, but another platform specific + // mechanism for process launching, like Linux's zygote or Android's app + // zygote. // |is_synchronous_launch| is set to false if the starting of the process is // asynchonous (this is the case on Android), in which case the returned // Process is not valid (and PostLaunchOnLauncherThread() will provide the - // process once it is available). - // Platform specific. + // process once it is available). Platform specific. ChildProcessLauncherHelper::Process LaunchProcessOnLauncherThread( - const base::LaunchOptions& options, + const base::LaunchOptions* options, std::unique_ptr<FileMappedForLaunch> files_to_register, #if BUILDFLAG(IS_ANDROID) bool is_pre_warmup_required, @@ -168,7 +176,7 @@ // not yet be created. Platform specific. void AfterLaunchOnLauncherThread( const ChildProcessLauncherHelper::Process& process, - const base::LaunchOptions& options); + const base::LaunchOptions* options); // Called once the process has been created, successfully or not. void PostLaunchOnLauncherThread(ChildProcessLauncherHelper::Process process, @@ -224,6 +232,11 @@ void LaunchOnLauncherThread(); +#if BUILDFLAG(USE_ZYGOTE_HANDLE) + // Returns the zygote handle for this particular launch, if any. + ZygoteHandle GetZygoteHandle(); +#endif // BUILDFLAG(USE_ZYGOTE_HANDLE) + base::CommandLine* command_line() { return command_line_.get(); } int child_process_id() const { return child_process_id_; }
diff --git a/content/browser/child_process_launcher_helper_android.cc b/content/browser/child_process_launcher_helper_android.cc index 8990bff..cac0e2f 100644 --- a/content/browser/child_process_launcher_helper_android.cc +++ b/content/browser/child_process_launcher_helper_android.cc
@@ -8,7 +8,7 @@ #include "base/android/apk_assets.h" #include "base/android/application_status_listener.h" #include "base/android/jni_array.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/i18n/icu_util.h" #include "base/logging.h" #include "base/metrics/field_trial.h" @@ -89,24 +89,25 @@ return files_to_register; } +bool ChildProcessLauncherHelper::IsUsingLaunchOptions() { + return false; +} + bool ChildProcessLauncherHelper::BeforeLaunchOnLauncherThread( PosixFileDescriptorInfo& files_to_register, base::LaunchOptions* options) { - for (const auto& remapped_fd : file_data_->additional_remapped_fds) { - options->fds_to_remap.emplace_back(remapped_fd.second.get(), - remapped_fd.first); - } - + DCHECK(!options); return true; } ChildProcessLauncherHelper::Process ChildProcessLauncherHelper::LaunchProcessOnLauncherThread( - const base::LaunchOptions& options, + const base::LaunchOptions* options, std::unique_ptr<PosixFileDescriptorInfo> files_to_register, bool can_use_warm_up_connection, bool* is_synchronous_launch, int* launch_result) { + DCHECK(!options); *is_synchronous_launch = false; JNIEnv* env = AttachCurrentThread(); @@ -158,7 +159,7 @@ void ChildProcessLauncherHelper::AfterLaunchOnLauncherThread( const ChildProcessLauncherHelper::Process& process, - const base::LaunchOptions& options) { + const base::LaunchOptions* options) { // Reset any FDs still held open. file_data_.reset(); } @@ -234,7 +235,7 @@ << process.process.Handle(); StopChildProcess(process.process.Handle()); } -// static + base::File OpenFileToShare(const base::FilePath& path, base::MemoryMappedFile::Region* region) { return base::File(base::android::OpenApkAsset(path.value(), region));
diff --git a/content/browser/child_process_launcher_helper_fuchsia.cc b/content/browser/child_process_launcher_helper_fuchsia.cc index 27c67177..67cd4a3 100644 --- a/content/browser/child_process_launcher_helper_fuchsia.cc +++ b/content/browser/child_process_launcher_helper_fuchsia.cc
@@ -88,6 +88,10 @@ return nullptr; } +bool ChildProcessLauncherHelper::IsUsingLaunchOptions() { + return true; +} + bool ChildProcessLauncherHelper::BeforeLaunchOnLauncherThread( PosixFileDescriptorInfo& files_to_register, base::LaunchOptions* options) { @@ -109,7 +113,7 @@ ChildProcessLauncherHelper::Process ChildProcessLauncherHelper::LaunchProcessOnLauncherThread( - const base::LaunchOptions& options, + const base::LaunchOptions* options, std::unique_ptr<FileMappedForLaunch> files_to_register, bool* is_synchronous_launch, int* launch_result) { @@ -122,14 +126,13 @@ // Move `sandbox_policy_` into the child process object so that it doesn't get // destroyed before the child process. child_process.sandbox_policy = std::move(sandbox_policy_); - child_process.process = base::LaunchProcess(*command_line(), options); + child_process.process = base::LaunchProcess(*command_line(), *options); return child_process; } void ChildProcessLauncherHelper::AfterLaunchOnLauncherThread( const ChildProcessLauncherHelper::Process& process, - const base::LaunchOptions& options) { -} + const base::LaunchOptions* options) {} // static void ChildProcessLauncherHelper::ForceNormalProcessTerminationSync(
diff --git a/content/browser/child_process_launcher_helper_linux.cc b/content/browser/child_process_launcher_helper_linux.cc index d7ec619..f866050 100644 --- a/content/browser/child_process_launcher_helper_linux.cc +++ b/content/browser/child_process_launcher_helper_linux.cc
@@ -44,40 +44,44 @@ file_data_->files_to_preload, GetProcessType(), command_line()); } +bool ChildProcessLauncherHelper::IsUsingLaunchOptions() { + return !GetZygoteHandle(); +} + bool ChildProcessLauncherHelper::BeforeLaunchOnLauncherThread( PosixFileDescriptorInfo& files_to_register, base::LaunchOptions* options) { - // Convert FD mapping to FileHandleMappingVector - options->fds_to_remap = files_to_register.GetMappingWithIDAdjustment( - base::GlobalDescriptors::kBaseDescriptor); + if (options) { + DCHECK(!GetZygoteHandle()); + // Convert FD mapping to FileHandleMappingVector + options->fds_to_remap = files_to_register.GetMappingWithIDAdjustment( + base::GlobalDescriptors::kBaseDescriptor); - if (GetProcessType() == switches::kRendererProcess) { - const int sandbox_fd = SandboxHostLinux::GetInstance()->GetChildSocket(); - options->fds_to_remap.emplace_back(sandbox_fd, GetSandboxFD()); + if (GetProcessType() == switches::kRendererProcess) { + const int sandbox_fd = SandboxHostLinux::GetInstance()->GetChildSocket(); + options->fds_to_remap.emplace_back(sandbox_fd, GetSandboxFD()); + } + + options->environment = delegate_->GetEnvironment(); + } else { + DCHECK(GetZygoteHandle()); + // Environment variables could be supported in the future, but are not + // currently supported when launching with the zygote. + DCHECK(delegate_->GetEnvironment().empty()); } - for (const auto& remapped_fd : file_data_->additional_remapped_fds) { - options->fds_to_remap.emplace_back(remapped_fd.second.get(), - remapped_fd.first); - } - - options->environment = delegate_->GetEnvironment(); - return true; } ChildProcessLauncherHelper::Process ChildProcessLauncherHelper::LaunchProcessOnLauncherThread( - const base::LaunchOptions& options, + const base::LaunchOptions* options, std::unique_ptr<FileMappedForLaunch> files_to_register, bool* is_synchronous_launch, int* launch_result) { *is_synchronous_launch = true; Process process; - ZygoteHandle zygote_handle = - base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kNoZygote) - ? nullptr - : delegate_->GetZygote(); + ZygoteHandle zygote_handle = GetZygoteHandle(); if (zygote_handle) { // TODO(crbug.com/569191): If chrome supported multiple zygotes they could // be created lazily here, or in the delegate GetZygote() implementations. @@ -101,7 +105,7 @@ process.process = base::Process(handle); process.zygote = zygote_handle; } else { - process.process = base::LaunchProcess(*command_line(), options); + process.process = base::LaunchProcess(*command_line(), *options); *launch_result = process.process.IsValid() ? LAUNCH_RESULT_SUCCESS : LAUNCH_RESULT_FAILURE; } @@ -117,7 +121,7 @@ void ChildProcessLauncherHelper::AfterLaunchOnLauncherThread( const ChildProcessLauncherHelper::Process& process, - const base::LaunchOptions& options) { + const base::LaunchOptions* options) { // Reset any FDs still held open. file_data_.reset(); } @@ -170,7 +174,12 @@ process.SetProcessBackgrounded(is_background); } -// static +ZygoteHandle ChildProcessLauncherHelper::GetZygoteHandle() { + return base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kNoZygote) + ? nullptr + : delegate_->GetZygote(); +} + base::File OpenFileToShare(const base::FilePath& path, base::MemoryMappedFile::Region* region) { base::FilePath exe_dir;
diff --git a/content/browser/child_process_launcher_helper_mac.cc b/content/browser/child_process_launcher_helper_mac.cc index faddc7a..a4be170a 100644 --- a/content/browser/child_process_launcher_helper_mac.cc +++ b/content/browser/child_process_launcher_helper_mac.cc
@@ -103,6 +103,10 @@ /*files_to_preload=*/{}, GetProcessType(), command_line()); } +bool ChildProcessLauncherHelper::IsUsingLaunchOptions() { + return true; +} + bool ChildProcessLauncherHelper::BeforeLaunchOnLauncherThread( FileMappedForLaunch& files_to_register, base::LaunchOptions* options) { @@ -178,23 +182,18 @@ base::StringPrintf("%s%d", sandbox::switches::kSeatbeltClient, pipe)); } - for (const auto& remapped_fd : file_data_->additional_remapped_fds) { - options->fds_to_remap.emplace_back(remapped_fd.second.get(), - remapped_fd.first); - } - return true; } ChildProcessLauncherHelper::Process ChildProcessLauncherHelper::LaunchProcessOnLauncherThread( - const base::LaunchOptions& options, + const base::LaunchOptions* options, std::unique_ptr<PosixFileDescriptorInfo> files_to_register, bool* is_synchronous_launch, int* launch_result) { *is_synchronous_launch = true; ChildProcessLauncherHelper::Process process; - process.process = base::LaunchProcess(*command_line(), options); + process.process = base::LaunchProcess(*command_line(), *options); *launch_result = process.process.IsValid() ? LAUNCH_RESULT_SUCCESS : LAUNCH_RESULT_FAILURE; return process; @@ -202,7 +201,7 @@ void ChildProcessLauncherHelper::AfterLaunchOnLauncherThread( const ChildProcessLauncherHelper::Process& process, - const base::LaunchOptions& options) { + const base::LaunchOptions* options) { // Send the sandbox profile after launch so that the child will exist and be // waiting for the message on its side of the pipe. if (process.process.IsValid() && seatbelt_exec_client_.get() != nullptr) { @@ -248,7 +247,6 @@ } } -// static base::File OpenFileToShare(const base::FilePath& path, base::MemoryMappedFile::Region* region) { // Not used yet (until required files are described in the service manifest on
diff --git a/content/browser/child_process_launcher_helper_win.cc b/content/browser/child_process_launcher_helper_win.cc index d9a3feec..d4c9e420 100644 --- a/content/browser/child_process_launcher_helper_win.cc +++ b/content/browser/child_process_launcher_helper_win.cc
@@ -44,6 +44,10 @@ return nullptr; } +bool ChildProcessLauncherHelper::IsUsingLaunchOptions() { + return true; +} + bool ChildProcessLauncherHelper::BeforeLaunchOnLauncherThread( FileMappedForLaunch& files_to_register, base::LaunchOptions* options) { @@ -59,14 +63,14 @@ ChildProcessLauncherHelper::Process ChildProcessLauncherHelper::LaunchProcessOnLauncherThread( - const base::LaunchOptions& options, + const base::LaunchOptions* options, std::unique_ptr<FileMappedForLaunch> files_to_register, bool* is_synchronous_launch, int* launch_result) { DCHECK(CurrentlyOnProcessLauncherTaskRunner()); *is_synchronous_launch = true; if (delegate_->ShouldLaunchElevated()) { - DCHECK(options.elevated); + DCHECK(options->elevated); // When establishing a Mojo connection, the pipe path has already been added // to the command line. base::LaunchOptions win_options; @@ -81,13 +85,13 @@ ChildProcessLauncherHelper::Process process; *launch_result = StartSandboxedProcess(delegate_.get(), *command_line(), - options.handles_to_inherit, &process.process); + options->handles_to_inherit, &process.process); return process; } void ChildProcessLauncherHelper::AfterLaunchOnLauncherThread( const ChildProcessLauncherHelper::Process& process, - const base::LaunchOptions& options) { + const base::LaunchOptions* options) { DCHECK(CurrentlyOnProcessLauncherTaskRunner()); }
diff --git a/content/browser/child_process_security_policy_impl.cc b/content/browser/child_process_security_policy_impl.cc index c514f80..4dbf8a28 100644 --- a/content/browser/child_process_security_policy_impl.cc +++ b/content/browser/child_process_security_policy_impl.cc
@@ -7,7 +7,6 @@ #include <tuple> #include <utility> -#include "base/bind.h" #include "base/command_line.h" #include "base/containers/contains.h" #include "base/containers/cxx20_erase.h" @@ -15,6 +14,7 @@ #include "base/debug/dump_without_crashing.h" #include "base/feature_list.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/memory/raw_ptr.h" #include "base/metrics/histogram_macros.h"
diff --git a/content/browser/child_process_security_policy_unittest.cc b/content/browser/child_process_security_policy_unittest.cc index 93c3d02..e7d34948 100644 --- a/content/browser/child_process_security_policy_unittest.cc +++ b/content/browser/child_process_security_policy_unittest.cc
@@ -5,8 +5,8 @@ #include <set> #include <string> -#include "base/callback_helpers.h" #include "base/files/file_path.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h"
diff --git a/content/browser/child_process_task_port_provider_mac.cc b/content/browser/child_process_task_port_provider_mac.cc index 9656932..cce92b6 100644 --- a/content/browser/child_process_task_port_provider_mac.cc +++ b/content/browser/child_process_task_port_provider_mac.cc
@@ -4,9 +4,9 @@ #include "content/browser/child_process_task_port_provider_mac.h" -#include "base/bind.h" #include "base/containers/cxx20_erase.h" #include "base/debug/crash_logging.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/mac/foundation_util.h" #include "base/mac/mach_logging.h"
diff --git a/content/browser/child_process_task_port_provider_mac_unittest.cc b/content/browser/child_process_task_port_provider_mac_unittest.cc index 55b2fda..ab99b6d 100644 --- a/content/browser/child_process_task_port_provider_mac_unittest.cc +++ b/content/browser/child_process_task_port_provider_mac_unittest.cc
@@ -8,8 +8,8 @@ #include <vector> -#include "base/callback.h" #include "base/clang_profiling_buildflags.h" +#include "base/functional/callback.h" #include "base/mac/scoped_mach_port.h" #include "base/task/sequenced_task_runner.h" #include "base/task/thread_pool.h"
diff --git a/content/browser/code_cache/generated_code_cache.cc b/content/browser/code_cache/generated_code_cache.cc index 4030ed6e..939dbbb8 100644 --- a/content/browser/code_cache/generated_code_cache.cc +++ b/content/browser/code_cache/generated_code_cache.cc
@@ -6,9 +6,9 @@ #include <iostream> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ptr_util.h" #include "base/metrics/histogram_functions.h" #include "base/metrics/histogram_macros.h"
diff --git a/content/browser/code_cache/generated_code_cache_context.cc b/content/browser/code_cache/generated_code_cache_context.cc index 352667f9..ee1f666 100644 --- a/content/browser/code_cache/generated_code_cache_context.cc +++ b/content/browser/code_cache/generated_code_cache_context.cc
@@ -5,8 +5,8 @@ #include <memory> -#include "base/bind.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/task/sequenced_task_runner.h" #include "base/task/thread_pool.h" #include "content/browser/code_cache/generated_code_cache.h"
diff --git a/content/browser/code_cache/generated_code_cache_unittest.cc b/content/browser/code_cache/generated_code_cache_unittest.cc index 7e56ce7..92b852a 100644 --- a/content/browser/code_cache/generated_code_cache_unittest.cc +++ b/content/browser/code_cache/generated_code_cache_unittest.cc
@@ -7,8 +7,8 @@ #include <memory> #include <utility> -#include "base/bind.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/strings/string_number_conversions.h" #include "base/test/scoped_feature_list.h"
diff --git a/content/browser/compositor/viz_process_transport_factory.cc b/content/browser/compositor/viz_process_transport_factory.cc index 3ee0cc95..0b0c6d67 100644 --- a/content/browser/compositor/viz_process_transport_factory.cc +++ b/content/browser/compositor/viz_process_transport_factory.cc
@@ -7,9 +7,9 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/command_line.h" #include "base/debug/dump_without_crashing.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h" #include "base/task/single_thread_task_runner.h"
diff --git a/content/browser/compute_pressure/pressure_service_impl.h b/content/browser/compute_pressure/pressure_service_impl.h index 928e4a8..4e6e497d8 100644 --- a/content/browser/compute_pressure/pressure_service_impl.h +++ b/content/browser/compute_pressure/pressure_service_impl.h
@@ -5,7 +5,7 @@ #ifndef CONTENT_BROWSER_COMPUTE_PRESSURE_PRESSURE_SERVICE_IMPL_H_ #define CONTENT_BROWSER_COMPUTE_PRESSURE_PRESSURE_SERVICE_IMPL_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/sequence_checker.h" #include "base/thread_annotations.h" #include "base/time/time.h"
diff --git a/content/browser/compute_pressure/pressure_service_impl_unittest.cc b/content/browser/compute_pressure/pressure_service_impl_unittest.cc index 714756f..1beb49df 100644 --- a/content/browser/compute_pressure/pressure_service_impl_unittest.cc +++ b/content/browser/compute_pressure/pressure_service_impl_unittest.cc
@@ -7,7 +7,7 @@ #include <vector> #include "base/barrier_closure.h" -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ref.h" #include "base/run_loop.h" #include "base/test/bind.h"
diff --git a/content/browser/contacts/contacts_manager_impl.cc b/content/browser/contacts/contacts_manager_impl.cc index 3704e15..fbe0ba3 100644 --- a/content/browser/contacts/contacts_manager_impl.cc +++ b/content/browser/contacts/contacts_manager_impl.cc
@@ -8,7 +8,7 @@ #include <utility> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "build/build_config.h" #include "content/browser/renderer_host/render_frame_host_impl.h" #include "content/public/browser/contacts_picker_properties_requested.h"
diff --git a/content/browser/contacts/contacts_provider_android.cc b/content/browser/contacts/contacts_provider_android.cc index 1c6fc82..eb7383f 100644 --- a/content/browser/contacts/contacts_provider_android.cc +++ b/content/browser/contacts/contacts_provider_android.cc
@@ -10,7 +10,7 @@ #include <vector> #include "base/android/jni_string.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/metrics/histogram_functions.h" #include "components/url_formatter/elide_url.h" #include "content/browser/renderer_host/render_frame_host_impl.h"
diff --git a/content/browser/content_index/content_index_context_impl.cc b/content/browser/content_index/content_index_context_impl.cc index 37733a3..e74d28b 100644 --- a/content/browser/content_index/content_index_context_impl.cc +++ b/content/browser/content_index/content_index_context_impl.cc
@@ -4,7 +4,7 @@ #include "content/browser/content_index/content_index_context_impl.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "content/public/browser/browser_context.h" #include "content/public/browser/browser_task_traits.h" #include "content/public/browser/browser_thread.h"
diff --git a/content/browser/content_index/content_index_service_impl.cc b/content/browser/content_index/content_index_service_impl.cc index 72eacf6..8257fed0 100644 --- a/content/browser/content_index/content_index_service_impl.cc +++ b/content/browser/content_index/content_index_service_impl.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "content/browser/bad_message.h" #include "content/browser/content_index/content_index_database.h" #include "content/browser/storage_partition_impl.h"
diff --git a/content/browser/cookie_store/cookie_store_manager.cc b/content/browser/cookie_store/cookie_store_manager.cc index 60070d5..9c4d701 100644 --- a/content/browser/cookie_store/cookie_store_manager.cc +++ b/content/browser/cookie_store/cookie_store_manager.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/ranges/algorithm.h" #include "base/sequence_checker.h" #include "content/browser/cookie_store/cookie_change_subscriptions.pb.h"
diff --git a/content/browser/cookie_store/cookie_store_manager.h b/content/browser/cookie_store/cookie_store_manager.h index 26ee72b8..a557e81 100644 --- a/content/browser/cookie_store/cookie_store_manager.h +++ b/content/browser/cookie_store/cookie_store_manager.h
@@ -9,9 +9,9 @@ #include <string> #include <vector> -#include "base/callback.h" #include "base/containers/linked_list.h" #include "base/containers/span.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h" #include "base/sequence_checker.h"
diff --git a/content/browser/cookie_store/cookie_store_manager_unittest.cc b/content/browser/cookie_store/cookie_store_manager_unittest.cc index 83dfc3d71..fdb4d0c 100644 --- a/content/browser/cookie_store/cookie_store_manager_unittest.cc +++ b/content/browser/cookie_store/cookie_store_manager_unittest.cc
@@ -4,8 +4,8 @@ #include <memory> -#include "base/bind.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h" #include "base/test/bind.h"
diff --git a/content/browser/data_decoder_browsertest.cc b/content/browser/data_decoder_browsertest.cc index 454e625d..0d924a2 100644 --- a/content/browser/data_decoder_browsertest.cc +++ b/content/browser/data_decoder_browsertest.cc
@@ -5,9 +5,9 @@ #include <limits> #include "base/base_paths.h" -#include "base/callback_helpers.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/callback_helpers.h" #include "base/path_service.h" #include "base/task/sequenced_task_runner.h" #include "base/test/bind.h"
diff --git a/content/browser/device_sensors/device_sensor_browsertest.cc b/content/browser/device_sensors/device_sensor_browsertest.cc index 00f3e153..253c2ad 100644 --- a/content/browser/device_sensors/device_sensor_browsertest.cc +++ b/content/browser/device_sensors/device_sensor_browsertest.cc
@@ -6,9 +6,9 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "base/threading/platform_thread.h" #include "build/build_config.h"
diff --git a/content/browser/devtools/auction_worklet_devtools_agent_host.cc b/content/browser/devtools/auction_worklet_devtools_agent_host.cc index d58283b0..8566d562 100644 --- a/content/browser/devtools/auction_worklet_devtools_agent_host.cc +++ b/content/browser/devtools/auction_worklet_devtools_agent_host.cc
@@ -4,7 +4,7 @@ #include "content/browser/devtools/auction_worklet_devtools_agent_host.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/scoped_refptr.h" #include "base/no_destructor.h" #include "base/notreached.h"
diff --git a/content/browser/devtools/browser_devtools_agent_host.cc b/content/browser/devtools/browser_devtools_agent_host.cc index 55b9973..9418007 100644 --- a/content/browser/devtools/browser_devtools_agent_host.cc +++ b/content/browser/devtools/browser_devtools_agent_host.cc
@@ -4,8 +4,8 @@ #include "content/browser/devtools/browser_devtools_agent_host.h" -#include "base/bind.h" #include "base/clang_profiling_buildflags.h" +#include "base/functional/bind.h" #include "base/guid.h" #include "base/json/json_reader.h" #include "base/memory/ptr_util.h"
diff --git a/content/browser/devtools/devtools_agent_host_impl.cc b/content/browser/devtools/devtools_agent_host_impl.cc index 12779c3..712fc58 100644 --- a/content/browser/devtools/devtools_agent_host_impl.cc +++ b/content/browser/devtools/devtools_agent_host_impl.cc
@@ -7,8 +7,8 @@ #include <map> #include <vector> -#include "base/bind.h" #include "base/containers/cxx20_erase.h" +#include "base/functional/bind.h" #include "base/memory/ref_counted_memory.h" #include "base/no_destructor.h" #include "base/observer_list.h"
diff --git a/content/browser/devtools/devtools_background_services_context_impl.h b/content/browser/devtools/devtools_background_services_context_impl.h index 520f71cf..0d7b526 100644 --- a/content/browser/devtools/devtools_background_services_context_impl.h +++ b/content/browser/devtools/devtools_background_services_context_impl.h
@@ -12,7 +12,7 @@ #include <utility> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h"
diff --git a/content/browser/devtools/devtools_http_handler.cc b/content/browser/devtools/devtools_http_handler.cc index 8cbeeec..a6e355d 100644 --- a/content/browser/devtools/devtools_http_handler.cc +++ b/content/browser/devtools/devtools_http_handler.cc
@@ -9,11 +9,11 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/compiler_specific.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/guid.h" #include "base/json/json_writer.h" #include "base/location.h"
diff --git a/content/browser/devtools/devtools_http_handler_unittest.cc b/content/browser/devtools/devtools_http_handler_unittest.cc index f6796ab..394ecaeb 100644 --- a/content/browser/devtools/devtools_http_handler_unittest.cc +++ b/content/browser/devtools/devtools_http_handler_unittest.cc
@@ -9,10 +9,10 @@ #include <memory> #include <utility> -#include "base/bind.h" #include "base/command_line.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" #include "base/json/json_reader.h" #include "base/location.h" #include "base/memory/ptr_util.h"
diff --git a/content/browser/devtools/devtools_io_context.cc b/content/browser/devtools/devtools_io_context.cc index b54cbe98..e0655de4 100644 --- a/content/browser/devtools/devtools_io_context.cc +++ b/content/browser/devtools/devtools_io_context.cc
@@ -4,7 +4,7 @@ #include "content/browser/devtools/devtools_io_context.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/string_number_conversions.h" #include "base/task/sequenced_task_runner.h" #include "content/browser/blob_storage/chrome_blob_storage_context.h"
diff --git a/content/browser/devtools/devtools_io_context.h b/content/browser/devtools/devtools_io_context.h index f24e74b..218b5da 100644 --- a/content/browser/devtools/devtools_io_context.h +++ b/content/browser/devtools/devtools_io_context.h
@@ -7,7 +7,7 @@ #include <map> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/ref_counted_delete_on_sequence.h" #include "base/memory/ref_counted_memory.h" #include "base/memory/weak_ptr.h"
diff --git a/content/browser/devtools/devtools_pipe_handler.cc b/content/browser/devtools/devtools_pipe_handler.cc index 8e151082..e533408 100644 --- a/content/browser/devtools/devtools_pipe_handler.cc +++ b/content/browser/devtools/devtools_pipe_handler.cc
@@ -19,9 +19,9 @@ #include <string> #include <utility> -#include "base/bind.h" #include "base/command_line.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/memory/ref_counted_memory.h" #include "base/message_loop/message_pump_type.h"
diff --git a/content/browser/devtools/devtools_pipe_handler.h b/content/browser/devtools/devtools_pipe_handler.h index 4f591d6..c4b4de5 100644 --- a/content/browser/devtools/devtools_pipe_handler.h +++ b/content/browser/devtools/devtools_pipe_handler.h
@@ -5,8 +5,8 @@ #ifndef CONTENT_BROWSER_DEVTOOLS_DEVTOOLS_PIPE_HANDLER_H_ #define CONTENT_BROWSER_DEVTOOLS_DEVTOOLS_PIPE_HANDLER_H_ -#include "base/callback.h" #include "base/containers/span.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "content/public/browser/devtools_agent_host_client.h"
diff --git a/content/browser/devtools/devtools_renderer_channel.cc b/content/browser/devtools/devtools_renderer_channel.cc index 438b052..49f404d 100644 --- a/content/browser/devtools/devtools_renderer_channel.cc +++ b/content/browser/devtools/devtools_renderer_channel.cc
@@ -4,8 +4,8 @@ #include "content/browser/devtools/devtools_renderer_channel.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "content/browser/devtools/devtools_agent_host_impl.h" #include "content/browser/devtools/devtools_session.h" #include "content/browser/devtools/protocol/devtools_domain_handler.h"
diff --git a/content/browser/devtools/devtools_renderer_channel.h b/content/browser/devtools/devtools_renderer_channel.h index 651e588..bc60dd93 100644 --- a/content/browser/devtools/devtools_renderer_channel.h +++ b/content/browser/devtools/devtools_renderer_channel.h
@@ -5,9 +5,9 @@ #ifndef CONTENT_BROWSER_DEVTOOLS_DEVTOOLS_RENDERER_CHANNEL_H_ #define CONTENT_BROWSER_DEVTOOLS_DEVTOOLS_RENDERER_CHANNEL_H_ -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/containers/flat_set.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/memory/weak_ptr.h" #include "mojo/public/cpp/bindings/associated_receiver.h" #include "mojo/public/cpp/bindings/associated_remote.h"
diff --git a/content/browser/devtools/devtools_session.cc b/content/browser/devtools/devtools_session.cc index 5c94a1d2..acf1112 100644 --- a/content/browser/devtools/devtools_session.cc +++ b/content/browser/devtools/devtools_session.cc
@@ -7,9 +7,9 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/containers/flat_set.h" #include "base/debug/stack_trace.h" +#include "base/functional/bind.h" #include "base/trace_event/trace_event.h" #include "content/browser/devtools/devtools_manager.h" #include "content/browser/devtools/protocol/devtools_domain_handler.h"
diff --git a/content/browser/devtools/devtools_stream_blob.cc b/content/browser/devtools/devtools_stream_blob.cc index 4d3081b..cf82163e 100644 --- a/content/browser/devtools/devtools_stream_blob.cc +++ b/content/browser/devtools/devtools_stream_blob.cc
@@ -5,7 +5,7 @@ #include "content/browser/devtools/devtools_stream_blob.h" #include "base/base64.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/string_piece.h" #include "content/browser/blob_storage/chrome_blob_storage_context.h" #include "content/public/browser/browser_task_traits.h"
diff --git a/content/browser/devtools/devtools_stream_blob.h b/content/browser/devtools/devtools_stream_blob.h index 90322d0..4ebba8e 100644 --- a/content/browser/devtools/devtools_stream_blob.h +++ b/content/browser/devtools/devtools_stream_blob.h
@@ -5,8 +5,8 @@ #ifndef CONTENT_BROWSER_DEVTOOLS_DEVTOOLS_STREAM_BLOB_H_ #define CONTENT_BROWSER_DEVTOOLS_DEVTOOLS_STREAM_BLOB_H_ -#include "base/callback.h" #include "base/containers/queue.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" #include "content/browser/devtools/devtools_io_context.h" #include "net/base/net_errors.h"
diff --git a/content/browser/devtools/devtools_stream_file.cc b/content/browser/devtools/devtools_stream_file.cc index 0c4ce59c..61fb1b7f 100644 --- a/content/browser/devtools/devtools_stream_file.cc +++ b/content/browser/devtools/devtools_stream_file.cc
@@ -5,8 +5,8 @@ #include "content/browser/devtools/devtools_stream_file.h" #include "base/base64.h" -#include "base/bind.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/strings/string_util.h" #include "base/task/lazy_thread_pool_task_runner.h" #include "base/task/sequenced_task_runner.h"
diff --git a/content/browser/devtools/devtools_stream_pipe.cc b/content/browser/devtools/devtools_stream_pipe.cc index 5e7001c..72fede7 100644 --- a/content/browser/devtools/devtools_stream_pipe.cc +++ b/content/browser/devtools/devtools_stream_pipe.cc
@@ -5,7 +5,7 @@ #include "content/browser/devtools/devtools_stream_pipe.h" #include "base/base64.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/task/sequenced_task_runner.h" namespace content {
diff --git a/content/browser/devtools/devtools_stream_pipe.h b/content/browser/devtools/devtools_stream_pipe.h index 399f536..48356a9d 100644 --- a/content/browser/devtools/devtools_stream_pipe.h +++ b/content/browser/devtools/devtools_stream_pipe.h
@@ -5,8 +5,8 @@ #ifndef CONTENT_BROWSER_DEVTOOLS_DEVTOOLS_STREAM_PIPE_H_ #define CONTENT_BROWSER_DEVTOOLS_DEVTOOLS_STREAM_PIPE_H_ -#include "base/callback.h" #include "base/containers/queue.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" #include "content/browser/devtools/devtools_io_context.h" #include "mojo/public/cpp/system/data_pipe.h"
diff --git a/content/browser/devtools/devtools_throttle_handle.h b/content/browser/devtools/devtools_throttle_handle.h index f5acb34..8d9e2f3 100644 --- a/content/browser/devtools/devtools_throttle_handle.h +++ b/content/browser/devtools/devtools_throttle_handle.h
@@ -5,7 +5,7 @@ #ifndef CONTENT_BROWSER_DEVTOOLS_DEVTOOLS_THROTTLE_HANDLE_H_ #define CONTENT_BROWSER_DEVTOOLS_DEVTOOLS_THROTTLE_HANDLE_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" namespace content {
diff --git a/content/browser/devtools/devtools_url_loader_interceptor.cc b/content/browser/devtools/devtools_url_loader_interceptor.cc index aa0d99b..f70c73a 100644 --- a/content/browser/devtools/devtools_url_loader_interceptor.cc +++ b/content/browser/devtools/devtools_url_loader_interceptor.cc
@@ -8,7 +8,7 @@ #include "base/barrier_closure.h" #include "base/base64.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/no_destructor.h" #include "base/strings/pattern.h" #include "base/strings/string_piece.h"
diff --git a/content/browser/devtools/devtools_url_loader_interceptor.h b/content/browser/devtools/devtools_url_loader_interceptor.h index 2eac44b..7bd0218 100644 --- a/content/browser/devtools/devtools_url_loader_interceptor.h +++ b/content/browser/devtools/devtools_url_loader_interceptor.h
@@ -5,8 +5,8 @@ #ifndef CONTENT_BROWSER_DEVTOOLS_DEVTOOLS_URL_LOADER_INTERCEPTOR_H_ #define CONTENT_BROWSER_DEVTOOLS_DEVTOOLS_URL_LOADER_INTERCEPTOR_H_ -#include "base/callback.h" #include "base/containers/flat_set.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "base/unguessable_token.h" #include "content/browser/devtools/protocol/network.h"
diff --git a/content/browser/devtools/devtools_video_consumer.cc b/content/browser/devtools/devtools_video_consumer.cc index a803636..04f67be 100644 --- a/content/browser/devtools/devtools_video_consumer.cc +++ b/content/browser/devtools/devtools_video_consumer.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/shared_memory_mapping.h" #include "cc/paint/skia_paint_canvas.h" #include "components/viz/common/surfaces/subtree_capture_id.h"
diff --git a/content/browser/devtools/devtools_video_consumer_browsertest.cc b/content/browser/devtools/devtools_video_consumer_browsertest.cc index c8111075..f9da5ea 100644 --- a/content/browser/devtools/devtools_video_consumer_browsertest.cc +++ b/content/browser/devtools/devtools_video_consumer_browsertest.cc
@@ -4,7 +4,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "content/browser/devtools/devtools_video_consumer.h" #include "content/browser/web_contents/web_contents_impl.h" #include "content/public/test/browser_test.h"
diff --git a/content/browser/devtools/devtools_video_consumer_unittest.cc b/content/browser/devtools/devtools_video_consumer_unittest.cc index e48d3758..8b074ee 100644 --- a/content/browser/devtools/devtools_video_consumer_unittest.cc +++ b/content/browser/devtools/devtools_video_consumer_unittest.cc
@@ -5,7 +5,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/read_only_shared_memory_region.h" #include "base/test/task_environment.h" #include "base/time/time.h"
diff --git a/content/browser/devtools/frame_auto_attacher.h b/content/browser/devtools/frame_auto_attacher.h index 885a0e89..e702f2f 100644 --- a/content/browser/devtools/frame_auto_attacher.h +++ b/content/browser/devtools/frame_auto_attacher.h
@@ -4,7 +4,7 @@ #ifndef CONTENT_BROWSER_DEVTOOLS_FRAME_AUTO_ATTACHER_H_ #define CONTENT_BROWSER_DEVTOOLS_FRAME_AUTO_ATTACHER_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "content/browser/devtools/protocol/target_auto_attacher.h" #include "content/browser/devtools/service_worker_devtools_manager.h" #include "content/browser/interest_group/debuggable_auction_worklet_tracker.h"
diff --git a/content/browser/devtools/protocol/devtools_download_manager_delegate.cc b/content/browser/devtools/protocol/devtools_download_manager_delegate.cc index bad5daf..6c615225c 100644 --- a/content/browser/devtools/protocol/devtools_download_manager_delegate.cc +++ b/content/browser/devtools/protocol/devtools_download_manager_delegate.cc
@@ -4,8 +4,8 @@ #include "content/browser/devtools/protocol/devtools_download_manager_delegate.h" -#include "base/bind.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/task/thread_pool.h" #include "content/public/browser/browser_context.h"
diff --git a/content/browser/devtools/protocol/devtools_download_manager_delegate.h b/content/browser/devtools/protocol/devtools_download_manager_delegate.h index dba80e4..b3455a7 100644 --- a/content/browser/devtools/protocol/devtools_download_manager_delegate.h +++ b/content/browser/devtools/protocol/devtools_download_manager_delegate.h
@@ -8,7 +8,7 @@ #include <stdint.h> #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/ref_counted.h" #include "content/public/browser/download_manager_delegate.h"
diff --git a/content/browser/devtools/protocol/devtools_mhtml_helper.cc b/content/browser/devtools/protocol/devtools_mhtml_helper.cc index d9bb2abd..9ed3d433 100644 --- a/content/browser/devtools/protocol/devtools_mhtml_helper.cc +++ b/content/browser/devtools/protocol/devtools_mhtml_helper.cc
@@ -4,8 +4,8 @@ #include "content/browser/devtools/protocol/devtools_mhtml_helper.h" -#include "base/bind.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/task/thread_pool.h" #include "content/browser/web_contents/web_contents_impl.h" #include "content/public/browser/browser_task_traits.h"
diff --git a/content/browser/devtools/protocol/devtools_network_resource_loader.cc b/content/browser/devtools/protocol/devtools_network_resource_loader.cc index 5b9f956..a53ded7 100644 --- a/content/browser/devtools/protocol/devtools_network_resource_loader.cc +++ b/content/browser/devtools/protocol/devtools_network_resource_loader.cc
@@ -5,7 +5,7 @@ #include "content/browser/devtools/protocol/devtools_network_resource_loader.h" #include <cstddef> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/json/json_writer.h" #include "base/memory/ptr_util.h" #include "net/base/load_flags.h"
diff --git a/content/browser/devtools/protocol/devtools_protocol_browsertest.cc b/content/browser/devtools/protocol/devtools_protocol_browsertest.cc index 6690de2..355b6b174 100644 --- a/content/browser/devtools/protocol/devtools_protocol_browsertest.cc +++ b/content/browser/devtools/protocol/devtools_protocol_browsertest.cc
@@ -8,11 +8,11 @@ #include <utility> #include "base/base64.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/json/json_reader.h" #include "base/logging.h" #include "base/strings/safe_sprintf.h"
diff --git a/content/browser/devtools/protocol/emulation_handler.cc b/content/browser/devtools/protocol/emulation_handler.cc index 52b1b3d..5d80ca27 100644 --- a/content/browser/devtools/protocol/emulation_handler.cc +++ b/content/browser/devtools/protocol/emulation_handler.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/numerics/safe_conversions.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h"
diff --git a/content/browser/devtools/protocol/fetch_handler.cc b/content/browser/devtools/protocol/fetch_handler.cc index bb2ffe8..45b4249 100644 --- a/content/browser/devtools/protocol/fetch_handler.cc +++ b/content/browser/devtools/protocol/fetch_handler.cc
@@ -6,8 +6,8 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "content/browser/devtools/devtools_agent_host_impl.h"
diff --git a/content/browser/devtools/protocol/input_handler.cc b/content/browser/devtools/protocol/input_handler.cc index 4add5bff..cb211c9 100644 --- a/content/browser/devtools/protocol/input_handler.cc +++ b/content/browser/devtools/protocol/input_handler.cc
@@ -9,8 +9,8 @@ #include <memory> #include <vector> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "base/task/single_thread_task_runner.h"
diff --git a/content/browser/devtools/protocol/io_handler.cc b/content/browser/devtools/protocol/io_handler.cc index e995331..951d883 100644 --- a/content/browser/devtools/protocol/io_handler.cc +++ b/content/browser/devtools/protocol/io_handler.cc
@@ -9,9 +9,9 @@ #include <memory> -#include "base/bind.h" #include "base/files/file.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/memory/ref_counted_memory.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h"
diff --git a/content/browser/devtools/protocol/memory_handler.cc b/content/browser/devtools/protocol/memory_handler.cc index 549b2c2..ea34dd4a 100644 --- a/content/browser/devtools/protocol/memory_handler.cc +++ b/content/browser/devtools/protocol/memory_handler.cc
@@ -6,7 +6,7 @@ #include <cinttypes> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/memory_pressure_listener.h" #include "base/profiler/module_cache.h" #include "base/sampling_heap_profiler/sampling_heap_profiler.h"
diff --git a/content/browser/devtools/protocol/network_handler.cc b/content/browser/devtools/protocol/network_handler.cc index d704c3ef..9ec7a8d 100644 --- a/content/browser/devtools/protocol/network_handler.cc +++ b/content/browser/devtools/protocol/network_handler.cc
@@ -11,11 +11,11 @@ #include "base/barrier_closure.h" #include "base/base64.h" -#include "base/bind.h" #include "base/command_line.h" #include "base/containers/contains.h" #include "base/containers/queue.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/i18n/i18n_constants.h" #include "base/i18n/icu_string_conversions.h" #include "base/process/process_handle.h"
diff --git a/content/browser/devtools/protocol/page_handler.cc b/content/browser/devtools/protocol/page_handler.cc index 34293fb6..a21d81c 100644 --- a/content/browser/devtools/protocol/page_handler.cc +++ b/content/browser/devtools/protocol/page_handler.cc
@@ -10,7 +10,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/memory/ref_counted.h" #include "base/memory/ref_counted_memory.h"
diff --git a/content/browser/devtools/protocol/service_worker_handler.cc b/content/browser/devtools/protocol/service_worker_handler.cc index 5622c95..091a4347a4 100644 --- a/content/browser/devtools/protocol/service_worker_handler.cc +++ b/content/browser/devtools/protocol/service_worker_handler.cc
@@ -6,9 +6,9 @@ #include <memory> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/containers/flat_set.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" #include "content/browser/background_sync/background_sync_context_impl.h"
diff --git a/content/browser/devtools/protocol/storage_handler.cc b/content/browser/devtools/protocol/storage_handler.cc index 1c8ac2a1c..4cb6558 100644 --- a/content/browser/devtools/protocol/storage_handler.cc +++ b/content/browser/devtools/protocol/storage_handler.cc
@@ -9,7 +9,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/scoped_observation.h" #include "base/strings/string_split.h" #include "base/strings/utf_string_conversions.h"
diff --git a/content/browser/devtools/protocol/system_info_handler.cc b/content/browser/devtools/protocol/system_info_handler.cc index 7c31e3bf..4bf48c9 100644 --- a/content/browser/devtools/protocol/system_info_handler.cc +++ b/content/browser/devtools/protocol/system_info_handler.cc
@@ -8,8 +8,8 @@ #include <utility> -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/process/process_metrics.h" #include "base/strings/utf_string_conversions.h" #include "build/build_config.h"
diff --git a/content/browser/devtools/protocol/target_auto_attacher.h b/content/browser/devtools/protocol/target_auto_attacher.h index 560581bf..1e435b60 100644 --- a/content/browser/devtools/protocol/target_auto_attacher.h +++ b/content/browser/devtools/protocol/target_auto_attacher.h
@@ -5,8 +5,8 @@ #ifndef CONTENT_BROWSER_DEVTOOLS_PROTOCOL_TARGET_AUTO_ATTACHER_H_ #define CONTENT_BROWSER_DEVTOOLS_PROTOCOL_TARGET_AUTO_ATTACHER_H_ -#include "base/callback.h" #include "base/containers/flat_set.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" #include "base/observer_list.h"
diff --git a/content/browser/devtools/protocol/target_handler.cc b/content/browser/devtools/protocol/target_handler.cc index 921e5e9..2539e0c 100644 --- a/content/browser/devtools/protocol/target_handler.cc +++ b/content/browser/devtools/protocol/target_handler.cc
@@ -7,9 +7,9 @@ #include <memory> #include "base/base64.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/containers/flat_map.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/json/json_reader.h" #include "base/json/json_writer.h" #include "base/memory/ptr_util.h"
diff --git a/content/browser/devtools/protocol/tethering_handler.cc b/content/browser/devtools/protocol/tethering_handler.cc index e637569..142334f 100644 --- a/content/browser/devtools/protocol/tethering_handler.cc +++ b/content/browser/devtools/protocol/tethering_handler.cc
@@ -7,7 +7,7 @@ #include <map> #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/task/single_thread_task_runner.h" #include "content/public/browser/browser_task_traits.h" #include "content/public/browser/browser_thread.h"
diff --git a/content/browser/devtools/protocol/tethering_handler.h b/content/browser/devtools/protocol/tethering_handler.h index 967b1f3..dbe92902 100644 --- a/content/browser/devtools/protocol/tethering_handler.h +++ b/content/browser/devtools/protocol/tethering_handler.h
@@ -8,7 +8,7 @@ #include <stdint.h> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "base/task/single_thread_task_runner.h"
diff --git a/content/browser/devtools/protocol/tracing_handler.cc b/content/browser/devtools/protocol/tracing_handler.cc index ca400d7..92e5a9a 100644 --- a/content/browser/devtools/protocol/tracing_handler.cc +++ b/content/browser/devtools/protocol/tracing_handler.cc
@@ -12,8 +12,8 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/format_macros.h" +#include "base/functional/bind.h" #include "base/json/json_writer.h" #include "base/memory/ref_counted_memory.h" #include "base/numerics/safe_conversions.h"
diff --git a/content/browser/devtools/protocol/visual_debugger_handler_browsertest.cc b/content/browser/devtools/protocol/visual_debugger_handler_browsertest.cc index cfb7d0f5..714c10be 100644 --- a/content/browser/devtools/protocol/visual_debugger_handler_browsertest.cc +++ b/content/browser/devtools/protocol/visual_debugger_handler_browsertest.cc
@@ -6,9 +6,9 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/json/json_reader.h" #include "base/system/sys_info.h" #include "base/test/scoped_feature_list.h"
diff --git a/content/browser/devtools/render_frame_devtools_agent_host.cc b/content/browser/devtools/render_frame_devtools_agent_host.cc index 2e0ecd5..04a6171 100644 --- a/content/browser/devtools/render_frame_devtools_agent_host.cc +++ b/content/browser/devtools/render_frame_devtools_agent_host.cc
@@ -9,7 +9,7 @@ #include <tuple> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/json/json_reader.h" #include "base/lazy_instance.h" #include "base/memory/ptr_util.h"
diff --git a/content/browser/devtools/service_worker_devtools_agent_host.cc b/content/browser/devtools/service_worker_devtools_agent_host.cc index 47d2d16..6b3bc3e8 100644 --- a/content/browser/devtools/service_worker_devtools_agent_host.cc +++ b/content/browser/devtools/service_worker_devtools_agent_host.cc
@@ -4,8 +4,8 @@ #include "content/browser/devtools/service_worker_devtools_agent_host.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ptr_util.h" #include "content/browser/devtools/devtools_renderer_channel.h" #include "content/browser/devtools/devtools_session.h"
diff --git a/content/browser/devtools/worker_devtools_agent_host.cc b/content/browser/devtools/worker_devtools_agent_host.cc index 3aad131..69bddee 100644 --- a/content/browser/devtools/worker_devtools_agent_host.cc +++ b/content/browser/devtools/worker_devtools_agent_host.cc
@@ -4,8 +4,8 @@ #include "content/browser/devtools/worker_devtools_agent_host.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "content/browser/devtools/devtools_session.h" #include "content/browser/devtools/protocol/io_handler.h" #include "content/browser/devtools/protocol/network_handler.h"
diff --git a/content/browser/direct_sockets/direct_sockets_test_utils.cc b/content/browser/direct_sockets/direct_sockets_test_utils.cc index fd2127fe..2ce8a60 100644 --- a/content/browser/direct_sockets/direct_sockets_test_utils.cc +++ b/content/browser/direct_sockets/direct_sockets_test_utils.cc
@@ -4,7 +4,7 @@ #include "content/browser/direct_sockets/direct_sockets_test_utils.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/json/json_reader.h" #include "base/notreached.h" #include "base/strings/stringprintf.h"
diff --git a/content/browser/direct_sockets/direct_sockets_test_utils.h b/content/browser/direct_sockets/direct_sockets_test_utils.h index 1ec69f91..44ff80aa6 100644 --- a/content/browser/direct_sockets/direct_sockets_test_utils.h +++ b/content/browser/direct_sockets/direct_sockets_test_utils.h
@@ -9,8 +9,8 @@ #include <memory> #include <string> -#include "base/callback_forward.h" #include "base/containers/span.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/notreached.h" #include "base/test/test_future.h"
diff --git a/content/browser/direct_sockets/direct_sockets_udp_unittest.cc b/content/browser/direct_sockets/direct_sockets_udp_unittest.cc index 1675415..7743db2 100644 --- a/content/browser/direct_sockets/direct_sockets_udp_unittest.cc +++ b/content/browser/direct_sockets/direct_sockets_udp_unittest.cc
@@ -4,8 +4,8 @@ #include "content/browser/direct_sockets/direct_udp_socket_impl.h" -#include "base/bind.h" #include "base/containers/span.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/task/sequenced_task_runner.h" #include "base/test/bind.h"
diff --git a/content/browser/do_not_track_browsertest.cc b/content/browser/do_not_track_browsertest.cc index 9b7e6b60..907eb57 100644 --- a/content/browser/do_not_track_browsertest.cc +++ b/content/browser/do_not_track_browsertest.cc
@@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/barrier_closure.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/strings/utf_string_conversions.h" #include "build/build_config.h"
diff --git a/content/browser/dom_storage/dom_storage_browsertest.cc b/content/browser/dom_storage/dom_storage_browsertest.cc index 0e6092fc..2057a1e 100644 --- a/content/browser/dom_storage/dom_storage_browsertest.cc +++ b/content/browser/dom_storage/dom_storage_browsertest.cc
@@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/bind.h" #include "base/command_line.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/test/bind.h" #include "base/threading/thread_restrictions.h"
diff --git a/content/browser/dom_storage/dom_storage_context_wrapper.cc b/content/browser/dom_storage/dom_storage_context_wrapper.cc index 1c5b6a4..40e64d1 100644 --- a/content/browser/dom_storage/dom_storage_context_wrapper.cc +++ b/content/browser/dom_storage/dom_storage_context_wrapper.cc
@@ -7,10 +7,10 @@ #include <string> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/memory/weak_ptr.h" #include "base/strings/strcat.h"
diff --git a/content/browser/dom_storage/dom_storage_context_wrapper_unittest.cc b/content/browser/dom_storage/dom_storage_context_wrapper_unittest.cc index 6488481..24b9e6a 100644 --- a/content/browser/dom_storage/dom_storage_context_wrapper_unittest.cc +++ b/content/browser/dom_storage/dom_storage_context_wrapper_unittest.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/guid.h" #include "base/run_loop.h" #include "content/browser/child_process_security_policy_impl.h"
diff --git a/content/browser/dom_storage/session_storage_namespace_impl.cc b/content/browser/dom_storage/session_storage_namespace_impl.cc index 2f5c1a72..8bcca903 100644 --- a/content/browser/dom_storage/session_storage_namespace_impl.cc +++ b/content/browser/dom_storage/session_storage_namespace_impl.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ptr_util.h" #include "components/services/storage/public/mojom/session_storage_control.mojom.h" #include "content/browser/dom_storage/dom_storage_context_wrapper.h"
diff --git a/content/browser/download/data_url_blob_reader.h b/content/browser/download/data_url_blob_reader.h index 0e00c97..699d35d 100644 --- a/content/browser/download/data_url_blob_reader.h +++ b/content/browser/download/data_url_blob_reader.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/sequence_checker.h" #include "mojo/public/cpp/bindings/pending_remote.h" #include "mojo/public/cpp/bindings/receiver.h"
diff --git a/content/browser/download/download_browsertest.cc b/content/browser/download/download_browsertest.cc index 615e3c80..ac4a5f15 100644 --- a/content/browser/download/download_browsertest.cc +++ b/content/browser/download/download_browsertest.cc
@@ -13,13 +13,13 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/containers/contains.h" #include "base/feature_list.h" #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" #include "base/format_macros.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h" #include "base/metrics/field_trial.h"
diff --git a/content/browser/download/download_manager_impl.cc b/content/browser/download/download_manager_impl.cc index 6dea288..7481ceaa 100644 --- a/content/browser/download/download_manager_impl.cc +++ b/content/browser/download/download_manager_impl.cc
@@ -7,12 +7,12 @@ #include <iterator> #include <utility> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/containers/contains.h" #include "base/debug/alias.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/i18n/case_conversion.h" #include "base/logging.h" #include "base/memory/ptr_util.h" @@ -751,15 +751,6 @@ return delegate_->GetQuarantineConnectionCallback(); } -std::unique_ptr<download::DownloadItemRenameHandler> -DownloadManagerImpl::GetRenameHandlerForDownload( - download::DownloadItemImpl* download_item) { - if (!delegate_) - return nullptr; - - return delegate_->GetRenameHandlerForDownload(download_item); -} - void DownloadManagerImpl::StartDownload( std::unique_ptr<download::DownloadCreateInfo> info, std::unique_ptr<download::InputStream> stream,
diff --git a/content/browser/download/download_manager_impl.h b/content/browser/download/download_manager_impl.h index 9ebcc91a..fdc6d7f 100644 --- a/content/browser/download/download_manager_impl.h +++ b/content/browser/download/download_manager_impl.h
@@ -13,7 +13,7 @@ #include <unordered_map> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h" @@ -264,9 +264,6 @@ void ReportBytesWasted(download::DownloadItemImpl* download) override; void BindWakeLockProvider( mojo::PendingReceiver<device::mojom::WakeLockProvider> receiver) override; - std::unique_ptr<download::DownloadItemRenameHandler> - GetRenameHandlerForDownload( - download::DownloadItemImpl* download_item) override; // Drops a download before it is created. void DropDownload();
diff --git a/content/browser/download/download_manager_impl_unittest.cc b/content/browser/download/download_manager_impl_unittest.cc index e69db1653..c939893 100644 --- a/content/browser/download/download_manager_impl_unittest.cc +++ b/content/browser/download/download_manager_impl_unittest.cc
@@ -14,9 +14,9 @@ #include <tuple> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/guid.h" #include "base/memory/weak_ptr.h" #include "base/run_loop.h"
diff --git a/content/browser/download/drag_download_file.cc b/content/browser/download/drag_download_file.cc index f5c1076..c721075 100644 --- a/content/browser/download/drag_download_file.cc +++ b/content/browser/download/drag_download_file.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" #include "base/files/file.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/memory/raw_ptr.h" #include "base/task/single_thread_task_runner.h"
diff --git a/content/browser/download/drag_download_util.cc b/content/browser/download/drag_download_util.cc index d440e2e..bc829ec4 100644 --- a/content/browser/download/drag_download_util.cc +++ b/content/browser/download/drag_download_util.cc
@@ -9,9 +9,9 @@ #include <memory> #include <string> -#include "base/bind.h" #include "base/files/file.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h"
diff --git a/content/browser/download/mhtml_generation_browsertest.cc b/content/browser/download/mhtml_generation_browsertest.cc index a7544a6..d13ab16e 100644 --- a/content/browser/download/mhtml_generation_browsertest.cc +++ b/content/browser/download/mhtml_generation_browsertest.cc
@@ -5,11 +5,11 @@ #include <stdint.h> #include <memory> -#include "base/bind.h" -#include "base/callback.h" #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/path_service.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h"
diff --git a/content/browser/download/mhtml_generation_manager.cc b/content/browser/download/mhtml_generation_manager.cc index 6f869f8..50c6ce2 100644 --- a/content/browser/download/mhtml_generation_manager.cc +++ b/content/browser/download/mhtml_generation_manager.cc
@@ -6,9 +6,9 @@ #include <utility> -#include "base/bind.h" #include "base/containers/queue.h" #include "base/files/file.h" +#include "base/functional/bind.h" #include "base/guid.h" #include "base/memory/ptr_util.h" #include "base/metrics/histogram_macros.h"
diff --git a/content/browser/download/save_file.cc b/content/browser/download/save_file.cc index f3d6bf2..b843603 100644 --- a/content/browser/download/save_file.cc +++ b/content/browser/download/save_file.cc
@@ -4,8 +4,8 @@ #include "content/browser/download/save_file.h" -#include "base/bind.h" #include "base/check.h" +#include "base/functional/bind.h" #include "base/notreached.h" #include "components/download/public/common/download_item.h" #include "components/download/public/common/download_task_runner.h"
diff --git a/content/browser/download/save_file_manager.cc b/content/browser/download/save_file_manager.cc index f064850..1f938cb 100644 --- a/content/browser/download/save_file_manager.cc +++ b/content/browser/download/save_file_manager.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/memory/raw_ptr.h" #include "base/strings/string_piece.h"
diff --git a/content/browser/download/save_package.cc b/content/browser/download/save_package.cc index 6e15e5f8..6e92cb28 100644 --- a/content/browser/download/save_package.cc +++ b/content/browser/download/save_package.cc
@@ -7,11 +7,11 @@ #include <algorithm> #include <utility> -#include "base/bind.h" #include "base/containers/contains.h" #include "base/containers/flat_map.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/i18n/file_util_icu.h" #include "base/logging.h" #include "base/memory/ptr_util.h"
diff --git a/content/browser/download/save_package_browsertest.cc b/content/browser/download/save_package_browsertest.cc index 4e0e8ff..c14d0ca 100644 --- a/content/browser/download/save_package_browsertest.cc +++ b/content/browser/download/save_package_browsertest.cc
@@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/bind.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h"
diff --git a/content/browser/download/save_package_serialization_handler.h b/content/browser/download/save_package_serialization_handler.h index 7105ad48..8914eb4 100644 --- a/content/browser/download/save_package_serialization_handler.h +++ b/content/browser/download/save_package_serialization_handler.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "content/common/frame.mojom.h" namespace content {
diff --git a/content/browser/eye_dropper_chooser_impl.cc b/content/browser/eye_dropper_chooser_impl.cc index f08fea8..a77b5f4d5 100644 --- a/content/browser/eye_dropper_chooser_impl.cc +++ b/content/browser/eye_dropper_chooser_impl.cc
@@ -4,7 +4,7 @@ #include "content/browser/eye_dropper_chooser_impl.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "content/browser/renderer_host/frame_tree_node.h" #include "content/browser/renderer_host/render_frame_host_impl.h" #include "content/public/browser/eye_dropper.h"
diff --git a/content/browser/fenced_frame/fenced_frame_browsertest.cc b/content/browser/fenced_frame/fenced_frame_browsertest.cc index 6d15580..04cbd159 100644 --- a/content/browser/fenced_frame/fenced_frame_browsertest.cc +++ b/content/browser/fenced_frame/fenced_frame_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 "base/callback.h" +#include "base/functional/callback.h" #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h" #include "base/test/bind.h"
diff --git a/content/browser/fenced_frame/fenced_frame_config.cc b/content/browser/fenced_frame/fenced_frame_config.cc index a169b544..f3e24d0 100644 --- a/content/browser/fenced_frame/fenced_frame_config.cc +++ b/content/browser/fenced_frame/fenced_frame_config.cc
@@ -3,7 +3,7 @@ // found in the LICENSE file. #include "content/browser/fenced_frame/fenced_frame_config.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/guid.h" #include "base/strings/strcat.h" #include "base/strings/string_util.h"
diff --git a/content/browser/fenced_frame/fenced_frame_config.h b/content/browser/fenced_frame/fenced_frame_config.h index 628a243..66ec165 100644 --- a/content/browser/fenced_frame/fenced_frame_config.h +++ b/content/browser/fenced_frame/fenced_frame_config.h
@@ -69,8 +69,8 @@ #ifndef CONTENT_BROWSER_FENCED_FRAME_FENCED_FRAME_CONFIG_H_ #define CONTENT_BROWSER_FENCED_FRAME_FENCED_FRAME_CONFIG_H_ -#include "base/callback_forward.h" #include "base/containers/flat_map.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "content/common/content_export.h" #include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/content/browser/fenced_frame/fenced_frame_url_mapping.cc b/content/browser/fenced_frame/fenced_frame_url_mapping.cc index 33631a1..62b4458 100644 --- a/content/browser/fenced_frame/fenced_frame_url_mapping.cc +++ b/content/browser/fenced_frame/fenced_frame_url_mapping.cc
@@ -8,8 +8,8 @@ #include <map> #include <string> -#include "base/callback.h" #include "base/check_op.h" +#include "base/functional/callback.h" #include "base/guid.h" #include "base/strings/strcat.h" #include "base/strings/string_util.h"
diff --git a/content/browser/fenced_frame/fenced_frame_url_mapping.h b/content/browser/fenced_frame/fenced_frame_url_mapping.h index fa249ad7..5848b26e 100644 --- a/content/browser/fenced_frame/fenced_frame_url_mapping.h +++ b/content/browser/fenced_frame/fenced_frame_url_mapping.h
@@ -10,8 +10,8 @@ #include <string> #include <vector> -#include "base/callback_forward.h" #include "base/containers/flat_map.h" +#include "base/functional/callback_forward.h" #include "base/gtest_prod_util.h" #include "base/memory/raw_ptr.h" #include "content/browser/fenced_frame/fenced_frame_config.h"
diff --git a/content/browser/fenced_frame/fenced_frame_url_mapping_unittest.cc b/content/browser/fenced_frame/fenced_frame_url_mapping_unittest.cc index cf1c1c4e..333761c 100644 --- a/content/browser/fenced_frame/fenced_frame_url_mapping_unittest.cc +++ b/content/browser/fenced_frame/fenced_frame_url_mapping_unittest.cc
@@ -4,7 +4,7 @@ #include "content/browser/fenced_frame/fenced_frame_url_mapping.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h"
diff --git a/content/browser/field_trial_synchronizer.cc b/content/browser/field_trial_synchronizer.cc index 814e604..5b14e3f 100644 --- a/content/browser/field_trial_synchronizer.cc +++ b/content/browser/field_trial_synchronizer.cc
@@ -4,8 +4,8 @@ #include "content/browser/field_trial_synchronizer.h" -#include "base/bind.h" #include "base/check_op.h" +#include "base/functional/bind.h" #include "base/threading/thread.h" #include "components/metrics/persistent_system_profile.h" #include "components/variations/variations_client.h"
diff --git a/content/browser/file_system/browser_file_system_helper.cc b/content/browser/file_system/browser_file_system_helper.cc index ec03d970..64c74fc 100644 --- a/content/browser/file_system/browser_file_system_helper.cc +++ b/content/browser/file_system/browser_file_system_helper.cc
@@ -10,9 +10,9 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/command_line.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/strings/utf_string_conversions.h" #include "base/task/lazy_thread_pool_task_runner.h" #include "base/task/sequenced_task_runner.h"
diff --git a/content/browser/file_system/file_system_browsertest.cc b/content/browser/file_system/file_system_browsertest.cc index 8584145..96397fd 100644 --- a/content/browser/file_system/file_system_browsertest.cc +++ b/content/browser/file_system/file_system_browsertest.cc
@@ -4,9 +4,9 @@ #include <stdint.h> -#include "base/bind.h" #include "base/command_line.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h"
diff --git a/content/browser/file_system/file_system_manager_impl.cc b/content/browser/file_system/file_system_manager_impl.cc index 2afa431..0f76195 100644 --- a/content/browser/file_system/file_system_manager_impl.cc +++ b/content/browser/file_system/file_system_manager_impl.cc
@@ -6,9 +6,9 @@ #include <utility> -#include "base/bind.h" #include "base/check_op.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/guid.h" #include "base/memory/raw_ptr.h" #include "base/metrics/user_metrics.h"
diff --git a/content/browser/file_system/file_system_manager_impl.h b/content/browser/file_system/file_system_manager_impl.h index d89a708..eb43e11 100644 --- a/content/browser/file_system/file_system_manager_impl.h +++ b/content/browser/file_system/file_system_manager_impl.h
@@ -14,7 +14,7 @@ #include <unordered_map> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h" #include "components/services/filesystem/public/mojom/types.mojom.h"
diff --git a/content/browser/file_system/file_system_operation_runner_unittest.cc b/content/browser/file_system/file_system_operation_runner_unittest.cc index 2cdc381..e67c8beb 100644 --- a/content/browser/file_system/file_system_operation_runner_unittest.cc +++ b/content/browser/file_system/file_system_operation_runner_unittest.cc
@@ -4,10 +4,10 @@ #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/scoped_refptr.h" #include "base/run_loop.h" #include "base/task/single_thread_task_runner.h"
diff --git a/content/browser/file_system/file_system_url_loader_factory.cc b/content/browser/file_system/file_system_url_loader_factory.cc index cc0afec2e..707974c 100644 --- a/content/browser/file_system/file_system_url_loader_factory.cc +++ b/content/browser/file_system/file_system_url_loader_factory.cc
@@ -10,8 +10,8 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "base/strings/string_piece.h"
diff --git a/content/browser/file_system/file_system_url_loader_factory_browsertest.cc b/content/browser/file_system/file_system_url_loader_factory_browsertest.cc index 5927dca8..69f0207c9 100644 --- a/content/browser/file_system/file_system_url_loader_factory_browsertest.cc +++ b/content/browser/file_system/file_system_url_loader_factory_browsertest.cc
@@ -8,11 +8,11 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/command_line.h" #include "base/feature_list.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" #include "base/i18n/unicodestring.h" #include "base/memory/raw_ptr.h" #include "base/rand_util.h"
diff --git a/content/browser/file_system_access/file_system_access_access_handle_host_impl.h b/content/browser/file_system_access/file_system_access_access_handle_host_impl.h index 34b9f9f..8bb3c1c 100644 --- a/content/browser/file_system_access/file_system_access_access_handle_host_impl.h +++ b/content/browser/file_system_access/file_system_access_access_handle_host_impl.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "content/browser/file_system_access/file_system_access_capacity_allocation_host_impl.h" #include "content/browser/file_system_access/file_system_access_file_delegate_host_impl.h"
diff --git a/content/browser/file_system_access/file_system_access_directory_handle_impl_unittest.cc b/content/browser/file_system_access/file_system_access_directory_handle_impl_unittest.cc index 836dfd18..697c1d14 100644 --- a/content/browser/file_system_access/file_system_access_directory_handle_impl_unittest.cc +++ b/content/browser/file_system_access/file_system_access_directory_handle_impl_unittest.cc
@@ -8,9 +8,9 @@ #include <string> #include <tuple> -#include "base/bind.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/test/bind.h"
diff --git a/content/browser/file_system_access/file_system_access_file_delegate_host_impl.cc b/content/browser/file_system_access/file_system_access_file_delegate_host_impl.cc index 9a28f2b..6581f5a 100644 --- a/content/browser/file_system_access/file_system_access_file_delegate_host_impl.cc +++ b/content/browser/file_system_access/file_system_access_file_delegate_host_impl.cc
@@ -7,9 +7,9 @@ #include <cstdint> #include "base/allocator/partition_allocator/partition_alloc_constants.h" -#include "base/bind.h" -#include "base/callback_forward.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_forward.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/memory/scoped_refptr.h" #include "base/numerics/safe_math.h"
diff --git a/content/browser/file_system_access/file_system_access_file_handle_impl.cc b/content/browser/file_system_access/file_system_access_file_handle_impl.cc index f7121a1..5609c5c 100644 --- a/content/browser/file_system_access/file_system_access_file_handle_impl.cc +++ b/content/browser/file_system_access/file_system_access_file_handle_impl.cc
@@ -4,10 +4,10 @@ #include "content/browser/file_system_access/file_system_access_file_handle_impl.h" -#include "base/callback_forward.h" -#include "base/callback_helpers.h" #include "base/files/file_error_or.h" #include "base/files/file_util.h" +#include "base/functional/callback_forward.h" +#include "base/functional/callback_helpers.h" #include "base/guid.h" #include "base/logging.h" #include "base/strings/stringprintf.h"
diff --git a/content/browser/file_system_access/file_system_access_file_handle_impl.h b/content/browser/file_system_access/file_system_access_file_handle_impl.h index 7d04c39..daaaabd2 100644 --- a/content/browser/file_system_access/file_system_access_file_handle_impl.h +++ b/content/browser/file_system_access/file_system_access_file_handle_impl.h
@@ -5,9 +5,9 @@ #ifndef CONTENT_BROWSER_FILE_SYSTEM_ACCESS_FILE_SYSTEM_ACCESS_FILE_HANDLE_IMPL_H_ #define CONTENT_BROWSER_FILE_SYSTEM_ACCESS_FILE_SYSTEM_ACCESS_FILE_HANDLE_IMPL_H_ -#include "base/callback_helpers.h" #include "base/files/file.h" #include "base/files/file_error_or.h" +#include "base/functional/callback_helpers.h" #include "base/memory/weak_ptr.h" #include "base/thread_annotations.h" #include "content/browser/file_system_access/file_system_access_handle_base.h"
diff --git a/content/browser/file_system_access/file_system_access_file_writer_impl.cc b/content/browser/file_system_access/file_system_access_file_writer_impl.cc index 8dfdd33a..6b47a7e 100644 --- a/content/browser/file_system_access/file_system_access_file_writer_impl.cc +++ b/content/browser/file_system_access/file_system_access_file_writer_impl.cc
@@ -4,7 +4,7 @@ #include "content/browser/file_system_access/file_system_access_file_writer_impl.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/memory/weak_ptr.h" #include "content/browser/file_system_access/file_system_access_error.h"
diff --git a/content/browser/file_system_access/file_system_access_file_writer_impl_unittest.cc b/content/browser/file_system_access/file_system_access_file_writer_impl_unittest.cc index 1c809f6..f24d5d6 100644 --- a/content/browser/file_system_access/file_system_access_file_writer_impl_unittest.cc +++ b/content/browser/file_system_access/file_system_access_file_writer_impl_unittest.cc
@@ -9,10 +9,10 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/containers/contains.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/guid.h" #include "base/memory/raw_ptr.h" #include "base/task/sequenced_task_runner.h"
diff --git a/content/browser/file_system_access/file_system_access_handle_base.cc b/content/browser/file_system_access/file_system_access_handle_base.cc index e452c56..da51d3d 100644 --- a/content/browser/file_system_access/file_system_access_handle_base.cc +++ b/content/browser/file_system_access/file_system_access_handle_base.cc
@@ -7,10 +7,10 @@ #include <memory> #include <vector> -#include "base/bind.h" #include "base/command_line.h" #include "base/feature_list.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/strings/strcat.h" #include "base/strings/utf_string_conversions.h" #include "content/browser/file_system_access/features.h"
diff --git a/content/browser/file_system_access/file_system_access_manager_impl.cc b/content/browser/file_system_access/file_system_access_manager_impl.cc index f646003..6ae9c93 100644 --- a/content/browser/file_system_access/file_system_access_manager_impl.cc +++ b/content/browser/file_system_access/file_system_access_manager_impl.cc
@@ -6,14 +6,14 @@ #include <string> -#include "base/bind.h" -#include "base/callback_forward.h" -#include "base/callback_helpers.h" #include "base/check_op.h" #include "base/command_line.h" #include "base/files/file.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback_forward.h" +#include "base/functional/callback_helpers.h" #include "base/guid.h" #include "base/notreached.h" #include "base/ranges/algorithm.h"
diff --git a/content/browser/file_system_access/file_system_access_manager_impl.h b/content/browser/file_system_access/file_system_access_manager_impl.h index 3764c7c5..b2bba5f 100644 --- a/content/browser/file_system_access/file_system_access_manager_impl.h +++ b/content/browser/file_system_access/file_system_access_manager_impl.h
@@ -5,10 +5,10 @@ #ifndef CONTENT_BROWSER_FILE_SYSTEM_ACCESS_FILE_SYSTEM_ACCESS_MANAGER_IMPL_H_ #define CONTENT_BROWSER_FILE_SYSTEM_ACCESS_FILE_SYSTEM_ACCESS_MANAGER_IMPL_H_ -#include "base/callback_forward.h" #include "base/containers/flat_set.h" #include "base/containers/unique_ptr_adapters.h" #include "base/files/file_path.h" +#include "base/functional/callback_forward.h" #include "base/guid.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h"
diff --git a/content/browser/file_system_access/file_system_access_manager_impl_unittest.cc b/content/browser/file_system_access/file_system_access_manager_impl_unittest.cc index eeb2744..7f1cd20e 100644 --- a/content/browser/file_system_access/file_system_access_manager_impl_unittest.cc +++ b/content/browser/file_system_access/file_system_access_manager_impl_unittest.cc
@@ -8,10 +8,10 @@ #include <utility> #include <vector> -#include "base/callback_helpers.h" #include "base/feature_list.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/callback_helpers.h" #include "base/guid.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h"
diff --git a/content/browser/file_system_access/file_system_chooser.h b/content/browser/file_system_access/file_system_chooser.h index 18f71a3..f1442f7 100644 --- a/content/browser/file_system_access/file_system_chooser.h +++ b/content/browser/file_system_access/file_system_chooser.h
@@ -7,9 +7,9 @@ #include <string> -#include "base/callback_helpers.h" #include "base/files/file.h" #include "base/files/file_path.h" +#include "base/functional/callback_helpers.h" #include "base/task/task_runner.h" #include "base/thread_annotations.h" #include "content/common/content_export.h"
diff --git a/content/browser/file_system_access/file_system_chooser_unittest.cc b/content/browser/file_system_access/file_system_chooser_unittest.cc index 3e3f49c..df45b36 100644 --- a/content/browser/file_system_access/file_system_chooser_unittest.cc +++ b/content/browser/file_system_access/file_system_chooser_unittest.cc
@@ -6,9 +6,9 @@ #include <string> -#include "base/callback_helpers.h" #include "base/containers/contains.h" #include "base/files/file_path.h" +#include "base/functional/callback_helpers.h" #include "base/ranges/algorithm.h" #include "base/strings/utf_string_conversions.h" #include "base/test/bind.h"
diff --git a/content/browser/find_request_manager.cc b/content/browser/find_request_manager.cc index ea59df3..02b4a23 100644 --- a/content/browser/find_request_manager.cc +++ b/content/browser/find_request_manager.cc
@@ -6,9 +6,9 @@ #include <utility> -#include "base/bind.h" #include "base/containers/contains.h" #include "base/containers/queue.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/metrics/histogram_macros.h" #include "base/ranges/algorithm.h"
diff --git a/content/browser/first_party_sets/first_party_sets_handler_impl.cc b/content/browser/first_party_sets/first_party_sets_handler_impl.cc index 3c457c85..593913e 100644 --- a/content/browser/first_party_sets/first_party_sets_handler_impl.cc +++ b/content/browser/first_party_sets/first_party_sets_handler_impl.cc
@@ -7,8 +7,8 @@ #include <string> #include <vector> -#include "base/bind.h" #include "base/files/file.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/metrics/histogram_functions.h" #include "base/task/thread_pool.h"
diff --git a/content/browser/first_party_sets/first_party_sets_handler_impl.h b/content/browser/first_party_sets/first_party_sets_handler_impl.h index 041d3ac4..8d0ed47 100644 --- a/content/browser/first_party_sets/first_party_sets_handler_impl.h +++ b/content/browser/first_party_sets/first_party_sets_handler_impl.h
@@ -8,10 +8,10 @@ #include <string> #include <utility> -#include "base/callback.h" #include "base/containers/circular_deque.h" #include "base/files/file.h" #include "base/files/file_path.h" +#include "base/functional/callback.h" #include "base/no_destructor.h" #include "base/sequence_checker.h" #include "base/thread_annotations.h"
diff --git a/content/browser/first_party_sets/first_party_sets_handler_impl_unittest.cc b/content/browser/first_party_sets/first_party_sets_handler_impl_unittest.cc index 4141e52e..4cf53aa 100644 --- a/content/browser/first_party_sets/first_party_sets_handler_impl_unittest.cc +++ b/content/browser/first_party_sets/first_party_sets_handler_impl_unittest.cc
@@ -6,7 +6,6 @@ #include <string> -#include "base/callback_helpers.h" #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h"
diff --git a/content/browser/first_party_sets/first_party_sets_loader.h b/content/browser/first_party_sets/first_party_sets_loader.h index 2ccf2af..7ecd1c72 100644 --- a/content/browser/first_party_sets/first_party_sets_loader.h +++ b/content/browser/first_party_sets/first_party_sets_loader.h
@@ -5,8 +5,8 @@ #ifndef CONTENT_BROWSER_FIRST_PARTY_SETS_FIRST_PARTY_SETS_LOADER_H_ #define CONTENT_BROWSER_FIRST_PARTY_SETS_FIRST_PARTY_SETS_LOADER_H_ -#include "base/callback.h" #include "base/files/file.h" +#include "base/functional/callback.h" #include "base/sequence_checker.h" #include "base/thread_annotations.h" #include "base/timer/elapsed_timer.h"
diff --git a/content/browser/first_party_sets/first_party_sets_site_data_remover.h b/content/browser/first_party_sets/first_party_sets_site_data_remover.h index 9496fa1e..d6865ab 100644 --- a/content/browser/first_party_sets/first_party_sets_site_data_remover.h +++ b/content/browser/first_party_sets/first_party_sets_site_data_remover.h
@@ -8,7 +8,7 @@ #include <inttypes.h> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "content/common/content_export.h" #include "content/public/browser/browsing_data_remover.h"
diff --git a/content/browser/font_access/font_access_manager.cc b/content/browser/font_access/font_access_manager.cc index 00ef53c2..681a7776 100644 --- a/content/browser/font_access/font_access_manager.cc +++ b/content/browser/font_access/font_access_manager.cc
@@ -9,7 +9,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/read_only_shared_memory_region.h" #include "base/sequence_checker.h" #include "base/task/thread_pool.h"
diff --git a/content/browser/font_list_async.cc b/content/browser/font_list_async.cc index c57cfca..c7e4b14a 100644 --- a/content/browser/font_list_async.cc +++ b/content/browser/font_list_async.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/values.h" #include "content/common/font_list.h"
diff --git a/content/browser/generic_sensor/generic_sensor_browsertest.cc b/content/browser/generic_sensor/generic_sensor_browsertest.cc index c3e8e17..0f42e774 100644 --- a/content/browser/generic_sensor/generic_sensor_browsertest.cc +++ b/content/browser/generic_sensor/generic_sensor_browsertest.cc
@@ -4,8 +4,8 @@ #include <memory> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/test/scoped_feature_list.h" #include "base/threading/platform_thread.h" #include "build/build_config.h"
diff --git a/content/browser/generic_sensor/sensor_provider_proxy_impl.cc b/content/browser/generic_sensor/sensor_provider_proxy_impl.cc index 18bacb2..bffcac89 100644 --- a/content/browser/generic_sensor/sensor_provider_proxy_impl.cc +++ b/content/browser/generic_sensor/sensor_provider_proxy_impl.cc
@@ -7,7 +7,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/no_destructor.h" #include "base/ranges/algorithm.h" #include "content/browser/renderer_host/render_frame_host_impl.h"
diff --git a/content/browser/generic_sensor/sensor_provider_proxy_impl_unittest.cc b/content/browser/generic_sensor/sensor_provider_proxy_impl_unittest.cc index ff7c9c9..ea07b1e2 100644 --- a/content/browser/generic_sensor/sensor_provider_proxy_impl_unittest.cc +++ b/content/browser/generic_sensor/sensor_provider_proxy_impl_unittest.cc
@@ -4,8 +4,8 @@ #include <memory> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/test/bind.h" #include "content/browser/generic_sensor/sensor_provider_proxy_impl.h" #include "content/public/test/mock_permission_manager.h"
diff --git a/content/browser/geolocation/geolocation_service_impl.cc b/content/browser/geolocation/geolocation_service_impl.cc index 2eca89d..efaa068f 100644 --- a/content/browser/geolocation/geolocation_service_impl.cc +++ b/content/browser/geolocation/geolocation_service_impl.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "content/public/browser/browser_context.h" #include "content/public/browser/permission_controller.h" #include "content/public/browser/render_frame_host.h"
diff --git a/content/browser/geolocation/geolocation_service_impl_unittest.cc b/content/browser/geolocation/geolocation_service_impl_unittest.cc index 4ecf64c4..731afae 100644 --- a/content/browser/geolocation/geolocation_service_impl_unittest.cc +++ b/content/browser/geolocation/geolocation_service_impl_unittest.cc
@@ -6,8 +6,8 @@ #include <memory> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "base/task/single_thread_task_runner.h" #include "content/browser/permissions/permission_controller_impl.h"
diff --git a/content/browser/gpu/browser_gpu_channel_host_factory.cc b/content/browser/gpu/browser_gpu_channel_host_factory.cc index 6f34a77..d445d08f 100644 --- a/content/browser/gpu/browser_gpu_channel_host_factory.cc +++ b/content/browser/gpu/browser_gpu_channel_host_factory.cc
@@ -7,9 +7,9 @@ #include <utility> #include "base/android/orderfile/orderfile_buildflags.h" -#include "base/bind.h" #include "base/command_line.h" #include "base/compiler_specific.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/process/process_handle.h" #include "base/synchronization/waitable_event.h"
diff --git a/content/browser/gpu/ca_transaction_gpu_coordinator.cc b/content/browser/gpu/ca_transaction_gpu_coordinator.cc index ddb3303..c660c572 100644 --- a/content/browser/gpu/ca_transaction_gpu_coordinator.cc +++ b/content/browser/gpu/ca_transaction_gpu_coordinator.cc
@@ -4,8 +4,8 @@ #include "content/browser/gpu/ca_transaction_gpu_coordinator.h" -#include "base/bind.h" #include "base/cancelable_callback.h" +#include "base/functional/bind.h" #include "content/browser/gpu/gpu_process_host.h" #include "content/public/browser/browser_task_traits.h" #include "content/public/browser/browser_thread.h"
diff --git a/content/browser/gpu/chromeos/video_capture_dependencies.cc b/content/browser/gpu/chromeos/video_capture_dependencies.cc index 655b879..a29543bb 100644 --- a/content/browser/gpu/chromeos/video_capture_dependencies.cc +++ b/content/browser/gpu/chromeos/video_capture_dependencies.cc
@@ -4,7 +4,7 @@ #include "content/browser/gpu/chromeos/video_capture_dependencies.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "build/chromeos_buildflags.h" #include "content/browser/gpu/gpu_process_host.h" #include "content/public/browser/browser_task_traits.h"
diff --git a/content/browser/gpu/gpu_data_manager_impl_private.cc b/content/browser/gpu/gpu_data_manager_impl_private.cc index c0a7b6b..280c20a 100644 --- a/content/browser/gpu/gpu_data_manager_impl_private.cc +++ b/content/browser/gpu/gpu_data_manager_impl_private.cc
@@ -17,13 +17,13 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/debug/dump_without_crashing.h" #include "base/feature_list.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/metrics/field_trial.h" #include "base/metrics/histogram_functions.h" #include "base/metrics/histogram_macros.h"
diff --git a/content/browser/gpu/gpu_feature_checker_impl.h b/content/browser/gpu/gpu_feature_checker_impl.h index fc9adc0..c040eb56 100644 --- a/content/browser/gpu/gpu_feature_checker_impl.h +++ b/content/browser/gpu/gpu_feature_checker_impl.h
@@ -5,7 +5,7 @@ #ifndef CONTENT_BROWSER_GPU_GPU_FEATURE_CHECKER_IMPL_H_ #define CONTENT_BROWSER_GPU_GPU_FEATURE_CHECKER_IMPL_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "content/public/browser/gpu_data_manager_observer.h" #include "content/public/browser/gpu_feature_checker.h" #include "gpu/config/gpu_feature_type.h"
diff --git a/content/browser/gpu/gpu_internals_ui.cc b/content/browser/gpu/gpu_internals_ui.cc index dfac5676..f77a508b 100644 --- a/content/browser/gpu/gpu_internals_ui.cc +++ b/content/browser/gpu/gpu_internals_ui.cc
@@ -11,11 +11,11 @@ #include <utility> #include "base/base64.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/containers/contains.h" #include "base/environment.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/i18n/time_formatting.h" #include "base/strings/string_number_conversions.h" #include "base/strings/stringize_macros.h"
diff --git a/content/browser/gpu/gpu_ipc_browsertests.cc b/content/browser/gpu/gpu_ipc_browsertests.cc index d4bacc5..ce9a1694 100644 --- a/content/browser/gpu/gpu_ipc_browsertests.cc +++ b/content/browser/gpu/gpu_ipc_browsertests.cc
@@ -108,7 +108,7 @@ // Include the shared tests. #define CONTEXT_TEST_F IN_PROC_BROWSER_TEST_F -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/task/single_thread_task_runner.h" #include "build/chromeos_buildflags.h" #include "content/public/browser/browser_thread.h"
diff --git a/content/browser/gpu/gpu_memory_buffer_manager_singleton.cc b/content/browser/gpu/gpu_memory_buffer_manager_singleton.cc index 8c981d34..1899912 100644 --- a/content/browser/gpu/gpu_memory_buffer_manager_singleton.cc +++ b/content/browser/gpu/gpu_memory_buffer_manager_singleton.cc
@@ -4,8 +4,8 @@ #include "content/browser/gpu/gpu_memory_buffer_manager_singleton.h" -#include "base/bind.h" #include "base/check_op.h" +#include "base/functional/bind.h" #include "base/task/single_thread_task_runner.h" #include "build/build_config.h" #include "components/viz/host/gpu_host_impl.h"
diff --git a/content/browser/gpu/gpu_process_host.cc b/content/browser/gpu/gpu_process_host.cc index 3739432..d89ee14c 100644 --- a/content/browser/gpu/gpu_process_host.cc +++ b/content/browser/gpu/gpu_process_host.cc
@@ -13,11 +13,11 @@ #include "base/base64.h" #include "base/base_switches.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/cxx17_backports.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/memory/ref_counted.h" #include "base/message_loop/message_pump_type.h"
diff --git a/content/browser/gpu/gpu_process_host.h b/content/browser/gpu/gpu_process_host.h index 934bf01..5e17fdf0 100644 --- a/content/browser/gpu/gpu_process_host.h +++ b/content/browser/gpu/gpu_process_host.h
@@ -13,7 +13,7 @@ #include <string> #include "base/atomicops.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/location.h" #include "base/memory/memory_pressure_listener.h" #include "base/memory/weak_ptr.h"
diff --git a/content/browser/gpu/in_process_gpu_thread_browsertests.cc b/content/browser/gpu/in_process_gpu_thread_browsertests.cc index 50f3c9d4..de09f71b 100644 --- a/content/browser/gpu/in_process_gpu_thread_browsertests.cc +++ b/content/browser/gpu/in_process_gpu_thread_browsertests.cc
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "content/browser/browser_main_loop.h" #include "content/browser/gpu/gpu_process_host.h"
diff --git a/content/browser/gpu/peak_gpu_memory_tracker_impl.cc b/content/browser/gpu/peak_gpu_memory_tracker_impl.cc index c044e41..77c9952 100644 --- a/content/browser/gpu/peak_gpu_memory_tracker_impl.cc +++ b/content/browser/gpu/peak_gpu_memory_tracker_impl.cc
@@ -6,8 +6,8 @@ #include <memory> -#include "base/bind.h" #include "base/containers/flat_map.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/metrics/histogram_macros.h" #include "base/strings/strcat.h"
diff --git a/content/browser/gpu/peak_gpu_memory_tracker_impl.h b/content/browser/gpu/peak_gpu_memory_tracker_impl.h index bb0657d1..00a31d0 100644 --- a/content/browser/gpu/peak_gpu_memory_tracker_impl.h +++ b/content/browser/gpu/peak_gpu_memory_tracker_impl.h
@@ -5,8 +5,8 @@ #ifndef CONTENT_BROWSER_GPU_PEAK_GPU_MEMORY_TRACKER_IMPL_H_ #define CONTENT_BROWSER_GPU_PEAK_GPU_MEMORY_TRACKER_IMPL_H_ -#include "base/callback_forward.h" -#include "base/callback_helpers.h" +#include "base/functional/callback_forward.h" +#include "base/functional/callback_helpers.h" #include "base/task/single_thread_task_runner.h" #include "content/public/browser/peak_gpu_memory_tracker.h"
diff --git a/content/browser/gpu/peak_gpu_memory_tracker_impl_browsertest.cc b/content/browser/gpu/peak_gpu_memory_tracker_impl_browsertest.cc index b6b241d..f344157f 100644 --- a/content/browser/gpu/peak_gpu_memory_tracker_impl_browsertest.cc +++ b/content/browser/gpu/peak_gpu_memory_tracker_impl_browsertest.cc
@@ -4,8 +4,8 @@ #include "content/browser/gpu/peak_gpu_memory_tracker_impl.h" -#include "base/bind.h" #include "base/clang_profiling_buildflags.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/run_loop.h" #include "base/test/metrics/histogram_tester.h"
diff --git a/content/browser/handwriting/handwriting_recognizer_impl.cc b/content/browser/handwriting/handwriting_recognizer_impl.cc index aae398a..57febc0 100644 --- a/content/browser/handwriting/handwriting_recognizer_impl.cc +++ b/content/browser/handwriting/handwriting_recognizer_impl.cc
@@ -8,7 +8,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "mojo/public/cpp/bindings/receiver.h" #include "mojo/public/cpp/bindings/self_owned_receiver.h" #include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/content/browser/handwriting/handwriting_recognizer_impl_cros.cc b/content/browser/handwriting/handwriting_recognizer_impl_cros.cc index d48b22a..4438c44a 100644 --- a/content/browser/handwriting/handwriting_recognizer_impl_cros.cc +++ b/content/browser/handwriting/handwriting_recognizer_impl_cros.cc
@@ -8,7 +8,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/notreached.h" #include "base/strings/string_piece.h"
diff --git a/content/browser/hid/hid_service.cc b/content/browser/hid/hid_service.cc index 49d16eb..501d47f 100644 --- a/content/browser/hid/hid_service.cc +++ b/content/browser/hid/hid_service.cc
@@ -7,12 +7,12 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/containers/contains.h" #include "base/containers/cxx20_erase.h" #include "base/debug/stack_trace.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "content/browser/web_contents/web_contents_impl.h" #include "content/public/browser/content_browser_client.h" #include "content/public/browser/document_service.h"
diff --git a/content/browser/hid/hid_test_utils.cc b/content/browser/hid/hid_test_utils.cc index ee1221f..595ceb4 100644 --- a/content/browser/hid/hid_test_utils.cc +++ b/content/browser/hid/hid_test_utils.cc
@@ -7,7 +7,7 @@ #include <utility> -#include "base/callback.h" +#include "base/functional/callback.h" namespace content {
diff --git a/content/browser/idle/idle_manager_impl.cc b/content/browser/idle/idle_manager_impl.cc index 1084c61..1d02f133 100644 --- a/content/browser/idle/idle_manager_impl.cc +++ b/content/browser/idle/idle_manager_impl.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "content/public/browser/browser_context.h" #include "content/public/browser/permission_controller.h" #include "content/public/browser/render_frame_host.h"
diff --git a/content/browser/idle/idle_manager_unittest.cc b/content/browser/idle/idle_manager_unittest.cc index ea05878..58363864 100644 --- a/content/browser/idle/idle_manager_unittest.cc +++ b/content/browser/idle/idle_manager_unittest.cc
@@ -5,8 +5,8 @@ #include <tuple> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h"
diff --git a/content/browser/image_capture/image_capture_impl.cc b/content/browser/image_capture/image_capture_impl.cc index 1bdd1a3..6edd533 100644 --- a/content/browser/image_capture/image_capture_impl.cc +++ b/content/browser/image_capture/image_capture_impl.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/unguessable_token.h" #include "content/browser/browser_main_loop.h" #include "content/browser/media/media_devices_permission_checker.h"
diff --git a/content/browser/indexed_db/cursor_impl.cc b/content/browser/indexed_db/cursor_impl.cc index c4f55b6d..6df8705 100644 --- a/content/browser/indexed_db/cursor_impl.cc +++ b/content/browser/indexed_db/cursor_impl.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/task/sequenced_task_runner.h" #include "content/browser/indexed_db/indexed_db_callbacks.h" #include "content/browser/indexed_db/indexed_db_cursor.h"
diff --git a/content/browser/indexed_db/database_impl.cc b/content/browser/indexed_db/database_impl.cc index 39cabad..69c34491 100644 --- a/content/browser/indexed_db/database_impl.cc +++ b/content/browser/indexed_db/database_impl.cc
@@ -7,7 +7,7 @@ #include <set> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/scoped_refptr.h" #include "base/metrics/histogram_macros.h" #include "base/numerics/safe_math.h"
diff --git a/content/browser/indexed_db/file_stream_reader_to_data_pipe.cc b/content/browser/indexed_db/file_stream_reader_to_data_pipe.cc index eed3a6a8..e01c709 100644 --- a/content/browser/indexed_db/file_stream_reader_to_data_pipe.cc +++ b/content/browser/indexed_db/file_stream_reader_to_data_pipe.cc
@@ -4,7 +4,7 @@ #include "content/browser/indexed_db/file_stream_reader_to_data_pipe.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/scoped_refptr.h" #include "base/task/sequenced_task_runner.h" #include "net/base/net_errors.h"
diff --git a/content/browser/indexed_db/file_stream_reader_to_data_pipe.h b/content/browser/indexed_db/file_stream_reader_to_data_pipe.h index 852d9619..a24871b 100644 --- a/content/browser/indexed_db/file_stream_reader_to_data_pipe.h +++ b/content/browser/indexed_db/file_stream_reader_to_data_pipe.h
@@ -5,7 +5,7 @@ #ifndef CONTENT_BROWSER_INDEXED_DB_FILE_STREAM_READER_TO_DATA_PIPE_H_ #define CONTENT_BROWSER_INDEXED_DB_FILE_STREAM_READER_TO_DATA_PIPE_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/weak_ptr.h" #include "mojo/public/cpp/system/data_pipe.h" #include "mojo/public/cpp/system/simple_watcher.h"
diff --git a/content/browser/indexed_db/indexed_db_active_blob_registry.cc b/content/browser/indexed_db/indexed_db_active_blob_registry.cc index af12f57..3d62291 100644 --- a/content/browser/indexed_db/indexed_db_active_blob_registry.cc +++ b/content/browser/indexed_db/indexed_db_active_blob_registry.cc
@@ -4,8 +4,8 @@ #include "content/browser/indexed_db/indexed_db_active_blob_registry.h" -#include "base/bind.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/task/task_runner.h" #include "content/browser/indexed_db/indexed_db_backing_store.h"
diff --git a/content/browser/indexed_db/indexed_db_active_blob_registry.h b/content/browser/indexed_db/indexed_db_active_blob_registry.h index 04f108c..0888b44 100644 --- a/content/browser/indexed_db/indexed_db_active_blob_registry.h +++ b/content/browser/indexed_db/indexed_db_active_blob_registry.h
@@ -11,7 +11,7 @@ #include <set> #include <utility> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "base/sequence_checker.h" #include "content/common/content_export.h"
diff --git a/content/browser/indexed_db/indexed_db_active_blob_registry_unittest.cc b/content/browser/indexed_db/indexed_db_active_blob_registry_unittest.cc index a2f0a47..d67d24f 100644 --- a/content/browser/indexed_db/indexed_db_active_blob_registry_unittest.cc +++ b/content/browser/indexed_db/indexed_db_active_blob_registry_unittest.cc
@@ -7,8 +7,8 @@ #include <memory> #include <set> -#include "base/bind.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/test/task_environment.h" #include "content/browser/indexed_db/indexed_db_active_blob_registry.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/content/browser/indexed_db/indexed_db_backing_store.cc b/content/browser/indexed_db/indexed_db_backing_store.cc index 0554e6ef..de524741 100644 --- a/content/browser/indexed_db/indexed_db_backing_store.cc +++ b/content/browser/indexed_db/indexed_db_backing_store.cc
@@ -8,10 +8,10 @@ #include <tuple> #include <utility> -#include "base/bind.h" #include "base/dcheck_is_on.h" #include "base/files/file_path.h" #include "base/format_macros.h" +#include "base/functional/bind.h" #include "base/json/json_reader.h" #include "base/json/json_writer.h" #include "base/logging.h"
diff --git a/content/browser/indexed_db/indexed_db_backing_store_unittest.cc b/content/browser/indexed_db/indexed_db_backing_store_unittest.cc index 3af6ab50..7b9712b 100644 --- a/content/browser/indexed_db/indexed_db_backing_store_unittest.cc +++ b/content/browser/indexed_db/indexed_db_backing_store_unittest.cc
@@ -12,12 +12,12 @@ #include <utility> #include "base/barrier_closure.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/check_op.h" #include "base/containers/span.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/guid.h" #include "base/memory/raw_ptr.h" #include "base/notreached.h"
diff --git a/content/browser/indexed_db/indexed_db_browsertest.cc b/content/browser/indexed_db/indexed_db_browsertest.cc index 435bb7d..dd33c49 100644 --- a/content/browser/indexed_db/indexed_db_browsertest.cc +++ b/content/browser/indexed_db/indexed_db_browsertest.cc
@@ -8,13 +8,13 @@ #include <functional> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/files/file.h" #include "base/files/file_enumerator.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/lazy_instance.h" #include "base/location.h" #include "base/memory/ref_counted.h"
diff --git a/content/browser/indexed_db/indexed_db_bucket_state.cc b/content/browser/indexed_db/indexed_db_bucket_state.cc index 2681982d1..0d443e7 100644 --- a/content/browser/indexed_db/indexed_db_bucket_state.cc +++ b/content/browser/indexed_db/indexed_db_bucket_state.cc
@@ -8,11 +8,11 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/containers/contains.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/rand_util.h" #include "base/synchronization/waitable_event.h" #include "components/services/storage/indexed_db/transactional_leveldb/transactional_leveldb_database.h"
diff --git a/content/browser/indexed_db/indexed_db_bucket_state.h b/content/browser/indexed_db/indexed_db_bucket_state.h index 30420dd..d4b0950c 100644 --- a/content/browser/indexed_db/indexed_db_bucket_state.h +++ b/content/browser/indexed_db/indexed_db_bucket_state.h
@@ -9,9 +9,9 @@ #include <memory> #include <string> -#include "base/callback.h" #include "base/containers/flat_map.h" #include "base/feature_list.h" +#include "base/functional/callback.h" #include "base/gtest_prod_util.h" #include "base/memory/raw_ptr.h" #include "base/sequence_checker.h"
diff --git a/content/browser/indexed_db/indexed_db_callbacks.cc b/content/browser/indexed_db/indexed_db_callbacks.cc index cffa4556a6..4a65b26b 100644 --- a/content/browser/indexed_db/indexed_db_callbacks.cc +++ b/content/browser/indexed_db/indexed_db_callbacks.cc
@@ -10,7 +10,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/task/sequenced_task_runner.h" #include "base/time/time.h" #include "content/browser/indexed_db/cursor_impl.h"
diff --git a/content/browser/indexed_db/indexed_db_class_factory.h b/content/browser/indexed_db/indexed_db_class_factory.h index f883e00..b6ae26f 100644 --- a/content/browser/indexed_db/indexed_db_class_factory.h +++ b/content/browser/indexed_db/indexed_db_class_factory.h
@@ -12,7 +12,7 @@ #include <string> #include <utility> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/lazy_instance.h" #include "base/memory/raw_ptr.h" #include "components/services/storage/indexed_db/locks/partitioned_lock_manager.h"
diff --git a/content/browser/indexed_db/indexed_db_connection_coordinator.h b/content/browser/indexed_db/indexed_db_connection_coordinator.h index b46c05b..9052d48f 100644 --- a/content/browser/indexed_db/indexed_db_connection_coordinator.h +++ b/content/browser/indexed_db/indexed_db_connection_coordinator.h
@@ -8,8 +8,8 @@ #include <memory> #include <tuple> -#include "base/callback.h" #include "base/containers/queue.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h"
diff --git a/content/browser/indexed_db/indexed_db_context_impl.cc b/content/browser/indexed_db/indexed_db_context_impl.cc index 50ee2f9..02989f3 100644 --- a/content/browser/indexed_db/indexed_db_context_impl.cc +++ b/content/browser/indexed_db/indexed_db_context_impl.cc
@@ -10,14 +10,14 @@ #include <vector> #include "base/barrier_callback.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/check_op.h" #include "base/command_line.h" #include "base/files/file_enumerator.h" #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/metrics/histogram_functions.h" #include "base/ranges/algorithm.h" #include "base/strings/string_util.h"
diff --git a/content/browser/indexed_db/indexed_db_cursor.cc b/content/browser/indexed_db/indexed_db_cursor.cc index cb24feb..a63178d 100644 --- a/content/browser/indexed_db/indexed_db_cursor.cc +++ b/content/browser/indexed_db/indexed_db_cursor.cc
@@ -8,8 +8,8 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/check_op.h" +#include "base/functional/bind.h" #include "base/notreached.h" #include "base/trace_event/base_tracing.h" #include "components/services/storage/public/cpp/buckets/bucket_locator.h"
diff --git a/content/browser/indexed_db/indexed_db_database.cc b/content/browser/indexed_db/indexed_db_database.cc index 0fc4e67a..0aa0b27 100644 --- a/content/browser/indexed_db/indexed_db_database.cc +++ b/content/browser/indexed_db/indexed_db_database.cc
@@ -11,8 +11,8 @@ #include <utility> #include "base/auto_reset.h" -#include "base/bind.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h"
diff --git a/content/browser/indexed_db/indexed_db_database.h b/content/browser/indexed_db/indexed_db_database.h index 08fecd7b..b9b53e8 100644 --- a/content/browser/indexed_db/indexed_db_database.h +++ b/content/browser/indexed_db/indexed_db_database.h
@@ -15,8 +15,8 @@ #include <utility> #include <vector> -#include "base/callback.h" #include "base/containers/queue.h" +#include "base/functional/callback.h" #include "base/gtest_prod_util.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h"
diff --git a/content/browser/indexed_db/indexed_db_database_callbacks.cc b/content/browser/indexed_db/indexed_db_database_callbacks.cc index a65ab99..303715b 100644 --- a/content/browser/indexed_db/indexed_db_database_callbacks.cc +++ b/content/browser/indexed_db/indexed_db_database_callbacks.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/task/sequenced_task_runner.h" #include "content/browser/indexed_db/indexed_db_context_impl.h" #include "content/browser/indexed_db/indexed_db_database_error.h"
diff --git a/content/browser/indexed_db/indexed_db_database_unittest.cc b/content/browser/indexed_db/indexed_db_database_unittest.cc index a45c46b..350844d0 100644 --- a/content/browser/indexed_db/indexed_db_database_unittest.cc +++ b/content/browser/indexed_db/indexed_db_database_unittest.cc
@@ -10,8 +10,8 @@ #include <utility> #include "base/auto_reset.h" -#include "base/bind.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h" #include "base/run_loop.h"
diff --git a/content/browser/indexed_db/indexed_db_dispatcher_host.cc b/content/browser/indexed_db/indexed_db_dispatcher_host.cc index 2f70286..a064486 100644 --- a/content/browser/indexed_db/indexed_db_dispatcher_host.cc +++ b/content/browser/indexed_db/indexed_db_dispatcher_host.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/guid.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h"
diff --git a/content/browser/indexed_db/indexed_db_dispatcher_host_unittest.cc b/content/browser/indexed_db/indexed_db_dispatcher_host_unittest.cc index de586d18..f18d18d 100644 --- a/content/browser/indexed_db/indexed_db_dispatcher_host_unittest.cc +++ b/content/browser/indexed_db/indexed_db_dispatcher_host_unittest.cc
@@ -7,9 +7,9 @@ #include <tuple> #include "base/barrier_closure.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/ref_counted.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h"
diff --git a/content/browser/indexed_db/indexed_db_external_object.cc b/content/browser/indexed_db/indexed_db_external_object.cc index 72e2c5e..307efb1 100644 --- a/content/browser/indexed_db/indexed_db_external_object.cc +++ b/content/browser/indexed_db/indexed_db_external_object.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" #include "base/check_op.h" +#include "base/functional/bind.h" #include "content/browser/indexed_db/indexed_db_leveldb_coding.h" #include "third_party/blink/public/mojom/indexeddb/indexeddb.mojom.h"
diff --git a/content/browser/indexed_db/indexed_db_external_object.h b/content/browser/indexed_db/indexed_db_external_object.h index 6bd41596..6a43e8d9 100644 --- a/content/browser/indexed_db/indexed_db_external_object.h +++ b/content/browser/indexed_db/indexed_db_external_object.h
@@ -11,8 +11,8 @@ #include <string> #include <vector> -#include "base/callback.h" #include "base/files/file_path.h" +#include "base/functional/callback.h" #include "base/time/time.h" #include "content/browser/indexed_db/indexed_db_leveldb_coding.h" #include "content/common/content_export.h"
diff --git a/content/browser/indexed_db/indexed_db_external_object_storage.cc b/content/browser/indexed_db/indexed_db_external_object_storage.cc index 99a7318..69aff01d 100644 --- a/content/browser/indexed_db/indexed_db_external_object_storage.cc +++ b/content/browser/indexed_db/indexed_db_external_object_storage.cc
@@ -4,7 +4,7 @@ #include "content/browser/indexed_db/indexed_db_external_object_storage.h" -#include "base/callback.h" +#include "base/functional/callback.h" namespace content {
diff --git a/content/browser/indexed_db/indexed_db_external_object_storage.h b/content/browser/indexed_db/indexed_db_external_object_storage.h index 53965c3..1500802 100644 --- a/content/browser/indexed_db/indexed_db_external_object_storage.h +++ b/content/browser/indexed_db/indexed_db_external_object_storage.h
@@ -10,7 +10,7 @@ #include <string> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "components/services/storage/public/mojom/blob_storage_context.mojom.h" #include "content/browser/indexed_db/indexed_db_external_object.h" #include "content/browser/indexed_db/indexed_db_leveldb_coding.h"
diff --git a/content/browser/indexed_db/indexed_db_factory.cc b/content/browser/indexed_db/indexed_db_factory.cc index c46c40e..70c6d71 100644 --- a/content/browser/indexed_db/indexed_db_factory.cc +++ b/content/browser/indexed_db/indexed_db_factory.cc
@@ -12,13 +12,13 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/compiler_specific.h" #include "base/containers/contains.h" #include "base/feature_list.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/metrics/histogram_macros.h" #include "base/ranges/algorithm.h"
diff --git a/content/browser/indexed_db/indexed_db_factory.h b/content/browser/indexed_db/indexed_db_factory.h index 629da134..9fd0636b 100644 --- a/content/browser/indexed_db/indexed_db_factory.h +++ b/content/browser/indexed_db/indexed_db_factory.h
@@ -14,8 +14,8 @@ #include <utility> #include <vector> -#include "base/callback.h" #include "base/containers/flat_map.h" +#include "base/functional/callback.h" #include "base/gtest_prod_util.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h"
diff --git a/content/browser/indexed_db/indexed_db_internals_ui.cc b/content/browser/indexed_db/indexed_db_internals_ui.cc index 81093b9..f28b767 100644 --- a/content/browser/indexed_db/indexed_db_internals_ui.cc +++ b/content/browser/indexed_db/indexed_db_internals_ui.cc
@@ -10,11 +10,10 @@ #include <utility> #include "base/barrier_callback.h" -#include "base/bind.h" -#include "base/callback_forward.h" #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/functional/bind.h" +#include "base/functional/callback_forward.h" #include "base/task/thread_pool.h" #include "components/services/storage/privileged/mojom/indexed_db_bucket_types.mojom-forward.h" #include "content/browser/indexed_db/indexed_db_internals.mojom-forward.h"
diff --git a/content/browser/indexed_db/indexed_db_pre_close_task_queue.cc b/content/browser/indexed_db/indexed_db_pre_close_task_queue.cc index a66c7ed9..1ac19c9d 100644 --- a/content/browser/indexed_db/indexed_db_pre_close_task_queue.cc +++ b/content/browser/indexed_db/indexed_db_pre_close_task_queue.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_macros.h" #include "base/task/sequenced_task_runner.h" #include "third_party/blink/public/common/indexeddb/indexeddb_metadata.h"
diff --git a/content/browser/indexed_db/indexed_db_pre_close_task_queue.h b/content/browser/indexed_db/indexed_db_pre_close_task_queue.h index 18455ad..1e9c3473 100644 --- a/content/browser/indexed_db/indexed_db_pre_close_task_queue.h +++ b/content/browser/indexed_db/indexed_db_pre_close_task_queue.h
@@ -9,7 +9,7 @@ #include <memory> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h" #include "base/task/sequenced_task_runner.h"
diff --git a/content/browser/indexed_db/indexed_db_pre_close_task_queue_unittest.cc b/content/browser/indexed_db/indexed_db_pre_close_task_queue_unittest.cc index 27990d69..c2db595 100644 --- a/content/browser/indexed_db/indexed_db_pre_close_task_queue_unittest.cc +++ b/content/browser/indexed_db/indexed_db_pre_close_task_queue_unittest.cc
@@ -8,7 +8,7 @@ #include <string> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/run_loop.h" #include "base/test/task_environment.h"
diff --git a/content/browser/indexed_db/indexed_db_quota_client.cc b/content/browser/indexed_db/indexed_db_quota_client.cc index 0aa7c9f..fe24455 100644 --- a/content/browser/indexed_db/indexed_db_quota_client.cc +++ b/content/browser/indexed_db/indexed_db_quota_client.cc
@@ -9,8 +9,8 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/check.h" +#include "base/functional/bind.h" #include "base/sequence_checker.h" #include "base/task/sequenced_task_runner.h" #include "components/services/storage/public/cpp/buckets/bucket_locator.h"
diff --git a/content/browser/indexed_db/indexed_db_quota_client_unittest.cc b/content/browser/indexed_db/indexed_db_quota_client_unittest.cc index 2fd018f..ac65a1c 100644 --- a/content/browser/indexed_db/indexed_db_quota_client_unittest.cc +++ b/content/browser/indexed_db/indexed_db_quota_client_unittest.cc
@@ -9,10 +9,10 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" #include "base/memory/scoped_refptr.h" #include "base/run_loop.h" #include "base/task/sequenced_task_runner.h"
diff --git a/content/browser/indexed_db/indexed_db_task_helper.h b/content/browser/indexed_db/indexed_db_task_helper.h index 5d3bb82..a76e898 100644 --- a/content/browser/indexed_db/indexed_db_task_helper.h +++ b/content/browser/indexed_db/indexed_db_task_helper.h
@@ -5,7 +5,7 @@ #ifndef CONTENT_BROWSER_INDEXED_DB_INDEXED_DB_TASK_HELPER_H_ #define CONTENT_BROWSER_INDEXED_DB_INDEXED_DB_TASK_HELPER_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" namespace content {
diff --git a/content/browser/indexed_db/indexed_db_tombstone_sweeper.h b/content/browser/indexed_db/indexed_db_tombstone_sweeper.h index d7760f1..e637ee3 100644 --- a/content/browser/indexed_db/indexed_db_tombstone_sweeper.h +++ b/content/browser/indexed_db/indexed_db_tombstone_sweeper.h
@@ -9,8 +9,8 @@ #include <memory> #include <vector> -#include "base/callback.h" #include "base/feature_list.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/time/time.h"
diff --git a/content/browser/indexed_db/indexed_db_transaction.cc b/content/browser/indexed_db/indexed_db_transaction.cc index a6c1a250..55fc38e 100644 --- a/content/browser/indexed_db/indexed_db_transaction.cc +++ b/content/browser/indexed_db/indexed_db_transaction.cc
@@ -7,8 +7,8 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/check_op.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/metrics/histogram_functions.h" #include "base/metrics/histogram_macros.h"
diff --git a/content/browser/indexed_db/indexed_db_transaction.h b/content/browser/indexed_db/indexed_db_transaction.h index dfcddbb..2d80ea49 100644 --- a/content/browser/indexed_db/indexed_db_transaction.h +++ b/content/browser/indexed_db/indexed_db_transaction.h
@@ -12,9 +12,9 @@ #include <set> #include <tuple> -#include "base/callback.h" #include "base/containers/queue.h" #include "base/containers/stack.h" +#include "base/functional/callback.h" #include "base/gtest_prod_util.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h"
diff --git a/content/browser/indexed_db/indexed_db_transaction_unittest.cc b/content/browser/indexed_db/indexed_db_transaction_unittest.cc index a4bfb661..a3b1024 100644 --- a/content/browser/indexed_db/indexed_db_transaction_unittest.cc +++ b/content/browser/indexed_db/indexed_db_transaction_unittest.cc
@@ -7,11 +7,11 @@ #include <stdint.h> #include <memory> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/check.h" #include "base/debug/stack_trace.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/scoped_refptr.h" #include "base/run_loop.h" #include "base/task/sequenced_task_runner.h"
diff --git a/content/browser/indexed_db/mock_indexed_db_callbacks.h b/content/browser/indexed_db/mock_indexed_db_callbacks.h index 6203212..59a7358b 100644 --- a/content/browser/indexed_db/mock_indexed_db_callbacks.h +++ b/content/browser/indexed_db/mock_indexed_db_callbacks.h
@@ -9,7 +9,7 @@ #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "content/browser/indexed_db/indexed_db_callbacks.h" #include "content/browser/indexed_db/indexed_db_connection.h" #include "third_party/blink/public/common/indexeddb/indexeddb_key.h"
diff --git a/content/browser/interest_group/ad_auction_service_impl_unittest.cc b/content/browser/interest_group/ad_auction_service_impl_unittest.cc index 5745d261..d40f35b 100644 --- a/content/browser/interest_group/ad_auction_service_impl_unittest.cc +++ b/content/browser/interest_group/ad_auction_service_impl_unittest.cc
@@ -9,10 +9,10 @@ #include <vector> #include "base/barrier_closure.h" -#include "base/bind.h" #include "base/containers/contains.h" #include "base/containers/flat_map.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h" #include "base/run_loop.h"
diff --git a/content/browser/interest_group/auction_process_manager.cc b/content/browser/interest_group/auction_process_manager.cc index f6bbbe1..b779a81 100644 --- a/content/browser/interest_group/auction_process_manager.cc +++ b/content/browser/interest_group/auction_process_manager.cc
@@ -4,9 +4,9 @@ #include "content/browser/interest_group/auction_process_manager.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/check.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h"
diff --git a/content/browser/interest_group/auction_process_manager.h b/content/browser/interest_group/auction_process_manager.h index 417cc01f..f4a75f9e 100644 --- a/content/browser/interest_group/auction_process_manager.h +++ b/content/browser/interest_group/auction_process_manager.h
@@ -10,7 +10,7 @@ #include <set> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h"
diff --git a/content/browser/interest_group/auction_process_manager_unittest.cc b/content/browser/interest_group/auction_process_manager_unittest.cc index 1676a64..59b180ec 100644 --- a/content/browser/interest_group/auction_process_manager_unittest.cc +++ b/content/browser/interest_group/auction_process_manager_unittest.cc
@@ -9,8 +9,8 @@ #include <string> #include <vector> -#include "base/callback.h" #include "base/check.h" +#include "base/functional/callback.h" #include "base/notreached.h" #include "base/run_loop.h" #include "base/strings/stringprintf.h"
diff --git a/content/browser/interest_group/auction_runner.cc b/content/browser/interest_group/auction_runner.cc index a415a785..bfe14896 100644 --- a/content/browser/interest_group/auction_runner.cc +++ b/content/browser/interest_group/auction_runner.cc
@@ -10,7 +10,7 @@ #include <utility> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/strings/stringprintf.h" #include "base/time/time.h" #include "base/types/optional_ref.h"
diff --git a/content/browser/interest_group/auction_runner.h b/content/browser/interest_group/auction_runner.h index a62981f..3e8b29d 100644 --- a/content/browser/interest_group/auction_runner.h +++ b/content/browser/interest_group/auction_runner.h
@@ -10,7 +10,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "content/browser/interest_group/auction_worklet_manager.h" #include "content/browser/interest_group/interest_group_auction.h"
diff --git a/content/browser/interest_group/auction_runner_unittest.cc b/content/browser/interest_group/auction_runner_unittest.cc index 7911278..ec25b1d8 100644 --- a/content/browser/interest_group/auction_runner_unittest.cc +++ b/content/browser/interest_group/auction_runner_unittest.cc
@@ -12,11 +12,11 @@ #include <string> #include <vector> -#include "base/callback_helpers.h" #include "base/check.h" #include "base/containers/contains.h" #include "base/feature_list.h" #include "base/files/file_path.h" +#include "base/functional/callback_helpers.h" #include "base/json/json_writer.h" #include "base/memory/raw_ptr.h" #include "base/notreached.h"
diff --git a/content/browser/interest_group/auction_url_loader_factory_proxy.cc b/content/browser/interest_group/auction_url_loader_factory_proxy.cc index db3d749..5b9306e 100644 --- a/content/browser/interest_group/auction_url_loader_factory_proxy.cc +++ b/content/browser/interest_group/auction_url_loader_factory_proxy.cc
@@ -8,8 +8,8 @@ #include <utility> -#include "base/callback.h" #include "base/check.h" +#include "base/functional/callback.h" #include "base/memory/ref_counted.h" #include "base/strings/escape.h" #include "base/strings/string_piece.h"
diff --git a/content/browser/interest_group/auction_url_loader_factory_proxy.h b/content/browser/interest_group/auction_url_loader_factory_proxy.h index 6443c97..69696ba 100644 --- a/content/browser/interest_group/auction_url_loader_factory_proxy.h +++ b/content/browser/interest_group/auction_url_loader_factory_proxy.h
@@ -7,7 +7,7 @@ #include <stdint.h> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/strings/string_piece_forward.h" #include "content/browser/interest_group/subresource_url_authorizations.h" #include "content/common/content_export.h"
diff --git a/content/browser/interest_group/auction_url_loader_factory_proxy_unittest.cc b/content/browser/interest_group/auction_url_loader_factory_proxy_unittest.cc index e1da440..ba761d90 100644 --- a/content/browser/interest_group/auction_url_loader_factory_proxy_unittest.cc +++ b/content/browser/interest_group/auction_url_loader_factory_proxy_unittest.cc
@@ -8,8 +8,8 @@ #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ref_counted.h" #include "base/run_loop.h" #include "base/strings/string_number_conversions.h"
diff --git a/content/browser/interest_group/auction_worklet_manager.cc b/content/browser/interest_group/auction_worklet_manager.cc index b435cacc..9892402 100644 --- a/content/browser/interest_group/auction_worklet_manager.cc +++ b/content/browser/interest_group/auction_worklet_manager.cc
@@ -13,10 +13,10 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback.h" #include "base/check.h" #include "base/compiler_specific.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h"
diff --git a/content/browser/interest_group/auction_worklet_manager.h b/content/browser/interest_group/auction_worklet_manager.h index 4df5921..5879d32 100644 --- a/content/browser/interest_group/auction_worklet_manager.h +++ b/content/browser/interest_group/auction_worklet_manager.h
@@ -9,7 +9,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h" #include "base/observer_list_types.h"
diff --git a/content/browser/interest_group/auction_worklet_manager_unittest.cc b/content/browser/interest_group/auction_worklet_manager_unittest.cc index 0873562..493ab90 100644 --- a/content/browser/interest_group/auction_worklet_manager_unittest.cc +++ b/content/browser/interest_group/auction_worklet_manager_unittest.cc
@@ -11,9 +11,9 @@ #include <string> #include <vector> -#include "base/bind.h" -#include "base/callback.h" #include "base/check.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/run_loop.h" #include "base/strings/stringprintf.h" #include "base/test/bind.h"
diff --git a/content/browser/interest_group/debuggable_auction_worklet.h b/content/browser/interest_group/debuggable_auction_worklet.h index 6b36c45..8daca530 100644 --- a/content/browser/interest_group/debuggable_auction_worklet.h +++ b/content/browser/interest_group/debuggable_auction_worklet.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/process/process_handle.h" #include "content/browser/interest_group/auction_process_manager.h"
diff --git a/content/browser/interest_group/interest_group_auction.cc b/content/browser/interest_group/interest_group_auction.cc index f73487f..23a721c 100644 --- a/content/browser/interest_group/interest_group_auction.cc +++ b/content/browser/interest_group/interest_group_auction.cc
@@ -14,9 +14,9 @@ #include <utility> #include <vector> -#include "base/callback.h" #include "base/check.h" #include "base/containers/cxx20_erase_vector.h" +#include "base/functional/callback.h" #include "base/location.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h"
diff --git a/content/browser/interest_group/interest_group_auction.h b/content/browser/interest_group/interest_group_auction.h index 37779b34..d8e584d 100644 --- a/content/browser/interest_group/interest_group_auction.h +++ b/content/browser/interest_group/interest_group_auction.h
@@ -12,8 +12,8 @@ #include <string> #include <vector> -#include "base/callback.h" #include "base/containers/flat_map.h" +#include "base/functional/callback.h" #include "base/logging.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h"
diff --git a/content/browser/interest_group/interest_group_auction_reporter.cc b/content/browser/interest_group/interest_group_auction_reporter.cc index d3e1e37..93f271ce 100644 --- a/content/browser/interest_group/interest_group_auction_reporter.cc +++ b/content/browser/interest_group/interest_group_auction_reporter.cc
@@ -11,8 +11,8 @@ #include <string> #include <vector> -#include "base/callback.h" #include "base/containers/flat_map.h" +#include "base/functional/callback.h" #include "base/logging.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h"
diff --git a/content/browser/interest_group/interest_group_auction_reporter.h b/content/browser/interest_group/interest_group_auction_reporter.h index 0f1bb34..4a80112 100644 --- a/content/browser/interest_group/interest_group_auction_reporter.h +++ b/content/browser/interest_group/interest_group_auction_reporter.h
@@ -12,8 +12,8 @@ #include <string> #include <vector> -#include "base/callback.h" #include "base/containers/flat_map.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/time/time.h"
diff --git a/content/browser/interest_group/interest_group_browsertest.cc b/content/browser/interest_group/interest_group_browsertest.cc index 0aa40f05..026163ca 100644 --- a/content/browser/interest_group/interest_group_browsertest.cc +++ b/content/browser/interest_group/interest_group_browsertest.cc
@@ -8,12 +8,12 @@ #include <string> #include <vector> -#include "base/callback.h" -#include "base/callback_forward.h" #include "base/command_line.h" #include "base/containers/contains.h" #include "base/containers/flat_map.h" #include "base/containers/flat_set.h" +#include "base/functional/callback.h" +#include "base/functional/callback_forward.h" #include "base/json/json_reader.h" #include "base/json/json_writer.h" #include "base/memory/raw_ptr.h"
diff --git a/content/browser/interest_group/interest_group_k_anonymity_manager.cc b/content/browser/interest_group/interest_group_k_anonymity_manager.cc index 4dfca6f..8368aa3d6 100644 --- a/content/browser/interest_group/interest_group_k_anonymity_manager.cc +++ b/content/browser/interest_group/interest_group_k_anonymity_manager.cc
@@ -4,8 +4,8 @@ #include "content/browser/interest_group/interest_group_k_anonymity_manager.h" -#include "base/bind.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/ranges/algorithm.h" #include "base/time/time.h" #include "content/browser/interest_group/interest_group_manager_impl.h"
diff --git a/content/browser/interest_group/interest_group_manager_impl.cc b/content/browser/interest_group/interest_group_manager_impl.cc index 087cf580..d4d8002 100644 --- a/content/browser/interest_group/interest_group_manager_impl.cc +++ b/content/browser/interest_group/interest_group_manager_impl.cc
@@ -8,10 +8,10 @@ #include <string> #include <vector> -#include "base/callback.h" #include "base/containers/flat_map.h" #include "base/containers/span.h" #include "base/files/file_path.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" #include "base/metrics/histogram_functions.h" #include "base/observer_list.h"
diff --git a/content/browser/interest_group/interest_group_manager_impl.h b/content/browser/interest_group/interest_group_manager_impl.h index 0a126c0..de87f9a 100644 --- a/content/browser/interest_group/interest_group_manager_impl.h +++ b/content/browser/interest_group/interest_group_manager_impl.h
@@ -10,9 +10,9 @@ #include <string> #include <vector> -#include "base/callback_forward.h" #include "base/containers/flat_map.h" #include "base/containers/span.h" +#include "base/functional/callback_forward.h" #include "base/memory/scoped_refptr.h" #include "base/observer_list.h" #include "base/threading/sequence_bound.h"
diff --git a/content/browser/interest_group/interest_group_permissions_cache.cc b/content/browser/interest_group/interest_group_permissions_cache.cc index 000f1153..13a1661 100644 --- a/content/browser/interest_group/interest_group_permissions_cache.cc +++ b/content/browser/interest_group/interest_group_permissions_cache.cc
@@ -7,8 +7,8 @@ #include <map> #include <memory> -#include "base/callback.h" #include "base/containers/lru_cache.h" +#include "base/functional/callback.h" #include "base/location.h" #include "base/time/time.h" #include "base/timer/timer.h"
diff --git a/content/browser/interest_group/interest_group_permissions_checker.cc b/content/browser/interest_group/interest_group_permissions_checker.cc index b99bad7..476d997 100644 --- a/content/browser/interest_group/interest_group_permissions_checker.cc +++ b/content/browser/interest_group/interest_group_permissions_checker.cc
@@ -4,7 +4,7 @@ #include "content/browser/interest_group/interest_group_permissions_checker.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/strings/escape.h" #include "base/strings/strcat.h" #include "base/time/time.h"
diff --git a/content/browser/interest_group/interest_group_permissions_checker.h b/content/browser/interest_group/interest_group_permissions_checker.h index 0e105741..246b881 100644 --- a/content/browser/interest_group/interest_group_permissions_checker.h +++ b/content/browser/interest_group/interest_group_permissions_checker.h
@@ -12,7 +12,7 @@ #include <memory> #include <tuple> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/weak_ptr.h" #include "base/time/time.h" #include "content/browser/interest_group/interest_group_permissions_cache.h"
diff --git a/content/browser/interest_group/interest_group_permissions_checker_unittest.cc b/content/browser/interest_group/interest_group_permissions_checker_unittest.cc index 9a5441c8..047c2b3 100644 --- a/content/browser/interest_group/interest_group_permissions_checker_unittest.cc +++ b/content/browser/interest_group/interest_group_permissions_checker_unittest.cc
@@ -6,7 +6,7 @@ #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/run_loop.h" #include "base/test/task_environment.h" #include "base/time/time.h"
diff --git a/content/browser/interest_group/interest_group_storage.cc b/content/browser/interest_group/interest_group_storage.cc index 3d7398e6..5eac1c0 100644 --- a/content/browser/interest_group/interest_group_storage.cc +++ b/content/browser/interest_group/interest_group_storage.cc
@@ -13,11 +13,11 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/containers/flat_map.h" #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/format_macros.h" +#include "base/functional/bind.h" #include "base/json/json_string_value_serializer.h" #include "base/metrics/histogram_functions.h" #include "base/metrics/histogram_macros.h"
diff --git a/content/browser/interest_group/interest_group_storage_unittest.cc b/content/browser/interest_group/interest_group_storage_unittest.cc index 5eef4d2..1c66b9a 100644 --- a/content/browser/interest_group/interest_group_storage_unittest.cc +++ b/content/browser/interest_group/interest_group_storage_unittest.cc
@@ -9,9 +9,9 @@ #include <functional> #include <memory> -#include "base/bind.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" #include "base/path_service.h" #include "base/run_loop.h" #include "base/strings/escape.h"
diff --git a/content/browser/interest_group/interest_group_update_manager.cc b/content/browser/interest_group/interest_group_update_manager.cc index fbb9e30..1485cf5 100644 --- a/content/browser/interest_group/interest_group_update_manager.cc +++ b/content/browser/interest_group/interest_group_update_manager.cc
@@ -12,10 +12,10 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback.h" #include "base/containers/flat_map.h" #include "base/containers/span.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/json/json_string_value_serializer.h" #include "base/memory/scoped_refptr.h" #include "base/metrics/histogram_functions.h"
diff --git a/content/browser/interest_group/interest_group_update_manager.h b/content/browser/interest_group/interest_group_update_manager.h index dbc312c..4218066 100644 --- a/content/browser/interest_group/interest_group_update_manager.h +++ b/content/browser/interest_group/interest_group_update_manager.h
@@ -10,10 +10,10 @@ #include <list> #include <memory> -#include "base/callback_forward.h" #include "base/containers/circular_deque.h" #include "base/containers/flat_map.h" #include "base/containers/span.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h"
diff --git a/content/browser/isolated_origin_browsertest.cc b/content/browser/isolated_origin_browsertest.cc index 4b7e8704..f3e53f8 100644 --- a/content/browser/isolated_origin_browsertest.cc +++ b/content/browser/isolated_origin_browsertest.cc
@@ -6,8 +6,8 @@ #include <tuple> #include <vector> -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/memory/raw_ref.h" #include "base/strings/string_util.h"
diff --git a/content/browser/keyboard_lock/keyboard_lock_service_impl.cc b/content/browser/keyboard_lock/keyboard_lock_service_impl.cc index 78a325a..938e8e9 100644 --- a/content/browser/keyboard_lock/keyboard_lock_service_impl.cc +++ b/content/browser/keyboard_lock/keyboard_lock_service_impl.cc
@@ -7,10 +7,10 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/check.h" #include "base/containers/flat_set.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/metrics/histogram_macros.h" #include "content/browser/keyboard_lock/keyboard_lock_metrics.h" #include "content/browser/renderer_host/render_frame_host_impl.h"
diff --git a/content/browser/loader/cors_file_origin_browsertest.cc b/content/browser/loader/cors_file_origin_browsertest.cc index d7d374c..3e581bfd 100644 --- a/content/browser/loader/cors_file_origin_browsertest.cc +++ b/content/browser/loader/cors_file_origin_browsertest.cc
@@ -4,10 +4,10 @@ #include <string> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/path_service.h" #include "base/strings/string_piece.h" #include "base/strings/stringprintf.h"
diff --git a/content/browser/loader/cors_origin_pattern_setter_browsertest.cc b/content/browser/loader/cors_origin_pattern_setter_browsertest.cc index 4d5f07b7..f2c0bcc 100644 --- a/content/browser/loader/cors_origin_pattern_setter_browsertest.cc +++ b/content/browser/loader/cors_origin_pattern_setter_browsertest.cc
@@ -5,8 +5,8 @@ #include <memory> #include <string> -#include "base/bind.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/path_service.h" #include "base/run_loop.h" #include "base/strings/stringprintf.h"
diff --git a/content/browser/loader/cors_preflight_cache_browsertest.cc b/content/browser/loader/cors_preflight_cache_browsertest.cc index 3b211da..0331c7e2 100644 --- a/content/browser/loader/cors_preflight_cache_browsertest.cc +++ b/content/browser/loader/cors_preflight_cache_browsertest.cc
@@ -4,8 +4,8 @@ #include <string> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "base/synchronization/lock.h"
diff --git a/content/browser/loader/cross_origin_read_blocking_checker.cc b/content/browser/loader/cross_origin_read_blocking_checker.cc index 96e3288..9a6990d 100644 --- a/content/browser/loader/cross_origin_read_blocking_checker.cc +++ b/content/browser/loader/cross_origin_read_blocking_checker.cc
@@ -4,7 +4,7 @@ #include "content/browser/loader/cross_origin_read_blocking_checker.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "content/public/browser/browser_task_traits.h" #include "content/public/browser/browser_thread.h" #include "net/base/io_buffer.h"
diff --git a/content/browser/loader/cross_origin_read_blocking_checker.h b/content/browser/loader/cross_origin_read_blocking_checker.h index 22f5ce2..98be558 100644 --- a/content/browser/loader/cross_origin_read_blocking_checker.h +++ b/content/browser/loader/cross_origin_read_blocking_checker.h
@@ -5,7 +5,7 @@ #ifndef CONTENT_BROWSER_LOADER_CROSS_ORIGIN_READ_BLOCKING_CHECKER_H_ #define CONTENT_BROWSER_LOADER_CROSS_ORIGIN_READ_BLOCKING_CHECKER_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "net/base/net_errors.h" #include "services/network/public/cpp/corb/corb_api.h"
diff --git a/content/browser/loader/cross_site_document_blocking_browsertest.cc b/content/browser/loader/cross_site_document_blocking_browsertest.cc index 7fb5cb52..b4c775f 100644 --- a/content/browser/loader/cross_site_document_blocking_browsertest.cc +++ b/content/browser/loader/cross_site_document_blocking_browsertest.cc
@@ -7,11 +7,11 @@ #include <utility> #include "base/base64.h" -#include "base/bind.h" #include "base/command_line.h" #include "base/feature_list.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/strings/pattern.h" #include "base/strings/string_piece.h" #include "base/strings/string_util.h"
diff --git a/content/browser/loader/file_url_loader_factory.cc b/content/browser/loader/file_url_loader_factory.cc index 968c7d1..afb684ea 100644 --- a/content/browser/loader/file_url_loader_factory.cc +++ b/content/browser/loader/file_url_loader_factory.cc
@@ -9,11 +9,11 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/command_line.h" #include "base/files/file.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/numerics/safe_conversions.h" #include "base/strings/string_piece.h"
diff --git a/content/browser/loader/file_url_loader_factory_browsertest.cc b/content/browser/loader/file_url_loader_factory_browsertest.cc index 2aced12..64e2181a 100644 --- a/content/browser/loader/file_url_loader_factory_browsertest.cc +++ b/content/browser/loader/file_url_loader_factory_browsertest.cc
@@ -5,7 +5,7 @@ #include "base/memory/raw_ptr.h" // This must be before Windows headers -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/strings/stringprintf.h" #include "base/time/time.h" #include "build/build_config.h"
diff --git a/content/browser/loader/loader_browsertest.cc b/content/browser/loader/loader_browsertest.cc index 50052f2f..f590880 100644 --- a/content/browser/loader/loader_browsertest.cc +++ b/content/browser/loader/loader_browsertest.cc
@@ -6,9 +6,9 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ref_counted.h" #include "base/run_loop.h" #include "base/strings/string_util.h"
diff --git a/content/browser/loader/navigation_early_hints_manager.h b/content/browser/loader/navigation_early_hints_manager.h index 27619e2..816a7e3 100644 --- a/content/browser/loader/navigation_early_hints_manager.h +++ b/content/browser/loader/navigation_early_hints_manager.h
@@ -5,9 +5,9 @@ #ifndef CONTENT_BROWSER_LOADER_NAVIGATION_EARLY_HINTS_MANAGER_H_ #define CONTENT_BROWSER_LOADER_NAVIGATION_EARLY_HINTS_MANAGER_H_ -#include "base/callback_forward.h" #include "base/containers/flat_map.h" #include "base/containers/flat_set.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/memory/raw_ref.h" #include "content/common/content_export.h"
diff --git a/content/browser/loader/navigation_loader_interceptor.h b/content/browser/loader/navigation_loader_interceptor.h index df39ce0..4405b51 100644 --- a/content/browser/loader/navigation_loader_interceptor.h +++ b/content/browser/loader/navigation_loader_interceptor.h
@@ -5,7 +5,7 @@ #ifndef CONTENT_BROWSER_LOADER_NAVIGATION_LOADER_INTERCEPTOR_H_ #define CONTENT_BROWSER_LOADER_NAVIGATION_LOADER_INTERCEPTOR_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "content/common/content_export.h" #include "mojo/public/cpp/bindings/pending_receiver.h" #include "mojo/public/cpp/bindings/pending_remote.h"
diff --git a/content/browser/loader/navigation_url_loader_impl.cc b/content/browser/loader/navigation_url_loader_impl.cc index 38ee4262..9f65e91 100644 --- a/content/browser/loader/navigation_url_loader_impl.cc +++ b/content/browser/loader/navigation_url_loader_impl.cc
@@ -9,11 +9,11 @@ #include <set> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/containers/contains.h" #include "base/debug/dump_without_crashing.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/scoped_refptr.h" #include "base/metrics/histogram_macros.h" #include "base/strings/strcat.h"
diff --git a/content/browser/loader/navigation_url_loader_impl_unittest.cc b/content/browser/loader/navigation_url_loader_impl_unittest.cc index 6e083c9..b384bf0 100644 --- a/content/browser/loader/navigation_url_loader_impl_unittest.cc +++ b/content/browser/loader/navigation_url_loader_impl_unittest.cc
@@ -11,7 +11,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/strings/stringprintf.h" #include "base/unguessable_token.h"
diff --git a/content/browser/loader/navigation_url_loader_unittest.cc b/content/browser/loader/navigation_url_loader_unittest.cc index 7c161db..71299eb 100644 --- a/content/browser/loader/navigation_url_loader_unittest.cc +++ b/content/browser/loader/navigation_url_loader_unittest.cc
@@ -5,8 +5,8 @@ #include <memory> #include <utility> -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/memory/ref_counted.h" #include "base/run_loop.h" #include "base/unguessable_token.h"
diff --git a/content/browser/loader/object_navigation_fallback_body_loader.cc b/content/browser/loader/object_navigation_fallback_body_loader.cc index ac0ecd07..82e5244 100644 --- a/content/browser/loader/object_navigation_fallback_body_loader.cc +++ b/content/browser/loader/object_navigation_fallback_body_loader.cc
@@ -7,9 +7,9 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "content/browser/renderer_host/frame_tree_node.h" #include "content/browser/renderer_host/navigation_request.h" #include "content/browser/renderer_host/render_frame_host_impl.h"
diff --git a/content/browser/loader/object_navigation_fallback_body_loader.h b/content/browser/loader/object_navigation_fallback_body_loader.h index fa4fa0ed..248dab9 100644 --- a/content/browser/loader/object_navigation_fallback_body_loader.h +++ b/content/browser/loader/object_navigation_fallback_body_loader.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ref.h" #include "content/public/browser/navigation_handle_user_data.h" #include "mojo/public/cpp/bindings/receiver.h"
diff --git a/content/browser/loader/prefetch_browsertest_base.cc b/content/browser/loader/prefetch_browsertest_base.cc index e829118..c4777bb 100644 --- a/content/browser/loader/prefetch_browsertest_base.cc +++ b/content/browser/loader/prefetch_browsertest_base.cc
@@ -4,8 +4,8 @@ #include "content/browser/loader/prefetch_browsertest_base.h" -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/strings/utf_string_conversions.h" #include "content/browser/loader/prefetch_url_loader_service.h" #include "content/browser/storage_partition_impl.h"
diff --git a/content/browser/loader/prefetch_browsertest_base.h b/content/browser/loader/prefetch_browsertest_base.h index bea6f5c..9097ae9 100644 --- a/content/browser/loader/prefetch_browsertest_base.h +++ b/content/browser/loader/prefetch_browsertest_base.h
@@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/ref_counted.h" #include "base/synchronization/lock.h" #include "base/thread_annotations.h"
diff --git a/content/browser/loader/prefetch_url_loader.cc b/content/browser/loader/prefetch_url_loader.cc index db110d6..c9f9ac89 100644 --- a/content/browser/loader/prefetch_url_loader.cc +++ b/content/browser/loader/prefetch_url_loader.cc
@@ -4,8 +4,8 @@ #include "content/browser/loader/prefetch_url_loader.h" -#include "base/bind.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_functions.h" #include "content/browser/web_package/prefetched_signed_exchange_cache.h" #include "content/browser/web_package/prefetched_signed_exchange_cache_adapter.h"
diff --git a/content/browser/loader/prefetch_url_loader.h b/content/browser/loader/prefetch_url_loader.h index 3bb87b2..b3852e2f 100644 --- a/content/browser/loader/prefetch_url_loader.h +++ b/content/browser/loader/prefetch_url_loader.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/unguessable_token.h" #include "content/browser/web_package/prefetched_signed_exchange_cache.h" #include "mojo/public/cpp/bindings/pending_remote.h"
diff --git a/content/browser/loader/prefetch_url_loader_service.cc b/content/browser/loader/prefetch_url_loader_service.cc index a015c727..23ad5eb7 100644 --- a/content/browser/loader/prefetch_url_loader_service.cc +++ b/content/browser/loader/prefetch_url_loader_service.cc
@@ -4,8 +4,8 @@ #include "content/browser/loader/prefetch_url_loader_service.h" -#include "base/bind.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/time/default_tick_clock.h" #include "content/browser/loader/prefetch_url_loader.h" #include "content/browser/renderer_host/render_frame_host_impl.h"
diff --git a/content/browser/loader/prefetch_url_loader_service.h b/content/browser/loader/prefetch_url_loader_service.h index f72959b..737cc03d1 100644 --- a/content/browser/loader/prefetch_url_loader_service.h +++ b/content/browser/loader/prefetch_url_loader_service.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h" #include "content/browser/web_package/signed_exchange_prefetch_metric_recorder.h"
diff --git a/content/browser/loader/reload_cache_control_browsertest.cc b/content/browser/loader/reload_cache_control_browsertest.cc index cc00646..3b7e0fb 100644 --- a/content/browser/loader/reload_cache_control_browsertest.cc +++ b/content/browser/loader/reload_cache_control_browsertest.cc
@@ -6,8 +6,8 @@ #include <string> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/strings/utf_string_conversions.h" #include "base/synchronization/lock.h" #include "content/public/test/browser_test.h"
diff --git a/content/browser/loader/shared_cors_origin_access_list_impl.cc b/content/browser/loader/shared_cors_origin_access_list_impl.cc index 88f3f0f0..4afbcf24 100644 --- a/content/browser/loader/shared_cors_origin_access_list_impl.cc +++ b/content/browser/loader/shared_cors_origin_access_list_impl.cc
@@ -4,8 +4,8 @@ #include "content/browser/loader/shared_cors_origin_access_list_impl.h" -#include "base/bind.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "content/public/browser/browser_task_traits.h" #include "content/public/browser/browser_thread.h"
diff --git a/content/browser/loader/web_transport_browsertest.cc b/content/browser/loader/web_transport_browsertest.cc index a198023..f7ec38e2 100644 --- a/content/browser/loader/web_transport_browsertest.cc +++ b/content/browser/loader/web_transport_browsertest.cc
@@ -6,8 +6,8 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h"
diff --git a/content/browser/lock_screen/lock_screen_service_impl_browsertest.cc b/content/browser/lock_screen/lock_screen_service_impl_browsertest.cc index 7ee8b2d..17a5e3f7 100644 --- a/content/browser/lock_screen/lock_screen_service_impl_browsertest.cc +++ b/content/browser/lock_screen/lock_screen_service_impl_browsertest.cc
@@ -5,10 +5,10 @@ #include <memory> #include "base/base_paths.h" -#include "base/bind.h" #include "base/command_line.h" #include "base/files/file_enumerator.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/path_service.h" #include "base/test/bind.h" #include "base/test/scoped_feature_list.h"
diff --git a/content/browser/locks/lock_manager.cc b/content/browser/locks/lock_manager.cc index c372de1d8..27a5414 100644 --- a/content/browser/locks/lock_manager.cc +++ b/content/browser/locks/lock_manager.cc
@@ -12,8 +12,8 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/guid.h" #include "base/memory/raw_ptr.h" #include "content/public/browser/browser_thread.h"
diff --git a/content/browser/locks/lock_manager.h b/content/browser/locks/lock_manager.h index 1e06012..2c23fdb2 100644 --- a/content/browser/locks/lock_manager.h +++ b/content/browser/locks/lock_manager.h
@@ -10,7 +10,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "base/sequence_checker.h" #include "components/services/storage/public/cpp/buckets/bucket_id.h"
diff --git a/content/browser/manifest/manifest_browsertest.cc b/content/browser/manifest/manifest_browsertest.cc index 84e7baa86..007eab4 100644 --- a/content/browser/manifest/manifest_browsertest.cc +++ b/content/browser/manifest/manifest_browsertest.cc
@@ -7,8 +7,8 @@ #include <string> #include <utility> -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/path_service.h" #include "base/strings/stringprintf.h"
diff --git a/content/browser/manifest/manifest_icon_downloader.cc b/content/browser/manifest/manifest_icon_downloader.cc index 05906d90..0b2578e 100644 --- a/content/browser/manifest/manifest_icon_downloader.cc +++ b/content/browser/manifest/manifest_icon_downloader.cc
@@ -9,8 +9,8 @@ #include <limits> #include <utility> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/numerics/safe_conversions.h" #include "content/public/browser/browser_task_traits.h" #include "content/public/browser/browser_thread.h"
diff --git a/content/browser/manifest/manifest_manager_host.cc b/content/browser/manifest/manifest_manager_host.cc index ea11aafc..ea217dfa 100644 --- a/content/browser/manifest/manifest_manager_host.cc +++ b/content/browser/manifest/manifest_manager_host.cc
@@ -6,7 +6,7 @@ #include <stdint.h> -#include "base/bind.h" +#include "base/functional/bind.h" #include "content/browser/renderer_host/render_frame_host_impl.h" #include "content/public/common/content_client.h" #include "services/service_manager/public/cpp/interface_provider.h"
diff --git a/content/browser/manifest/manifest_manager_host.h b/content/browser/manifest/manifest_manager_host.h index 00f99e4..af4d253 100644 --- a/content/browser/manifest/manifest_manager_host.h +++ b/content/browser/manifest/manifest_manager_host.h
@@ -5,8 +5,8 @@ #ifndef CONTENT_BROWSER_MANIFEST_MANIFEST_MANAGER_HOST_H_ #define CONTENT_BROWSER_MANIFEST_MANIFEST_MANAGER_HOST_H_ -#include "base/callback_forward.h" #include "base/containers/id_map.h" +#include "base/functional/callback_forward.h" #include "content/public/browser/page_user_data.h" #include "mojo/public/cpp/bindings/associated_receiver.h" #include "mojo/public/cpp/bindings/remote.h"
diff --git a/content/browser/media/android/browser_gpu_video_accelerator_factories.cc b/content/browser/media/android/browser_gpu_video_accelerator_factories.cc index 08eceea5..88cc3d5 100644 --- a/content/browser/media/android/browser_gpu_video_accelerator_factories.cc +++ b/content/browser/media/android/browser_gpu_video_accelerator_factories.cc
@@ -4,7 +4,7 @@ #include "content/browser/media/android/browser_gpu_video_accelerator_factories.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/task/sequenced_task_runner.h" #include "content/browser/browser_main_loop.h" #include "content/public/browser/android/gpu_video_accelerator_factories_provider.h"
diff --git a/content/browser/media/android/media_player_renderer.cc b/content/browser/media/android/media_player_renderer.cc index ef5a75b..954db22 100644 --- a/content/browser/media/android/media_player_renderer.cc +++ b/content/browser/media/android/media_player_renderer.cc
@@ -6,8 +6,8 @@ #include <memory> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "content/browser/android/scoped_surface_request_manager.h" #include "content/browser/media/android/media_player_renderer_web_contents_observer.h" #include "content/browser/media/android/media_resource_getter_impl.h"
diff --git a/content/browser/media/android/media_player_renderer.h b/content/browser/media/android/media_player_renderer.h index 5b8b00db..195827c 100644 --- a/content/browser/media/android/media_player_renderer.h +++ b/content/browser/media/android/media_player_renderer.h
@@ -5,7 +5,7 @@ #ifndef CONTENT_BROWSER_MEDIA_ANDROID_MEDIA_PLAYER_RENDERER_H_ #define CONTENT_BROWSER_MEDIA_ANDROID_MEDIA_PLAYER_RENDERER_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/time/time.h"
diff --git a/content/browser/media/android/media_resource_getter_impl.cc b/content/browser/media/android/media_resource_getter_impl.cc index 8319f83..fb2671b 100644 --- a/content/browser/media/android/media_resource_getter_impl.cc +++ b/content/browser/media/android/media_resource_getter_impl.cc
@@ -4,7 +4,7 @@ #include "content/browser/media/android/media_resource_getter_impl.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/path_service.h" #include "base/task/single_thread_task_runner.h" #include "content/browser/child_process_security_policy_impl.h"
diff --git a/content/browser/media/audio_input_stream_broker.cc b/content/browser/media/audio_input_stream_broker.cc index e9ae70d..2449defe 100644 --- a/content/browser/media/audio_input_stream_broker.cc +++ b/content/browser/media/audio_input_stream_broker.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/logging.h" #include "base/memory/read_only_shared_memory_region.h"
diff --git a/content/browser/media/audio_loopback_stream_broker.cc b/content/browser/media/audio_loopback_stream_broker.cc index abfba09..c9f683c 100644 --- a/content/browser/media/audio_loopback_stream_broker.cc +++ b/content/browser/media/audio_loopback_stream_broker.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" #include "base/check_op.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/unguessable_token.h" #include "content/public/browser/browser_task_traits.h"
diff --git a/content/browser/media/audio_output_stream_broker.cc b/content/browser/media/audio_output_stream_broker.cc index c0d09ebe..3d7a8f3 100644 --- a/content/browser/media/audio_output_stream_broker.cc +++ b/content/browser/media/audio_output_stream_broker.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_macros.h" #include "base/trace_event/trace_event.h" #include "content/browser/media/media_internals.h"
diff --git a/content/browser/media/audio_output_stream_broker.h b/content/browser/media/audio_output_stream_broker.h index 10fb24f..5108768 100644 --- a/content/browser/media/audio_output_stream_broker.h +++ b/content/browser/media/audio_output_stream_broker.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "base/sequence_checker.h" #include "base/time/time.h"
diff --git a/content/browser/media/audio_output_stream_broker_unittest.cc b/content/browser/media/audio_output_stream_broker_unittest.cc index 3caa047..f0c7335b 100644 --- a/content/browser/media/audio_output_stream_broker_unittest.cc +++ b/content/browser/media/audio_output_stream_broker_unittest.cc
@@ -7,8 +7,8 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/sync_socket.h" #include "base/test/mock_callback.h"
diff --git a/content/browser/media/audio_stream_monitor.cc b/content/browser/media/audio_stream_monitor.cc index fe3c8c5..a5431ec 100644 --- a/content/browser/media/audio_stream_monitor.cc +++ b/content/browser/media/audio_stream_monitor.cc
@@ -4,9 +4,9 @@ #include "content/browser/media/audio_stream_monitor.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/containers/cxx20_erase.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "content/browser/renderer_host/render_frame_host_impl.h" #include "content/browser/web_contents/web_contents_impl.h" #include "content/public/browser/browser_task_traits.h"
diff --git a/content/browser/media/audio_stream_monitor_unittest.cc b/content/browser/media/audio_stream_monitor_unittest.cc index 2befd68..49090bc 100644 --- a/content/browser/media/audio_stream_monitor_unittest.cc +++ b/content/browser/media/audio_stream_monitor_unittest.cc
@@ -8,8 +8,8 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/test/simple_test_tick_clock.h" #include "base/time/time.h"
diff --git a/content/browser/media/capture/aura_window_video_capture_device.cc b/content/browser/media/capture/aura_window_video_capture_device.cc index 8bc6118..497e76cd 100644 --- a/content/browser/media/capture/aura_window_video_capture_device.cc +++ b/content/browser/media/capture/aura_window_video_capture_device.cc
@@ -7,8 +7,8 @@ #include <utility> -#include "base/bind.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h"
diff --git a/content/browser/media/capture/content_capture_device_browsertest_base.cc b/content/browser/media/capture/content_capture_device_browsertest_base.cc index f2c7bcf..9735535 100644 --- a/content/browser/media/capture/content_capture_device_browsertest_base.cc +++ b/content/browser/media/capture/content_capture_device_browsertest_base.cc
@@ -7,7 +7,7 @@ #include <cmath> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/strings/stringprintf.h" #include "content/browser/media/capture/frame_sink_video_capture_device.h"
diff --git a/content/browser/media/capture/crop_id_web_contents_helper.cc b/content/browser/media/capture/crop_id_web_contents_helper.cc index a9af0114..5e4e5cb 100644 --- a/content/browser/media/capture/crop_id_web_contents_helper.cc +++ b/content/browser/media/capture/crop_id_web_contents_helper.cc
@@ -7,8 +7,8 @@ #include <string> #include <vector> -#include "base/callback.h" #include "base/containers/contains.h" +#include "base/functional/callback.h" #include "base/guid.h" #include "base/token.h" #include "build/build_config.h"
diff --git a/content/browser/media/capture/crop_id_web_contents_helper.h b/content/browser/media/capture/crop_id_web_contents_helper.h index 8682545..63807e7 100644 --- a/content/browser/media/capture/crop_id_web_contents_helper.h +++ b/content/browser/media/capture/crop_id_web_contents_helper.h
@@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/guid.h" #include "base/token.h" #include "build/build_config.h"
diff --git a/content/browser/media/capture/desktop_capture_device.cc b/content/browser/media/capture/desktop_capture_device.cc index 034f8e5..043a0c50 100644 --- a/content/browser/media/capture/desktop_capture_device.cc +++ b/content/browser/media/capture/desktop_capture_device.cc
@@ -11,10 +11,10 @@ #include <memory> #include <utility> -#include "base/bind.h" #include "base/check_op.h" #include "base/command_line.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/memory/raw_ptr.h" #include "base/message_loop/message_pump_type.h"
diff --git a/content/browser/media/capture/desktop_capture_device_unittest.cc b/content/browser/media/capture/desktop_capture_device_unittest.cc index 0d60d5d..1ce58b11 100644 --- a/content/browser/media/capture/desktop_capture_device_unittest.cc +++ b/content/browser/media/capture/desktop_capture_device_unittest.cc
@@ -13,8 +13,8 @@ #include <string> #include <utility> -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/strings/string_number_conversions.h" #include "base/synchronization/waitable_event.h" #include "base/task/single_thread_task_runner.h"
diff --git a/content/browser/media/capture/desktop_streams_registry_impl.cc b/content/browser/media/capture/desktop_streams_registry_impl.cc index 29f99a1..30144b2 100644 --- a/content/browser/media/capture/desktop_streams_registry_impl.cc +++ b/content/browser/media/capture/desktop_streams_registry_impl.cc
@@ -5,7 +5,7 @@ #include "content/browser/media/capture/desktop_streams_registry_impl.h" #include "base/base64.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/no_destructor.h" #include "base/time/time.h"
diff --git a/content/browser/media/capture/fake_video_capture_stack.cc b/content/browser/media/capture/fake_video_capture_stack.cc index 4cde8e4..a9fbd5773 100644 --- a/content/browser/media/capture/fake_video_capture_stack.cc +++ b/content/browser/media/capture/fake_video_capture_stack.cc
@@ -9,9 +9,8 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h"
diff --git a/content/browser/media/capture/fake_video_capture_stack.h b/content/browser/media/capture/fake_video_capture_stack.h index 2d8ef318..768e0e27 100644 --- a/content/browser/media/capture/fake_video_capture_stack.h +++ b/content/browser/media/capture/fake_video_capture_stack.h
@@ -8,8 +8,8 @@ #include <memory> #include <string> -#include "base/callback_forward.h" #include "base/containers/circular_deque.h" +#include "base/functional/callback_forward.h" #include "base/memory/scoped_refptr.h" #include "base/memory/unsafe_shared_memory_pool.h" #include "base/sequence_checker.h"
diff --git a/content/browser/media/capture/frame_sink_video_capture_device.cc b/content/browser/media/capture/frame_sink_video_capture_device.cc index 9caa2c6..f1b6077 100644 --- a/content/browser/media/capture/frame_sink_video_capture_device.cc +++ b/content/browser/media/capture/frame_sink_video_capture_device.cc
@@ -4,9 +4,9 @@ #include "content/browser/media/capture/frame_sink_video_capture_device.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/check_op.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/location.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_refptr.h"
diff --git a/content/browser/media/capture/frame_sink_video_capture_device.h b/content/browser/media/capture/frame_sink_video_capture_device.h index 415ddeb..8839689 100644 --- a/content/browser/media/capture/frame_sink_video_capture_device.h +++ b/content/browser/media/capture/frame_sink_video_capture_device.h
@@ -10,8 +10,8 @@ #include <utility> #include <vector> -#include "base/callback_forward.h" #include "base/check.h" +#include "base/functional/callback_forward.h" #include "base/memory/weak_ptr.h" #include "base/sequence_checker.h" #include "build/build_config.h"
diff --git a/content/browser/media/capture/frame_sink_video_capture_device_unittest.cc b/content/browser/media/capture/frame_sink_video_capture_device_unittest.cc index 6724f9e6..363d7d5 100644 --- a/content/browser/media/capture/frame_sink_video_capture_device_unittest.cc +++ b/content/browser/media/capture/frame_sink_video_capture_device_unittest.cc
@@ -6,9 +6,9 @@ #include <memory> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/containers/flat_map.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/memory/read_only_shared_memory_region.h" #include "base/memory/shared_memory_mapping.h"
diff --git a/content/browser/media/capture/mouse_cursor_overlay_controller.cc b/content/browser/media/capture/mouse_cursor_overlay_controller.cc index 9ee4e44..31de6ee 100644 --- a/content/browser/media/capture/mouse_cursor_overlay_controller.cc +++ b/content/browser/media/capture/mouse_cursor_overlay_controller.cc
@@ -7,9 +7,9 @@ #include <cmath> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/check_op.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/task/sequenced_task_runner.h" #include "base/time/time.h"
diff --git a/content/browser/media/capture/mouse_cursor_overlay_controller_mac.mm b/content/browser/media/capture/mouse_cursor_overlay_controller_mac.mm index 0366e3ee..ad16a476 100644 --- a/content/browser/media/capture/mouse_cursor_overlay_controller_mac.mm +++ b/content/browser/media/capture/mouse_cursor_overlay_controller_mac.mm
@@ -6,9 +6,9 @@ #include <Cocoa/Cocoa.h> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/mac/mac_util.h" #include "base/mac/scoped_nsobject.h" #include "base/memory/raw_ptr.h"
diff --git a/content/browser/media/capture/video_capture_device_proxy_lacros.cc b/content/browser/media/capture/video_capture_device_proxy_lacros.cc index 9d9fbe1..e656b2d0 100644 --- a/content/browser/media/capture/video_capture_device_proxy_lacros.cc +++ b/content/browser/media/capture/video_capture_device_proxy_lacros.cc
@@ -7,9 +7,9 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/check_op.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "base/notreached.h" #include "base/token.h"
diff --git a/content/browser/media/capture/video_capture_device_proxy_lacros.h b/content/browser/media/capture/video_capture_device_proxy_lacros.h index ddf2d8c..f30e1b6 100644 --- a/content/browser/media/capture/video_capture_device_proxy_lacros.h +++ b/content/browser/media/capture/video_capture_device_proxy_lacros.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/weak_ptr.h" #include "chromeos/crosapi/mojom/screen_manager.mojom.h" #include "chromeos/crosapi/mojom/video_capture.mojom.h"
diff --git a/content/browser/media/capture/views_widget_video_capture_device_mac.cc b/content/browser/media/capture/views_widget_video_capture_device_mac.cc index f036aad2e..b7763ad1 100644 --- a/content/browser/media/capture/views_widget_video_capture_device_mac.cc +++ b/content/browser/media/capture/views_widget_video_capture_device_mac.cc
@@ -4,7 +4,7 @@ #include "content/browser/media/capture/views_widget_video_capture_device_mac.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/task/single_thread_task_runner.h" #include "components/remote_cocoa/browser/scoped_cg_window_id.h"
diff --git a/content/browser/media/capture/web_contents_frame_tracker.cc b/content/browser/media/capture/web_contents_frame_tracker.cc index 4ba60de..02e473a 100644 --- a/content/browser/media/capture/web_contents_frame_tracker.cc +++ b/content/browser/media/capture/web_contents_frame_tracker.cc
@@ -7,7 +7,7 @@ #include <algorithm> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h"
diff --git a/content/browser/media/capture/web_contents_video_capture_device.cc b/content/browser/media/capture/web_contents_video_capture_device.cc index ee4a548..84f716b 100644 --- a/content/browser/media/capture/web_contents_video_capture_device.cc +++ b/content/browser/media/capture/web_contents_video_capture_device.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h"
diff --git a/content/browser/media/capture/web_contents_video_capture_device_browsertest.cc b/content/browser/media/capture/web_contents_video_capture_device_browsertest.cc index ebd1562..003f074 100644 --- a/content/browser/media/capture/web_contents_video_capture_device_browsertest.cc +++ b/content/browser/media/capture/web_contents_video_capture_device_browsertest.cc
@@ -6,7 +6,7 @@ #include <tuple> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/strings/strcat.h" #include "base/strings/stringprintf.h"
diff --git a/content/browser/media/capture_handle_manager.h b/content/browser/media/capture_handle_manager.h index 40704bb..354682c0 100644 --- a/content/browser/media/capture_handle_manager.h +++ b/content/browser/media/capture_handle_manager.h
@@ -9,7 +9,7 @@ #include <memory> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "content/common/content_export.h" #include "content/public/browser/global_routing_id.h" #include "media/mojo/mojom/capture_handle.mojom.h"
diff --git a/content/browser/media/cdm_file_impl.cc b/content/browser/media/cdm_file_impl.cc index 00096de4..ac2937e7 100644 --- a/content/browser/media/cdm_file_impl.cc +++ b/content/browser/media/cdm_file_impl.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/logging.h" #include "base/metrics/histogram_functions.h" #include "base/strings/string_util.h"
diff --git a/content/browser/media/cdm_file_impl.h b/content/browser/media/cdm_file_impl.h index 00adf3e..21c36d7 100644 --- a/content/browser/media/cdm_file_impl.h +++ b/content/browser/media/cdm_file_impl.h
@@ -8,8 +8,8 @@ #include <string> #include <vector> -#include "base/callback_forward.h" #include "base/files/file.h" +#include "base/functional/callback_forward.h" #include "base/memory/weak_ptr.h" #include "base/threading/sequence_bound.h" #include "base/threading/thread_checker.h"
diff --git a/content/browser/media/cdm_registry_impl_unittest.cc b/content/browser/media/cdm_registry_impl_unittest.cc index 2619d7e3..20fe462 100644 --- a/content/browser/media/cdm_registry_impl_unittest.cc +++ b/content/browser/media/cdm_registry_impl_unittest.cc
@@ -9,11 +9,11 @@ #include <vector> #include "base/base_paths.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/containers/contains.h" #include "base/containers/flat_set.h" #include "base/files/file_path.h" +#include "base/functional/callback_helpers.h" #include "base/strings/string_split.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h"
diff --git a/content/browser/media/flinging_renderer.h b/content/browser/media/flinging_renderer.h index 08bb900e..722a010 100644 --- a/content/browser/media/flinging_renderer.h +++ b/content/browser/media/flinging_renderer.h
@@ -5,7 +5,7 @@ #ifndef CONTENT_BROWSER_MEDIA_FLINGING_RENDERER_H_ #define CONTENT_BROWSER_MEDIA_FLINGING_RENDERER_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "content/common/content_export.h" #include "media/base/flinging_controller.h"
diff --git a/content/browser/media/flinging_renderer_unittest.cc b/content/browser/media/flinging_renderer_unittest.cc index 54825911..f022c5b3 100644 --- a/content/browser/media/flinging_renderer_unittest.cc +++ b/content/browser/media/flinging_renderer_unittest.cc
@@ -4,7 +4,7 @@ #include "content/browser/media/flinging_renderer.h" -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h" #include "base/time/time.h"
diff --git a/content/browser/media/forwarding_audio_stream_factory.cc b/content/browser/media/forwarding_audio_stream_factory.cc index ef5bf7fa..a641cf79 100644 --- a/content/browser/media/forwarding_audio_stream_factory.cc +++ b/content/browser/media/forwarding_audio_stream_factory.cc
@@ -6,10 +6,10 @@ #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/check_op.h" #include "base/containers/cxx20_erase.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/no_destructor.h" #include "base/trace_event/trace_event.h"
diff --git a/content/browser/media/forwarding_audio_stream_factory_unittest.cc b/content/browser/media/forwarding_audio_stream_factory_unittest.cc index c8a2ea6..17df023 100644 --- a/content/browser/media/forwarding_audio_stream_factory_unittest.cc +++ b/content/browser/media/forwarding_audio_stream_factory_unittest.cc
@@ -8,9 +8,9 @@ #include <tuple> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/containers/queue.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/test/mock_callback.h"
diff --git a/content/browser/media/frameless_media_interface_proxy.cc b/content/browser/media/frameless_media_interface_proxy.cc index e6c05fe..bbf7373 100644 --- a/content/browser/media/frameless_media_interface_proxy.cc +++ b/content/browser/media/frameless_media_interface_proxy.cc
@@ -6,7 +6,7 @@ #include <tuple> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "build/build_config.h" #include "content/public/browser/media_service.h"
diff --git a/content/browser/media/key_system_support_android.h b/content/browser/media/key_system_support_android.h index 239e88b56..e0e3a65 100644 --- a/content/browser/media/key_system_support_android.h +++ b/content/browser/media/key_system_support_android.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "content/public/common/cdm_info.h" #include "media/cdm/cdm_capability.h" #include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/content/browser/media/key_system_support_impl.h b/content/browser/media/key_system_support_impl.h index d087f0f..0b5270e 100644 --- a/content/browser/media/key_system_support_impl.h +++ b/content/browser/media/key_system_support_impl.h
@@ -9,7 +9,7 @@ #include <utility> #include <vector> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/memory/weak_ptr.h" #include "base/no_destructor.h" #include "content/browser/media/cdm_registry_impl.h"
diff --git a/content/browser/media/key_system_support_impl_unittest.cc b/content/browser/media/key_system_support_impl_unittest.cc index 0594155..a972314 100644 --- a/content/browser/media/key_system_support_impl_unittest.cc +++ b/content/browser/media/key_system_support_impl_unittest.cc
@@ -6,8 +6,8 @@ #include <string> -#include "base/callback_helpers.h" #include "base/containers/contains.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/task/single_thread_task_runner.h" #include "base/test/gmock_callback_support.h"
diff --git a/content/browser/media/key_system_support_win.h b/content/browser/media/key_system_support_win.h index d2427c2..cd8cb2be 100644 --- a/content/browser/media/key_system_support_win.h +++ b/content/browser/media/key_system_support_win.h
@@ -7,8 +7,8 @@ #include <string> -#include "base/callback.h" #include "base/files/file_path.h" +#include "base/functional/callback.h" #include "media/cdm/cdm_capability.h" #include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/content/browser/media/media_devices_permission_checker.cc b/content/browser/media/media_devices_permission_checker.cc index c47f8060..7566373d 100644 --- a/content/browser/media/media_devices_permission_checker.cc +++ b/content/browser/media/media_devices_permission_checker.cc
@@ -7,8 +7,8 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "build/build_config.h" #include "content/browser/permissions/permission_util.h" #include "content/browser/renderer_host/render_frame_host_delegate.h"
diff --git a/content/browser/media/media_devices_permission_checker.h b/content/browser/media/media_devices_permission_checker.h index 168256c7..568404c8 100644 --- a/content/browser/media/media_devices_permission_checker.h +++ b/content/browser/media/media_devices_permission_checker.h
@@ -5,7 +5,7 @@ #ifndef CONTENT_BROWSER_MEDIA_MEDIA_DEVICES_PERMISSION_CHECKER_H_ #define CONTENT_BROWSER_MEDIA_MEDIA_DEVICES_PERMISSION_CHECKER_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "content/browser/renderer_host/media/media_devices_manager.h" #include "content/common/content_export.h"
diff --git a/content/browser/media/media_devices_permission_checker_unittest.cc b/content/browser/media/media_devices_permission_checker_unittest.cc index 3538809..389ed7782 100644 --- a/content/browser/media/media_devices_permission_checker_unittest.cc +++ b/content/browser/media/media_devices_permission_checker_unittest.cc
@@ -4,7 +4,7 @@ #include "content/browser/media/media_devices_permission_checker.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "content/public/browser/render_frame_host.h" #include "content/public/browser/render_process_host.h"
diff --git a/content/browser/media/media_devices_util.cc b/content/browser/media/media_devices_util.cc index 7a4e9231..20776fa 100644 --- a/content/browser/media/media_devices_util.cc +++ b/content/browser/media/media_devices_util.cc
@@ -7,8 +7,8 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/strings/string_split.h" #include "base/strings/string_tokenizer.h" #include "content/browser/renderer_host/frame_tree.h"
diff --git a/content/browser/media/media_devices_util.h b/content/browser/media/media_devices_util.h index 74fd745..fa8f588 100644 --- a/content/browser/media/media_devices_util.h +++ b/content/browser/media/media_devices_util.h
@@ -8,7 +8,7 @@ #include <string> #include <utility> -#include "base/callback.h" +#include "base/functional/callback.h" #include "content/common/content_export.h" #include "third_party/blink/public/common/mediastream/media_devices.h" #include "url/origin.h"
diff --git a/content/browser/media/media_interface_factory_holder.h b/content/browser/media/media_interface_factory_holder.h index be1ba8e..659c286 100644 --- a/content/browser/media/media_interface_factory_holder.h +++ b/content/browser/media/media_interface_factory_holder.h
@@ -5,7 +5,7 @@ #ifndef CONTENT_BROWSER_MEDIA_MEDIA_INTERFACE_FACTORY_HOLDER_H_ #define CONTENT_BROWSER_MEDIA_MEDIA_INTERFACE_FACTORY_HOLDER_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/threading/thread_checker.h" #include "media/mojo/mojom/frame_interface_factory.mojom.h" #include "media/mojo/mojom/interface_factory.mojom.h"
diff --git a/content/browser/media/media_interface_proxy.cc b/content/browser/media/media_interface_proxy.cc index 0299bd8..22dbee9c 100644 --- a/content/browser/media/media_interface_proxy.cc +++ b/content/browser/media/media_interface_proxy.cc
@@ -9,8 +9,8 @@ #include <string> #include <tuple> -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/memory/raw_ptr.h" #include "base/no_destructor.h"
diff --git a/content/browser/media/media_internals.cc b/content/browser/media/media_internals.cc index 98ee76c..a77dfc8 100644 --- a/content/browser/media/media_internals.cc +++ b/content/browser/media/media_internals.cc
@@ -10,10 +10,10 @@ #include <tuple> #include <utility> -#include "base/bind.h" #include "base/containers/adapters.h" #include "base/containers/cxx20_erase.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/metrics/field_trial_params.h" #include "base/metrics/histogram_functions.h"
diff --git a/content/browser/media/media_internals.h b/content/browser/media/media_internals.h index 1bae391..2f2c5f8 100644 --- a/content/browser/media/media_internals.h +++ b/content/browser/media/media_internals.h
@@ -12,7 +12,7 @@ #include <tuple> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/synchronization/lock.h" #include "base/values.h" #include "content/browser/media/media_internals_audio_focus_helper.h"
diff --git a/content/browser/media/media_internals_audio_focus_helper.cc b/content/browser/media/media_internals_audio_focus_helper.cc index 34095da5..bff77b0 100644 --- a/content/browser/media/media_internals_audio_focus_helper.cc +++ b/content/browser/media/media_internals_audio_focus_helper.cc
@@ -6,8 +6,8 @@ #include <string> -#include "base/bind.h" #include "base/containers/adapters.h" +#include "base/functional/bind.h" #include "base/ranges/algorithm.h" #include "base/strings/strcat.h" #include "base/values.h"
diff --git a/content/browser/media/media_internals_handler.cc b/content/browser/media/media_internals_handler.cc index a686d80..540fdb5 100644 --- a/content/browser/media/media_internals_handler.cc +++ b/content/browser/media/media_internals_handler.cc
@@ -4,8 +4,8 @@ #include "content/browser/media/media_internals_handler.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/values.h" #include "content/browser/media/media_internals_proxy.h" #include "content/public/browser/browser_thread.h"
diff --git a/content/browser/media/media_internals_proxy.cc b/content/browser/media/media_internals_proxy.cc index 0d9d3919..8a0b81b 100644 --- a/content/browser/media/media_internals_proxy.cc +++ b/content/browser/media/media_internals_proxy.cc
@@ -4,7 +4,7 @@ #include "content/browser/media/media_internals_proxy.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "build/build_config.h" #include "content/browser/media/media_internals.h"
diff --git a/content/browser/media/media_internals_unittest.cc b/content/browser/media/media_internals_unittest.cc index 9efaac40..c33b44a 100644 --- a/content/browser/media/media_internals_unittest.cc +++ b/content/browser/media/media_internals_unittest.cc
@@ -6,8 +6,8 @@ #include <stddef.h> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/json/json_reader.h" #include "base/run_loop.h" #include "base/strings/stringprintf.h"
diff --git a/content/browser/media/media_license_manager.cc b/content/browser/media/media_license_manager.cc index 8d70549..1661b921 100644 --- a/content/browser/media/media_license_manager.cc +++ b/content/browser/media/media_license_manager.cc
@@ -8,11 +8,11 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback_forward.h" #include "base/containers/flat_map.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback_forward.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h" #include "base/sequence_checker.h"
diff --git a/content/browser/media/media_license_manager.h b/content/browser/media/media_license_manager.h index f295a5a..43726d3 100644 --- a/content/browser/media/media_license_manager.h +++ b/content/browser/media/media_license_manager.h
@@ -8,9 +8,9 @@ #include <memory> #include <vector> -#include "base/callback_forward.h" #include "base/containers/flat_map.h" #include "base/files/file_path.h" +#include "base/functional/callback_forward.h" #include "base/memory/scoped_refptr.h" #include "base/task/sequenced_task_runner.h" #include "base/types/pass_key.h"
diff --git a/content/browser/media/media_license_storage_host.cc b/content/browser/media/media_license_storage_host.cc index cc888c9..9cdafd44 100644 --- a/content/browser/media/media_license_storage_host.cc +++ b/content/browser/media/media_license_storage_host.cc
@@ -9,8 +9,8 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_functions.h" #include "base/notreached.h" #include "base/sequence_checker.h"
diff --git a/content/browser/media/media_license_storage_host.h b/content/browser/media/media_license_storage_host.h index e16f089..abca36e 100644 --- a/content/browser/media/media_license_storage_host.h +++ b/content/browser/media/media_license_storage_host.h
@@ -5,9 +5,9 @@ #ifndef CONTENT_BROWSER_MEDIA_MEDIA_LICENSE_STORAGE_HOST_H_ #define CONTENT_BROWSER_MEDIA_MEDIA_LICENSE_STORAGE_HOST_H_ -#include "base/callback_forward.h" #include "base/containers/unique_ptr_adapters.h" #include "base/files/file_path.h" +#include "base/functional/callback_forward.h" #include "base/thread_annotations.h" #include "base/threading/sequence_bound.h" #include "base/types/pass_key.h"
diff --git a/content/browser/media/media_license_storage_host_unittest.cc b/content/browser/media/media_license_storage_host_unittest.cc index 0f8fd4d..4abe676 100644 --- a/content/browser/media/media_license_storage_host_unittest.cc +++ b/content/browser/media/media_license_storage_host_unittest.cc
@@ -5,9 +5,9 @@ #include <memory> #include <vector> -#include "base/bind.h" -#include "base/callback.h" #include "base/files/file.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/logging.h" #include "base/test/bind.h" #include "base/test/test_future.h"
diff --git a/content/browser/media/media_power_experiment_manager.cc b/content/browser/media/media_power_experiment_manager.cc index 3195e43..4ce15c4 100644 --- a/content/browser/media/media_power_experiment_manager.cc +++ b/content/browser/media/media_power_experiment_manager.cc
@@ -7,8 +7,8 @@ #include <memory> #include <utility> -#include "base/callback_helpers.h" #include "base/feature_list.h" +#include "base/functional/callback_helpers.h" #include "base/no_destructor.h" #include "base/task/sequenced_task_runner.h" #include "media/base/media_switches.h"
diff --git a/content/browser/media/media_power_experiment_manager.h b/content/browser/media/media_power_experiment_manager.h index 43f8ba37..1582438 100644 --- a/content/browser/media/media_power_experiment_manager.h +++ b/content/browser/media/media_power_experiment_manager.h
@@ -9,7 +9,7 @@ #include <set> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" #include "base/sequence_checker.h" #include "base/task/sequenced_task_runner.h"
diff --git a/content/browser/media/media_power_experiment_manager_unittest.cc b/content/browser/media/media_power_experiment_manager_unittest.cc index f7947c536..95b7175 100644 --- a/content/browser/media/media_power_experiment_manager_unittest.cc +++ b/content/browser/media/media_power_experiment_manager_unittest.cc
@@ -4,7 +4,7 @@ #include "content/browser/media/media_power_experiment_manager.h" -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ptr_util.h" #include "base/time/time.h" #include "base/version.h"
diff --git a/content/browser/media/media_redirect_browsertest.cc b/content/browser/media/media_redirect_browsertest.cc index bed1fce..13f1517 100644 --- a/content/browser/media/media_redirect_browsertest.cc +++ b/content/browser/media/media_redirect_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 "base/bind.h" +#include "base/functional/bind.h" #include "build/build_config.h" #include "content/browser/media/media_browsertest.h" #include "content/public/test/browser_test.h"
diff --git a/content/browser/media/media_suspend_browsertest.cc b/content/browser/media/media_suspend_browsertest.cc index 549b6c5..c668ae03 100644 --- a/content/browser/media/media_suspend_browsertest.cc +++ b/content/browser/media/media_suspend_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 "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/utf_string_conversions.h" #include "content/browser/media/media_browsertest.h" #include "content/browser/media/media_web_contents_observer.h"
diff --git a/content/browser/media/media_web_contents_observer.cc b/content/browser/media/media_web_contents_observer.cc index 8ebab3e..936f262 100644 --- a/content/browser/media/media_web_contents_observer.cc +++ b/content/browser/media/media_web_contents_observer.cc
@@ -7,10 +7,10 @@ #include <memory> #include <tuple> -#include "base/bind.h" #include "base/containers/cxx20_erase.h" #include "base/debug/crash_logging.h" #include "base/debug/dump_without_crashing.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/task/sequenced_task_runner.h" #include "build/build_config.h"
diff --git a/content/browser/media/midi_host.cc b/content/browser/media/midi_host.cc index 424920e..94ffc6e 100644 --- a/content/browser/media/midi_host.cc +++ b/content/browser/media/midi_host.cc
@@ -4,9 +4,9 @@ #include "content/browser/media/midi_host.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ptr_util.h" #include "base/process/process.h" #include "base/trace_event/trace_event.h"
diff --git a/content/browser/media/service_factory.cc b/content/browser/media/service_factory.cc index 37408c7..dca1c40 100644 --- a/content/browser/media/service_factory.cc +++ b/content/browser/media/service_factory.cc
@@ -8,8 +8,8 @@ #include <string> #include <utility> -#include "base/bind.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/threading/sequence_local_storage_slot.h" #include "base/time/time.h"
diff --git a/content/browser/media/session/audio_focus_delegate_default.cc b/content/browser/media/session/audio_focus_delegate_default.cc index a7d80fa5..3bb7b5f 100644 --- a/content/browser/media/session/audio_focus_delegate_default.cc +++ b/content/browser/media/session/audio_focus_delegate_default.cc
@@ -5,7 +5,7 @@ #include "base/memory/raw_ptr.h" #include "content/browser/media/session/audio_focus_delegate.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/unguessable_token.h" #include "build/build_config.h" #include "content/browser/media/session/media_session_impl.h"
diff --git a/content/browser/media/session/audio_focus_delegate_default_browsertest.cc b/content/browser/media/session/audio_focus_delegate_default_browsertest.cc index 2a6c85b..cf3a64c9 100644 --- a/content/browser/media/session/audio_focus_delegate_default_browsertest.cc +++ b/content/browser/media/session/audio_focus_delegate_default_browsertest.cc
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/test/scoped_feature_list.h" #include "base/unguessable_token.h" #include "build/build_config.h"
diff --git a/content/browser/media/session/media_session_browsertest.cc b/content/browser/media/session/media_session_browsertest.cc index dac08a3..c00f6bb1 100644 --- a/content/browser/media/session/media_session_browsertest.cc +++ b/content/browser/media/session/media_session_browsertest.cc
@@ -4,9 +4,9 @@ #include "content/public/browser/media_session.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/containers/contains.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h" #include "base/synchronization/lock.h"
diff --git a/content/browser/media/session/media_session_impl.cc b/content/browser/media/session/media_session_impl.cc index 11903e9..4ca4f52 100644 --- a/content/browser/media/session/media_session_impl.cc +++ b/content/browser/media/session/media_session_impl.cc
@@ -7,9 +7,9 @@ #include <memory> #include <utility> -#include "base/bind.h" #include "base/containers/contains.h" #include "base/cxx17_backports.h" +#include "base/functional/bind.h" #include "base/ranges/algorithm.h" #include "base/strings/string_util.h" #include "base/time/time.h"
diff --git a/content/browser/media/session/media_session_impl_visibility_browsertest.cc b/content/browser/media/session/media_session_impl_visibility_browsertest.cc index ce9f54a..592b4af 100644 --- a/content/browser/media/session/media_session_impl_visibility_browsertest.cc +++ b/content/browser/media/session/media_session_impl_visibility_browsertest.cc
@@ -4,8 +4,8 @@ #include <tuple> -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h"
diff --git a/content/browser/media/system_media_controls_notifier.cc b/content/browser/media/system_media_controls_notifier.cc index c224be51..57e2852 100644 --- a/content/browser/media/system_media_controls_notifier.cc +++ b/content/browser/media/system_media_controls_notifier.cc
@@ -17,7 +17,7 @@ #include "ui/gfx/image/image_skia.h" #if BUILDFLAG(IS_WIN) -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/time/time.h" #include "ui/base/idle/idle.h" #endif // BUILDFLAG(IS_WIN)
diff --git a/content/browser/media/url_provision_fetcher.cc b/content/browser/media/url_provision_fetcher.cc index ff4a2c4a..ea6b3295a6 100644 --- a/content/browser/media/url_provision_fetcher.cc +++ b/content/browser/media/url_provision_fetcher.cc
@@ -4,7 +4,7 @@ #include "content/browser/media/url_provision_fetcher.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_functions.h" #include "content/public/browser/provision_fetcher_factory.h" #include "media/base/bind_to_current_loop.h"
diff --git a/content/browser/memory_pressure/user_level_memory_pressure_signal_generator.cc b/content/browser/memory_pressure/user_level_memory_pressure_signal_generator.cc index 65da0b7f..7a58b896 100644 --- a/content/browser/memory_pressure/user_level_memory_pressure_signal_generator.cc +++ b/content/browser/memory_pressure/user_level_memory_pressure_signal_generator.cc
@@ -12,11 +12,11 @@ #include <unistd.h> #include <utility> #include "base/android/child_process_binding_types.h" -#include "base/bind.h" #include "base/feature_list.h" #include "base/files/file.h" #include "base/files/file_path.h" #include "base/files/scoped_file.h" +#include "base/functional/bind.h" #include "base/memory/memory_pressure_listener.h" #include "base/metrics/field_trial_params.h" #include "base/numerics/safe_conversions.h"
diff --git a/content/browser/message_port_provider_browsertest.cc b/content/browser/message_port_provider_browsertest.cc index 3f7c980..1d011c7 100644 --- a/content/browser/message_port_provider_browsertest.cc +++ b/content/browser/message_port_provider_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 "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/strcat.h" #include "base/strings/utf_string_conversions.h" #include "base/synchronization/waitable_event.h"
diff --git a/content/browser/metrics/histogram_controller.cc b/content/browser/metrics/histogram_controller.cc index 3296c56..f3f5033a 100644 --- a/content/browser/metrics/histogram_controller.cc +++ b/content/browser/metrics/histogram_controller.cc
@@ -4,7 +4,6 @@ #include "content/browser/metrics/histogram_controller.h" -#include "base/bind.h" #include "base/functional/bind.h" #include "base/metrics/histogram_macros.h" #include "base/process/process_handle.h"
diff --git a/content/browser/metrics/histogram_synchronizer.cc b/content/browser/metrics/histogram_synchronizer.cc index 0134a31..58f3834 100644 --- a/content/browser/metrics/histogram_synchronizer.cc +++ b/content/browser/metrics/histogram_synchronizer.cc
@@ -6,9 +6,9 @@ #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/check_op.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/lazy_instance.h" #include "base/location.h" #include "base/metrics/histogram_delta_serialization.h"
diff --git a/content/browser/metrics/histogram_synchronizer.h b/content/browser/metrics/histogram_synchronizer.h index 4f2d406..85b9da5 100644 --- a/content/browser/metrics/histogram_synchronizer.h +++ b/content/browser/metrics/histogram_synchronizer.h
@@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/singleton.h" #include "base/synchronization/lock.h" #include "base/task/task_runner.h"
diff --git a/content/browser/metrics/histograms_internals_ui.cc b/content/browser/metrics/histograms_internals_ui.cc index 3bd2298..77c9f0c 100644 --- a/content/browser/metrics/histograms_internals_ui.cc +++ b/content/browser/metrics/histograms_internals_ui.cc
@@ -10,7 +10,7 @@ #include <string> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/metrics/histogram.h" #include "base/metrics/statistics_recorder.h" #include "base/values.h"
diff --git a/content/browser/mojo_binder_policy_applier.h b/content/browser/mojo_binder_policy_applier.h index ab24ebe..763609c92 100644 --- a/content/browser/mojo_binder_policy_applier.h +++ b/content/browser/mojo_binder_policy_applier.h
@@ -7,8 +7,8 @@ #include <string> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/functional/callback_forward.h" #include "base/memory/raw_ref.h" #include "content/browser/mojo_binder_policy_map_impl.h"
diff --git a/content/browser/mojo_binder_policy_applier_unittest.cc b/content/browser/mojo_binder_policy_applier_unittest.cc index 034b19c..db4e59b 100644 --- a/content/browser/mojo_binder_policy_applier_unittest.cc +++ b/content/browser/mojo_binder_policy_applier_unittest.cc
@@ -4,7 +4,7 @@ #include "content/browser/mojo_binder_policy_applier.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "base/test/bind.h" #include "base/test/task_environment.h"
diff --git a/content/browser/mojo_sandbox_browsertest.cc b/content/browser/mojo_sandbox_browsertest.cc index e06f9ff..9f0214d 100644 --- a/content/browser/mojo_sandbox_browsertest.cc +++ b/content/browser/mojo_sandbox_browsertest.cc
@@ -6,9 +6,9 @@ #include <memory> #include <utility> -#include "base/bind.h" #include "base/command_line.h" #include "base/containers/span.h" +#include "base/functional/bind.h" #include "base/memory/read_only_shared_memory_region.h" #include "base/memory/shared_memory_mapping.h" #include "base/memory/unsafe_shared_memory_region.h"
diff --git a/content/browser/navigation_browsertest.cc b/content/browser/navigation_browsertest.cc index 9bd8431..0881702 100644 --- a/content/browser/navigation_browsertest.cc +++ b/content/browser/navigation_browsertest.cc
@@ -6,12 +6,12 @@ #include <memory> -#include "base/bind.h" -#include "base/callback.h" #include "base/command_line.h" #include "base/containers/contains.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/guid.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h"
diff --git a/content/browser/network/accept_header_browsertest.cc b/content/browser/network/accept_header_browsertest.cc index 6b110d2..cdb9fbc 100644 --- a/content/browser/network/accept_header_browsertest.cc +++ b/content/browser/network/accept_header_browsertest.cc
@@ -4,8 +4,8 @@ #include <map> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "base/synchronization/lock.h" #include "base/test/bind.h"
diff --git a/content/browser/network/cookie_store_factory.cc b/content/browser/network/cookie_store_factory.cc index 7aaae74..dcce4ec2 100644 --- a/content/browser/network/cookie_store_factory.cc +++ b/content/browser/network/cookie_store_factory.cc
@@ -6,8 +6,8 @@ #include <memory> -#include "base/callback_helpers.h" #include "base/files/file_path.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ref_counted.h" #include "base/task/sequenced_task_runner.h" #include "base/task/thread_pool.h"
diff --git a/content/browser/network/network_errors_listing_ui.cc b/content/browser/network/network_errors_listing_ui.cc index 8e2b8d98..f630245 100644 --- a/content/browser/network/network_errors_listing_ui.cc +++ b/content/browser/network/network_errors_listing_ui.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/json/json_writer.h" #include "base/memory/ref_counted_memory.h" #include "base/values.h"
diff --git a/content/browser/network_context_client_base_impl.cc b/content/browser/network_context_client_base_impl.cc index f751226..b07a2447 100644 --- a/content/browser/network_context_client_base_impl.cc +++ b/content/browser/network_context_client_base_impl.cc
@@ -4,7 +4,7 @@ #include "content/browser/network_context_client_base_impl.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/task/sequenced_task_runner.h" #include "base/task/task_runner.h" #include "base/task/task_traits.h"
diff --git a/content/browser/network_context_client_base_impl_unittest.cc b/content/browser/network_context_client_base_impl_unittest.cc index a8e7a34..9a87e2cb 100644 --- a/content/browser/network_context_client_base_impl_unittest.cc +++ b/content/browser/network_context_client_base_impl_unittest.cc
@@ -4,11 +4,11 @@ #include "content/public/browser/network_context_client_base.h" -#include "base/bind.h" #include "base/files/file.h" #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" #include "base/path_service.h" #include "base/test/task_environment.h" #include "base/test/test_file_util.h"
diff --git a/content/browser/network_sandbox.h b/content/browser/network_sandbox.h index 6ffb513d..a3f19d4e 100644 --- a/content/browser/network_sandbox.h +++ b/content/browser/network_sandbox.h
@@ -5,7 +5,7 @@ #ifndef CONTENT_BROWSER_NETWORK_SANDBOX_H_ #define CONTENT_BROWSER_NETWORK_SANDBOX_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "services/network/public/mojom/network_context.mojom.h" // As of 2022-03 there is no plan to sandbox the network service in any special
diff --git a/content/browser/network_service_browsertest.cc b/content/browser/network_service_browsertest.cc index 7ca36e9..7f12d477 100644 --- a/content/browser/network_service_browsertest.cc +++ b/content/browser/network_service_browsertest.cc
@@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/bind.h" #include "base/command_line.h" #include "base/files/file.h" #include "base/files/file_enumerator.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/json/json_reader.h" #include "base/json/json_writer.h" #include "base/json/values_util.h"
diff --git a/content/browser/network_service_client.cc b/content/browser/network_service_client.cc index ca8f89c..f09709d4 100644 --- a/content/browser/network_service_client.cc +++ b/content/browser/network_service_client.cc
@@ -6,9 +6,9 @@ #include <utility> -#include "base/bind.h" #include "base/command_line.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/threading/sequence_bound.h" #include "base/unguessable_token.h" #include "build/build_config.h"
diff --git a/content/browser/network_service_instance_impl.cc b/content/browser/network_service_instance_impl.cc index c692226..b1d21b8 100644 --- a/content/browser/network_service_instance_impl.cc +++ b/content/browser/network_service_instance_impl.cc
@@ -9,13 +9,13 @@ #include <utility> #include "base/base_paths.h" -#include "base/bind.h" #include "base/command_line.h" #include "base/environment.h" #include "base/feature_list.h" #include "base/files/file.h" #include "base/files/file_enumerator.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/message_loop/message_pump_type.h" #include "base/metrics/histogram_functions.h" #include "base/metrics/histogram_macros.h"
diff --git a/content/browser/network_service_instance_impl.h b/content/browser/network_service_instance_impl.h index 5e889e4..f58a074 100644 --- a/content/browser/network_service_instance_impl.h +++ b/content/browser/network_service_instance_impl.h
@@ -5,8 +5,8 @@ #ifndef CONTENT_BROWSER_NETWORK_SERVICE_INSTANCE_IMPL_H_ #define CONTENT_BROWSER_NETWORK_SERVICE_INSTANCE_IMPL_H_ -#include "base/callback.h" #include "base/callback_list.h" +#include "base/functional/callback.h" #include "content/common/content_export.h" namespace base {
diff --git a/content/browser/network_service_restart_browsertest.cc b/content/browser/network_service_restart_browsertest.cc index 4a86166..a6d68f4 100644 --- a/content/browser/network_service_restart_browsertest.cc +++ b/content/browser/network_service_restart_browsertest.cc
@@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/bind.h" -#include "base/callback.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/run_loop.h" #include "base/scoped_environment_variable_override.h" #include "base/strings/strcat.h"
diff --git a/content/browser/notifications/blink_notification_service_impl.cc b/content/browser/notifications/blink_notification_service_impl.cc index d4540308..688c95e 100644 --- a/content/browser/notifications/blink_notification_service_impl.cc +++ b/content/browser/notifications/blink_notification_service_impl.cc
@@ -7,10 +7,10 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/check_op.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/metrics/histogram_functions.h" #include "content/browser/notifications/notification_event_dispatcher_impl.h" #include "content/browser/notifications/platform_notification_context_impl.h"
diff --git a/content/browser/notifications/blink_notification_service_impl_unittest.cc b/content/browser/notifications/blink_notification_service_impl_unittest.cc index a8e229e..f4a46e1 100644 --- a/content/browser/notifications/blink_notification_service_impl_unittest.cc +++ b/content/browser/notifications/blink_notification_service_impl_unittest.cc
@@ -8,8 +8,8 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/scoped_refptr.h" #include "base/run_loop.h" #include "base/test/scoped_feature_list.h"
diff --git a/content/browser/notifications/devtools_event_logging.cc b/content/browser/notifications/devtools_event_logging.cc index a3c7f96..2639275 100644 --- a/content/browser/notifications/devtools_event_logging.cc +++ b/content/browser/notifications/devtools_event_logging.cc
@@ -4,7 +4,7 @@ #include "content/browser/notifications/devtools_event_logging.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" #include "base/time/time_to_iso8601.h"
diff --git a/content/browser/notifications/notification_database.cc b/content/browser/notifications/notification_database.cc index c35ad11..b3c49adc 100644 --- a/content/browser/notifications/notification_database.cc +++ b/content/browser/notifications/notification_database.cc
@@ -7,8 +7,8 @@ #include <string> #include <utility> -#include "base/bind.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_macros.h" #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h"
diff --git a/content/browser/notifications/notification_event_dispatcher_impl.cc b/content/browser/notifications/notification_event_dispatcher_impl.cc index e65f98f..2da8992a 100644 --- a/content/browser/notifications/notification_event_dispatcher_impl.cc +++ b/content/browser/notifications/notification_event_dispatcher_impl.cc
@@ -4,9 +4,9 @@ #include "content/browser/notifications/notification_event_dispatcher_impl.h" -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/metrics/histogram_functions.h" #include "base/notreached.h" #include "build/build_config.h"
diff --git a/content/browser/notifications/notification_event_dispatcher_impl.h b/content/browser/notifications/notification_event_dispatcher_impl.h index e3acec10..5dbef52 100644 --- a/content/browser/notifications/notification_event_dispatcher_impl.h +++ b/content/browser/notifications/notification_event_dispatcher_impl.h
@@ -9,7 +9,7 @@ #include <string> #include <utility> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/singleton.h" #include "content/common/content_export.h" #include "content/public/browser/notification_database_data.h"
diff --git a/content/browser/notifications/notification_event_dispatcher_impl_unittest.cc b/content/browser/notifications/notification_event_dispatcher_impl_unittest.cc index 42cb31a..8edf2e9 100644 --- a/content/browser/notifications/notification_event_dispatcher_impl_unittest.cc +++ b/content/browser/notifications/notification_event_dispatcher_impl_unittest.cc
@@ -9,7 +9,7 @@ #include <utility> #include <vector> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/test/task_environment.h" #include "base/test/test_simple_task_runner.h"
diff --git a/content/browser/notifications/notification_storage.cc b/content/browser/notifications/notification_storage.cc index c483f0bd..69a11bbe 100644 --- a/content/browser/notifications/notification_storage.cc +++ b/content/browser/notifications/notification_storage.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_macros.h" #include "base/time/time.h" #include "content/browser/notifications/notification_database_conversions.h"
diff --git a/content/browser/notifications/notification_storage_unittest.cc b/content/browser/notifications/notification_storage_unittest.cc index 46ed3aa..e89ca4b 100644 --- a/content/browser/notifications/notification_storage_unittest.cc +++ b/content/browser/notifications/notification_storage_unittest.cc
@@ -4,7 +4,7 @@ #include "content/browser/notifications/notification_storage.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/guid.h" #include "base/run_loop.h" #include "content/browser/service_worker/embedded_worker_test_helper.h"
diff --git a/content/browser/notifications/platform_notification_context_impl.cc b/content/browser/notifications/platform_notification_context_impl.cc index 6e44c3b..aa04c67 100644 --- a/content/browser/notifications/platform_notification_context_impl.cc +++ b/content/browser/notifications/platform_notification_context_impl.cc
@@ -6,11 +6,11 @@ #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/containers/cxx20_erase.h" #include "base/feature_list.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/metrics/histogram_functions.h" #include "base/metrics/histogram_macros.h" #include "base/task/sequenced_task_runner.h"
diff --git a/content/browser/notifications/platform_notification_context_impl.h b/content/browser/notifications/platform_notification_context_impl.h index 600d248..bbd2aa78 100644 --- a/content/browser/notifications/platform_notification_context_impl.h +++ b/content/browser/notifications/platform_notification_context_impl.h
@@ -11,8 +11,8 @@ #include <string> #include <vector> -#include "base/callback.h" #include "base/files/file_path.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h" #include "base/time/time.h"
diff --git a/content/browser/notifications/platform_notification_context_trigger_unittest.cc b/content/browser/notifications/platform_notification_context_trigger_unittest.cc index 08c9577..4dd9a56 100644 --- a/content/browser/notifications/platform_notification_context_trigger_unittest.cc +++ b/content/browser/notifications/platform_notification_context_trigger_unittest.cc
@@ -4,7 +4,7 @@ #include <stdint.h> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/task/single_thread_task_runner.h" #include "base/test/bind.h"
diff --git a/content/browser/notifications/platform_notification_context_unittest.cc b/content/browser/notifications/platform_notification_context_unittest.cc index dac8c33..154b716 100644 --- a/content/browser/notifications/platform_notification_context_unittest.cc +++ b/content/browser/notifications/platform_notification_context_unittest.cc
@@ -4,9 +4,9 @@ #include <stdint.h> -#include "base/bind.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h"
diff --git a/content/browser/notifications/platform_notification_service_proxy.h b/content/browser/notifications/platform_notification_service_proxy.h index 02ae700..26cf026 100644 --- a/content/browser/notifications/platform_notification_service_proxy.h +++ b/content/browser/notifications/platform_notification_service_proxy.h
@@ -9,7 +9,7 @@ #include <set> #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h"
diff --git a/content/browser/payments/installed_payment_apps_finder_impl.cc b/content/browser/payments/installed_payment_apps_finder_impl.cc index da2f406..0b13a1c 100644 --- a/content/browser/payments/installed_payment_apps_finder_impl.cc +++ b/content/browser/payments/installed_payment_apps_finder_impl.cc
@@ -4,7 +4,7 @@ #include "content/browser/payments/installed_payment_apps_finder_impl.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/supports_user_data.h" #include "content/browser/payments/payment_app_context_impl.h"
diff --git a/content/browser/payments/payment_app_browsertest.cc b/content/browser/payments/payment_app_browsertest.cc index d45acc0..7dd90e3 100644 --- a/content/browser/payments/payment_app_browsertest.cc +++ b/content/browser/payments/payment_app_browsertest.cc
@@ -4,8 +4,8 @@ #include <memory> -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "build/chromeos_buildflags.h" #include "content/browser/storage_partition_impl.h"
diff --git a/content/browser/payments/payment_app_content_unittest_base.cc b/content/browser/payments/payment_app_content_unittest_base.cc index 86b513c0..32b2f00 100644 --- a/content/browser/payments/payment_app_content_unittest_base.cc +++ b/content/browser/payments/payment_app_content_unittest_base.cc
@@ -10,9 +10,9 @@ #include <set> #include <utility> -#include "base/bind.h" #include "base/containers/contains.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "content/browser/payments/payment_app_context_impl.h" #include "content/browser/service_worker/embedded_worker_test_helper.h"
diff --git a/content/browser/payments/payment_app_context_impl.cc b/content/browser/payments/payment_app_context_impl.cc index d0bad5d..51ea8c82 100644 --- a/content/browser/payments/payment_app_context_impl.cc +++ b/content/browser/payments/payment_app_context_impl.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "content/browser/payments/payment_manager.h" #include "content/public/browser/browser_task_traits.h"
diff --git a/content/browser/payments/payment_app_database.cc b/content/browser/payments/payment_app_database.cc index 144fb93..09f20b6 100644 --- a/content/browser/payments/payment_app_database.cc +++ b/content/browser/payments/payment_app_database.cc
@@ -8,8 +8,8 @@ #include <utility> #include "base/base64.h" -#include "base/bind.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/strings/utf_string_conversions.h" #include "base/time/time.h" #include "content/browser/payments/payment_app.pb.h"
diff --git a/content/browser/payments/payment_app_info_fetcher.cc b/content/browser/payments/payment_app_info_fetcher.cc index 5a1ed318..3883c7a 100644 --- a/content/browser/payments/payment_app_info_fetcher.cc +++ b/content/browser/payments/payment_app_info_fetcher.cc
@@ -8,8 +8,8 @@ #include <utility> #include "base/base64.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/task/sequenced_task_runner.h" #include "components/payments/content/icon/icon_size.h" #include "content/browser/renderer_host/render_frame_host_impl.h"
diff --git a/content/browser/payments/payment_app_installer.cc b/content/browser/payments/payment_app_installer.cc index a65028a..6e2a0e0 100644 --- a/content/browser/payments/payment_app_installer.cc +++ b/content/browser/payments/payment_app_installer.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "base/metrics/histogram_functions.h"
diff --git a/content/browser/payments/payment_app_installer.h b/content/browser/payments/payment_app_installer.h index d5414b9..033647f 100644 --- a/content/browser/payments/payment_app_installer.h +++ b/content/browser/payments/payment_app_installer.h
@@ -8,7 +8,7 @@ #include <stdint.h> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "content/public/browser/supported_delegations.h" class GURL;
diff --git a/content/browser/payments/payment_app_provider_impl.cc b/content/browser/payments/payment_app_provider_impl.cc index 7e015e5a..1e9c64a 100644 --- a/content/browser/payments/payment_app_provider_impl.cc +++ b/content/browser/payments/payment_app_provider_impl.cc
@@ -10,9 +10,9 @@ #include <vector> #include "base/base64.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ref_counted_memory.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h"
diff --git a/content/browser/payments/payment_app_provider_impl_unittest.cc b/content/browser/payments/payment_app_provider_impl_unittest.cc index 0b6c0f3..32f98559 100644 --- a/content/browser/payments/payment_app_provider_impl_unittest.cc +++ b/content/browser/payments/payment_app_provider_impl_unittest.cc
@@ -6,7 +6,7 @@ #include <string> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "content/browser/payments/installed_payment_apps_finder_impl.h"
diff --git a/content/browser/payments/payment_event_dispatcher.cc b/content/browser/payments/payment_event_dispatcher.cc index 8dc19c4a..0b94d16f8 100644 --- a/content/browser/payments/payment_event_dispatcher.cc +++ b/content/browser/payments/payment_event_dispatcher.cc
@@ -4,9 +4,9 @@ #include "content/browser/payments/payment_event_dispatcher.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "content/browser/payments/payment_app_provider_impl.h" #include "content/browser/service_worker/service_worker_context_wrapper.h" #include "content/public/common/content_features.h"
diff --git a/content/browser/payments/payment_instrument_icon_fetcher.cc b/content/browser/payments/payment_instrument_icon_fetcher.cc index a79de27..0aa41fb 100644 --- a/content/browser/payments/payment_instrument_icon_fetcher.cc +++ b/content/browser/payments/payment_instrument_icon_fetcher.cc
@@ -8,8 +8,8 @@ #include <utility> #include "base/base64.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/task/sequenced_task_runner.h" #include "components/payments/content/icon/icon_size.h" #include "content/browser/renderer_host/render_frame_host_impl.h"
diff --git a/content/browser/payments/payment_instrument_icon_fetcher.h b/content/browser/payments/payment_instrument_icon_fetcher.h index f5ead190..1a3bb46 100644 --- a/content/browser/payments/payment_instrument_icon_fetcher.h +++ b/content/browser/payments/payment_instrument_icon_fetcher.h
@@ -9,7 +9,7 @@ #include <string> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "content/public/browser/global_routing_id.h" #include "third_party/blink/public/common/manifest/manifest.h"
diff --git a/content/browser/payments/payment_manager.cc b/content/browser/payments/payment_manager.cc index eea2b26f..e2854cb3 100644 --- a/content/browser/payments/payment_manager.cc +++ b/content/browser/payments/payment_manager.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/string_util.h" #include "content/browser/payments/payment_app.pb.h" #include "content/browser/payments/payment_app_context_impl.h"
diff --git a/content/browser/payments/payment_manager_unittest.cc b/content/browser/payments/payment_manager_unittest.cc index e90e329..220fde5 100644 --- a/content/browser/payments/payment_manager_unittest.cc +++ b/content/browser/payments/payment_manager_unittest.cc
@@ -4,7 +4,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "content/browser/payments/payment_app_content_unittest_base.h"
diff --git a/content/browser/payments/respond_with_callback.h b/content/browser/payments/respond_with_callback.h index 189bd1fc..9187bd58 100644 --- a/content/browser/payments/respond_with_callback.h +++ b/content/browser/payments/respond_with_callback.h
@@ -5,7 +5,7 @@ #ifndef CONTENT_BROWSER_PAYMENTS_RESPOND_WITH_CALLBACK_H_ #define CONTENT_BROWSER_PAYMENTS_RESPOND_WITH_CALLBACK_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/metrics/histogram_macros.h" #include "content/browser/service_worker/service_worker_context_wrapper.h" #include "content/public/browser/browser_context.h"
diff --git a/content/browser/permissions/permission_controller_impl.cc b/content/browser/permissions/permission_controller_impl.cc index a4b6160..240a1f44 100644 --- a/content/browser/permissions/permission_controller_impl.cc +++ b/content/browser/permissions/permission_controller_impl.cc
@@ -4,7 +4,7 @@ #include "content/browser/permissions/permission_controller_impl.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "content/browser/permissions/permission_service_context.h" #include "content/browser/permissions/permission_util.h" #include "content/browser/renderer_host/render_frame_host_impl.h"
diff --git a/content/browser/permissions/permission_service_context.cc b/content/browser/permissions/permission_service_context.cc index 30744374..2582b2aa 100644 --- a/content/browser/permissions/permission_service_context.cc +++ b/content/browser/permissions/permission_service_context.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "content/browser/permissions/permission_controller_impl.h"
diff --git a/content/browser/permissions/permission_service_impl.cc b/content/browser/permissions/permission_service_impl.cc index 51659ad..25aaf11 100644 --- a/content/browser/permissions/permission_service_impl.cc +++ b/content/browser/permissions/permission_service_impl.cc
@@ -10,7 +10,7 @@ #include <set> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "content/browser/bad_message.h" #include "content/browser/permissions/permission_controller_impl.h"
diff --git a/content/browser/permissions/permission_service_impl.h b/content/browser/permissions/permission_service_impl.h index f6e7701..0bd6b867 100644 --- a/content/browser/permissions/permission_service_impl.h +++ b/content/browser/permissions/permission_service_impl.h
@@ -5,8 +5,8 @@ #ifndef CONTENT_BROWSER_PERMISSIONS_PERMISSION_SERVICE_IMPL_H_ #define CONTENT_BROWSER_PERMISSIONS_PERMISSION_SERVICE_IMPL_H_ -#include "base/callback.h" #include "base/containers/id_map.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "content/browser/permissions/permission_service_context.h"
diff --git a/content/browser/picture_in_picture/document_picture_in_picture_window_controller_impl.cc b/content/browser/picture_in_picture/document_picture_in_picture_window_controller_impl.cc index 09e44f5..632fcbab1 100644 --- a/content/browser/picture_in_picture/document_picture_in_picture_window_controller_impl.cc +++ b/content/browser/picture_in_picture/document_picture_in_picture_window_controller_impl.cc
@@ -7,7 +7,7 @@ #include <set> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "content/browser/media/media_web_contents_observer.h" #include "content/browser/media/session/media_session_impl.h" #include "content/browser/picture_in_picture/picture_in_picture_session.h"
diff --git a/content/browser/picture_in_picture/document_picture_in_picture_window_controller_impl.h b/content/browser/picture_in_picture/document_picture_in_picture_window_controller_impl.h index 0a412e01..a328393 100644 --- a/content/browser/picture_in_picture/document_picture_in_picture_window_controller_impl.h +++ b/content/browser/picture_in_picture/document_picture_in_picture_window_controller_impl.h
@@ -8,7 +8,7 @@ #include <map> #include <set> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "content/common/content_export.h"
diff --git a/content/browser/picture_in_picture/picture_in_picture_session.cc b/content/browser/picture_in_picture/picture_in_picture_session.cc index ee6ee794..53ee7971 100644 --- a/content/browser/picture_in_picture/picture_in_picture_session.cc +++ b/content/browser/picture_in_picture/picture_in_picture_session.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "content/browser/picture_in_picture/picture_in_picture_service_impl.h" #include "content/browser/picture_in_picture/video_picture_in_picture_window_controller_impl.h" #include "content/browser/web_contents/web_contents_impl.h"
diff --git a/content/browser/plugin_service_impl.cc b/content/browser/plugin_service_impl.cc index d1ab7c3b..f895a90 100644 --- a/content/browser/plugin_service_impl.cc +++ b/content/browser/plugin_service_impl.cc
@@ -9,10 +9,10 @@ #include <string> #include <utility> -#include "base/bind.h" #include "base/command_line.h" #include "base/compiler_specific.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/logging.h" #include "base/strings/string_piece.h"
diff --git a/content/browser/plugin_service_impl_browsertest.cc b/content/browser/plugin_service_impl_browsertest.cc index 07e5470..ccc093de 100644 --- a/content/browser/plugin_service_impl_browsertest.cc +++ b/content/browser/plugin_service_impl_browsertest.cc
@@ -8,7 +8,7 @@ #include <string> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h"
diff --git a/content/browser/portal/portal.cc b/content/browser/portal/portal.cc index 100f078..c99e937c 100644 --- a/content/browser/portal/portal.cc +++ b/content/browser/portal/portal.cc
@@ -7,9 +7,9 @@ #include <unordered_map> #include <utility> -#include "base/callback_helpers.h" #include "base/check_op.h" #include "base/feature_list.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ptr_util.h" #include "base/strings/stringprintf.h" #include "content/browser/bad_message.h"
diff --git a/content/browser/portal/portal_browsertest.cc b/content/browser/portal/portal_browsertest.cc index dd1a470..5742378 100644 --- a/content/browser/portal/portal_browsertest.cc +++ b/content/browser/portal/portal_browsertest.cc
@@ -5,9 +5,9 @@ #include <memory> #include "base/base_switches.h" -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h"
diff --git a/content/browser/portal/portal_navigation_throttle_browsertest.cc b/content/browser/portal/portal_navigation_throttle_browsertest.cc index 823046f..ff3f63d 100644 --- a/content/browser/portal/portal_navigation_throttle_browsertest.cc +++ b/content/browser/portal/portal_navigation_throttle_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 "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/strings/escape.h" #include "base/strings/stringprintf.h"
diff --git a/content/browser/power_monitor_browsertest.cc b/content/browser/power_monitor_browsertest.cc index 12df350d..0b2d5c8 100644 --- a/content/browser/power_monitor_browsertest.cc +++ b/content/browser/power_monitor_browsertest.cc
@@ -4,8 +4,8 @@ #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h" #include "content/browser/renderer_host/render_process_host_impl.h"
diff --git a/content/browser/ppapi_plugin_process_host.cc b/content/browser/ppapi_plugin_process_host.cc index 3c7a303..b29794a 100644 --- a/content/browser/ppapi_plugin_process_host.cc +++ b/content/browser/ppapi_plugin_process_host.cc
@@ -10,9 +10,9 @@ #include <utility> #include "base/base_switches.h" -#include "base/bind.h" #include "base/command_line.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h"
diff --git a/content/browser/preloading/prefetch/prefetch_canary_checker.cc b/content/browser/preloading/prefetch/prefetch_canary_checker.cc index f89a938..a076405 100644 --- a/content/browser/preloading/prefetch/prefetch_canary_checker.cc +++ b/content/browser/preloading/prefetch/prefetch_canary_checker.cc
@@ -9,8 +9,8 @@ #include <cmath> #include "base/base64.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/guid.h" #include "base/metrics/histogram.h" #include "base/metrics/histogram_functions.h"
diff --git a/content/browser/preloading/prefetch/prefetch_canary_checker.h b/content/browser/preloading/prefetch/prefetch_canary_checker.h index a06aa6d..5d4d8b7 100644 --- a/content/browser/preloading/prefetch/prefetch_canary_checker.h +++ b/content/browser/preloading/prefetch/prefetch_canary_checker.h
@@ -5,8 +5,8 @@ #ifndef CONTENT_BROWSER_PRELOADING_PREFETCH_PREFETCH_CANARY_CHECKER_H_ #define CONTENT_BROWSER_PRELOADING_PREFETCH_PREFETCH_CANARY_CHECKER_H_ -#include "base/callback.h" #include "base/containers/lru_cache.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h"
diff --git a/content/browser/preloading/prefetch/prefetch_dns_prober.cc b/content/browser/preloading/prefetch/prefetch_dns_prober.cc index fe70518..4b3359c 100644 --- a/content/browser/preloading/prefetch/prefetch_dns_prober.cc +++ b/content/browser/preloading/prefetch/prefetch_dns_prober.cc
@@ -4,7 +4,7 @@ #include "content/browser/preloading/prefetch/prefetch_dns_prober.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "net/base/address_list.h" #include "net/dns/public/resolve_error_info.h" #include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/content/browser/preloading/prefetch/prefetch_dns_prober.h b/content/browser/preloading/prefetch/prefetch_dns_prober.h index 972bdca..d6e6ef2 100644 --- a/content/browser/preloading/prefetch/prefetch_dns_prober.h +++ b/content/browser/preloading/prefetch/prefetch_dns_prober.h
@@ -7,7 +7,7 @@ #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "net/base/address_list.h" #include "net/base/host_port_pair.h" #include "net/dns/public/host_resolver_results.h"
diff --git a/content/browser/preloading/prefetch/prefetch_from_string_url_loader.cc b/content/browser/preloading/prefetch/prefetch_from_string_url_loader.cc index b034d178..e83eef7 100644 --- a/content/browser/preloading/prefetch/prefetch_from_string_url_loader.cc +++ b/content/browser/preloading/prefetch/prefetch_from_string_url_loader.cc
@@ -6,8 +6,8 @@ #include <memory> -#include "base/bind.h" #include "base/check_op.h" +#include "base/functional/bind.h" #include "base/memory/weak_ptr.h" #include "base/notreached.h" #include "base/task/sequenced_task_runner.h"
diff --git a/content/browser/preloading/prefetch/prefetch_origin_prober.cc b/content/browser/preloading/prefetch/prefetch_origin_prober.cc index 6e7db4bc..5ddb805 100644 --- a/content/browser/preloading/prefetch/prefetch_origin_prober.cc +++ b/content/browser/preloading/prefetch/prefetch_origin_prober.cc
@@ -4,8 +4,8 @@ #include "content/browser/preloading/prefetch/prefetch_origin_prober.h" -#include "base/bind.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/strings/string_util.h" #include "content/browser/preloading/prefetch/prefetch_canary_checker.h" #include "content/browser/preloading/prefetch/prefetch_dns_prober.h"
diff --git a/content/browser/preloading/prefetch/prefetch_origin_prober.h b/content/browser/preloading/prefetch/prefetch_origin_prober.h index edf84b71..efb706f7 100644 --- a/content/browser/preloading/prefetch/prefetch_origin_prober.h +++ b/content/browser/preloading/prefetch/prefetch_origin_prober.h
@@ -5,7 +5,7 @@ #ifndef CONTENT_BROWSER_PRELOADING_PREFETCH_PREFETCH_ORIGIN_PROBER_H_ #define CONTENT_BROWSER_PRELOADING_PREFETCH_PREFETCH_ORIGIN_PROBER_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "content/browser/preloading/prefetch/prefetch_probe_result.h"
diff --git a/content/browser/preloading/prefetch/prefetch_service.h b/content/browser/preloading/prefetch/prefetch_service.h index a127c5d..2f46a3c0 100644 --- a/content/browser/preloading/prefetch/prefetch_service.h +++ b/content/browser/preloading/prefetch/prefetch_service.h
@@ -7,7 +7,7 @@ #include <map> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/weak_ptr.h" #include "content/browser/preloading/prefetch/prefetch_container.h" #include "content/browser/preloading/prefetch/prefetch_status.h"
diff --git a/content/browser/preloading/prefetch/prefetch_url_loader_interceptor_unittest.cc b/content/browser/preloading/prefetch/prefetch_url_loader_interceptor_unittest.cc index e4cc7d2..9114397 100644 --- a/content/browser/preloading/prefetch/prefetch_url_loader_interceptor_unittest.cc +++ b/content/browser/preloading/prefetch/prefetch_url_loader_interceptor_unittest.cc
@@ -7,7 +7,7 @@ #include <map> #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/scoped_feature_list.h"
diff --git a/content/browser/preloading/prefetch/proxy_lookup_client_impl.cc b/content/browser/preloading/prefetch/proxy_lookup_client_impl.cc index 9a3c219b..7083695 100644 --- a/content/browser/preloading/prefetch/proxy_lookup_client_impl.cc +++ b/content/browser/preloading/prefetch/proxy_lookup_client_impl.cc
@@ -4,7 +4,7 @@ #include "content/browser/preloading/prefetch/proxy_lookup_client_impl.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "content/public/browser/browser_task_traits.h" #include "content/public/browser/browser_thread.h" #include "net/proxy_resolution/proxy_info.h"
diff --git a/content/browser/preloading/prefetch/proxy_lookup_client_impl.h b/content/browser/preloading/prefetch/proxy_lookup_client_impl.h index f1a1ff8..72f7579 100644 --- a/content/browser/preloading/prefetch/proxy_lookup_client_impl.h +++ b/content/browser/preloading/prefetch/proxy_lookup_client_impl.h
@@ -5,7 +5,7 @@ #ifndef CONTENT_BROWSER_PRELOADING_PREFETCH_PROXY_LOOKUP_CLIENT_IMPL_H_ #define CONTENT_BROWSER_PRELOADING_PREFETCH_PROXY_LOOKUP_CLIENT_IMPL_H_ -#include "base/bind.h" +#include "base/functional/bind.h" #include "content/common/content_export.h" #include "mojo/public/cpp/bindings/receiver.h" #include "services/network/public/mojom/proxy_lookup_client.mojom.h"
diff --git a/content/browser/preloading/preloading_prediction.h b/content/browser/preloading/preloading_prediction.h index 6a0bab9..09bb3e1 100644 --- a/content/browser/preloading/preloading_prediction.h +++ b/content/browser/preloading/preloading_prediction.h
@@ -7,7 +7,7 @@ #include "content/public/browser/preloading_data.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "services/metrics/public/cpp/ukm_source_id.h" #include "third_party/abseil-cpp/absl/types/optional.h" #include "url/gurl.h"
diff --git a/content/browser/preloading/prerender/prerender_browsertest.cc b/content/browser/preloading/prerender/prerender_browsertest.cc index d3030f38..700a068 100644 --- a/content/browser/preloading/prerender/prerender_browsertest.cc +++ b/content/browser/preloading/prerender/prerender_browsertest.cc
@@ -7,13 +7,13 @@ #include "base/barrier_closure.h" #include "base/base_switches.h" -#include "base/callback_forward.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/containers/flat_map.h" #include "base/containers/flat_set.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/callback_forward.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/metrics/metrics_hashes.h"
diff --git a/content/browser/preloading/prerender/prerender_host_registry.cc b/content/browser/preloading/prerender/prerender_host_registry.cc index 7b8344f..1a8af705 100644 --- a/content/browser/preloading/prerender/prerender_host_registry.cc +++ b/content/browser/preloading/prerender/prerender_host_registry.cc
@@ -4,12 +4,12 @@ #include "content/browser/preloading/prerender/prerender_host_registry.h" -#include "base/callback_helpers.h" #include "base/check.h" #include "base/check_op.h" #include "base/containers/contains.h" #include "base/feature_list.h" #include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/metrics/field_trial_params.h" #include "base/notreached.h" #include "base/observer_list.h"
diff --git a/content/browser/presentation/presentation_service_impl.cc b/content/browser/presentation/presentation_service_impl.cc index 61996d0b..a130c82 100644 --- a/content/browser/presentation/presentation_service_impl.cc +++ b/content/browser/presentation/presentation_service_impl.cc
@@ -11,8 +11,8 @@ #include <memory> #include <utility> -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/memory/ptr_util.h" #include "content/public/browser/content_browser_client.h"
diff --git a/content/browser/presentation/presentation_service_impl.h b/content/browser/presentation/presentation_service_impl.h index 3c22b7e..0ef6e56 100644 --- a/content/browser/presentation/presentation_service_impl.h +++ b/content/browser/presentation/presentation_service_impl.h
@@ -11,7 +11,7 @@ #include <unordered_map> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/gtest_prod_util.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h"
diff --git a/content/browser/presentation/presentation_service_impl_unittest.cc b/content/browser/presentation/presentation_service_impl_unittest.cc index d6c150e..bdc5d7c 100644 --- a/content/browser/presentation/presentation_service_impl_unittest.cc +++ b/content/browser/presentation/presentation_service_impl_unittest.cc
@@ -14,8 +14,8 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "base/strings/stringprintf.h" #include "content/browser/presentation/presentation_test_utils.h"
diff --git a/content/browser/private_aggregation/private_aggregation_budget_storage.cc b/content/browser/private_aggregation/private_aggregation_budget_storage.cc index 99b7e52..db3451a 100644 --- a/content/browser/private_aggregation/private_aggregation_budget_storage.cc +++ b/content/browser/private_aggregation/private_aggregation_budget_storage.cc
@@ -9,12 +9,12 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback.h" #include "base/check.h" #include "base/check_op.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/location.h" #include "base/memory/ptr_util.h" #include "base/memory/scoped_refptr.h"
diff --git a/content/browser/private_aggregation/private_aggregation_budget_storage.h b/content/browser/private_aggregation/private_aggregation_budget_storage.h index fe4c7e1e..82cb80a 100644 --- a/content/browser/private_aggregation/private_aggregation_budget_storage.h +++ b/content/browser/private_aggregation/private_aggregation_budget_storage.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/scoped_refptr.h" #include "base/sequence_checker.h" #include "base/time/time.h"
diff --git a/content/browser/private_aggregation/private_aggregation_budget_storage_unittest.cc b/content/browser/private_aggregation/private_aggregation_budget_storage_unittest.cc index 1492977..6b3c4f0 100644 --- a/content/browser/private_aggregation/private_aggregation_budget_storage_unittest.cc +++ b/content/browser/private_aggregation/private_aggregation_budget_storage_unittest.cc
@@ -7,12 +7,12 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/memory/scoped_refptr.h" #include "base/run_loop.h" #include "base/task/sequenced_task_runner.h"
diff --git a/content/browser/private_aggregation/private_aggregation_budgeter.cc b/content/browser/private_aggregation/private_aggregation_budgeter.cc index 88416606..bb24e5ca 100644 --- a/content/browser/private_aggregation/private_aggregation_budgeter.cc +++ b/content/browser/private_aggregation/private_aggregation_budgeter.cc
@@ -12,11 +12,11 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback.h" #include "base/check.h" #include "base/check_op.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" #include "base/metrics/histogram_functions.h" #include "base/notreached.h"
diff --git a/content/browser/private_aggregation/private_aggregation_budgeter.h b/content/browser/private_aggregation/private_aggregation_budgeter.h index 3e566dd..bec2e2e9f 100644 --- a/content/browser/private_aggregation/private_aggregation_budgeter.h +++ b/content/browser/private_aggregation/private_aggregation_budgeter.h
@@ -8,7 +8,7 @@ #include <memory> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h" #include "base/time/time.h"
diff --git a/content/browser/private_aggregation/private_aggregation_budgeter_unittest.cc b/content/browser/private_aggregation/private_aggregation_budgeter_unittest.cc index 7bf4d09..2c3ddc9 100644 --- a/content/browser/private_aggregation/private_aggregation_budgeter_unittest.cc +++ b/content/browser/private_aggregation/private_aggregation_budgeter_unittest.cc
@@ -11,12 +11,12 @@ #include <utility> #include <vector> -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/check_op.h" #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h" #include "base/run_loop.h"
diff --git a/content/browser/private_aggregation/private_aggregation_host.cc b/content/browser/private_aggregation/private_aggregation_host.cc index 8901a46c..02b89767 100644 --- a/content/browser/private_aggregation/private_aggregation_host.cc +++ b/content/browser/private_aggregation/private_aggregation_host.cc
@@ -9,9 +9,9 @@ #include <utility> #include <vector> -#include "base/callback.h" #include "base/check.h" #include "base/command_line.h" +#include "base/functional/callback.h" #include "base/guid.h" #include "base/metrics/histogram_functions.h" #include "base/rand_util.h"
diff --git a/content/browser/private_aggregation/private_aggregation_host.h b/content/browser/private_aggregation/private_aggregation_host.h index a184b40..4f21985e 100644 --- a/content/browser/private_aggregation/private_aggregation_host.h +++ b/content/browser/private_aggregation/private_aggregation_host.h
@@ -7,7 +7,7 @@ #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ref.h" #include "content/browser/private_aggregation/private_aggregation_budget_key.h" #include "content/common/content_export.h"
diff --git a/content/browser/private_aggregation/private_aggregation_manager.h b/content/browser/private_aggregation/private_aggregation_manager.h index d5e0b87..3c88cfed 100644 --- a/content/browser/private_aggregation/private_aggregation_manager.h +++ b/content/browser/private_aggregation/private_aggregation_manager.h
@@ -5,7 +5,7 @@ #ifndef CONTENT_BROWSER_PRIVATE_AGGREGATION_PRIVATE_AGGREGATION_MANAGER_H_ #define CONTENT_BROWSER_PRIVATE_AGGREGATION_PRIVATE_AGGREGATION_MANAGER_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "content/browser/private_aggregation/private_aggregation_budget_key.h" #include "content/common/private_aggregation_host.mojom-forward.h" #include "content/public/browser/storage_partition.h"
diff --git a/content/browser/private_aggregation/private_aggregation_manager_impl.cc b/content/browser/private_aggregation/private_aggregation_manager_impl.cc index 0a8e238..ccf4d421 100644 --- a/content/browser/private_aggregation/private_aggregation_manager_impl.cc +++ b/content/browser/private_aggregation/private_aggregation_manager_impl.cc
@@ -10,10 +10,10 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback.h" #include "base/check.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" #include "base/metrics/histogram_functions.h" #include "base/numerics/checked_math.h"
diff --git a/content/browser/private_aggregation/private_aggregation_manager_impl.h b/content/browser/private_aggregation/private_aggregation_manager_impl.h index be8c571..7b35756 100644 --- a/content/browser/private_aggregation/private_aggregation_manager_impl.h +++ b/content/browser/private_aggregation/private_aggregation_manager_impl.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "content/browser/private_aggregation/private_aggregation_budget_key.h" #include "content/browser/private_aggregation/private_aggregation_budgeter.h"
diff --git a/content/browser/private_aggregation/private_aggregation_manager_impl_unittest.cc b/content/browser/private_aggregation/private_aggregation_manager_impl_unittest.cc index 9787ebc..4b1762e 100644 --- a/content/browser/private_aggregation/private_aggregation_manager_impl_unittest.cc +++ b/content/browser/private_aggregation/private_aggregation_manager_impl_unittest.cc
@@ -8,9 +8,9 @@ #include <utility> #include <vector> -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/files/file_path.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h"
diff --git a/content/browser/private_aggregation/private_aggregation_test_utils.cc b/content/browser/private_aggregation/private_aggregation_test_utils.cc index 495253ad..7441094 100644 --- a/content/browser/private_aggregation/private_aggregation_test_utils.cc +++ b/content/browser/private_aggregation/private_aggregation_test_utils.cc
@@ -6,7 +6,7 @@ #include <tuple> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "content/browser/private_aggregation/private_aggregation_budget_key.h" namespace content {
diff --git a/content/browser/private_aggregation/private_aggregation_test_utils.h b/content/browser/private_aggregation/private_aggregation_test_utils.h index eab8041..2df5019 100644 --- a/content/browser/private_aggregation/private_aggregation_test_utils.h +++ b/content/browser/private_aggregation/private_aggregation_test_utils.h
@@ -7,7 +7,7 @@ #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "content/browser/aggregation_service/aggregatable_report.h" #include "content/browser/private_aggregation/private_aggregation_budget_key.h" #include "content/browser/private_aggregation/private_aggregation_budgeter.h"
diff --git a/content/browser/process_internals/process_internals_ui.cc b/content/browser/process_internals/process_internals_ui.cc index ffedea8e7..3a0f043 100644 --- a/content/browser/process_internals/process_internals_ui.cc +++ b/content/browser/process_internals/process_internals_ui.cc
@@ -8,7 +8,7 @@ #include <string> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "content/browser/process_internals/process_internals.mojom.h" #include "content/browser/process_internals/process_internals_handler_impl.h" #include "content/grit/dev_ui_content_resources.h"
diff --git a/content/browser/profiling_utils.cc b/content/browser/profiling_utils.cc index 17796d043..359bea55 100644 --- a/content/browser/profiling_utils.cc +++ b/content/browser/profiling_utils.cc
@@ -5,10 +5,10 @@ #include <memory> #include <vector> -#include "base/bind.h" -#include "base/callback_forward.h" -#include "base/callback_helpers.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback_forward.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ref_counted.h" #include "base/path_service.h" #include "base/rand_util.h"
diff --git a/content/browser/push_messaging/push_messaging_manager.cc b/content/browser/push_messaging/push_messaging_manager.cc index 83a0b9a..ae729ef 100644 --- a/content/browser/push_messaging/push_messaging_manager.cc +++ b/content/browser/push_messaging/push_messaging_manager.cc
@@ -8,10 +8,10 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/check_op.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/metrics/histogram_macros.h" #include "base/notreached.h" #include "base/strings/string_number_conversions.h"
diff --git a/content/browser/push_messaging/push_messaging_router.cc b/content/browser/push_messaging/push_messaging_router.cc index 2af71ab..f88e11c5 100644 --- a/content/browser/push_messaging/push_messaging_router.cc +++ b/content/browser/push_messaging/push_messaging_router.cc
@@ -6,8 +6,8 @@ #include <string> -#include "base/bind.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_macros.h" #include "content/browser/devtools/devtools_background_services_context_impl.h" #include "content/browser/service_worker/service_worker_context_wrapper.h"
diff --git a/content/browser/push_messaging/push_messaging_router.h b/content/browser/push_messaging/push_messaging_router.h index 600280c..af66203 100644 --- a/content/browser/push_messaging/push_messaging_router.h +++ b/content/browser/push_messaging/push_messaging_router.h
@@ -7,7 +7,7 @@ #include <stdint.h> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/scoped_refptr.h" #include "third_party/abseil-cpp/absl/types/optional.h" #include "third_party/blink/public/common/service_worker/service_worker_status_code.h"
diff --git a/content/browser/quota/quota_change_browsertest.cc b/content/browser/quota/quota_change_browsertest.cc index ab90bd2..9ca4d29b 100644 --- a/content/browser/quota/quota_change_browsertest.cc +++ b/content/browser/quota/quota_change_browsertest.cc
@@ -5,10 +5,10 @@ #include <stdint.h> #include <tuple> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/task/single_thread_task_runner.h" #include "base/test/scoped_feature_list.h"
diff --git a/content/browser/quota/quota_change_dispatcher.cc b/content/browser/quota/quota_change_dispatcher.cc index 541f02f..3e897a30 100644 --- a/content/browser/quota/quota_change_dispatcher.cc +++ b/content/browser/quota/quota_change_dispatcher.cc
@@ -7,8 +7,8 @@ #include <map> #include <utility> -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/memory/ref_counted_delete_on_sequence.h" #include "base/rand_util.h" #include "base/strings/string_number_conversions.h"
diff --git a/content/browser/quota/quota_manager_host.cc b/content/browser/quota/quota_manager_host.cc index adc7eb75..fbf7309 100644 --- a/content/browser/quota/quota_manager_host.cc +++ b/content/browser/quota/quota_manager_host.cc
@@ -9,7 +9,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h" #include "content/browser/quota/quota_change_dispatcher.h"
diff --git a/content/browser/renderer_host/ancestor_throttle_unittest.cc b/content/browser/renderer_host/ancestor_throttle_unittest.cc index c56c349..7e75f64 100644 --- a/content/browser/renderer_host/ancestor_throttle_unittest.cc +++ b/content/browser/renderer_host/ancestor_throttle_unittest.cc
@@ -4,8 +4,8 @@ #include "content/browser/renderer_host/ancestor_throttle.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ref_counted.h" #include "base/test/scoped_feature_list.h" #include "content/browser/renderer_host/frame_tree_node.h"
diff --git a/content/browser/renderer_host/back_forward_cache_metrics_browsertest.cc b/content/browser/renderer_host/back_forward_cache_metrics_browsertest.cc index 977f3bb..9f591a0 100644 --- a/content/browser/renderer_host/back_forward_cache_metrics_browsertest.cc +++ b/content/browser/renderer_host/back_forward_cache_metrics_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 "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/task/single_thread_task_runner.h" #include "base/test/bind.h"
diff --git a/content/browser/renderer_host/clipboard_host_impl.cc b/content/browser/renderer_host/clipboard_host_impl.cc index 4dd80ee..1490e17 100644 --- a/content/browser/renderer_host/clipboard_host_impl.cc +++ b/content/browser/renderer_host/clipboard_host_impl.cc
@@ -8,7 +8,7 @@ #include <set> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/memory/ptr_util.h" #include "base/notreached.h"
diff --git a/content/browser/renderer_host/clipboard_host_impl.h b/content/browser/renderer_host/clipboard_host_impl.h index 8205fe2..7484a693 100644 --- a/content/browser/renderer_host/clipboard_host_impl.h +++ b/content/browser/renderer_host/clipboard_host_impl.h
@@ -10,7 +10,7 @@ #include <string> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/gtest_prod_util.h" #include "base/memory/weak_ptr.h" #include "base/time/time.h"
diff --git a/content/browser/renderer_host/clipboard_host_impl_mac.mm b/content/browser/renderer_host/clipboard_host_impl_mac.mm index 1c168b0e..0b138c6 100644 --- a/content/browser/renderer_host/clipboard_host_impl_mac.mm +++ b/content/browser/renderer_host/clipboard_host_impl_mac.mm
@@ -7,8 +7,8 @@ #import <Cocoa/Cocoa.h> #include <stddef.h> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/mac/scoped_nsobject.h" #include "base/strings/sys_string_conversions.h" #include "content/public/browser/browser_thread.h"
diff --git a/content/browser/renderer_host/clipboard_host_impl_unittest.cc b/content/browser/renderer_host/clipboard_host_impl_unittest.cc index e3d747a3..23dd9476 100644 --- a/content/browser/renderer_host/clipboard_host_impl_unittest.cc +++ b/content/browser/renderer_host/clipboard_host_impl_unittest.cc
@@ -8,8 +8,8 @@ #include <string> #include <vector> -#include "base/callback_helpers.h" #include "base/containers/contains.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/pickle.h" #include "base/run_loop.h"
diff --git a/content/browser/renderer_host/code_cache_host_impl.cc b/content/browser/renderer_host/code_cache_host_impl.cc index b1985dd5..616bb1c4 100644 --- a/content/browser/renderer_host/code_cache_host_impl.cc +++ b/content/browser/renderer_host/code_cache_host_impl.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/metrics/histogram_functions.h" #include "base/strings/utf_string_conversions.h" #include "base/threading/thread.h"
diff --git a/content/browser/renderer_host/compositor_dependencies_android.cc b/content/browser/renderer_host/compositor_dependencies_android.cc index bb7d7551..b72c98f8 100644 --- a/content/browser/renderer_host/compositor_dependencies_android.cc +++ b/content/browser/renderer_host/compositor_dependencies_android.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/no_destructor.h" #include "base/system/sys_info.h" #include "base/task/single_thread_task_runner.h"
diff --git a/content/browser/renderer_host/compositor_dependencies_android.h b/content/browser/renderer_host/compositor_dependencies_android.h index de6bec4f..7f4b5a2 100644 --- a/content/browser/renderer_host/compositor_dependencies_android.h +++ b/content/browser/renderer_host/compositor_dependencies_android.h
@@ -7,9 +7,9 @@ #include <memory> -#include "base/callback.h" #include "base/cancelable_callback.h" #include "base/containers/flat_set.h" +#include "base/functional/callback.h" #include "base/no_destructor.h" #include "components/viz/common/surfaces/frame_sink_id_allocator.h" #include "components/viz/host/host_frame_sink_manager.h"
diff --git a/content/browser/renderer_host/compositor_impl_android.cc b/content/browser/renderer_host/compositor_impl_android.cc index 9edb7c4..6f1ca82 100644 --- a/content/browser/renderer_host/compositor_impl_android.cc +++ b/content/browser/renderer_host/compositor_impl_android.cc
@@ -16,9 +16,9 @@ #include "base/android/jni_android.h" #include "base/android/scoped_java_ref.h" #include "base/auto_reset.h" -#include "base/bind.h" #include "base/command_line.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/lazy_instance.h" #include "base/logging.h" #include "base/memory/raw_ptr.h"
diff --git a/content/browser/renderer_host/compositor_impl_android_browsertest.cc b/content/browser/renderer_host/compositor_impl_android_browsertest.cc index edd8f97..20cfd68 100644 --- a/content/browser/renderer_host/compositor_impl_android_browsertest.cc +++ b/content/browser/renderer_host/compositor_impl_android_browsertest.cc
@@ -5,8 +5,8 @@ #include "base/android/application_status_listener.h" #include "base/android/build_info.h" #include "base/base_switches.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/task/single_thread_task_runner.h" #include "content/browser/browser_main_loop.h"
diff --git a/content/browser/renderer_host/cookie_browsertest.cc b/content/browser/renderer_host/cookie_browsertest.cc index 39cc9d7..c646801 100644 --- a/content/browser/renderer_host/cookie_browsertest.cc +++ b/content/browser/renderer_host/cookie_browsertest.cc
@@ -4,10 +4,10 @@ #include <string> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/scoped_feature_list.h"
diff --git a/content/browser/renderer_host/cross_process_frame_connector.cc b/content/browser/renderer_host/cross_process_frame_connector.cc index 30cb6fc..1300c9c 100644 --- a/content/browser/renderer_host/cross_process_frame_connector.cc +++ b/content/browser/renderer_host/cross_process_frame_connector.cc
@@ -4,7 +4,7 @@ #include "content/browser/renderer_host/cross_process_frame_connector.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_macros.h" #include "base/trace_event/optional_trace_event.h" #include "components/viz/common/features.h"
diff --git a/content/browser/renderer_host/debug_urls.cc b/content/browser/renderer_host/debug_urls.cc index c5ce85ba..e1148972 100644 --- a/content/browser/renderer_host/debug_urls.cc +++ b/content/browser/renderer_host/debug_urls.cc
@@ -6,10 +6,10 @@ #include <vector> -#include "base/bind.h" #include "base/command_line.h" #include "base/debug/asan_invalid_access.h" #include "base/debug/profiler.h" +#include "base/functional/bind.h" #include "base/memory/memory_pressure_listener.h" #include "base/sanitizer_buildflags.h" #include "base/strings/utf_string_conversions.h"
diff --git a/content/browser/renderer_host/delegated_frame_host.cc b/content/browser/renderer_host/delegated_frame_host.cc index 771b565..248b271 100644 --- a/content/browser/renderer_host/delegated_frame_host.cc +++ b/content/browser/renderer_host/delegated_frame_host.cc
@@ -8,10 +8,10 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/metrics/histogram_macros.h" #include "base/observer_list.h" #include "base/trace_event/trace_event.h"
diff --git a/content/browser/renderer_host/document_service_browsertest.cc b/content/browser/renderer_host/document_service_browsertest.cc index ae86739..d1c1d34 100644 --- a/content/browser/renderer_host/document_service_browsertest.cc +++ b/content/browser/renderer_host/document_service_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 "base/bind.h" +#include "base/functional/bind.h" #include "content/browser/renderer_host/document_service_echo_impl.h" #include "content/public/browser/document_service.h" #include "content/public/browser/render_frame_host.h"
diff --git a/content/browser/renderer_host/document_service_echo_impl.h b/content/browser/renderer_host/document_service_echo_impl.h index 7c85109..c1f9148 100644 --- a/content/browser/renderer_host/document_service_echo_impl.h +++ b/content/browser/renderer_host/document_service_echo_impl.h
@@ -5,7 +5,7 @@ #ifndef CONTENT_BROWSER_RENDERER_HOST_DOCUMENT_SERVICE_ECHO_IMPL_H_ #define CONTENT_BROWSER_RENDERER_HOST_DOCUMENT_SERVICE_ECHO_IMPL_H_ -#include "base/bind.h" +#include "base/functional/bind.h" #include "content/public/browser/document_service.h" #include "content/test/echo.test-mojom.h" #include "mojo/public/cpp/bindings/pending_receiver.h"
diff --git a/content/browser/renderer_host/document_service_unittest.cc b/content/browser/renderer_host/document_service_unittest.cc index 14bf63c6..23491eb4 100644 --- a/content/browser/renderer_host/document_service_unittest.cc +++ b/content/browser/renderer_host/document_service_unittest.cc
@@ -4,7 +4,7 @@ #include "content/public/browser/document_service.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "content/browser/renderer_host/document_service_echo_impl.h"
diff --git a/content/browser/renderer_host/dwrite_font_proxy_impl_win.cc b/content/browser/renderer_host/dwrite_font_proxy_impl_win.cc index 7e0d1c6..a42f326f 100644 --- a/content/browser/renderer_host/dwrite_font_proxy_impl_win.cc +++ b/content/browser/renderer_host/dwrite_font_proxy_impl_win.cc
@@ -14,9 +14,9 @@ #include <string> #include <utility> -#include "base/callback_helpers.h" #include "base/check_op.h" #include "base/feature_list.h" +#include "base/functional/callback_helpers.h" #include "base/i18n/case_conversion.h" #include "base/metrics/histogram_functions.h" #include "base/metrics/histogram_macros.h"
diff --git a/content/browser/renderer_host/embedded_frame_sink_impl.h b/content/browser/renderer_host/embedded_frame_sink_impl.h index b98fe54..1d20d3d 100644 --- a/content/browser/renderer_host/embedded_frame_sink_impl.h +++ b/content/browser/renderer_host/embedded_frame_sink_impl.h
@@ -5,7 +5,7 @@ #ifndef CONTENT_BROWSER_RENDERER_HOST_EMBEDDED_FRAME_SINK_IMPL_H_ #define CONTENT_BROWSER_RENDERER_HOST_EMBEDDED_FRAME_SINK_IMPL_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/time/time.h" #include "components/viz/common/surfaces/frame_sink_bundle_id.h"
diff --git a/content/browser/renderer_host/embedded_frame_sink_provider_impl.cc b/content/browser/renderer_host/embedded_frame_sink_provider_impl.cc index 126d0ac..9bd1ea6f 100644 --- a/content/browser/renderer_host/embedded_frame_sink_provider_impl.cc +++ b/content/browser/renderer_host/embedded_frame_sink_provider_impl.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "components/viz/host/host_frame_sink_manager.h" #include "content/browser/renderer_host/embedded_frame_sink_impl.h"
diff --git a/content/browser/renderer_host/embedded_frame_sink_provider_impl_unittest.cc b/content/browser/renderer_host/embedded_frame_sink_provider_impl_unittest.cc index 81f93919..75bbb73 100644 --- a/content/browser/renderer_host/embedded_frame_sink_provider_impl_unittest.cc +++ b/content/browser/renderer_host/embedded_frame_sink_provider_impl_unittest.cc
@@ -9,7 +9,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/test/task_environment.h" #include "build/build_config.h"
diff --git a/content/browser/renderer_host/frame_token_message_queue.cc b/content/browser/renderer_host/frame_token_message_queue.cc index c8777a3..ab5e5e0 100644 --- a/content/browser/renderer_host/frame_token_message_queue.cc +++ b/content/browser/renderer_host/frame_token_message_queue.cc
@@ -4,7 +4,7 @@ #include "content/browser/renderer_host/frame_token_message_queue.h" -#include "base/bind.h" +#include "base/functional/bind.h" namespace content {
diff --git a/content/browser/renderer_host/frame_token_message_queue.h b/content/browser/renderer_host/frame_token_message_queue.h index 6215b7c9..caa3e88 100644 --- a/content/browser/renderer_host/frame_token_message_queue.h +++ b/content/browser/renderer_host/frame_token_message_queue.h
@@ -8,7 +8,7 @@ #include <map> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/time/time.h" #include "content/common/content_export.h"
diff --git a/content/browser/renderer_host/frame_token_message_queue_unittest.cc b/content/browser/renderer_host/frame_token_message_queue_unittest.cc index 4672ac4..2371f9f 100644 --- a/content/browser/renderer_host/frame_token_message_queue_unittest.cc +++ b/content/browser/renderer_host/frame_token_message_queue_unittest.cc
@@ -6,7 +6,7 @@ #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/time/time.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/content/browser/renderer_host/frame_tree.cc b/content/browser/renderer_host/frame_tree.cc index caf9ced..079ae660 100644 --- a/content/browser/renderer_host/frame_tree.cc +++ b/content/browser/renderer_host/frame_tree.cc
@@ -10,10 +10,10 @@ #include <set> #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/containers/contains.h" #include "base/debug/dump_without_crashing.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/lazy_instance.h" #include "base/memory/ptr_util.h" #include "base/ranges/algorithm.h"
diff --git a/content/browser/renderer_host/frame_tree.h b/content/browser/renderer_host/frame_tree.h index 3c3efc2..8261ad2e 100644 --- a/content/browser/renderer_host/frame_tree.h +++ b/content/browser/renderer_host/frame_tree.h
@@ -12,9 +12,9 @@ #include <string> #include <unordered_map> -#include "base/callback.h" #include "base/containers/queue.h" #include "base/dcheck_is_on.h" +#include "base/functional/callback.h" #include "base/gtest_prod_util.h" #include "base/memory/raw_ptr.h" #include "base/memory/safe_ref.h"
diff --git a/content/browser/renderer_host/input/composited_scrolling_browsertest.cc b/content/browser/renderer_host/input/composited_scrolling_browsertest.cc index 2671a9f..7c3af7e00 100644 --- a/content/browser/renderer_host/input/composited_scrolling_browsertest.cc +++ b/content/browser/renderer_host/input/composited_scrolling_browsertest.cc
@@ -5,8 +5,8 @@ #include <tuple> #include <utility> -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h" #include "base/test/metrics/histogram_tester.h"
diff --git a/content/browser/renderer_host/input/compositor_event_ack_browsertest.cc b/content/browser/renderer_host/input/compositor_event_ack_browsertest.cc index 6b0320a..c551b32 100644 --- a/content/browser/renderer_host/input/compositor_event_ack_browsertest.cc +++ b/content/browser/renderer_host/input/compositor_event_ack_browsertest.cc
@@ -6,8 +6,8 @@ #include <utility> #include "base/auto_reset.h" -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h" #include "build/build_config.h"
diff --git a/content/browser/renderer_host/input/fling_browsertest.cc b/content/browser/renderer_host/input/fling_browsertest.cc index 815b806..d4f59aa 100644 --- a/content/browser/renderer_host/input/fling_browsertest.cc +++ b/content/browser/renderer_host/input/fling_browsertest.cc
@@ -4,7 +4,7 @@ #include <tuple> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/task/single_thread_task_runner.h" #include "base/test/scoped_feature_list.h"
diff --git a/content/browser/renderer_host/input/input_injector_impl.cc b/content/browser/renderer_host/input/input_injector_impl.cc index ce1e37df..b7fa4e3 100644 --- a/content/browser/renderer_host/input/input_injector_impl.cc +++ b/content/browser/renderer_host/input/input_injector_impl.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "content/browser/renderer_host/input/synthetic_gesture.h" #include "content/browser/renderer_host/render_frame_host_impl.h" #include "content/browser/renderer_host/render_widget_host_impl.h"
diff --git a/content/browser/renderer_host/input/input_router.h b/content/browser/renderer_host/input/input_router.h index 6632dd7..91da306 100644 --- a/content/browser/renderer_host/input/input_router.h +++ b/content/browser/renderer_host/input/input_router.h
@@ -5,7 +5,7 @@ #ifndef CONTENT_BROWSER_RENDERER_HOST_INPUT_INPUT_ROUTER_H_ #define CONTENT_BROWSER_RENDERER_HOST_INPUT_INPUT_ROUTER_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/task/sequenced_task_runner.h" #include "cc/input/touch_action.h" #include "content/browser/renderer_host/event_with_latency_info.h"
diff --git a/content/browser/renderer_host/input/input_router_impl.cc b/content/browser/renderer_host/input/input_router_impl.cc index ed2dd98..b7219f9f 100644 --- a/content/browser/renderer_host/input/input_router_impl.cc +++ b/content/browser/renderer_host/input/input_router_impl.cc
@@ -9,8 +9,8 @@ #include <utility> #include "base/auto_reset.h" -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_macros.h" #include "base/strings/string_number_conversions.h" #include "base/task/sequenced_task_runner.h"
diff --git a/content/browser/renderer_host/input/main_thread_event_queue_browsertest.cc b/content/browser/renderer_host/input/main_thread_event_queue_browsertest.cc index e11a91e..0e68e04 100644 --- a/content/browser/renderer_host/input/main_thread_event_queue_browsertest.cc +++ b/content/browser/renderer_host/input/main_thread_event_queue_browsertest.cc
@@ -6,8 +6,8 @@ #include <utility> #include "base/auto_reset.h" -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h" #include "build/build_config.h"
diff --git a/content/browser/renderer_host/input/mock_input_disposition_handler.cc b/content/browser/renderer_host/input/mock_input_disposition_handler.cc index 1b23a03..2e7489b 100644 --- a/content/browser/renderer_host/input/mock_input_disposition_handler.cc +++ b/content/browser/renderer_host/input/mock_input_disposition_handler.cc
@@ -4,7 +4,7 @@ #include "content/browser/renderer_host/input/mock_input_disposition_handler.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "content/browser/renderer_host/input/input_router.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/content/browser/renderer_host/input/mouse_latency_browsertest.cc b/content/browser/renderer_host/input/mouse_latency_browsertest.cc index ab0f18d..bd4a7b7 100644 --- a/content/browser/renderer_host/input/mouse_latency_browsertest.cc +++ b/content/browser/renderer_host/input/mouse_latency_browsertest.cc
@@ -7,7 +7,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/json/json_reader.h" #include "base/run_loop.h" #include "base/test/test_timeouts.h"
diff --git a/content/browser/renderer_host/input/mouse_wheel_event_queue.cc b/content/browser/renderer_host/input/mouse_wheel_event_queue.cc index e941de2..40bfd1fc 100644 --- a/content/browser/renderer_host/input/mouse_wheel_event_queue.cc +++ b/content/browser/renderer_host/input/mouse_wheel_event_queue.cc
@@ -4,7 +4,7 @@ #include "content/browser/renderer_host/input/mouse_wheel_event_queue.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_macros.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h"
diff --git a/content/browser/renderer_host/input/mouse_wheel_event_queue.h b/content/browser/renderer_host/input/mouse_wheel_event_queue.h index 237ce4f..5be10b6 100644 --- a/content/browser/renderer_host/input/mouse_wheel_event_queue.h +++ b/content/browser/renderer_host/input/mouse_wheel_event_queue.h
@@ -7,8 +7,8 @@ #include <memory> -#include "base/callback.h" #include "base/containers/circular_deque.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/trace_event/trace_event.h" #include "content/browser/renderer_host/event_with_latency_info.h"
diff --git a/content/browser/renderer_host/input/mouse_wheel_phase_handler.cc b/content/browser/renderer_host/input/mouse_wheel_phase_handler.cc index 1ffe3cc3..0f173dd9 100644 --- a/content/browser/renderer_host/input/mouse_wheel_phase_handler.cc +++ b/content/browser/renderer_host/input/mouse_wheel_phase_handler.cc
@@ -4,7 +4,7 @@ #include "content/browser/renderer_host/input/mouse_wheel_phase_handler.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/trace_event/trace_event.h" #include "content/browser/renderer_host/render_widget_host_impl.h" #include "content/browser/renderer_host/render_widget_host_input_event_router.h"
diff --git a/content/browser/renderer_host/input/scroll_behavior_browsertest.cc b/content/browser/renderer_host/input/scroll_behavior_browsertest.cc index 6aea2b3e..7c19e52 100644 --- a/content/browser/renderer_host/input/scroll_behavior_browsertest.cc +++ b/content/browser/renderer_host/input/scroll_behavior_browsertest.cc
@@ -5,7 +5,7 @@ #include <memory> #include <tuple> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/test/scoped_feature_list.h" #include "build/build_config.h"
diff --git a/content/browser/renderer_host/input/scroll_latency_browsertest.cc b/content/browser/renderer_host/input/scroll_latency_browsertest.cc index bca8d53..588fc36f 100644 --- a/content/browser/renderer_host/input/scroll_latency_browsertest.cc +++ b/content/browser/renderer_host/input/scroll_latency_browsertest.cc
@@ -4,7 +4,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/task/single_thread_task_runner.h" #include "base/test/metrics/histogram_tester.h"
diff --git a/content/browser/renderer_host/input/synthetic_gesture.h b/content/browser/renderer_host/input/synthetic_gesture.h index a7084b9..f7130da 100644 --- a/content/browser/renderer_host/input/synthetic_gesture.h +++ b/content/browser/renderer_host/input/synthetic_gesture.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/time/time.h" #include "content/common/content_export.h" #include "content/common/input/synthetic_gesture_params.h"
diff --git a/content/browser/renderer_host/input/synthetic_gesture_controller.cc b/content/browser/renderer_host/input/synthetic_gesture_controller.cc index 25b74e32..c1579e29 100644 --- a/content/browser/renderer_host/input/synthetic_gesture_controller.cc +++ b/content/browser/renderer_host/input/synthetic_gesture_controller.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/trace_event/trace_event.h" #include "content/browser/renderer_host/input/synthetic_gesture_target.h" #include "content/common/input/synthetic_smooth_scroll_gesture_params.h"
diff --git a/content/browser/renderer_host/input/synthetic_gesture_controller.h b/content/browser/renderer_host/input/synthetic_gesture_controller.h index be5538f7..1048608 100644 --- a/content/browser/renderer_host/input/synthetic_gesture_controller.h +++ b/content/browser/renderer_host/input/synthetic_gesture_controller.h
@@ -9,8 +9,8 @@ #include <utility> #include <vector> -#include "base/callback.h" #include "base/containers/queue.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/time/time.h"
diff --git a/content/browser/renderer_host/input/synthetic_gesture_controller_unittest.cc b/content/browser/renderer_host/input/synthetic_gesture_controller_unittest.cc index 463a740a..82c6048 100644 --- a/content/browser/renderer_host/input/synthetic_gesture_controller_unittest.cc +++ b/content/browser/renderer_host/input/synthetic_gesture_controller_unittest.cc
@@ -10,8 +10,8 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/test/task_environment.h" #include "base/time/time.h"
diff --git a/content/browser/renderer_host/input/synthetic_gesture_target.h b/content/browser/renderer_host/input/synthetic_gesture_target.h index 97e22df..145c222e 100644 --- a/content/browser/renderer_host/input/synthetic_gesture_target.h +++ b/content/browser/renderer_host/input/synthetic_gesture_target.h
@@ -5,7 +5,7 @@ #ifndef CONTENT_BROWSER_RENDERER_HOST_INPUT_SYNTHETIC_GESTURE_TARGET_H_ #define CONTENT_BROWSER_RENDERER_HOST_INPUT_SYNTHETIC_GESTURE_TARGET_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/time/time.h" #include "content/common/input/synthetic_gesture_params.h"
diff --git a/content/browser/renderer_host/input/synthetic_gesture_target_base.h b/content/browser/renderer_host/input/synthetic_gesture_target_base.h index c48c5c9..95ce915 100644 --- a/content/browser/renderer_host/input/synthetic_gesture_target_base.h +++ b/content/browser/renderer_host/input/synthetic_gesture_target_base.h
@@ -5,7 +5,7 @@ #ifndef CONTENT_BROWSER_RENDERER_HOST_INPUT_SYNTHETIC_GESTURE_TARGET_BASE_H_ #define CONTENT_BROWSER_RENDERER_HOST_INPUT_SYNTHETIC_GESTURE_TARGET_BASE_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/time/time.h" #include "content/browser/renderer_host/input/synthetic_gesture_target.h"
diff --git a/content/browser/renderer_host/input/synthetic_input_browsertest.cc b/content/browser/renderer_host/input/synthetic_input_browsertest.cc index b9c31a0..ca383f03 100644 --- a/content/browser/renderer_host/input/synthetic_input_browsertest.cc +++ b/content/browser/renderer_host/input/synthetic_input_browsertest.cc
@@ -5,8 +5,8 @@ #include <memory> #include <tuple> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/run_loop.h" #include "base/task/single_thread_task_runner.h" #include "base/test/scoped_feature_list.h"
diff --git a/content/browser/renderer_host/input/synthetic_pinch_gesture.h b/content/browser/renderer_host/input/synthetic_pinch_gesture.h index 15014b8..6d960307 100644 --- a/content/browser/renderer_host/input/synthetic_pinch_gesture.h +++ b/content/browser/renderer_host/input/synthetic_pinch_gesture.h
@@ -5,7 +5,7 @@ #ifndef CONTENT_BROWSER_RENDERER_HOST_INPUT_SYNTHETIC_PINCH_GESTURE_H_ #define CONTENT_BROWSER_RENDERER_HOST_INPUT_SYNTHETIC_PINCH_GESTURE_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/time/time.h" #include "content/browser/renderer_host/input/synthetic_gesture.h" #include "content/browser/renderer_host/input/synthetic_gesture_target.h"
diff --git a/content/browser/renderer_host/input/synthetic_pointer_action_unittest.cc b/content/browser/renderer_host/input/synthetic_pointer_action_unittest.cc index d32b00e..1066651 100644 --- a/content/browser/renderer_host/input/synthetic_pointer_action_unittest.cc +++ b/content/browser/renderer_host/input/synthetic_pointer_action_unittest.cc
@@ -3,7 +3,7 @@ // found in the LICENSE file. #include "content/browser/renderer_host/input/synthetic_pointer_action.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/time/time.h" #include "build/build_config.h" #include "content/browser/renderer_host/input/synthetic_gesture.h"
diff --git a/content/browser/renderer_host/input/synthetic_touchpad_pinch_gesture.cc b/content/browser/renderer_host/input/synthetic_touchpad_pinch_gesture.cc index 9e4cffc..72b8092 100644 --- a/content/browser/renderer_host/input/synthetic_touchpad_pinch_gesture.cc +++ b/content/browser/renderer_host/input/synthetic_touchpad_pinch_gesture.cc
@@ -4,7 +4,7 @@ #include <stdint.h> -#include "base/callback.h" +#include "base/functional/callback.h" #include "content/browser/renderer_host/input/synthetic_touchpad_pinch_gesture.h" #include "content/common/input/input_injector.mojom.h" #include "third_party/blink/public/common/input/synthetic_web_input_event_builders.h"
diff --git a/content/browser/renderer_host/input/timeout_monitor.h b/content/browser/renderer_host/input/timeout_monitor.h index d842632..4325610 100644 --- a/content/browser/renderer_host/input/timeout_monitor.h +++ b/content/browser/renderer_host/input/timeout_monitor.h
@@ -5,7 +5,7 @@ #ifndef CONTENT_BROWSER_RENDERER_HOST_INPUT_TIMEOUT_MONITOR_H_ #define CONTENT_BROWSER_RENDERER_HOST_INPUT_TIMEOUT_MONITOR_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/time/time.h" #include "base/timer/timer.h" #include "content/common/content_export.h"
diff --git a/content/browser/renderer_host/input/touch_action_browsertest.cc b/content/browser/renderer_host/input/touch_action_browsertest.cc index e17c0e7..ca40569 100644 --- a/content/browser/renderer_host/input/touch_action_browsertest.cc +++ b/content/browser/renderer_host/input/touch_action_browsertest.cc
@@ -6,9 +6,9 @@ #include <utility> #include "base/auto_reset.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/json/json_reader.h" #include "base/run_loop.h" #include "base/strings/stringprintf.h"
diff --git a/content/browser/renderer_host/input/touch_emulator.h b/content/browser/renderer_host/input/touch_emulator.h index ba2a262..d15c79b9 100644 --- a/content/browser/renderer_host/input/touch_emulator.h +++ b/content/browser/renderer_host/input/touch_emulator.h
@@ -7,8 +7,8 @@ #include <memory> -#include "base/callback.h" #include "base/containers/queue.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/time/time.h" #include "content/browser/renderer_host/input/touch_emulator_client.h"
diff --git a/content/browser/renderer_host/input/touch_emulator_unittest.cc b/content/browser/renderer_host/input/touch_emulator_unittest.cc index b8318ec..bc7b976 100644 --- a/content/browser/renderer_host/input/touch_emulator_unittest.cc +++ b/content/browser/renderer_host/input/touch_emulator_unittest.cc
@@ -9,7 +9,7 @@ #include <memory> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/test/task_environment.h" #include "base/time/time.h" #include "content/browser/renderer_host/input/touch_emulator_client.h"
diff --git a/content/browser/renderer_host/input/touch_selection_controller_client_aura.cc b/content/browser/renderer_host/input/touch_selection_controller_client_aura.cc index c8d0b89d..27d0798 100644 --- a/content/browser/renderer_host/input/touch_selection_controller_client_aura.cc +++ b/content/browser/renderer_host/input/touch_selection_controller_client_aura.cc
@@ -6,7 +6,7 @@ #include <set> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/observer_list.h" #include "build/chromeos_buildflags.h"
diff --git a/content/browser/renderer_host/input/touch_timeout_handler.cc b/content/browser/renderer_host/input/touch_timeout_handler.cc index 2a96046..dcb8d29 100644 --- a/content/browser/renderer_host/input/touch_timeout_handler.cc +++ b/content/browser/renderer_host/input/touch_timeout_handler.cc
@@ -7,7 +7,7 @@ #include <utility> #include "base/auto_reset.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_macros.h" #include "base/trace_event/trace_event.h" #include "content/browser/renderer_host/input/passthrough_touch_event_queue.h"
diff --git a/content/browser/renderer_host/input/touchpad_pinch_browsertest.cc b/content/browser/renderer_host/input/touchpad_pinch_browsertest.cc index adda80f..2fd6f0b 100644 --- a/content/browser/renderer_host/input/touchpad_pinch_browsertest.cc +++ b/content/browser/renderer_host/input/touchpad_pinch_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 "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/test/scoped_feature_list.h" #include "build/build_config.h"
diff --git a/content/browser/renderer_host/input/touchpad_pinch_event_queue.cc b/content/browser/renderer_host/input/touchpad_pinch_event_queue.cc index ed7cb6ed..71b190c 100644 --- a/content/browser/renderer_host/input/touchpad_pinch_event_queue.cc +++ b/content/browser/renderer_host/input/touchpad_pinch_event_queue.cc
@@ -4,7 +4,7 @@ #include "content/browser/renderer_host/input/touchpad_pinch_event_queue.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/trace_event/trace_event.h" #include "content/public/common/content_features.h" #include "third_party/blink/public/common/input/web_mouse_wheel_event.h"
diff --git a/content/browser/renderer_host/input/touchpad_pinch_event_queue_unittest.cc b/content/browser/renderer_host/input/touchpad_pinch_event_queue_unittest.cc index 6b4e3ac..5ccbadf 100644 --- a/content/browser/renderer_host/input/touchpad_pinch_event_queue_unittest.cc +++ b/content/browser/renderer_host/input/touchpad_pinch_event_queue_unittest.cc
@@ -6,7 +6,7 @@ #include <string> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/test/scoped_feature_list.h" #include "content/common/input/event_with_latency_info.h" #include "content/public/common/content_features.h"
diff --git a/content/browser/renderer_host/keep_alive_handle_factory.cc b/content/browser/renderer_host/keep_alive_handle_factory.cc index a481cb00..21c0b77 100644 --- a/content/browser/renderer_host/keep_alive_handle_factory.cc +++ b/content/browser/renderer_host/keep_alive_handle_factory.cc
@@ -8,8 +8,8 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "content/public/browser/browser_task_traits.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/content_browser_client.h"
diff --git a/content/browser/renderer_host/media/aec_dump_manager_impl.cc b/content/browser/renderer_host/media/aec_dump_manager_impl.cc index 7854178..e327441e 100644 --- a/content/browser/renderer_host/media/aec_dump_manager_impl.cc +++ b/content/browser/renderer_host/media/aec_dump_manager_impl.cc
@@ -4,8 +4,8 @@ #include "content/browser/renderer_host/media/aec_dump_manager_impl.h" -#include "base/callback_helpers.h" #include "base/files/file.h" +#include "base/functional/callback_helpers.h" #include "base/strings/string_number_conversions.h" #include "base/task/thread_pool.h" #include "content/browser/webrtc/webrtc_internals.h"
diff --git a/content/browser/renderer_host/media/audio_input_device_manager.cc b/content/browser/renderer_host/media/audio_input_device_manager.cc index 324c4edd..39d2a15 100644 --- a/content/browser/renderer_host/media/audio_input_device_manager.cc +++ b/content/browser/renderer_host/media/audio_input_device_manager.cc
@@ -7,9 +7,9 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/metrics/histogram_macros.h" #include "base/observer_list.h" #include "base/strings/stringprintf.h"
diff --git a/content/browser/renderer_host/media/audio_input_device_manager_unittest.cc b/content/browser/renderer_host/media/audio_input_device_manager_unittest.cc index e93b089..a21d4a0 100644 --- a/content/browser/renderer_host/media/audio_input_device_manager_unittest.cc +++ b/content/browser/renderer_host/media/audio_input_device_manager_unittest.cc
@@ -9,9 +9,9 @@ #include <memory> #include <string> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/memory/ref_counted.h" #include "base/run_loop.h"
diff --git a/content/browser/renderer_host/media/audio_input_stream_handle.cc b/content/browser/renderer_host/media/audio_input_stream_handle.cc index 42bec64..d65bd0b9 100644 --- a/content/browser/renderer_host/media/audio_input_stream_handle.cc +++ b/content/browser/renderer_host/media/audio_input_stream_handle.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" namespace content {
diff --git a/content/browser/renderer_host/media/audio_input_stream_handle.h b/content/browser/renderer_host/media/audio_input_stream_handle.h index 27a908b9..4832479 100644 --- a/content/browser/renderer_host/media/audio_input_stream_handle.h +++ b/content/browser/renderer_host/media/audio_input_stream_handle.h
@@ -5,7 +5,7 @@ #ifndef CONTENT_BROWSER_RENDERER_HOST_MEDIA_AUDIO_INPUT_STREAM_HANDLE_H_ #define CONTENT_BROWSER_RENDERER_HOST_MEDIA_AUDIO_INPUT_STREAM_HANDLE_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/sequence_checker.h" #include "content/common/content_export.h" #include "media/mojo/mojom/audio_data_pipe.mojom.h"
diff --git a/content/browser/renderer_host/media/audio_input_stream_handle_unittest.cc b/content/browser/renderer_host/media/audio_input_stream_handle_unittest.cc index 5ca4bc5..3e2e9fa 100644 --- a/content/browser/renderer_host/media/audio_input_stream_handle_unittest.cc +++ b/content/browser/renderer_host/media/audio_input_stream_handle_unittest.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/read_only_shared_memory_region.h" #include "base/run_loop.h" #include "base/sync_socket.h"
diff --git a/content/browser/renderer_host/media/audio_output_authorization_handler.cc b/content/browser/renderer_host/media/audio_output_authorization_handler.cc index c0a9d37..e5e12c5 100644 --- a/content/browser/renderer_host/media/audio_output_authorization_handler.cc +++ b/content/browser/renderer_host/media/audio_output_authorization_handler.cc
@@ -4,7 +4,7 @@ #include "content/browser/renderer_host/media/audio_output_authorization_handler.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_macros.h" #include "base/trace_event/trace_event.h" #include "content/browser/media/media_devices_permission_checker.h"
diff --git a/content/browser/renderer_host/media/audio_output_authorization_handler.h b/content/browser/renderer_host/media/audio_output_authorization_handler.h index e17ee7f..49a5b5f 100644 --- a/content/browser/renderer_host/media/audio_output_authorization_handler.h +++ b/content/browser/renderer_host/media/audio_output_authorization_handler.h
@@ -9,7 +9,7 @@ #include <string> #include <utility> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/time/time.h"
diff --git a/content/browser/renderer_host/media/audio_output_authorization_handler_unittest.cc b/content/browser/renderer_host/media/audio_output_authorization_handler_unittest.cc index 85b8841..58f085a 100644 --- a/content/browser/renderer_host/media/audio_output_authorization_handler_unittest.cc +++ b/content/browser/renderer_host/media/audio_output_authorization_handler_unittest.cc
@@ -6,8 +6,8 @@ #include "content/browser/renderer_host/media/audio_output_authorization_handler.h" -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/task/single_thread_task_runner.h" #include "base/test/mock_callback.h"
diff --git a/content/browser/renderer_host/media/fake_video_capture_device_launcher.cc b/content/browser/renderer_host/media/fake_video_capture_device_launcher.cc index aae450c..d178066 100644 --- a/content/browser/renderer_host/media/fake_video_capture_device_launcher.cc +++ b/content/browser/renderer_host/media/fake_video_capture_device_launcher.cc
@@ -4,8 +4,8 @@ #include <memory> -#include "base/bind.h" -#include "base/callback_forward.h" +#include "base/functional/bind.h" +#include "base/functional/callback_forward.h" #include "base/task/single_thread_task_runner.h" #include "base/token.h" #include "build/chromeos_buildflags.h"
diff --git a/content/browser/renderer_host/media/in_process_launched_video_capture_device.cc b/content/browser/renderer_host/media/in_process_launched_video_capture_device.cc index 3bdd73e..18878ec 100644 --- a/content/browser/renderer_host/media/in_process_launched_video_capture_device.cc +++ b/content/browser/renderer_host/media/in_process_launched_video_capture_device.cc
@@ -6,9 +6,9 @@ #include <utility> -#include "base/bind.h" -#include "base/callback_forward.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_forward.h" +#include "base/functional/callback_helpers.h" #include "base/metrics/histogram_macros.h" #include "base/task/bind_post_task.h" #include "base/task/single_thread_task_runner.h"
diff --git a/content/browser/renderer_host/media/in_process_launched_video_capture_device.h b/content/browser/renderer_host/media/in_process_launched_video_capture_device.h index a4fc659..5e406e76 100644 --- a/content/browser/renderer_host/media/in_process_launched_video_capture_device.h +++ b/content/browser/renderer_host/media/in_process_launched_video_capture_device.h
@@ -5,7 +5,7 @@ #ifndef CONTENT_BROWSER_RENDERER_HOST_MEDIA_IN_PROCESS_LAUNCHED_VIDEO_CAPTURE_DEVICE_H_ #define CONTENT_BROWSER_RENDERER_HOST_MEDIA_IN_PROCESS_LAUNCHED_VIDEO_CAPTURE_DEVICE_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/task/single_thread_task_runner.h" #include "base/token.h" #include "content/browser/renderer_host/media/video_capture_provider.h"
diff --git a/content/browser/renderer_host/media/in_process_video_capture_device_launcher.cc b/content/browser/renderer_host/media/in_process_video_capture_device_launcher.cc index 156c8ed..73bc88e 100644 --- a/content/browser/renderer_host/media/in_process_video_capture_device_launcher.cc +++ b/content/browser/renderer_host/media/in_process_video_capture_device_launcher.cc
@@ -7,9 +7,9 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/command_line.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_functions.h" #include "base/metrics/histogram_macros.h" #include "base/task/single_thread_task_runner.h"
diff --git a/content/browser/renderer_host/media/in_process_video_capture_provider.cc b/content/browser/renderer_host/media/in_process_video_capture_provider.cc index c4ddd05..eee0b73 100644 --- a/content/browser/renderer_host/media/in_process_video_capture_provider.cc +++ b/content/browser/renderer_host/media/in_process_video_capture_provider.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/task/single_thread_task_runner.h" #include "content/browser/renderer_host/media/in_process_video_capture_device_launcher.h"
diff --git a/content/browser/renderer_host/media/media_capture_devices_impl.cc b/content/browser/renderer_host/media/media_capture_devices_impl.cc index 184d596..6676c4dc 100644 --- a/content/browser/renderer_host/media/media_capture_devices_impl.cc +++ b/content/browser/renderer_host/media/media_capture_devices_impl.cc
@@ -4,7 +4,7 @@ #include "content/browser/renderer_host/media/media_capture_devices_impl.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "content/browser/browser_main_loop.h" #include "content/browser/renderer_host/media/media_stream_manager.h" #include "content/public/browser/browser_task_traits.h"
diff --git a/content/browser/renderer_host/media/media_devices_dispatcher_host.cc b/content/browser/renderer_host/media/media_devices_dispatcher_host.cc index cf0d5446..1055ebe1 100644 --- a/content/browser/renderer_host/media/media_devices_dispatcher_host.cc +++ b/content/browser/renderer_host/media/media_devices_dispatcher_host.cc
@@ -9,9 +9,9 @@ #include <algorithm> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "base/task/bind_post_task.h" #include "base/task/sequenced_task_runner.h"
diff --git a/content/browser/renderer_host/media/media_devices_dispatcher_host.h b/content/browser/renderer_host/media/media_devices_dispatcher_host.h index 6ded7c8..8d72445 100644 --- a/content/browser/renderer_host/media/media_devices_dispatcher_host.h +++ b/content/browser/renderer_host/media/media_devices_dispatcher_host.h
@@ -10,7 +10,7 @@ #include <utility> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "build/build_config.h" #include "content/browser/bad_message.h"
diff --git a/content/browser/renderer_host/media/media_devices_dispatcher_host_unittest.cc b/content/browser/renderer_host/media/media_devices_dispatcher_host_unittest.cc index fae96668..43fa9740 100644 --- a/content/browser/renderer_host/media/media_devices_dispatcher_host_unittest.cc +++ b/content/browser/renderer_host/media/media_devices_dispatcher_host_unittest.cc
@@ -11,9 +11,9 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/strings/stringprintf.h"
diff --git a/content/browser/renderer_host/media/media_devices_manager.cc b/content/browser/renderer_host/media/media_devices_manager.cc index dd4dfa9a..2bd8d3dc 100644 --- a/content/browser/renderer_host/media/media_devices_manager.cc +++ b/content/browser/renderer_host/media/media_devices_manager.cc
@@ -11,10 +11,10 @@ #include <map> #include <string> -#include "base/bind.h" #include "base/command_line.h" #include "base/containers/contains.h" #include "base/containers/cxx20_erase.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/metrics/histogram_functions.h" #include "base/ranges/algorithm.h" @@ -42,7 +42,7 @@ #include "third_party/blink/public/mojom/mediastream/media_devices.mojom.h" #if BUILDFLAG(IS_MAC) -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/task/single_thread_task_runner.h" #include "content/browser/browser_main_loop.h" #include "media/device_monitors/device_monitor_mac.h"
diff --git a/content/browser/renderer_host/media/media_devices_manager.h b/content/browser/renderer_host/media/media_devices_manager.h index 68afbf2..13eed22e 100644 --- a/content/browser/renderer_host/media/media_devices_manager.h +++ b/content/browser/renderer_host/media/media_devices_manager.h
@@ -12,8 +12,8 @@ #include <utility> #include <vector> -#include "base/callback.h" #include "base/containers/flat_map.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/system/system_monitor.h"
diff --git a/content/browser/renderer_host/media/media_devices_manager_unittest.cc b/content/browser/renderer_host/media/media_devices_manager_unittest.cc index 538c52df..68aae43 100644 --- a/content/browser/renderer_host/media/media_devices_manager_unittest.cc +++ b/content/browser/renderer_host/media/media_devices_manager_unittest.cc
@@ -7,9 +7,9 @@ #include <memory> #include <string> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h" #include "base/run_loop.h"
diff --git a/content/browser/renderer_host/media/media_stream_dispatcher_host.cc b/content/browser/renderer_host/media/media_stream_dispatcher_host.cc index 4bf332c..77d2934 100644 --- a/content/browser/renderer_host/media/media_stream_dispatcher_host.cc +++ b/content/browser/renderer_host/media/media_stream_dispatcher_host.cc
@@ -6,10 +6,10 @@ #include <memory> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/check_op.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/task/bind_post_task.h" #include "build/build_config.h" #include "content/browser/renderer_host/media/media_stream_manager.h"
diff --git a/content/browser/renderer_host/media/media_stream_dispatcher_host_unittest.cc b/content/browser/renderer_host/media/media_stream_dispatcher_host_unittest.cc index f49a574..bfa0436 100644 --- a/content/browser/renderer_host/media/media_stream_dispatcher_host_unittest.cc +++ b/content/browser/renderer_host/media/media_stream_dispatcher_host_unittest.cc
@@ -14,10 +14,10 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/containers/queue.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/ranges/algorithm.h" #include "base/run_loop.h"
diff --git a/content/browser/renderer_host/media/media_stream_manager.cc b/content/browser/renderer_host/media/media_stream_manager.cc index fe45e17..efe987a 100644 --- a/content/browser/renderer_host/media/media_stream_manager.cc +++ b/content/browser/renderer_host/media/media_stream_manager.cc
@@ -12,10 +12,10 @@ #include <memory> #include <vector> -#include "base/bind.h" #include "base/command_line.h" #include "base/compiler_specific.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/lazy_instance.h" #include "base/logging.h" #include "base/memory/ptr_util.h"
diff --git a/content/browser/renderer_host/media/media_stream_manager.h b/content/browser/renderer_host/media/media_stream_manager.h index 03b9639b..84c49a1b9 100644 --- a/content/browser/renderer_host/media/media_stream_manager.h +++ b/content/browser/renderer_host/media/media_stream_manager.h
@@ -33,7 +33,7 @@ #include <utility> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/gtest_prod_util.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h"
diff --git a/content/browser/renderer_host/media/media_stream_manager_unittest.cc b/content/browser/renderer_host/media/media_stream_manager_unittest.cc index 5f14d2d..3dc8bbb 100644 --- a/content/browser/renderer_host/media/media_stream_manager_unittest.cc +++ b/content/browser/renderer_host/media/media_stream_manager_unittest.cc
@@ -8,8 +8,8 @@ #include <string> #include <utility> -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h"
diff --git a/content/browser/renderer_host/media/media_stream_ui_proxy.cc b/content/browser/renderer_host/media/media_stream_ui_proxy.cc index afb84f3..fed95d4 100644 --- a/content/browser/renderer_host/media/media_stream_ui_proxy.cc +++ b/content/browser/renderer_host/media/media_stream_ui_proxy.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "build/build_config.h" #include "content/browser/renderer_host/render_frame_host_delegate.h"
diff --git a/content/browser/renderer_host/media/media_stream_ui_proxy.h b/content/browser/renderer_host/media/media_stream_ui_proxy.h index 3c66a2b..9074dd1f 100644 --- a/content/browser/renderer_host/media/media_stream_ui_proxy.h +++ b/content/browser/renderer_host/media/media_stream_ui_proxy.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "build/build_config.h" #include "content/common/content_export.h"
diff --git a/content/browser/renderer_host/media/media_stream_ui_proxy_unittest.cc b/content/browser/renderer_host/media/media_stream_ui_proxy_unittest.cc index 9d49c08c..8be1987 100644 --- a/content/browser/renderer_host/media/media_stream_ui_proxy_unittest.cc +++ b/content/browser/renderer_host/media/media_stream_ui_proxy_unittest.cc
@@ -7,9 +7,9 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "base/test/gmock_move_support.h" #include "build/build_config.h"
diff --git a/content/browser/renderer_host/media/mock_video_capture_provider.h b/content/browser/renderer_host/media/mock_video_capture_provider.h index dc47504..b253ec19 100644 --- a/content/browser/renderer_host/media/mock_video_capture_provider.h +++ b/content/browser/renderer_host/media/mock_video_capture_provider.h
@@ -5,7 +5,7 @@ #ifndef CONTENT_BROWSER_RENDERER_HOST_MEDIA_MOCK_VIDEO_CAPTURE_PROVIDER_H_ #define CONTENT_BROWSER_RENDERER_HOST_MEDIA_MOCK_VIDEO_CAPTURE_PROVIDER_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/token.h" #include "content/browser/renderer_host/media/video_capture_provider.h" #include "content/public/browser/video_capture_device_launcher.h"
diff --git a/content/browser/renderer_host/media/peer_connection_tracker_host.cc b/content/browser/renderer_host/media/peer_connection_tracker_host.cc index 9798b4fc..8803f3f 100644 --- a/content/browser/renderer_host/media/peer_connection_tracker_host.cc +++ b/content/browser/renderer_host/media/peer_connection_tracker_host.cc
@@ -7,7 +7,7 @@ #include <set> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/no_destructor.h" #include "base/observer_list.h" #include "base/power_monitor/power_monitor.h"
diff --git a/content/browser/renderer_host/media/render_frame_audio_input_stream_factory.cc b/content/browser/renderer_host/media/render_frame_audio_input_stream_factory.cc index 58a102d..f9b23072 100644 --- a/content/browser/renderer_host/media/render_frame_audio_input_stream_factory.cc +++ b/content/browser/renderer_host/media/render_frame_audio_input_stream_factory.cc
@@ -8,10 +8,10 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/check_op.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h"
diff --git a/content/browser/renderer_host/media/render_frame_audio_input_stream_factory_unittest.cc b/content/browser/renderer_host/media/render_frame_audio_input_stream_factory_unittest.cc index bac32729..ec86df9 100644 --- a/content/browser/renderer_host/media/render_frame_audio_input_stream_factory_unittest.cc +++ b/content/browser/renderer_host/media/render_frame_audio_input_stream_factory_unittest.cc
@@ -8,8 +8,8 @@ #include <tuple> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h"
diff --git a/content/browser/renderer_host/media/render_frame_audio_output_stream_factory.cc b/content/browser/renderer_host/media/render_frame_audio_output_stream_factory.cc index a153e1e8..cd6379d 100644 --- a/content/browser/renderer_host/media/render_frame_audio_output_stream_factory.cc +++ b/content/browser/renderer_host/media/render_frame_audio_output_stream_factory.cc
@@ -10,12 +10,12 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/check_op.h" #include "base/containers/flat_set.h" #include "base/containers/unique_ptr_adapters.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h"
diff --git a/content/browser/renderer_host/media/render_frame_audio_output_stream_factory_unittest.cc b/content/browser/renderer_host/media/render_frame_audio_output_stream_factory_unittest.cc index 9c49b21..4f8fa45 100644 --- a/content/browser/renderer_host/media/render_frame_audio_output_stream_factory_unittest.cc +++ b/content/browser/renderer_host/media/render_frame_audio_output_stream_factory_unittest.cc
@@ -9,8 +9,8 @@ #include <tuple> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "base/test/mock_callback.h" #include "base/test/task_environment.h"
diff --git a/content/browser/renderer_host/media/service_launched_video_capture_device.cc b/content/browser/renderer_host/media/service_launched_video_capture_device.cc index 19593e5..bf90437 100644 --- a/content/browser/renderer_host/media/service_launched_video_capture_device.cc +++ b/content/browser/renderer_host/media/service_launched_video_capture_device.cc
@@ -6,9 +6,9 @@ #include <utility> -#include "base/bind.h" -#include "base/callback_forward.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_forward.h" +#include "base/functional/callback_helpers.h" #include "base/token.h" #include "media/capture/mojom/video_capture_types.mojom.h"
diff --git a/content/browser/renderer_host/media/service_launched_video_capture_device.h b/content/browser/renderer_host/media/service_launched_video_capture_device.h index 6efe290..b2b8e3d 100644 --- a/content/browser/renderer_host/media/service_launched_video_capture_device.h +++ b/content/browser/renderer_host/media/service_launched_video_capture_device.h
@@ -5,7 +5,7 @@ #ifndef CONTENT_BROWSER_RENDERER_HOST_MEDIA_SERVICE_LAUNCHED_VIDEO_CAPTURE_DEVICE_H_ #define CONTENT_BROWSER_RENDERER_HOST_MEDIA_SERVICE_LAUNCHED_VIDEO_CAPTURE_DEVICE_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/token.h" #include "content/browser/renderer_host/media/video_capture_provider.h" #include "content/public/browser/video_capture_device_launcher.h"
diff --git a/content/browser/renderer_host/media/service_video_capture_device_launcher.cc b/content/browser/renderer_host/media/service_video_capture_device_launcher.cc index ad5d583..0efd3db 100644 --- a/content/browser/renderer_host/media/service_video_capture_device_launcher.cc +++ b/content/browser/renderer_host/media/service_video_capture_device_launcher.cc
@@ -6,9 +6,9 @@ #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "build/build_config.h" #include "content/browser/renderer_host/media/service_launched_video_capture_device.h" #include "content/public/browser/browser_task_traits.h"
diff --git a/content/browser/renderer_host/media/service_video_capture_device_launcher_unittest.cc b/content/browser/renderer_host/media/service_video_capture_device_launcher_unittest.cc index ead49aa..95f71a1 100644 --- a/content/browser/renderer_host/media/service_video_capture_device_launcher_unittest.cc +++ b/content/browser/renderer_host/media/service_video_capture_device_launcher_unittest.cc
@@ -4,8 +4,8 @@ #include "content/browser/renderer_host/media/service_video_capture_device_launcher.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "base/task/single_thread_task_runner.h" #include "base/test/mock_callback.h"
diff --git a/content/browser/renderer_host/media/service_video_capture_provider.cc b/content/browser/renderer_host/media/service_video_capture_provider.cc index bada984..d0bb4a6 100644 --- a/content/browser/renderer_host/media/service_video_capture_provider.cc +++ b/content/browser/renderer_host/media/service_video_capture_provider.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h" #include "content/browser/child_process_host_impl.h"
diff --git a/content/browser/renderer_host/media/service_video_capture_provider_unittest.cc b/content/browser/renderer_host/media/service_video_capture_provider_unittest.cc index cad03a6..37df1e09 100644 --- a/content/browser/renderer_host/media/service_video_capture_provider_unittest.cc +++ b/content/browser/renderer_host/media/service_video_capture_provider_unittest.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "base/test/bind.h" #include "base/test/mock_callback.h"
diff --git a/content/browser/renderer_host/media/video_capture_browsertest.cc b/content/browser/renderer_host/media/video_capture_browsertest.cc index 891a15ec..d550ad8f 100644 --- a/content/browser/renderer_host/media/video_capture_browsertest.cc +++ b/content/browser/renderer_host/media/video_capture_browsertest.cc
@@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/task/single_thread_task_runner.h"
diff --git a/content/browser/renderer_host/media/video_capture_buffer_pool_unittest.cc b/content/browser/renderer_host/media/video_capture_buffer_pool_unittest.cc index 0057e76..7341b53 100644 --- a/content/browser/renderer_host/media/video_capture_buffer_pool_unittest.cc +++ b/content/browser/renderer_host/media/video_capture_buffer_pool_unittest.cc
@@ -14,7 +14,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ref_counted.h" #include "base/test/task_environment.h" #include "build/build_config.h"
diff --git a/content/browser/renderer_host/media/video_capture_controller.cc b/content/browser/renderer_host/media/video_capture_controller.cc index 79fc646..8c660f4 100644 --- a/content/browser/renderer_host/media/video_capture_controller.cc +++ b/content/browser/renderer_host/media/video_capture_controller.cc
@@ -10,10 +10,10 @@ #include <map> #include <set> -#include "base/bind.h" -#include "base/callback_forward.h" #include "base/command_line.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/metrics/histogram_functions.h" #include "base/metrics/histogram_macros.h"
diff --git a/content/browser/renderer_host/media/video_capture_controller.h b/content/browser/renderer_host/media/video_capture_controller.h index e70e79b4..113a5097a 100644 --- a/content/browser/renderer_host/media/video_capture_controller.h +++ b/content/browser/renderer_host/media/video_capture_controller.h
@@ -8,7 +8,7 @@ #include <list> #include <memory> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h"
diff --git a/content/browser/renderer_host/media/video_capture_controller_unittest.cc b/content/browser/renderer_host/media/video_capture_controller_unittest.cc index e818899..4be6a8f 100644 --- a/content/browser/renderer_host/media/video_capture_controller_unittest.cc +++ b/content/browser/renderer_host/media/video_capture_controller_unittest.cc
@@ -14,8 +14,8 @@ #include "base/metrics/histogram_macros.h" #include "base/task/single_thread_task_runner.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/memory/ref_counted.h" #include "base/run_loop.h"
diff --git a/content/browser/renderer_host/media/video_capture_host.cc b/content/browser/renderer_host/media/video_capture_host.cc index 080aa5c..e470002 100644 --- a/content/browser/renderer_host/media/video_capture_host.cc +++ b/content/browser/renderer_host/media/video_capture_host.cc
@@ -6,10 +6,10 @@ #include <memory> -#include "base/bind.h" -#include "base/callback_forward.h" -#include "base/callback_helpers.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" +#include "base/functional/callback_forward.h" +#include "base/functional/callback_helpers.h" #include "base/token.h" #include "base/unguessable_token.h" #include "content/browser/browser_main_loop.h"
diff --git a/content/browser/renderer_host/media/video_capture_manager.cc b/content/browser/renderer_host/media/video_capture_manager.cc index 1e09c68..c2361d8 100644 --- a/content/browser/renderer_host/media/video_capture_manager.cc +++ b/content/browser/renderer_host/media/video_capture_manager.cc
@@ -8,11 +8,11 @@ #include <set> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/containers/contains.h" #include "base/containers/cxx20_erase.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/logging.h" #include "base/memory/raw_ptr.h"
diff --git a/content/browser/renderer_host/media/video_capture_manager_unittest.cc b/content/browser/renderer_host/media/video_capture_manager_unittest.cc index aa7d6118..4c2883f3 100644 --- a/content/browser/renderer_host/media/video_capture_manager_unittest.cc +++ b/content/browser/renderer_host/media/video_capture_manager_unittest.cc
@@ -12,8 +12,8 @@ #include <string> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h" #include "base/ranges/algorithm.h"
diff --git a/content/browser/renderer_host/media/video_capture_provider_switcher.cc b/content/browser/renderer_host/media/video_capture_provider_switcher.cc index b9a654f..aa010602 100644 --- a/content/browser/renderer_host/media/video_capture_provider_switcher.cc +++ b/content/browser/renderer_host/media/video_capture_provider_switcher.cc
@@ -7,7 +7,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" namespace content {
diff --git a/content/browser/renderer_host/media/video_capture_unittest.cc b/content/browser/renderer_host/media/video_capture_unittest.cc index 1f7d1c36..413154de 100644 --- a/content/browser/renderer_host/media/video_capture_unittest.cc +++ b/content/browser/renderer_host/media/video_capture_unittest.cc
@@ -8,8 +8,8 @@ #include <memory> #include <string> -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/memory/weak_ptr.h" #include "base/run_loop.h"
diff --git a/content/browser/renderer_host/navigation_controller_android.cc b/content/browser/renderer_host/navigation_controller_android.cc index 72a95bd..49af2a8e 100644 --- a/content/browser/renderer_host/navigation_controller_android.cc +++ b/content/browser/renderer_host/navigation_controller_android.cc
@@ -10,11 +10,11 @@ #include "base/android/jni_android.h" #include "base/android/jni_string.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/containers/flat_map.h" #include "base/debug/crash_logging.h" #include "base/debug/dump_without_crashing.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "content/browser/renderer_host/navigation_controller_impl.h" #include "content/browser/renderer_host/navigation_entry_impl.h" #include "content/public/android/content_jni_headers/NavigationControllerImpl_jni.h"
diff --git a/content/browser/renderer_host/navigation_controller_impl.cc b/content/browser/renderer_host/navigation_controller_impl.cc index 8d6825e1..00a9bfa6 100644 --- a/content/browser/renderer_host/navigation_controller_impl.cc +++ b/content/browser/renderer_host/navigation_controller_impl.cc
@@ -38,10 +38,10 @@ #include <algorithm> #include <utility> -#include "base/bind.h" #include "base/command_line.h" #include "base/containers/adapters.h" #include "base/debug/dump_without_crashing.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/metrics/histogram_macros.h" #include "base/numerics/safe_conversions.h"
diff --git a/content/browser/renderer_host/navigation_controller_impl.h b/content/browser/renderer_host/navigation_controller_impl.h index 8412ea6..ebb6afd8 100644 --- a/content/browser/renderer_host/navigation_controller_impl.h +++ b/content/browser/renderer_host/navigation_controller_impl.h
@@ -13,7 +13,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/gtest_prod_util.h" #include "base/memory/raw_ptr.h" #include "base/memory/raw_ref.h"
diff --git a/content/browser/renderer_host/navigation_controller_impl_browsertest.cc b/content/browser/renderer_host/navigation_controller_impl_browsertest.cc index 17b48ad..7a8b470 100644 --- a/content/browser/renderer_host/navigation_controller_impl_browsertest.cc +++ b/content/browser/renderer_host/navigation_controller_impl_browsertest.cc
@@ -7,11 +7,11 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/memory/raw_ref.h" #include "base/memory/ref_counted.h"
diff --git a/content/browser/renderer_host/navigation_controller_impl_unittest.cc b/content/browser/renderer_host/navigation_controller_impl_unittest.cc index ffcd0b05..eec3dca 100644 --- a/content/browser/renderer_host/navigation_controller_impl_unittest.cc +++ b/content/browser/renderer_host/navigation_controller_impl_unittest.cc
@@ -12,9 +12,9 @@ #include <tuple> #include <utility> -#include "base/bind.h" #include "base/cxx17_backports.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h"
diff --git a/content/browser/renderer_host/navigation_request.cc b/content/browser/renderer_host/navigation_request.cc index 0106a5da..af3dec7 100644 --- a/content/browser/renderer_host/navigation_request.cc +++ b/content/browser/renderer_host/navigation_request.cc
@@ -9,8 +9,6 @@ #include <vector> #include "base/auto_reset.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/containers/contains.h" #include "base/containers/cxx20_erase.h" @@ -18,6 +16,8 @@ #include "base/debug/dump_without_crashing.h" #include "base/feature_list.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ptr_util.h" #include "base/metrics/field_trial_params.h" #include "base/metrics/histogram_functions.h"
diff --git a/content/browser/renderer_host/navigation_request.h b/content/browser/renderer_host/navigation_request.h index da39b7d..bbd0cb9 100644 --- a/content/browser/renderer_host/navigation_request.h +++ b/content/browser/renderer_host/navigation_request.h
@@ -9,9 +9,9 @@ #include <string> #include <vector> -#include "base/callback.h" -#include "base/callback_forward.h" #include "base/debug/crash_logging.h" +#include "base/functional/callback.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h" #include "base/memory/safe_ref.h"
diff --git a/content/browser/renderer_host/navigation_request_browsertest.cc b/content/browser/renderer_host/navigation_request_browsertest.cc index 1213eb4..8c7ac1a 100644 --- a/content/browser/renderer_host/navigation_request_browsertest.cc +++ b/content/browser/renderer_host/navigation_request_browsertest.cc
@@ -4,9 +4,9 @@ #include <memory> -#include "base/bind.h" #include "base/command_line.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/strings/string_number_conversions.h"
diff --git a/content/browser/renderer_host/navigation_request_unittest.cc b/content/browser/renderer_host/navigation_request_unittest.cc index a3ded44e..a6c3f46 100644 --- a/content/browser/renderer_host/navigation_request_unittest.cc +++ b/content/browser/renderer_host/navigation_request_unittest.cc
@@ -7,8 +7,8 @@ #include <string> #include <vector> -#include "base/bind.h" #include "base/containers/flat_map.h" +#include "base/functional/bind.h" #include "base/i18n/number_formatting.h" #include "base/test/scoped_feature_list.h" #include "build/build_config.h"
diff --git a/content/browser/renderer_host/navigation_throttle_runner_unittest.cc b/content/browser/renderer_host/navigation_throttle_runner_unittest.cc index 99bdc6cf..91f14a5 100644 --- a/content/browser/renderer_host/navigation_throttle_runner_unittest.cc +++ b/content/browser/renderer_host/navigation_throttle_runner_unittest.cc
@@ -4,7 +4,7 @@ #include "content/browser/renderer_host/navigation_throttle_runner.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/metrics/metrics_hashes.h" #include "components/ukm/test_ukm_recorder.h" #include "content/public/browser/navigation_throttle.h"
diff --git a/content/browser/renderer_host/p2p/socket_dispatcher_host.cc b/content/browser/renderer_host/p2p/socket_dispatcher_host.cc index 34efc68..8bc67693 100644 --- a/content/browser/renderer_host/p2p/socket_dispatcher_host.cc +++ b/content/browser/renderer_host/p2p/socket_dispatcher_host.cc
@@ -8,7 +8,7 @@ #include <algorithm> -#include "base/bind.h" +#include "base/functional/bind.h" #include "content/browser/bad_message.h" #include "content/browser/renderer_host/render_process_host_impl.h" #include "content/browser/storage_partition_impl.h"
diff --git a/content/browser/renderer_host/page_lifecycle_state_manager.cc b/content/browser/renderer_host/page_lifecycle_state_manager.cc index 8d2dcb03..1c8e384 100644 --- a/content/browser/renderer_host/page_lifecycle_state_manager.cc +++ b/content/browser/renderer_host/page_lifecycle_state_manager.cc
@@ -4,8 +4,8 @@ #include "content/browser/renderer_host/page_lifecycle_state_manager.h" -#include "base/callback_helpers.h" #include "base/feature_list.h" +#include "base/functional/callback_helpers.h" #include "base/metrics/histogram_macros.h" #include "base/task/single_thread_task_runner.h" #include "base/time/time.h"
diff --git a/content/browser/renderer_host/page_lifecycle_state_manager.h b/content/browser/renderer_host/page_lifecycle_state_manager.h index f73e821..32a9d67 100644 --- a/content/browser/renderer_host/page_lifecycle_state_manager.h +++ b/content/browser/renderer_host/page_lifecycle_state_manager.h
@@ -5,7 +5,7 @@ #ifndef CONTENT_BROWSER_RENDERER_HOST_PAGE_LIFECYCLE_STATE_MANAGER_H_ #define CONTENT_BROWSER_RENDERER_HOST_PAGE_LIFECYCLE_STATE_MANAGER_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/time/time.h"
diff --git a/content/browser/renderer_host/pending_beacon_service.cc b/content/browser/renderer_host/pending_beacon_service.cc index 90082a96..341a346 100644 --- a/content/browser/renderer_host/pending_beacon_service.cc +++ b/content/browser/renderer_host/pending_beacon_service.cc
@@ -3,7 +3,7 @@ // found in the LICENSE file. #include "content/browser/renderer_host/pending_beacon_service.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_macros.h" #include "content/browser/renderer_host/pending_beacon_host.h" #include "net/traffic_annotation/network_traffic_annotation.h"
diff --git a/content/browser/renderer_host/pepper/pepper_external_file_ref_backend.cc b/content/browser/renderer_host/pepper/pepper_external_file_ref_backend.cc index 6150fa5..334b116 100644 --- a/content/browser/renderer_host/pepper/pepper_external_file_ref_backend.cc +++ b/content/browser/renderer_host/pepper/pepper_external_file_ref_backend.cc
@@ -6,9 +6,9 @@ #include <string.h> -#include "base/bind.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/task/thread_pool.h" #include "content/browser/child_process_security_policy_impl.h" #include "content/public/browser/browser_thread.h"
diff --git a/content/browser/renderer_host/pepper/pepper_file_io_host.cc b/content/browser/renderer_host/pepper/pepper_file_io_host.cc index 40ff951..e22fb4e0 100644 --- a/content/browser/renderer_host/pepper/pepper_file_io_host.cc +++ b/content/browser/renderer_host/pepper/pepper_file_io_host.cc
@@ -6,10 +6,10 @@ #include <utility> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_forward.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_forward.h" +#include "base/functional/callback_helpers.h" #include "base/memory/weak_ptr.h" #include "base/task/sequenced_task_runner.h" #include "base/task/thread_pool.h"
diff --git a/content/browser/renderer_host/pepper/pepper_file_io_host.h b/content/browser/renderer_host/pepper/pepper_file_io_host.h index eadd5d4..00a5186f 100644 --- a/content/browser/renderer_host/pepper/pepper_file_io_host.h +++ b/content/browser/renderer_host/pepper/pepper_file_io_host.h
@@ -7,10 +7,10 @@ #include <stdint.h> -#include "base/callback_forward.h" -#include "base/callback_helpers.h" #include "base/files/file.h" #include "base/files/file_proxy.h" +#include "base/functional/callback_forward.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h"
diff --git a/content/browser/renderer_host/pepper/pepper_file_system_browser_host.cc b/content/browser/renderer_host/pepper/pepper_file_system_browser_host.cc index 91fdccaa..50c2ead 100644 --- a/content/browser/renderer_host/pepper/pepper_file_system_browser_host.cc +++ b/content/browser/renderer_host/pepper/pepper_file_system_browser_host.cc
@@ -4,8 +4,8 @@ #include "content/browser/renderer_host/pepper/pepper_file_system_browser_host.h" -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/task/sequenced_task_runner.h" #include "base/task/single_thread_task_runner.h" #include "content/browser/renderer_host/pepper/pepper_file_io_host.h"
diff --git a/content/browser/renderer_host/pepper/pepper_file_system_browser_host.h b/content/browser/renderer_host/pepper/pepper_file_system_browser_host.h index 5580f14c..da229e2 100644 --- a/content/browser/renderer_host/pepper/pepper_file_system_browser_host.h +++ b/content/browser/renderer_host/pepper/pepper_file_system_browser_host.h
@@ -11,7 +11,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h"
diff --git a/content/browser/renderer_host/pepper/pepper_gamepad_host.cc b/content/browser/renderer_host/pepper/pepper_gamepad_host.cc index e2a91a5..9390c2c 100644 --- a/content/browser/renderer_host/pepper/pepper_gamepad_host.cc +++ b/content/browser/renderer_host/pepper/pepper_gamepad_host.cc
@@ -4,7 +4,7 @@ #include "content/browser/renderer_host/pepper/pepper_gamepad_host.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "content/public/browser/browser_ppapi_host.h" #include "device/gamepad/gamepad_service.h" #include "device/gamepad/gamepad_shared_buffer.h"
diff --git a/content/browser/renderer_host/pepper/pepper_host_resolver_message_filter.cc b/content/browser/renderer_host/pepper/pepper_host_resolver_message_filter.cc index 9f46196e..adade34 100644 --- a/content/browser/renderer_host/pepper/pepper_host_resolver_message_filter.cc +++ b/content/browser/renderer_host/pepper/pepper_host_resolver_message_filter.cc
@@ -9,8 +9,8 @@ #include <memory> #include <utility> -#include "base/bind.h" #include "base/check_op.h" +#include "base/functional/bind.h" #include "base/notreached.h" #include "base/task/sequenced_task_runner.h" #include "content/browser/renderer_host/pepper/browser_ppapi_host_impl.h"
diff --git a/content/browser/renderer_host/pepper/pepper_internal_file_ref_backend.cc b/content/browser/renderer_host/pepper/pepper_internal_file_ref_backend.cc index 351fe8c..a1e16c8 100644 --- a/content/browser/renderer_host/pepper/pepper_internal_file_ref_backend.cc +++ b/content/browser/renderer_host/pepper/pepper_internal_file_ref_backend.cc
@@ -9,9 +9,9 @@ #include <string> #include <vector> -#include "base/bind.h" -#include "base/callback.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/strings/escape.h" #include "content/browser/child_process_security_policy_impl.h" #include "content/browser/file_system/browser_file_system_helper.h"
diff --git a/content/browser/renderer_host/pepper/pepper_network_monitor_host.cc b/content/browser/renderer_host/pepper/pepper_network_monitor_host.cc index 7dbba5f..0b09042 100644 --- a/content/browser/renderer_host/pepper/pepper_network_monitor_host.cc +++ b/content/browser/renderer_host/pepper/pepper_network_monitor_host.cc
@@ -7,8 +7,8 @@ #include <stddef.h> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "content/browser/renderer_host/pepper/browser_ppapi_host_impl.h" #include "content/browser/renderer_host/pepper/pepper_socket_utils.h" #include "content/public/browser/browser_task_traits.h"
diff --git a/content/browser/renderer_host/pepper/pepper_network_proxy_host.cc b/content/browser/renderer_host/pepper/pepper_network_proxy_host.cc index 8718dd8..0ab20830 100644 --- a/content/browser/renderer_host/pepper/pepper_network_proxy_host.cc +++ b/content/browser/renderer_host/pepper/pepper_network_proxy_host.cc
@@ -4,7 +4,7 @@ #include "content/browser/renderer_host/pepper/pepper_network_proxy_host.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "content/browser/renderer_host/pepper/browser_ppapi_host_impl.h" #include "content/browser/renderer_host/pepper/pepper_proxy_lookup_helper.h" #include "content/browser/renderer_host/pepper/pepper_socket_utils.h"
diff --git a/content/browser/renderer_host/pepper/pepper_print_settings_manager.h b/content/browser/renderer_host/pepper/pepper_print_settings_manager.h index bbbb3a38..c7c55247 100644 --- a/content/browser/renderer_host/pepper/pepper_print_settings_manager.h +++ b/content/browser/renderer_host/pepper/pepper_print_settings_manager.h
@@ -7,7 +7,7 @@ #include <stdint.h> -#include "base/bind.h" +#include "base/functional/bind.h" #include "ppapi/c/dev/pp_print_settings_dev.h" namespace content {
diff --git a/content/browser/renderer_host/pepper/pepper_printing_host.cc b/content/browser/renderer_host/pepper/pepper_printing_host.cc index 4770e7b..b968476 100644 --- a/content/browser/renderer_host/pepper/pepper_printing_host.cc +++ b/content/browser/renderer_host/pepper/pepper_printing_host.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "ppapi/c/dev/pp_print_settings_dev.h" #include "ppapi/c/pp_errors.h" #include "ppapi/host/dispatch_host_message.h"
diff --git a/content/browser/renderer_host/pepper/pepper_proxy_lookup_helper.cc b/content/browser/renderer_host/pepper/pepper_proxy_lookup_helper.cc index f07c8022..703d88a 100644 --- a/content/browser/renderer_host/pepper/pepper_proxy_lookup_helper.cc +++ b/content/browser/renderer_host/pepper/pepper_proxy_lookup_helper.cc
@@ -4,8 +4,8 @@ #include "content/browser/renderer_host/pepper/pepper_proxy_lookup_helper.h" -#include "base/bind.h" #include "base/check_op.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/memory/ref_counted.h" #include "base/task/sequenced_task_runner.h"
diff --git a/content/browser/renderer_host/pepper/pepper_proxy_lookup_helper.h b/content/browser/renderer_host/pepper/pepper_proxy_lookup_helper.h index f00e0f680..2ae2f05 100644 --- a/content/browser/renderer_host/pepper/pepper_proxy_lookup_helper.h +++ b/content/browser/renderer_host/pepper/pepper_proxy_lookup_helper.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "base/sequence_checker.h" #include "content/common/content_export.h"
diff --git a/content/browser/renderer_host/pepper/pepper_proxy_lookup_helper_unittest.cc b/content/browser/renderer_host/pepper/pepper_proxy_lookup_helper_unittest.cc index 0282747..58dc276 100644 --- a/content/browser/renderer_host/pepper/pepper_proxy_lookup_helper_unittest.cc +++ b/content/browser/renderer_host/pepper/pepper_proxy_lookup_helper_unittest.cc
@@ -7,9 +7,9 @@ #include <memory> #include <string> -#include "base/bind.h" -#include "base/callback.h" #include "base/check_op.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "base/run_loop.h" #include "content/public/browser/browser_task_traits.h"
diff --git a/content/browser/renderer_host/pepper/pepper_renderer_connection.cc b/content/browser/renderer_host/pepper/pepper_renderer_connection.cc index bff5705..39a7d673 100644 --- a/content/browser/renderer_host/pepper/pepper_renderer_connection.cc +++ b/content/browser/renderer_host/pepper/pepper_renderer_connection.cc
@@ -9,7 +9,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h" #include "content/browser/bad_message.h"
diff --git a/content/browser/renderer_host/pepper/pepper_tcp_server_socket_message_filter.cc b/content/browser/renderer_host/pepper/pepper_tcp_server_socket_message_filter.cc index ded5dc0..ea9811e2 100644 --- a/content/browser/renderer_host/pepper/pepper_tcp_server_socket_message_filter.cc +++ b/content/browser/renderer_host/pepper/pepper_tcp_server_socket_message_filter.cc
@@ -7,8 +7,8 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/task/sequenced_task_runner.h" #include "build/build_config.h"
diff --git a/content/browser/renderer_host/pepper/pepper_tcp_socket_message_filter.cc b/content/browser/renderer_host/pepper/pepper_tcp_socket_message_filter.cc index af4f2cc2..1dc7c8a 100644 --- a/content/browser/renderer_host/pepper/pepper_tcp_socket_message_filter.cc +++ b/content/browser/renderer_host/pepper/pepper_tcp_socket_message_filter.cc
@@ -7,7 +7,7 @@ #include <cstring> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/logging.h" #include "base/memory/ptr_util.h"
diff --git a/content/browser/renderer_host/pepper/pepper_truetype_font_host.cc b/content/browser/renderer_host/pepper/pepper_truetype_font_host.cc index 3e4c2d4..8aa81e5 100644 --- a/content/browser/renderer_host/pepper/pepper_truetype_font_host.cc +++ b/content/browser/renderer_host/pepper/pepper_truetype_font_host.cc
@@ -4,7 +4,7 @@ #include "content/browser/renderer_host/pepper/pepper_truetype_font_host.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/task/thread_pool.h" #include "content/browser/renderer_host/pepper/pepper_truetype_font.h" #include "content/public/browser/browser_ppapi_host.h"
diff --git a/content/browser/renderer_host/pepper/pepper_udp_socket_message_filter.cc b/content/browser/renderer_host/pepper/pepper_udp_socket_message_filter.cc index dc1bce3..5ccd76a 100644 --- a/content/browser/renderer_host/pepper/pepper_udp_socket_message_filter.cc +++ b/content/browser/renderer_host/pepper/pepper_udp_socket_message_filter.cc
@@ -7,9 +7,9 @@ #include <cstring> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/compiler_specific.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/metrics/histogram_macros.h" #include "base/task/sequenced_task_runner.h"
diff --git a/content/browser/renderer_host/pepper/pepper_udp_socket_message_filter.h b/content/browser/renderer_host/pepper/pepper_udp_socket_message_filter.h index ff1a955..dd86f75 100644 --- a/content/browser/renderer_host/pepper/pepper_udp_socket_message_filter.h +++ b/content/browser/renderer_host/pepper/pepper_udp_socket_message_filter.h
@@ -12,8 +12,8 @@ #include <string> #include <vector> -#include "base/callback.h" #include "base/containers/queue.h" +#include "base/functional/callback.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "base/task/sequenced_task_runner.h"
diff --git a/content/browser/renderer_host/pepper/pepper_vpn_provider_message_filter_chromeos.cc b/content/browser/renderer_host/pepper/pepper_vpn_provider_message_filter_chromeos.cc index 1d40da6..18bbd89 100644 --- a/content/browser/renderer_host/pepper/pepper_vpn_provider_message_filter_chromeos.cc +++ b/content/browser/renderer_host/pepper/pepper_vpn_provider_message_filter_chromeos.cc
@@ -4,7 +4,7 @@ #include "content/browser/renderer_host/pepper/pepper_vpn_provider_message_filter_chromeos.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/task/sequenced_task_runner.h" #include "content/public/browser/browser_task_traits.h" #include "content/public/browser/browser_thread.h"
diff --git a/content/browser/renderer_host/pepper/pepper_vpn_provider_message_filter_chromeos.h b/content/browser/renderer_host/pepper/pepper_vpn_provider_message_filter_chromeos.h index 6b0ba89..dfaa1723 100644 --- a/content/browser/renderer_host/pepper/pepper_vpn_provider_message_filter_chromeos.h +++ b/content/browser/renderer_host/pepper/pepper_vpn_provider_message_filter_chromeos.h
@@ -11,8 +11,8 @@ #include <string> #include <vector> -#include "base/callback.h" #include "base/containers/queue.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h"
diff --git a/content/browser/renderer_host/pepper/quota_reservation.cc b/content/browser/renderer_host/pepper/quota_reservation.cc index 3c72d64..d3ab6e5 100644 --- a/content/browser/renderer_host/pepper/quota_reservation.cc +++ b/content/browser/renderer_host/pepper/quota_reservation.cc
@@ -7,8 +7,8 @@ #include <memory> #include <tuple> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "content/public/browser/browser_task_traits.h" #include "content/public/browser/browser_thread.h" #include "storage/browser/file_system/file_system_operation_runner.h"
diff --git a/content/browser/renderer_host/pepper/quota_reservation.h b/content/browser/renderer_host/pepper/quota_reservation.h index 9902b79..48030d7 100644 --- a/content/browser/renderer_host/pepper/quota_reservation.h +++ b/content/browser/renderer_host/pepper/quota_reservation.h
@@ -7,7 +7,7 @@ #include <map> -#include "base/callback.h" +#include "base/functional/callback.h" #include "content/common/content_export.h" #include "ppapi/c/pp_stdint.h" // For int64_t on Windows. #include "ppapi/shared_impl/file_growth.h"
diff --git a/content/browser/renderer_host/pepper/quota_reservation_unittest.cc b/content/browser/renderer_host/pepper/quota_reservation_unittest.cc index 71614e4..9ea9f7d 100644 --- a/content/browser/renderer_host/pepper/quota_reservation_unittest.cc +++ b/content/browser/renderer_host/pepper/quota_reservation_unittest.cc
@@ -8,11 +8,11 @@ #include <memory> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/files/file.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/run_loop.h" #include "base/task/single_thread_task_runner.h"
diff --git a/content/browser/renderer_host/plugin_registry_impl.cc b/content/browser/renderer_host/plugin_registry_impl.cc index b64ab7f..4174752 100644 --- a/content/browser/renderer_host/plugin_registry_impl.cc +++ b/content/browser/renderer_host/plugin_registry_impl.cc
@@ -4,8 +4,8 @@ #include "content/browser/renderer_host/plugin_registry_impl.h" -#include "base/bind.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "content/browser/plugin_service_impl.h" #include "content/public/browser/content_browser_client.h" #include "content/public/browser/plugin_service_filter.h"
diff --git a/content/browser/renderer_host/render_frame_host_android.cc b/content/browser/renderer_host/render_frame_host_android.cc index 23df34c..a9eec34 100644 --- a/content/browser/renderer_host/render_frame_host_android.cc +++ b/content/browser/renderer_host/render_frame_host_android.cc
@@ -11,8 +11,8 @@ #include "base/android/jni_array.h" #include "base/android/jni_string.h" #include "base/android/unguessable_token_android.h" -#include "base/bind.h" #include "base/check_op.h" +#include "base/functional/bind.h" #include "content/browser/bad_message.h" #include "content/browser/renderer_host/close_listener_host.h" #include "content/browser/renderer_host/render_frame_host_delegate.h"
diff --git a/content/browser/renderer_host/render_frame_host_delegate.cc b/content/browser/renderer_host/render_frame_host_delegate.cc index 37824d7..36fb3f8 100644 --- a/content/browser/renderer_host/render_frame_host_delegate.cc +++ b/content/browser/renderer_host/render_frame_host_delegate.cc
@@ -9,8 +9,8 @@ #include <string> #include <utility> -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "build/build_config.h" #include "ipc/ipc_message.h" #include "third_party/blink/public/mojom/frame/fullscreen.mojom.h"
diff --git a/content/browser/renderer_host/render_frame_host_delegate.h b/content/browser/renderer_host/render_frame_host_delegate.h index 197bb1d..7c909f4a 100644 --- a/content/browser/renderer_host/render_frame_host_delegate.h +++ b/content/browser/renderer_host/render_frame_host_delegate.h
@@ -10,7 +10,7 @@ #include <string> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/i18n/rtl.h" #include "base/memory/safe_ref.h" #include "build/build_config.h"
diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc index 892d2e6..0252acb 100644 --- a/content/browser/renderer_host/render_frame_host_impl.cc +++ b/content/browser/renderer_host/render_frame_host_impl.cc
@@ -9,14 +9,14 @@ #include <unordered_map> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/containers/contains.h" #include "base/containers/cxx20_erase.h" #include "base/debug/crash_logging.h" #include "base/debug/dump_without_crashing.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/lazy_instance.h" #include "base/memory/memory_pressure_monitor.h" #include "base/memory/ptr_util.h"
diff --git a/content/browser/renderer_host/render_frame_host_impl.h b/content/browser/renderer_host/render_frame_host_impl.h index 55bd643..0abf623f 100644 --- a/content/browser/renderer_host/render_frame_host_impl.h +++ b/content/browser/renderer_host/render_frame_host_impl.h
@@ -16,11 +16,11 @@ #include <utility> #include <vector> -#include "base/callback.h" #include "base/containers/flat_map.h" #include "base/containers/flat_set.h" #include "base/containers/unique_ptr_adapters.h" #include "base/files/file_path.h" +#include "base/functional/callback.h" #include "base/functional/function_ref.h" #include "base/gtest_prod_util.h" #include "base/i18n/rtl.h"
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 b12f645..bea1b4a 100644 --- a/content/browser/renderer_host/render_frame_host_impl_browsertest.cc +++ b/content/browser/renderer_host/render_frame_host_impl_browsertest.cc
@@ -10,11 +10,11 @@ #include <tuple> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/containers/contains.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h" #include "base/memory/raw_ref.h"
diff --git a/content/browser/renderer_host/render_frame_host_manager_browsertest.cc b/content/browser/renderer_host/render_frame_host_manager_browsertest.cc index e01d7d1..3a78d83 100644 --- a/content/browser/renderer_host/render_frame_host_manager_browsertest.cc +++ b/content/browser/renderer_host/render_frame_host_manager_browsertest.cc
@@ -9,9 +9,9 @@ #include <memory> #include <set> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/json/json_reader.h" #include "base/location.h" #include "base/memory/raw_ptr.h"
diff --git a/content/browser/renderer_host/render_frame_host_manager_unittest.cc b/content/browser/renderer_host/render_frame_host_manager_unittest.cc index 9d8b701..e23a843 100644 --- a/content/browser/renderer_host/render_frame_host_manager_unittest.cc +++ b/content/browser/renderer_host/render_frame_host_manager_unittest.cc
@@ -13,9 +13,9 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/command_line.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/hash/hash.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h"
diff --git a/content/browser/renderer_host/render_frame_metadata_provider_impl.cc b/content/browser/renderer_host/render_frame_metadata_provider_impl.cc index 528833d..50e81b4 100644 --- a/content/browser/renderer_host/render_frame_metadata_provider_impl.cc +++ b/content/browser/renderer_host/render_frame_metadata_provider_impl.cc
@@ -4,7 +4,7 @@ #include "content/browser/renderer_host/render_frame_metadata_provider_impl.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/observer_list.h" #include "base/task/single_thread_task_runner.h" #include "build/build_config.h"
diff --git a/content/browser/renderer_host/render_frame_proxy_host.cc b/content/browser/renderer_host/render_frame_proxy_host.cc index 22592c4..737dd64f 100644 --- a/content/browser/renderer_host/render_frame_proxy_host.cc +++ b/content/browser/renderer_host/render_frame_proxy_host.cc
@@ -10,9 +10,9 @@ #include <utility> #include <vector> -#include "base/callback.h" #include "base/containers/circular_deque.h" #include "base/containers/contains.h" +#include "base/functional/callback.h" #include "base/hash/hash.h" #include "base/lazy_instance.h" #include "base/no_destructor.h"
diff --git a/content/browser/renderer_host/render_frame_proxy_host.h b/content/browser/renderer_host/render_frame_proxy_host.h index ef9ab623..5d404a6e 100644 --- a/content/browser/renderer_host/render_frame_proxy_host.h +++ b/content/browser/renderer_host/render_frame_proxy_host.h
@@ -9,7 +9,7 @@ #include <memory> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "content/browser/site_instance_impl.h" #include "content/common/content_export.h"
diff --git a/content/browser/renderer_host/render_message_filter.cc b/content/browser/renderer_host/render_message_filter.cc index 42f08bce..85b6631a 100644 --- a/content/browser/renderer_host/render_message_filter.cc +++ b/content/browser/renderer_host/render_message_filter.cc
@@ -10,10 +10,10 @@ #include <map> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/debug/alias.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/numerics/safe_math.h" #include "base/strings/sys_string_conversions.h" #include "base/strings/utf_string_conversions.h"
diff --git a/content/browser/renderer_host/render_process_host_browsertest.cc b/content/browser/renderer_host/render_process_host_browsertest.cc index d221916..e8979cc 100644 --- a/content/browser/renderer_host/render_process_host_browsertest.cc +++ b/content/browser/renderer_host/render_process_host_browsertest.cc
@@ -4,10 +4,10 @@ #include <string> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/scoped_observation.h"
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc index 57dc9db..8d68020 100644 --- a/content/browser/renderer_host/render_process_host_impl.cc +++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -15,8 +15,6 @@ #include <vector> #include "base/base_switches.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/clang_profiling_buildflags.h" #include "base/command_line.h" #include "base/containers/adapters.h" @@ -29,6 +27,8 @@ #include "base/feature_list.h" #include "base/files/file.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/location.h" #include "base/logging.h" #include "base/memory/memory_pressure_monitor.h"
diff --git a/content/browser/renderer_host/render_process_host_impl.h b/content/browser/renderer_host/render_process_host_impl.h index 9c5b522..153f3e02 100644 --- a/content/browser/renderer_host/render_process_host_impl.h +++ b/content/browser/renderer_host/render_process_host_impl.h
@@ -13,9 +13,9 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback_forward.h" #include "base/containers/flat_set.h" +#include "base/functional/bind.h" +#include "base/functional/callback_forward.h" #include "base/gtest_prod_util.h" #include "base/memory/raw_ptr.h" #include "base/memory/safe_ref.h"
diff --git a/content/browser/renderer_host/render_view_host_delegate.h b/content/browser/renderer_host/render_view_host_delegate.h index 8dd9694..d8188df 100644 --- a/content/browser/renderer_host/render_view_host_delegate.h +++ b/content/browser/renderer_host/render_view_host_delegate.h
@@ -7,7 +7,7 @@ #include <stdint.h> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/process/kill.h" #include "content/browser/dom_storage/session_storage_namespace_impl.h" #include "mojo/public/cpp/bindings/pending_remote.h"
diff --git a/content/browser/renderer_host/render_view_host_delegate_view.h b/content/browser/renderer_host/render_view_host_delegate_view.h index f1bddc3..8cd69d5 100644 --- a/content/browser/renderer_host/render_view_host_delegate_view.h +++ b/content/browser/renderer_host/render_view_host_delegate_view.h
@@ -7,7 +7,7 @@ #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "build/build_config.h" #include "content/common/buildflags.h" #include "content/common/content_export.h"
diff --git a/content/browser/renderer_host/render_view_host_impl.cc b/content/browser/renderer_host/render_view_host_impl.cc index 6b36af5..25b533ff 100644 --- a/content/browser/renderer_host/render_view_host_impl.cc +++ b/content/browser/renderer_host/render_view_host_impl.cc
@@ -10,11 +10,11 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback.h" #include "base/command_line.h" #include "base/debug/dump_without_crashing.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/hash/hash.h" #include "base/i18n/rtl.h" #include "base/json/json_reader.h"
diff --git a/content/browser/renderer_host/render_view_host_impl.h b/content/browser/renderer_host/render_view_host_impl.h index 4e40347..effa12d 100644 --- a/content/browser/renderer_host/render_view_host_impl.h +++ b/content/browser/renderer_host/render_view_host_impl.h
@@ -13,7 +13,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/gtest_prod_util.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h"
diff --git a/content/browser/renderer_host/render_view_host_unittest.cc b/content/browser/renderer_host/render_view_host_unittest.cc index 6af57bb..97b1886 100644 --- a/content/browser/renderer_host/render_view_host_unittest.cc +++ b/content/browser/renderer_host/render_view_host_unittest.cc
@@ -4,7 +4,7 @@ #include <stdint.h> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/path_service.h" #include "base/strings/strcat.h"
diff --git a/content/browser/renderer_host/render_widget_helper.cc b/content/browser/renderer_host/render_widget_helper.cc index f498d73..460bd2cf 100644 --- a/content/browser/renderer_host/render_widget_helper.cc +++ b/content/browser/renderer_host/render_widget_helper.cc
@@ -4,9 +4,9 @@ #include "content/browser/renderer_host/render_widget_helper.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/check_op.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/lazy_instance.h" #include "content/public/browser/browser_task_traits.h" #include "content/public/browser/browser_thread.h"
diff --git a/content/browser/renderer_host/render_widget_host_browsertest.cc b/content/browser/renderer_host/render_widget_host_browsertest.cc index b509d98..158187f 100644 --- a/content/browser/renderer_host/render_widget_host_browsertest.cc +++ b/content/browser/renderer_host/render_widget_host_browsertest.cc
@@ -5,8 +5,8 @@ #include <memory> #include <vector> -#include "base/bind.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/task/single_thread_task_runner.h"
diff --git a/content/browser/renderer_host/render_widget_host_delegate.h b/content/browser/renderer_host/render_widget_host_delegate.h index 5bc19ff..b842aea 100644 --- a/content/browser/renderer_host/render_widget_host_delegate.h +++ b/content/browser/renderer_host/render_widget_host_delegate.h
@@ -10,7 +10,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "build/build_config.h" #include "components/viz/common/vertical_scroll_direction.h" #include "content/common/content_export.h"
diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc index 59472c8..d7188ae 100644 --- a/content/browser/renderer_host/render_widget_host_impl.cc +++ b/content/browser/renderer_host/render_widget_host_impl.cc
@@ -14,8 +14,6 @@ #include <vector> #include "base/auto_reset.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/check.h" #include "base/command_line.h" #include "base/containers/contains.h" @@ -24,6 +22,8 @@ #include "base/debug/dump_without_crashing.h" #include "base/feature_list.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/hash/hash.h" #include "base/i18n/rtl.h" #include "base/lazy_instance.h"
diff --git a/content/browser/renderer_host/render_widget_host_impl.h b/content/browser/renderer_host/render_widget_host_impl.h index c03146d..3910d3a 100644 --- a/content/browser/renderer_host/render_widget_host_impl.h +++ b/content/browser/renderer_host/render_widget_host_impl.h
@@ -14,10 +14,10 @@ #include <utility> #include <vector> -#include "base/callback.h" #include "base/callback_list.h" #include "base/containers/flat_map.h" #include "base/containers/flat_set.h" +#include "base/functional/callback.h" #include "base/gtest_prod_util.h" #include "base/memory/raw_ptr.h" #include "base/memory/raw_ref.h"
diff --git a/content/browser/renderer_host/render_widget_host_unittest.cc b/content/browser/renderer_host/render_widget_host_unittest.cc index b7fc302..f7ba794 100644 --- a/content/browser/renderer_host/render_widget_host_unittest.cc +++ b/content/browser/renderer_host/render_widget_host_unittest.cc
@@ -8,8 +8,8 @@ #include <memory> #include <tuple> -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h"
diff --git a/content/browser/renderer_host/render_widget_host_view_android.cc b/content/browser/renderer_host/render_widget_host_view_android.cc index a1b7396b..e16a50de 100644 --- a/content/browser/renderer_host/render_widget_host_view_android.cc +++ b/content/browser/renderer_host/render_widget_host_view_android.cc
@@ -13,10 +13,10 @@ #include "base/android/callback_android.h" #include "base/android/jni_string.h" #include "base/auto_reset.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/logging.h" #include "base/memory/ref_counted.h"
diff --git a/content/browser/renderer_host/render_widget_host_view_android.h b/content/browser/renderer_host/render_widget_host_view_android.h index 6321ac9..3d6782b5 100644 --- a/content/browser/renderer_host/render_widget_host_view_android.h +++ b/content/browser/renderer_host/render_widget_host_view_android.h
@@ -13,9 +13,9 @@ #include <memory> #include "base/android/jni_android.h" -#include "base/callback.h" #include "base/callback_list.h" #include "base/containers/queue.h" +#include "base/functional/callback.h" #include "base/gtest_prod_util.h" #include "base/i18n/rtl.h" #include "base/memory/raw_ptr.h"
diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc index 9ed11c8..ddec0e1 100644 --- a/content/browser/renderer_host/render_widget_host_view_aura.cc +++ b/content/browser/renderer_host/render_widget_host_view_aura.cc
@@ -10,10 +10,10 @@ #include <utility> #include "base/auto_reset.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/memory/raw_ptr.h" #include "base/metrics/histogram_functions.h"
diff --git a/content/browser/renderer_host/render_widget_host_view_aura.h b/content/browser/renderer_host/render_widget_host_view_aura.h index 7305f751..8ca7667 100644 --- a/content/browser/renderer_host/render_widget_host_view_aura.h +++ b/content/browser/renderer_host/render_widget_host_view_aura.h
@@ -14,7 +14,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/gtest_prod_util.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h"
diff --git a/content/browser/renderer_host/render_widget_host_view_aura_browsertest.cc b/content/browser/renderer_host/render_widget_host_view_aura_browsertest.cc index 3011316..5efbcc3 100644 --- a/content/browser/renderer_host/render_widget_host_view_aura_browsertest.cc +++ b/content/browser/renderer_host/render_widget_host_view_aura_browsertest.cc
@@ -4,7 +4,7 @@ #include "content/browser/renderer_host/render_widget_host_view_aura.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/task/single_thread_task_runner.h" #include "base/test/test_timeouts.h"
diff --git a/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc b/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc index 35d4c1c9..0d02045 100644 --- a/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc +++ b/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc
@@ -12,8 +12,8 @@ #include <tuple> #include <utility> -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h"
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 0433b76..39b6c68 100644 --- a/content/browser/renderer_host/render_widget_host_view_base.cc +++ b/content/browser/renderer_host/render_widget_host_view_base.cc
@@ -4,9 +4,9 @@ #include "content/browser/renderer_host/render_widget_host_view_base.h" -#include "base/bind.h" #include "base/check.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/observer_list.h" #include "base/unguessable_token.h"
diff --git a/content/browser/renderer_host/render_widget_host_view_base.h b/content/browser/renderer_host/render_widget_host_view_base.h index 75293ea..9794751 100644 --- a/content/browser/renderer_host/render_widget_host_view_base.h +++ b/content/browser/renderer_host/render_widget_host_view_base.h
@@ -12,7 +12,7 @@ #include <string> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/gtest_prod_util.h" #include "base/i18n/rtl.h" #include "base/memory/raw_ptr.h"
diff --git a/content/browser/renderer_host/render_widget_host_view_browsertest.cc b/content/browser/renderer_host/render_widget_host_view_browsertest.cc index b667951..d2a6f93 100644 --- a/content/browser/renderer_host/render_widget_host_view_browsertest.cc +++ b/content/browser/renderer_host/render_widget_host_view_browsertest.cc
@@ -8,8 +8,8 @@ #include <stdint.h> -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/memory/raw_ptr.h" #include "base/path_service.h"
diff --git a/content/browser/renderer_host/render_widget_host_view_child_frame.cc b/content/browser/renderer_host/render_widget_host_view_child_frame.cc index 17f07df0..8bfdba6c 100644 --- a/content/browser/renderer_host/render_widget_host_view_child_frame.cc +++ b/content/browser/renderer_host/render_widget_host_view_child_frame.cc
@@ -8,8 +8,8 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/debug/dump_without_crashing.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/task/single_thread_task_runner.h" #include "build/build_config.h"
diff --git a/content/browser/renderer_host/render_widget_host_view_child_frame.h b/content/browser/renderer_host/render_widget_host_view_child_frame.h index f7f9a981..10f9a24 100644 --- a/content/browser/renderer_host/render_widget_host_view_child_frame.h +++ b/content/browser/renderer_host/render_widget_host_view_child_frame.h
@@ -11,7 +11,7 @@ #include <memory> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/gtest_prod_util.h" #include "base/memory/raw_ptr.h" #include "base/time/time.h"
diff --git a/content/browser/renderer_host/render_widget_host_view_child_frame_browsertest.cc b/content/browser/renderer_host/render_widget_host_view_child_frame_browsertest.cc index 4a2d2b0..eb0ff16 100644 --- a/content/browser/renderer_host/render_widget_host_view_child_frame_browsertest.cc +++ b/content/browser/renderer_host/render_widget_host_view_child_frame_browsertest.cc
@@ -4,8 +4,8 @@ #include "content/browser/renderer_host/render_widget_host_view_child_frame.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/run_loop.h" #include "base/task/single_thread_task_runner.h"
diff --git a/content/browser/renderer_host/render_widget_host_view_mac.mm b/content/browser/renderer_host/render_widget_host_view_mac.mm index f33cfd5a..62799f0 100644 --- a/content/browser/renderer_host/render_widget_host_view_mac.mm +++ b/content/browser/renderer_host/render_widget_host_view_mac.mm
@@ -12,9 +12,9 @@ #include <utility> #include "base/auto_reset.h" -#include "base/bind.h" #include "base/command_line.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/mac/mac_util.h" #include "base/mac/scoped_cftyperef.h"
diff --git a/content/browser/renderer_host/render_widget_host_view_mac_browsertest.mm b/content/browser/renderer_host/render_widget_host_view_mac_browsertest.mm index 358a1b4..d28b3f0 100644 --- a/content/browser/renderer_host/render_widget_host_view_mac_browsertest.mm +++ b/content/browser/renderer_host/render_widget_host_view_mac_browsertest.mm
@@ -6,7 +6,7 @@ #include <string> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h" #import "content/app_shim_remote_cocoa/render_widget_host_view_cocoa.h"
diff --git a/content/browser/renderer_host/render_widget_targeter.cc b/content/browser/renderer_host/render_widget_targeter.cc index a6c879e..27d627d 100644 --- a/content/browser/renderer_host/render_widget_targeter.cc +++ b/content/browser/renderer_host/render_widget_targeter.cc
@@ -6,8 +6,8 @@ #include <memory> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/metrics/histogram_functions.h" #include "base/metrics/histogram_macros.h" #include "base/rand_util.h"
diff --git a/content/browser/renderer_host/text_input_client_mac.h b/content/browser/renderer_host/text_input_client_mac.h index 4af05700..774464a5 100644 --- a/content/browser/renderer_host/text_input_client_mac.h +++ b/content/browser/renderer_host/text_input_client_mac.h
@@ -5,7 +5,7 @@ #ifndef CONTENT_BROWSER_RENDERER_HOST_TEXT_INPUT_CLIENT_MAC_H_ #define CONTENT_BROWSER_RENDERER_HOST_TEXT_INPUT_CLIENT_MAC_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/gtest_prod_util.h" #include "base/mac/scoped_block.h" #include "base/synchronization/condition_variable.h"
diff --git a/content/browser/renderer_host/text_input_client_mac.mm b/content/browser/renderer_host/text_input_client_mac.mm index 9f5852b..54d173b 100644 --- a/content/browser/renderer_host/text_input_client_mac.mm +++ b/content/browser/renderer_host/text_input_client_mac.mm
@@ -4,7 +4,7 @@ #import "content/browser/renderer_host/text_input_client_mac.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/singleton.h" #include "base/metrics/histogram_macros.h" #include "base/threading/thread_restrictions.h"
diff --git a/content/browser/renderer_host/text_input_client_mac_unittest.mm b/content/browser/renderer_host/text_input_client_mac_unittest.mm index 7541a1d..89b2dad 100644 --- a/content/browser/renderer_host/text_input_client_mac_unittest.mm +++ b/content/browser/renderer_host/text_input_client_mac_unittest.mm
@@ -9,7 +9,7 @@ #include <stddef.h> #include <stdint.h> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/task/single_thread_task_runner.h" #include "base/threading/thread.h"
diff --git a/content/browser/sandbox_mac_unittest.mm b/content/browser/sandbox_mac_unittest.mm index 132f9dd4..89d3b83 100644 --- a/content/browser/sandbox_mac_unittest.mm +++ b/content/browser/sandbox_mac_unittest.mm
@@ -7,11 +7,11 @@ #include <fcntl.h> -#include "base/bind.h" -#include "base/callback.h" #include "base/command_line.h" #include "base/files/file_util.h" #include "base/files/scoped_file.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/mac/foundation_util.h" #include "base/mac/mac_util.h" #include "base/mac/scoped_cftyperef.h"
diff --git a/content/browser/sandbox_support_mac_impl.mm b/content/browser/sandbox_support_mac_impl.mm index 22a7a6f..da98f9d 100644 --- a/content/browser/sandbox_support_mac_impl.mm +++ b/content/browser/sandbox_support_mac_impl.mm
@@ -4,7 +4,7 @@ #import "content/browser/sandbox_support_mac_impl.h" -#include "base/bind.h" +#include "base/functional/bind.h" #import "content/browser/theme_helper_mac.h" #include "content/common/mac/font_loader.h" #include "content/public/browser/browser_task_traits.h"
diff --git a/content/browser/scheduler/browser_io_thread_delegate_unittest.cc b/content/browser/scheduler/browser_io_thread_delegate_unittest.cc index 785e5bcd..653536b 100644 --- a/content/browser/scheduler/browser_io_thread_delegate_unittest.cc +++ b/content/browser/scheduler/browser_io_thread_delegate_unittest.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/synchronization/waitable_event.h" #include "base/threading/thread.h" #include "content/browser/scheduler/browser_task_executor.h"
diff --git a/content/browser/scheduler/browser_task_executor.cc b/content/browser/scheduler/browser_task_executor.cc index 4f3588f..15c5b18 100644 --- a/content/browser/scheduler/browser_task_executor.cc +++ b/content/browser/scheduler/browser_task_executor.cc
@@ -6,7 +6,7 @@ #include <atomic> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/message_loop/message_pump_type.h" #include "base/run_loop.h" #include "base/task/deferred_sequenced_task_runner.h"
diff --git a/content/browser/scheduler/browser_task_executor_unittest.cc b/content/browser/scheduler/browser_task_executor_unittest.cc index b1ad6e3e..9908f49 100644 --- a/content/browser/scheduler/browser_task_executor_unittest.cc +++ b/content/browser/scheduler/browser_task_executor_unittest.cc
@@ -9,8 +9,8 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/task/single_thread_task_runner.h" #include "base/task/task_traits.h" #include "base/task/thread_pool/thread_pool_instance.h"
diff --git a/content/browser/scheduler/browser_task_queues.cc b/content/browser/scheduler/browser_task_queues.cc index d883344..9daad0f7 100644 --- a/content/browser/scheduler/browser_task_queues.cc +++ b/content/browser/scheduler/browser_task_queues.cc
@@ -8,10 +8,10 @@ #include <cstdint> #include <iterator> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/check.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/scoped_refptr.h" #include "base/task/sequence_manager/sequence_manager.h" #include "base/task/sequenced_task_runner.h"
diff --git a/content/browser/scheduler/browser_task_queues.h b/content/browser/scheduler/browser_task_queues.h index 4c29abe..df747412 100644 --- a/content/browser/scheduler/browser_task_queues.h +++ b/content/browser/scheduler/browser_task_queues.h
@@ -7,7 +7,7 @@ #include <array> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h" #include "base/task/sequence_manager/task_queue.h"
diff --git a/content/browser/scheduler/browser_task_queues_unittest.cc b/content/browser/scheduler/browser_task_queues_unittest.cc index 0cfb79e..0978f64 100644 --- a/content/browser/scheduler/browser_task_queues_unittest.cc +++ b/content/browser/scheduler/browser_task_queues_unittest.cc
@@ -7,7 +7,7 @@ #include <array> #include <memory> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/message_loop/message_pump.h" #include "base/message_loop/message_pump_type.h" #include "base/run_loop.h"
diff --git a/content/browser/scheduler/browser_ui_thread_scheduler_unittest.cc b/content/browser/scheduler/browser_ui_thread_scheduler_unittest.cc index a62ffb5..285a15a 100644 --- a/content/browser/scheduler/browser_ui_thread_scheduler_unittest.cc +++ b/content/browser/scheduler/browser_ui_thread_scheduler_unittest.cc
@@ -8,8 +8,8 @@ #include <utility> #include <vector> -#include "base/callback_helpers.h" #include "base/feature_list.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "base/task/single_thread_task_runner.h" #include "base/task/task_features.h"
diff --git a/content/browser/scheduler/responsiveness/calculator.cc b/content/browser/scheduler/responsiveness/calculator.cc index cbe18ba0..6fcde97 100644 --- a/content/browser/scheduler/responsiveness/calculator.cc +++ b/content/browser/scheduler/responsiveness/calculator.cc
@@ -7,7 +7,7 @@ #include <algorithm> #include <set> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_macros.h" #include "base/trace_event/trace_event.h" #include "build/build_config.h"
diff --git a/content/browser/scheduler/responsiveness/jank_monitor_impl.cc b/content/browser/scheduler/responsiveness/jank_monitor_impl.cc index 677366b..0eb0ceb 100644 --- a/content/browser/scheduler/responsiveness/jank_monitor_impl.cc +++ b/content/browser/scheduler/responsiveness/jank_monitor_impl.cc
@@ -4,8 +4,8 @@ #include "content/browser/scheduler/responsiveness/jank_monitor_impl.h" -#include "base/callback_helpers.h" #include "base/compiler_specific.h" +#include "base/functional/callback_helpers.h" #include "base/observer_list.h" #include "base/task/thread_pool.h" #include "build/build_config.h"
diff --git a/content/browser/scheduler/responsiveness/jank_monitor_impl_unittest.cc b/content/browser/scheduler/responsiveness/jank_monitor_impl_unittest.cc index d9ec381..be3edc7 100644 --- a/content/browser/scheduler/responsiveness/jank_monitor_impl_unittest.cc +++ b/content/browser/scheduler/responsiveness/jank_monitor_impl_unittest.cc
@@ -4,8 +4,8 @@ #include "content/browser/scheduler/responsiveness/jank_monitor_impl.h" -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/synchronization/waitable_event.h" #include "base/test/bind.h"
diff --git a/content/browser/scheduler/responsiveness/metric_source.cc b/content/browser/scheduler/responsiveness/metric_source.cc index f75493eb..cb68abde 100644 --- a/content/browser/scheduler/responsiveness/metric_source.cc +++ b/content/browser/scheduler/responsiveness/metric_source.cc
@@ -4,7 +4,7 @@ #include "content/browser/scheduler/responsiveness/metric_source.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/pending_task.h" #include "build/build_config.h" #include "content/browser/scheduler/responsiveness/message_loop_observer.h"
diff --git a/content/browser/scheduler/responsiveness/metric_source.h b/content/browser/scheduler/responsiveness/metric_source.h index 43e1f29c..5272b632 100644 --- a/content/browser/scheduler/responsiveness/metric_source.h +++ b/content/browser/scheduler/responsiveness/metric_source.h
@@ -7,8 +7,8 @@ #include <memory> -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/gtest_prod_util.h" #include "base/memory/raw_ptr.h" #include "content/common/content_export.h"
diff --git a/content/browser/scheduler/responsiveness/metric_source_unittest.cc b/content/browser/scheduler/responsiveness/metric_source_unittest.cc index 3571989..422651f 100644 --- a/content/browser/scheduler/responsiveness/metric_source_unittest.cc +++ b/content/browser/scheduler/responsiveness/metric_source_unittest.cc
@@ -6,7 +6,7 @@ #include <atomic> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/test/bind.h" #include "content/browser/scheduler/responsiveness/native_event_observer.h" #include "content/public/browser/browser_task_traits.h"
diff --git a/content/browser/scheduler/responsiveness/native_event_observer.h b/content/browser/scheduler/responsiveness/native_event_observer.h index cde15564..4b35719 100644 --- a/content/browser/scheduler/responsiveness/native_event_observer.h +++ b/content/browser/scheduler/responsiveness/native_event_observer.h
@@ -7,7 +7,7 @@ #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "build/build_config.h" #include "content/common/content_export.h"
diff --git a/content/browser/scheduler/responsiveness/native_event_observer_browsertest.mm b/content/browser/scheduler/responsiveness/native_event_observer_browsertest.mm index 215734e..5f484381 100644 --- a/content/browser/scheduler/responsiveness/native_event_observer_browsertest.mm +++ b/content/browser/scheduler/responsiveness/native_event_observer_browsertest.mm
@@ -4,7 +4,7 @@ #include "content/browser/scheduler/responsiveness/native_event_observer.h" -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "content/public/test/browser_test.h" #include "content/public/test/content_browser_test.h"
diff --git a/content/browser/scheduler/responsiveness/native_event_observer_browsertest_win.cc b/content/browser/scheduler/responsiveness/native_event_observer_browsertest_win.cc index c55971e2..97bfe2e2 100644 --- a/content/browser/scheduler/responsiveness/native_event_observer_browsertest_win.cc +++ b/content/browser/scheduler/responsiveness/native_event_observer_browsertest_win.cc
@@ -4,8 +4,8 @@ #include "content/browser/scheduler/responsiveness/native_event_observer.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/win/message_window.h" #include "content/public/test/browser_test.h"
diff --git a/content/browser/scheduler/responsiveness/watcher.cc b/content/browser/scheduler/responsiveness/watcher.cc index ef90e97..a4261b58 100644 --- a/content/browser/scheduler/responsiveness/watcher.cc +++ b/content/browser/scheduler/responsiveness/watcher.cc
@@ -4,8 +4,8 @@ #include "content/browser/scheduler/responsiveness/watcher.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/pending_task.h" #include "base/power_monitor/power_monitor.h" #include "build/build_config.h"
diff --git a/content/browser/scheduler/responsiveness/watcher_unittest.cc b/content/browser/scheduler/responsiveness/watcher_unittest.cc index 71fc9bf48..9b6e7666 100644 --- a/content/browser/scheduler/responsiveness/watcher_unittest.cc +++ b/content/browser/scheduler/responsiveness/watcher_unittest.cc
@@ -4,9 +4,9 @@ #include "content/browser/scheduler/responsiveness/watcher.h" -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/memory/raw_ptr.h" #include "base/pending_task.h"
diff --git a/content/browser/screen_details/screen_change_monitor.h b/content/browser/screen_details/screen_change_monitor.h index f4d465e..6d91709 100644 --- a/content/browser/screen_details/screen_change_monitor.h +++ b/content/browser/screen_details/screen_change_monitor.h
@@ -7,7 +7,7 @@ #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "ui/display/display_observer.h" namespace content {
diff --git a/content/browser/screen_orientation/screen_orientation_provider.h b/content/browser/screen_orientation/screen_orientation_provider.h index 30490c3..6b5ed22 100644 --- a/content/browser/screen_orientation/screen_orientation_provider.h +++ b/content/browser/screen_orientation/screen_orientation_provider.h
@@ -5,7 +5,7 @@ #ifndef CONTENT_BROWSER_SCREEN_ORIENTATION_SCREEN_ORIENTATION_PROVIDER_H_ #define CONTENT_BROWSER_SCREEN_ORIENTATION_SCREEN_ORIENTATION_PROVIDER_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "content/common/content_export.h" #include "content/public/browser/render_frame_host_receiver_set.h" #include "content/public/browser/web_contents_observer.h"
diff --git a/content/browser/screen_orientation/screen_orientation_provider_unittest.cc b/content/browser/screen_orientation/screen_orientation_provider_unittest.cc index 3299461..08d3f801 100644 --- a/content/browser/screen_orientation/screen_orientation_provider_unittest.cc +++ b/content/browser/screen_orientation/screen_orientation_provider_unittest.cc
@@ -4,8 +4,8 @@ #include "content/browser/screen_orientation/screen_orientation_provider.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "content/public/browser/screen_orientation_delegate.h"
diff --git a/content/browser/screenlock_monitor/screenlock_monitor_device_source_win.cc b/content/browser/screenlock_monitor/screenlock_monitor_device_source_win.cc index c12bca9..4fe29dc82 100644 --- a/content/browser/screenlock_monitor/screenlock_monitor_device_source_win.cc +++ b/content/browser/screenlock_monitor/screenlock_monitor_device_source_win.cc
@@ -6,8 +6,8 @@ #include <memory> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/task/thread_pool.h" #include "base/win/message_window.h"
diff --git a/content/browser/security_exploit_browsertest.cc b/content/browser/security_exploit_browsertest.cc index 74ca304..2ef8e3da 100644 --- a/content/browser/security_exploit_browsertest.cc +++ b/content/browser/security_exploit_browsertest.cc
@@ -6,11 +6,11 @@ #include <tuple> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/feature_list.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h"
diff --git a/content/browser/serial/serial_service.cc b/content/browser/serial/serial_service.cc index 399e8e78..e5de2c8 100644 --- a/content/browser/serial/serial_service.cc +++ b/content/browser/serial/serial_service.cc
@@ -6,9 +6,9 @@ #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/containers/cxx20_erase.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "content/browser/renderer_host/back_forward_cache_disable.h" #include "content/browser/web_contents/web_contents_impl.h" #include "content/public/browser/back_forward_cache.h"
diff --git a/content/browser/serial/serial_test_utils.cc b/content/browser/serial/serial_test_utils.cc index 24c74fb..d401aeb 100644 --- a/content/browser/serial/serial_test_utils.cc +++ b/content/browser/serial/serial_test_utils.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/callback.h" +#include "base/functional/callback.h" namespace content {
diff --git a/content/browser/service_process_host_impl.cc b/content/browser/service_process_host_impl.cc index f0b0335b..0072ab7 100644 --- a/content/browser/service_process_host_impl.cc +++ b/content/browser/service_process_host_impl.cc
@@ -6,7 +6,7 @@ #include <string> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/weak_ptr.h" #include "base/no_destructor.h" #include "base/observer_list.h"
diff --git a/content/browser/service_worker/embedded_worker_instance.cc b/content/browser/service_worker/embedded_worker_instance.cc index 8a58d061..8e34b3d6 100644 --- a/content/browser/service_worker/embedded_worker_instance.cc +++ b/content/browser/service_worker/embedded_worker_instance.cc
@@ -6,11 +6,11 @@ #include <utility> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/containers/contains.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/metrics/histogram_macros.h" #include "base/observer_list.h" #include "base/time/time.h"
diff --git a/content/browser/service_worker/embedded_worker_instance.h b/content/browser/service_worker/embedded_worker_instance.h index 8738891..4d753bed 100644 --- a/content/browser/service_worker/embedded_worker_instance.h +++ b/content/browser/service_worker/embedded_worker_instance.h
@@ -10,8 +10,8 @@ #include <memory> #include <string> -#include "base/callback_forward.h" #include "base/check_op.h" +#include "base/functional/callback_forward.h" #include "base/gtest_prod_util.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h"
diff --git a/content/browser/service_worker/embedded_worker_test_helper.cc b/content/browser/service_worker/embedded_worker_test_helper.cc index eb97ab1..4789e46 100644 --- a/content/browser/service_worker/embedded_worker_test_helper.cc +++ b/content/browser/service_worker/embedded_worker_test_helper.cc
@@ -7,7 +7,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" #include "base/task/sequenced_task_runner.h" #include "base/task/single_thread_task_runner.h"
diff --git a/content/browser/service_worker/embedded_worker_test_helper.h b/content/browser/service_worker/embedded_worker_test_helper.h index c1578f0..be60996 100644 --- a/content/browser/service_worker/embedded_worker_test_helper.h +++ b/content/browser/service_worker/embedded_worker_test_helper.h
@@ -8,9 +8,9 @@ #include <memory> #include <utility> -#include "base/callback_forward.h" #include "base/containers/flat_set.h" #include "base/containers/unique_ptr_adapters.h" +#include "base/functional/callback_forward.h" #include "base/memory/scoped_refptr.h" #include "base/task/sequenced_task_runner.h" #include "components/services/storage/public/mojom/service_worker_storage_control.mojom.h"
diff --git a/content/browser/service_worker/fake_embedded_worker_instance_client.cc b/content/browser/service_worker/fake_embedded_worker_instance_client.cc index da866541..ac065c6 100644 --- a/content/browser/service_worker/fake_embedded_worker_instance_client.cc +++ b/content/browser/service_worker/fake_embedded_worker_instance_client.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/test/bind.h" #include "content/browser/service_worker/embedded_worker_test_helper.h"
diff --git a/content/browser/service_worker/fake_service_worker.cc b/content/browser/service_worker/fake_service_worker.cc index 1176ddd0..4f93752 100644 --- a/content/browser/service_worker/fake_service_worker.cc +++ b/content/browser/service_worker/fake_service_worker.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "content/browser/service_worker/embedded_worker_test_helper.h" #include "mojo/public/cpp/bindings/remote.h"
diff --git a/content/browser/service_worker/payment_handler_support.cc b/content/browser/service_worker/payment_handler_support.cc index 9266ec9..19a909fc 100644 --- a/content/browser/service_worker/payment_handler_support.cc +++ b/content/browser/service_worker/payment_handler_support.cc
@@ -4,7 +4,7 @@ #include "content/browser/service_worker/payment_handler_support.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/task/sequenced_task_runner.h" #include "content/browser/service_worker/service_worker_context_core.h" #include "content/browser/service_worker/service_worker_context_wrapper.h"
diff --git a/content/browser/service_worker/payment_handler_support.h b/content/browser/service_worker/payment_handler_support.h index 14cc87c..9666b5e 100644 --- a/content/browser/service_worker/payment_handler_support.h +++ b/content/browser/service_worker/payment_handler_support.h
@@ -5,7 +5,7 @@ #ifndef CONTENT_BROWSER_SERVICE_WORKER_PAYMENT_HANDLER_SUPPORT_H_ #define CONTENT_BROWSER_SERVICE_WORKER_PAYMENT_HANDLER_SUPPORT_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "third_party/blink/public/mojom/service_worker/service_worker.mojom.h" class GURL;
diff --git a/content/browser/service_worker/service_worker_accessed_callback.h b/content/browser/service_worker/service_worker_accessed_callback.h index b94db682..a4d7fb5 100644 --- a/content/browser/service_worker/service_worker_accessed_callback.h +++ b/content/browser/service_worker/service_worker_accessed_callback.h
@@ -5,7 +5,7 @@ #ifndef CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_ACCESSED_CALLBACK_H_ #define CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_ACCESSED_CALLBACK_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "content/public/browser/allow_service_worker_result.h" #include "url/gurl.h"
diff --git a/content/browser/service_worker/service_worker_auth_browsertest.cc b/content/browser/service_worker/service_worker_auth_browsertest.cc index af9155f..2509b579 100644 --- a/content/browser/service_worker/service_worker_auth_browsertest.cc +++ b/content/browser/service_worker/service_worker_auth_browsertest.cc
@@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/bind.h" -#include "base/callback.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "content/public/browser/client_certificate_delegate.h"
diff --git a/content/browser/service_worker/service_worker_browsertest.cc b/content/browser/service_worker/service_worker_browsertest.cc index 0d4b4167..e4f7716 100644 --- a/content/browser/service_worker/service_worker_browsertest.cc +++ b/content/browser/service_worker/service_worker_browsertest.cc
@@ -11,10 +11,10 @@ #include <tuple> #include <utility> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/guid.h" #include "base/json/json_reader.h" #include "base/memory/raw_ptr.h"
diff --git a/content/browser/service_worker/service_worker_cache_writer.cc b/content/browser/service_worker/service_worker_cache_writer.cc index b569001..c11c771 100644 --- a/content/browser/service_worker/service_worker_cache_writer.cc +++ b/content/browser/service_worker/service_worker_cache_writer.cc
@@ -7,7 +7,7 @@ #include <algorithm> #include <string> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h" #include "base/task/sequenced_task_runner.h"
diff --git a/content/browser/service_worker/service_worker_cache_writer.h b/content/browser/service_worker/service_worker_cache_writer.h index 275b26d..77cad40 100644 --- a/content/browser/service_worker/service_worker_cache_writer.h +++ b/content/browser/service_worker/service_worker_cache_writer.h
@@ -11,7 +11,7 @@ #include <memory> #include <set> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "components/services/storage/public/mojom/service_worker_storage_control.mojom.h"
diff --git a/content/browser/service_worker/service_worker_cache_writer_unittest.cc b/content/browser/service_worker/service_worker_cache_writer_unittest.cc index f7f62122..c355cafe 100644 --- a/content/browser/service_worker/service_worker_cache_writer_unittest.cc +++ b/content/browser/service_worker/service_worker_cache_writer_unittest.cc
@@ -10,9 +10,9 @@ #include <string> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/containers/queue.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ptr_util.h" #include "base/test/task_environment.h" #include "content/browser/service_worker/service_worker_test_utils.h"
diff --git a/content/browser/service_worker/service_worker_client_utils.cc b/content/browser/service_worker/service_worker_client_utils.cc index a9bf790..c3f6bdd 100644 --- a/content/browser/service_worker/service_worker_client_utils.cc +++ b/content/browser/service_worker/service_worker_client_utils.cc
@@ -9,8 +9,8 @@ #include <tuple> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/task/sequenced_task_runner.h" #include "base/task/single_thread_task_runner.h"
diff --git a/content/browser/service_worker/service_worker_client_utils.h b/content/browser/service_worker/service_worker_client_utils.h index 03d30f1..15782733 100644 --- a/content/browser/service_worker/service_worker_client_utils.h +++ b/content/browser/service_worker/service_worker_client_utils.h
@@ -5,7 +5,7 @@ #ifndef CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_CLIENT_UTILS_H_ #define CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_CLIENT_UTILS_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "third_party/blink/public/common/service_worker/service_worker_status_code.h" #include "third_party/blink/public/mojom/service_worker/service_worker.mojom.h"
diff --git a/content/browser/service_worker/service_worker_clients_api_browsertest.cc b/content/browser/service_worker/service_worker_clients_api_browsertest.cc index e95093b5..49850b4 100644 --- a/content/browser/service_worker/service_worker_clients_api_browsertest.cc +++ b/content/browser/service_worker/service_worker_clients_api_browsertest.cc
@@ -4,9 +4,9 @@ #include <string> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/memory/scoped_refptr.h" #include "base/strings/utf_string_conversions.h" #include "base/task/task_traits.h"
diff --git a/content/browser/service_worker/service_worker_container_host.cc b/content/browser/service_worker/service_worker_container_host.cc index e91027a3..1067ddc 100644 --- a/content/browser/service_worker/service_worker_container_host.cc +++ b/content/browser/service_worker/service_worker_container_host.cc
@@ -7,9 +7,9 @@ #include <set> #include <utility> -#include "base/callback_helpers.h" #include "base/containers/adapters.h" #include "base/containers/contains.h" +#include "base/functional/callback_helpers.h" #include "base/guid.h" #include "base/strings/stringprintf.h" #include "base/task/single_thread_task_runner.h"
diff --git a/content/browser/service_worker/service_worker_container_host_unittest.cc b/content/browser/service_worker/service_worker_container_host_unittest.cc index cae5852..a81eff5 100644 --- a/content/browser/service_worker/service_worker_container_host_unittest.cc +++ b/content/browser/service_worker/service_worker_container_host_unittest.cc
@@ -9,9 +9,9 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/run_loop.h"
diff --git a/content/browser/service_worker/service_worker_context_core.cc b/content/browser/service_worker/service_worker_context_core.cc index eac99ac..d2382ea47 100644 --- a/content/browser/service_worker/service_worker_context_core.cc +++ b/content/browser/service_worker/service_worker_context_core.cc
@@ -10,9 +10,9 @@ #include <utility> #include "base/barrier_closure.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/memory/ptr_util.h" #include "base/strings/string_util.h"
diff --git a/content/browser/service_worker/service_worker_context_core.h b/content/browser/service_worker/service_worker_context_core.h index 832a013..4c29567 100644 --- a/content/browser/service_worker/service_worker_context_core.h +++ b/content/browser/service_worker/service_worker_context_core.h
@@ -12,8 +12,8 @@ #include <string> #include <vector> -#include "base/callback.h" #include "base/containers/id_map.h" +#include "base/functional/callback.h" #include "base/gtest_prod_util.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h"
diff --git a/content/browser/service_worker/service_worker_context_core_observer.h b/content/browser/service_worker/service_worker_context_core_observer.h index a6b7a644..42eb7fe 100644 --- a/content/browser/service_worker/service_worker_context_core_observer.h +++ b/content/browser/service_worker/service_worker_context_core_observer.h
@@ -8,7 +8,7 @@ #include <stdint.h> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/time/time.h" #include "content/browser/service_worker/service_worker_info.h" #include "content/browser/service_worker/service_worker_version.h"
diff --git a/content/browser/service_worker/service_worker_context_core_unittest.cc b/content/browser/service_worker/service_worker_context_core_unittest.cc index 9d01b1ef..650df3f 100644 --- a/content/browser/service_worker/service_worker_context_core_unittest.cc +++ b/content/browser/service_worker/service_worker_context_core_unittest.cc
@@ -6,8 +6,8 @@ #include <memory> -#include "base/callback_helpers.h" #include "base/containers/contains.h" +#include "base/functional/callback_helpers.h" #include "base/test/bind.h" #include "content/browser/service_worker/embedded_worker_test_helper.h" #include "content/browser/service_worker/service_worker_context_core_observer.h"
diff --git a/content/browser/service_worker/service_worker_context_unittest.cc b/content/browser/service_worker/service_worker_context_unittest.cc index 32b8545..351c7f26 100644 --- a/content/browser/service_worker/service_worker_context_unittest.cc +++ b/content/browser/service_worker/service_worker_context_unittest.cc
@@ -8,9 +8,9 @@ #include <memory> -#include "base/bind.h" #include "base/containers/contains.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/scoped_observation.h" #include "base/time/time.h"
diff --git a/content/browser/service_worker/service_worker_context_watcher.cc b/content/browser/service_worker/service_worker_context_watcher.cc index 14bcb18..050b3d1d 100644 --- a/content/browser/service_worker/service_worker_context_watcher.cc +++ b/content/browser/service_worker/service_worker_context_watcher.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "content/browser/service_worker/embedded_worker_status.h" #include "content/browser/service_worker/service_worker_context_wrapper.h" #include "content/browser/service_worker/service_worker_version.h"
diff --git a/content/browser/service_worker/service_worker_context_watcher.h b/content/browser/service_worker/service_worker_context_watcher.h index 1d690fa..b936d6c 100644 --- a/content/browser/service_worker/service_worker_context_watcher.h +++ b/content/browser/service_worker/service_worker_context_watcher.h
@@ -12,7 +12,7 @@ #include <unordered_map> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "content/browser/service_worker/service_worker_context_core_observer.h" #include "content/browser/service_worker/service_worker_info.h" #include "content/common/content_export.h"
diff --git a/content/browser/service_worker/service_worker_context_watcher_unittest.cc b/content/browser/service_worker/service_worker_context_watcher_unittest.cc index 4891b2e..1902a82 100644 --- a/content/browser/service_worker/service_worker_context_watcher_unittest.cc +++ b/content/browser/service_worker/service_worker_context_watcher_unittest.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/weak_ptr.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h"
diff --git a/content/browser/service_worker/service_worker_context_wrapper.cc b/content/browser/service_worker/service_worker_context_wrapper.cc index bd15ed3..a06519a 100644 --- a/content/browser/service_worker/service_worker_context_wrapper.cc +++ b/content/browser/service_worker/service_worker_context_wrapper.cc
@@ -12,10 +12,10 @@ #include <vector> #include "base/barrier_closure.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/feature_list.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/lazy_instance.h" #include "base/location.h" #include "base/logging.h"
diff --git a/content/browser/service_worker/service_worker_controllee_request_handler.cc b/content/browser/service_worker/service_worker_controllee_request_handler.cc index 6db1e3d..7f96713 100644 --- a/content/browser/service_worker/service_worker_controllee_request_handler.cc +++ b/content/browser/service_worker/service_worker_controllee_request_handler.cc
@@ -7,8 +7,8 @@ #include <set> #include <utility> -#include "base/bind.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_functions.h" #include "base/no_destructor.h" #include "base/strings/string_split.h"
diff --git a/content/browser/service_worker/service_worker_controllee_request_handler_unittest.cc b/content/browser/service_worker/service_worker_controllee_request_handler_unittest.cc index 5ff24a26..4910153 100644 --- a/content/browser/service_worker/service_worker_controllee_request_handler_unittest.cc +++ b/content/browser/service_worker/service_worker_controllee_request_handler_unittest.cc
@@ -8,8 +8,8 @@ #include <utility> #include <vector> -#include "base/callback_helpers.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h"
diff --git a/content/browser/service_worker/service_worker_fetch_dispatcher.cc b/content/browser/service_worker/service_worker_fetch_dispatcher.cc index 9c3757821..71aff38 100644 --- a/content/browser/service_worker/service_worker_fetch_dispatcher.cc +++ b/content/browser/service_worker/service_worker_fetch_dispatcher.cc
@@ -8,10 +8,10 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/containers/queue.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/strings/stringprintf.h" #include "base/task/sequenced_task_runner.h"
diff --git a/content/browser/service_worker/service_worker_fetch_dispatcher.h b/content/browser/service_worker/service_worker_fetch_dispatcher.h index 5ba22e7..3bfe2d8d 100644 --- a/content/browser/service_worker/service_worker_fetch_dispatcher.h +++ b/content/browser/service_worker/service_worker_fetch_dispatcher.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h" #include "base/sequence_checker.h"
diff --git a/content/browser/service_worker/service_worker_fetch_dispatcher_browsertest.cc b/content/browser/service_worker/service_worker_fetch_dispatcher_browsertest.cc index 0063d4d7..7957084 100644 --- a/content/browser/service_worker/service_worker_fetch_dispatcher_browsertest.cc +++ b/content/browser/service_worker/service_worker_fetch_dispatcher_browsertest.cc
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ref_counted.h" #include "base/run_loop.h" #include "base/scoped_observation.h"
diff --git a/content/browser/service_worker/service_worker_file_upload_browsertest.cc b/content/browser/service_worker/service_worker_file_upload_browsertest.cc index 7c45177..183cabe 100644 --- a/content/browser/service_worker/service_worker_file_upload_browsertest.cc +++ b/content/browser/service_worker/service_worker_file_upload_browsertest.cc
@@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/bind.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" #include "base/numerics/safe_conversions.h" #include "base/strings/escape.h" #include "base/strings/string_number_conversions.h"
diff --git a/content/browser/service_worker/service_worker_host.cc b/content/browser/service_worker/service_worker_host.cc index 1d23da05..1ecb0e5 100644 --- a/content/browser/service_worker/service_worker_host.cc +++ b/content/browser/service_worker/service_worker_host.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "content/browser/broadcast_channel/broadcast_channel_provider.h" #include "content/browser/broadcast_channel/broadcast_channel_service.h"
diff --git a/content/browser/service_worker/service_worker_info.h b/content/browser/service_worker/service_worker_info.h index 6bde033..ab57650 100644 --- a/content/browser/service_worker/service_worker_info.h +++ b/content/browser/service_worker/service_worker_info.h
@@ -10,7 +10,7 @@ #include <map> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/time/time.h" #include "content/browser/service_worker/service_worker_version.h" #include "content/common/content_export.h"
diff --git a/content/browser/service_worker/service_worker_installed_script_reader.cc b/content/browser/service_worker/service_worker_installed_script_reader.cc index d004becb..deb0217 100644 --- a/content/browser/service_worker/service_worker_installed_script_reader.cc +++ b/content/browser/service_worker/service_worker_installed_script_reader.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ref_counted.h" #include "base/task/sequenced_task_runner.h" #include "base/trace_event/trace_event.h"
diff --git a/content/browser/service_worker/service_worker_installed_scripts_sender_unittest.cc b/content/browser/service_worker/service_worker_installed_scripts_sender_unittest.cc index a27df473..28d4b168d 100644 --- a/content/browser/service_worker/service_worker_installed_scripts_sender_unittest.cc +++ b/content/browser/service_worker/service_worker_installed_scripts_sender_unittest.cc
@@ -4,9 +4,9 @@ #include "content/browser/service_worker/service_worker_installed_scripts_sender.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "base/test/metrics/histogram_tester.h" #include "content/browser/service_worker/embedded_worker_test_helper.h"
diff --git a/content/browser/service_worker/service_worker_internals_ui.cc b/content/browser/service_worker/service_worker_internals_ui.cc index 907b150..b00282c7 100644 --- a/content/browser/service_worker/service_worker_internals_ui.cc +++ b/content/browser/service_worker/service_worker_internals_ui.cc
@@ -11,8 +11,8 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/metrics/histogram_functions.h" #include "base/strings/string_number_conversions.h" #include "base/values.h"
diff --git a/content/browser/service_worker/service_worker_internals_ui.h b/content/browser/service_worker/service_worker_internals_ui.h index 25a0327..ea40b19 100644 --- a/content/browser/service_worker/service_worker_internals_ui.h +++ b/content/browser/service_worker/service_worker_internals_ui.h
@@ -9,8 +9,8 @@ #include <set> #include <unordered_map> -#include "base/callback_forward.h" #include "base/files/file_path.h" +#include "base/functional/callback_forward.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "base/values.h"
diff --git a/content/browser/service_worker/service_worker_internals_ui_browsertest.cc b/content/browser/service_worker/service_worker_internals_ui_browsertest.cc index 6ea4ef2..34a43c4 100644 --- a/content/browser/service_worker/service_worker_internals_ui_browsertest.cc +++ b/content/browser/service_worker/service_worker_internals_ui_browsertest.cc
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/metrics/statistics_recorder.h" #include "base/run_loop.h"
diff --git a/content/browser/service_worker/service_worker_job_unittest.cc b/content/browser/service_worker/service_worker_job_unittest.cc index 2439ff74..7ee692a 100644 --- a/content/browser/service_worker/service_worker_job_unittest.cc +++ b/content/browser/service_worker/service_worker_job_unittest.cc
@@ -8,10 +8,10 @@ #include <tuple> #include "base/barrier_closure.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/check.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/test/bind.h"
diff --git a/content/browser/service_worker/service_worker_main_resource_handle.cc b/content/browser/service_worker/service_worker_main_resource_handle.cc index b4d07c37..4df92f0 100644 --- a/content/browser/service_worker/service_worker_main_resource_handle.cc +++ b/content/browser/service_worker/service_worker_main_resource_handle.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "content/browser/renderer_host/policy_container_host.h" #include "content/browser/service_worker/service_worker_container_host.h" #include "content/browser/service_worker/service_worker_context_wrapper.h"
diff --git a/content/browser/service_worker/service_worker_main_resource_loader.cc b/content/browser/service_worker/service_worker_main_resource_loader.cc index 6f446ae..ad3f15e 100644 --- a/content/browser/service_worker/service_worker_main_resource_loader.cc +++ b/content/browser/service_worker/service_worker_main_resource_loader.cc
@@ -8,8 +8,8 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/metrics/histogram_functions.h" #include "base/metrics/histogram_macros.h"
diff --git a/content/browser/service_worker/service_worker_main_resource_loader_interceptor.cc b/content/browser/service_worker/service_worker_main_resource_loader_interceptor.cc index 2ae68c4..58dce62 100644 --- a/content/browser/service_worker/service_worker_main_resource_loader_interceptor.cc +++ b/content/browser/service_worker/service_worker_main_resource_loader_interceptor.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/types/optional_util.h" #include "build/chromeos_buildflags.h"
diff --git a/content/browser/service_worker/service_worker_main_resource_loader_unittest.cc b/content/browser/service_worker/service_worker_main_resource_loader_unittest.cc index 4e86b9b8..b8d46c0 100644 --- a/content/browser/service_worker/service_worker_main_resource_loader_unittest.cc +++ b/content/browser/service_worker/service_worker_main_resource_loader_unittest.cc
@@ -7,8 +7,8 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/strings/string_number_conversions.h"
diff --git a/content/browser/service_worker/service_worker_metrics.cc b/content/browser/service_worker/service_worker_metrics.cc index 8793d29c..dc0ccdb 100644 --- a/content/browser/service_worker/service_worker_metrics.cc +++ b/content/browser/service_worker/service_worker_metrics.cc
@@ -7,7 +7,7 @@ #include <limits> #include <string> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_functions.h" #include "base/metrics/histogram_macros.h" #include "base/strings/strcat.h"
diff --git a/content/browser/service_worker/service_worker_new_script_fetcher.h b/content/browser/service_worker/service_worker_new_script_fetcher.h index 3e497ff46..e3cefdf9 100644 --- a/content/browser/service_worker/service_worker_new_script_fetcher.h +++ b/content/browser/service_worker/service_worker_new_script_fetcher.h
@@ -5,7 +5,7 @@ #ifndef CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_NEW_SCRIPT_FETCHER_H_ #define CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_NEW_SCRIPT_FETCHER_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ref.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h"
diff --git a/content/browser/service_worker/service_worker_new_script_loader.cc b/content/browser/service_worker/service_worker_new_script_loader.cc index f97e1f0..d864ca6 100644 --- a/content/browser/service_worker/service_worker_new_script_loader.cc +++ b/content/browser/service_worker/service_worker_new_script_loader.cc
@@ -7,8 +7,8 @@ #include <memory> #include <vector> -#include "base/bind.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/numerics/safe_conversions.h" #include "base/task/sequenced_task_runner.h"
diff --git a/content/browser/service_worker/service_worker_new_script_loader_unittest.cc b/content/browser/service_worker/service_worker_new_script_loader_unittest.cc index 97c8ad1..89b59e2 100644 --- a/content/browser/service_worker/service_worker_new_script_loader_unittest.cc +++ b/content/browser/service_worker/service_worker_new_script_loader_unittest.cc
@@ -9,7 +9,7 @@ #include <string> #include <utility> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/strings/string_util.h"
diff --git a/content/browser/service_worker/service_worker_object_host.cc b/content/browser/service_worker/service_worker_object_host.cc index dbaf875..7c5099a 100644 --- a/content/browser/service_worker/service_worker_object_host.cc +++ b/content/browser/service_worker/service_worker_object_host.cc
@@ -4,8 +4,8 @@ #include "content/browser/service_worker/service_worker_object_host.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/task/single_thread_task_runner.h" #include "content/browser/service_worker/service_worker_client_utils.h" #include "content/browser/service_worker/service_worker_container_host.h"
diff --git a/content/browser/service_worker/service_worker_object_host_unittest.cc b/content/browser/service_worker/service_worker_object_host_unittest.cc index 6c77654..101f860 100644 --- a/content/browser/service_worker/service_worker_object_host_unittest.cc +++ b/content/browser/service_worker/service_worker_object_host_unittest.cc
@@ -5,8 +5,8 @@ #include <tuple> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "base/test/bind.h" #include "base/test/simple_test_tick_clock.h"
diff --git a/content/browser/service_worker/service_worker_offline_capability_check_browsertest.cc b/content/browser/service_worker/service_worker_offline_capability_check_browsertest.cc index 00ec46e..75117ef 100644 --- a/content/browser/service_worker/service_worker_offline_capability_check_browsertest.cc +++ b/content/browser/service_worker/service_worker_offline_capability_check_browsertest.cc
@@ -3,8 +3,8 @@ // found in the LICENSE file. #include "base/barrier_closure.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/guid.h" #include "base/memory/scoped_refptr.h" #include "base/task/task_traits.h"
diff --git a/content/browser/service_worker/service_worker_offline_capability_checker.cc b/content/browser/service_worker/service_worker_offline_capability_checker.cc index 5e406172..6a22db0 100644 --- a/content/browser/service_worker/service_worker_offline_capability_checker.cc +++ b/content/browser/service_worker/service_worker_offline_capability_checker.cc
@@ -4,8 +4,8 @@ #include "content/browser/service_worker/service_worker_offline_capability_checker.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/guid.h" #include "content/browser/service_worker/service_worker_context_core.h" #include "content/browser/service_worker/service_worker_context_wrapper.h"
diff --git a/content/browser/service_worker/service_worker_process_manager.h b/content/browser/service_worker/service_worker_process_manager.h index 527d3a08..bdcfc023 100644 --- a/content/browser/service_worker/service_worker_process_manager.h +++ b/content/browser/service_worker/service_worker_process_manager.h
@@ -9,7 +9,7 @@ #include <memory> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/gtest_prod_util.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h"
diff --git a/content/browser/service_worker/service_worker_quota_client.cc b/content/browser/service_worker/service_worker_quota_client.cc index dce961e..8ee27c0 100644 --- a/content/browser/service_worker/service_worker_quota_client.cc +++ b/content/browser/service_worker/service_worker_quota_client.cc
@@ -8,7 +8,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/sequence_checker.h" #include "components/services/storage/public/cpp/buckets/bucket_locator.h" #include "content/browser/service_worker/service_worker_context_wrapper.h"
diff --git a/content/browser/service_worker/service_worker_quota_client.h b/content/browser/service_worker/service_worker_quota_client.h index c65804b..b694e78 100644 --- a/content/browser/service_worker/service_worker_quota_client.h +++ b/content/browser/service_worker/service_worker_quota_client.h
@@ -5,7 +5,7 @@ #ifndef CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_QUOTA_CLIENT_H_ #define CONTENT_BROWSER_SERVICE_WORKER_SERVICE_WORKER_QUOTA_CLIENT_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/sequence_checker.h" #include "base/thread_annotations.h"
diff --git a/content/browser/service_worker/service_worker_register_job.cc b/content/browser/service_worker/service_worker_register_job.cc index 25b77e7..a23310d6 100644 --- a/content/browser/service_worker/service_worker_register_job.cc +++ b/content/browser/service_worker/service_worker_register_job.cc
@@ -8,8 +8,8 @@ #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/memory/scoped_refptr.h" #include "base/strings/stringprintf.h"
diff --git a/content/browser/service_worker/service_worker_registration.cc b/content/browser/service_worker/service_worker_registration.cc index ed0b31fb..15812f9 100644 --- a/content/browser/service_worker/service_worker_registration.cc +++ b/content/browser/service_worker/service_worker_registration.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/observer_list.h" #include "base/task/single_thread_task_runner.h" #include "content/browser/service_worker/embedded_worker_status.h"
diff --git a/content/browser/service_worker/service_worker_registration_object_host.cc b/content/browser/service_worker/service_worker_registration_object_host.cc index 3dc78dd..1ba792f 100644 --- a/content/browser/service_worker/service_worker_registration_object_host.cc +++ b/content/browser/service_worker/service_worker_registration_object_host.cc
@@ -4,8 +4,8 @@ #include "content/browser/service_worker/service_worker_registration_object_host.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/strings/stringprintf.h" #include "base/time/time.h" #include "content/browser/service_worker/service_worker_consts.h"
diff --git a/content/browser/service_worker/service_worker_registration_unittest.cc b/content/browser/service_worker/service_worker_registration_unittest.cc index dc2e2f3..14de4d54 100644 --- a/content/browser/service_worker/service_worker_registration_unittest.cc +++ b/content/browser/service_worker/service_worker_registration_unittest.cc
@@ -7,11 +7,11 @@ #include <stdint.h> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/check.h" #include "base/compiler_specific.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/notreached.h"
diff --git a/content/browser/service_worker/service_worker_registry_unittest.cc b/content/browser/service_worker/service_worker_registry_unittest.cc index f6cec22..05bcbf0 100644 --- a/content/browser/service_worker/service_worker_registry_unittest.cc +++ b/content/browser/service_worker/service_worker_registry_unittest.cc
@@ -4,7 +4,7 @@ #include "content/browser/service_worker/service_worker_registry.h" -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "content/browser/service_worker/embedded_worker_test_helper.h"
diff --git a/content/browser/service_worker/service_worker_script_cache_map.cc b/content/browser/service_worker/service_worker_script_cache_map.cc index b14f94a..bdad498e 100644 --- a/content/browser/service_worker/service_worker_script_cache_map.cc +++ b/content/browser/service_worker/service_worker_script_cache_map.cc
@@ -6,9 +6,9 @@ #include <utility> -#include "base/bind.h" #include "base/check_op.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "content/browser/service_worker/service_worker_consts.h" #include "content/browser/service_worker/service_worker_context_core.h" #include "content/browser/service_worker/service_worker_version.h"
diff --git a/content/browser/service_worker/service_worker_script_loader_factory.cc b/content/browser/service_worker/service_worker_script_loader_factory.cc index 1828be2..b2df707 100644 --- a/content/browser/service_worker/service_worker_script_loader_factory.cc +++ b/content/browser/service_worker/service_worker_script_loader_factory.cc
@@ -8,7 +8,7 @@ #include <string> #include <utility> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/strings/string_number_conversions.h" #include "content/browser/service_worker/service_worker_cache_writer.h" #include "content/browser/service_worker/service_worker_consts.h"
diff --git a/content/browser/service_worker/service_worker_script_loader_factory_unittest.cc b/content/browser/service_worker/service_worker_script_loader_factory_unittest.cc index 0e5e0b1..a79db071 100644 --- a/content/browser/service_worker/service_worker_script_loader_factory_unittest.cc +++ b/content/browser/service_worker/service_worker_script_loader_factory_unittest.cc
@@ -4,7 +4,7 @@ #include "content/browser/service_worker/service_worker_script_loader_factory.h" -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "content/browser/service_worker/embedded_worker_test_helper.h" #include "content/browser/service_worker/service_worker_context_core.h"
diff --git a/content/browser/service_worker/service_worker_single_script_update_checker.cc b/content/browser/service_worker/service_worker_single_script_update_checker.cc index 12b6c1e..f5fc7fe7 100644 --- a/content/browser/service_worker/service_worker_single_script_update_checker.cc +++ b/content/browser/service_worker/service_worker_single_script_update_checker.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/task/sequenced_task_runner.h" #include "base/task/single_thread_task_runner.h" #include "base/trace_event/trace_event.h"
diff --git a/content/browser/service_worker/service_worker_single_script_update_checker_unittest.cc b/content/browser/service_worker/service_worker_single_script_update_checker_unittest.cc index 89bd2c2..3607da5 100644 --- a/content/browser/service_worker/service_worker_single_script_update_checker_unittest.cc +++ b/content/browser/service_worker/service_worker_single_script_update_checker_unittest.cc
@@ -5,8 +5,8 @@ #include "content/browser/service_worker/service_worker_single_script_update_checker.h" #include <vector> -#include "base/bind.h" #include "base/containers/queue.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/test/bind.h" #include "content/browser/service_worker/service_worker_context_wrapper.h"
diff --git a/content/browser/service_worker/service_worker_test_utils.h b/content/browser/service_worker/service_worker_test_utils.h index a9bd68a2..5a4ff23 100644 --- a/content/browser/service_worker/service_worker_test_utils.h +++ b/content/browser/service_worker/service_worker_test_utils.h
@@ -7,10 +7,10 @@ #include <memory> -#include "base/bind.h" -#include "base/callback.h" #include "base/command_line.h" #include "base/containers/queue.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "base/run_loop.h" #include "components/services/storage/public/mojom/service_worker_storage_control.mojom.h"
diff --git a/content/browser/service_worker/service_worker_unregister_job.cc b/content/browser/service_worker/service_worker_unregister_job.cc index a67e641..7dac757c 100644 --- a/content/browser/service_worker/service_worker_unregister_job.cc +++ b/content/browser/service_worker/service_worker_unregister_job.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/weak_ptr.h" #include "content/browser/service_worker/service_worker_context_core.h" #include "content/browser/service_worker/service_worker_job_coordinator.h"
diff --git a/content/browser/service_worker/service_worker_unregister_job.h b/content/browser/service_worker/service_worker_unregister_job.h index 8c6219e..8a977d2 100644 --- a/content/browser/service_worker/service_worker_unregister_job.h +++ b/content/browser/service_worker/service_worker_unregister_job.h
@@ -9,7 +9,7 @@ #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "content/browser/service_worker/service_worker_register_job_base.h"
diff --git a/content/browser/service_worker/service_worker_update_checker.cc b/content/browser/service_worker/service_worker_update_checker.cc index 21007cf5..b6eb5e70 100644 --- a/content/browser/service_worker/service_worker_update_checker.cc +++ b/content/browser/service_worker/service_worker_update_checker.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/trace_event/trace_event.h" #include "content/browser/loader/browser_initiated_resource_request.h" #include "content/browser/service_worker/service_worker_consts.h"
diff --git a/content/browser/service_worker/service_worker_update_checker.h b/content/browser/service_worker/service_worker_update_checker.h index 7fe24ac..8bc85ae 100644 --- a/content/browser/service_worker/service_worker_update_checker.h +++ b/content/browser/service_worker/service_worker_update_checker.h
@@ -9,7 +9,7 @@ #include <memory> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/time/time.h" #include "content/browser/renderer_host/policy_container_host.h"
diff --git a/content/browser/service_worker/service_worker_updated_script_loader.cc b/content/browser/service_worker/service_worker_updated_script_loader.cc index c9ed6e79..3fecf4fb3 100644 --- a/content/browser/service_worker/service_worker_updated_script_loader.cc +++ b/content/browser/service_worker/service_worker_updated_script_loader.cc
@@ -7,7 +7,7 @@ #include <memory> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/numerics/safe_conversions.h" #include "base/task/sequenced_task_runner.h"
diff --git a/content/browser/service_worker/service_worker_updated_script_loader_unittest.cc b/content/browser/service_worker/service_worker_updated_script_loader_unittest.cc index edbc4e2b..e9d16aa 100644 --- a/content/browser/service_worker/service_worker_updated_script_loader_unittest.cc +++ b/content/browser/service_worker/service_worker_updated_script_loader_unittest.cc
@@ -9,7 +9,7 @@ #include <string> #include <utility> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "base/strings/string_util.h" #include "base/test/metrics/histogram_tester.h"
diff --git a/content/browser/service_worker/service_worker_version.cc b/content/browser/service_worker/service_worker_version.cc index f5e9690..0c15a43 100644 --- a/content/browser/service_worker/service_worker_version.cc +++ b/content/browser/service_worker/service_worker_version.cc
@@ -10,12 +10,12 @@ #include <map> #include <string> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/check.h" #include "base/command_line.h" #include "base/containers/contains.h" #include "base/debug/dump_without_crashing.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/guid.h" #include "base/location.h" #include "base/memory/ref_counted.h"
diff --git a/content/browser/service_worker/service_worker_version.h b/content/browser/service_worker/service_worker_version.h index d7c46d9..9e19510c 100644 --- a/content/browser/service_worker/service_worker_version.h +++ b/content/browser/service_worker/service_worker_version.h
@@ -15,9 +15,9 @@ #include <utility> #include <vector> -#include "base/callback.h" #include "base/cancelable_callback.h" #include "base/containers/id_map.h" +#include "base/functional/callback.h" #include "base/gtest_prod_util.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h"
diff --git a/content/browser/service_worker/service_worker_version_browsertest.cc b/content/browser/service_worker/service_worker_version_browsertest.cc index 8ab1f54b..3915523 100644 --- a/content/browser/service_worker/service_worker_version_browsertest.cc +++ b/content/browser/service_worker/service_worker_version_browsertest.cc
@@ -12,9 +12,9 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h" #include "base/metrics/statistics_recorder.h"
diff --git a/content/browser/service_worker/service_worker_version_unittest.cc b/content/browser/service_worker/service_worker_version_unittest.cc index d0eed6b..3b5bfec9 100644 --- a/content/browser/service_worker/service_worker_version_unittest.cc +++ b/content/browser/service_worker/service_worker_version_unittest.cc
@@ -9,10 +9,10 @@ #include <tuple> #include <utility> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/containers/span.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/guid.h" #include "base/memory/ptr_util.h" #include "base/run_loop.h"
diff --git a/content/browser/session_history_browsertest.cc b/content/browser/session_history_browsertest.cc index 86f3f75..a5613e27 100644 --- a/content/browser/session_history_browsertest.cc +++ b/content/browser/session_history_browsertest.cc
@@ -4,7 +4,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h"
diff --git a/content/browser/shared_storage/shared_storage_url_loader_factory_proxy.cc b/content/browser/shared_storage/shared_storage_url_loader_factory_proxy.cc index 6a2904f..b990079 100644 --- a/content/browser/shared_storage/shared_storage_url_loader_factory_proxy.cc +++ b/content/browser/shared_storage/shared_storage_url_loader_factory_proxy.cc
@@ -8,7 +8,7 @@ #include <utility> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/logging.h" #include "base/memory/ref_counted.h" #include "base/strings/escape.h"
diff --git a/content/browser/shared_storage/shared_storage_url_loader_factory_proxy.h b/content/browser/shared_storage/shared_storage_url_loader_factory_proxy.h index 3501403d..06f117c 100644 --- a/content/browser/shared_storage/shared_storage_url_loader_factory_proxy.h +++ b/content/browser/shared_storage/shared_storage_url_loader_factory_proxy.h
@@ -7,7 +7,7 @@ #include <stdint.h> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/strings/string_piece_forward.h" #include "content/common/content_export.h" #include "mojo/public/cpp/bindings/pending_receiver.h"
diff --git a/content/browser/shared_storage/shared_storage_url_loader_factory_proxy_unittest.cc b/content/browser/shared_storage/shared_storage_url_loader_factory_proxy_unittest.cc index 35dbae9..4fb9011 100644 --- a/content/browser/shared_storage/shared_storage_url_loader_factory_proxy_unittest.cc +++ b/content/browser/shared_storage/shared_storage_url_loader_factory_proxy_unittest.cc
@@ -8,8 +8,8 @@ #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ref_counted.h" #include "base/run_loop.h" #include "base/test/bind.h"
diff --git a/content/browser/site_per_process_browsertest.cc b/content/browser/site_per_process_browsertest.cc index 2b07ce1..f8f936b 100644 --- a/content/browser/site_per_process_browsertest.cc +++ b/content/browser/site_per_process_browsertest.cc
@@ -18,13 +18,13 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/containers/contains.h" #include "base/cxx17_backports.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/json/json_reader.h" #include "base/location.h" #include "base/memory/ptr_util.h"
diff --git a/content/browser/site_per_process_hit_test_browsertest.cc b/content/browser/site_per_process_hit_test_browsertest.cc index 34d3409..bca5fbf 100644 --- a/content/browser/site_per_process_hit_test_browsertest.cc +++ b/content/browser/site_per_process_hit_test_browsertest.cc
@@ -5,10 +5,10 @@ #include <memory> #include <tuple> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/json/json_reader.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h"
diff --git a/content/browser/site_per_process_mac_browsertest.mm b/content/browser/site_per_process_mac_browsertest.mm index efc3dae..d813759 100644 --- a/content/browser/site_per_process_mac_browsertest.mm +++ b/content/browser/site_per_process_mac_browsertest.mm
@@ -6,7 +6,7 @@ #include <Cocoa/Cocoa.h> -#include "base/bind.h" +#include "base/functional/bind.h" #import "content/app_shim_remote_cocoa/render_widget_host_view_cocoa.h" #include "content/browser/renderer_host/render_widget_host_input_event_router.h" #include "content/browser/renderer_host/render_widget_host_view_mac.h"
diff --git a/content/browser/site_per_process_unload_browsertest.cc b/content/browser/site_per_process_unload_browsertest.cc index a10abae6..38da6d3 100644 --- a/content/browser/site_per_process_unload_browsertest.cc +++ b/content/browser/site_per_process_unload_browsertest.cc
@@ -10,7 +10,7 @@ #include <utility> #include <vector> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/json/json_reader.h" #include "base/location.h" #include "base/memory/ptr_util.h"
diff --git a/content/browser/sms/sms_fetcher_impl.cc b/content/browser/sms/sms_fetcher_impl.cc index e675040..c76d453d 100644 --- a/content/browser/sms/sms_fetcher_impl.cc +++ b/content/browser/sms/sms_fetcher_impl.cc
@@ -4,7 +4,7 @@ #include "content/browser/sms/sms_fetcher_impl.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "content/browser/browser_main_loop.h" #include "content/browser/sms/sms_parser.h" #include "content/public/browser/browser_context.h"
diff --git a/content/browser/sms/sms_fetcher_impl.h b/content/browser/sms/sms_fetcher_impl.h index a1ce04ae..0634b8f 100644 --- a/content/browser/sms/sms_fetcher_impl.h +++ b/content/browser/sms/sms_fetcher_impl.h
@@ -8,8 +8,8 @@ #include <memory> #include <string> -#include "base/callback_forward.h" #include "base/containers/flat_map.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/sequence_checker.h" #include "base/supports_user_data.h"
diff --git a/content/browser/sms/sms_provider_gms.cc b/content/browser/sms/sms_provider_gms.cc index 35545c3a7..656d4e3 100644 --- a/content/browser/sms/sms_provider_gms.cc +++ b/content/browser/sms/sms_provider_gms.cc
@@ -7,8 +7,8 @@ #include <string> #include "base/android/scoped_java_ref.h" -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "content/public/common/content_features.h" #include "content/public/common/content_switches.h"
diff --git a/content/browser/sms/sms_queue.cc b/content/browser/sms/sms_queue.cc index 051834c6..6ca10ca 100644 --- a/content/browser/sms/sms_queue.cc +++ b/content/browser/sms/sms_queue.cc
@@ -4,7 +4,7 @@ #include "content/browser/sms/sms_queue.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/metrics/histogram_macros.h" #include "base/observer_list.h" #include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/content/browser/sms/user_consent_handler.cc b/content/browser/sms/user_consent_handler.cc index 2375c6c..b5d618bb 100644 --- a/content/browser/sms/user_consent_handler.cc +++ b/content/browser/sms/user_consent_handler.cc
@@ -3,7 +3,7 @@ // found in the LICENSE file. #include "content/browser/sms/user_consent_handler.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "content/browser/sms/webotp_service.h" #include "content/public/browser/render_frame_host.h" #include "content/public/browser/web_contents.h"
diff --git a/content/browser/sms/user_consent_handler.h b/content/browser/sms/user_consent_handler.h index 6551852..874f8c8 100644 --- a/content/browser/sms/user_consent_handler.h +++ b/content/browser/sms/user_consent_handler.h
@@ -5,7 +5,7 @@ #ifndef CONTENT_BROWSER_SMS_USER_CONSENT_HANDLER_H_ #define CONTENT_BROWSER_SMS_USER_CONSENT_HANDLER_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ref.h" #include "content/common/content_export.h" #include "third_party/blink/public/mojom/sms/webotp_service.mojom-shared.h"
diff --git a/content/browser/sms/user_consent_handler_unittest.cc b/content/browser/sms/user_consent_handler_unittest.cc index 0a164c1..b01adcf 100644 --- a/content/browser/sms/user_consent_handler_unittest.cc +++ b/content/browser/sms/user_consent_handler_unittest.cc
@@ -4,7 +4,7 @@ #include "content/browser/sms/user_consent_handler.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/test/bind.h" #include "base/test/scoped_feature_list.h" #include "content/browser/sms/test/mock_sms_web_contents_delegate.h"
diff --git a/content/browser/sms/webotp_service.cc b/content/browser/sms/webotp_service.cc index 67d0ef0a..2f6c1385 100644 --- a/content/browser/sms/webotp_service.cc +++ b/content/browser/sms/webotp_service.cc
@@ -10,10 +10,10 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/check_op.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/metrics/histogram_functions.h" #include "content/browser/renderer_host/render_frame_host_impl.h" #include "content/browser/sms/sms_metrics.h"
diff --git a/content/browser/sms/webotp_service.h b/content/browser/sms/webotp_service.h index f3870e3..061cc39 100644 --- a/content/browser/sms/webotp_service.h +++ b/content/browser/sms/webotp_service.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/sequence_checker.h" #include "base/time/time.h"
diff --git a/content/browser/sms/webotp_service_unittest.cc b/content/browser/sms/webotp_service_unittest.cc index 95459414..25c29602 100644 --- a/content/browser/sms/webotp_service_unittest.cc +++ b/content/browser/sms/webotp_service_unittest.cc
@@ -8,9 +8,9 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h"
diff --git a/content/browser/snapshot_browsertest.cc b/content/browser/snapshot_browsertest.cc index a9f0aa8..458c0afd 100644 --- a/content/browser/snapshot_browsertest.cc +++ b/content/browser/snapshot_browsertest.cc
@@ -8,9 +8,9 @@ #include <map> #include <vector> -#include "base/bind.h" #include "base/command_line.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/rand_util.h" #include "base/run_loop.h"
diff --git a/content/browser/speech/speech_recognition_browsertest.cc b/content/browser/speech/speech_recognition_browsertest.cc index deaad061..8e27089d 100644 --- a/content/browser/speech/speech_recognition_browsertest.cc +++ b/content/browser/speech/speech_recognition_browsertest.cc
@@ -9,7 +9,7 @@ #include <list> #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/memory/raw_ptr.h" #include "base/numerics/safe_conversions.h"
diff --git a/content/browser/speech/speech_recognition_dispatcher_host.cc b/content/browser/speech/speech_recognition_dispatcher_host.cc index bf5d858..b24af93 100644 --- a/content/browser/speech/speech_recognition_dispatcher_host.cc +++ b/content/browser/speech/speech_recognition_dispatcher_host.cc
@@ -6,8 +6,8 @@ #include <memory> -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/lazy_instance.h" #include "content/browser/renderer_host/frame_tree_node.h" #include "content/browser/renderer_host/render_frame_host_manager.h"
diff --git a/content/browser/speech/speech_recognition_engine.cc b/content/browser/speech/speech_recognition_engine.cc index 4ebded0..c90005ab 100644 --- a/content/browser/speech/speech_recognition_engine.cc +++ b/content/browser/speech/speech_recognition_engine.cc
@@ -9,7 +9,7 @@ #include <vector> #include "base/big_endian.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_functions.h" #include "base/rand_util.h" #include "base/strings/escape.h"
diff --git a/content/browser/speech/speech_recognition_manager_impl.cc b/content/browser/speech/speech_recognition_manager_impl.cc index 6f16be6fa..a310158 100644 --- a/content/browser/speech/speech_recognition_manager_impl.cc +++ b/content/browser/speech/speech_recognition_manager_impl.cc
@@ -9,8 +9,8 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/location.h" #include "base/memory/ref_counted_delete_on_sequence.h" #include "base/task/sequenced_task_runner.h"
diff --git a/content/browser/speech/speech_recognizer_impl.cc b/content/browser/speech/speech_recognizer_impl.cc index f3b4a9c..a4a85fa 100644 --- a/content/browser/speech/speech_recognizer_impl.cc +++ b/content/browser/speech/speech_recognizer_impl.cc
@@ -9,8 +9,8 @@ #include <algorithm> #include <memory> -#include "base/bind.h" #include "base/cxx17_backports.h" +#include "base/functional/bind.h" #include "base/time/time.h" #include "build/build_config.h" #include "components/speech/audio_buffer.h"
diff --git a/content/browser/speech/speech_recognizer_impl_android.cc b/content/browser/speech/speech_recognizer_impl_android.cc index cfff9f38..52c1cb0 100644 --- a/content/browser/speech/speech_recognizer_impl_android.cc +++ b/content/browser/speech/speech_recognizer_impl_android.cc
@@ -10,7 +10,7 @@ #include "base/android/jni_array.h" #include "base/android/jni_string.h" #include "base/android/scoped_java_ref.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/utf_string_conversions.h" #include "content/public/android/content_jni_headers/SpeechRecognitionImpl_jni.h" #include "content/public/browser/browser_task_traits.h"
diff --git a/content/browser/speech/speech_recognizer_impl_unittest.cc b/content/browser/speech/speech_recognizer_impl_unittest.cc index fa8c179..72ff260ff 100644 --- a/content/browser/speech/speech_recognizer_impl_unittest.cc +++ b/content/browser/speech/speech_recognizer_impl_unittest.cc
@@ -8,8 +8,8 @@ #include <memory> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ref_counted.h" #include "base/run_loop.h" #include "base/synchronization/waitable_event.h"
diff --git a/content/browser/speech/tts_android.cc b/content/browser/speech/tts_android.cc index d3d433f..0f705d4 100644 --- a/content/browser/speech/tts_android.cc +++ b/content/browser/speech/tts_android.cc
@@ -7,7 +7,7 @@ #include <string> #include "base/android/jni_string.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/singleton.h" #include "base/strings/utf_string_conversions.h" #include "content/browser/speech/tts_controller_impl.h"
diff --git a/content/browser/speech/tts_controller_impl.cc b/content/browser/speech/tts_controller_impl.cc index a674165..a083e7b 100644 --- a/content/browser/speech/tts_controller_impl.cc +++ b/content/browser/speech/tts_controller_impl.cc
@@ -10,8 +10,8 @@ #include <string> #include <vector> -#include "base/bind.h" #include "base/containers/queue.h" +#include "base/functional/bind.h" #include "base/json/json_reader.h" #include "base/metrics/histogram_macros.h" #include "base/metrics/user_metrics.h"
diff --git a/content/browser/speech/tts_environment_android_impl.cc b/content/browser/speech/tts_environment_android_impl.cc index 380fc3f..d7b63d8 100644 --- a/content/browser/speech/tts_environment_android_impl.cc +++ b/content/browser/speech/tts_environment_android_impl.cc
@@ -4,8 +4,8 @@ #include "content/browser/speech/tts_environment_android_impl.h" -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" using base::android::ApplicationStatusListener;
diff --git a/content/browser/speech/tts_environment_android_impl.h b/content/browser/speech/tts_environment_android_impl.h index bd6d521..48ecea0 100644 --- a/content/browser/speech/tts_environment_android_impl.h +++ b/content/browser/speech/tts_environment_android_impl.h
@@ -8,7 +8,7 @@ #include <memory> #include "base/android/application_status_listener.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "content/public/browser/tts_environment_android.h" namespace content {
diff --git a/content/browser/speech/tts_fuchsia.cc b/content/browser/speech/tts_fuchsia.cc index 404c275..ea21119 100644 --- a/content/browser/speech/tts_fuchsia.cc +++ b/content/browser/speech/tts_fuchsia.cc
@@ -4,7 +4,7 @@ #include "content/browser/speech/tts_platform_impl.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/no_destructor.h" namespace content {
diff --git a/content/browser/speech/tts_linux.cc b/content/browser/speech/tts_linux.cc index 6b86a46..99daff0f 100644 --- a/content/browser/speech/tts_linux.cc +++ b/content/browser/speech/tts_linux.cc
@@ -8,9 +8,9 @@ #include <map> #include <memory> -#include "base/bind.h" #include "base/command_line.h" #include "base/debug/leak_annotations.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/no_destructor.h" #include "base/synchronization/lock.h"
diff --git a/content/browser/speech/tts_mac.h b/content/browser/speech/tts_mac.h index 5a2cf76..537592e 100644 --- a/content/browser/speech/tts_mac.h +++ b/content/browser/speech/tts_mac.h
@@ -5,7 +5,7 @@ #ifndef CONTENT_BROWSER_SPEECH_TTS_MAC_H_ #define CONTENT_BROWSER_SPEECH_TTS_MAC_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/mac/scoped_nsobject.h" #include "base/no_destructor.h" #include "content/browser/speech/tts_platform_impl.h"
diff --git a/content/browser/speech/tts_mac.mm b/content/browser/speech/tts_mac.mm index e68e8e79..4ea9bdd 100644 --- a/content/browser/speech/tts_mac.mm +++ b/content/browser/speech/tts_mac.mm
@@ -8,7 +8,7 @@ #include <string> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/sys_string_conversions.h" #include "base/values.h" #include "content/public/browser/tts_controller.h"
diff --git a/content/browser/speech/tts_ssml_browsertest.cc b/content/browser/speech/tts_ssml_browsertest.cc index a9cac1a8..ca3b9c7 100644 --- a/content/browser/speech/tts_ssml_browsertest.cc +++ b/content/browser/speech/tts_ssml_browsertest.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "content/public/test/browser_test.h" #include "content/public/test/browser_test_utils.h" #include "content/public/test/content_browser_test.h"
diff --git a/content/browser/speech/tts_win.cc b/content/browser/speech/tts_win.cc index 11fcb77..5104185 100644 --- a/content/browser/speech/tts_win.cc +++ b/content/browser/speech/tts_win.cc
@@ -9,8 +9,8 @@ #include <wrl/client.h> #include <wrl/implements.h> -#include "base/bind.h" #include "base/cxx17_backports.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/no_destructor.h" #include "base/strings/string_number_conversions.h"
diff --git a/content/browser/ssl/ssl_client_auth_handler.cc b/content/browser/ssl/ssl_client_auth_handler.cc index 9bb0867..80f19c2 100644 --- a/content/browser/ssl/ssl_client_auth_handler.cc +++ b/content/browser/ssl/ssl_client_auth_handler.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" #include "base/check_op.h" +#include "base/functional/bind.h" #include "content/public/browser/browser_task_traits.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/client_certificate_delegate.h"
diff --git a/content/browser/ssl/ssl_client_auth_handler.h b/content/browser/ssl/ssl_client_auth_handler.h index 152f105..5c8788a 100644 --- a/content/browser/ssl/ssl_client_auth_handler.h +++ b/content/browser/ssl/ssl_client_auth_handler.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h"
diff --git a/content/browser/ssl/ssl_manager.cc b/content/browser/ssl/ssl_manager.cc index ac365cf..82fd37d8 100644 --- a/content/browser/ssl/ssl_manager.cc +++ b/content/browser/ssl/ssl_manager.cc
@@ -7,8 +7,8 @@ #include <set> #include <utility> -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_macros.h" #include "base/strings/utf_string_conversions.h" #include "base/supports_user_data.h"
diff --git a/content/browser/ssl_private_key_impl.cc b/content/browser/ssl_private_key_impl.cc index c3d1465..9cab4fff 100644 --- a/content/browser/ssl_private_key_impl.cc +++ b/content/browser/ssl_private_key_impl.cc
@@ -4,9 +4,9 @@ #include "content/browser/ssl_private_key_impl.h" -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" namespace content {
diff --git a/content/browser/startup_task_runner.cc b/content/browser/startup_task_runner.cc index c239401a..5fc37722 100644 --- a/content/browser/startup_task_runner.cc +++ b/content/browser/startup_task_runner.cc
@@ -4,7 +4,7 @@ #include "content/browser/startup_task_runner.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/metrics/histogram_macros.h" #include "base/task/single_thread_task_runner.h"
diff --git a/content/browser/startup_task_runner.h b/content/browser/startup_task_runner.h index f56ff09b..9bef205 100644 --- a/content/browser/startup_task_runner.h +++ b/content/browser/startup_task_runner.h
@@ -7,7 +7,7 @@ #include <list> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/task/single_thread_task_runner.h" #include "base/time/time.h" #include "content/common/content_export.h"
diff --git a/content/browser/startup_task_runner_unittest.cc b/content/browser/startup_task_runner_unittest.cc index 52a3a12..c4affdd 100644 --- a/content/browser/startup_task_runner_unittest.cc +++ b/content/browser/startup_task_runner_unittest.cc
@@ -6,9 +6,9 @@ #include <utility> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h"
diff --git a/content/browser/storage_partition_impl.cc b/content/browser/storage_partition_impl.cc index ee49ce9e..86339393 100644 --- a/content/browser/storage_partition_impl.cc +++ b/content/browser/storage_partition_impl.cc
@@ -14,14 +14,13 @@ #include "base/barrier_callback.h" #include "base/barrier_closure.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/containers/contains.h" #include "base/feature_list.h" #include "base/files/file_util.h" #include "base/functional/bind.h" #include "base/functional/callback_forward.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h"
diff --git a/content/browser/storage_partition_impl_map.cc b/content/browser/storage_partition_impl_map.cc index f4e7c20f..1ae8db8 100644 --- a/content/browser/storage_partition_impl_map.cc +++ b/content/browser/storage_partition_impl_map.cc
@@ -8,14 +8,14 @@ #include <utility> #include "base/barrier_closure.h" -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/containers/contains.h" #include "base/files/file_enumerator.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h"
diff --git a/content/browser/storage_partition_impl_map.h b/content/browser/storage_partition_impl_map.h index 0c53496..d999fd35 100644 --- a/content/browser/storage_partition_impl_map.h +++ b/content/browser/storage_partition_impl_map.h
@@ -10,7 +10,7 @@ #include <string> #include <unordered_set> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/gtest_prod_util.h" #include "base/memory/raw_ptr.h" #include "base/supports_user_data.h"
diff --git a/content/browser/storage_partition_impl_unittest.cc b/content/browser/storage_partition_impl_unittest.cc index 892d73ca..4d2eae8f 100644 --- a/content/browser/storage_partition_impl_unittest.cc +++ b/content/browser/storage_partition_impl_unittest.cc
@@ -14,12 +14,12 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/containers/contains.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h"
diff --git a/content/browser/system_dns_resolution/system_dns_resolver.cc b/content/browser/system_dns_resolution/system_dns_resolver.cc index 271f3299..83d2bed 100644 --- a/content/browser/system_dns_resolution/system_dns_resolver.cc +++ b/content/browser/system_dns_resolution/system_dns_resolver.cc
@@ -7,7 +7,7 @@ #include <algorithm> #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "mojo/public/cpp/bindings/callback_helpers.h" #include "net/base/address_list.h" #include "net/base/net_errors.h"
diff --git a/content/browser/theme_helper_mac.mm b/content/browser/theme_helper_mac.mm index 22da2ef..34f8f293 100644 --- a/content/browser/theme_helper_mac.mm +++ b/content/browser/theme_helper_mac.mm
@@ -7,10 +7,10 @@ #import <Carbon/Carbon.h> #import <Cocoa/Cocoa.h> -#include "base/bind.h" -#include "base/callback.h" #include "base/command_line.h" #include "base/containers/span.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/mac/mac_util.h" #include "base/mac/scoped_nsobject.h" #include "base/strings/sys_string_conversions.h"
diff --git a/content/browser/tracing/background_startup_tracing_observer.cc b/content/browser/tracing/background_startup_tracing_observer.cc index f1e3797..c3e35694 100644 --- a/content/browser/tracing/background_startup_tracing_observer.cc +++ b/content/browser/tracing/background_startup_tracing_observer.cc
@@ -4,7 +4,7 @@ #include "content/browser/tracing/background_startup_tracing_observer.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/no_destructor.h" #include "components/tracing/common/trace_startup_config.h" #include "content/browser/tracing/background_tracing_rule.h"
diff --git a/content/browser/tracing/background_tracing_active_scenario.cc b/content/browser/tracing/background_tracing_active_scenario.cc index e71c26f..2d85466 100644 --- a/content/browser/tracing/background_tracing_active_scenario.cc +++ b/content/browser/tracing/background_tracing_active_scenario.cc
@@ -7,7 +7,7 @@ #include <set> #include <utility> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted_memory.h" #include "base/metrics/histogram_macros.h"
diff --git a/content/browser/tracing/background_tracing_manager_browsertest.cc b/content/browser/tracing/background_tracing_manager_browsertest.cc index 23c2120..40bd804 100644 --- a/content/browser/tracing/background_tracing_manager_browsertest.cc +++ b/content/browser/tracing/background_tracing_manager_browsertest.cc
@@ -8,9 +8,9 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/json/json_reader.h" #include "base/memory/ref_counted_memory.h" #include "base/metrics/histogram_macros.h"
diff --git a/content/browser/tracing/background_tracing_manager_impl.cc b/content/browser/tracing/background_tracing_manager_impl.cc index 3d91bf4..062a24cc 100644 --- a/content/browser/tracing/background_tracing_manager_impl.cc +++ b/content/browser/tracing/background_tracing_manager_impl.cc
@@ -6,9 +6,9 @@ #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/json/json_reader.h" #include "base/json/json_writer.h" #include "base/location.h"
diff --git a/content/browser/tracing/background_tracing_rule.cc b/content/browser/tracing/background_tracing_rule.cc index 051581306..aa07c62 100644 --- a/content/browser/tracing/background_tracing_rule.cc +++ b/content/browser/tracing/background_tracing_rule.cc
@@ -7,7 +7,7 @@ #include <string> #include <type_traits> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/metrics/histogram_macros.h" #include "base/metrics/metrics_hashes.h"
diff --git a/content/browser/tracing/cast_tracing_agent.cc b/content/browser/tracing/cast_tracing_agent.cc index 10ba5e1..c157d27 100644 --- a/content/browser/tracing/cast_tracing_agent.cc +++ b/content/browser/tracing/cast_tracing_agent.cc
@@ -7,9 +7,9 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/check_op.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/no_destructor.h" #include "base/sequence_checker.h" #include "base/strings/string_util.h"
diff --git a/content/browser/tracing/cros_tracing_agent.cc b/content/browser/tracing/cros_tracing_agent.cc index b4f724c..dce174bc 100644 --- a/content/browser/tracing/cros_tracing_agent.cc +++ b/content/browser/tracing/cros_tracing_agent.cc
@@ -6,10 +6,10 @@ #include <utility> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/check_op.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ref_counted_memory.h" #include "base/no_destructor.h" #include "base/sequence_checker.h"
diff --git a/content/browser/tracing/memory_instrumentation_browsertest.cc b/content/browser/tracing/memory_instrumentation_browsertest.cc index 9db4a075..8e34ee7 100644 --- a/content/browser/tracing/memory_instrumentation_browsertest.cc +++ b/content/browser/tracing/memory_instrumentation_browsertest.cc
@@ -6,7 +6,7 @@ #include <algorithm> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/process/process_handle.h" #include "base/run_loop.h" #include "build/build_config.h"
diff --git a/content/browser/tracing/memory_tracing_browsertest.cc b/content/browser/tracing/memory_tracing_browsertest.cc index 7a5558a..224bde5a 100644 --- a/content/browser/tracing/memory_tracing_browsertest.cc +++ b/content/browser/tracing/memory_tracing_browsertest.cc
@@ -6,9 +6,9 @@ #include <memory> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "base/task/single_thread_task_runner.h" #include "base/trace_event/memory_dump_manager.h"
diff --git a/content/browser/tracing/tracing_controller_browsertest.cc b/content/browser/tracing/tracing_controller_browsertest.cc index 4d5299fd..0fe46e1 100644 --- a/content/browser/tracing/tracing_controller_browsertest.cc +++ b/content/browser/tracing/tracing_controller_browsertest.cc
@@ -7,8 +7,8 @@ #include <stdint.h> #include <utility> -#include "base/bind.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/json/json_reader.h" #include "base/memory/ref_counted_memory.h" #include "base/run_loop.h"
diff --git a/content/browser/tracing/tracing_controller_impl.cc b/content/browser/tracing/tracing_controller_impl.cc index 21dbfff..cdd7d94d 100644 --- a/content/browser/tracing/tracing_controller_impl.cc +++ b/content/browser/tracing/tracing_controller_impl.cc
@@ -9,12 +9,12 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/cpu.h" #include "base/dcheck_is_on.h" #include "base/files/file_tracing.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/run_loop.h" #include "base/strings/string_split.h"
diff --git a/content/browser/tracing/tracing_controller_impl.h b/content/browser/tracing/tracing_controller_impl.h index 51a1f8a..2e29cca1 100644 --- a/content/browser/tracing/tracing_controller_impl.h +++ b/content/browser/tracing/tracing_controller_impl.h
@@ -10,7 +10,7 @@ #include <string> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/ref_counted.h" #include "base/task/task_traits.h" #include "base/timer/timer.h"
diff --git a/content/browser/tracing/tracing_controller_impl_data_endpoint.cc b/content/browser/tracing/tracing_controller_impl_data_endpoint.cc index 8a177f9..880edc4 100644 --- a/content/browser/tracing/tracing_controller_impl_data_endpoint.cc +++ b/content/browser/tracing/tracing_controller_impl_data_endpoint.cc
@@ -6,8 +6,8 @@ #include <tuple> #include <utility> -#include "base/bind.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/json/json_writer.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted_memory.h"
diff --git a/content/browser/tracing/tracing_service_controller.h b/content/browser/tracing/tracing_service_controller.h index dce8d72b..8dcd1ed7 100644 --- a/content/browser/tracing/tracing_service_controller.h +++ b/content/browser/tracing/tracing_service_controller.h
@@ -8,7 +8,7 @@ #include <map> #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/no_destructor.h" #include "base/process/process_handle.h" #include "base/types/pass_key.h"
diff --git a/content/browser/tracing/tracing_ui.cc b/content/browser/tracing/tracing_ui.cc index daedf594..fa5fd9d 100644 --- a/content/browser/tracing/tracing_ui.cc +++ b/content/browser/tracing/tracing_ui.cc
@@ -13,10 +13,10 @@ #include <vector> #include "base/base64.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/format_macros.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/json/json_reader.h" #include "base/json/json_writer.h" #include "base/memory/ref_counted_memory.h"
diff --git a/content/browser/ukm_internals_ui.cc b/content/browser/ukm_internals_ui.cc index f49e2d6b..2be73c7 100644 --- a/content/browser/ukm_internals_ui.cc +++ b/content/browser/ukm_internals_ui.cc
@@ -10,7 +10,7 @@ #include <string> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "components/ukm/debug/ukm_debug_data_extractor.h" #include "components/ukm/ukm_service.h"
diff --git a/content/browser/url_loader_factory_getter.cc b/content/browser/url_loader_factory_getter.cc index a188102..58452eb 100644 --- a/content/browser/url_loader_factory_getter.cc +++ b/content/browser/url_loader_factory_getter.cc
@@ -7,10 +7,10 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/lazy_instance.h" #include "base/run_loop.h" #include "content/browser/storage_partition_impl.h"
diff --git a/content/browser/url_loader_factory_getter.h b/content/browser/url_loader_factory_getter.h index cc631fac..c71cd28 100644 --- a/content/browser/url_loader_factory_getter.h +++ b/content/browser/url_loader_factory_getter.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h" #include "content/common/content_export.h"
diff --git a/content/browser/usb/usb_test_utils.cc b/content/browser/usb/usb_test_utils.cc index 4ec0b054..0c78a544f 100644 --- a/content/browser/usb/usb_test_utils.cc +++ b/content/browser/usb/usb_test_utils.cc
@@ -4,7 +4,7 @@ #include "content/browser/usb/usb_test_utils.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "services/device/public/mojom/usb_device.mojom.h" #include "services/device/public/mojom/usb_enumeration_options.mojom.h"
diff --git a/content/browser/usb/web_usb_service_impl.cc b/content/browser/usb/web_usb_service_impl.cc index 2259b25..01017ab 100644 --- a/content/browser/usb/web_usb_service_impl.cc +++ b/content/browser/usb/web_usb_service_impl.cc
@@ -7,9 +7,9 @@ #include <memory> #include <utility> -#include "base/bind.h" #include "base/containers/contains.h" #include "base/containers/cxx20_erase.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "content/browser/renderer_host/render_frame_host_impl.h" #include "content/browser/service_worker/service_worker_context_core.h"
diff --git a/content/browser/usb/web_usb_service_impl_unittest.cc b/content/browser/usb/web_usb_service_impl_unittest.cc index ca95973..c4f84a887 100644 --- a/content/browser/usb/web_usb_service_impl_unittest.cc +++ b/content/browser/usb/web_usb_service_impl_unittest.cc
@@ -11,7 +11,7 @@ #include <vector> #include "base/barrier_closure.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/test/gmock_callback_support.h" #include "base/test/test_future.h"
diff --git a/content/browser/utility_process_host.cc b/content/browser/utility_process_host.cc index 7ace3e8..66ba477 100644 --- a/content/browser/utility_process_host.cc +++ b/content/browser/utility_process_host.cc
@@ -8,10 +8,10 @@ #include <utility> #include "base/base_switches.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/i18n/base_i18n_switches.h" #include "base/strings/utf_string_conversions.h" #include "base/task/sequenced_task_runner.h"
diff --git a/content/browser/utility_process_host.h b/content/browser/utility_process_host.h index db20f0c..a218d9b 100644 --- a/content/browser/utility_process_host.h +++ b/content/browser/utility_process_host.h
@@ -24,7 +24,7 @@ // TODO(crbug.com/1328879): Remove this when fixing the bug. #if BUILDFLAG(IS_CASTOS) || BUILDFLAG(IS_CAST_ANDROID) -#include "base/callback.h" +#include "base/functional/callback.h" #include "mojo/public/cpp/system/message_pipe.h" #endif
diff --git a/content/browser/utility_process_host_browsertest.cc b/content/browser/utility_process_host_browsertest.cc index 4b4fb2a..d3834db5 100644 --- a/content/browser/utility_process_host_browsertest.cc +++ b/content/browser/utility_process_host_browsertest.cc
@@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/bind.h" #include "base/command_line.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/memory/read_only_shared_memory_region.h" #include "base/memory/unsafe_shared_memory_region.h" #include "base/memory/writable_shared_memory_region.h"
diff --git a/content/browser/utility_process_sandbox_browsertest.cc b/content/browser/utility_process_sandbox_browsertest.cc index 20c5cca..fdadeb97 100644 --- a/content/browser/utility_process_sandbox_browsertest.cc +++ b/content/browser/utility_process_sandbox_browsertest.cc
@@ -5,8 +5,8 @@ #include <string> #include <vector> -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h"
diff --git a/content/browser/vibration_browsertest.cc b/content/browser/vibration_browsertest.cc index e9f036e..a2c9b644 100644 --- a/content/browser/vibration_browsertest.cc +++ b/content/browser/vibration_browsertest.cc
@@ -4,8 +4,8 @@ #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "base/strings/string_number_conversions.h" #include "content/browser/browser_interface_binders.h"
diff --git a/content/browser/web_contents/file_chooser_impl.h b/content/browser/web_contents/file_chooser_impl.h index bab52c0..7756fa1 100644 --- a/content/browser/web_contents/file_chooser_impl.h +++ b/content/browser/web_contents/file_chooser_impl.h
@@ -5,7 +5,7 @@ #ifndef CONTENT_BROWSER_WEB_CONTENTS_FILE_CHOOSER_IMPL_H_ #define CONTENT_BROWSER_WEB_CONTENTS_FILE_CHOOSER_IMPL_H_ -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "content/common/content_export.h" #include "content/public/browser/file_select_listener.h"
diff --git a/content/browser/web_contents/file_chooser_impl_browsertest.cc b/content/browser/web_contents/file_chooser_impl_browsertest.cc index dc07f3ce..ea4a4fc56 100644 --- a/content/browser/web_contents/file_chooser_impl_browsertest.cc +++ b/content/browser/web_contents/file_chooser_impl_browsertest.cc
@@ -4,8 +4,8 @@ #include "content/browser/web_contents/file_chooser_impl.h" -#include "base/bind.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/path_service.h" #include "base/run_loop.h" #include "content/browser/renderer_host/render_frame_host_impl.h"
diff --git a/content/browser/web_contents/web_contents_android.cc b/content/browser/web_contents/web_contents_android.cc index 72f835f..1dc5a46 100644 --- a/content/browser/web_contents/web_contents_android.cc +++ b/content/browser/web_contents/web_contents_android.cc
@@ -14,8 +14,8 @@ #include "base/android/jni_android.h" #include "base/android/jni_array.h" #include "base/android/jni_string.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/json/json_writer.h" #include "base/lazy_instance.h" #include "base/logging.h"
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc index 3f90ee3c..75fc94d 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc
@@ -15,7 +15,6 @@ #include "base/allocator/partition_alloc_features.h" #include "base/allocator/partition_allocator/partition_alloc_buildflags.h" #include "base/allocator/partition_allocator/starscan/pcscan.h" -#include "base/bind.h" #include "base/check_op.h" #include "base/command_line.h" #include "base/containers/contains.h" @@ -23,6 +22,7 @@ #include "base/containers/flat_set.h" #include "base/feature_list.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/lazy_instance.h" #include "base/location.h" #include "base/logging.h"
diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h index 3f0ecf8..a22f40a6f 100644 --- a/content/browser/web_contents/web_contents_impl.h +++ b/content/browser/web_contents/web_contents_impl.h
@@ -15,9 +15,9 @@ #include <utility> #include <vector> -#include "base/callback_helpers.h" #include "base/callback_list.h" #include "base/containers/flat_map.h" +#include "base/functional/callback_helpers.h" #include "base/functional/function_ref.h" #include "base/gtest_prod_util.h" #include "base/memory/raw_ptr.h"
diff --git a/content/browser/web_contents/web_contents_impl_browsertest.cc b/content/browser/web_contents/web_contents_impl_browsertest.cc index 2b0a78f7..9a9bc91 100644 --- a/content/browser/web_contents/web_contents_impl_browsertest.cc +++ b/content/browser/web_contents/web_contents_impl_browsertest.cc
@@ -8,12 +8,12 @@ #include <vector> #include "base/allocator/partition_allocator/partition_alloc_buildflags.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/containers/contains.h" #include "base/feature_list.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h"
diff --git a/content/browser/web_contents/web_contents_impl_unittest.cc b/content/browser/web_contents/web_contents_impl_unittest.cc index 5b77884..c026db9f 100644 --- a/content/browser/web_contents/web_contents_impl_unittest.cc +++ b/content/browser/web_contents/web_contents_impl_unittest.cc
@@ -7,11 +7,11 @@ #include <tuple> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/check.h" #include "base/command_line.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h" #include "base/strings/utf_string_conversions.h"
diff --git a/content/browser/web_contents/web_contents_view_aura.cc b/content/browser/web_contents/web_contents_view_aura.cc index db53934..78ce9650 100644 --- a/content/browser/web_contents/web_contents_view_aura.cc +++ b/content/browser/web_contents/web_contents_view_aura.cc
@@ -12,13 +12,13 @@ #include <utility> #include "base/auto_reset.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/containers/flat_set.h" #include "base/feature_list.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/no_destructor.h" #include "base/strings/utf_string_conversions.h"
diff --git a/content/browser/web_contents/web_contents_view_aura.h b/content/browser/web_contents/web_contents_view_aura.h index 2083d0c..450fa961 100644 --- a/content/browser/web_contents/web_contents_view_aura.h +++ b/content/browser/web_contents/web_contents_view_aura.h
@@ -9,7 +9,7 @@ #include <utility> #include <vector> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/gtest_prod_util.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h"
diff --git a/content/browser/web_contents/web_contents_view_aura_browsertest.cc b/content/browser/web_contents/web_contents_view_aura_browsertest.cc index da67ee9..98ce501 100644 --- a/content/browser/web_contents/web_contents_view_aura_browsertest.cc +++ b/content/browser/web_contents/web_contents_view_aura_browsertest.cc
@@ -8,8 +8,8 @@ #include <tuple> #include <utility> -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h"
diff --git a/content/browser/web_database/web_database_host_impl.cc b/content/browser/web_database/web_database_host_impl.cc index 89c0d29..8ac1b16d 100644 --- a/content/browser/web_database/web_database_host_impl.cc +++ b/content/browser/web_database/web_database_host_impl.cc
@@ -7,8 +7,8 @@ #include <string> #include <utility> -#include "base/bind.h" #include "base/check_op.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_macros.h" #include "base/strings/utf_string_conversions.h" #include "base/task/sequenced_task_runner.h"
diff --git a/content/browser/web_database/web_database_host_impl.h b/content/browser/web_database/web_database_host_impl.h index 815ac32..d150f30 100644 --- a/content/browser/web_database/web_database_host_impl.h +++ b/content/browser/web_database/web_database_host_impl.h
@@ -9,7 +9,7 @@ #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/scoped_refptr.h" #include "build/build_config.h" #include "components/services/storage/public/cpp/quota_error_or.h"
diff --git a/content/browser/web_database/web_database_host_impl_unittest.cc b/content/browser/web_database/web_database_host_impl_unittest.cc index afb7f2a..a608676 100644 --- a/content/browser/web_database/web_database_host_impl_unittest.cc +++ b/content/browser/web_database/web_database_host_impl_unittest.cc
@@ -8,10 +8,10 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/memory/scoped_refptr.h" #include "base/run_loop.h"
diff --git a/content/browser/web_package/mock_signed_exchange_handler.cc b/content/browser/web_package/mock_signed_exchange_handler.cc index 243a9249..6e42718 100644 --- a/content/browser/web_package/mock_signed_exchange_handler.cc +++ b/content/browser/web_package/mock_signed_exchange_handler.cc
@@ -7,8 +7,8 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/strings/string_piece.h" #include "base/task/sequenced_task_runner.h" #include "content/browser/web_package/prefetched_signed_exchange_cache_entry.h"
diff --git a/content/browser/web_package/mock_web_bundle_reader_factory.cc b/content/browser/web_package/mock_web_bundle_reader_factory.cc index 5392a3b..8c20bed 100644 --- a/content/browser/web_package/mock_web_bundle_reader_factory.cc +++ b/content/browser/web_package/mock_web_bundle_reader_factory.cc
@@ -4,11 +4,11 @@ #include "content/browser/web_package/mock_web_bundle_reader_factory.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/test/test_future.h" #include "components/web_package/test_support/mock_web_bundle_parser_factory.h" #include "content/browser/web_package/web_bundle_reader.h"
diff --git a/content/browser/web_package/save_as_web_bundle_job.cc b/content/browser/web_package/save_as_web_bundle_job.cc index f2419c5..bda3340c 100644 --- a/content/browser/web_package/save_as_web_bundle_job.cc +++ b/content/browser/web_package/save_as_web_bundle_job.cc
@@ -4,8 +4,8 @@ #include "content/browser/web_package/save_as_web_bundle_job.h" -#include "base/callback.h" #include "base/files/file_path.h" +#include "base/functional/callback.h" #include "components/download/public/common/download_task_runner.h" #include "content/browser/renderer_host/render_frame_host_impl.h" #include "content/browser/web_contents/web_contents_impl.h"
diff --git a/content/browser/web_package/save_as_web_bundle_job.h b/content/browser/web_package/save_as_web_bundle_job.h index 3e9c2265..2fff680 100644 --- a/content/browser/web_package/save_as_web_bundle_job.h +++ b/content/browser/web_package/save_as_web_bundle_job.h
@@ -8,8 +8,8 @@ #include <memory> #include <vector> -#include "base/callback_forward.h" #include "base/files/file.h" +#include "base/functional/callback_forward.h" #include "mojo/public/cpp/bindings/pending_remote.h" #include "mojo/public/cpp/bindings/remote.h" #include "services/data_decoder/public/mojom/resource_snapshot_for_web_bundle.mojom.h"
diff --git a/content/browser/web_package/signed_exchange_cert_fetcher.cc b/content/browser/web_package/signed_exchange_cert_fetcher.cc index 5c39253d..24279d1 100644 --- a/content/browser/web_package/signed_exchange_cert_fetcher.cc +++ b/content/browser/web_package/signed_exchange_cert_fetcher.cc
@@ -4,9 +4,9 @@ #include "content/browser/web_package/signed_exchange_cert_fetcher.h" -#include "base/bind.h" #include "base/feature_list.h" #include "base/format_macros.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_macros.h" #include "base/numerics/safe_conversions.h" #include "base/strings/string_piece.h"
diff --git a/content/browser/web_package/signed_exchange_cert_fetcher.h b/content/browser/web_package/signed_exchange_cert_fetcher.h index e79157f..8c5db833 100644 --- a/content/browser/web_package/signed_exchange_cert_fetcher.h +++ b/content/browser/web_package/signed_exchange_cert_fetcher.h
@@ -8,8 +8,8 @@ #include <string> #include <vector> -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/gtest_prod_util.h" #include "base/memory/raw_ptr.h" #include "base/unguessable_token.h"
diff --git a/content/browser/web_package/signed_exchange_cert_fetcher_factory.h b/content/browser/web_package/signed_exchange_cert_fetcher_factory.h index 3d7aa758..743a611 100644 --- a/content/browser/web_package/signed_exchange_cert_fetcher_factory.h +++ b/content/browser/web_package/signed_exchange_cert_fetcher_factory.h
@@ -8,7 +8,7 @@ #include <memory> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/unguessable_token.h" #include "content/browser/web_package/signed_exchange_cert_fetcher.h" #include "content/common/content_export.h"
diff --git a/content/browser/web_package/signed_exchange_cert_fetcher_unittest.cc b/content/browser/web_package/signed_exchange_cert_fetcher_unittest.cc index 3eb9ff76..8e313146 100644 --- a/content/browser/web_package/signed_exchange_cert_fetcher_unittest.cc +++ b/content/browser/web_package/signed_exchange_cert_fetcher_unittest.cc
@@ -5,9 +5,9 @@ #include "content/browser/web_package/signed_exchange_cert_fetcher.h" #include "base/base64.h" -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/strings/string_piece.h" #include "base/test/task_environment.h" #include "components/cbor/values.h"
diff --git a/content/browser/web_package/signed_exchange_devtools_proxy.cc b/content/browser/web_package/signed_exchange_devtools_proxy.cc index 78398fb..84f7a72 100644 --- a/content/browser/web_package/signed_exchange_devtools_proxy.cc +++ b/content/browser/web_package/signed_exchange_devtools_proxy.cc
@@ -4,7 +4,7 @@ #include "content/browser/web_package/signed_exchange_devtools_proxy.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/trace_event/trace_event.h" #include "content/browser/devtools/devtools_instrumentation.h" #include "content/browser/loader/navigation_url_loader_impl.h"
diff --git a/content/browser/web_package/signed_exchange_devtools_proxy.h b/content/browser/web_package/signed_exchange_devtools_proxy.h index 08f1cfe0..7eea737 100644 --- a/content/browser/web_package/signed_exchange_devtools_proxy.h +++ b/content/browser/web_package/signed_exchange_devtools_proxy.h
@@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/unguessable_token.h" #include "content/browser/web_package/signed_exchange_error.h" #include "content/common/content_export.h"
diff --git a/content/browser/web_package/signed_exchange_envelope.cc b/content/browser/web_package/signed_exchange_envelope.cc index 063594a..6add4a5 100644 --- a/content/browser/web_package/signed_exchange_envelope.cc +++ b/content/browser/web_package/signed_exchange_envelope.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/callback.h" #include "base/format_macros.h" +#include "base/functional/callback.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_piece.h" #include "base/strings/stringprintf.h"
diff --git a/content/browser/web_package/signed_exchange_envelope_unittest.cc b/content/browser/web_package/signed_exchange_envelope_unittest.cc index f4298563..7988127f 100644 --- a/content/browser/web_package/signed_exchange_envelope_unittest.cc +++ b/content/browser/web_package/signed_exchange_envelope_unittest.cc
@@ -4,9 +4,9 @@ #include "content/browser/web_package/signed_exchange_envelope.h" -#include "base/callback.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/callback.h" #include "base/path_service.h" #include "components/cbor/values.h" #include "components/cbor/writer.h"
diff --git a/content/browser/web_package/signed_exchange_handler.cc b/content/browser/web_package/signed_exchange_handler.cc index e6a5f185..2918a0d3 100644 --- a/content/browser/web_package/signed_exchange_handler.cc +++ b/content/browser/web_package/signed_exchange_handler.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_functions.h" #include "base/metrics/histogram_macros.h" #include "base/strings/stringprintf.h"
diff --git a/content/browser/web_package/signed_exchange_handler.h b/content/browser/web_package/signed_exchange_handler.h index b035a22..36233cbd 100644 --- a/content/browser/web_package/signed_exchange_handler.h +++ b/content/browser/web_package/signed_exchange_handler.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/time/time.h" #include "content/browser/web_package/signed_exchange_consts.h"
diff --git a/content/browser/web_package/signed_exchange_handler_unittest.cc b/content/browser/web_package/signed_exchange_handler_unittest.cc index b642c51..3f6eace 100644 --- a/content/browser/web_package/signed_exchange_handler_unittest.cc +++ b/content/browser/web_package/signed_exchange_handler_unittest.cc
@@ -6,10 +6,10 @@ #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/path_service.h" #include "base/task/sequenced_task_runner.h"
diff --git a/content/browser/web_package/signed_exchange_loader.cc b/content/browser/web_package/signed_exchange_loader.cc index ccca6b9..7b05d8c 100644 --- a/content/browser/web_package/signed_exchange_loader.cc +++ b/content/browser/web_package/signed_exchange_loader.cc
@@ -6,9 +6,9 @@ #include <memory> -#include "base/bind.h" -#include "base/callback.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/metrics/histogram_macros.h" #include "components/web_package/web_bundle_utils.h" #include "content/browser/web_package/prefetched_signed_exchange_cache_entry.h"
diff --git a/content/browser/web_package/signed_exchange_loader.h b/content/browser/web_package/signed_exchange_loader.h index efaffb8..81b438b 100644 --- a/content/browser/web_package/signed_exchange_loader.h +++ b/content/browser/web_package/signed_exchange_loader.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/unguessable_token.h" #include "content/browser/web_package/signed_exchange_error.h" #include "content/common/content_export.h"
diff --git a/content/browser/web_package/signed_exchange_prefetch_handler.cc b/content/browser/web_package/signed_exchange_prefetch_handler.cc index 3a8d96d..8a26c43 100644 --- a/content/browser/web_package/signed_exchange_prefetch_handler.cc +++ b/content/browser/web_package/signed_exchange_prefetch_handler.cc
@@ -4,8 +4,8 @@ #include "content/browser/web_package/signed_exchange_prefetch_handler.h" -#include "base/callback.h" #include "base/feature_list.h" +#include "base/functional/callback.h" #include "content/browser/web_package/prefetched_signed_exchange_cache_entry.h" #include "content/browser/web_package/signed_exchange_devtools_proxy.h" #include "content/browser/web_package/signed_exchange_loader.h"
diff --git a/content/browser/web_package/signed_exchange_prefetch_handler.h b/content/browser/web_package/signed_exchange_prefetch_handler.h index fd0333d..3112490 100644 --- a/content/browser/web_package/signed_exchange_prefetch_handler.h +++ b/content/browser/web_package/signed_exchange_prefetch_handler.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/unguessable_token.h" #include "mojo/public/cpp/bindings/pending_receiver.h"
diff --git a/content/browser/web_package/signed_exchange_prefetch_metric_recorder.cc b/content/browser/web_package/signed_exchange_prefetch_metric_recorder.cc index cd63277..669f728 100644 --- a/content/browser/web_package/signed_exchange_prefetch_metric_recorder.cc +++ b/content/browser/web_package/signed_exchange_prefetch_metric_recorder.cc
@@ -4,7 +4,7 @@ #include "content/browser/web_package/signed_exchange_prefetch_metric_recorder.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_macros.h" #include "base/time/tick_clock.h"
diff --git a/content/browser/web_package/signed_exchange_reporter.cc b/content/browser/web_package/signed_exchange_reporter.cc index 7de1b078..2da894ca 100644 --- a/content/browser/web_package/signed_exchange_reporter.cc +++ b/content/browser/web_package/signed_exchange_reporter.cc
@@ -7,7 +7,7 @@ #include <string> #include <utility> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/ptr_util.h" #include "content/browser/renderer_host/frame_tree_node.h" #include "content/browser/web_package/signed_exchange_utils.h"
diff --git a/content/browser/web_package/signed_exchange_request_handler.cc b/content/browser/web_package/signed_exchange_request_handler.cc index d01eea6..99aa56f 100644 --- a/content/browser/web_package/signed_exchange_request_handler.cc +++ b/content/browser/web_package/signed_exchange_request_handler.cc
@@ -6,8 +6,8 @@ #include <memory> -#include "base/bind.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "content/browser/web_package/signed_exchange_devtools_proxy.h" #include "content/browser/web_package/signed_exchange_loader.h" #include "content/browser/web_package/signed_exchange_prefetch_metric_recorder.h"
diff --git a/content/browser/web_package/signed_exchange_request_handler_browsertest.cc b/content/browser/web_package/signed_exchange_request_handler_browsertest.cc index 2da051f..955ade9 100644 --- a/content/browser/web_package/signed_exchange_request_handler_browsertest.cc +++ b/content/browser/web_package/signed_exchange_request_handler_browsertest.cc
@@ -4,8 +4,8 @@ #include <tuple> -#include "base/bind.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/path_service.h" #include "base/strings/strcat.h"
diff --git a/content/browser/web_package/signed_exchange_signature_header_field_unittest.cc b/content/browser/web_package/signed_exchange_signature_header_field_unittest.cc index 596ecc1..d55787a 100644 --- a/content/browser/web_package/signed_exchange_signature_header_field_unittest.cc +++ b/content/browser/web_package/signed_exchange_signature_header_field_unittest.cc
@@ -4,7 +4,7 @@ #include "content/browser/web_package/signed_exchange_signature_header_field.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "testing/gtest/include/gtest/gtest.h" namespace content {
diff --git a/content/browser/web_package/web_bundle_blob_data_source.cc b/content/browser/web_package/web_bundle_blob_data_source.cc index 453c29f..91f5e93 100644 --- a/content/browser/web_package/web_bundle_blob_data_source.cc +++ b/content/browser/web_package/web_bundle_blob_data_source.cc
@@ -5,7 +5,7 @@ #include "content/browser/web_package/web_bundle_blob_data_source.h" #include "base/bit_cast.h" -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ref_counted.h" #include "base/numerics/checked_math.h" #include "base/numerics/safe_conversions.h"
diff --git a/content/browser/web_package/web_bundle_blob_data_source.h b/content/browser/web_package/web_bundle_blob_data_source.h index 8199a57..f86fe6a 100644 --- a/content/browser/web_package/web_bundle_blob_data_source.h +++ b/content/browser/web_package/web_bundle_blob_data_source.h
@@ -7,7 +7,7 @@ #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "components/web_package/mojom/web_bundle_parser.mojom.h" #include "content/common/content_export.h" #include "content/public/browser/browser_context.h"
diff --git a/content/browser/web_package/web_bundle_interceptor_for_trustable_file.cc b/content/browser/web_package/web_bundle_interceptor_for_trustable_file.cc index a72d014..6f4e6017 100644 --- a/content/browser/web_package/web_bundle_interceptor_for_trustable_file.cc +++ b/content/browser/web_package/web_bundle_interceptor_for_trustable_file.cc
@@ -4,7 +4,7 @@ #include "content/browser/web_package/web_bundle_interceptor_for_trustable_file.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "content/browser/web_package/web_bundle_reader.h" #include "content/browser/web_package/web_bundle_redirect_url_loader.h" #include "content/browser/web_package/web_bundle_source.h"
diff --git a/content/browser/web_package/web_bundle_reader_unittest.cc b/content/browser/web_package/web_bundle_reader_unittest.cc index d2240882..2364a311 100644 --- a/content/browser/web_package/web_bundle_reader_unittest.cc +++ b/content/browser/web_package/web_bundle_reader_unittest.cc
@@ -4,10 +4,10 @@ #include "content/browser/web_package/web_bundle_reader.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/numerics/safe_conversions.h" #include "base/test/task_environment.h" #include "components/web_package/mojom/web_bundle_parser.mojom.h"
diff --git a/content/browser/web_package/web_bundle_trustable_file_browsertest.cc b/content/browser/web_package/web_bundle_trustable_file_browsertest.cc index 13d41b0..0c6e57d 100644 --- a/content/browser/web_package/web_bundle_trustable_file_browsertest.cc +++ b/content/browser/web_package/web_bundle_trustable_file_browsertest.cc
@@ -157,7 +157,14 @@ RunTestScript("test-range-request.js"); } -IN_PROC_BROWSER_TEST_P(WebBundleTrustableFileBrowserTest, BasicNavigation) { +// Flaky on Linux bots https://crbug.com/1406600. +#if BUILDFLAG(IS_LINUX) +#define MAYBE_BasicNavigation DISABLED_BasicNavigation +#else +#define MAYBE_BasicNavigation BasicNavigation +#endif +IN_PROC_BROWSER_TEST_P(WebBundleTrustableFileBrowserTest, + MAYBE_BasicNavigation) { RunSharedNavigationTest( &web_bundle_browsertest_utils::SetUpBasicNavigationTest, &web_bundle_browsertest_utils::RunBasicNavigationTest); @@ -171,16 +178,30 @@ RunBrowserInitiatedOutOfBundleNavigationTest); } +// Flaky on Linux bots https://crbug.com/1406600. +#if BUILDFLAG(IS_LINUX) +#define MAYBE_RendererInitiatedOutOfBundleNavigation \ + DISABLED_RendererInitiatedOutOfBundleNavigation +#else +#define MAYBE_RendererInitiatedOutOfBundleNavigation \ + RendererInitiatedOutOfBundleNavigation +#endif IN_PROC_BROWSER_TEST_P(WebBundleTrustableFileBrowserTest, - RendererInitiatedOutOfBundleNavigation) { + MAYBE_RendererInitiatedOutOfBundleNavigation) { RunSharedNavigationTest(&web_bundle_browsertest_utils:: SetUpRendererInitiatedOutOfBundleNavigationTest, &web_bundle_browsertest_utils:: RunRendererInitiatedOutOfBundleNavigationTest); } +// Flaky on Linux bots https://crbug.com/1406600. +#if BUILDFLAG(IS_LINUX) +#define MAYBE_SameDocumentNavigation DISABLED_SameDocumentNavigation +#else +#define MAYBE_SameDocumentNavigation SameDocumentNavigation +#endif IN_PROC_BROWSER_TEST_P(WebBundleTrustableFileBrowserTest, - SameDocumentNavigation) { + MAYBE_SameDocumentNavigation) { RunSharedNavigationTest( &web_bundle_browsertest_utils::SetUpSameDocumentNavigationTest, &web_bundle_browsertest_utils::RunSameDocumentNavigationTest);
diff --git a/content/browser/web_package/web_bundle_url_loader_factory.h b/content/browser/web_package/web_bundle_url_loader_factory.h index 29a1b2fd..16a60236 100644 --- a/content/browser/web_package/web_bundle_url_loader_factory.h +++ b/content/browser/web_package/web_bundle_url_loader_factory.h
@@ -5,7 +5,7 @@ #ifndef CONTENT_BROWSER_WEB_PACKAGE_WEB_BUNDLE_URL_LOADER_FACTORY_H_ #define CONTENT_BROWSER_WEB_PACKAGE_WEB_BUNDLE_URL_LOADER_FACTORY_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "content/common/content_export.h" #include "mojo/public/cpp/bindings/pending_receiver.h"
diff --git a/content/browser/web_package/web_bundle_url_loader_factory_unittest.cc b/content/browser/web_package/web_bundle_url_loader_factory_unittest.cc index 24f6ce9f..bd2ea7b 100644 --- a/content/browser/web_package/web_bundle_url_loader_factory_unittest.cc +++ b/content/browser/web_package/web_bundle_url_loader_factory_unittest.cc
@@ -4,7 +4,7 @@ #include "content/browser/web_package/web_bundle_url_loader_factory.h" -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "content/browser/renderer_host/frame_tree_node.h"
diff --git a/content/browser/webauth/authenticator_common_impl.cc b/content/browser/webauth/authenticator_common_impl.cc index 10f0ca3..1dc8def 100644 --- a/content/browser/webauth/authenticator_common_impl.cc +++ b/content/browser/webauth/authenticator_common_impl.cc
@@ -10,9 +10,9 @@ #include <vector> #include "base/base64url.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/check.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/notreached.h" #include "base/strings/string_piece.h" #include "base/timer/timer.h"
diff --git a/content/browser/webauth/authenticator_impl_unittest.cc b/content/browser/webauth/authenticator_impl_unittest.cc index 6c3b544a..5bb4f68 100644 --- a/content/browser/webauth/authenticator_impl_unittest.cc +++ b/content/browser/webauth/authenticator_impl_unittest.cc
@@ -11,12 +11,12 @@ #include <vector> #include "base/base64url.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/compiler_specific.h" #include "base/containers/contains.h" #include "base/containers/flat_set.h" #include "base/files/file.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/json/json_reader.h" #include "base/json/json_writer.h" #include "base/memory/raw_ptr.h"
diff --git a/content/browser/webauth/is_uvpaa.h b/content/browser/webauth/is_uvpaa.h index 6c13685e81..09907f0 100644 --- a/content/browser/webauth/is_uvpaa.h +++ b/content/browser/webauth/is_uvpaa.h
@@ -5,7 +5,7 @@ #ifndef CONTENT_BROWSER_WEBAUTH_IS_UVPAA_H_ #define CONTENT_BROWSER_WEBAUTH_IS_UVPAA_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h" #include "content/common/content_export.h"
diff --git a/content/browser/webauth/virtual_discovery.cc b/content/browser/webauth/virtual_discovery.cc index bc2d270..3c54e41 100644 --- a/content/browser/webauth/virtual_discovery.cc +++ b/content/browser/webauth/virtual_discovery.cc
@@ -7,8 +7,8 @@ #include <memory> #include <utility> -#include "base/bind.h" #include "base/check.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/memory/weak_ptr.h" #include "base/strings/string_piece.h"
diff --git a/content/browser/webauth/webauth_browsertest.cc b/content/browser/webauth/webauth_browsertest.cc index 956df07..593b847 100644 --- a/content/browser/webauth/webauth_browsertest.cc +++ b/content/browser/webauth/webauth_browsertest.cc
@@ -8,9 +8,9 @@ #include <vector> #include "base/base64.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/json/json_reader.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h"
diff --git a/content/browser/webid/federated_auth_request_impl.cc b/content/browser/webid/federated_auth_request_impl.cc index de6e6948..52be4d3 100644 --- a/content/browser/webid/federated_auth_request_impl.cc +++ b/content/browser/webid/federated_auth_request_impl.cc
@@ -4,8 +4,8 @@ #include "content/browser/webid/federated_auth_request_impl.h" -#include "base/callback.h" #include "base/command_line.h" +#include "base/functional/callback.h" #include "base/rand_util.h" #include "base/ranges/algorithm.h" #include "base/strings/escape.h"
diff --git a/content/browser/webid/federated_auth_request_impl.h b/content/browser/webid/federated_auth_request_impl.h index 3b231d5a..964ecc8 100644 --- a/content/browser/webid/federated_auth_request_impl.h +++ b/content/browser/webid/federated_auth_request_impl.h
@@ -9,8 +9,8 @@ #include <string> #include <vector> -#include "base/callback_forward.h" #include "base/containers/queue.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/time/time.h" #include "content/browser/webid/fedcm_metrics.h"
diff --git a/content/browser/webid/federated_auth_request_impl_logout_unittest.cc b/content/browser/webid/federated_auth_request_impl_logout_unittest.cc index 76f5f39..b29d59a 100644 --- a/content/browser/webid/federated_auth_request_impl_logout_unittest.cc +++ b/content/browser/webid/federated_auth_request_impl_logout_unittest.cc
@@ -9,7 +9,7 @@ #include <string> #include <utility> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/test/scoped_feature_list.h"
diff --git a/content/browser/webid/federated_auth_request_impl_multiple_frames_unittest.cc b/content/browser/webid/federated_auth_request_impl_multiple_frames_unittest.cc index efc17ee..ce2ef94 100644 --- a/content/browser/webid/federated_auth_request_impl_multiple_frames_unittest.cc +++ b/content/browser/webid/federated_auth_request_impl_multiple_frames_unittest.cc
@@ -10,7 +10,7 @@ #include <string> #include <utility> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/task/sequenced_task_runner.h"
diff --git a/content/browser/webid/federated_auth_request_impl_unittest.cc b/content/browser/webid/federated_auth_request_impl_unittest.cc index aea240d..e8fb2a6 100644 --- a/content/browser/webid/federated_auth_request_impl_unittest.cc +++ b/content/browser/webid/federated_auth_request_impl_unittest.cc
@@ -9,7 +9,7 @@ #include <string> #include <utility> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/run_loop.h"
diff --git a/content/browser/webid/federated_provider_fetcher.h b/content/browser/webid/federated_provider_fetcher.h index 6441298..271ce78 100644 --- a/content/browser/webid/federated_provider_fetcher.h +++ b/content/browser/webid/federated_provider_fetcher.h
@@ -9,8 +9,8 @@ #include <set> #include <vector> -#include "base/callback_forward.h" #include "base/containers/flat_set.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "content/browser/webid/fedcm_metrics.h"
diff --git a/content/browser/webid/idp_network_request_manager.h b/content/browser/webid/idp_network_request_manager.h index b6c31bb..b6904d3 100644 --- a/content/browser/webid/idp_network_request_manager.h +++ b/content/browser/webid/idp_network_request_manager.h
@@ -9,7 +9,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "content/common/content_export.h" #include "content/public/browser/identity_request_account.h" #include "content/public/browser/identity_request_dialog_controller.h"
diff --git a/content/browser/webid/test/federated_auth_request_request_token_callback_helper.h b/content/browser/webid/test/federated_auth_request_request_token_callback_helper.h index 0002406..948add8 100644 --- a/content/browser/webid/test/federated_auth_request_request_token_callback_helper.h +++ b/content/browser/webid/test/federated_auth_request_request_token_callback_helper.h
@@ -7,8 +7,8 @@ #include <string> -#include "base/bind.h" -#include "base/callback_forward.h" +#include "base/functional/bind.h" +#include "base/functional/callback_forward.h" #include "base/run_loop.h" #include "content/browser/webid/federated_auth_request_impl.h" #include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/content/browser/webid/webid_browsertest.cc b/content/browser/webid/webid_browsertest.cc index 9f7c9f69..8eac3a7a 100644 --- a/content/browser/webid/webid_browsertest.cc +++ b/content/browser/webid/webid_browsertest.cc
@@ -6,9 +6,9 @@ #include <string> #include <vector> -#include "base/bind.h" #include "base/command_line.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h"
diff --git a/content/browser/webkit_browsertest.cc b/content/browser/webkit_browsertest.cc index 810cbe9..a922b4b5 100644 --- a/content/browser/webkit_browsertest.cc +++ b/content/browser/webkit_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 "base/bind.h" +#include "base/functional/bind.h" #include "content/browser/web_contents/web_contents_impl.h" #include "content/public/browser/web_contents.h" #include "content/public/test/browser_test.h"
diff --git a/content/browser/webrtc/webrtc_connections_observer.h b/content/browser/webrtc/webrtc_connections_observer.h index b21db3b..24ca952 100644 --- a/content/browser/webrtc/webrtc_connections_observer.h +++ b/content/browser/webrtc/webrtc_connections_observer.h
@@ -5,7 +5,7 @@ #ifndef CONTENT_BROWSER_WEBRTC_WEBRTC_CONNECTIONS_OBSERVER_H_ #define CONTENT_BROWSER_WEBRTC_WEBRTC_CONNECTIONS_OBSERVER_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/sequence_checker.h" #include "content/browser/webrtc/webrtc_internals_connections_observer.h"
diff --git a/content/browser/webrtc/webrtc_content_browsertest_base.cc b/content/browser/webrtc/webrtc_content_browsertest_base.cc index 1ca79fb..896a61b 100644 --- a/content/browser/webrtc/webrtc_content_browsertest_base.cc +++ b/content/browser/webrtc/webrtc_content_browsertest_base.cc
@@ -4,8 +4,8 @@ #include "content/browser/webrtc/webrtc_content_browsertest_base.h" -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h"
diff --git a/content/browser/webrtc/webrtc_getusermedia_browsertest.cc b/content/browser/webrtc/webrtc_getusermedia_browsertest.cc index f8f0590..b32e494f 100644 --- a/content/browser/webrtc/webrtc_getusermedia_browsertest.cc +++ b/content/browser/webrtc/webrtc_getusermedia_browsertest.cc
@@ -4,9 +4,9 @@ #include <stddef.h> -#include "base/bind.h" #include "base/command_line.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/json/json_reader.h" #include "base/strings/stringprintf.h" #include "base/test/scoped_feature_list.h"
diff --git a/content/browser/webrtc/webrtc_internals.cc b/content/browser/webrtc/webrtc_internals.cc index 43f7dfd8..ddf741c 100644 --- a/content/browser/webrtc/webrtc_internals.cc +++ b/content/browser/webrtc/webrtc_internals.cc
@@ -9,8 +9,8 @@ #include <memory> #include <utility> -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/observer_list.h" #include "base/strings/string_number_conversions.h" #include "build/build_config.h"
diff --git a/content/browser/webrtc/webrtc_internals_message_handler.cc b/content/browser/webrtc/webrtc_internals_message_handler.cc index 19b158d..76f0b65 100644 --- a/content/browser/webrtc/webrtc_internals_message_handler.cc +++ b/content/browser/webrtc/webrtc_internals_message_handler.cc
@@ -4,8 +4,8 @@ #include "content/browser/webrtc/webrtc_internals_message_handler.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "content/browser/renderer_host/media/peer_connection_tracker_host.h" #include "content/browser/webrtc/webrtc_internals.h" #include "content/public/browser/browser_thread.h"
diff --git a/content/browser/webrtc/webrtc_video_capture_service_browsertest.cc b/content/browser/webrtc/webrtc_video_capture_service_browsertest.cc index f600fa1..07cb31ca 100644 --- a/content/browser/webrtc/webrtc_video_capture_service_browsertest.cc +++ b/content/browser/webrtc/webrtc_video_capture_service_browsertest.cc
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/strings/stringprintf.h" #include "base/task/sequenced_task_runner.h"
diff --git a/content/browser/webtransport/web_transport_throttle_context.cc b/content/browser/webtransport/web_transport_throttle_context.cc index cc2e3a2e..db2e4d2 100644 --- a/content/browser/webtransport/web_transport_throttle_context.cc +++ b/content/browser/webtransport/web_transport_throttle_context.cc
@@ -4,9 +4,9 @@ #include "content/browser/webtransport/web_transport_throttle_context.h" -#include "base/callback.h" #include "base/check.h" #include "base/check_op.h" +#include "base/functional/callback.h" #include "base/logging.h" #include "base/rand_util.h"
diff --git a/content/browser/webtransport/web_transport_throttle_context.h b/content/browser/webtransport/web_transport_throttle_context.h index 6c4e2344..c03ebba0 100644 --- a/content/browser/webtransport/web_transport_throttle_context.h +++ b/content/browser/webtransport/web_transport_throttle_context.h
@@ -12,8 +12,8 @@ #include <queue> #include <vector> -#include "base/callback_forward.h" #include "base/containers/queue.h" +#include "base/functional/callback_forward.h" #include "base/memory/weak_ptr.h" #include "base/supports_user_data.h" #include "base/time/time.h"
diff --git a/content/browser/webui/url_data_manager.cc b/content/browser/webui/url_data_manager.cc index fde8095d..8275b55 100644 --- a/content/browser/webui/url_data_manager.cc +++ b/content/browser/webui/url_data_manager.cc
@@ -9,9 +9,9 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/lazy_instance.h" #include "base/memory/ref_counted_memory.h" #include "base/strings/string_util.h"
diff --git a/content/browser/webui/url_data_manager_backend.cc b/content/browser/webui/url_data_manager_backend.cc index b60010ac..ef74fc1 100644 --- a/content/browser/webui/url_data_manager_backend.cc +++ b/content/browser/webui/url_data_manager_backend.cc
@@ -7,8 +7,8 @@ #include <set> #include <utility> -#include "base/bind.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/memory/ptr_util.h" #include "base/memory/ref_counted.h"
diff --git a/content/browser/webui/url_data_source_impl.cc b/content/browser/webui/url_data_source_impl.cc index ba4ed58..e469c53 100644 --- a/content/browser/webui/url_data_source_impl.cc +++ b/content/browser/webui/url_data_source_impl.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ref_counted_memory.h" #include "base/strings/string_util.h" #include "content/browser/webui/url_data_manager_backend.h"
diff --git a/content/browser/webui/web_ui_browsertest.cc b/content/browser/webui/web_ui_browsertest.cc index 55fa565..8c0d9aa 100644 --- a/content/browser/webui/web_ui_browsertest.cc +++ b/content/browser/webui/web_ui_browsertest.cc
@@ -4,10 +4,10 @@ #include <utility> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted_memory.h"
diff --git a/content/browser/webui/web_ui_data_source_impl.cc b/content/browser/webui/web_ui_data_source_impl.cc index 047d4a48..7dfc2a4 100644 --- a/content/browser/webui/web_ui_data_source_impl.cc +++ b/content/browser/webui/web_ui_data_source_impl.cc
@@ -12,10 +12,10 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback.h" #include "base/check.h" #include "base/check_op.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted_memory.h" #include "base/strings/string_piece.h"
diff --git a/content/browser/webui/web_ui_data_source_impl.h b/content/browser/webui/web_ui_data_source_impl.h index 3033361..c97d63a7 100644 --- a/content/browser/webui/web_ui_data_source_impl.h +++ b/content/browser/webui/web_ui_data_source_impl.h
@@ -10,8 +10,8 @@ #include <map> #include <string> -#include "base/callback.h" #include "base/containers/flat_map.h" +#include "base/functional/callback.h" #include "base/gtest_prod_util.h" #include "base/values.h" #include "content/browser/webui/url_data_manager.h"
diff --git a/content/browser/webui/web_ui_data_source_unittest.cc b/content/browser/webui/web_ui_data_source_unittest.cc index 52022ca..df6a11a 100644 --- a/content/browser/webui/web_ui_data_source_unittest.cc +++ b/content/browser/webui/web_ui_data_source_unittest.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 "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ref_counted_memory.h" #include "base/strings/utf_string_conversions.h" #include "content/browser/webui/web_ui_data_source_impl.h"
diff --git a/content/browser/webui/web_ui_impl.cc b/content/browser/webui/web_ui_impl.cc index 93b4d784..85232f8 100644 --- a/content/browser/webui/web_ui_impl.cc +++ b/content/browser/webui/web_ui_impl.cc
@@ -9,8 +9,8 @@ #include <string> #include <utility> -#include "base/callback_helpers.h" #include "base/debug/dump_without_crashing.h" +#include "base/functional/callback_helpers.h" #include "base/json/json_writer.h" #include "base/strings/strcat.h" #include "base/strings/string_piece.h"
diff --git a/content/browser/webui/web_ui_main_frame_observer.cc b/content/browser/webui/web_ui_main_frame_observer.cc index 603a550..7731427 100644 --- a/content/browser/webui/web_ui_main_frame_observer.cc +++ b/content/browser/webui/web_ui_main_frame_observer.cc
@@ -14,8 +14,8 @@ #include "content/public/browser/web_ui_controller.h" #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -#include "base/callback_helpers.h" #include "base/feature_list.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/strings/strcat.h" #include "base/strings/utf_string_conversions.h"
diff --git a/content/browser/webui/web_ui_mojo_browsertest.cc b/content/browser/webui/web_ui_mojo_browsertest.cc index 443f2c2..200b48e 100644 --- a/content/browser/webui/web_ui_mojo_browsertest.cc +++ b/content/browser/webui/web_ui_mojo_browsertest.cc
@@ -5,10 +5,10 @@ #include <limits> #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/containers/flat_map.h" #include "base/containers/span.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted_memory.h" #include "base/run_loop.h"
diff --git a/content/browser/webui/web_ui_url_loader_factory.cc b/content/browser/webui/web_ui_url_loader_factory.cc index fd7e6489..0f189ba4 100644 --- a/content/browser/webui/web_ui_url_loader_factory.cc +++ b/content/browser/webui/web_ui_url_loader_factory.cc
@@ -7,8 +7,8 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/debug/crash_logging.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/memory/ref_counted_memory.h" #include "base/metrics/histogram_macros.h"
diff --git a/content/browser/worker_host/dedicated_worker_host.cc b/content/browser/worker_host/dedicated_worker_host.cc index f1d80f5..50edb38e 100644 --- a/content/browser/worker_host/dedicated_worker_host.cc +++ b/content/browser/worker_host/dedicated_worker_host.cc
@@ -8,8 +8,8 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "build/build_config.h" #include "content/browser/blob_storage/chrome_blob_storage_context.h" #include "content/browser/broadcast_channel/broadcast_channel_provider.h"
diff --git a/content/browser/worker_host/dedicated_worker_service_impl_unittest.cc b/content/browser/worker_host/dedicated_worker_service_impl_unittest.cc index 174a15f2..89d18c56 100644 --- a/content/browser/worker_host/dedicated_worker_service_impl_unittest.cc +++ b/content/browser/worker_host/dedicated_worker_service_impl_unittest.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "base/scoped_observation.h" #include "base/test/scoped_feature_list.h"
diff --git a/content/browser/worker_host/shared_worker_content_settings_proxy_impl.h b/content/browser/worker_host/shared_worker_content_settings_proxy_impl.h index 4a21fab9..9c7d66e 100644 --- a/content/browser/worker_host/shared_worker_content_settings_proxy_impl.h +++ b/content/browser/worker_host/shared_worker_content_settings_proxy_impl.h
@@ -5,7 +5,7 @@ #ifndef CONTENT_BROWSER_WORKER_HOST_SHARED_WORKER_CONTENT_SETTINGS_PROXY_IMPL_H_ #define CONTENT_BROWSER_WORKER_HOST_SHARED_WORKER_CONTENT_SETTINGS_PROXY_IMPL_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "mojo/public/cpp/bindings/pending_receiver.h" #include "mojo/public/cpp/bindings/receiver.h"
diff --git a/content/browser/worker_host/shared_worker_host.cc b/content/browser/worker_host/shared_worker_host.cc index e4d7c6b6..f12d5af 100644 --- a/content/browser/worker_host/shared_worker_host.cc +++ b/content/browser/worker_host/shared_worker_host.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/metrics/histogram_macros.h" #include "base/unguessable_token.h"
diff --git a/content/browser/worker_host/shared_worker_host_unittest.cc b/content/browser/worker_host/shared_worker_host_unittest.cc index a4aa398..e011dfe8 100644 --- a/content/browser/worker_host/shared_worker_host_unittest.cc +++ b/content/browser/worker_host/shared_worker_host_unittest.cc
@@ -8,7 +8,7 @@ #include <string> #include <utility> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h"
diff --git a/content/browser/worker_host/shared_worker_service_impl.cc b/content/browser/worker_host/shared_worker_service_impl.cc index 1e33267..b40314f 100644 --- a/content/browser/worker_host/shared_worker_service_impl.cc +++ b/content/browser/worker_host/shared_worker_service_impl.cc
@@ -10,11 +10,11 @@ #include <iterator> #include <string> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/check_op.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/observer_list.h" #include "content/browser/devtools/shared_worker_devtools_agent_host.h" #include "content/browser/loader/file_url_loader_factory.h"
diff --git a/content/browser/worker_host/shared_worker_service_impl_unittest.cc b/content/browser/worker_host/shared_worker_service_impl_unittest.cc index 79fd30d..684b361 100644 --- a/content/browser/worker_host/shared_worker_service_impl_unittest.cc +++ b/content/browser/worker_host/shared_worker_service_impl_unittest.cc
@@ -8,9 +8,9 @@ #include <set> #include <string> -#include "base/bind.h" #include "base/containers/flat_map.h" #include "base/containers/queue.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/scoped_observation.h"
diff --git a/content/browser/worker_host/test_shared_worker_service_impl.h b/content/browser/worker_host/test_shared_worker_service_impl.h index 2e3cefb..37c9785 100644 --- a/content/browser/worker_host/test_shared_worker_service_impl.h +++ b/content/browser/worker_host/test_shared_worker_service_impl.h
@@ -5,7 +5,7 @@ #ifndef CONTENT_BROWSER_WORKER_HOST_TEST_SHARED_WORKER_SERVICE_IMPL_H_ #define CONTENT_BROWSER_WORKER_HOST_TEST_SHARED_WORKER_SERVICE_IMPL_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" #include "content/browser/worker_host/shared_worker_service_impl.h" #include "mojo/public/cpp/bindings/remote_set.h"
diff --git a/content/browser/worker_host/worker_browsertest.cc b/content/browser/worker_host/worker_browsertest.cc index 1309772..fcd24d4 100644 --- a/content/browser/worker_host/worker_browsertest.cc +++ b/content/browser/worker_host/worker_browsertest.cc
@@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/bind.h" -#include "base/callback.h" #include "base/check.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/path_service.h" #include "base/strings/escape.h" #include "base/strings/string_util.h"
diff --git a/content/browser/worker_host/worker_script_fetcher.cc b/content/browser/worker_host/worker_script_fetcher.cc index ed9d9b7..a5e3300 100644 --- a/content/browser/worker_host/worker_script_fetcher.cc +++ b/content/browser/worker_host/worker_script_fetcher.cc
@@ -4,8 +4,8 @@ #include "content/browser/worker_host/worker_script_fetcher.h" -#include "base/bind.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/task/single_thread_task_runner.h" #include "content/browser/data_url_loader_factory.h" #include "content/browser/devtools/devtools_agent_host_impl.h"
diff --git a/content/browser/worker_host/worker_script_fetcher.h b/content/browser/worker_host/worker_script_fetcher.h index 3575b0e..2427ab67 100644 --- a/content/browser/worker_host/worker_script_fetcher.h +++ b/content/browser/worker_host/worker_script_fetcher.h
@@ -5,7 +5,7 @@ #ifndef CONTENT_BROWSER_WORKER_HOST_WORKER_SCRIPT_FETCHER_H_ #define CONTENT_BROWSER_WORKER_HOST_WORKER_SCRIPT_FETCHER_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "content/browser/navigation_subresource_loader_params.h" #include "content/common/content_export.h" #include "content/public/browser/service_worker_client_info.h"
diff --git a/content/browser/worker_host/worker_script_loader.cc b/content/browser/worker_host/worker_script_loader.cc index 6de43c6..7b4e58e7 100644 --- a/content/browser/worker_host/worker_script_loader.cc +++ b/content/browser/worker_host/worker_script_loader.cc
@@ -4,7 +4,7 @@ #include "content/browser/worker_host/worker_script_loader.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "content/browser/loader/navigation_loader_interceptor.h" #include "content/browser/service_worker/service_worker_main_resource_handle.h" #include "content/browser/service_worker/service_worker_main_resource_loader_interceptor.h"
diff --git a/content/browser/worker_host/worker_script_loader_factory_unittest.cc b/content/browser/worker_host/worker_script_loader_factory_unittest.cc index c4d89ef..413d0034 100644 --- a/content/browser/worker_host/worker_script_loader_factory_unittest.cc +++ b/content/browser/worker_host/worker_script_loader_factory_unittest.cc
@@ -4,7 +4,7 @@ #include "content/browser/worker_host/worker_script_loader_factory.h" -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "content/browser/service_worker/embedded_worker_test_helper.h" #include "content/browser/service_worker/service_worker_container_host.h"
diff --git a/content/browser/xr/service/browser_xr_runtime_impl.cc b/content/browser/xr/service/browser_xr_runtime_impl.cc index d01a81e..e3b4e08 100644 --- a/content/browser/xr/service/browser_xr_runtime_impl.cc +++ b/content/browser/xr/service/browser_xr_runtime_impl.cc
@@ -8,9 +8,9 @@ #include <memory> #include <utility> -#include "base/callback_helpers.h" #include "base/containers/contains.h" #include "base/cxx17_backports.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/observer_list.h" #include "build/build_config.h"
diff --git a/content/browser/xr/service/isolated_device_provider.cc b/content/browser/xr/service/isolated_device_provider.cc index 01347f2..9d60f63 100644 --- a/content/browser/xr/service/isolated_device_provider.cc +++ b/content/browser/xr/service/isolated_device_provider.cc
@@ -4,7 +4,7 @@ #include "content/browser/xr/service/isolated_device_provider.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "content/browser/xr/service/xr_device_service.h" #include "content/browser/xr/xr_utils.h" #include "content/public/browser/xr_integration_client.h"
diff --git a/content/browser/xr/service/vr_service_impl.cc b/content/browser/xr/service/vr_service_impl.cc index c4c8ee9..a289de3 100644 --- a/content/browser/xr/service/vr_service_impl.cc +++ b/content/browser/xr/service/vr_service_impl.cc
@@ -7,11 +7,11 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/containers/contains.h" #include "base/containers/cxx20_erase.h" #include "base/dcheck_is_on.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_macros.h" #include "base/ranges/algorithm.h" #include "base/stl_util.h"
diff --git a/content/browser/xr/service/xr_device_service.cc b/content/browser/xr/service/xr_device_service.cc index eeb138e..ea28818 100644 --- a/content/browser/xr/service/xr_device_service.cc +++ b/content/browser/xr/service/xr_device_service.cc
@@ -4,7 +4,7 @@ #include "content/browser/xr/service/xr_device_service.h" -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/no_destructor.h" #include "build/build_config.h" #include "content/public/browser/gpu_client.h"
diff --git a/content/browser/xr/service/xr_device_service.h b/content/browser/xr/service/xr_device_service.h index 7cceed9..592d36e 100644 --- a/content/browser/xr/service/xr_device_service.h +++ b/content/browser/xr/service/xr_device_service.h
@@ -5,7 +5,7 @@ #ifndef CONTENT_BROWSER_XR_SERVICE_XR_DEVICE_SERVICE_H_ #define CONTENT_BROWSER_XR_SERVICE_XR_DEVICE_SERVICE_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "content/common/content_export.h" #include "device/vr/public/mojom/isolated_xr_service.mojom.h" #include "mojo/public/cpp/bindings/remote.h"
diff --git a/content/browser/xr/service/xr_frame_sink_client_impl.cc b/content/browser/xr/service/xr_frame_sink_client_impl.cc index 2d41ba7e..4966af78 100644 --- a/content/browser/xr/service/xr_frame_sink_client_impl.cc +++ b/content/browser/xr/service/xr_frame_sink_client_impl.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "build/build_config.h" #include "components/viz/host/host_frame_sink_manager.h" #include "content/browser/browser_thread_impl.h"
diff --git a/content/browser/xr/service/xr_frame_sink_client_impl.h b/content/browser/xr/service/xr_frame_sink_client_impl.h index 5ff93abb..3e657e2 100644 --- a/content/browser/xr/service/xr_frame_sink_client_impl.h +++ b/content/browser/xr/service/xr_frame_sink_client_impl.h
@@ -5,8 +5,8 @@ #ifndef CONTENT_BROWSER_XR_SERVICE_XR_FRAME_SINK_CLIENT_IMPL_H_ #define CONTENT_BROWSER_XR_SERVICE_XR_FRAME_SINK_CLIENT_IMPL_H_ -#include "base/callback_forward.h" #include "base/callback_list.h" +#include "base/functional/callback_forward.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h" #include "base/synchronization/lock.h"
diff --git a/content/browser/xr/service/xr_runtime_manager_impl.cc b/content/browser/xr/service/xr_runtime_manager_impl.cc index 88fce9cf..5ed87805 100644 --- a/content/browser/xr/service/xr_runtime_manager_impl.cc +++ b/content/browser/xr/service/xr_runtime_manager_impl.cc
@@ -7,10 +7,10 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/command_line.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/lazy_instance.h" #include "base/memory/singleton.h" #include "base/observer_list.h"
diff --git a/content/browser/xr/service/xr_runtime_manager_impl.h b/content/browser/xr/service/xr_runtime_manager_impl.h index 8499048..20200fb 100644 --- a/content/browser/xr/service/xr_runtime_manager_impl.h +++ b/content/browser/xr/service/xr_runtime_manager_impl.h
@@ -12,7 +12,7 @@ #include <set> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/ref_counted.h" #include "base/threading/thread_checker.h" #include "base/timer/timer.h"
diff --git a/content/browser/xr/service/xr_runtime_manager_unittest.cc b/content/browser/xr/service/xr_runtime_manager_unittest.cc index 31a47edc..1fc16b43 100644 --- a/content/browser/xr/service/xr_runtime_manager_unittest.cc +++ b/content/browser/xr/service/xr_runtime_manager_unittest.cc
@@ -6,8 +6,8 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h" #include "base/test/task_environment.h"
diff --git a/content/child/blink_platform_impl.cc b/content/child/blink_platform_impl.cc index ac8b640e..016b247 100644 --- a/content/child/blink_platform_impl.cc +++ b/content/child/blink_platform_impl.cc
@@ -9,9 +9,9 @@ #include <memory> #include <vector> -#include "base/bind.h" #include "base/command_line.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/memory/raw_ptr.h" #include "base/memory/singleton.h"
diff --git a/content/child/browser_exposed_child_interfaces.cc b/content/child/browser_exposed_child_interfaces.cc index 3e6e3b4..bad0fb44 100644 --- a/content/child/browser_exposed_child_interfaces.cc +++ b/content/child/browser_exposed_child_interfaces.cc
@@ -4,7 +4,7 @@ #include "content/child/browser_exposed_child_interfaces.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/task/sequenced_task_runner.h" #include "content/child/child_histogram_fetcher_impl.h" #include "content/public/common/content_client.h"
diff --git a/content/child/child_histogram_fetcher_impl.cc b/content/child/child_histogram_fetcher_impl.cc index 9089b7e..ff7820b 100644 --- a/content/child/child_histogram_fetcher_impl.cc +++ b/content/child/child_histogram_fetcher_impl.cc
@@ -8,7 +8,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/metrics/histogram_delta_serialization.h" #include "base/metrics/histogram_macros.h"
diff --git a/content/child/child_process.cc b/content/child/child_process.cc index 50c98b6..21f05899 100644 --- a/content/child/child_process.cc +++ b/content/child/child_process.cc
@@ -6,9 +6,9 @@ #include <string.h> -#include "base/bind.h" #include "base/clang_profiling_buildflags.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/lazy_instance.h" #include "base/message_loop/message_pump_type.h" #include "base/process/process_handle.h"
diff --git a/content/child/child_process_sandbox_support_impl_mac.cc b/content/child/child_process_sandbox_support_impl_mac.cc index f7919d2b..97454ada 100644 --- a/content/child/child_process_sandbox_support_impl_mac.cc +++ b/content/child/child_process_sandbox_support_impl_mac.cc
@@ -7,7 +7,7 @@ #include <string> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/mac/scoped_cftyperef.h" #include "base/memory/read_only_shared_memory_region.h" #include "base/strings/sys_string_conversions.h"
diff --git a/content/child/child_thread_impl.cc b/content/child/child_thread_impl.cc index e9d76e85..acb7abc 100644 --- a/content/child/child_thread_impl.cc +++ b/content/child/child_thread_impl.cc
@@ -12,14 +12,14 @@ #include <utility> #include "base/base_switches.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/clang_profiling_buildflags.h" #include "base/command_line.h" #include "base/debug/alias.h" #include "base/debug/leak_annotations.h" #include "base/debug/profiler.h" #include "base/files/file.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/lazy_instance.h" #include "base/location.h" #include "base/logging.h"
diff --git a/content/child/dwrite_font_proxy/dwrite_font_proxy_init_impl_win.cc b/content/child/dwrite_font_proxy/dwrite_font_proxy_init_impl_win.cc index 2a7380d..26026dc 100644 --- a/content/child/dwrite_font_proxy/dwrite_font_proxy_init_impl_win.cc +++ b/content/child/dwrite_font_proxy/dwrite_font_proxy_init_impl_win.cc
@@ -8,9 +8,9 @@ #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/debug/alias.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/trace_event/trace_event.h" #include "base/win/iat_patch_function.h" #include "base/win/windows_version.h"
diff --git a/content/child/dwrite_font_proxy/dwrite_font_proxy_init_impl_win.h b/content/child/dwrite_font_proxy/dwrite_font_proxy_init_impl_win.h index 5cad6e5..ffa5c92 100644 --- a/content/child/dwrite_font_proxy/dwrite_font_proxy_init_impl_win.h +++ b/content/child/dwrite_font_proxy/dwrite_font_proxy_init_impl_win.h
@@ -5,7 +5,7 @@ #ifndef CONTENT_CHILD_DWRITE_FONT_PROXY_DWRITE_FONT_PROXY_INIT_IMPL_WIN_H_ #define CONTENT_CHILD_DWRITE_FONT_PROXY_DWRITE_FONT_PROXY_INIT_IMPL_WIN_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "content/common/content_export.h" #include "content/public/child/dwrite_font_proxy_init_win.h" #include "mojo/public/cpp/bindings/pending_remote.h"
diff --git a/content/child/dwrite_font_proxy/dwrite_font_proxy_win.cc b/content/child/dwrite_font_proxy/dwrite_font_proxy_win.cc index 775e730..85f6c61e 100644 --- a/content/child/dwrite_font_proxy/dwrite_font_proxy_win.cc +++ b/content/child/dwrite_font_proxy/dwrite_font_proxy_win.cc
@@ -9,10 +9,10 @@ #include <utility> -#include "base/bind.h" #include "base/check_op.h" #include "base/debug/crash_logging.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_macros.h" #include "base/strings/utf_string_conversions.h" #include "base/task/single_thread_task_runner.h"
diff --git a/content/child/dwrite_font_proxy/dwrite_font_proxy_win.h b/content/child/dwrite_font_proxy/dwrite_font_proxy_win.h index 204ad34..3da00bc 100644 --- a/content/child/dwrite_font_proxy/dwrite_font_proxy_win.h +++ b/content/child/dwrite_font_proxy/dwrite_font_proxy_win.h
@@ -12,8 +12,8 @@ #include <string> #include <vector> -#include "base/callback.h" #include "base/files/memory_mapped_file.h" +#include "base/functional/callback.h" #include "base/sequence_checker.h" #include "base/synchronization/lock.h" #include "base/task/sequenced_task_runner.h"
diff --git a/content/child/scoped_child_process_reference.cc b/content/child/scoped_child_process_reference.cc index 14f0304..00de541 100644 --- a/content/child/scoped_child_process_reference.cc +++ b/content/child/scoped_child_process_reference.cc
@@ -4,7 +4,7 @@ #include "content/child/scoped_child_process_reference.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/task/single_thread_task_runner.h" #include "base/time/time.h"
diff --git a/content/common/android/cpu_time_metrics_internal.cc b/content/common/android/cpu_time_metrics_internal.cc index 30fbdec9..b8eccbd6d 100644 --- a/content/common/android/cpu_time_metrics_internal.cc +++ b/content/common/android/cpu_time_metrics_internal.cc
@@ -10,10 +10,10 @@ #include <memory> #include <utility> -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/containers/flat_map.h" #include "base/cpu.h" +#include "base/functional/callback_helpers.h" #include "base/lazy_instance.h" #include "base/memory/raw_ptr.h" #include "base/metrics/histogram_functions.h"
diff --git a/content/common/font_list_unittest.cc b/content/common/font_list_unittest.cc index 12ed79c2..47c88e8 100644 --- a/content/common/font_list_unittest.cc +++ b/content/common/font_list_unittest.cc
@@ -4,7 +4,7 @@ #include "content/common/font_list.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/i18n/rtl.h" #include "base/strings/string_piece.h" #include "base/strings/string_util.h"
diff --git a/content/common/mac/font_loader.h b/content/common/mac/font_loader.h index d3f014a..42a3759 100644 --- a/content/common/mac/font_loader.h +++ b/content/common/mac/font_loader.h
@@ -11,7 +11,7 @@ #include <memory> #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/mac/scoped_cftyperef.h" #include "base/memory/read_only_shared_memory_region.h" #include "content/common/content_export.h"
diff --git a/content/common/mac/font_loader.mm b/content/common/mac/font_loader.mm index e418214..5d8e525 100644 --- a/content/common/mac/font_loader.mm +++ b/content/common/mac/font_loader.mm
@@ -10,10 +10,10 @@ #include <limits> #include <string> -#include "base/bind.h" -#include "base/callback.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/logging.h" #import "base/mac/foundation_util.h" #include "base/mac/scoped_cftyperef.h"
diff --git a/content/common/webid/identity_url_loader_throttle.h b/content/common/webid/identity_url_loader_throttle.h index 0a82af38..5f89189e 100644 --- a/content/common/webid/identity_url_loader_throttle.h +++ b/content/common/webid/identity_url_loader_throttle.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "content/common/content_export.h" #include "content/public/common/web_identity.h"
diff --git a/content/common/zygote/zygote_communication_linux.h b/content/common/zygote/zygote_communication_linux.h index 4b847a0..6a6e52f 100644 --- a/content/common/zygote/zygote_communication_linux.h +++ b/content/common/zygote/zygote_communication_linux.h
@@ -12,9 +12,9 @@ #include <sys/types.h> -#include "base/callback.h" #include "base/files/platform_file.h" #include "base/files/scoped_file.h" +#include "base/functional/callback.h" #include "base/process/kill.h" #include "base/process/launch.h" #include "base/process/process_handle.h"
diff --git a/content/gpu/gpu_child_thread.cc b/content/gpu/gpu_child_thread.cc index 2057ed01..d943fed 100644 --- a/content/gpu/gpu_child_thread.cc +++ b/content/gpu/gpu_child_thread.cc
@@ -10,10 +10,10 @@ #include <utility> #include "base/allocator/allocator_extension.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/debug/dump_without_crashing.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/weak_ptr.h" #include "base/power_monitor/power_monitor.h" #include "base/power_monitor/power_monitor_device_source.h"
diff --git a/content/gpu/gpu_child_thread.h b/content/gpu/gpu_child_thread.h index 283827c..ad6076ef 100644 --- a/content/gpu/gpu_child_thread.h +++ b/content/gpu/gpu_child_thread.h
@@ -11,8 +11,8 @@ #include <queue> #include <vector> -#include "base/callback.h" #include "base/command_line.h" +#include "base/functional/callback.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "base/task/single_thread_task_runner.h"
diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc index c8fbf62..d21db85 100644 --- a/content/gpu/gpu_main.cc +++ b/content/gpu/gpu_main.cc
@@ -10,10 +10,10 @@ #include <utility> #include "base/allocator/partition_alloc_support.h" -#include "base/bind.h" #include "base/check.h" #include "base/command_line.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/message_loop/message_pump_type.h" #include "base/metrics/histogram_macros.h"
diff --git a/content/gpu/gpu_sandbox_hook_linux.cc b/content/gpu/gpu_sandbox_hook_linux.cc index 0391df5..2d975f07 100644 --- a/content/gpu/gpu_sandbox_hook_linux.cc +++ b/content/gpu/gpu_sandbox_hook_linux.cc
@@ -14,10 +14,10 @@ #include <vector> #include "base/base_paths.h" -#include "base/bind.h" #include "base/files/file_enumerator.h" #include "base/files/file_path.h" #include "base/files/scoped_file.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/path_service.h" #include "base/strings/stringprintf.h"
diff --git a/content/gpu/gpu_service_factory.cc b/content/gpu/gpu_service_factory.cc index 00d0f79..cf7b765 100644 --- a/content/gpu/gpu_service_factory.cc +++ b/content/gpu/gpu_service_factory.cc
@@ -14,7 +14,7 @@ #include "media/media_buildflags.h" #if BUILDFLAG(ENABLE_MOJO_MEDIA_IN_GPU_PROCESS) -#include "base/bind.h" +#include "base/functional/bind.h" #include "media/mojo/services/media_service_factory.h" // nogncheck #endif // BUILDFLAG(ENABLE_MOJO_MEDIA_IN_GPU_PROCESS)
diff --git a/content/ppapi_plugin/plugin_process_dispatcher.cc b/content/ppapi_plugin/plugin_process_dispatcher.cc index f4865a005..f13f23a 100644 --- a/content/ppapi_plugin/plugin_process_dispatcher.cc +++ b/content/ppapi_plugin/plugin_process_dispatcher.cc
@@ -4,8 +4,8 @@ #include "content/ppapi_plugin/plugin_process_dispatcher.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "content/child/child_process.h" namespace content {
diff --git a/content/public/app/content_main.h b/content/public/app/content_main.h index 9164669..16e8c65 100644 --- a/content/public/app/content_main.h +++ b/content/public/app/content_main.h
@@ -7,7 +7,7 @@ #include <stddef.h> -#include "base/callback.h" +#include "base/functional/callback.h" #include "build/build_config.h" #include "content/common/content_export.h"
diff --git a/content/public/browser/android/compositor.h b/content/public/browser/android/compositor.h index eaa48d56..b4c80c42 100644 --- a/content/public/browser/android/compositor.h +++ b/content/public/browser/android/compositor.h
@@ -6,7 +6,7 @@ #define CONTENT_PUBLIC_BROWSER_ANDROID_COMPOSITOR_H_ #include "base/android/scoped_java_ref.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "cc/resources/ui_resource_bitmap.h" #include "cc/trees/layer_tree_host_client.h"
diff --git a/content/public/browser/android/gpu_video_accelerator_factories_provider.h b/content/public/browser/android/gpu_video_accelerator_factories_provider.h index f856ba1d..c91a1723 100644 --- a/content/public/browser/android/gpu_video_accelerator_factories_provider.h +++ b/content/public/browser/android/gpu_video_accelerator_factories_provider.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "content/common/content_export.h" namespace media {
diff --git a/content/public/browser/android/synchronous_compositor_client.h b/content/public/browser/android/synchronous_compositor_client.h index d65e5b9..6968b75 100644 --- a/content/public/browser/android/synchronous_compositor_client.h +++ b/content/public/browser/android/synchronous_compositor_client.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "ui/gfx/geometry/point_f.h" #include "ui/gfx/geometry/size_f.h" #include "ui/gfx/geometry/vector2d_f.h"
diff --git a/content/public/browser/audio_service.h b/content/public/browser/audio_service.h index bc4912f..f2138b6 100644 --- a/content/public/browser/audio_service.h +++ b/content/public/browser/audio_service.h
@@ -5,7 +5,7 @@ #ifndef CONTENT_PUBLIC_BROWSER_AUDIO_SERVICE_H_ #define CONTENT_PUBLIC_BROWSER_AUDIO_SERVICE_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "content/common/content_export.h" #include "media/mojo/mojom/audio_stream_factory.mojom.h" #include "mojo/public/cpp/bindings/pending_receiver.h"
diff --git a/content/public/browser/audio_stream_broker.cc b/content/public/browser/audio_stream_broker.cc index e513648..28cad5b1 100644 --- a/content/public/browser/audio_stream_broker.cc +++ b/content/public/browser/audio_stream_broker.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "content/public/browser/browser_task_traits.h" #include "content/public/browser/browser_thread.h"
diff --git a/content/public/browser/audio_stream_broker.h b/content/public/browser/audio_stream_broker.h index 7d1af347..124b061 100644 --- a/content/public/browser/audio_stream_broker.h +++ b/content/public/browser/audio_stream_broker.h
@@ -9,7 +9,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "content/common/content_export.h" #include "media/mojo/mojom/audio_output_stream.mojom.h" #include "mojo/public/cpp/bindings/pending_remote.h"
diff --git a/content/public/browser/authenticator_request_client_delegate.cc b/content/public/browser/authenticator_request_client_delegate.cc index da11066..bf4643e 100644 --- a/content/public/browser/authenticator_request_client_delegate.cc +++ b/content/public/browser/authenticator_request_client_delegate.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/strings/string_piece.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h"
diff --git a/content/public/browser/authenticator_request_client_delegate.h b/content/public/browser/authenticator_request_client_delegate.h index 8a97305..c612766 100644 --- a/content/public/browser/authenticator_request_client_delegate.h +++ b/content/public/browser/authenticator_request_client_delegate.h
@@ -7,8 +7,8 @@ #include <string> -#include "base/callback_forward.h" #include "base/containers/span.h" +#include "base/functional/callback_forward.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h" #include "content/common/content_export.h"
diff --git a/content/public/browser/background_fetch_delegate.h b/content/public/browser/background_fetch_delegate.h index 9dd8348..b956173 100644 --- a/content/public/browser/background_fetch_delegate.h +++ b/content/public/browser/background_fetch_delegate.h
@@ -9,7 +9,7 @@ #include <string> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/weak_ptr.h" #include "content/common/content_export.h" #include "content/public/browser/web_contents.h"
diff --git a/content/public/browser/background_sync_context.h b/content/public/browser/background_sync_context.h index 916fb5c..11e3efd8 100644 --- a/content/public/browser/background_sync_context.h +++ b/content/public/browser/background_sync_context.h
@@ -5,7 +5,7 @@ #ifndef CONTENT_PUBLIC_BROWSER_BACKGROUND_SYNC_CONTEXT_H_ #define CONTENT_PUBLIC_BROWSER_BACKGROUND_SYNC_CONTEXT_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "build/build_config.h" #include "content/common/content_export.h" #include "third_party/blink/public/mojom/background_sync/background_sync.mojom.h"
diff --git a/content/public/browser/background_sync_registration.h b/content/public/browser/background_sync_registration.h index c6c0a1b1..0745e1ff 100644 --- a/content/public/browser/background_sync_registration.h +++ b/content/public/browser/background_sync_registration.h
@@ -7,7 +7,7 @@ #include <stdint.h> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/time/time.h" #include "content/common/content_export.h" #include "third_party/blink/public/mojom/background_sync/background_sync.mojom.h"
diff --git a/content/public/browser/bluetooth_chooser.h b/content/public/browser/bluetooth_chooser.h index 0a9bb37..4ce8c09 100644 --- a/content/public/browser/bluetooth_chooser.h +++ b/content/public/browser/bluetooth_chooser.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "content/common/content_export.h" namespace content {
diff --git a/content/public/browser/bluetooth_scanning_prompt.h b/content/public/browser/bluetooth_scanning_prompt.h index d7ffe00..427242b 100644 --- a/content/public/browser/bluetooth_scanning_prompt.h +++ b/content/public/browser/bluetooth_scanning_prompt.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "content/common/content_export.h" namespace content {
diff --git a/content/public/browser/browser_accessibility_state.h b/content/public/browser/browser_accessibility_state.h index 5a18fb3..b49f76ce 100644 --- a/content/public/browser/browser_accessibility_state.h +++ b/content/public/browser/browser_accessibility_state.h
@@ -5,8 +5,8 @@ #ifndef CONTENT_PUBLIC_BROWSER_BROWSER_ACCESSIBILITY_STATE_H_ #define CONTENT_PUBLIC_BROWSER_BROWSER_ACCESSIBILITY_STATE_H_ -#include "base/callback_forward.h" #include "base/callback_list.h" +#include "base/functional/callback_forward.h" #include "build/build_config.h" #include "content/common/content_export.h" #include "content/public/browser/browser_context.h"
diff --git a/content/public/browser/browser_associated_interface.h b/content/public/browser/browser_associated_interface.h index 94cb2d0..f2c797f7 100644 --- a/content/public/browser/browser_associated_interface.h +++ b/content/public/browser/browser_associated_interface.h
@@ -5,7 +5,7 @@ #ifndef CONTENT_PUBLIC_BROWSER_BROWSER_ASSOCIATED_INTERFACE_H_ #define CONTENT_PUBLIC_BROWSER_BROWSER_ASSOCIATED_INTERFACE_H_ -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h" #include "content/public/browser/browser_message_filter.h"
diff --git a/content/public/browser/browser_child_process_host.h b/content/public/browser/browser_child_process_host.h index 156bde80..bf0c41ee 100644 --- a/content/public/browser/browser_child_process_host.h +++ b/content/public/browser/browser_child_process_host.h
@@ -8,8 +8,8 @@ #include <memory> #include <string> -#include "base/callback.h" #include "base/environment.h" +#include "base/functional/callback.h" #include "base/process/kill.h" #include "base/process/process.h" #include "build/build_config.h"
diff --git a/content/public/browser/browser_context.h b/content/public/browser/browser_context.h index 7f265510..06e6c9f 100644 --- a/content/public/browser/browser_context.h +++ b/content/public/browser/browser_context.h
@@ -14,7 +14,7 @@ #include <unordered_set> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/weak_ptr.h" #include "base/supports_user_data.h" #include "content/common/content_export.h"
diff --git a/content/public/browser/browser_main_parts.h b/content/public/browser/browser_main_parts.h index 63d4423a..5b97d61 100644 --- a/content/public/browser/browser_main_parts.h +++ b/content/public/browser/browser_main_parts.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/types/strong_alias.h" #include "content/common/content_export.h"
diff --git a/content/public/browser/browser_message_filter.cc b/content/public/browser/browser_message_filter.cc index b9b143f..704d0d0 100644 --- a/content/public/browser/browser_message_filter.cc +++ b/content/public/browser/browser_message_filter.cc
@@ -4,11 +4,11 @@ #include "content/public/browser/browser_message_filter.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/check_op.h" #include "base/command_line.h" #include "base/debug/dump_without_crashing.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/notreached.h" #include "base/process/process_handle.h" #include "base/task/sequenced_task_runner.h"
diff --git a/content/public/browser/browser_plugin_guest_manager.h b/content/public/browser/browser_plugin_guest_manager.h index 5748f54..954c1fb0 100644 --- a/content/public/browser/browser_plugin_guest_manager.h +++ b/content/public/browser/browser_plugin_guest_manager.h
@@ -5,7 +5,7 @@ #ifndef CONTENT_PUBLIC_BROWSER_BROWSER_PLUGIN_GUEST_MANAGER_H_ #define CONTENT_PUBLIC_BROWSER_BROWSER_PLUGIN_GUEST_MANAGER_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "content/common/content_export.h" namespace content {
diff --git a/content/public/browser/browser_thread.h b/content/public/browser/browser_thread.h index 5114f71ec..e7fc967 100644 --- a/content/public/browser/browser_thread.h +++ b/content/public/browser/browser_thread.h
@@ -9,8 +9,8 @@ #include <string> #include <utility> -#include "base/callback.h" #include "base/check.h" +#include "base/functional/callback.h" #include "base/location.h" #include "base/memory/scoped_refptr.h" #include "base/task/single_thread_task_runner.h"
diff --git a/content/public/browser/browsing_data_filter_builder.h b/content/public/browser/browsing_data_filter_builder.h index 4991cbf..0c31b896 100644 --- a/content/public/browser/browsing_data_filter_builder.h +++ b/content/public/browser/browsing_data_filter_builder.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "content/common/content_export.h" #include "content/public/browser/storage_partition.h" #include "net/cookies/cookie_partition_key_collection.h"
diff --git a/content/public/browser/browsing_data_remover.h b/content/public/browser/browsing_data_remover.h index df40f25..09282dd 100644 --- a/content/public/browser/browsing_data_remover.h +++ b/content/public/browser/browsing_data_remover.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/time/time.h" #include "build/build_config.h"
diff --git a/content/public/browser/browsing_data_remover_delegate.h b/content/public/browser/browsing_data_remover_delegate.h index ee75332..0821cbd 100644 --- a/content/public/browser/browsing_data_remover_delegate.h +++ b/content/public/browser/browsing_data_remover_delegate.h
@@ -7,7 +7,7 @@ #include <string> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" namespace base { class Time;
diff --git a/content/public/browser/browsing_topics_site_data_manager.h b/content/public/browser/browsing_topics_site_data_manager.h index 57ee6f3c25..78e150c 100644 --- a/content/public/browser/browsing_topics_site_data_manager.h +++ b/content/public/browser/browsing_topics_site_data_manager.h
@@ -5,8 +5,8 @@ #ifndef CONTENT_PUBLIC_BROWSER_BROWSING_TOPICS_SITE_DATA_MANAGER_H_ #define CONTENT_PUBLIC_BROWSER_BROWSING_TOPICS_SITE_DATA_MANAGER_H_ -#include "base/callback.h" #include "base/containers/flat_set.h" +#include "base/functional/callback.h" #include "components/browsing_topics/common/common_types.h" #include "content/common/content_export.h"
diff --git a/content/public/browser/clear_site_data_utils.h b/content/public/browser/clear_site_data_utils.h index e2bbcc8..b746aa4 100644 --- a/content/public/browser/clear_site_data_utils.h +++ b/content/public/browser/clear_site_data_utils.h
@@ -5,7 +5,7 @@ #ifndef CONTENT_PUBLIC_BROWSER_CLEAR_SITE_DATA_UTILS_H_ #define CONTENT_PUBLIC_BROWSER_CLEAR_SITE_DATA_UTILS_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "content/common/content_export.h" #include "net/cookies/cookie_partition_key.h" #include "third_party/blink/public/common/storage_key/storage_key.h"
diff --git a/content/public/browser/commit_deferring_condition.h b/content/public/browser/commit_deferring_condition.h index a03c2c6..c3893c0 100644 --- a/content/public/browser/commit_deferring_condition.h +++ b/content/public/browser/commit_deferring_condition.h
@@ -5,7 +5,7 @@ #ifndef CONTENT_PUBLIC_BROWSER_COMMIT_DEFERRING_CONDITION_H_ #define CONTENT_PUBLIC_BROWSER_COMMIT_DEFERRING_CONDITION_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/safe_ref.h" #include "content/common/content_export.h"
diff --git a/content/public/browser/content_browser_client.cc b/content/public/browser/content_browser_client.cc index 6830d806..8b9c7cb6 100644 --- a/content/public/browser/content_browser_client.cc +++ b/content/public/browser/content_browser_client.cc
@@ -6,10 +6,10 @@ #include <utility> -#include "base/callback_helpers.h" #include "base/check.h" #include "base/feature_list.h" #include "base/files/file_path.h" +#include "base/functional/callback_helpers.h" #include "base/guid.h" #include "base/no_destructor.h" #include "base/notreached.h"
diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h index d582ad40..0daa50aa 100644 --- a/content/public/browser/content_browser_client.h +++ b/content/public/browser/content_browser_client.h
@@ -13,9 +13,9 @@ #include <string> #include <vector> -#include "base/callback_forward.h" #include "base/containers/flat_map.h" #include "base/containers/flat_set.h" +#include "base/functional/callback_forward.h" #include "base/memory/scoped_refptr.h" #include "base/strings/string_piece_forward.h" #include "base/time/time.h"
diff --git a/content/public/browser/content_index_context.h b/content/public/browser/content_index_context.h index 93bd82d..32efab7 100644 --- a/content/public/browser/content_index_context.h +++ b/content/public/browser/content_index_context.h
@@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "content/common/content_export.h" #include "content/public/browser/content_index_provider.h" #include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/content/public/browser/cors_origin_pattern_setter.cc b/content/public/browser/cors_origin_pattern_setter.cc index 85a1315..58199ba 100644 --- a/content/public/browser/cors_origin_pattern_setter.cc +++ b/content/public/browser/cors_origin_pattern_setter.cc
@@ -7,7 +7,7 @@ #include <memory> #include "base/barrier_closure.h" -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ref_counted.h" #include "content/public/browser/browser_context.h" #include "content/public/browser/shared_cors_origin_access_list.h"
diff --git a/content/public/browser/cors_origin_pattern_setter.h b/content/public/browser/cors_origin_pattern_setter.h index ed83d41..29ca678 100644 --- a/content/public/browser/cors_origin_pattern_setter.h +++ b/content/public/browser/cors_origin_pattern_setter.h
@@ -9,7 +9,7 @@ #include <vector> #include "base/barrier_closure.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/types/pass_key.h" #include "content/common/content_export.h" #include "services/network/public/mojom/cors_origin_pattern.mojom.h"
diff --git a/content/public/browser/devtools_agent_host.h b/content/public/browser/devtools_agent_host.h index 291acc63..8016cc5f 100644 --- a/content/public/browser/devtools_agent_host.h +++ b/content/public/browser/devtools_agent_host.h
@@ -9,9 +9,9 @@ #include <string> #include <vector> -#include "base/callback.h" #include "base/containers/span.h" #include "base/files/file_path.h" +#include "base/functional/callback.h" #include "base/functional/callback_forward.h" #include "base/memory/ref_counted.h" #include "base/time/time.h"
diff --git a/content/public/browser/devtools_frontend_host.h b/content/public/browser/devtools_frontend_host.h index 8b8b2846..aa57626 100644 --- a/content/public/browser/devtools_frontend_host.h +++ b/content/public/browser/devtools_frontend_host.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" #include "base/values.h" #include "content/common/content_export.h"
diff --git a/content/public/browser/document_service.h b/content/public/browser/document_service.h index 196ed7e..d5bbbe8 100644 --- a/content/public/browser/document_service.h +++ b/content/public/browser/document_service.h
@@ -8,8 +8,8 @@ #include <cstdint> #include <utility> -#include "base/bind.h" #include "base/check.h" +#include "base/functional/bind.h" #include "base/strings/string_piece.h" #include "base/threading/thread_checker.h" #include "content/public/browser/document_service_internal.h"
diff --git a/content/public/browser/dom_storage_context.h b/content/public/browser/dom_storage_context.h index ee346f3..7e3877e3 100644 --- a/content/public/browser/dom_storage_context.h +++ b/content/public/browser/dom_storage_context.h
@@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" namespace blink { class StorageKey;
diff --git a/content/public/browser/download_manager.h b/content/public/browser/download_manager.h index a9910fa1..af60df69 100644 --- a/content/public/browser/download_manager.h +++ b/content/public/browser/download_manager.h
@@ -33,8 +33,8 @@ #include <string> #include <vector> -#include "base/callback.h" #include "base/files/file_path.h" +#include "base/functional/callback.h" #include "base/task/sequenced_task_runner.h" #include "base/time/time.h" #include "components/download/public/common/download_interrupt_reasons.h"
diff --git a/content/public/browser/download_manager_delegate.cc b/content/public/browser/download_manager_delegate.cc index 07477b95b..31562041 100644 --- a/content/public/browser/download_manager_delegate.cc +++ b/content/public/browser/download_manager_delegate.cc
@@ -4,8 +4,8 @@ #include "content/public/browser/download_manager_delegate.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/task/single_thread_task_runner.h" #include "components/download/public/common/download_item.h" #include "content/public/browser/web_contents_delegate.h" @@ -106,12 +106,6 @@ DownloadManagerDelegate::~DownloadManagerDelegate() {} -std::unique_ptr<download::DownloadItemRenameHandler> -DownloadManagerDelegate::GetRenameHandlerForDownload( - download::DownloadItem* download_item) { - return nullptr; -} - download::DownloadItem* DownloadManagerDelegate::GetDownloadByGuid( const std::string& guid) { return nullptr;
diff --git a/content/public/browser/download_manager_delegate.h b/content/public/browser/download_manager_delegate.h index 56e004d..01a96aca 100644 --- a/content/public/browser/download_manager_delegate.h +++ b/content/public/browser/download_manager_delegate.h
@@ -7,11 +7,10 @@ #include <stdint.h> -#include "base/callback.h" #include "base/files/file_path.h" +#include "base/functional/callback.h" #include "components/download/public/common/download_danger_type.h" #include "components/download/public/common/download_item.h" -#include "components/download/public/common/download_item_rename_handler.h" #include "components/download/public/common/download_url_parameters.h" #include "components/download/public/common/quarantine_connection.h" #include "content/common/content_export.h" @@ -222,13 +221,6 @@ virtual download::QuarantineConnectionCallback GetQuarantineConnectionCallback(); - // Gets a handler to perform the rename for a download item. If no special - // rename handling is required, don't override this, as the default - // implementation returns null, which indicates that the default rename - // handling should be performed. - virtual std::unique_ptr<download::DownloadItemRenameHandler> - GetRenameHandlerForDownload(download::DownloadItem* download_item); - // Gets a |DownloadItem| from the GUID, or null if no such GUID is available. virtual download::DownloadItem* GetDownloadByGuid(const std::string& guid);
diff --git a/content/public/browser/file_system_access_permission_grant.h b/content/public/browser/file_system_access_permission_grant.h index 1b6f8d7d..6e72ef3 100644 --- a/content/public/browser/file_system_access_permission_grant.h +++ b/content/public/browser/file_system_access_permission_grant.h
@@ -5,7 +5,7 @@ #ifndef CONTENT_PUBLIC_BROWSER_FILE_SYSTEM_ACCESS_PERMISSION_GRANT_H_ #define CONTENT_PUBLIC_BROWSER_FILE_SYSTEM_ACCESS_PERMISSION_GRANT_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/ref_counted.h" #include "base/observer_list.h" #include "base/observer_list_types.h"
diff --git a/content/public/browser/first_party_sets_handler.h b/content/public/browser/first_party_sets_handler.h index ab90a348..937b598 100644 --- a/content/public/browser/first_party_sets_handler.h +++ b/content/public/browser/first_party_sets_handler.h
@@ -8,8 +8,8 @@ #include <set> #include <string> -#include "base/callback.h" #include "base/files/file.h" +#include "base/functional/callback.h" #include "base/types/expected.h" #include "base/values.h" #include "base/version.h"
diff --git a/content/public/browser/font_list_async.h b/content/public/browser/font_list_async.h index b71cad5..3eb0ed1 100644 --- a/content/public/browser/font_list_async.h +++ b/content/public/browser/font_list_async.h
@@ -5,7 +5,7 @@ #ifndef CONTENT_PUBLIC_BROWSER_FONT_LIST_ASYNC_H_ #define CONTENT_PUBLIC_BROWSER_FONT_LIST_ASYNC_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/values.h" #include "content/common/content_export.h"
diff --git a/content/public/browser/gpu_data_manager.h b/content/public/browser/gpu_data_manager.h index 2620678..89664dd 100644 --- a/content/public/browser/gpu_data_manager.h +++ b/content/public/browser/gpu_data_manager.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/process/process.h" #include "content/common/content_export.h" #include "gpu/config/gpu_feature_info.h"
diff --git a/content/public/browser/gpu_feature_checker.h b/content/public/browser/gpu_feature_checker.h index d079007..d4dd6e40 100644 --- a/content/public/browser/gpu_feature_checker.h +++ b/content/public/browser/gpu_feature_checker.h
@@ -5,7 +5,7 @@ #ifndef CONTENT_PUBLIC_BROWSER_GPU_FEATURE_CHECKER_H_ #define CONTENT_PUBLIC_BROWSER_GPU_FEATURE_CHECKER_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/ref_counted.h" #include "content/common/content_export.h" #include "gpu/config/gpu_feature_type.h"
diff --git a/content/public/browser/gpu_utils.cc b/content/public/browser/gpu_utils.cc index 2e9fb517..3c09b41 100644 --- a/content/public/browser/gpu_utils.cc +++ b/content/public/browser/gpu_utils.cc
@@ -6,8 +6,8 @@ #include <string> -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/strings/string_number_conversions.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h"
diff --git a/content/public/browser/gpu_utils.h b/content/public/browser/gpu_utils.h index ac4eb9e3..fe59ed8 100644 --- a/content/public/browser/gpu_utils.h +++ b/content/public/browser/gpu_utils.h
@@ -5,8 +5,8 @@ #ifndef CONTENT_PUBLIC_BROWSER_GPU_UTILS_H_ #define CONTENT_PUBLIC_BROWSER_GPU_UTILS_H_ -#include "base/callback_forward.h" #include "base/clang_profiling_buildflags.h" +#include "base/functional/callback_forward.h" #include "content/common/content_export.h" #include "gpu/config/gpu_preferences.h"
diff --git a/content/public/browser/hid_chooser.h b/content/public/browser/hid_chooser.h index 0dccd95..20e08fe 100644 --- a/content/public/browser/hid_chooser.h +++ b/content/public/browser/hid_chooser.h
@@ -7,7 +7,7 @@ #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "content/common/content_export.h" #include "services/device/public/mojom/hid.mojom-forward.h"
diff --git a/content/public/browser/histogram_fetcher.h b/content/public/browser/histogram_fetcher.h index bbe3753..039f55bd 100644 --- a/content/public/browser/histogram_fetcher.h +++ b/content/public/browser/histogram_fetcher.h
@@ -5,7 +5,7 @@ #ifndef CONTENT_PUBLIC_BROWSER_HISTOGRAM_FETCHER_H_ #define CONTENT_PUBLIC_BROWSER_HISTOGRAM_FETCHER_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/task/task_runner.h" #include "base/time/time.h" #include "content/common/content_export.h"
diff --git a/content/public/browser/host_zoom_map.h b/content/public/browser/host_zoom_map.h index 0eba58e2..99bf08d 100644 --- a/content/public/browser/host_zoom_map.h +++ b/content/public/browser/host_zoom_map.h
@@ -10,8 +10,8 @@ #include <string> #include <vector> -#include "base/callback.h" #include "base/callback_list.h" +#include "base/functional/callback.h" #include "base/time/time.h" #include "content/common/content_export.h" #include "url/gurl.h"
diff --git a/content/public/browser/identity_request_dialog_controller.h b/content/public/browser/identity_request_dialog_controller.h index d61b2fc..3cec0b3 100644 --- a/content/public/browser/identity_request_dialog_controller.h +++ b/content/public/browser/identity_request_dialog_controller.h
@@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "content/common/content_export.h" #include "content/public/browser/identity_request_account.h" #include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/content/public/browser/installed_payment_apps_finder.h b/content/public/browser/installed_payment_apps_finder.h index ed851f9..b1ee3ee2c 100644 --- a/content/public/browser/installed_payment_apps_finder.h +++ b/content/public/browser/installed_payment_apps_finder.h
@@ -5,7 +5,7 @@ #ifndef CONTENT_PUBLIC_BROWSER_INSTALLED_PAYMENT_APPS_FINDER_H_ #define CONTENT_PUBLIC_BROWSER_INSTALLED_PAYMENT_APPS_FINDER_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "content/common/content_export.h" #include "content/public/browser/stored_payment_app.h"
diff --git a/content/public/browser/interest_group_manager.h b/content/public/browser/interest_group_manager.h index 58a3441..0b3d7791 100644 --- a/content/public/browser/interest_group_manager.h +++ b/content/public/browser/interest_group_manager.h
@@ -5,7 +5,7 @@ #ifndef CONTENT_PUBLIC_BROWSER_INTEREST_GROUP_MANAGER_H_ #define CONTENT_PUBLIC_BROWSER_INTEREST_GROUP_MANAGER_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "content/common/content_export.h" #include "url/origin.h"
diff --git a/content/public/browser/javascript_dialog_manager.h b/content/public/browser/javascript_dialog_manager.h index bb0abafe..5294e9a 100644 --- a/content/public/browser/javascript_dialog_manager.h +++ b/content/public/browser/javascript_dialog_manager.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "content/common/content_export.h" #include "content/public/common/javascript_dialog_type.h" #include "ui/gfx/native_widget_types.h"
diff --git a/content/public/browser/k_anonymity_service_delegate.h b/content/public/browser/k_anonymity_service_delegate.h index c005bb35..255302b8 100644 --- a/content/public/browser/k_anonymity_service_delegate.h +++ b/content/public/browser/k_anonymity_service_delegate.h
@@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/time/time.h" #include "content/common/content_export.h"
diff --git a/content/public/browser/manifest_icon_downloader.h b/content/public/browser/manifest_icon_downloader.h index 5884d48..5e48b83e 100644 --- a/content/public/browser/manifest_icon_downloader.h +++ b/content/public/browser/manifest_icon_downloader.h
@@ -7,7 +7,7 @@ #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/weak_ptr.h" #include "content/common/content_export.h" #include "content/public/browser/global_routing_id.h"
diff --git a/content/public/browser/media_stream_request.h b/content/public/browser/media_stream_request.h index cbe6784..56a7571 100644 --- a/content/public/browser/media_stream_request.h +++ b/content/public/browser/media_stream_request.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "build/build_config.h" #include "content/common/content_export.h" #include "content/public/browser/desktop_media_id.h"
diff --git a/content/public/browser/mhtml_generation_result.h b/content/public/browser/mhtml_generation_result.h index 2b2c07f..0186f44 100644 --- a/content/public/browser/mhtml_generation_result.h +++ b/content/public/browser/mhtml_generation_result.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "content/common/content_export.h" #include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/content/public/browser/navigation_throttle.h b/content/public/browser/navigation_throttle.h index 57e4650..fb335d4a 100644 --- a/content/public/browser/navigation_throttle.h +++ b/content/public/browser/navigation_throttle.h
@@ -5,7 +5,7 @@ #ifndef CONTENT_PUBLIC_BROWSER_NAVIGATION_THROTTLE_H_ #define CONTENT_PUBLIC_BROWSER_NAVIGATION_THROTTLE_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "content/common/content_export.h" #include "net/base/net_errors.h"
diff --git a/content/public/browser/network_service_instance.h b/content/public/browser/network_service_instance.h index b2d2eee..705188d 100644 --- a/content/public/browser/network_service_instance.h +++ b/content/public/browser/network_service_instance.h
@@ -5,8 +5,8 @@ #ifndef CONTENT_PUBLIC_BROWSER_NETWORK_SERVICE_INSTANCE_H_ #define CONTENT_PUBLIC_BROWSER_NETWORK_SERVICE_INSTANCE_H_ -#include "base/callback.h" #include "base/callback_list.h" +#include "base/functional/callback.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h" #include "content/common/content_export.h"
diff --git a/content/public/browser/notification_event_dispatcher.h b/content/public/browser/notification_event_dispatcher.h index f9cf814d..d6d516a6 100644 --- a/content/public/browser/notification_event_dispatcher.h +++ b/content/public/browser/notification_event_dispatcher.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "content/common/content_export.h" #include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/content/public/browser/page.h b/content/public/browser/page.h index b503d78..537a2a746 100644 --- a/content/public/browser/page.h +++ b/content/public/browser/page.h
@@ -5,7 +5,7 @@ #ifndef CONTENT_PUBLIC_BROWSER_PAGE_H_ #define CONTENT_PUBLIC_BROWSER_PAGE_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/supports_user_data.h" #include "content/common/content_export.h" #include "content/public/browser/render_frame_host.h"
diff --git a/content/public/browser/payment_app_provider.h b/content/public/browser/payment_app_provider.h index 42c10ed0..de0efee 100644 --- a/content/public/browser/payment_app_provider.h +++ b/content/public/browser/payment_app_provider.h
@@ -5,7 +5,7 @@ #ifndef CONTENT_PUBLIC_BROWSER_PAYMENT_APP_PROVIDER_H_ #define CONTENT_PUBLIC_BROWSER_PAYMENT_APP_PROVIDER_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "content/common/content_export.h" #include "third_party/blink/public/mojom/payments/payment_app.mojom.h"
diff --git a/content/public/browser/platform_notification_context.h b/content/public/browser/platform_notification_context.h index 3bc11c4..e5cdf208 100644 --- a/content/public/browser/platform_notification_context.h +++ b/content/public/browser/platform_notification_context.h
@@ -10,7 +10,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/ref_counted.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_database_data.h"
diff --git a/content/public/browser/platform_notification_service.h b/content/public/browser/platform_notification_service.h index 2cb0d1fc..d9e36712 100644 --- a/content/public/browser/platform_notification_service.h +++ b/content/public/browser/platform_notification_service.h
@@ -12,7 +12,7 @@ #include <string> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/time/time.h" #include "content/common/content_export.h" #include "content/public/browser/notification_database_data.h"
diff --git a/content/public/browser/plugin_service.h b/content/public/browser/plugin_service.h index 0cd7b92..7a1304a 100644 --- a/content/public/browser/plugin_service.h +++ b/content/public/browser/plugin_service.h
@@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "build/build_config.h" #include "content/common/content_export.h" #include "ppapi/buildflags/buildflags.h"
diff --git a/content/public/browser/preloading_data.h b/content/public/browser/preloading_data.h index afbe73aa..6fd21cc0 100644 --- a/content/public/browser/preloading_data.h +++ b/content/public/browser/preloading_data.h
@@ -5,7 +5,7 @@ #ifndef CONTENT_PUBLIC_BROWSER_PRELOADING_DATA_H_ #define CONTENT_PUBLIC_BROWSER_PRELOADING_DATA_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "content/common/content_export.h" #include "content/public/browser/preloading.h" #include "services/metrics/public/cpp/ukm_source_id.h"
diff --git a/content/public/browser/presentation_service_delegate.h b/content/public/browser/presentation_service_delegate.h index 03cff0d..c9e428a 100644 --- a/content/public/browser/presentation_service_delegate.h +++ b/content/public/browser/presentation_service_delegate.h
@@ -10,7 +10,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "content/common/content_export.h" #include "media/base/flinging_controller.h" #include "mojo/public/cpp/bindings/pending_receiver.h"
diff --git a/content/public/browser/profiling_utils.h b/content/public/browser/profiling_utils.h index 1bda7859..f12b5138 100644 --- a/content/public/browser/profiling_utils.h +++ b/content/public/browser/profiling_utils.h
@@ -5,7 +5,7 @@ #ifndef CONTENT_PUBLIC_BROWSER_PROFILING_UTILS_H_ #define CONTENT_PUBLIC_BROWSER_PROFILING_UTILS_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "content/common/content_export.h" namespace content {
diff --git a/content/public/browser/provision_fetcher_impl.cc b/content/public/browser/provision_fetcher_impl.cc index 8b769d84..c1387dc 100644 --- a/content/public/browser/provision_fetcher_impl.cc +++ b/content/public/browser/provision_fetcher_impl.cc
@@ -4,7 +4,7 @@ #include "content/public/browser/provision_fetcher_impl.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "content/public/browser/provision_fetcher_factory.h" #include "mojo/public/cpp/bindings/self_owned_receiver.h" #include "services/network/public/cpp/shared_url_loader_factory.h"
diff --git a/content/public/browser/push_messaging_service.cc b/content/public/browser/push_messaging_service.cc index cb57e83c..395536ab 100644 --- a/content/public/browser/push_messaging_service.cc +++ b/content/public/browser/push_messaging_service.cc
@@ -4,8 +4,8 @@ #include "content/public/browser/push_messaging_service.h" -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "content/browser/push_messaging/push_messaging_manager.h" #include "content/browser/service_worker/service_worker_context_wrapper.h" #include "content/public/browser/browser_context.h"
diff --git a/content/public/browser/push_messaging_service.h b/content/public/browser/push_messaging_service.h index 7ae0804..c778585 100644 --- a/content/public/browser/push_messaging_service.h +++ b/content/public/browser/push_messaging_service.h
@@ -9,7 +9,7 @@ #include <string> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/time/time.h" #include "content/common/content_export.h" #include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/content/public/browser/remote_cocoa.h b/content/public/browser/remote_cocoa.h index e2c91c0..7813508 100644 --- a/content/public/browser/remote_cocoa.h +++ b/content/public/browser/remote_cocoa.h
@@ -7,7 +7,7 @@ #import <Cocoa/Cocoa.h> -#include "base/callback.h" +#include "base/functional/callback.h" #include "content/common/content_export.h" #include "mojo/public/cpp/bindings/scoped_interface_endpoint_handle.h"
diff --git a/content/public/browser/render_frame_host.h b/content/public/browser/render_frame_host.h index 02eae9c..9591157 100644 --- a/content/public/browser/render_frame_host.h +++ b/content/public/browser/render_frame_host.h
@@ -9,8 +9,8 @@ #include <utility> #include <vector> -#include "base/callback_forward.h" #include "base/containers/flat_set.h" +#include "base/functional/callback_forward.h" #include "base/functional/function_ref.h" #include "base/values.h" #include "build/build_config.h"
diff --git a/content/public/browser/render_widget_host.h b/content/public/browser/render_widget_host.h index 21c22c0..f2e2592 100644 --- a/content/public/browser/render_widget_host.h +++ b/content/public/browser/render_widget_host.h
@@ -10,7 +10,7 @@ #include <memory> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/i18n/rtl.h" #include "build/build_config.h" #include "content/common/content_export.h"
diff --git a/content/public/browser/same_site_data_remover.h b/content/public/browser/same_site_data_remover.h index a9820ea..d9b0fdb3 100644 --- a/content/public/browser/same_site_data_remover.h +++ b/content/public/browser/same_site_data_remover.h
@@ -7,7 +7,7 @@ #include <set> -#include "base/callback.h" +#include "base/functional/callback.h" #include "content/common/content_export.h" namespace url {
diff --git a/content/public/browser/serial_chooser.h b/content/public/browser/serial_chooser.h index 748238e..6e3074425 100644 --- a/content/public/browser/serial_chooser.h +++ b/content/public/browser/serial_chooser.h
@@ -5,7 +5,7 @@ #ifndef CONTENT_PUBLIC_BROWSER_SERIAL_CHOOSER_H_ #define CONTENT_PUBLIC_BROWSER_SERIAL_CHOOSER_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "content/common/content_export.h" #include "services/device/public/mojom/serial.mojom-forward.h"
diff --git a/content/public/browser/service_process_host.h b/content/public/browser/service_process_host.h index a308d46..c46ee10e 100644 --- a/content/public/browser/service_process_host.h +++ b/content/public/browser/service_process_host.h
@@ -10,8 +10,8 @@ #include <utility> #include <vector> -#include "base/callback.h" #include "base/command_line.h" +#include "base/functional/callback.h" #include "base/observer_list_types.h" #include "base/process/process_handle.h" #include "base/strings/string_piece.h"
diff --git a/content/public/browser/service_worker_context.h b/content/public/browser/service_worker_context.h index eba701d..e2e907c 100644 --- a/content/public/browser/service_worker_context.h +++ b/content/public/browser/service_worker_context.h
@@ -9,7 +9,7 @@ #include <string> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/task/sequenced_task_runner.h" #include "content/common/content_export.h" #include "content/public/browser/browser_thread.h"
diff --git a/content/public/browser/site_isolation_policy.cc b/content/public/browser/site_isolation_policy.cc index 2e8cbe4..62d67b7 100644 --- a/content/public/browser/site_isolation_policy.cc +++ b/content/public/browser/site_isolation_policy.cc
@@ -10,10 +10,10 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/command_line.h" #include "base/containers/flat_set.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/metrics/field_trial_params.h" #include "base/no_destructor.h" #include "base/strings/string_split.h"
diff --git a/content/public/browser/speech_recognition_manager.h b/content/public/browser/speech_recognition_manager.h index 2dd3d69a5..ba8cd6a 100644 --- a/content/public/browser/speech_recognition_manager.h +++ b/content/public/browser/speech_recognition_manager.h
@@ -5,7 +5,7 @@ #ifndef CONTENT_PUBLIC_BROWSER_SPEECH_RECOGNITION_MANAGER_H_ #define CONTENT_PUBLIC_BROWSER_SPEECH_RECOGNITION_MANAGER_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "content/common/content_export.h" namespace content {
diff --git a/content/public/browser/speech_recognition_manager_delegate.h b/content/public/browser/speech_recognition_manager_delegate.h index 2bf2467..c94e867 100644 --- a/content/public/browser/speech_recognition_manager_delegate.h +++ b/content/public/browser/speech_recognition_manager_delegate.h
@@ -5,7 +5,7 @@ #ifndef CONTENT_PUBLIC_BROWSER_SPEECH_RECOGNITION_MANAGER_DELEGATE_H_ #define CONTENT_PUBLIC_BROWSER_SPEECH_RECOGNITION_MANAGER_DELEGATE_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" namespace content {
diff --git a/content/public/browser/ssl_host_state_delegate.h b/content/public/browser/ssl_host_state_delegate.h index 2177b237..0f7784a 100644 --- a/content/public/browser/ssl_host_state_delegate.h +++ b/content/public/browser/ssl_host_state_delegate.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "net/cert/x509_certificate.h" namespace content {
diff --git a/content/public/browser/storage_notification_service.h b/content/public/browser/storage_notification_service.h index d5b33d9..cd8c95d1 100644 --- a/content/public/browser/storage_notification_service.h +++ b/content/public/browser/storage_notification_service.h
@@ -5,7 +5,7 @@ #ifndef CONTENT_PUBLIC_BROWSER_STORAGE_NOTIFICATION_SERVICE_H_ #define CONTENT_PUBLIC_BROWSER_STORAGE_NOTIFICATION_SERVICE_H_ -#include "base/bind.h" +#include "base/functional/bind.h" #include "url/origin.h" namespace blink {
diff --git a/content/public/browser/storage_partition.h b/content/public/browser/storage_partition.h index 3a1974a..380e808 100644 --- a/content/public/browser/storage_partition.h +++ b/content/public/browser/storage_partition.h
@@ -9,7 +9,7 @@ #include <set> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/observer_list_types.h" #include "base/time/time.h" #include "build/build_config.h"
diff --git a/content/public/browser/tracing_controller.h b/content/public/browser/tracing_controller.h index 02a7829..00f68a6 100644 --- a/content/public/browser/tracing_controller.h +++ b/content/public/browser/tracing_controller.h
@@ -11,7 +11,7 @@ #include <set> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/ref_counted.h" #include "base/task/task_traits.h" #include "content/common/content_export.h"
diff --git a/content/public/browser/tracing_delegate.h b/content/public/browser/tracing_delegate.h index edc7b52..7827988c 100644 --- a/content/public/browser/tracing_delegate.h +++ b/content/public/browser/tracing_delegate.h
@@ -5,7 +5,7 @@ #ifndef CONTENT_PUBLIC_BROWSER_TRACING_DELEGATE_H_ #define CONTENT_PUBLIC_BROWSER_TRACING_DELEGATE_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/values.h" #include "content/common/content_export.h" #include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/content/public/browser/tts_controller.h b/content/public/browser/tts_controller.h index 6592b41f..3d17c9a 100644 --- a/content/public/browser/tts_controller.h +++ b/content/public/browser/tts_controller.h
@@ -11,7 +11,7 @@ #include <string> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/singleton.h" #include "base/observer_list_types.h" #include "base/scoped_observation_traits.h"
diff --git a/content/public/browser/tts_environment_android.h b/content/public/browser/tts_environment_android.h index fddee44..ed286ad 100644 --- a/content/public/browser/tts_environment_android.h +++ b/content/public/browser/tts_environment_android.h
@@ -5,7 +5,7 @@ #ifndef CONTENT_PUBLIC_BROWSER_TTS_ENVIRONMENT_ANDROID_H_ #define CONTENT_PUBLIC_BROWSER_TTS_ENVIRONMENT_ANDROID_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "content/common/content_export.h" namespace content {
diff --git a/content/public/browser/url_data_source.h b/content/public/browser/url_data_source.h index c32c97f..d840c36 100644 --- a/content/public/browser/url_data_source.h +++ b/content/public/browser/url_data_source.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/ref_counted.h" #include "content/common/content_export.h" #include "content/public/browser/web_contents.h"
diff --git a/content/public/browser/url_loader_request_interceptor.h b/content/public/browser/url_loader_request_interceptor.h index dc1174d..24e30841 100644 --- a/content/public/browser/url_loader_request_interceptor.h +++ b/content/public/browser/url_loader_request_interceptor.h
@@ -5,7 +5,7 @@ #ifndef CONTENT_PUBLIC_BROWSER_URL_LOADER_REQUEST_INTERCEPTOR_H_ #define CONTENT_PUBLIC_BROWSER_URL_LOADER_REQUEST_INTERCEPTOR_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "mojo/public/cpp/bindings/pending_receiver.h" #include "mojo/public/cpp/bindings/pending_remote.h" #include "services/network/public/mojom/url_loader.mojom.h"
diff --git a/content/public/browser/url_loader_throttles.h b/content/public/browser/url_loader_throttles.h index 8f7cd50..7d55fb261 100644 --- a/content/public/browser/url_loader_throttles.h +++ b/content/public/browser/url_loader_throttles.h
@@ -7,7 +7,7 @@ #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "content/common/content_export.h" namespace blink {
diff --git a/content/public/browser/usb_delegate.h b/content/public/browser/usb_delegate.h index e535a931..4a2f9ff95 100644 --- a/content/public/browser/usb_delegate.h +++ b/content/public/browser/usb_delegate.h
@@ -8,8 +8,8 @@ #include <memory> #include <vector> -#include "base/callback.h" #include "base/containers/span.h" +#include "base/functional/callback.h" #include "base/observer_list_types.h" #include "content/common/content_export.h" #include "mojo/public/cpp/bindings/pending_receiver.h"
diff --git a/content/public/browser/video_capture_device_launcher.h b/content/public/browser/video_capture_device_launcher.h index f3dab72..9cd04647 100644 --- a/content/public/browser/video_capture_device_launcher.h +++ b/content/public/browser/video_capture_device_launcher.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/task/single_thread_task_runner.h" #include "base/token.h" #include "content/common/content_export.h"
diff --git a/content/public/browser/vpn_service_proxy.h b/content/public/browser/vpn_service_proxy.h index 6a0d528..9e6d7cc 100644 --- a/content/public/browser/vpn_service_proxy.h +++ b/content/public/browser/vpn_service_proxy.h
@@ -8,7 +8,7 @@ #include <memory> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "content/common/content_export.h" namespace content {
diff --git a/content/public/browser/web_authentication_request_proxy.h b/content/public/browser/web_authentication_request_proxy.h index 90201f8..96787ab 100644 --- a/content/public/browser/web_authentication_request_proxy.h +++ b/content/public/browser/web_authentication_request_proxy.h
@@ -5,7 +5,7 @@ #ifndef CONTENT_PUBLIC_BROWSER_WEB_AUTHENTICATION_REQUEST_PROXY_H_ #define CONTENT_PUBLIC_BROWSER_WEB_AUTHENTICATION_REQUEST_PROXY_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "third_party/blink/public/mojom/webauthn/authenticator.mojom-forward.h" namespace url {
diff --git a/content/public/browser/web_contents.h b/content/public/browser/web_contents.h index 1fd1561..80bafeb 100644 --- a/content/public/browser/web_contents.h +++ b/content/public/browser/web_contents.h
@@ -12,8 +12,8 @@ #include <string> #include <vector> -#include "base/callback_forward.h" -#include "base/callback_helpers.h" +#include "base/functional/callback_forward.h" +#include "base/functional/callback_helpers.h" #include "base/functional/function_ref.h" #include "base/location.h" #include "base/memory/raw_ptr.h"
diff --git a/content/public/browser/web_contents_delegate.h b/content/public/browser/web_contents_delegate.h index 405a82d..3cec5f88 100644 --- a/content/public/browser/web_contents_delegate.h +++ b/content/public/browser/web_contents_delegate.h
@@ -12,7 +12,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" #include "build/build_config.h" #include "content/common/content_export.h"
diff --git a/content/public/browser/web_contents_view_delegate.cc b/content/public/browser/web_contents_view_delegate.cc index e916fc5..3cb69e1a 100644 --- a/content/public/browser/web_contents_view_delegate.cc +++ b/content/public/browser/web_contents_view_delegate.cc
@@ -7,8 +7,8 @@ #include <stddef.h> #include <utility> -#include "base/callback.h" #include "base/check.h" +#include "base/functional/callback.h" #include "content/public/common/drop_data.h" namespace content {
diff --git a/content/public/browser/web_contents_view_delegate.h b/content/public/browser/web_contents_view_delegate.h index 98e873d2..8a42a912 100644 --- a/content/public/browser/web_contents_view_delegate.h +++ b/content/public/browser/web_contents_view_delegate.h
@@ -9,7 +9,7 @@ #import <Cocoa/Cocoa.h> #endif -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "content/common/content_export.h" #include "third_party/abseil-cpp/absl/types/optional.h" #include "ui/gfx/native_widget_types.h"
diff --git a/content/public/browser/web_ui.h b/content/public/browser/web_ui.h index 3cd9d8d..95c65d15 100644 --- a/content/public/browser/web_ui.h +++ b/content/public/browser/web_ui.h
@@ -10,8 +10,8 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/strings/string_piece.h" #include "base/values.h" #include "content/common/content_export.h"
diff --git a/content/public/browser/web_ui_data_source.h b/content/public/browser/web_ui_data_source.h index 146bfa6..12c3b5b 100644 --- a/content/public/browser/web_ui_data_source.h +++ b/content/public/browser/web_ui_data_source.h
@@ -11,8 +11,8 @@ #include <string> #include <vector> -#include "base/callback.h" #include "base/containers/span.h" +#include "base/functional/callback.h" #include "base/strings/string_piece.h" #include "base/values.h" #include "content/common/content_export.h"
diff --git a/content/public/browser/webrtc_log.h b/content/public/browser/webrtc_log.h index 25c06d7..c79e385d 100644 --- a/content/public/browser/webrtc_log.h +++ b/content/public/browser/webrtc_log.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "content/common/content_export.h" #include "media/media_buildflags.h"
diff --git a/content/public/browser/xr_install_helper.h b/content/public/browser/xr_install_helper.h index 29cfd21..42fdcb65 100644 --- a/content/public/browser/xr_install_helper.h +++ b/content/public/browser/xr_install_helper.h
@@ -5,7 +5,7 @@ #ifndef CONTENT_PUBLIC_BROWSER_XR_INSTALL_HELPER_H_ #define CONTENT_PUBLIC_BROWSER_XR_INSTALL_HELPER_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "content/common/content_export.h" namespace content {
diff --git a/content/public/browser/xr_runtime_manager.h b/content/public/browser/xr_runtime_manager.h index b4f1989d..3e0d52de 100644 --- a/content/public/browser/xr_runtime_manager.h +++ b/content/public/browser/xr_runtime_manager.h
@@ -5,7 +5,7 @@ #ifndef CONTENT_PUBLIC_BROWSER_XR_RUNTIME_MANAGER_H_ #define CONTENT_PUBLIC_BROWSER_XR_RUNTIME_MANAGER_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/observer_list_types.h" #include "content/common/content_export.h" #include "device/vr/public/mojom/vr_service.mojom-forward.h"
diff --git a/content/public/common/main_function_params.h b/content/public/common/main_function_params.h index 9c86bea..8015cfe 100644 --- a/content/public/common/main_function_params.h +++ b/content/public/common/main_function_params.h
@@ -7,8 +7,8 @@ #include <memory> -#include "base/callback.h" #include "base/command_line.h" +#include "base/functional/callback.h" #include "build/build_config.h" #include "content/common/content_export.h"
diff --git a/content/public/common/profiling.cc b/content/public/common/profiling.cc index 100c9204..4e70484d 100644 --- a/content/public/common/profiling.cc +++ b/content/public/common/profiling.cc
@@ -6,9 +6,9 @@ #include "base/at_exit.h" #include "base/base_switches.h" -#include "base/bind.h" #include "base/command_line.h" #include "base/debug/profiler.h" +#include "base/functional/bind.h" #include "base/lazy_instance.h" #include "base/location.h" #include "base/memory/raw_ptr.h"
diff --git a/content/public/common/zygote/zygote_handle.h b/content/public/common/zygote/zygote_handle.h index 217a024f..cfd7c7a 100644 --- a/content/public/common/zygote/zygote_handle.h +++ b/content/public/common/zygote/zygote_handle.h
@@ -5,9 +5,9 @@ #ifndef CONTENT_PUBLIC_COMMON_ZYGOTE_ZYGOTE_HANDLE_H_ #define CONTENT_PUBLIC_COMMON_ZYGOTE_ZYGOTE_HANDLE_H_ -#include "base/callback.h" #include "base/command_line.h" #include "base/files/scoped_file.h" +#include "base/functional/callback.h" #include "build/build_config.h" #include "content/common/content_export.h" #include "content/public/common/zygote/zygote_buildflags.h"
diff --git a/content/public/renderer/content_renderer_client.h b/content/public/renderer/content_renderer_client.h index 09846e00..77f2c4f 100644 --- a/content/public/renderer/content_renderer_client.h +++ b/content/public/renderer/content_renderer_client.h
@@ -12,8 +12,8 @@ #include <string> #include <vector> -#include "base/callback_forward.h" #include "base/files/file_path.h" +#include "base/functional/callback_forward.h" #include "base/memory/ref_counted.h" #include "base/task/sequenced_task_runner.h" #include "base/task/thread_pool/thread_pool_instance.h"
diff --git a/content/public/renderer/key_system_support.h b/content/public/renderer/key_system_support.h index 2d57a873..ff257c53 100644 --- a/content/public/renderer/key_system_support.h +++ b/content/public/renderer/key_system_support.h
@@ -7,8 +7,8 @@ #include <string> -#include "base/callback.h" #include "base/containers/flat_map.h" +#include "base/functional/callback.h" #include "content/common/content_export.h" #include "media/mojo/mojom/key_system_support.mojom.h"
diff --git a/content/public/renderer/render_thread.h b/content/public/renderer/render_thread.h index 13b13fa6..064e267 100644 --- a/content/public/renderer/render_thread.h +++ b/content/public/renderer/render_thread.h
@@ -9,7 +9,7 @@ #include <stdint.h> #include <memory> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/scoped_refptr.h" #include "base/task/single_thread_task_runner.h" #include "components/attribution_reporting/os_support.mojom-forward.h"
diff --git a/content/public/renderer/renderer_ppapi_host.h b/content/public/renderer/renderer_ppapi_host.h index 38ddcd19..8037e81 100644 --- a/content/public/renderer/renderer_ppapi_host.h +++ b/content/public/renderer/renderer_ppapi_host.h
@@ -7,8 +7,8 @@ #include <vector> -#include "base/callback_forward.h" #include "base/files/file.h" +#include "base/functional/callback_forward.h" #include "base/memory/read_only_shared_memory_region.h" #include "base/memory/unsafe_shared_memory_region.h" #include "base/process/process.h"
diff --git a/content/public/renderer/v8_value_converter.h b/content/public/renderer/v8_value_converter.h index 72c1a79..a91f840c 100644 --- a/content/public/renderer/v8_value_converter.h +++ b/content/public/renderer/v8_value_converter.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "content/common/content_export.h" #include "third_party/blink/public/platform/web_v8_value_converter.h" #include "v8/include/v8-forward.h"
diff --git a/content/public/renderer/video_encode_accelerator.cc b/content/public/renderer/video_encode_accelerator.cc index e009bdb..403a9765 100644 --- a/content/public/renderer/video_encode_accelerator.cc +++ b/content/public/renderer/video_encode_accelerator.cc
@@ -4,7 +4,7 @@ #include "content/public/renderer/video_encode_accelerator.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/task/sequenced_task_runner.h" #include "build/build_config.h" #include "content/renderer/render_thread_impl.h"
diff --git a/content/public/renderer/video_encode_accelerator.h b/content/public/renderer/video_encode_accelerator.h index 5a9d119..03274c3 100644 --- a/content/public/renderer/video_encode_accelerator.h +++ b/content/public/renderer/video_encode_accelerator.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/task/sequenced_task_runner.h" #include "content/common/content_export.h" #include "media/video/video_encode_accelerator.h"
diff --git a/content/public/renderer/worker_thread.h b/content/public/renderer/worker_thread.h index 3612c38..03d0fff 100644 --- a/content/public/renderer/worker_thread.h +++ b/content/public/renderer/worker_thread.h
@@ -5,7 +5,7 @@ #ifndef CONTENT_PUBLIC_RENDERER_WORKER_THREAD_H_ #define CONTENT_PUBLIC_RENDERER_WORKER_THREAD_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "content/common/content_export.h" namespace content {
diff --git a/content/public/test/accessibility_notification_waiter.cc b/content/public/test/accessibility_notification_waiter.cc index bdc9db3..9c94cc5 100644 --- a/content/public/test/accessibility_notification_waiter.cc +++ b/content/public/test/accessibility_notification_waiter.cc
@@ -4,7 +4,7 @@ #include "content/public/test/accessibility_notification_waiter.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/no_destructor.h" #include "base/run_loop.h"
diff --git a/content/public/test/android/render_frame_host_test_ext.cc b/content/public/test/android/render_frame_host_test_ext.cc index 8cfce0f..186b61b 100644 --- a/content/public/test/android/render_frame_host_test_ext.cc +++ b/content/public/test/android/render_frame_host_test_ext.cc
@@ -6,7 +6,7 @@ #include "base/android/callback_android.h" #include "base/android/jni_string.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/json/json_string_value_serializer.h" #include "base/memory/ptr_util.h" #include "content/browser/renderer_host/render_frame_host_android.h"
diff --git a/content/public/test/android/web_contents_utils.cc b/content/public/test/android/web_contents_utils.cc index 4812cc5d..0578d2a 100644 --- a/content/public/test/android/web_contents_utils.cc +++ b/content/public/test/android/web_contents_utils.cc
@@ -5,7 +5,7 @@ #include "base/android/jni_android.h" #include "base/android/jni_string.h" #include "base/android/scoped_java_ref.h" -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/json/json_writer.h" #include "content/browser/renderer_host/render_frame_host_impl.h" #include "content/browser/renderer_host/render_widget_host_impl.h"
diff --git a/content/public/test/audio_service_test_helper.cc b/content/public/test/audio_service_test_helper.cc index c55d7f84..99aa07b 100644 --- a/content/public/test/audio_service_test_helper.cc +++ b/content/public/test/audio_service_test_helper.cc
@@ -6,9 +6,9 @@ #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/process/process.h" #include "content/public/common/content_features.h"
diff --git a/content/public/test/background_sync_test_util.cc b/content/public/test/background_sync_test_util.cc index 6974003..c50c1fb 100644 --- a/content/public/test/background_sync_test_util.cc +++ b/content/public/test/background_sync_test_util.cc
@@ -4,7 +4,7 @@ #include "content/public/test/background_sync_test_util.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "content/browser/background_sync/background_sync_context_impl.h" #include "content/browser/background_sync/background_sync_manager.h"
diff --git a/content/public/test/browser_task_environment.cc b/content/public/test/browser_task_environment.cc index b5687bae..610cd62 100644 --- a/content/public/test/browser_task_environment.cc +++ b/content/public/test/browser_task_environment.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" #include "base/check.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/memory/scoped_refptr.h" #include "base/run_loop.h"
diff --git a/content/public/test/browser_task_environment_unittest.cc b/content/public/test/browser_task_environment_unittest.cc index acc230c..bb867e3 100644 --- a/content/public/test/browser_task_environment_unittest.cc +++ b/content/public/test/browser_task_environment_unittest.cc
@@ -7,9 +7,9 @@ #include <string> #include "base/atomicops.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/dcheck_is_on.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/synchronization/waitable_event.h" #include "base/task/current_thread.h" #include "base/task/thread_pool.h"
diff --git a/content/public/test/browser_test_base.cc b/content/public/test/browser_test_base.cc index 0198dac..1950306 100644 --- a/content/public/test/browser_test_base.cc +++ b/content/public/test/browser_test_base.cc
@@ -14,11 +14,11 @@ #include <vector> #include "base/base_switches.h" -#include "base/bind.h" #include "base/command_line.h" #include "base/debug/stack_trace.h" #include "base/feature_list.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/i18n/icu_util.h" #include "base/location.h" #include "base/logging.h"
diff --git a/content/public/test/browser_test_base.h b/content/public/test/browser_test_base.h index 8efee76..28072eb8 100644 --- a/content/public/test/browser_test_base.h +++ b/content/public/test/browser_test_base.h
@@ -20,7 +20,7 @@ #include <string> #include <utility> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/metrics/field_trial.h" #include "base/threading/thread.h"
diff --git a/content/public/test/browser_test_utils.cc b/content/public/test/browser_test_utils.cc index af6dbda3..bbe14bd2 100644 --- a/content/public/test/browser_test_utils.cc +++ b/content/public/test/browser_test_utils.cc
@@ -12,11 +12,11 @@ #include <tuple> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/containers/contains.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/guid.h" #include "base/json/json_reader.h" #include "base/no_destructor.h"
diff --git a/content/public/test/browser_test_utils.h b/content/public/test/browser_test_utils.h index 022f135..22b676a 100644 --- a/content/public/test/browser_test_utils.h +++ b/content/public/test/browser_test_utils.h
@@ -10,10 +10,10 @@ #include <utility> #include <vector> -#include "base/callback.h" #include "base/containers/flat_set.h" #include "base/containers/queue.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/callback.h" #include "base/json/json_writer.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h"
diff --git a/content/public/test/browsing_data_remover_test_util.cc b/content/public/test/browsing_data_remover_test_util.cc index e42aa6d..d3e46be6 100644 --- a/content/public/test/browsing_data_remover_test_util.cc +++ b/content/public/test/browsing_data_remover_test_util.cc
@@ -4,7 +4,7 @@ #include "content/public/test/browsing_data_remover_test_util.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/task/single_thread_task_runner.h" #include "base/task/thread_pool/thread_pool_instance.h"
diff --git a/content/public/test/commit_message_delayer.h b/content/public/test/commit_message_delayer.h index 400dd79..66c2011 100644 --- a/content/public/test/commit_message_delayer.h +++ b/content/public/test/commit_message_delayer.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "url/gurl.h" namespace content {
diff --git a/content/public/test/content_browser_test_utils.cc b/content/public/test/content_browser_test_utils.cc index 34447e2..ef76b1f0 100644 --- a/content/public/test/content_browser_test_utils.cc +++ b/content/public/test/content_browser_test_utils.cc
@@ -7,8 +7,8 @@ #include <string> #include <utility> -#include "base/bind.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/guid.h" #include "base/path_service.h" #include "base/run_loop.h"
diff --git a/content/public/test/content_browser_test_utils.h b/content/public/test/content_browser_test_utils.h index 594ac93..6bf5caa 100644 --- a/content/public/test/content_browser_test_utils.h +++ b/content/public/test/content_browser_test_utils.h
@@ -8,7 +8,7 @@ #include <map> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "build/build_config.h"
diff --git a/content/public/test/content_browser_test_utils_mac.mm b/content/public/test/content_browser_test_utils_mac.mm index 3e46378..181d41f 100644 --- a/content/public/test/content_browser_test_utils_mac.mm +++ b/content/public/test/content_browser_test_utils_mac.mm
@@ -9,7 +9,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/lazy_instance.h" #include "base/mac/scoped_objc_class_swizzler.h" #include "base/strings/sys_string_conversions.h"
diff --git a/content/public/test/download_test_observer.cc b/content/public/test/download_test_observer.cc index 6589409..2b18836 100644 --- a/content/public/test/download_test_observer.cc +++ b/content/public/test/download_test_observer.cc
@@ -6,9 +6,9 @@ #include <vector> -#include "base/bind.h" #include "base/check_op.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/notreached.h" #include "base/run_loop.h" #include "components/download/public/common/download_url_parameters.h"
diff --git a/content/public/test/download_test_observer.h b/content/public/test/download_test_observer.h index 0c34682..a1fa58d 100644 --- a/content/public/test/download_test_observer.h +++ b/content/public/test/download_test_observer.h
@@ -11,7 +11,7 @@ #include <set> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "components/download/public/common/download_interrupt_reasons.h"
diff --git a/content/public/test/fake_download_item.cc b/content/public/test/fake_download_item.cc index f8c7f604..3674073 100644 --- a/content/public/test/fake_download_item.cc +++ b/content/public/test/fake_download_item.cc
@@ -4,8 +4,8 @@ #include "content/public/test/fake_download_item.h" -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/notreached.h" #include "components/download/public/common/download_danger_type.h" #include "net/http/http_response_headers.h"
diff --git a/content/public/test/fake_download_item.h b/content/public/test/fake_download_item.h index 6832f70..abdd6c38 100644 --- a/content/public/test/fake_download_item.h +++ b/content/public/test/fake_download_item.h
@@ -8,8 +8,8 @@ #include <string> #include <vector> -#include "base/callback_forward.h" #include "base/files/file_path.h" +#include "base/functional/callback_forward.h" #include "base/observer_list.h" #include "base/time/time.h" #include "components/download/public/common/download_danger_type.h"
diff --git a/content/public/test/fake_service_worker_context.cc b/content/public/test/fake_service_worker_context.cc index f380e64..b5864af 100644 --- a/content/public/test/fake_service_worker_context.cc +++ b/content/public/test/fake_service_worker_context.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/no_destructor.h" #include "base/notreached.h" #include "base/task/single_thread_task_runner.h"
diff --git a/content/public/test/fake_service_worker_context.h b/content/public/test/fake_service_worker_context.h index 2215a8d..fa1f3ff 100644 --- a/content/public/test/fake_service_worker_context.h +++ b/content/public/test/fake_service_worker_context.h
@@ -9,7 +9,7 @@ #include <tuple> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/observer_list.h" #include "content/public/browser/service_worker_context.h" #include "third_party/blink/public/common/storage_key/storage_key.h"
diff --git a/content/public/test/fake_speech_recognition_manager.cc b/content/public/test/fake_speech_recognition_manager.cc index d2c8d677..8ca69d1 100644 --- a/content/public/test/fake_speech_recognition_manager.cc +++ b/content/public/test/fake_speech_recognition_manager.cc
@@ -4,7 +4,7 @@ #include "content/public/test/fake_speech_recognition_manager.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h"
diff --git a/content/public/test/fake_speech_recognition_manager.h b/content/public/test/fake_speech_recognition_manager.h index 390abf5..5472ad1 100644 --- a/content/public/test/fake_speech_recognition_manager.h +++ b/content/public/test/fake_speech_recognition_manager.h
@@ -5,7 +5,7 @@ #ifndef CONTENT_PUBLIC_TEST_FAKE_SPEECH_RECOGNITION_MANAGER_H_ #define CONTENT_PUBLIC_TEST_FAKE_SPEECH_RECOGNITION_MANAGER_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "content/public/browser/speech_recognition_event_listener.h" #include "content/public/browser/speech_recognition_manager.h"
diff --git a/content/public/test/mock_browsing_data_remover_delegate.cc b/content/public/test/mock_browsing_data_remover_delegate.cc index 1beafc4..fd87693f 100644 --- a/content/public/test/mock_browsing_data_remover_delegate.cc +++ b/content/public/test/mock_browsing_data_remover_delegate.cc
@@ -4,7 +4,7 @@ #include "content/public/test/mock_browsing_data_remover_delegate.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "content/public/browser/browsing_data_filter_builder.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/content/public/test/mock_render_process_host.cc b/content/public/test/mock_render_process_host.cc index bcd009f..7607070 100644 --- a/content/public/test/mock_render_process_host.cc +++ b/content/public/test/mock_render_process_host.cc
@@ -9,8 +9,8 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/lazy_instance.h" #include "base/location.h" #include "base/no_destructor.h"
diff --git a/content/public/test/mock_render_process_host.h b/content/public/test/mock_render_process_host.h index 0e2010e9..968ddee 100644 --- a/content/public/test/mock_render_process_host.h +++ b/content/public/test/mock_render_process_host.h
@@ -15,8 +15,8 @@ #include <utility> #include <vector> -#include "base/callback_forward.h" #include "base/containers/flat_set.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/metrics/persistent_memory_allocator.h"
diff --git a/content/public/test/network_connection_change_simulator.cc b/content/public/test/network_connection_change_simulator.cc index 67baa7f3..dfca8aa 100644 --- a/content/public/test/network_connection_change_simulator.cc +++ b/content/public/test/network_connection_change_simulator.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "build/chromeos_buildflags.h" #include "content/public/browser/network_service_instance.h"
diff --git a/content/public/test/network_service_test_helper.cc b/content/public/test/network_service_test_helper.cc index 450bfe89..606f6fe 100644 --- a/content/public/test/network_service_test_helper.cc +++ b/content/public/test/network_service_test_helper.cc
@@ -7,11 +7,11 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/environment.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/memory/weak_ptr.h" #include "base/metrics/field_trial.h"
diff --git a/content/public/test/ppapi_test_utils.h b/content/public/test/ppapi_test_utils.h index 040f224b..001d31f 100644 --- a/content/public/test/ppapi_test_utils.h +++ b/content/public/test/ppapi_test_utils.h
@@ -5,8 +5,8 @@ #ifndef CONTENT_PUBLIC_TEST_PPAPI_TEST_UTILS_H_ #define CONTENT_PUBLIC_TEST_PPAPI_TEST_UTILS_H_ -#include "base/callback_forward.h" #include "base/files/file_path.h" +#include "base/functional/callback_forward.h" #include "mojo/public/cpp/bindings/pending_receiver.h" #include "mojo/public/cpp/bindings/pending_remote.h" #include "services/network/public/mojom/udp_socket.mojom.h"
diff --git a/content/public/test/prerender_test_util.cc b/content/public/test/prerender_test_util.cc index d638911a..57370e0 100644 --- a/content/public/test/prerender_test_util.cc +++ b/content/public/test/prerender_test_util.cc
@@ -6,7 +6,7 @@ #include <tuple> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/strings/string_util.h" #include "base/trace_event/typed_macros.h" #include "content/browser/preloading/prerender/prerender_final_status.h"
diff --git a/content/public/test/prerender_test_util.h b/content/public/test/prerender_test_util.h index e94e512..3ac6b1e 100644 --- a/content/public/test/prerender_test_util.h +++ b/content/public/test/prerender_test_util.h
@@ -5,7 +5,7 @@ #ifndef CONTENT_PUBLIC_TEST_PRERENDER_TEST_UTIL_H_ #define CONTENT_PUBLIC_TEST_PRERENDER_TEST_UTIL_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/test/scoped_feature_list.h" #include "content/public/browser/prerender_trigger_type.h" #include "content/public/browser/render_frame_host.h"
diff --git a/content/public/test/private_network_access_util.cc b/content/public/test/private_network_access_util.cc index db51aba..24c2103 100644 --- a/content/public/test/private_network_access_util.cc +++ b/content/public/test/private_network_access_util.cc
@@ -4,7 +4,7 @@ #include "content/public/test/private_network_access_util.h" -#include "base/bind.h" +#include "base/functional/bind.h" namespace content {
diff --git a/content/public/test/render_view_test.cc b/content/public/test/render_view_test.cc index eae812b..e51a536 100644 --- a/content/public/test/render_view_test.cc +++ b/content/public/test/render_view_test.cc
@@ -9,8 +9,8 @@ #include <cctype> #include <tuple> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h"
diff --git a/content/public/test/scoped_page_focus_override.cc b/content/public/test/scoped_page_focus_override.cc index f1762d7..7a9a7f7 100644 --- a/content/public/test/scoped_page_focus_override.cc +++ b/content/public/test/scoped_page_focus_override.cc
@@ -7,8 +7,8 @@ #include <memory> #include <string> -#include "base/callback.h" #include "base/containers/span.h" +#include "base/functional/callback.h" #include "base/json/json_reader.h" #include "base/json/json_writer.h" #include "base/run_loop.h"
diff --git a/content/public/test/scoped_page_focus_override.h b/content/public/test/scoped_page_focus_override.h index b90105b..e4a8ae0 100644 --- a/content/public/test/scoped_page_focus_override.h +++ b/content/public/test/scoped_page_focus_override.h
@@ -5,8 +5,8 @@ #ifndef CONTENT_PUBLIC_TEST_SCOPED_PAGE_FOCUS_OVERRIDE_H_ #define CONTENT_PUBLIC_TEST_SCOPED_PAGE_FOCUS_OVERRIDE_H_ -#include "base/callback_forward.h" #include "base/containers/span.h" +#include "base/functional/callback_forward.h" #include "base/memory/ref_counted.h" #include "content/public/browser/devtools_agent_host.h" #include "content/public/browser/devtools_agent_host_client.h"
diff --git a/content/public/test/service_worker_host_interceptor.cc b/content/public/test/service_worker_host_interceptor.cc index 3f0a8fd..79525785 100644 --- a/content/public/test/service_worker_host_interceptor.cc +++ b/content/public/test/service_worker_host_interceptor.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/location.h" #include "base/run_loop.h" #include "content/browser/service_worker/service_worker_context_wrapper.h"
diff --git a/content/public/test/service_worker_host_interceptor.h b/content/public/test/service_worker_host_interceptor.h index 2070fe8..96b3cb3 100644 --- a/content/public/test/service_worker_host_interceptor.h +++ b/content/public/test/service_worker_host_interceptor.h
@@ -5,7 +5,7 @@ #ifndef CONTENT_PUBLIC_TEST_SERVICE_WORKER_HOST_INTERCEPTOR_H_ #define CONTENT_PUBLIC_TEST_SERVICE_WORKER_HOST_INTERCEPTOR_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h" #include "content/public/browser/browser_thread.h"
diff --git a/content/public/test/service_worker_test_helpers.cc b/content/public/test/service_worker_test_helpers.cc index cc24d7e..7d1e4846d 100644 --- a/content/public/test/service_worker_test_helpers.cc +++ b/content/public/test/service_worker_test_helpers.cc
@@ -8,8 +8,8 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "content/browser/service_worker/service_worker_context_core_observer.h" #include "content/browser/service_worker/service_worker_context_wrapper.h"
diff --git a/content/public/test/service_worker_test_helpers.h b/content/public/test/service_worker_test_helpers.h index 453a20b..2296e122 100644 --- a/content/public/test/service_worker_test_helpers.h +++ b/content/public/test/service_worker_test_helpers.h
@@ -5,7 +5,7 @@ #ifndef CONTENT_PUBLIC_TEST_SERVICE_WORKER_TEST_HELPERS_H_ #define CONTENT_PUBLIC_TEST_SERVICE_WORKER_TEST_HELPERS_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" class GURL;
diff --git a/content/public/test/simple_url_loader_test_helper.cc b/content/public/test/simple_url_loader_test_helper.cc index e894265..a4774a8 100644 --- a/content/public/test/simple_url_loader_test_helper.cc +++ b/content/public/test/simple_url_loader_test_helper.cc
@@ -4,9 +4,9 @@ #include "content/public/test/simple_url_loader_test_helper.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/check.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" namespace content {
diff --git a/content/public/test/simple_url_loader_test_helper.h b/content/public/test/simple_url_loader_test_helper.h index 78330842..f01ef67a 100644 --- a/content/public/test/simple_url_loader_test_helper.h +++ b/content/public/test/simple_url_loader_test_helper.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/weak_ptr.h" #include "base/run_loop.h" #include "services/network/public/cpp/simple_url_loader.h"
diff --git a/content/public/test/slow_download_http_response.cc b/content/public/test/slow_download_http_response.cc index a638c16..d44896c 100644 --- a/content/public/test/slow_download_http_response.cc +++ b/content/public/test/slow_download_http_response.cc
@@ -4,7 +4,7 @@ #include "content/public/test/slow_download_http_response.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/string_split.h" #include "base/task/single_thread_task_runner.h" #include "base/test/bind.h"
diff --git a/content/public/test/slow_http_response.cc b/content/public/test/slow_http_response.cc index 9c5cb333..f56ed8b0 100644 --- a/content/public/test/slow_http_response.cc +++ b/content/public/test/slow_http_response.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/strings/string_split.h" #include "base/task/bind_post_task.h" #include "base/task/single_thread_task_runner.h"
diff --git a/content/public/test/test_aggregation_service.h b/content/public/test/test_aggregation_service.h index 5ba20ea..75e6bb9 100644 --- a/content/public/test/test_aggregation_service.h +++ b/content/public/test/test_aggregation_service.h
@@ -9,7 +9,7 @@ #include <string> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/values.h" #include "third_party/abseil-cpp/absl/numeric/int128.h" #include "url/origin.h"
diff --git a/content/public/test/test_devtools_protocol_client.h b/content/public/test/test_devtools_protocol_client.h index 3345bcd..0f791bb 100644 --- a/content/public/test/test_devtools_protocol_client.h +++ b/content/public/test/test_devtools_protocol_client.h
@@ -10,7 +10,7 @@ #include <utility> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/values.h" #include "content/public/browser/devtools_agent_host.h" #include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/content/public/test/test_download_http_response.cc b/content/public/test/test_download_http_response.cc index 8777aeb..0bbd199 100644 --- a/content/public/test/test_download_http_response.cc +++ b/content/public/test/test_download_http_response.cc
@@ -6,10 +6,10 @@ #include <inttypes.h> -#include "base/bind.h" -#include "base/callback_forward.h" -#include "base/callback_helpers.h" #include "base/cxx17_backports.h" +#include "base/functional/bind.h" +#include "base/functional/callback_forward.h" +#include "base/functional/callback_helpers.h" #include "base/lazy_instance.h" #include "base/logging.h" #include "base/run_loop.h"
diff --git a/content/public/test/test_download_http_response.h b/content/public/test/test_download_http_response.h index 8d58551..82836ce 100644 --- a/content/public/test/test_download_http_response.h +++ b/content/public/test/test_download_http_response.h
@@ -8,8 +8,8 @@ #include <string> #include <vector> -#include "base/callback_forward.h" #include "base/containers/queue.h" +#include "base/functional/callback_forward.h" #include "base/sequence_checker.h" #include "base/task/single_thread_task_runner.h" #include "net/http/http_byte_range.h"
diff --git a/content/public/test/test_file_error_injector.cc b/content/public/test/test_file_error_injector.cc index 859c5831..d53a118f 100644 --- a/content/public/test/test_file_error_injector.cc +++ b/content/public/test/test_file_error_injector.cc
@@ -7,10 +7,10 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback.h" #include "base/check_op.h" #include "base/compiler_specific.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "components/download/public/common/download_file_factory.h" #include "components/download/public/common/download_file_impl.h" #include "components/download/public/common/download_interrupt_reasons_utils.h"
diff --git a/content/public/test/test_fileapi_operation_waiter.cc b/content/public/test/test_fileapi_operation_waiter.cc index 704a55f..8f34acf 100644 --- a/content/public/test/test_fileapi_operation_waiter.cc +++ b/content/public/test/test_fileapi_operation_waiter.cc
@@ -4,7 +4,7 @@ #include "content/public/test/test_fileapi_operation_waiter.h" -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "components/services/filesystem/public/mojom/types.mojom.h" namespace content {
diff --git a/content/public/test/test_launcher.cc b/content/public/test/test_launcher.cc index 686df04a..22eae6b 100644 --- a/content/public/test/test_launcher.cc +++ b/content/public/test/test_launcher.cc
@@ -13,13 +13,13 @@ #include <utility> #include <vector> -#include "base/callback_helpers.h" #include "base/check_op.h" #include "base/command_line.h" #include "base/debug/debugger.h" #include "base/environment.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/memory/raw_ptr.h" #include "base/message_loop/message_pump_type.h"
diff --git a/content/public/test/test_navigation_observer.cc b/content/public/test/test_navigation_observer.cc index 4dd859c..246a3146b 100644 --- a/content/public/test/test_navigation_observer.cc +++ b/content/public/test/test_navigation_observer.cc
@@ -4,7 +4,7 @@ #include "content/public/test/test_navigation_observer.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "content/browser/renderer_host/navigation_request.h" #include "content/browser/web_contents/web_contents_impl.h"
diff --git a/content/public/test/test_navigation_observer.h b/content/public/test/test_navigation_observer.h index e1142875..9e36987 100644 --- a/content/public/test/test_navigation_observer.h +++ b/content/public/test/test_navigation_observer.h
@@ -8,9 +8,9 @@ #include <map> #include <memory> -#include "base/callback.h" #include "base/callback_list.h" #include "base/containers/unique_ptr_adapters.h" +#include "base/functional/callback.h" #include "content/public/browser/child_process_host.h" #include "content/public/test/test_utils.h" #include "net/base/net_errors.h"
diff --git a/content/public/test/test_navigation_throttle.cc b/content/public/test/test_navigation_throttle.cc index aa0ebae8..c5e7fc60 100644 --- a/content/public/test/test_navigation_throttle.cc +++ b/content/public/test/test_navigation_throttle.cc
@@ -4,7 +4,7 @@ #include "content/public/test/test_navigation_throttle.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "content/public/browser/browser_task_traits.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/navigation_handle.h"
diff --git a/content/public/test/test_navigation_throttle.h b/content/public/test/test_navigation_throttle.h index e908e8e..7538fe6 100644 --- a/content/public/test/test_navigation_throttle.h +++ b/content/public/test/test_navigation_throttle.h
@@ -5,7 +5,7 @@ #ifndef CONTENT_PUBLIC_TEST_TEST_NAVIGATION_THROTTLE_H_ #define CONTENT_PUBLIC_TEST_TEST_NAVIGATION_THROTTLE_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "content/public/browser/navigation_throttle.h"
diff --git a/content/public/test/test_navigation_throttle_inserter.h b/content/public/test/test_navigation_throttle_inserter.h index 287f44d8..4dcb841 100644 --- a/content/public/test/test_navigation_throttle_inserter.h +++ b/content/public/test/test_navigation_throttle_inserter.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "content/public/browser/web_contents_observer.h" namespace content {
diff --git a/content/public/test/test_storage_partition.h b/content/public/test/test_storage_partition.h index 66e516b..bf1e936b 100644 --- a/content/public/test/test_storage_partition.h +++ b/content/public/test/test_storage_partition.h
@@ -5,8 +5,8 @@ #ifndef CONTENT_PUBLIC_TEST_TEST_STORAGE_PARTITION_H_ #define CONTENT_PUBLIC_TEST_TEST_STORAGE_PARTITION_H_ -#include "base/callback_forward.h" #include "base/files/file_path.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "build/build_config.h" #include "components/services/storage/privileged/mojom/indexed_db_control.mojom.h"
diff --git a/content/public/test/test_utils.cc b/content/public/test/test_utils.cc index 2690ba4..1675a1216 100644 --- a/content/public/test/test_utils.cc +++ b/content/public/test/test_utils.cc
@@ -8,8 +8,8 @@ #include <utility> #include "base/base_switches.h" -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/run_loop.h" #include "base/strings/string_util.h"
diff --git a/content/public/test/test_utils.h b/content/public/test/test_utils.h index 41b21604..28dca9e 100644 --- a/content/public/test/test_utils.h +++ b/content/public/test/test_utils.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h" #include "base/run_loop.h"
diff --git a/content/public/test/test_web_ui.cc b/content/public/test/test_web_ui.cc index 3347851..e631cbfc 100644 --- a/content/public/test/test_web_ui.cc +++ b/content/public/test/test_web_ui.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/ptr_util.h" #include "base/notreached.h" #include "base/strings/string_piece.h"
diff --git a/content/public/test/test_web_ui_listener_observer.cc b/content/public/test/test_web_ui_listener_observer.cc index 5631c04..0dc966c60 100644 --- a/content/public/test/test_web_ui_listener_observer.cc +++ b/content/public/test/test_web_ui_listener_observer.cc
@@ -4,8 +4,8 @@ #include "content/public/test/test_web_ui_listener_observer.h" -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "content/public/test/test_web_ui.h" namespace content {
diff --git a/content/public/test/text_input_test_utils.h b/content/public/test/text_input_test_utils.h index 34a04ecb..e9af4e4 100644 --- a/content/public/test/text_input_test_utils.h +++ b/content/public/test/text_input_test_utils.h
@@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "build/build_config.h" #include "content/public/test/test_utils.h"
diff --git a/content/public/test/unittest_test_suite.h b/content/public/test/unittest_test_suite.h index 06d8c22..c76cadf 100644 --- a/content/public/test/unittest_test_suite.h +++ b/content/public/test/unittest_test_suite.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/test/scoped_feature_list.h" #include "build/build_config.h"
diff --git a/content/public/test/url_loader_interceptor.cc b/content/public/test/url_loader_interceptor.cc index ee5032b..9996f474 100644 --- a/content/public/test/url_loader_interceptor.cc +++ b/content/public/test/url_loader_interceptor.cc
@@ -7,11 +7,11 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/containers/unique_ptr_adapters.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/path_service.h" #include "base/run_loop.h"
diff --git a/content/public/test/url_loader_interceptor.h b/content/public/test/url_loader_interceptor.h index d3043e8e..64a5f01d 100644 --- a/content/public/test/url_loader_interceptor.h +++ b/content/public/test/url_loader_interceptor.h
@@ -9,8 +9,8 @@ #include <set> #include <string> -#include "base/callback_helpers.h" #include "base/files/file_path.h" +#include "base/functional/callback_helpers.h" #include "base/memory/scoped_refptr.h" #include "base/strings/string_piece.h" #include "base/synchronization/lock.h"
diff --git a/content/public/test/url_loader_monitor.cc b/content/public/test/url_loader_monitor.cc index b3171e23..c4a06139 100644 --- a/content/public/test/url_loader_monitor.cc +++ b/content/public/test/url_loader_monitor.cc
@@ -8,7 +8,7 @@ #include <memory> #include <set> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/run_loop.h" #include "base/synchronization/lock.h" #include "base/thread_annotations.h"
diff --git a/content/public/test/url_loader_monitor.h b/content/public/test/url_loader_monitor.h index 11475fc..3e6a5a0 100644 --- a/content/public/test/url_loader_monitor.h +++ b/content/public/test/url_loader_monitor.h
@@ -9,7 +9,7 @@ #include <memory> #include <set> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/run_loop.h" #include "base/synchronization/lock.h" #include "base/thread_annotations.h"
diff --git a/content/public/test/web_transport_simple_test_server.cc b/content/public/test/web_transport_simple_test_server.cc index a6699d7..4dce0742 100644 --- a/content/public/test/web_transport_simple_test_server.cc +++ b/content/public/test/web_transport_simple_test_server.cc
@@ -4,8 +4,8 @@ #include "content/public/test/web_transport_simple_test_server.h" -#include "base/callback_helpers.h" #include "base/command_line.h" +#include "base/functional/callback_helpers.h" #include "base/strings/stringprintf.h" #include "base/synchronization/waitable_event.h" #include "base/test/bind.h"
diff --git a/content/public/test/web_ui_browsertest_util.cc b/content/public/test/web_ui_browsertest_util.cc index 1cd712f..9bb9bae 100644 --- a/content/public/test/web_ui_browsertest_util.cc +++ b/content/public/test/web_ui_browsertest_util.cc
@@ -7,9 +7,9 @@ #include <memory> #include <string> -#include "base/bind.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/hash/hash.h" #include "base/memory/ref_counted_memory.h" #include "base/path_service.h"
diff --git a/content/public/test/xr_test_utils.h b/content/public/test/xr_test_utils.h index b3f7bf47..ec174251 100644 --- a/content/public/test/xr_test_utils.h +++ b/content/public/test/xr_test_utils.h
@@ -5,7 +5,7 @@ #ifndef CONTENT_PUBLIC_TEST_XR_TEST_UTILS_H_ #define CONTENT_PUBLIC_TEST_XR_TEST_UTILS_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "device/vr/public/mojom/isolated_xr_service.mojom-forward.h" #include "mojo/public/cpp/bindings/remote.h"
diff --git a/content/renderer/accessibility/ax_image_annotator.h b/content/renderer/accessibility/ax_image_annotator.h index 63fa2550..d21e76c 100644 --- a/content/renderer/accessibility/ax_image_annotator.h +++ b/content/renderer/accessibility/ax_image_annotator.h
@@ -8,7 +8,7 @@ #include <string> #include <unordered_map> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/weak_ptr.h" #include "base/observer_list_types.h" #include "content/common/content_export.h"
diff --git a/content/renderer/accessibility/render_accessibility_impl.cc b/content/renderer/accessibility/render_accessibility_impl.cc index dd76f56..4afc5530 100644 --- a/content/renderer/accessibility/render_accessibility_impl.cc +++ b/content/renderer/accessibility/render_accessibility_impl.cc
@@ -12,10 +12,10 @@ #include <string> #include <utility> -#include "base/bind.h" #include "base/command_line.h" #include "base/containers/queue.h" #include "base/debug/crash_logging.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/memory/ptr_util.h" #include "base/metrics/histogram_macros.h"
diff --git a/content/renderer/accessibility/render_accessibility_impl_browsertest.cc b/content/renderer/accessibility/render_accessibility_impl_browsertest.cc index b138ced..1f8c52f 100644 --- a/content/renderer/accessibility/render_accessibility_impl_browsertest.cc +++ b/content/renderer/accessibility/render_accessibility_impl_browsertest.cc
@@ -10,8 +10,8 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/containers/adapters.h" +#include "base/functional/bind.h" #include "base/strings/utf_string_conversions.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/scoped_feature_list.h"
diff --git a/content/renderer/accessibility/render_accessibility_manager.cc b/content/renderer/accessibility/render_accessibility_manager.cc index e9485f36..786e602 100644 --- a/content/renderer/accessibility/render_accessibility_manager.cc +++ b/content/renderer/accessibility/render_accessibility_manager.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" #include "base/debug/alias.h" +#include "base/functional/bind.h" #include "content/renderer/accessibility/render_accessibility_impl.h" #include "content/renderer/render_frame_impl.h"
diff --git a/content/renderer/browser_exposed_renderer_interfaces.cc b/content/renderer/browser_exposed_renderer_interfaces.cc index 78e28f3..5cf905aa 100644 --- a/content/renderer/browser_exposed_renderer_interfaces.cc +++ b/content/renderer/browser_exposed_renderer_interfaces.cc
@@ -9,8 +9,8 @@ #include <memory> #include <utility> -#include "base/bind.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h" #include "base/task/single_thread_task_runner.h"
diff --git a/content/renderer/browser_render_view_browsertest.cc b/content/renderer/browser_render_view_browsertest.cc index 846930d..21d1f925 100644 --- a/content/renderer/browser_render_view_browsertest.cc +++ b/content/renderer/browser_render_view_browsertest.cc
@@ -8,10 +8,10 @@ #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/command_line.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/strings/utf_string_conversions.h" #include "build/build_config.h" #include "content/public/browser/browser_context.h"
diff --git a/content/renderer/dom_serializer_browsertest.cc b/content/renderer/dom_serializer_browsertest.cc index beec4a2..2dbd22a6 100644 --- a/content/renderer/dom_serializer_browsertest.cc +++ b/content/renderer/dom_serializer_browsertest.cc
@@ -5,11 +5,11 @@ #include <stddef.h> #include <stdint.h> -#include "base/bind.h" #include "base/command_line.h" #include "base/compiler_specific.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "base/task/current_thread.h"
diff --git a/content/renderer/gpu_benchmarking_extension.cc b/content/renderer/gpu_benchmarking_extension.cc index c3722c510..d86ac90c2 100644 --- a/content/renderer/gpu_benchmarking_extension.cc +++ b/content/renderer/gpu_benchmarking_extension.cc
@@ -13,12 +13,12 @@ #include <vector> #include "base/base64.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/debug/profiler.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h" #include "build/build_config.h"
diff --git a/content/renderer/java/gin_java_bridge_object.cc b/content/renderer/java/gin_java_bridge_object.cc index 23ca5603..1ad110c 100644 --- a/content/renderer/java/gin_java_bridge_object.cc +++ b/content/renderer/java/gin_java_bridge_object.cc
@@ -4,7 +4,7 @@ #include "content/renderer/java/gin_java_bridge_object.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "content/common/gin_java_bridge_messages.h" #include "content/public/renderer/render_thread.h" #include "content/renderer/java/gin_java_function_invocation_helper.h"
diff --git a/content/renderer/media/android/flinging_renderer_client.cc b/content/renderer/media/android/flinging_renderer_client.cc index befad15..74fdeb4 100644 --- a/content/renderer/media/android/flinging_renderer_client.cc +++ b/content/renderer/media/android/flinging_renderer_client.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/task/sequenced_task_runner.h" namespace content {
diff --git a/content/renderer/media/android/flinging_renderer_client.h b/content/renderer/media/android/flinging_renderer_client.h index ec26344..e0f96a6e 100644 --- a/content/renderer/media/android/flinging_renderer_client.h +++ b/content/renderer/media/android/flinging_renderer_client.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/task/sequenced_task_runner.h" #include "base/task/single_thread_task_runner.h" #include "content/common/content_export.h"
diff --git a/content/renderer/media/android/media_player_renderer_client.cc b/content/renderer/media/android/media_player_renderer_client.cc index 5af3554..5943c6f 100644 --- a/content/renderer/media/android/media_player_renderer_client.cc +++ b/content/renderer/media/android/media_player_renderer_client.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/task/sequenced_task_runner.h" #include "base/task/single_thread_task_runner.h"
diff --git a/content/renderer/media/android/media_player_renderer_client.h b/content/renderer/media/android/media_player_renderer_client.h index 0f65452..bfd044d 100644 --- a/content/renderer/media/android/media_player_renderer_client.h +++ b/content/renderer/media/android/media_player_renderer_client.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "base/task/sequenced_task_runner.h" #include "base/task/single_thread_task_runner.h"
diff --git a/content/renderer/media/android/media_player_renderer_client_factory.h b/content/renderer/media/android/media_player_renderer_client_factory.h index c36af8e2..59b0315 100644 --- a/content/renderer/media/android/media_player_renderer_client_factory.h +++ b/content/renderer/media/android/media_player_renderer_client_factory.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/task/sequenced_task_runner.h" #include "base/task/single_thread_task_runner.h" #include "content/common/content_export.h"
diff --git a/content/renderer/media/android/stream_texture_factory.cc b/content/renderer/media/android/stream_texture_factory.cc index f4a6ef31..8d7f7fb 100644 --- a/content/renderer/media/android/stream_texture_factory.cc +++ b/content/renderer/media/android/stream_texture_factory.cc
@@ -4,7 +4,7 @@ #include "content/renderer/media/android/stream_texture_factory.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/task/single_thread_task_runner.h" #include "gpu/ipc/client/client_shared_image_interface.h"
diff --git a/content/renderer/media/android/stream_texture_wrapper_impl.cc b/content/renderer/media/android/stream_texture_wrapper_impl.cc index c86a0280..0ccf8fe 100644 --- a/content/renderer/media/android/stream_texture_wrapper_impl.cc +++ b/content/renderer/media/android/stream_texture_wrapper_impl.cc
@@ -4,9 +4,9 @@ #include "content/renderer/media/android/stream_texture_wrapper_impl.h" -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/task/bind_post_task.h" #include "base/task/single_thread_task_runner.h"
diff --git a/content/renderer/media/android/stream_texture_wrapper_impl_unittest.cc b/content/renderer/media/android/stream_texture_wrapper_impl_unittest.cc index 015cae0..b3681e8 100644 --- a/content/renderer/media/android/stream_texture_wrapper_impl_unittest.cc +++ b/content/renderer/media/android/stream_texture_wrapper_impl_unittest.cc
@@ -4,7 +4,7 @@ #include "content/renderer/media/android/stream_texture_wrapper_impl.h" -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "base/test/task_environment.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/content/renderer/media/batching_media_log.cc b/content/renderer/media/batching_media_log.cc index 46117e0..ed397b0 100644 --- a/content/renderer/media/batching_media_log.cc +++ b/content/renderer/media/batching_media_log.cc
@@ -6,7 +6,7 @@ #include <sstream> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/json/json_writer.h" #include "base/logging.h" #include "base/strings/string_number_conversions.h"
diff --git a/content/renderer/media/cast_renderer_client_factory.h b/content/renderer/media/cast_renderer_client_factory.h index 464d1ef2..55693bf6 100644 --- a/content/renderer/media/cast_renderer_client_factory.h +++ b/content/renderer/media/cast_renderer_client_factory.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/ref_counted.h" #include "base/task/sequenced_task_runner.h" #include "media/base/renderer.h"
diff --git a/content/renderer/media/cast_renderer_factory.cc b/content/renderer/media/cast_renderer_factory.cc index 62813d4..a723e1a 100644 --- a/content/renderer/media/cast_renderer_factory.cc +++ b/content/renderer/media/cast_renderer_factory.cc
@@ -6,9 +6,9 @@ #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/check.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/task/single_thread_task_runner.h" #include "chromecast/media/audio/cast_audio_renderer.h" #include "media/base/decoder_factory.h"
diff --git a/content/renderer/media/cast_renderer_factory.h b/content/renderer/media/cast_renderer_factory.h index c12075d..552c7d3 100644 --- a/content/renderer/media/cast_renderer_factory.h +++ b/content/renderer/media/cast_renderer_factory.h
@@ -8,7 +8,7 @@ #include <memory> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/task/single_thread_task_runner.h" #include "media/base/renderer_factory.h"
diff --git a/content/renderer/media/media_factory.cc b/content/renderer/media/media_factory.cc index 6c5c4c03..8382314 100644 --- a/content/renderer/media/media_factory.cc +++ b/content/renderer/media/media_factory.cc
@@ -9,9 +9,9 @@ #include <tuple> #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/metrics/field_trial_params.h" #include "base/metrics/histogram_functions.h" #include "base/strings/string_number_conversions.h"
diff --git a/content/renderer/media/media_interface_factory.cc b/content/renderer/media/media_interface_factory.cc index 1eca9680..f176c5b 100644 --- a/content/renderer/media/media_interface_factory.cc +++ b/content/renderer/media/media_interface_factory.cc
@@ -6,7 +6,7 @@ #include <string> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/task/single_thread_task_runner.h" #include "build/build_config.h" #include "media/mojo/mojom/content_decryption_module.mojom.h"
diff --git a/content/renderer/media/media_interface_factory.h b/content/renderer/media/media_interface_factory.h index c0172851..aa1c67e0 100644 --- a/content/renderer/media/media_interface_factory.h +++ b/content/renderer/media/media_interface_factory.h
@@ -5,7 +5,7 @@ #ifndef CONTENT_RENDERER_MEDIA_MEDIA_INTERFACE_FACTORY_H_ #define CONTENT_RENDERER_MEDIA_MEDIA_INTERFACE_FACTORY_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "base/task/single_thread_task_runner.h" #include "base/unguessable_token.h"
diff --git a/content/renderer/media/media_permission_dispatcher.cc b/content/renderer/media/media_permission_dispatcher.cc index 9ac125ed..19c8e31 100644 --- a/content/renderer/media/media_permission_dispatcher.cc +++ b/content/renderer/media/media_permission_dispatcher.cc
@@ -4,7 +4,7 @@ #include "content/renderer/media/media_permission_dispatcher.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/task/single_thread_task_runner.h" #include "media/base/bind_to_current_loop.h"
diff --git a/content/renderer/media/media_permission_dispatcher.h b/content/renderer/media/media_permission_dispatcher.h index f25c1847c..ad05fc4 100644 --- a/content/renderer/media/media_permission_dispatcher.h +++ b/content/renderer/media/media_permission_dispatcher.h
@@ -9,7 +9,7 @@ #include <map> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "content/renderer/render_frame_impl.h"
diff --git a/content/renderer/media/renderer_webaudiodevice_impl.cc b/content/renderer/media/renderer_webaudiodevice_impl.cc index 5bfa3560..0061cf7 100644 --- a/content/renderer/media/renderer_webaudiodevice_impl.cc +++ b/content/renderer/media/renderer_webaudiodevice_impl.cc
@@ -9,9 +9,9 @@ #include <memory> #include <string> -#include "base/bind.h" #include "base/check_op.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/notreached.h" #include "base/strings/stringprintf.h" #include "base/task/sequenced_task_runner.h"
diff --git a/content/renderer/media/renderer_webaudiodevice_impl_unittest.cc b/content/renderer/media/renderer_webaudiodevice_impl_unittest.cc index 603e7702..ece701fe 100644 --- a/content/renderer/media/renderer_webaudiodevice_impl_unittest.cc +++ b/content/renderer/media/renderer_webaudiodevice_impl_unittest.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/stringprintf.h" #include "base/task/sequenced_task_runner.h" #include "base/test/task_environment.h"
diff --git a/content/renderer/media/renderer_webmediaplayer_delegate.cc b/content/renderer/media/renderer_webmediaplayer_delegate.cc index bfa1ce8d..20d07fa7 100644 --- a/content/renderer/media/renderer_webmediaplayer_delegate.cc +++ b/content/renderer/media/renderer_webmediaplayer_delegate.cc
@@ -7,7 +7,7 @@ #include <stdint.h> #include "base/auto_reset.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/metrics/user_metrics_action.h" #include "base/system/sys_info.h"
diff --git a/content/renderer/media/renderer_webmediaplayer_delegate_browsertest.cc b/content/renderer/media/renderer_webmediaplayer_delegate_browsertest.cc index 2ed9461..fc1a23e0 100644 --- a/content/renderer/media/renderer_webmediaplayer_delegate_browsertest.cc +++ b/content/renderer/media/renderer_webmediaplayer_delegate_browsertest.cc
@@ -5,8 +5,8 @@ #include <memory> #include <tuple> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/run_loop.h" #include "base/task/single_thread_task_runner.h"
diff --git a/content/renderer/media/win/dcomp_texture_wrapper_impl.cc b/content/renderer/media/win/dcomp_texture_wrapper_impl.cc index cce8ded9..a160d51c 100644 --- a/content/renderer/media/win/dcomp_texture_wrapper_impl.cc +++ b/content/renderer/media/win/dcomp_texture_wrapper_impl.cc
@@ -4,7 +4,7 @@ #include "content/renderer/media/win/dcomp_texture_wrapper_impl.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/ptr_util.h" #include "base/task/sequenced_task_runner.h" #include "cc/layers/video_frame_provider.h"
diff --git a/content/renderer/mhtml_handle_writer.h b/content/renderer/mhtml_handle_writer.h index 0006cde..d4d87f7 100644 --- a/content/renderer/mhtml_handle_writer.h +++ b/content/renderer/mhtml_handle_writer.h
@@ -8,8 +8,8 @@ #include <memory> #include <vector> -#include "base/callback.h" #include "base/files/file.h" +#include "base/functional/callback.h" #include "base/time/time.h" #include "content/common/download/mhtml_file_writer.mojom-forward.h" #include "mojo/public/cpp/system/data_pipe.h"
diff --git a/content/renderer/mock_agent_scheduling_group.h b/content/renderer/mock_agent_scheduling_group.h index c23aaa5f..6866481 100644 --- a/content/renderer/mock_agent_scheduling_group.h +++ b/content/renderer/mock_agent_scheduling_group.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/types/pass_key.h" #include "content/common/associated_interfaces.mojom.h" #include "content/renderer/agent_scheduling_group.h"
diff --git a/content/renderer/mojo/blink_interface_registry_impl.cc b/content/renderer/mojo/blink_interface_registry_impl.cc index 4f642ed..599af6148 100644 --- a/content/renderer/mojo/blink_interface_registry_impl.cc +++ b/content/renderer/mojo/blink_interface_registry_impl.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/task/single_thread_task_runner.h" #include "mojo/public/cpp/system/message_pipe.h"
diff --git a/content/renderer/navigation_client.cc b/content/renderer/navigation_client.cc index aaddbe887..c4e3894 100644 --- a/content/renderer/navigation_client.cc +++ b/content/renderer/navigation_client.cc
@@ -4,9 +4,9 @@ #include "content/renderer/navigation_client.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/check.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "content/common/frame.mojom.h" #include "content/renderer/render_frame_impl.h" #include "services/network/public/mojom/fetch_api.mojom.h"
diff --git a/content/renderer/pepper/message_channel.cc b/content/renderer/pepper/message_channel.cc index 74eef7b69..0abec62 100644 --- a/content/renderer/pepper/message_channel.cc +++ b/content/renderer/pepper/message_channel.cc
@@ -7,7 +7,7 @@ #include <cstdlib> #include <string> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/logging.h" #include "base/task/single_thread_task_runner.h"
diff --git a/content/renderer/pepper/pepper_audio_encoder_host.cc b/content/renderer/pepper/pepper_audio_encoder_host.cc index 1be6dd230..dd437d9 100644 --- a/content/renderer/pepper/pepper_audio_encoder_host.cc +++ b/content/renderer/pepper/pepper_audio_encoder_host.cc
@@ -8,7 +8,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/unsafe_shared_memory_region.h" #include "content/public/renderer/renderer_ppapi_host.h" #include "content/renderer/pepper/host_globals.h"
diff --git a/content/renderer/pepper/pepper_browser_connection.h b/content/renderer/pepper/pepper_browser_connection.h index 4f640fb1..c197f21d 100644 --- a/content/renderer/pepper/pepper_browser_connection.h +++ b/content/renderer/pepper/pepper_browser_connection.h
@@ -10,7 +10,7 @@ #include <map> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "content/common/pepper_plugin.mojom.h" #include "content/public/renderer/render_frame_observer.h" #include "content/public/renderer/render_frame_observer_tracker.h"
diff --git a/content/renderer/pepper/pepper_device_enumeration_host_helper.cc b/content/renderer/pepper/pepper_device_enumeration_host_helper.cc index e2ecf10..0f92786 100644 --- a/content/renderer/pepper/pepper_device_enumeration_host_helper.cc +++ b/content/renderer/pepper/pepper_device_enumeration_host_helper.cc
@@ -4,8 +4,8 @@ #include "content/renderer/pepper/pepper_device_enumeration_host_helper.h" -#include "base/bind.h" #include "base/check.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/memory/weak_ptr.h" #include "base/task/single_thread_task_runner.h"
diff --git a/content/renderer/pepper/pepper_device_enumeration_host_helper.h b/content/renderer/pepper/pepper_device_enumeration_host_helper.h index 7e06584..2ae75e6 100644 --- a/content/renderer/pepper/pepper_device_enumeration_host_helper.h +++ b/content/renderer/pepper/pepper_device_enumeration_host_helper.h
@@ -10,7 +10,7 @@ #include <memory> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/weak_ptr.h" #include "content/common/content_export.h" #include "ppapi/c/dev/ppb_device_ref_dev.h"
diff --git a/content/renderer/pepper/pepper_file_chooser_host.cc b/content/renderer/pepper/pepper_file_chooser_host.cc index 3113805..18e4cb9 100644 --- a/content/renderer/pepper/pepper_file_chooser_host.cc +++ b/content/renderer/pepper/pepper_file_chooser_host.cc
@@ -6,8 +6,8 @@ #include <stddef.h> -#include "base/bind.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/strings/utf_string_conversions.h" #include "content/public/renderer/renderer_ppapi_host.h" #include "content/renderer/pepper/pepper_file_ref_renderer_host.h"
diff --git a/content/renderer/pepper/pepper_file_chooser_host_unittest.cc b/content/renderer/pepper/pepper_file_chooser_host_unittest.cc index e1da620..0fe594f 100644 --- a/content/renderer/pepper/pepper_file_chooser_host_unittest.cc +++ b/content/renderer/pepper/pepper_file_chooser_host_unittest.cc
@@ -10,8 +10,8 @@ #include <tuple> #include <utility> -#include "base/bind.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/strings/utf_string_conversions.h" #include "build/build_config.h" #include "content/public/test/render_view_test.h"
diff --git a/content/renderer/pepper/pepper_file_system_host.cc b/content/renderer/pepper/pepper_file_system_host.cc index cfd37fb..987ad7e 100644 --- a/content/renderer/pepper/pepper_file_system_host.cc +++ b/content/renderer/pepper/pepper_file_system_host.cc
@@ -4,8 +4,8 @@ #include "content/renderer/pepper/pepper_file_system_host.h" -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "content/common/pepper_file_util.h" #include "content/public/renderer/render_frame.h" #include "content/public/renderer/renderer_ppapi_host.h"
diff --git a/content/renderer/pepper/pepper_graphics_2d_host.cc b/content/renderer/pepper/pepper_graphics_2d_host.cc index c126b9e..7f77761 100644 --- a/content/renderer/pepper/pepper_graphics_2d_host.cc +++ b/content/renderer/pepper/pepper_graphics_2d_host.cc
@@ -7,9 +7,9 @@ #include <stddef.h> #include <utility> -#include "base/bind.h" #include "base/check.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/memory/read_only_shared_memory_region.h" #include "base/numerics/checked_math.h"
diff --git a/content/renderer/pepper/pepper_hung_plugin_filter.cc b/content/renderer/pepper/pepper_hung_plugin_filter.cc index 559efed..1cc07028 100644 --- a/content/renderer/pepper/pepper_hung_plugin_filter.cc +++ b/content/renderer/pepper/pepper_hung_plugin_filter.cc
@@ -4,7 +4,7 @@ #include "content/renderer/pepper/pepper_hung_plugin_filter.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "content/child/child_process.h" namespace content {
diff --git a/content/renderer/pepper/pepper_in_process_resource_creation.cc b/content/renderer/pepper/pepper_in_process_resource_creation.cc index eb2ac09..bacef52 100644 --- a/content/renderer/pepper/pepper_in_process_resource_creation.cc +++ b/content/renderer/pepper/pepper_in_process_resource_creation.cc
@@ -4,7 +4,7 @@ #include "content/renderer/pepper/pepper_in_process_resource_creation.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/weak_ptr.h" #include "base/notreached.h" #include "content/child/browser_font_resource_trusted.h"
diff --git a/content/renderer/pepper/pepper_in_process_router.cc b/content/renderer/pepper/pepper_in_process_router.cc index 4fadc0647..051b2ca 100644 --- a/content/renderer/pepper/pepper_in_process_router.cc +++ b/content/renderer/pepper/pepper_in_process_router.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/task/single_thread_task_runner.h" #include "content/public/renderer/render_frame.h"
diff --git a/content/renderer/pepper/pepper_in_process_router.h b/content/renderer/pepper/pepper_in_process_router.h index c04afed..a3f42a89 100644 --- a/content/renderer/pepper/pepper_in_process_router.h +++ b/content/renderer/pepper/pepper_in_process_router.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "ppapi/c/pp_instance.h" #include "ppapi/proxy/connection.h"
diff --git a/content/renderer/pepper/pepper_media_device_manager.cc b/content/renderer/pepper/pepper_media_device_manager.cc index d9f59286..1bed617b 100644 --- a/content/renderer/pepper/pepper_media_device_manager.cc +++ b/content/renderer/pepper/pepper_media_device_manager.cc
@@ -4,10 +4,10 @@ #include "content/renderer/pepper/pepper_media_device_manager.h" -#include "base/bind.h" #include "base/check.h" #include "base/containers/cxx20_erase.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/notreached.h" #include "base/task/single_thread_task_runner.h"
diff --git a/content/renderer/pepper/pepper_media_stream_audio_track_host.cc b/content/renderer/pepper/pepper_media_stream_audio_track_host.cc index bbb3077..0e9e2c1 100644 --- a/content/renderer/pepper/pepper_media_stream_audio_track_host.cc +++ b/content/renderer/pepper/pepper_media_stream_audio_track_host.cc
@@ -6,8 +6,8 @@ #include <algorithm> -#include "base/bind.h" #include "base/check_op.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/numerics/ostream_operators.h" #include "base/numerics/safe_math.h"
diff --git a/content/renderer/pepper/pepper_media_stream_video_track_host.cc b/content/renderer/pepper/pepper_media_stream_video_track_host.cc index d209a67..e8697aa 100644 --- a/content/renderer/pepper/pepper_media_stream_video_track_host.cc +++ b/content/renderer/pepper/pepper_media_stream_video_track_host.cc
@@ -7,7 +7,7 @@ #include <stddef.h> #include "base/base64.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/memory/ptr_util.h" #include "base/rand_util.h"
diff --git a/content/renderer/pepper/pepper_platform_audio_input.cc b/content/renderer/pepper/pepper_platform_audio_input.cc index 41de78e..a2ded51 100644 --- a/content/renderer/pepper/pepper_platform_audio_input.cc +++ b/content/renderer/pepper/pepper_platform_audio_input.cc
@@ -4,8 +4,8 @@ #include "content/renderer/pepper/pepper_platform_audio_input.h" -#include "base/bind.h" #include "base/check_op.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/task/single_thread_task_runner.h" #include "build/build_config.h"
diff --git a/content/renderer/pepper/pepper_platform_audio_output.cc b/content/renderer/pepper/pepper_platform_audio_output.cc index 4bc57d7..ef9f8be 100644 --- a/content/renderer/pepper/pepper_platform_audio_output.cc +++ b/content/renderer/pepper/pepper_platform_audio_output.cc
@@ -4,8 +4,8 @@ #include "content/renderer/pepper/pepper_platform_audio_output.h" -#include "base/bind.h" #include "base/check_op.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/notreached.h" #include "base/task/single_thread_task_runner.h"
diff --git a/content/renderer/pepper/pepper_platform_audio_output_dev.cc b/content/renderer/pepper/pepper_platform_audio_output_dev.cc index e3e1c3c8..1198e97 100644 --- a/content/renderer/pepper/pepper_platform_audio_output_dev.cc +++ b/content/renderer/pepper/pepper_platform_audio_output_dev.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/logging.h" #include "base/synchronization/waitable_event.h"
diff --git a/content/renderer/pepper/pepper_platform_camera_device.cc b/content/renderer/pepper/pepper_platform_camera_device.cc index 74ea4a9..a445418 100644 --- a/content/renderer/pepper/pepper_platform_camera_device.cc +++ b/content/renderer/pepper/pepper_platform_camera_device.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" #include "base/check.h" +#include "base/functional/bind.h" #include "content/public/renderer/ppapi_gfx_conversion.h" #include "content/renderer/pepper/pepper_camera_device_host.h" #include "content/renderer/pepper/pepper_media_device_manager.h"
diff --git a/content/renderer/pepper/pepper_platform_camera_device.h b/content/renderer/pepper/pepper_platform_camera_device.h index 819fe6d..ba3bfca 100644 --- a/content/renderer/pepper/pepper_platform_camera_device.h +++ b/content/renderer/pepper/pepper_platform_camera_device.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "base/threading/thread_checker.h" #include "base/unguessable_token.h"
diff --git a/content/renderer/pepper/pepper_platform_video_capture.cc b/content/renderer/pepper/pepper_platform_video_capture.cc index 63cc7af..b206342 100644 --- a/content/renderer/pepper/pepper_platform_video_capture.cc +++ b/content/renderer/pepper/pepper_platform_video_capture.cc
@@ -4,8 +4,8 @@ #include "content/renderer/pepper/pepper_platform_video_capture.h" -#include "base/bind.h" #include "base/check.h" +#include "base/functional/bind.h" #include "base/memory/ref_counted.h" #include "base/notreached.h" #include "content/renderer/pepper/pepper_media_device_manager.h"
diff --git a/content/renderer/pepper/pepper_platform_video_capture.h b/content/renderer/pepper/pepper_platform_video_capture.h index b5b9c63..294d7bb 100644 --- a/content/renderer/pepper/pepper_platform_video_capture.h +++ b/content/renderer/pepper/pepper_platform_video_capture.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "base/threading/thread_checker.h" #include "base/time/time.h"
diff --git a/content/renderer/pepper/pepper_plugin_instance_impl.cc b/content/renderer/pepper/pepper_plugin_instance_impl.cc index fc60e5ee..770e66e 100644 --- a/content/renderer/pepper/pepper_plugin_instance_impl.cc +++ b/content/renderer/pepper/pepper_plugin_instance_impl.cc
@@ -6,9 +6,9 @@ #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/i18n/char_iterator.h" #include "base/location.h" #include "base/logging.h"
diff --git a/content/renderer/pepper/pepper_plugin_instance_impl.h b/content/renderer/pepper/pepper_plugin_instance_impl.h index 8a29df0..a3f99906 100644 --- a/content/renderer/pepper/pepper_plugin_instance_impl.h +++ b/content/renderer/pepper/pepper_plugin_instance_impl.h
@@ -15,7 +15,7 @@ #include <utility> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "build/build_config.h"
diff --git a/content/renderer/pepper/pepper_video_decoder_host.cc b/content/renderer/pepper/pepper_video_decoder_host.cc index 4f06fe5..a9044e4e 100644 --- a/content/renderer/pepper/pepper_video_decoder_host.cc +++ b/content/renderer/pepper/pepper_video_decoder_host.cc
@@ -6,7 +6,7 @@ #include <stddef.h> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/memory/unsafe_shared_memory_region.h" #include "base/ranges/algorithm.h"
diff --git a/content/renderer/pepper/pepper_video_encoder_host.cc b/content/renderer/pepper/pepper_video_encoder_host.cc index 240e23c3..5fc2b11 100644 --- a/content/renderer/pepper/pepper_video_encoder_host.cc +++ b/content/renderer/pepper/pepper_video_encoder_host.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/unsafe_shared_memory_region.h" #include "base/numerics/safe_math.h" #include "build/build_config.h"
diff --git a/content/renderer/pepper/plugin_module.cc b/content/renderer/pepper/plugin_module.cc index cc025de9..127b5cd 100644 --- a/content/renderer/pepper/plugin_module.cc +++ b/content/renderer/pepper/plugin_module.cc
@@ -12,8 +12,8 @@ #include <set> #include <utility> -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/no_destructor.h" #include "base/run_loop.h"
diff --git a/content/renderer/pepper/plugin_object.cc b/content/renderer/pepper/plugin_object.cc index 7bd0ac9..0ac5434d 100644 --- a/content/renderer/pepper/plugin_object.cc +++ b/content/renderer/pepper/plugin_object.cc
@@ -8,8 +8,8 @@ #include <memory> -#include "base/bind.h" #include "base/check.h" +#include "base/functional/bind.h" #include "base/memory/ref_counted.h" #include "base/notreached.h" #include "base/strings/string_number_conversions.h"
diff --git a/content/renderer/pepper/ppb_graphics_3d_impl.cc b/content/renderer/pepper/ppb_graphics_3d_impl.cc index a77922f..3eb8c86 100644 --- a/content/renderer/pepper/ppb_graphics_3d_impl.cc +++ b/content/renderer/pepper/ppb_graphics_3d_impl.cc
@@ -4,9 +4,9 @@ #include "content/renderer/pepper/ppb_graphics_3d_impl.h" -#include "base/bind.h" #include "base/command_line.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/metrics/histogram_macros.h" #include "base/strings/utf_string_conversions.h"
diff --git a/content/renderer/pepper/renderer_ppapi_host_impl.cc b/content/renderer/pepper/renderer_ppapi_host_impl.cc index 4618229..9fa640e8 100644 --- a/content/renderer/pepper/renderer_ppapi_host_impl.cc +++ b/content/renderer/pepper/renderer_ppapi_host_impl.cc
@@ -6,9 +6,9 @@ #include <memory> -#include "base/bind.h" #include "base/check.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/process/process_handle.h" #include "base/task/single_thread_task_runner.h"
diff --git a/content/renderer/pepper/resource_converter.cc b/content/renderer/pepper/resource_converter.cc index 9b54ea3..27d487d 100644 --- a/content/renderer/pepper/resource_converter.cc +++ b/content/renderer/pepper/resource_converter.cc
@@ -8,7 +8,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "content/public/renderer/renderer_ppapi_host.h" #include "content/renderer/pepper/pepper_file_system_host.h" #include "content/renderer/pepper/pepper_media_stream_audio_track_host.h"
diff --git a/content/renderer/pepper/resource_converter.h b/content/renderer/pepper/resource_converter.h index 16ac93b9..01d2cde7 100644 --- a/content/renderer/pepper/resource_converter.h +++ b/content/renderer/pepper/resource_converter.h
@@ -7,7 +7,7 @@ #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/ref_counted.h" #include "content/common/content_export.h" #include "content/renderer/pepper/host_resource_var.h"
diff --git a/content/renderer/pepper/v8_var_converter.cc b/content/renderer/pepper/v8_var_converter.cc index cac746dc..963db8a 100644 --- a/content/renderer/pepper/v8_var_converter.cc +++ b/content/renderer/pepper/v8_var_converter.cc
@@ -14,9 +14,9 @@ #include <unordered_map> #include <unordered_set> -#include "base/bind.h" #include "base/containers/circular_deque.h" #include "base/containers/stack.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/logging.h" #include "content/public/renderer/renderer_ppapi_host.h"
diff --git a/content/renderer/pepper/v8_var_converter.h b/content/renderer/pepper/v8_var_converter.h index d0ba94b..b197c91 100644 --- a/content/renderer/pepper/v8_var_converter.h +++ b/content/renderer/pepper/v8_var_converter.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "content/common/content_export.h" #include "ppapi/c/pp_instance.h" #include "ppapi/c/pp_var.h"
diff --git a/content/renderer/pepper/v8_var_converter_unittest.cc b/content/renderer/pepper/v8_var_converter_unittest.cc index 5e44c2e..ac75008b 100644 --- a/content/renderer/pepper/v8_var_converter_unittest.cc +++ b/content/renderer/pepper/v8_var_converter_unittest.cc
@@ -11,8 +11,8 @@ #include <memory> #include <unordered_map> -#include "base/bind.h" #include "base/check.h" +#include "base/functional/bind.h" #include "base/memory/ref_counted.h" #include "base/notreached.h" #include "base/run_loop.h"
diff --git a/content/renderer/pepper/video_decoder_shim.cc b/content/renderer/pepper/video_decoder_shim.cc index 04aa8f8..1f26cd0 100644 --- a/content/renderer/pepper/video_decoder_shim.cc +++ b/content/renderer/pepper/video_decoder_shim.cc
@@ -11,10 +11,10 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/check_op.h" #include "base/containers/queue.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/memory/ref_counted.h" #include "base/notreached.h"
diff --git a/content/renderer/pepper/video_encoder_shim.cc b/content/renderer/pepper/video_encoder_shim.cc index 3fdc23c..714542d9 100644 --- a/content/renderer/pepper/video_encoder_shim.cc +++ b/content/renderer/pepper/video_encoder_shim.cc
@@ -8,9 +8,9 @@ #include <memory> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/containers/circular_deque.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/system/sys_info.h" #include "base/task/single_thread_task_runner.h"
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc index 4d57400d..fcb7668 100644 --- a/content/renderer/render_frame_impl.cc +++ b/content/renderer/render_frame_impl.cc
@@ -11,8 +11,6 @@ #include <vector> #include "base/auto_reset.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/containers/flat_map.h" #include "base/debug/alias.h" @@ -21,6 +19,8 @@ #include "base/debug/dump_without_crashing.h" #include "base/feature_list.h" #include "base/files/file.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/guid.h" #include "base/json/json_reader.h" #include "base/json/json_writer.h" @@ -3250,11 +3250,14 @@ WebMediaPlayerEncryptedMediaClient* encrypted_client, WebContentDecryptionModule* initial_cdm, const blink::WebString& sink_id, - const cc::LayerTreeSettings& settings, + const cc::LayerTreeSettings* settings, scoped_refptr<base::TaskRunner> compositor_worker_task_runner) { + // `settings` should be non-null since the WebView created for + // RenderFrameImpl always composites. + DCHECK(settings); return media_factory_.CreateMediaPlayer( source, client, inspector_context, encrypted_client, initial_cdm, sink_id, - GetLocalRootWebFrameWidget()->GetFrameSinkId(), settings, + GetLocalRootWebFrameWidget()->GetFrameSinkId(), *settings, agent_scheduling_group_.agent_group_scheduler().CompositorTaskRunner(), std::move(compositor_worker_task_runner)); }
diff --git a/content/renderer/render_frame_impl.h b/content/renderer/render_frame_impl.h index 6b70546..c0d24c17 100644 --- a/content/renderer/render_frame_impl.h +++ b/content/renderer/render_frame_impl.h
@@ -16,9 +16,9 @@ #include <utility> #include <vector> -#include "base/callback.h" #include "base/containers/id_map.h" #include "base/files/file_path.h" +#include "base/functional/callback.h" #include "base/gtest_prod_util.h" #include "base/memory/read_only_shared_memory_region.h" #include "base/memory/ref_counted.h" @@ -489,7 +489,7 @@ blink::WebMediaPlayerEncryptedMediaClient* encrypted_client, blink::WebContentDecryptionModule* initial_cdm, const blink::WebString& sink_id, - const cc::LayerTreeSettings& settings, + const cc::LayerTreeSettings* settings, scoped_refptr<base::TaskRunner> compositor_worker_task_runner) override; std::unique_ptr<blink::WebContentSettingsClient> CreateWorkerContentSettingsClient() override;
diff --git a/content/renderer/render_frame_impl_browsertest.cc b/content/renderer/render_frame_impl_browsertest.cc index fb9bb79..dd230fd 100644 --- a/content/renderer/render_frame_impl_browsertest.cc +++ b/content/renderer/render_frame_impl_browsertest.cc
@@ -7,10 +7,10 @@ #include <tuple> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/debug/leak_annotations.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h"
diff --git a/content/renderer/render_process_impl.cc b/content/renderer/render_process_impl.cc index 0051dac..af6e5ce 100644 --- a/content/renderer/render_process_impl.cc +++ b/content/renderer/render_process_impl.cc
@@ -18,12 +18,12 @@ #include <utility> #include "base/base_switches.h" -#include "base/bind.h" #include "base/command_line.h" #include "base/compiler_specific.h" #include "base/debug/crash_logging.h" #include "base/debug/stack_trace.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/synchronization/waitable_event.h" #include "base/system/sys_info.h"
diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc index 8820b82..59b0db6f 100644 --- a/content/renderer/render_thread_impl.cc +++ b/content/renderer/render_thread_impl.cc
@@ -15,11 +15,11 @@ #include "base/allocator/allocator_extension.h" #include "base/allocator/partition_alloc_support.h" #include "base/at_exit.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/debug/crash_logging.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/lazy_instance.h" #include "base/logging.h" #include "base/memory/discardable_memory_allocator.h"
diff --git a/content/renderer/render_thread_impl_browsertest.cc b/content/renderer/render_thread_impl_browsertest.cc index 81fe48d..0be71f2 100644 --- a/content/renderer/render_thread_impl_browsertest.cc +++ b/content/renderer/render_thread_impl_browsertest.cc
@@ -10,10 +10,10 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/command_line.h" #include "base/debug/leak_annotations.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/location.h" #include "base/memory/discardable_memory.h" #include "base/metrics/field_trial.h"
diff --git a/content/renderer/render_thread_impl_discardable_memory_browsertest.cc b/content/renderer/render_thread_impl_discardable_memory_browsertest.cc index dfdb3d89..c5ad5e8 100644 --- a/content/renderer/render_thread_impl_discardable_memory_browsertest.cc +++ b/content/renderer/render_thread_impl_discardable_memory_browsertest.cc
@@ -11,9 +11,9 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/discardable_memory.h" #include "base/memory/discardable_memory_allocator.h" #include "base/memory/madv_free_discardable_memory_allocator_posix.h"
diff --git a/content/renderer/render_view_browsertest.cc b/content/renderer/render_view_browsertest.cc index 86d691e7..83ff9d5 100644 --- a/content/renderer/render_view_browsertest.cc +++ b/content/renderer/render_view_browsertest.cc
@@ -9,10 +9,10 @@ #include <memory> #include <tuple> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/json/json_reader.h" #include "base/json/json_writer.h" #include "base/location.h"
diff --git a/content/renderer/render_widget_browsertest.cc b/content/renderer/render_widget_browsertest.cc index 0af753a9c..382fbd0 100644 --- a/content/renderer/render_widget_browsertest.cc +++ b/content/renderer/render_widget_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 "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/strings/utf_string_conversions.h" #include "components/viz/common/surfaces/local_surface_id.h" #include "components/viz/common/surfaces/parent_local_surface_id_allocator.h"
diff --git a/content/renderer/renderer_blink_platform_impl.cc b/content/renderer/renderer_blink_platform_impl.cc index 15e93c98..ba197fd 100644 --- a/content/renderer/renderer_blink_platform_impl.cc +++ b/content/renderer/renderer_blink_platform_impl.cc
@@ -9,10 +9,10 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/command_line.h" #include "base/feature_list.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/guid.h" #include "base/lazy_instance.h" #include "base/location.h"
diff --git a/content/renderer/renderer_thread_type_handler.cc b/content/renderer/renderer_thread_type_handler.cc index ed17ff8..de53af55 100644 --- a/content/renderer/renderer_thread_type_handler.cc +++ b/content/renderer/renderer_thread_type_handler.cc
@@ -4,7 +4,7 @@ #include "content/renderer/renderer_thread_type_handler.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/task/single_thread_task_runner.h" #include "content/renderer/render_thread_impl.h"
diff --git a/content/renderer/savable_resources_browsertest.cc b/content/renderer/savable_resources_browsertest.cc index f07ab8a..d263631 100644 --- a/content/renderer/savable_resources_browsertest.cc +++ b/content/renderer/savable_resources_browsertest.cc
@@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/bind.h" #include "base/command_line.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "build/build_config.h" #include "content/public/browser/render_frame_host.h" #include "content/public/browser/web_contents.h"
diff --git a/content/renderer/service_worker/controller_service_worker_connector.cc b/content/renderer/service_worker/controller_service_worker_connector.cc index b8af6f7..278811e 100644 --- a/content/renderer/service_worker/controller_service_worker_connector.cc +++ b/content/renderer/service_worker/controller_service_worker_connector.cc
@@ -4,8 +4,8 @@ #include "content/renderer/service_worker/controller_service_worker_connector.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/observer_list.h" namespace content {
diff --git a/content/renderer/service_worker/embedded_worker_instance_client_impl.cc b/content/renderer/service_worker/embedded_worker_instance_client_impl.cc index f8149360..90c4771 100644 --- a/content/renderer/service_worker/embedded_worker_instance_client_impl.cc +++ b/content/renderer/service_worker/embedded_worker_instance_client_impl.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_macros.h" #include "base/strings/utf_string_conversions.h" #include "base/task/single_thread_task_runner.h"
diff --git a/content/renderer/service_worker/service_worker_context_client.cc b/content/renderer/service_worker/service_worker_context_client.cc index 5c60dbe..9459063 100644 --- a/content/renderer/service_worker/service_worker_context_client.cc +++ b/content/renderer/service_worker/service_worker_context_client.cc
@@ -9,11 +9,11 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/check_op.h" #include "base/debug/alias.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/metrics/histogram_macros.h" #include "base/strings/utf_string_conversions.h" #include "base/task/sequenced_task_runner.h"
diff --git a/content/renderer/service_worker/service_worker_context_client.h b/content/renderer/service_worker/service_worker_context_client.h index 3bb49fe4..24f14f9 100644 --- a/content/renderer/service_worker/service_worker_context_client.h +++ b/content/renderer/service_worker/service_worker_context_client.h
@@ -12,8 +12,8 @@ #include <memory> #include <string> -#include "base/callback.h" #include "base/containers/id_map.h" +#include "base/functional/callback.h" #include "base/gtest_prod_util.h" #include "base/memory/scoped_refptr.h" #include "base/time/time.h"
diff --git a/content/renderer/service_worker/service_worker_provider_context.cc b/content/renderer/service_worker/service_worker_provider_context.cc index f3f8ec59..b565bf7 100644 --- a/content/renderer/service_worker/service_worker_provider_context.cc +++ b/content/renderer/service_worker/service_worker_provider_context.cc
@@ -8,8 +8,8 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/containers/cxx20_erase.h" +#include "base/functional/bind.h" #include "base/memory/ref_counted.h" #include "base/task/sequenced_task_runner.h" #include "base/task/sequenced_task_runner_helpers.h"
diff --git a/content/renderer/service_worker/service_worker_provider_context_unittest.cc b/content/renderer/service_worker/service_worker_provider_context_unittest.cc index 57d1cd8..739cd18 100644 --- a/content/renderer/service_worker/service_worker_provider_context_unittest.cc +++ b/content/renderer/service_worker/service_worker_provider_context_unittest.cc
@@ -10,8 +10,8 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "base/test/task_environment.h" #include "content/public/common/content_features.h"
diff --git a/content/renderer/service_worker/service_worker_subresource_loader.cc b/content/renderer/service_worker/service_worker_subresource_loader.cc index e27fda9..52f7626 100644 --- a/content/renderer/service_worker/service_worker_subresource_loader.cc +++ b/content/renderer/service_worker/service_worker_subresource_loader.cc
@@ -5,9 +5,9 @@ #include "content/renderer/service_worker/service_worker_subresource_loader.h" #include "base/atomic_sequence_num.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/metrics/histogram_functions.h" #include "base/metrics/histogram_macros.h" #include "base/strings/strcat.h"
diff --git a/content/renderer/service_worker/service_worker_subresource_loader_unittest.cc b/content/renderer/service_worker/service_worker_subresource_loader_unittest.cc index ea6d28d..75688d77 100644 --- a/content/renderer/service_worker/service_worker_subresource_loader_unittest.cc +++ b/content/renderer/service_worker/service_worker_subresource_loader_unittest.cc
@@ -9,8 +9,8 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h"
diff --git a/content/renderer/service_worker/web_service_worker_provider_impl.cc b/content/renderer/service_worker/web_service_worker_provider_impl.cc index 385ce36..fa4ee138 100644 --- a/content/renderer/service_worker/web_service_worker_provider_impl.cc +++ b/content/renderer/service_worker/web_service_worker_provider_impl.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/utf_string_conversions.h" #include "base/trace_event/trace_event.h" #include "content/renderer/service_worker/service_worker_provider_context.h"
diff --git a/content/renderer/v8_value_converter_impl.cc b/content/renderer/v8_value_converter_impl.cc index b4bf9bc..0142e54 100644 --- a/content/renderer/v8_value_converter_impl.cc +++ b/content/renderer/v8_value_converter_impl.cc
@@ -13,9 +13,9 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/containers/span.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/values.h" #include "v8/include/v8-array-buffer.h"
diff --git a/content/renderer/visual_state_browsertest.cc b/content/renderer/visual_state_browsertest.cc index 2d7011a..d9a0d3f 100644 --- a/content/renderer/visual_state_browsertest.cc +++ b/content/renderer/visual_state_browsertest.cc
@@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/bind.h" #include "base/command_line.h" #include "base/containers/flat_map.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/task/current_thread.h" #include "content/public/browser/render_frame_host.h"
diff --git a/content/renderer/web_ui_extension.cc b/content/renderer/web_ui_extension.cc index febd09a..7e31f1ae7c 100644 --- a/content/renderer/web_ui_extension.cc +++ b/content/renderer/web_ui_extension.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/values.h" #include "content/public/common/bindings_policy.h" #include "content/public/common/url_constants.h"
diff --git a/content/renderer/worker/embedded_shared_worker_stub.cc b/content/renderer/worker/embedded_shared_worker_stub.cc index 7ec12f0e..c06f718 100644 --- a/content/renderer/worker/embedded_shared_worker_stub.cc +++ b/content/renderer/worker/embedded_shared_worker_stub.cc
@@ -7,8 +7,8 @@ #include <stdint.h> #include <utility> -#include "base/bind.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "content/public/common/network_service_util.h" #include "content/renderer/content_security_policy_util.h" #include "content/renderer/policy_container_util.h"
diff --git a/content/renderer/worker/worker_thread_registry.h b/content/renderer/worker/worker_thread_registry.h index 62a1d17..5c9f1797 100644 --- a/content/renderer/worker/worker_thread_registry.h +++ b/content/renderer/worker/worker_thread_registry.h
@@ -7,7 +7,7 @@ #include <map> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/ref_counted.h" #include "base/synchronization/lock.h" #include "base/threading/platform_thread.h"
diff --git a/content/services/auction_worklet/auction_downloader.cc b/content/services/auction_worklet/auction_downloader.cc index 5fc7d12..8954552 100644 --- a/content/services/auction_worklet/auction_downloader.cc +++ b/content/services/auction_worklet/auction_downloader.cc
@@ -8,8 +8,8 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" #include "base/trace_event/trace_event.h"
diff --git a/content/services/auction_worklet/auction_downloader.h b/content/services/auction_worklet/auction_downloader.h index 784821d..1fed492f 100644 --- a/content/services/auction_worklet/auction_downloader.h +++ b/content/services/auction_worklet/auction_downloader.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/unguessable_token.h" #include "content/common/content_export.h" #include "net/http/http_response_headers.h"
diff --git a/content/services/auction_worklet/auction_downloader_unittest.cc b/content/services/auction_worklet/auction_downloader_unittest.cc index 1feb4c4..1ec29fb99 100644 --- a/content/services/auction_worklet/auction_downloader_unittest.cc +++ b/content/services/auction_worklet/auction_downloader_unittest.cc
@@ -8,7 +8,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/test/task_environment.h" #include "content/services/auction_worklet/worklet_test_util.h"
diff --git a/content/services/auction_worklet/auction_v8_devtools_session.h b/content/services/auction_worklet/auction_v8_devtools_session.h index f33753be..59799b40 100644 --- a/content/services/auction_worklet/auction_v8_devtools_session.h +++ b/content/services/auction_worklet/auction_v8_devtools_session.h
@@ -9,8 +9,8 @@ #include <string> #include <vector> -#include "base/callback.h" #include "base/containers/span.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h" #include "base/sequence_checker.h"
diff --git a/content/services/auction_worklet/auction_v8_helper.cc b/content/services/auction_worklet/auction_v8_helper.cc index 0c7506e..37c6677 100644 --- a/content/services/auction_worklet/auction_v8_helper.cc +++ b/content/services/auction_worklet/auction_v8_helper.cc
@@ -8,8 +8,8 @@ #include <memory> #include <utility> -#include "base/callback.h" #include "base/check.h" +#include "base/functional/callback.h" #include "base/location.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h"
diff --git a/content/services/auction_worklet/auction_v8_helper_unittest.cc b/content/services/auction_worklet/auction_v8_helper_unittest.cc index 6754e90..857aa17b 100644 --- a/content/services/auction_worklet/auction_v8_helper_unittest.cc +++ b/content/services/auction_worklet/auction_v8_helper_unittest.cc
@@ -10,7 +10,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/strings/stringprintf.h" #include "base/synchronization/lock.h" #include "base/task/sequenced_task_runner.h"
diff --git a/content/services/auction_worklet/bidder_worklet.cc b/content/services/auction_worklet/bidder_worklet.cc index b9f2f93..20f06c25 100644 --- a/content/services/auction_worklet/bidder_worklet.cc +++ b/content/services/auction_worklet/bidder_worklet.cc
@@ -13,8 +13,8 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" #include "base/metrics/histogram_functions.h" #include "base/strings/strcat.h"
diff --git a/content/services/auction_worklet/bidder_worklet.h b/content/services/auction_worklet/bidder_worklet.h index d350562..4fcc38c 100644 --- a/content/services/auction_worklet/bidder_worklet.h +++ b/content/services/auction_worklet/bidder_worklet.h
@@ -13,10 +13,10 @@ #include <string> #include <vector> -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/containers/flat_map.h" #include "base/containers/unique_ptr_adapters.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h" #include "base/task/cancelable_task_tracker.h"
diff --git a/content/services/auction_worklet/bidder_worklet_unittest.cc b/content/services/auction_worklet/bidder_worklet_unittest.cc index 1b7a757..c00255b 100644 --- a/content/services/auction_worklet/bidder_worklet_unittest.cc +++ b/content/services/auction_worklet/bidder_worklet_unittest.cc
@@ -10,8 +10,8 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/json/json_writer.h" #include "base/memory/raw_ptr.h" #include "base/ranges/algorithm.h"
diff --git a/content/services/auction_worklet/debug_command_queue.h b/content/services/auction_worklet/debug_command_queue.h index c2b271b..a161f0e9 100644 --- a/content/services/auction_worklet/debug_command_queue.h +++ b/content/services/auction_worklet/debug_command_queue.h
@@ -7,8 +7,8 @@ #include <set> -#include "base/callback.h" #include "base/containers/queue.h" +#include "base/functional/callback.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_refptr.h" #include "base/synchronization/condition_variable.h"
diff --git a/content/services/auction_worklet/direct_from_seller_signals_requester.cc b/content/services/auction_worklet/direct_from_seller_signals_requester.cc index 209c8c8..b03c51d 100644 --- a/content/services/auction_worklet/direct_from_seller_signals_requester.cc +++ b/content/services/auction_worklet/direct_from_seller_signals_requester.cc
@@ -11,8 +11,8 @@ #include <utility> #include <vector> -#include "base/callback.h" #include "base/check.h" +#include "base/functional/callback.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_refptr.h" #include "base/metrics/histogram_functions.h"
diff --git a/content/services/auction_worklet/direct_from_seller_signals_requester.h b/content/services/auction_worklet/direct_from_seller_signals_requester.h index 217708da..91959cb 100644 --- a/content/services/auction_worklet/direct_from_seller_signals_requester.h +++ b/content/services/auction_worklet/direct_from_seller_signals_requester.h
@@ -11,7 +11,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h"
diff --git a/content/services/auction_worklet/for_debugging_only_bindings.cc b/content/services/auction_worklet/for_debugging_only_bindings.cc index baca6f2..d853bc8 100644 --- a/content/services/auction_worklet/for_debugging_only_bindings.cc +++ b/content/services/auction_worklet/for_debugging_only_bindings.cc
@@ -8,9 +8,9 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "content/services/auction_worklet/auction_v8_helper.h" #include "gin/converter.h" #include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/content/services/auction_worklet/for_debugging_only_bindings.h b/content/services/auction_worklet/for_debugging_only_bindings.h index 8816010e4..7d75ff3 100644 --- a/content/services/auction_worklet/for_debugging_only_bindings.h +++ b/content/services/auction_worklet/for_debugging_only_bindings.h
@@ -5,7 +5,7 @@ #ifndef CONTENT_SERVICES_AUCTION_WORKLET_FOR_DEBUGGING_ONLY_BINDINGS_H_ #define CONTENT_SERVICES_AUCTION_WORKLET_FOR_DEBUGGING_ONLY_BINDINGS_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "content/services/auction_worklet/auction_v8_helper.h" #include "content/services/auction_worklet/context_recycler.h"
diff --git a/content/services/auction_worklet/register_ad_beacon_bindings.cc b/content/services/auction_worklet/register_ad_beacon_bindings.cc index 3bcc5a3..fca23a01 100644 --- a/content/services/auction_worklet/register_ad_beacon_bindings.cc +++ b/content/services/auction_worklet/register_ad_beacon_bindings.cc
@@ -8,8 +8,8 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/strings/strcat.h" #include "content/services/auction_worklet/auction_v8_helper.h" #include "gin/converter.h"
diff --git a/content/services/auction_worklet/register_ad_beacon_bindings.h b/content/services/auction_worklet/register_ad_beacon_bindings.h index 2cdd57e..f5542c33 100644 --- a/content/services/auction_worklet/register_ad_beacon_bindings.h +++ b/content/services/auction_worklet/register_ad_beacon_bindings.h
@@ -5,8 +5,8 @@ #ifndef CONTENT_SERVICES_AUCTION_WORKLET_REGISTER_AD_BEACON_BINDINGS_H_ #define CONTENT_SERVICES_AUCTION_WORKLET_REGISTER_AD_BEACON_BINDINGS_H_ -#include "base/callback.h" #include "base/containers/flat_map.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "content/services/auction_worklet/auction_v8_helper.h" #include "content/services/auction_worklet/context_recycler.h"
diff --git a/content/services/auction_worklet/report_bindings.cc b/content/services/auction_worklet/report_bindings.cc index e3b0dc8..ad8428f 100644 --- a/content/services/auction_worklet/report_bindings.cc +++ b/content/services/auction_worklet/report_bindings.cc
@@ -8,8 +8,8 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "content/services/auction_worklet/auction_v8_helper.h" #include "gin/converter.h" #include "url/gurl.h"
diff --git a/content/services/auction_worklet/report_bindings.h b/content/services/auction_worklet/report_bindings.h index 2e66232..18c9ab8 100644 --- a/content/services/auction_worklet/report_bindings.h +++ b/content/services/auction_worklet/report_bindings.h
@@ -5,7 +5,7 @@ #ifndef CONTENT_SERVICES_AUCTION_WORKLET_REPORT_BINDINGS_H_ #define CONTENT_SERVICES_AUCTION_WORKLET_REPORT_BINDINGS_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "content/services/auction_worklet/auction_v8_helper.h" #include "content/services/auction_worklet/context_recycler.h"
diff --git a/content/services/auction_worklet/seller_worklet.cc b/content/services/auction_worklet/seller_worklet.cc index a6312ca..1cc2d9b 100644 --- a/content/services/auction_worklet/seller_worklet.cc +++ b/content/services/auction_worklet/seller_worklet.cc
@@ -13,9 +13,9 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback.h" #include "base/containers/flat_map.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" #include "base/metrics/histogram_functions.h" #include "base/strings/strcat.h"
diff --git a/content/services/auction_worklet/seller_worklet.h b/content/services/auction_worklet/seller_worklet.h index ffb7fe1..4d3c807 100644 --- a/content/services/auction_worklet/seller_worklet.h +++ b/content/services/auction_worklet/seller_worklet.h
@@ -12,9 +12,9 @@ #include <string> #include <vector> -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/containers/flat_map.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h" #include "base/sequence_checker.h"
diff --git a/content/services/auction_worklet/seller_worklet_unittest.cc b/content/services/auction_worklet/seller_worklet_unittest.cc index 6c7bfb6..32411ce 100644 --- a/content/services/auction_worklet/seller_worklet_unittest.cc +++ b/content/services/auction_worklet/seller_worklet_unittest.cc
@@ -9,9 +9,9 @@ #include <string> #include <utility> -#include "base/bind.h" #include "base/containers/flat_map.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/ranges/algorithm.h" #include "base/run_loop.h" #include "base/strings/stringprintf.h"
diff --git a/content/services/auction_worklet/set_bid_bindings.cc b/content/services/auction_worklet/set_bid_bindings.cc index c0a8769..94af56dc 100644 --- a/content/services/auction_worklet/set_bid_bindings.cc +++ b/content/services/auction_worklet/set_bid_bindings.cc
@@ -8,8 +8,8 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/strings/strcat.h" #include "base/strings/stringprintf.h" #include "content/services/auction_worklet/auction_v8_helper.h"
diff --git a/content/services/auction_worklet/set_bid_bindings.h b/content/services/auction_worklet/set_bid_bindings.h index b13607d..554e26e 100644 --- a/content/services/auction_worklet/set_bid_bindings.h +++ b/content/services/auction_worklet/set_bid_bindings.h
@@ -5,7 +5,7 @@ #ifndef CONTENT_SERVICES_AUCTION_WORKLET_SET_BID_BINDINGS_H_ #define CONTENT_SERVICES_AUCTION_WORKLET_SET_BID_BINDINGS_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/time/time.h" #include "content/common/content_export.h"
diff --git a/content/services/auction_worklet/set_priority_bindings.cc b/content/services/auction_worklet/set_priority_bindings.cc index 6a7e2218..a5e220b7 100644 --- a/content/services/auction_worklet/set_priority_bindings.cc +++ b/content/services/auction_worklet/set_priority_bindings.cc
@@ -8,8 +8,8 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "content/services/auction_worklet/auction_v8_helper.h" #include "gin/converter.h" #include "url/gurl.h"
diff --git a/content/services/auction_worklet/set_priority_bindings.h b/content/services/auction_worklet/set_priority_bindings.h index b57b694b1..dd3c5e3 100644 --- a/content/services/auction_worklet/set_priority_bindings.h +++ b/content/services/auction_worklet/set_priority_bindings.h
@@ -5,7 +5,7 @@ #ifndef CONTENT_SERVICES_AUCTION_WORKLET_SET_PRIORITY_BINDINGS_H_ #define CONTENT_SERVICES_AUCTION_WORKLET_SET_PRIORITY_BINDINGS_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "content/services/auction_worklet/auction_v8_helper.h" #include "content/services/auction_worklet/context_recycler.h"
diff --git a/content/services/auction_worklet/set_priority_signals_override_bindings.cc b/content/services/auction_worklet/set_priority_signals_override_bindings.cc index 8159c8e8..12e1763d 100644 --- a/content/services/auction_worklet/set_priority_signals_override_bindings.cc +++ b/content/services/auction_worklet/set_priority_signals_override_bindings.cc
@@ -8,8 +8,8 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/strings/strcat.h" #include "content/services/auction_worklet/auction_v8_helper.h" #include "content/services/auction_worklet/public/mojom/bidder_worklet.mojom.h"
diff --git a/content/services/auction_worklet/set_priority_signals_override_bindings.h b/content/services/auction_worklet/set_priority_signals_override_bindings.h index a9a2e2f..a32ef81e 100644 --- a/content/services/auction_worklet/set_priority_signals_override_bindings.h +++ b/content/services/auction_worklet/set_priority_signals_override_bindings.h
@@ -5,8 +5,8 @@ #ifndef CONTENT_SERVICES_AUCTION_WORKLET_SET_PRIORITY_SIGNALS_OVERRIDE_BINDINGS_H_ #define CONTENT_SERVICES_AUCTION_WORKLET_SET_PRIORITY_SIGNALS_OVERRIDE_BINDINGS_H_ -#include "base/callback.h" #include "base/containers/flat_map.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "content/services/auction_worklet/auction_v8_helper.h" #include "content/services/auction_worklet/context_recycler.h"
diff --git a/content/services/auction_worklet/trusted_signals.cc b/content/services/auction_worklet/trusted_signals.cc index cac013b..21cb1a5 100644 --- a/content/services/auction_worklet/trusted_signals.cc +++ b/content/services/auction_worklet/trusted_signals.cc
@@ -9,9 +9,9 @@ #include <string> #include <vector> -#include "base/bind.h" -#include "base/callback.h" #include "base/check.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/ptr_util.h" #include "base/memory/scoped_refptr.h" #include "base/metrics/histogram_functions.h"
diff --git a/content/services/auction_worklet/trusted_signals.h b/content/services/auction_worklet/trusted_signals.h index b97de96..1dcfb326 100644 --- a/content/services/auction_worklet/trusted_signals.h +++ b/content/services/auction_worklet/trusted_signals.h
@@ -11,8 +11,8 @@ #include <string> #include <vector> -#include "base/callback.h" #include "base/containers/flat_map.h" +#include "base/functional/callback.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_refptr.h" #include "base/task/sequenced_task_runner.h"
diff --git a/content/services/auction_worklet/trusted_signals_request_manager.cc b/content/services/auction_worklet/trusted_signals_request_manager.cc index 5794e03..e99c6a0 100644 --- a/content/services/auction_worklet/trusted_signals_request_manager.cc +++ b/content/services/auction_worklet/trusted_signals_request_manager.cc
@@ -9,9 +9,9 @@ #include <string> #include <vector> -#include "base/callback.h" #include "base/check.h" #include "base/containers/unique_ptr_adapters.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_refptr.h"
diff --git a/content/services/auction_worklet/trusted_signals_request_manager.h b/content/services/auction_worklet/trusted_signals_request_manager.h index feaba76..405b0d19 100644 --- a/content/services/auction_worklet/trusted_signals_request_manager.h +++ b/content/services/auction_worklet/trusted_signals_request_manager.h
@@ -10,8 +10,8 @@ #include <string> #include <vector> -#include "base/callback.h" #include "base/containers/unique_ptr_adapters.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_refptr.h"
diff --git a/content/services/auction_worklet/trusted_signals_request_manager_unittest.cc b/content/services/auction_worklet/trusted_signals_request_manager_unittest.cc index a402cc4..c427e10 100644 --- a/content/services/auction_worklet/trusted_signals_request_manager_unittest.cc +++ b/content/services/auction_worklet/trusted_signals_request_manager_unittest.cc
@@ -9,7 +9,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/scoped_refptr.h" #include "base/run_loop.h" #include "base/synchronization/waitable_event.h"
diff --git a/content/services/auction_worklet/trusted_signals_unittest.cc b/content/services/auction_worklet/trusted_signals_unittest.cc index fe9eb35..8c3fbb7 100644 --- a/content/services/auction_worklet/trusted_signals_unittest.cc +++ b/content/services/auction_worklet/trusted_signals_unittest.cc
@@ -10,7 +10,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/scoped_refptr.h" #include "base/run_loop.h" #include "base/synchronization/waitable_event.h"
diff --git a/content/services/auction_worklet/worklet_devtools_debug_test_util.h b/content/services/auction_worklet/worklet_devtools_debug_test_util.h index c954808..6fd72fd 100644 --- a/content/services/auction_worklet/worklet_devtools_debug_test_util.h +++ b/content/services/auction_worklet/worklet_devtools_debug_test_util.h
@@ -8,7 +8,7 @@ #include <list> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/values.h" #include "mojo/public/cpp/bindings/associated_receiver.h" #include "mojo/public/cpp/bindings/associated_remote.h"
diff --git a/content/services/auction_worklet/worklet_loader.cc b/content/services/auction_worklet/worklet_loader.cc index 5089cf8..5f52efe 100644 --- a/content/services/auction_worklet/worklet_loader.cc +++ b/content/services/auction_worklet/worklet_loader.cc
@@ -11,8 +11,8 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/task/sequenced_task_runner.h" #include "content/services/auction_worklet/auction_downloader.h" #include "content/services/auction_worklet/auction_v8_helper.h"
diff --git a/content/services/auction_worklet/worklet_loader.h b/content/services/auction_worklet/worklet_loader.h index 8a2c1714..d8418fc7 100644 --- a/content/services/auction_worklet/worklet_loader.h +++ b/content/services/auction_worklet/worklet_loader.h
@@ -11,7 +11,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h" #include "base/task/sequenced_task_runner.h"
diff --git a/content/services/auction_worklet/worklet_loader_unittest.cc b/content/services/auction_worklet/worklet_loader_unittest.cc index 5b62375..32c82ac 100644 --- a/content/services/auction_worklet/worklet_loader_unittest.cc +++ b/content/services/auction_worklet/worklet_loader_unittest.cc
@@ -7,7 +7,7 @@ #include <string> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/synchronization/waitable_event.h" #include "base/test/bind.h"
diff --git a/content/services/auction_worklet/worklet_v8_debug_test_util.cc b/content/services/auction_worklet/worklet_v8_debug_test_util.cc index d449b7a..3e231f0 100644 --- a/content/services/auction_worklet/worklet_v8_debug_test_util.cc +++ b/content/services/auction_worklet/worklet_v8_debug_test_util.cc
@@ -9,7 +9,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/json/json_reader.h" #include "base/memory/ptr_util.h" #include "base/run_loop.h"
diff --git a/content/services/auction_worklet/worklet_v8_debug_test_util.h b/content/services/auction_worklet/worklet_v8_debug_test_util.h index 0d82a4f..1d92637 100644 --- a/content/services/auction_worklet/worklet_v8_debug_test_util.h +++ b/content/services/auction_worklet/worklet_v8_debug_test_util.h
@@ -10,7 +10,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h" #include "base/synchronization/condition_variable.h"
diff --git a/content/services/isolated_xr_device/xr_runtime_provider.cc b/content/services/isolated_xr_device/xr_runtime_provider.cc index 20dc2f1..c8af4c74 100644 --- a/content/services/isolated_xr_device/xr_runtime_provider.cc +++ b/content/services/isolated_xr_device/xr_runtime_provider.cc
@@ -4,8 +4,8 @@ #include "content/services/isolated_xr_device/xr_runtime_provider.h" -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/task/single_thread_task_runner.h" #include "base/trace_event/trace_event.h" #include "content/public/common/content_switches.h"
diff --git a/content/services/isolated_xr_device/xr_service_test_hook.cc b/content/services/isolated_xr_device/xr_service_test_hook.cc index 022f96f..5ace0bb 100644 --- a/content/services/isolated_xr_device/xr_service_test_hook.cc +++ b/content/services/isolated_xr_device/xr_service_test_hook.cc
@@ -4,7 +4,7 @@ #include "content/services/isolated_xr_device/xr_service_test_hook.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/process/process.h" #include "content/services/isolated_xr_device/xr_test_hook_wrapper.h" #include "device/vr/buildflags/buildflags.h"
diff --git a/content/services/shared_storage_worklet/module_script_downloader.cc b/content/services/shared_storage_worklet/module_script_downloader.cc index 8461ece7..e60b4e03c 100644 --- a/content/services/shared_storage_worklet/module_script_downloader.cc +++ b/content/services/shared_storage_worklet/module_script_downloader.cc
@@ -7,8 +7,8 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" #include "net/base/net_errors.h"
diff --git a/content/services/shared_storage_worklet/module_script_downloader.h b/content/services/shared_storage_worklet/module_script_downloader.h index aee474e..ac646ef 100644 --- a/content/services/shared_storage_worklet/module_script_downloader.h +++ b/content/services/shared_storage_worklet/module_script_downloader.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "content/common/content_export.h" #include "net/url_request/redirect_info.h" #include "services/network/public/mojom/url_loader_factory.mojom-forward.h"
diff --git a/content/services/shared_storage_worklet/module_script_downloader_unittest.cc b/content/services/shared_storage_worklet/module_script_downloader_unittest.cc index 84f6b3e..04e3e93a 100644 --- a/content/services/shared_storage_worklet/module_script_downloader_unittest.cc +++ b/content/services/shared_storage_worklet/module_script_downloader_unittest.cc
@@ -8,7 +8,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/strings/stringprintf.h" #include "base/test/task_environment.h"
diff --git a/content/shell/android/browsertests_apk/content_browser_tests_jni_onload.cc b/content/shell/android/browsertests_apk/content_browser_tests_jni_onload.cc index c80b961..6dede1cc5 100644 --- a/content/shell/android/browsertests_apk/content_browser_tests_jni_onload.cc +++ b/content/shell/android/browsertests_apk/content_browser_tests_jni_onload.cc
@@ -6,7 +6,7 @@ #include "base/android/jni_android.h" #include "base/android/library_loader/library_loader_hooks.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/message_loop/message_pump.h" #include "content/public/app/content_jni_onload.h" #include "content/public/app/content_main.h"
diff --git a/content/shell/android/shell_manager.cc b/content/shell/android/shell_manager.cc index f78d471..c1aefdb 100644 --- a/content/shell/android/shell_manager.cc +++ b/content/shell/android/shell_manager.cc
@@ -7,7 +7,7 @@ #include "base/android/jni_android.h" #include "base/android/jni_string.h" #include "base/android/scoped_java_ref.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/lazy_instance.h" #include "content/public/browser/web_contents.h" #include "content/shell/android/content_shell_jni_headers/ShellManager_jni.h"
diff --git a/content/shell/browser/shell.cc b/content/shell/browser/shell.cc index 36f98af..22270c5 100644 --- a/content/shell/browser/shell.cc +++ b/content/shell/browser/shell.cc
@@ -11,8 +11,8 @@ #include <string> #include <utility> -#include "base/callback_helpers.h" #include "base/command_line.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/no_destructor.h" #include "base/run_loop.h"
diff --git a/content/shell/browser/shell.h b/content/shell/browser/shell.h index 4f80237..a623e85 100644 --- a/content/shell/browser/shell.h +++ b/content/shell/browser/shell.h
@@ -10,7 +10,7 @@ #include <string> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/ref_counted.h" #include "base/strings/string_piece.h" #include "build/build_config.h"
diff --git a/content/shell/browser/shell_browser_context.cc b/content/shell/browser/shell_browser_context.cc index d734e72f..8dcd2ee4 100644 --- a/content/shell/browser/shell_browser_context.cc +++ b/content/shell/browser/shell_browser_context.cc
@@ -7,10 +7,10 @@ #include <memory> #include <utility> -#include "base/bind.h" #include "base/command_line.h" #include "base/environment.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/path_service.h" #include "base/threading/thread.h"
diff --git a/content/shell/browser/shell_browser_main_parts.cc b/content/shell/browser/shell_browser_main_parts.cc index 6ed6a9e4..157cdba 100644 --- a/content/shell/browser/shell_browser_main_parts.cc +++ b/content/shell/browser/shell_browser_main_parts.cc
@@ -7,11 +7,11 @@ #include <utility> #include "base/base_switches.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ref_counted_memory.h" #include "base/strings/utf_string_conversions.h" #include "base/task/current_thread.h"
diff --git a/content/shell/browser/shell_content_browser_client.h b/content/shell/browser/shell_content_browser_client.h index 8571530..176a7fe1 100644 --- a/content/shell/browser/shell_content_browser_client.h +++ b/content/shell/browser/shell_content_browser_client.h
@@ -8,8 +8,8 @@ #include <memory> #include <string> -#include "base/callback.h" #include "base/files/file_path.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "build/build_config.h" #include "content/public/browser/content_browser_client.h"
diff --git a/content/shell/browser/shell_devtools_bindings.cc b/content/shell/browser/shell_devtools_bindings.cc index df4efd8..4eb322a 100644 --- a/content/shell/browser/shell_devtools_bindings.cc +++ b/content/shell/browser/shell_devtools_bindings.cc
@@ -9,11 +9,11 @@ #include <utility> #include "base/base64.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/containers/contains.h" #include "base/containers/cxx20_erase.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/guid.h" #include "base/json/json_reader.h" #include "base/json/json_writer.h"
diff --git a/content/shell/browser/shell_devtools_bindings.h b/content/shell/browser/shell_devtools_bindings.h index 9eca80d..976a56f 100644 --- a/content/shell/browser/shell_devtools_bindings.h +++ b/content/shell/browser/shell_devtools_bindings.h
@@ -8,9 +8,9 @@ #include <memory> #include <set> -#include "base/callback_helpers.h" #include "base/containers/span.h" #include "base/containers/unique_ptr_adapters.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h"
diff --git a/content/shell/browser/shell_devtools_manager_delegate.cc b/content/shell/browser/shell_devtools_manager_delegate.cc index e709fa4..ee719fa 100644 --- a/content/shell/browser/shell_devtools_manager_delegate.cc +++ b/content/shell/browser/shell_devtools_manager_delegate.cc
@@ -9,10 +9,10 @@ #include <vector> #include "base/atomicops.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/command_line.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" #include "build/build_config.h"
diff --git a/content/shell/browser/shell_download_manager_delegate.cc b/content/shell/browser/shell_download_manager_delegate.cc index cd63d92..38664c7 100644 --- a/content/shell/browser/shell_download_manager_delegate.cc +++ b/content/shell/browser/shell_download_manager_delegate.cc
@@ -13,11 +13,11 @@ #include <commdlg.h> #endif -#include "base/bind.h" #include "base/check_op.h" #include "base/command_line.h" #include "base/cxx17_backports.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/notreached.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h"
diff --git a/content/shell/browser/shell_download_manager_delegate.h b/content/shell/browser/shell_download_manager_delegate.h index 0dab802..96eff67 100644 --- a/content/shell/browser/shell_download_manager_delegate.h +++ b/content/shell/browser/shell_download_manager_delegate.h
@@ -7,7 +7,7 @@ #include <stdint.h> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "content/public/browser/download_manager_delegate.h"
diff --git a/content/shell/browser/shell_javascript_dialog.h b/content/shell/browser/shell_javascript_dialog.h index f6c2689..259a65c 100644 --- a/content/shell/browser/shell_javascript_dialog.h +++ b/content/shell/browser/shell_javascript_dialog.h
@@ -5,7 +5,7 @@ #ifndef CONTENT_SHELL_BROWSER_SHELL_JAVASCRIPT_DIALOG_H_ #define CONTENT_SHELL_BROWSER_SHELL_JAVASCRIPT_DIALOG_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "build/build_config.h" #include "content/public/browser/javascript_dialog_manager.h"
diff --git a/content/shell/browser/shell_javascript_dialog_manager.h b/content/shell/browser/shell_javascript_dialog_manager.h index 0fba00c..bf998406 100644 --- a/content/shell/browser/shell_javascript_dialog_manager.h +++ b/content/shell/browser/shell_javascript_dialog_manager.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "build/build_config.h" #include "content/public/browser/javascript_dialog_manager.h"
diff --git a/content/shell/browser/shell_permission_manager.cc b/content/shell/browser/shell_permission_manager.cc index 8016730..8f51a8bf0 100644 --- a/content/shell/browser/shell_permission_manager.cc +++ b/content/shell/browser/shell_permission_manager.cc
@@ -4,8 +4,8 @@ #include "content/shell/browser/shell_permission_manager.h" -#include "base/callback.h" #include "base/command_line.h" +#include "base/functional/callback.h" #include "components/permissions/permission_util.h" #include "content/public/browser/permission_controller.h" #include "content/public/browser/render_frame_host.h"
diff --git a/content/shell/browser/shell_permission_manager.h b/content/shell/browser/shell_permission_manager.h index 7ddb174..fafd9a1 100644 --- a/content/shell/browser/shell_permission_manager.h +++ b/content/shell/browser/shell_permission_manager.h
@@ -5,7 +5,7 @@ #ifndef CONTENT_SHELL_BROWSER_SHELL_PERMISSION_MANAGER_H_ #define CONTENT_SHELL_BROWSER_SHELL_PERMISSION_MANAGER_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "content/public/browser/permission_controller_delegate.h" #include "content/public/browser/permission_result.h"
diff --git a/content/shell/browser/shell_platform_delegate_views.cc b/content/shell/browser/shell_platform_delegate_views.cc index f6a867e1..5314b16 100644 --- a/content/shell/browser/shell_platform_delegate_views.cc +++ b/content/shell/browser/shell_platform_delegate_views.cc
@@ -7,9 +7,9 @@ #include <algorithm> #include <memory> -#include "base/bind.h" #include "base/command_line.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/strings/utf_string_conversions.h" #include "build/build_config.h"
diff --git a/content/shell/browser/shell_speech_recognition_manager_delegate.h b/content/shell/browser/shell_speech_recognition_manager_delegate.h index 6b2a982..415b96ad 100644 --- a/content/shell/browser/shell_speech_recognition_manager_delegate.h +++ b/content/shell/browser/shell_speech_recognition_manager_delegate.h
@@ -5,7 +5,7 @@ #ifndef CONTENT_SHELL_BROWSER_SHELL_SPEECH_RECOGNITION_MANAGER_DELEGATE_H_ #define CONTENT_SHELL_BROWSER_SHELL_SPEECH_RECOGNITION_MANAGER_DELEGATE_H_ -#include "base/bind.h" +#include "base/functional/bind.h" #include "content/public/browser/speech_recognition_event_listener.h" #include "content/public/browser/speech_recognition_manager_delegate.h"
diff --git a/content/shell/gpu/shell_content_gpu_client.cc b/content/shell/gpu/shell_content_gpu_client.cc index f470af16..d2f5d1ee 100644 --- a/content/shell/gpu/shell_content_gpu_client.cc +++ b/content/shell/gpu/shell_content_gpu_client.cc
@@ -4,7 +4,7 @@ #include "content/shell/gpu/shell_content_gpu_client.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/task/single_thread_task_runner.h" #include "content/shell/common/power_monitor_test_impl.h" #include "mojo/public/cpp/bindings/self_owned_receiver.h"
diff --git a/content/shell/renderer/shell_content_renderer_client.cc b/content/shell/renderer/shell_content_renderer_client.cc index 5316846..9181c4d5 100644 --- a/content/shell/renderer/shell_content_renderer_client.cc +++ b/content/shell/renderer/shell_content_renderer_client.cc
@@ -6,10 +6,10 @@ #include <string> -#include "base/bind.h" #include "base/check_op.h" #include "base/command_line.h" #include "base/files/file.h" +#include "base/functional/bind.h" #include "base/notreached.h" #include "base/strings/string_number_conversions.h" #include "base/task/single_thread_task_runner.h"
diff --git a/content/shell/utility/shell_content_utility_client.cc b/content/shell/utility/shell_content_utility_client.cc index 6a18740..4653b3bf 100644 --- a/content/shell/utility/shell_content_utility_client.cc +++ b/content/shell/utility/shell_content_utility_client.cc
@@ -7,11 +7,11 @@ #include <memory> #include <utility> -#include "base/bind.h" #include "base/command_line.h" #include "base/containers/span.h" #include "base/files/file.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/memory/read_only_shared_memory_region.h" #include "base/memory/shared_memory_mapping.h"
diff --git a/content/test/attribution_simulator_impl.cc b/content/test/attribution_simulator_impl.cc index 98025ea..d8f0c5d1 100644 --- a/content/test/attribution_simulator_impl.cc +++ b/content/test/attribution_simulator_impl.cc
@@ -13,10 +13,10 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/check.h" #include "base/check_op.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/functional/overloaded.h" #include "base/guid.h" #include "base/memory/raw_ptr.h"
diff --git a/content/test/attribution_simulator_input_parser.cc b/content/test/attribution_simulator_input_parser.cc index 3abb297..2bca6a7f 100644 --- a/content/test/attribution_simulator_input_parser.cc +++ b/content/test/attribution_simulator_input_parser.cc
@@ -12,8 +12,8 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_piece.h" #include "base/test/bind.h"
diff --git a/content/test/content_browser_consistency_checker.cc b/content/test/content_browser_consistency_checker.cc index 70396de8..f89a3a6b 100644 --- a/content/test/content_browser_consistency_checker.cc +++ b/content/test/content_browser_consistency_checker.cc
@@ -4,7 +4,7 @@ #include "content/test/content_browser_consistency_checker.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "content/browser/web_contents/web_contents_impl.h" #include "content/public/test/browser_test_utils.h" #include "content/test/web_contents_observer_consistency_checker.h"
diff --git a/content/test/content_browser_consistency_checker.h b/content/test/content_browser_consistency_checker.h index c47791b..18f9258 100644 --- a/content/test/content_browser_consistency_checker.h +++ b/content/test/content_browser_consistency_checker.h
@@ -5,8 +5,8 @@ #ifndef CONTENT_TEST_CONTENT_BROWSER_CONSISTENCY_CHECKER_H_ #define CONTENT_TEST_CONTENT_BROWSER_CONSISTENCY_CHECKER_H_ -#include "base/callback.h" #include "base/callback_list.h" +#include "base/functional/callback.h" namespace content {
diff --git a/content/test/content_browser_test_test.cc b/content/test/content_browser_test_test.cc index c1dff48..61af904 100644 --- a/content/test/content_browser_test_test.cc +++ b/content/test/content_browser_test_test.cc
@@ -7,8 +7,8 @@ #include <string> #include "base/base_switches.h" -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/process/launch.h" #include "base/run_loop.h"
diff --git a/content/test/content_browser_test_utils_internal.cc b/content/test/content_browser_test_utils_internal.cc index be3a2ed..3385dd3 100644 --- a/content/test/content_browser_test_utils_internal.cc +++ b/content/test/content_browser_test_utils_internal.cc
@@ -12,9 +12,9 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/containers/stack.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/json/json_reader.h" #include "base/ranges/algorithm.h" #include "base/strings/stringprintf.h"
diff --git a/content/test/data/direct_sockets/tcp.js b/content/test/data/direct_sockets/tcp.js index 50c4bced..f9b0af6 100644 --- a/content/test/data/direct_sockets/tcp.js +++ b/content/test/data/direct_sockets/tcp.js
@@ -49,22 +49,28 @@ } async function readLoop(reader, requiredBytes) { - if (!(reader instanceof ReadableStreamDefaultReader)) - return 'read failed: reader is not a ReadableStreamDefaultReader'; + if (!(reader instanceof ReadableStreamBYOBReader)) + return 'read failed: reader is not a ReadableStreamBYOBReader'; let bytesRead = 0; + let buffer = new ArrayBuffer(requiredBytes); while (bytesRead < requiredBytes) { - const { value, done } = await reader.read(); + const {value: view, done} = + await reader.read(new Uint8Array(buffer, bytesRead)); if (done) return 'read failed: unexpected stream close'; - if (!value || value.length === 0) + if (!view || view.length === 0) return 'read failed: no data returned'; - for (let index = 0; index < value.length; ++index) { - if (value[index] !== bytesRead % 256) - return 'read failed: bad data returned'; - ++bytesRead; - } + bytesRead += view.byteLength; + buffer = view.buffer; } + + const array = new Uint8Array(buffer); + for (let index = 0; index < bytesRead; ++index) { + if (array[index] !== index % 256) + return 'read failed: bad data returned'; + } + return 'read succeeded'; } @@ -72,7 +78,7 @@ try { let tcpSocket = new TCPSocket(address, port, options); let { readable } = await tcpSocket.opened; - let reader = readable.getReader(); + let reader = readable.getReader({mode: 'byob'}); return await readLoop(reader, requiredBytes); } catch(error) { return ('readTcp failed: ' + error); @@ -83,7 +89,7 @@ try { let tcpSocket = new TCPSocket(address, port, options); let { readable, writable } = await tcpSocket.opened; - let reader = readable.getReader(); + let reader = readable.getReader({mode: 'byob'}); let writer = writable.getWriter(); let [readResult, writeResult] = await Promise.all([readLoop(reader, requiredBytes),
diff --git a/content/test/did_commit_navigation_interceptor.h b/content/test/did_commit_navigation_interceptor.h index 020597c..a2343ae 100644 --- a/content/test/did_commit_navigation_interceptor.h +++ b/content/test/did_commit_navigation_interceptor.h
@@ -8,7 +8,7 @@ #include <map> #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/run_loop.h" #include "content/common/frame.mojom.h" #include "content/public/browser/web_contents_observer.h"
diff --git a/content/test/dwrite_font_fake_sender_win.cc b/content/test/dwrite_font_fake_sender_win.cc index 3f5b271..efc265e 100644 --- a/content/test/dwrite_font_fake_sender_win.cc +++ b/content/test/dwrite_font_fake_sender_win.cc
@@ -9,7 +9,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/string_util.h" #include "third_party/abseil-cpp/absl/utility/utility.h"
diff --git a/content/test/fuzzer/audio_context_manager_mojolpm_fuzzer.cc b/content/test/fuzzer/audio_context_manager_mojolpm_fuzzer.cc index 25b8ee28..957659c 100644 --- a/content/test/fuzzer/audio_context_manager_mojolpm_fuzzer.cc +++ b/content/test/fuzzer/audio_context_manager_mojolpm_fuzzer.cc
@@ -6,8 +6,8 @@ #include <cstddef> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/no_destructor.h" #include "base/task/sequenced_task_runner.h" #include "base/test/simple_test_tick_clock.h"
diff --git a/content/test/fuzzer/clipboard_host_mojolpm_fuzzer.cc b/content/test/fuzzer/clipboard_host_mojolpm_fuzzer.cc index fce51e9..909cbc26 100644 --- a/content/test/fuzzer/clipboard_host_mojolpm_fuzzer.cc +++ b/content/test/fuzzer/clipboard_host_mojolpm_fuzzer.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/no_destructor.h" #include "base/task/sequenced_task_runner.h" #include "content/browser/renderer_host/clipboard_host_impl.h"
diff --git a/content/test/fuzzer/image_capture_mojolpm_fuzzer.cc b/content/test/fuzzer/image_capture_mojolpm_fuzzer.cc index c4bfdad3..35175cb 100644 --- a/content/test/fuzzer/image_capture_mojolpm_fuzzer.cc +++ b/content/test/fuzzer/image_capture_mojolpm_fuzzer.cc
@@ -6,8 +6,8 @@ #include <cstddef> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/no_destructor.h" #include "base/task/sequenced_task_runner.h" #include "base/task/thread_pool/thread_pool_instance.h"
diff --git a/content/test/fuzzer/media_stream_dispatcher_host_mojolpm_fuzzer.cc b/content/test/fuzzer/media_stream_dispatcher_host_mojolpm_fuzzer.cc index ead98d2783..9819325 100644 --- a/content/test/fuzzer/media_stream_dispatcher_host_mojolpm_fuzzer.cc +++ b/content/test/fuzzer/media_stream_dispatcher_host_mojolpm_fuzzer.cc
@@ -5,8 +5,8 @@ #include <stdint.h> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/no_destructor.h" #include "base/run_loop.h" #include "base/test/simple_test_tick_clock.h"
diff --git a/content/test/fuzzer/presentation_service_mojolpm_fuzzer.cc b/content/test/fuzzer/presentation_service_mojolpm_fuzzer.cc index 2a561de..6a30fdc 100644 --- a/content/test/fuzzer/presentation_service_mojolpm_fuzzer.cc +++ b/content/test/fuzzer/presentation_service_mojolpm_fuzzer.cc
@@ -7,8 +7,8 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/no_destructor.h" #include "base/run_loop.h" #include "base/task/sequenced_task_runner.h"
diff --git a/content/test/fuzzer/video_capture_host_mojolpm_fuzzer.cc b/content/test/fuzzer/video_capture_host_mojolpm_fuzzer.cc index b1f1b74..ebc5b0b5 100644 --- a/content/test/fuzzer/video_capture_host_mojolpm_fuzzer.cc +++ b/content/test/fuzzer/video_capture_host_mojolpm_fuzzer.cc
@@ -7,8 +7,8 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/no_destructor.h" #include "base/run_loop.h" #include "base/task/sequenced_task_runner.h"
diff --git a/content/test/gpu_browsertest_helpers.cc b/content/test/gpu_browsertest_helpers.cc index cd9eb27..4df274a 100644 --- a/content/test/gpu_browsertest_helpers.cc +++ b/content/test/gpu_browsertest_helpers.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/run_loop.h" #include "content/browser/browser_main_loop.h" #include "content/public/common/gpu_stream_constants.h"
diff --git a/content/test/io_thread_shared_url_loader_factory_owner.cc b/content/test/io_thread_shared_url_loader_factory_owner.cc index bab9be4..4650949 100644 --- a/content/test/io_thread_shared_url_loader_factory_owner.cc +++ b/content/test/io_thread_shared_url_loader_factory_owner.cc
@@ -4,7 +4,7 @@ #include "content/test/io_thread_shared_url_loader_factory_owner.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "content/browser/url_loader_factory_getter.h" #include "content/public/browser/browser_task_traits.h"
diff --git a/content/test/mock_commit_deferring_condition.h b/content/test/mock_commit_deferring_condition.h index 30def2a..e86d423 100644 --- a/content/test/mock_commit_deferring_condition.h +++ b/content/test/mock_commit_deferring_condition.h
@@ -5,7 +5,7 @@ #ifndef CONTENT_TEST_MOCK_COMMIT_DEFERRING_CONDITION_H_ #define CONTENT_TEST_MOCK_COMMIT_DEFERRING_CONDITION_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "content/browser/renderer_host/commit_deferring_condition_runner.h" #include "content/public/browser/commit_deferring_condition.h" #include "content/public/browser/web_contents_observer.h"
diff --git a/content/test/mock_platform_notification_service.cc b/content/test/mock_platform_notification_service.cc index b78a368..a282b3c 100644 --- a/content/test/mock_platform_notification_service.cc +++ b/content/test/mock_platform_notification_service.cc
@@ -7,8 +7,8 @@ #include <set> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/guid.h" #include "base/strings/utf_string_conversions.h" #include "content/public/browser/browser_context.h"
diff --git a/content/test/mock_platform_notification_service.h b/content/test/mock_platform_notification_service.h index 91f7759..7cd457d 100644 --- a/content/test/mock_platform_notification_service.h +++ b/content/test/mock_platform_notification_service.h
@@ -10,7 +10,7 @@ #include <unordered_map> #include <unordered_set> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "content/public/browser/notification_database_data.h" #include "content/public/browser/platform_notification_service.h"
diff --git a/content/test/mock_ssl_host_state_delegate.cc b/content/test/mock_ssl_host_state_delegate.cc index e140b7e8..5828616 100644 --- a/content/test/mock_ssl_host_state_delegate.cc +++ b/content/test/mock_ssl_host_state_delegate.cc
@@ -4,8 +4,8 @@ #include "content/test/mock_ssl_host_state_delegate.h" -#include "base/callback.h" #include "base/containers/contains.h" +#include "base/functional/callback.h" namespace content {
diff --git a/content/test/navigation_simulator_impl.cc b/content/test/navigation_simulator_impl.cc index 34de5569..c475b31 100644 --- a/content/test/navigation_simulator_impl.cc +++ b/content/test/navigation_simulator_impl.cc
@@ -5,9 +5,9 @@ #include "content/test/navigation_simulator_impl.h" #include <utility> -#include "base/bind.h" #include "base/debug/stack_trace.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/run_loop.h" #include "content/browser/renderer_host/back_forward_cache_metrics.h"
diff --git a/content/test/navigation_simulator_impl.h b/content/test/navigation_simulator_impl.h index 4723d01..8138375 100644 --- a/content/test/navigation_simulator_impl.h +++ b/content/test/navigation_simulator_impl.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/time/time.h" #include "content/browser/renderer_host/navigation_request.h"
diff --git a/content/test/navigation_simulator_unittest.cc b/content/test/navigation_simulator_unittest.cc index 231e1e1..fb687c3 100644 --- a/content/test/navigation_simulator_unittest.cc +++ b/content/test/navigation_simulator_unittest.cc
@@ -9,7 +9,7 @@ #include <tuple> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h"
diff --git a/content/test/portal/portal_created_observer.h b/content/test/portal/portal_created_observer.h index e14b265..d21897f 100644 --- a/content/test/portal/portal_created_observer.h +++ b/content/test/portal/portal_created_observer.h
@@ -5,7 +5,7 @@ #ifndef CONTENT_TEST_PORTAL_PORTAL_CREATED_OBSERVER_H_ #define CONTENT_TEST_PORTAL_PORTAL_CREATED_OBSERVER_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "mojo/public/cpp/bindings/associated_receiver.h" #include "mojo/public/cpp/bindings/pending_associated_receiver.h"
diff --git a/content/test/portal/portal_interceptor_for_testing.h b/content/test/portal/portal_interceptor_for_testing.h index 2e2f705..513bce6 100644 --- a/content/test/portal/portal_interceptor_for_testing.h +++ b/content/test/portal/portal_interceptor_for_testing.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_refptr.h"
diff --git a/content/test/resource_load_observer.h b/content/test/resource_load_observer.h index ba35c5b..f1f8534 100644 --- a/content/test/resource_load_observer.h +++ b/content/test/resource_load_observer.h
@@ -8,8 +8,8 @@ #include <string> #include <vector> -#include "base/callback_forward.h" #include "base/files/file_util.h" +#include "base/functional/callback_forward.h" #include "base/time/time.h" #include "content/public/browser/web_contents_observer.h" #include "content/shell/browser/shell.h"
diff --git a/content/test/run_all_unittests.cc b/content/test/run_all_unittests.cc index 374edc3..a8b100a 100644 --- a/content/test/run_all_unittests.cc +++ b/content/test/run_all_unittests.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 "base/bind.h" +#include "base/functional/bind.h" #include "base/test/launcher/unit_test_launcher.h" #include "base/values.h" #include "build/build_config.h"
diff --git a/content/test/storage_partition_test_helpers.h b/content/test/storage_partition_test_helpers.h index e2056e71..427a960e 100644 --- a/content/test/storage_partition_test_helpers.h +++ b/content/test/storage_partition_test_helpers.h
@@ -5,7 +5,7 @@ #ifndef CONTENT_TEST_STORAGE_PARTITION_TEST_HELPERS_H_ #define CONTENT_TEST_STORAGE_PARTITION_TEST_HELPERS_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "content/test/test_content_browser_client.h" namespace content {
diff --git a/content/test/task_runner_deferring_throttle.cc b/content/test/task_runner_deferring_throttle.cc index 1f9eae9..7f14990f 100644 --- a/content/test/task_runner_deferring_throttle.cc +++ b/content/test/task_runner_deferring_throttle.cc
@@ -4,7 +4,7 @@ #include "content/test/task_runner_deferring_throttle.h" -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ptr_util.h" namespace content {
diff --git a/content/test/test_aggregation_service_impl.cc b/content/test/test_aggregation_service_impl.cc index 77fb8981..e68c364 100644 --- a/content/test/test_aggregation_service_impl.cc +++ b/content/test/test_aggregation_service_impl.cc
@@ -7,10 +7,10 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/check.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/guid.h" #include "base/logging.h" #include "base/memory/scoped_refptr.h"
diff --git a/content/test/test_aggregation_service_impl.h b/content/test/test_aggregation_service_impl.h index 15db593..058926e 100644 --- a/content/test/test_aggregation_service_impl.h +++ b/content/test/test_aggregation_service_impl.h
@@ -8,7 +8,7 @@ #include <memory> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ref.h" #include "base/threading/sequence_bound.h" #include "content/browser/aggregation_service/aggregation_service_storage_context.h"
diff --git a/content/test/test_background_sync_manager.cc b/content/test/test_background_sync_manager.cc index 7ada6b67..8b54e2a 100644 --- a/content/test/test_background_sync_manager.cc +++ b/content/test/test_background_sync_manager.cc
@@ -4,7 +4,7 @@ #include "content/test/test_background_sync_manager.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/task/single_thread_task_runner.h" #include "base/time/time.h" #include "content/browser/devtools/devtools_background_services_context_impl.h"
diff --git a/content/test/test_background_sync_manager.h b/content/test/test_background_sync_manager.h index 8c52d2d..b851594 100644 --- a/content/test/test_background_sync_manager.h +++ b/content/test/test_background_sync_manager.h
@@ -10,7 +10,7 @@ #include <memory> #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/ref_counted.h" #include "base/time/time.h" #include "content/browser/background_sync/background_sync_manager.h"
diff --git a/content/test/test_background_sync_proxy.h b/content/test/test_background_sync_proxy.h index ac26472b..5e67dd9b 100644 --- a/content/test/test_background_sync_proxy.h +++ b/content/test/test_background_sync_proxy.h
@@ -5,7 +5,7 @@ #ifndef CONTENT_TEST_TEST_BACKGROUND_SYNC_PROXY_H_ #define CONTENT_TEST_TEST_BACKGROUND_SYNC_PROXY_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/scoped_refptr.h" #include "base/time/time.h"
diff --git a/content/test/test_blink_web_unit_test_support.cc b/content/test/test_blink_web_unit_test_support.cc index 91324f1..6396765 100644 --- a/content/test/test_blink_web_unit_test_support.cc +++ b/content/test/test_blink_web_unit_test_support.cc
@@ -6,11 +6,11 @@ #include <memory> -#include "base/bind.h" -#include "base/callback.h" #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/message_loop/message_pump.h" #include "base/message_loop/message_pump_type.h" #include "base/path_service.h"
diff --git a/content/test/test_render_frame.cc b/content/test/test_render_frame.cc index 41c357d1..2e300292 100644 --- a/content/test/test_render_frame.cc +++ b/content/test/test_render_frame.cc
@@ -8,7 +8,7 @@ #include <utility> #include <vector> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/unguessable_token.h" #include "build/build_config.h" #include "content/common/frame.mojom.h"
diff --git a/content/test/web_contents_observer_test_utils.h b/content/test/web_contents_observer_test_utils.h index d1b908b..c350226a 100644 --- a/content/test/web_contents_observer_test_utils.h +++ b/content/test/web_contents_observer_test_utils.h
@@ -5,7 +5,7 @@ #ifndef CONTENT_TEST_WEB_CONTENTS_OBSERVER_TEST_UTILS_H_ #define CONTENT_TEST_WEB_CONTENTS_OBSERVER_TEST_UTILS_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_observer.h"
diff --git a/content/utility/browser_exposed_utility_interfaces.cc b/content/utility/browser_exposed_utility_interfaces.cc index 4b0a2cb..63defeec 100644 --- a/content/utility/browser_exposed_utility_interfaces.cc +++ b/content/utility/browser_exposed_utility_interfaces.cc
@@ -8,8 +8,8 @@ #include <utility> -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/task/single_thread_task_runner.h" #include "build/build_config.h" #include "content/public/common/content_client.h"
diff --git a/content/utility/in_process_utility_thread.cc b/content/utility/in_process_utility_thread.cc index 1fd071f7..f260d735 100644 --- a/content/utility/in_process_utility_thread.cc +++ b/content/utility/in_process_utility_thread.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/lazy_instance.h" #include "base/location.h" #include "base/task/single_thread_task_runner.h"
diff --git a/content/utility/utility_main.cc b/content/utility/utility_main.cc index 6986bf1..ae45bb0 100644 --- a/content/utility/utility_main.cc +++ b/content/utility/utility_main.cc
@@ -3,9 +3,9 @@ // found in the LICENSE file. #include "base/allocator/partition_alloc_support.h" -#include "base/bind.h" #include "base/command_line.h" #include "base/debug/leak_annotations.h" +#include "base/functional/bind.h" #include "base/message_loop/message_pump_type.h" #include "base/power_monitor/power_monitor.h" #include "base/run_loop.h"
diff --git a/content/utility/utility_thread_impl.cc b/content/utility/utility_thread_impl.cc index 848c6c7..e99d840 100644 --- a/content/utility/utility_thread_impl.cc +++ b/content/utility/utility_thread_impl.cc
@@ -8,11 +8,11 @@ #include <set> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/containers/unique_ptr_adapters.h" #include "base/debug/crash_logging.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h" #include "base/no_destructor.h"
diff --git a/content/utility/utility_thread_impl.h b/content/utility/utility_thread_impl.h index afda1bb..7e10f498 100644 --- a/content/utility/utility_thread_impl.h +++ b/content/utility/utility_thread_impl.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/process/current_process.h" #include "base/strings/pattern.h" #include "build/build_config.h"
diff --git a/content/web_test/browser/devtools_protocol_test_bindings.cc b/content/web_test/browser/devtools_protocol_test_bindings.cc index 4996b9f..8d7e9de3 100644 --- a/content/web_test/browser/devtools_protocol_test_bindings.cc +++ b/content/web_test/browser/devtools_protocol_test_bindings.cc
@@ -4,9 +4,9 @@ #include "content/web_test/browser/devtools_protocol_test_bindings.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/json/json_reader.h" #include "base/json/string_escape.h" #include "base/strings/string_number_conversions.h"
diff --git a/content/web_test/browser/leak_detector.cc b/content/web_test/browser/leak_detector.cc index aa1168c..520ec90 100644 --- a/content/web_test/browser/leak_detector.cc +++ b/content/web_test/browser/leak_detector.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/json/json_writer.h" #include "base/values.h" #include "content/public/browser/render_process_host.h"
diff --git a/content/web_test/browser/web_test_background_fetch_delegate.cc b/content/web_test/browser/web_test_background_fetch_delegate.cc index 2d0a91c..a1998551f 100644 --- a/content/web_test/browser/web_test_background_fetch_delegate.cc +++ b/content/web_test/browser/web_test_background_fetch_delegate.cc
@@ -7,9 +7,9 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h"
diff --git a/content/web_test/browser/web_test_bluetooth_adapter_provider.cc b/content/web_test/browser/web_test_bluetooth_adapter_provider.cc index ae0e6cc..feb5c08 100644 --- a/content/web_test/browser/web_test_bluetooth_adapter_provider.cc +++ b/content/web_test/browser/web_test_bluetooth_adapter_provider.cc
@@ -8,9 +8,9 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/format_macros.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h"
diff --git a/content/web_test/browser/web_test_bluetooth_adapter_provider.h b/content/web_test/browser/web_test_bluetooth_adapter_provider.h index a0884f2..a16ba165 100644 --- a/content/web_test/browser/web_test_bluetooth_adapter_provider.h +++ b/content/web_test/browser/web_test_bluetooth_adapter_provider.h
@@ -10,7 +10,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "device/bluetooth/test/mock_bluetooth_adapter.h" #include "device/bluetooth/test/mock_bluetooth_device.h" #include "device/bluetooth/test/mock_bluetooth_gatt_characteristic.h"
diff --git a/content/web_test/browser/web_test_browser_context.cc b/content/web_test/browser/web_test_browser_context.cc index 47f44e6..50cc205 100644 --- a/content/web_test/browser/web_test_browser_context.cc +++ b/content/web_test/browser/web_test_browser_context.cc
@@ -7,9 +7,9 @@ #include <memory> #include <utility> -#include "base/bind.h" #include "base/command_line.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "build/build_config.h" #include "content/public/browser/browser_task_traits.h" #include "content/public/browser/browser_thread.h"
diff --git a/content/web_test/browser/web_test_browser_main_parts.cc b/content/web_test/browser/web_test_browser_main_parts.cc index 5e42009..2e0f313 100644 --- a/content/web_test/browser/web_test_browser_main_parts.cc +++ b/content/web_test/browser/web_test_browser_main_parts.cc
@@ -7,9 +7,9 @@ #include <memory> #include "base/base_switches.h" -#include "base/bind.h" #include "base/command_line.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/threading/thread.h" #include "base/threading/thread_restrictions.h" #include "build/build_config.h"
diff --git a/content/web_test/browser/web_test_browser_main_runner.cc b/content/web_test/browser/web_test_browser_main_runner.cc index a34a2ef..041e480 100644 --- a/content/web_test/browser/web_test_browser_main_runner.cc +++ b/content/web_test/browser/web_test_browser_main_runner.cc
@@ -7,12 +7,12 @@ #include <iostream> #include <memory> -#include "base/bind.h" #include "base/check_op.h" #include "base/command_line.h" #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/run_loop.h" #include "base/strings/sys_string_conversions.h"
diff --git a/content/web_test/browser/web_test_content_browser_client.cc b/content/web_test/browser/web_test_content_browser_client.cc index aca7d52e..c1e5e53 100644 --- a/content/web_test/browser/web_test_content_browser_client.cc +++ b/content/web_test/browser/web_test_content_browser_client.cc
@@ -11,8 +11,8 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/no_destructor.h" #include "base/path_service.h" #include "base/strings/pattern.h"
diff --git a/content/web_test/browser/web_test_control_host.cc b/content/web_test/browser/web_test_control_host.cc index 8b94af89..0044e21 100644 --- a/content/web_test/browser/web_test_control_host.cc +++ b/content/web_test/browser/web_test_control_host.cc
@@ -18,11 +18,11 @@ #include "base/barrier_closure.h" #include "base/base64.h" -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/logging.h" #include "base/path_service.h"
diff --git a/content/web_test/browser/web_test_devtools_bindings.cc b/content/web_test/browser/web_test_devtools_bindings.cc index b8183ad7..2c24085 100644 --- a/content/web_test/browser/web_test_devtools_bindings.cc +++ b/content/web_test/browser/web_test_devtools_bindings.cc
@@ -7,8 +7,8 @@ #include <memory> -#include "base/callback_helpers.h" #include "base/command_line.h" +#include "base/functional/callback_helpers.h" #include "base/path_service.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h"
diff --git a/content/web_test/browser/web_test_download_manager_delegate.cc b/content/web_test/browser/web_test_download_manager_delegate.cc index fdbdd43..71206a009 100644 --- a/content/web_test/browser/web_test_download_manager_delegate.cc +++ b/content/web_test/browser/web_test_download_manager_delegate.cc
@@ -4,9 +4,9 @@ #include "content/web_test/browser/web_test_download_manager_delegate.h" -#include "base/bind.h" #include "base/command_line.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "build/build_config.h" #include "components/download/public/common/download_item.h" #include "content/public/browser/download_item_utils.h"
diff --git a/content/web_test/browser/web_test_download_manager_delegate.h b/content/web_test/browser/web_test_download_manager_delegate.h index 50feaf0..2f5f452 100644 --- a/content/web_test/browser/web_test_download_manager_delegate.h +++ b/content/web_test/browser/web_test_download_manager_delegate.h
@@ -5,7 +5,7 @@ #ifndef CONTENT_WEB_TEST_BROWSER_WEB_TEST_DOWNLOAD_MANAGER_DELEGATE_H_ #define CONTENT_WEB_TEST_BROWSER_WEB_TEST_DOWNLOAD_MANAGER_DELEGATE_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "content/public/browser/download_manager_delegate.h" #include "content/shell/browser/shell_download_manager_delegate.h"
diff --git a/content/web_test/browser/web_test_javascript_dialog_manager.h b/content/web_test/browser/web_test_javascript_dialog_manager.h index 617cadd..624f58b 100644 --- a/content/web_test/browser/web_test_javascript_dialog_manager.h +++ b/content/web_test/browser/web_test_javascript_dialog_manager.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "content/shell/browser/shell_javascript_dialog_manager.h" namespace content {
diff --git a/content/web_test/browser/web_test_permission_manager.cc b/content/web_test/browser/web_test_permission_manager.cc index 9c963a5..2b9d6f5 100644 --- a/content/web_test/browser/web_test_permission_manager.cc +++ b/content/web_test/browser/web_test_permission_manager.cc
@@ -8,8 +8,8 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "content/browser/permissions/permission_util.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/permission_controller.h"
diff --git a/content/web_test/browser/web_test_permission_manager.h b/content/web_test/browser/web_test_permission_manager.h index 55460e1..0af9c23 100644 --- a/content/web_test/browser/web_test_permission_manager.h +++ b/content/web_test/browser/web_test_permission_manager.h
@@ -7,8 +7,8 @@ #include <stddef.h> -#include "base/callback_forward.h" #include "base/containers/id_map.h" +#include "base/functional/callback_forward.h" #include "base/synchronization/lock.h" #include "content/public/browser/permission_controller_delegate.h" #include "content/public/browser/permission_result.h"
diff --git a/content/web_test/browser/web_test_push_messaging_service.cc b/content/web_test/browser/web_test_push_messaging_service.cc index 0238efb..1cb7e68 100644 --- a/content/web_test/browser/web_test_push_messaging_service.cc +++ b/content/web_test/browser/web_test_push_messaging_service.cc
@@ -4,8 +4,8 @@ #include "content/web_test/browser/web_test_push_messaging_service.h" -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/time/time.h" #include "content/public/browser/permission_controller.h" #include "content/public/browser/render_process_host.h"
diff --git a/content/web_test/browser/web_test_storage_access_manager.cc b/content/web_test/browser/web_test_storage_access_manager.cc index d619af3..2f8b8ce 100644 --- a/content/web_test/browser/web_test_storage_access_manager.cc +++ b/content/web_test/browser/web_test_storage_access_manager.cc
@@ -11,8 +11,8 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" namespace content {
diff --git a/content/web_test/browser/web_test_storage_access_manager.h b/content/web_test/browser/web_test_storage_access_manager.h index a2ee4291..84800e3 100644 --- a/content/web_test/browser/web_test_storage_access_manager.h +++ b/content/web_test/browser/web_test_storage_access_manager.h
@@ -7,8 +7,8 @@ #include <stddef.h> -#include "base/callback_forward.h" #include "base/containers/id_map.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/synchronization/lock.h" #include "components/content_settings/core/common/content_settings.h"
diff --git a/content/web_test/browser/web_test_tts_platform.cc b/content/web_test/browser/web_test_tts_platform.cc index 2f54280..c7eb4aa 100644 --- a/content/web_test/browser/web_test_tts_platform.cc +++ b/content/web_test/browser/web_test_tts_platform.cc
@@ -4,8 +4,8 @@ #include "content/web_test/browser/web_test_tts_platform.h" -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/task/sequenced_task_runner.h" #include "content/public/browser/tts_controller.h"
diff --git a/content/web_test/renderer/app_banner_service.cc b/content/web_test/renderer/app_banner_service.cc index 6d96161..5ca5f871 100644 --- a/content/web_test/renderer/app_banner_service.cc +++ b/content/web_test/renderer/app_banner_service.cc
@@ -3,7 +3,7 @@ // found in the LICENSE file. #include "content/web_test/renderer/app_banner_service.h" -#include "base/bind.h" +#include "base/functional/bind.h" namespace content {
diff --git a/content/web_test/renderer/app_banner_service.h b/content/web_test/renderer/app_banner_service.h index 96dda4e..4af7e6e8 100644 --- a/content/web_test/renderer/app_banner_service.h +++ b/content/web_test/renderer/app_banner_service.h
@@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "mojo/public/cpp/bindings/receiver.h" #include "mojo/public/cpp/bindings/remote.h" #include "third_party/blink/public/mojom/app_banner/app_banner.mojom.h"
diff --git a/content/web_test/renderer/event_sender.cc b/content/web_test/renderer/event_sender.cc index d36a742..50705cf 100644 --- a/content/web_test/renderer/event_sender.cc +++ b/content/web_test/renderer/event_sender.cc
@@ -11,11 +11,11 @@ #include <memory> #include <string> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/check_op.h" #include "base/command_line.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/notreached.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h"
diff --git a/content/web_test/renderer/fake_screen_orientation_impl.cc b/content/web_test/renderer/fake_screen_orientation_impl.cc index af2b8e3..730dbbe 100644 --- a/content/web_test/renderer/fake_screen_orientation_impl.cc +++ b/content/web_test/renderer/fake_screen_orientation_impl.cc
@@ -6,8 +6,8 @@ #include <memory> -#include "base/bind.h" #include "base/check.h" +#include "base/functional/bind.h" #include "base/task/single_thread_task_runner.h" #include "content/public/renderer/render_frame.h" #include "mojo/public/cpp/bindings/pending_receiver.h"
diff --git a/content/web_test/renderer/gamepad_controller.cc b/content/web_test/renderer/gamepad_controller.cc index ec1e0f46..ab60666 100644 --- a/content/web_test/renderer/gamepad_controller.cc +++ b/content/web_test/renderer/gamepad_controller.cc
@@ -7,7 +7,7 @@ #include <string> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "content/public/renderer/render_frame.h" #include "gin/arguments.h" #include "gin/handle.h"
diff --git a/content/web_test/renderer/gc_controller.cc b/content/web_test/renderer/gc_controller.cc index 1ccf7bc..1eb9771e 100644 --- a/content/web_test/renderer/gc_controller.cc +++ b/content/web_test/renderer/gc_controller.cc
@@ -6,7 +6,7 @@ #include <tuple> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/task/single_thread_task_runner.h" #include "gin/arguments.h" #include "gin/handle.h"
diff --git a/content/web_test/renderer/pixel_dump.cc b/content/web_test/renderer/pixel_dump.cc index 0cf66a7..6869133d 100644 --- a/content/web_test/renderer/pixel_dump.cc +++ b/content/web_test/renderer/pixel_dump.cc
@@ -7,9 +7,9 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/memory/ref_counted.h" #include "base/trace_event/trace_event.h"
diff --git a/content/web_test/renderer/spell_check_client.cc b/content/web_test/renderer/spell_check_client.cc index f15f172..51dc7c5a1 100644 --- a/content/web_test/renderer/spell_check_client.cc +++ b/content/web_test/renderer/spell_check_client.cc
@@ -6,8 +6,8 @@ #include <stddef.h> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/task/single_thread_task_runner.h" #include "content/web_test/renderer/web_test_grammar_checker.h" #include "third_party/blink/public/web/blink.h"
diff --git a/content/web_test/renderer/test_plugin.cc b/content/web_test/renderer/test_plugin.cc index 4c5f45f1..fd513bf 100644 --- a/content/web_test/renderer/test_plugin.cc +++ b/content/web_test/renderer/test_plugin.cc
@@ -9,8 +9,8 @@ #include <utility> -#include "base/bind.h" #include "base/check_op.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/memory/unsafe_shared_memory_region.h" #include "base/no_destructor.h"
diff --git a/content/web_test/renderer/test_runner.cc b/content/web_test/renderer/test_runner.cc index e581028d..7a974d31 100644 --- a/content/web_test/renderer/test_runner.cc +++ b/content/web_test/renderer/test_runner.cc
@@ -11,12 +11,12 @@ #include <limits> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/containers/contains.h" #include "base/containers/cxx20_erase.h" #include "base/containers/unique_ptr_adapters.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_piece.h"
diff --git a/content/web_test/renderer/test_runner.h b/content/web_test/renderer/test_runner.h index 5f320ec..f13e1f58 100644 --- a/content/web_test/renderer/test_runner.h +++ b/content/web_test/renderer/test_runner.h
@@ -12,10 +12,10 @@ #include <string> #include <vector> -#include "base/callback_forward.h" #include "base/containers/circular_deque.h" #include "base/containers/flat_set.h" #include "base/files/file_path.h" +#include "base/functional/callback_forward.h" #include "base/memory/weak_ptr.h" #include "base/values.h" #include "content/web_test/common/web_test.mojom.h"
diff --git a/content/web_test/renderer/test_websocket_handshake_throttle_provider.cc b/content/web_test/renderer/test_websocket_handshake_throttle_provider.cc index f8e56c0..ea887d9 100644 --- a/content/web_test/renderer/test_websocket_handshake_throttle_provider.cc +++ b/content/web_test/renderer/test_websocket_handshake_throttle_provider.cc
@@ -4,8 +4,8 @@ #include "content/web_test/renderer/test_websocket_handshake_throttle_provider.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_piece.h" #include "base/task/single_thread_task_runner.h"
diff --git a/content/web_test/renderer/web_test_content_renderer_client.cc b/content/web_test/renderer/web_test_content_renderer_client.cc index c8be326..47fd95c 100644 --- a/content/web_test/renderer/web_test_content_renderer_client.cc +++ b/content/web_test/renderer/web_test_content_renderer_client.cc
@@ -7,9 +7,9 @@ #include <string> #include <utility> -#include "base/callback.h" #include "base/command_line.h" #include "base/debug/debugger.h" +#include "base/functional/callback.h" #include "base/task/single_thread_task_runner.h" #include "build/build_config.h" #include "content/public/common/content_constants.h"
diff --git a/content/zygote/zygote_main_linux.cc b/content/zygote/zygote_main_linux.cc index 4f2383df..2869146 100644 --- a/content/zygote/zygote_main_linux.cc +++ b/content/zygote/zygote_main_linux.cc
@@ -18,9 +18,9 @@ #include <utility> -#include "base/bind.h" #include "base/command_line.h" #include "base/compiler_specific.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/posix/eintr_wrapper.h" #include "base/posix/unix_domain_socket.h"
diff --git a/docs/testing/regression-test-selection.md b/docs/testing/regression-test-selection.md index a116ea96..e4cd63a 100644 --- a/docs/testing/regression-test-selection.md +++ b/docs/testing/regression-test-selection.md
@@ -1,11 +1,58 @@ # Regression test selection (RTS) -Regression Test Selection (RTS) is a technique to intellegently select tests to -run, without spending too many resources on testing, but still detecting bad -code changes. - [TOC] -## Design Doc +## What is RTS? +RTS is a selection strategy to run a minimal amount of tests to validate a CL. +Since small code changes don’t always need every test to run, RTS decides which +tests are the most important to run based on which files changed. In our +application of RTS we attempt to catch at least 95% of CL rejections when RTS +is applied (the remaining 5% are still caught in CQ+2). -- [Browser RTS](https://bit.ly/chromium-rts) +Our model is being generated daily on the rts-model-packager builder to keep +adjusting the model for new data and tests. + + +## RTS in CQ+1 + +When enabled, RTS in a CQ+1 build will choose the tests most likely to fail +based on how how often the test files and source files in the current CL have +changed together as well as the distance in the file graph of those files. + + +## RTS in CQ+2 + +When enabled, RTS does not run the same strategy. Instead, to ensure we still +have 100% test coverage, the tests that were skipped by RTS are run. This will +only work if a build with RTS enabled is found in the last 24 hours that can +be reused, otherwise the build will compile and run all tests as if RTS doesn't +exist. + + +## What if RTS is causing problems with my CL? +If RTS needs to be disabled, add this footer to the commit message: + + Disable-Rts:True + +This will disable RTS for both Dry Run and submit so that all tests will run in +both. If you believe the build failed because of RTS infrastructure please file +a bug http://crbug.com/new under the ‘Infra>Client>Chrome’ component. + + +## Is RTS running in my build? + +RTS is only enabled on a subset of long pole builders. Within these builders +RTS is also only enabled on a subset of test suites that are compatible with +the rest of the pipeline. Some file changes, such as DEPS change will also +disable RTS on a CL by CL basis. To know for certain that RTS is actually being +used in the CQ+1 build page, "Ran tests selected by RTS" can be seen in the test +suite's results step and an output property `"rts_was_used": true`. In a CQ+2 +build "Ran tests previously skipped by RTS" will instead be seen in test suites' +results step. + + +## Useful links + +- [Design Doc](https://bit.ly/chromium-rts) +- [Brews and Bites](https://docs.google.com/presentation/d/1MUqTf14yznxg7zzT00VxRxw1FHc2a3_PrWoFJZqu0GI) +- [rts-model-packager](https://ci.chromium.org/p/chromium/builders/ci/rts-model-packager)
diff --git a/docs/webui_build_configuration.md b/docs/webui_build_configuration.md index 472df65e..f96ede4 100644 --- a/docs/webui_build_configuration.md +++ b/docs/webui_build_configuration.md
@@ -413,7 +413,7 @@ ``` List of files params: -static_files: Required parameter. List of +static_files: Optional parameter. List of 1) non Web Component HTML/CSS files (don't confuse with |css_files| below). These are passed to preprocess_if_expr() 2) JPG/PNG/SVG files. These are included in the build verbatim @@ -465,6 +465,8 @@ Other params: grd_prefix: See |grd_prefix| in generate_grd(). Required parameter. +grd_resource_path_prefix: See |resource_path_prefix| in generate_grd(). Optional + parameter. html_to_wrapper_template: See |template| in html_to_wrapper(). extra_grdp_deps: List of external generate_grd() targets that generate .grdp files. These will be included in the final generated
diff --git a/extensions/common/extension_features.cc b/extensions/common/extension_features.cc index 8e64598..577a582 100644 --- a/extensions/common/extension_features.cc +++ b/extensions/common/extension_features.cc
@@ -95,7 +95,7 @@ // creating the script context too early which can be bad for performance. BASE_FEATURE(kAvoidEarlyExtensionScriptContextCreation, "AvoidEarlyExtensionScriptContextCreation", - base::FEATURE_DISABLED_BY_DEFAULT); + base::FEATURE_ENABLED_BY_DEFAULT); // The feature enabling offscreen documents in Manifest V3 extensions. BASE_FEATURE(kExtensionsOffscreenDocuments,
diff --git a/gpu/command_buffer/service/shared_image/d3d_image_backing.cc b/gpu/command_buffer/service/shared_image/d3d_image_backing.cc index 2e5d2e32..4665c77 100644 --- a/gpu/command_buffer/service/shared_image/d3d_image_backing.cc +++ b/gpu/command_buffer/service/shared_image/d3d_image_backing.cc
@@ -595,9 +595,16 @@ #if BUILDFLAG(USE_DAWN) #if BUILDFLAG(DAWN_ENABLE_BACKEND_OPENGLES) if (backend_type == WGPUBackendType_OpenGLES) { + std::unique_ptr<GLTextureImageRepresentationBase> gl_representation = + ProduceGLTexturePassthrough(manager, tracker); + gpu::TextureBase* texture = gl_representation->GetTextureBase(); + const gl::GLImage* image = + static_cast<gles2::TexturePassthrough*>(texture)->GetLevelImage( + texture->target(), 0u); + DCHECK(image); return std::make_unique<DawnEGLImageRepresentation>( - ProduceGLTexturePassthrough(manager, tracker), manager, this, tracker, - device); + std::move(gl_representation), image->GetEGLImage(), manager, this, + tracker, device); } #endif D3D11_TEXTURE2D_DESC desc;
diff --git a/gpu/command_buffer/service/shared_image/dawn_egl_image_representation.cc b/gpu/command_buffer/service/shared_image/dawn_egl_image_representation.cc index b890628..6062a0b 100644 --- a/gpu/command_buffer/service/shared_image/dawn_egl_image_representation.cc +++ b/gpu/command_buffer/service/shared_image/dawn_egl_image_representation.cc
@@ -26,12 +26,14 @@ DawnEGLImageRepresentation::DawnEGLImageRepresentation( std::unique_ptr<GLTextureImageRepresentationBase> gl_representation, + void* egl_image, SharedImageManager* manager, SharedImageBacking* backing, MemoryTypeTracker* tracker, WGPUDevice device) : DawnImageRepresentation(manager, backing, tracker), gl_representation_(std::move(gl_representation)), + egl_image_(std::move(egl_image)), device_(device), dawn_procs_(dawn::native::GetProcs()) { DCHECK(device_); @@ -61,16 +63,7 @@ texture_descriptor.sampleCount = 1; dawn::native::opengl::ExternalImageDescriptorEGLImage externalImageDesc; externalImageDesc.cTextureDescriptor = &texture_descriptor; - const gl::GLImage* image; - gpu::TextureBase* texture = gl_representation_->GetTextureBase(); - if (texture->GetType() == gpu::TextureBase::Type::kPassthrough) { - image = static_cast<gles2::TexturePassthrough*>(texture)->GetLevelImage( - texture->target(), 0u); - } else { - image = static_cast<gles2::Texture*>(texture)->GetLevelImage( - texture->target(), 0u); - } - externalImageDesc.image = image->GetEGLImage(); + externalImageDesc.image = egl_image_; DCHECK(externalImageDesc.image); externalImageDesc.isInitialized = true; texture_ =
diff --git a/gpu/command_buffer/service/shared_image/dawn_egl_image_representation.h b/gpu/command_buffer/service/shared_image/dawn_egl_image_representation.h index a5679c71..fa80e6c0 100644 --- a/gpu/command_buffer/service/shared_image/dawn_egl_image_representation.h +++ b/gpu/command_buffer/service/shared_image/dawn_egl_image_representation.h
@@ -16,6 +16,7 @@ public: DawnEGLImageRepresentation( std::unique_ptr<GLTextureImageRepresentationBase> gl_representation, + void* egl_image, SharedImageManager* manager, SharedImageBacking* backing, MemoryTypeTracker* tracker, @@ -28,6 +29,7 @@ private: std::unique_ptr<GLTextureImageRepresentationBase> gl_representation_; + raw_ptr<void> egl_image_ = nullptr; // EGLImageKHR WGPUDevice device_; DawnProcTable dawn_procs_; WGPUTexture texture_ = nullptr;
diff --git a/gpu/command_buffer/service/shared_image/gl_texture_image_backing.cc b/gpu/command_buffer/service/shared_image/gl_texture_image_backing.cc index dbbf6cd..f24fa0b 100644 --- a/gpu/command_buffer/service/shared_image/gl_texture_image_backing.cc +++ b/gpu/command_buffer/service/shared_image/gl_texture_image_backing.cc
@@ -181,13 +181,23 @@ return SharedImageBackingType::kGLTexture; } +gfx::Rect GLTextureImageBacking::ClearedRect() const { + if (!IsPassthrough()) + return texture_->GetLevelClearedRect(texture_->target(), 0); + + // Use shared image based tracking for passthrough, because we don't always + // use angle robust initialization. + return ClearTrackingSharedImageBacking::ClearedRect(); +} + void GLTextureImageBacking::SetClearedRect(const gfx::Rect& cleared_rect) { - if (!IsPassthrough() && !IsCleared()) { - // If the image isn't already fully cleared then pass `cleared_rect` to - // validating command decoder as well. + if (!IsPassthrough()) { texture_->SetLevelClearedRect(texture_->target(), 0, cleared_rect); + return; } + // Use shared image based tracking for passthrough, because we don't always + // use angle robust initialization. ClearTrackingSharedImageBacking::SetClearedRect(cleared_rect); } @@ -380,19 +390,35 @@ std::vector<WGPUTextureFormat> view_formats) { #if BUILDFLAG(USE_DAWN) && BUILDFLAG(DAWN_ENABLE_BACKEND_OPENGLES) if (backend_type == WGPUBackendType_OpenGLES) { + // GLImageNativePixmap is only compiled on below os. +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE) if (!gl_image_native_pixmap_) { - CreateGLImageNativePixmap(); + SharedContextState* shared_context_state = + factory()->GetSharedContextState(); + ui::ScopedMakeCurrent smc(shared_context_state->context(), + shared_context_state->surface()); + gl_image_native_pixmap_ = gl::GLImageNativePixmap::CreateFromTexture( + size(), ToBufferFormat(format()), GetGLServiceId()); + if (!gl_image_native_pixmap_) { + DLOG(ERROR) << "Unable to create a GLImage"; + return nullptr; + } } - std::unique_ptr<GLTextureImageRepresentationBase> texture; + std::unique_ptr<GLTextureImageRepresentationBase> gl_representation; if (IsPassthrough()) { - texture = ProduceGLTexturePassthrough(manager, tracker); + gl_representation = ProduceGLTexturePassthrough(manager, tracker); } else { - texture = ProduceGLTexture(manager, tracker); + gl_representation = ProduceGLTexture(manager, tracker); } return std::make_unique<DawnEGLImageRepresentation>( - std::move(texture), manager, this, tracker, device); + std::move(gl_representation), gl_image_native_pixmap_->GetEGLImage(), + manager, this, tracker, device); +#else + DLOG(ERROR) << "Dawn representation not supported"; + return nullptr; +#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE) } -#endif +#endif // BUILDFLAG(USE_DAWN) && BUILDFLAG(DAWN_ENABLE_BACKEND_OPENGLES) if (!factory()) { DLOG(ERROR) << "No SharedImageFactory to create a dawn representation."; @@ -428,6 +454,7 @@ void GLTextureImageBacking::InitializeGLTexture( const GLCommonImageBackingFactory::FormatInfo& format_info, + bool is_cleared, bool framebuffer_attachment_angle) { format_desc_.target = GL_TEXTURE_2D; format_desc_.data_format = format_info.gl_format; @@ -442,6 +469,7 @@ if (IsPassthrough()) { passthrough_texture_->SetEstimatedSize(GetEstimatedSize()); + SetClearedRect(is_cleared ? gfx::Rect(size()) : gfx::Rect()); } else { // TODO(piman): We pretend the texture was created in an ES2 context, so // that it can be used in other ES2 contexts, and so we have to pass @@ -450,29 +478,11 @@ texture_->SetLevelInfo(format_desc_.target, 0, format_desc_.data_format, size().width(), size().height(), /*depth=*/1, 0, format_desc_.data_format, format_desc_.data_type, - /*cleared_rect=*/gfx::Rect()); + is_cleared ? gfx::Rect(size()) : gfx::Rect()); texture_->SetImmutable(true, format_info.supports_storage); } } -void GLTextureImageBacking::CreateGLImageNativePixmap() { -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE) - SharedContextState* shared_context_state = factory()->GetSharedContextState(); - ui::ScopedMakeCurrent smc(shared_context_state->context(), - shared_context_state->surface()); - gl_image_native_pixmap_ = gl::GLImageNativePixmap::CreateFromTexture( - size(), ToBufferFormat(format()), GetGLServiceId()); - if (passthrough_texture_) { - passthrough_texture_->SetLevelImage(passthrough_texture_->target(), 0, - gl_image_native_pixmap_.get()); - } else if (texture_) { - texture_->SetLevelImage(texture_->target(), 0, - gl_image_native_pixmap_.get(), - gles2::Texture::ImageState::BOUND); - } -#endif -} - void GLTextureImageBacking::SetCompatibilitySwizzle( const gles2::Texture::CompatibilitySwizzle* swizzle) { if (!IsPassthrough())
diff --git a/gpu/command_buffer/service/shared_image/gl_texture_image_backing.h b/gpu/command_buffer/service/shared_image/gl_texture_image_backing.h index 7d78cf3..0a0decb2 100644 --- a/gpu/command_buffer/service/shared_image/gl_texture_image_backing.h +++ b/gpu/command_buffer/service/shared_image/gl_texture_image_backing.h
@@ -35,17 +35,18 @@ void InitializeGLTexture( const GLCommonImageBackingFactory::FormatInfo& format_info, + bool is_cleared, bool framebuffer_attachment_angle); void SetCompatibilitySwizzle( const gles2::Texture::CompatibilitySwizzle* swizzle); GLenum GetGLTarget() const; GLuint GetGLServiceId() const; - void CreateGLImageNativePixmap(); private: // SharedImageBacking: SharedImageBackingType GetType() const override; + gfx::Rect ClearedRect() const final; void SetClearedRect(const gfx::Rect& cleared_rect) final; std::unique_ptr<GLTextureImageRepresentation> ProduceGLTexture( SharedImageManager* manager,
diff --git a/gpu/command_buffer/service/shared_image/gl_texture_image_backing_factory.cc b/gpu/command_buffer/service/shared_image/gl_texture_image_backing_factory.cc index 003e158..6af2f07 100644 --- a/gpu/command_buffer/service/shared_image/gl_texture_image_backing_factory.cc +++ b/gpu/command_buffer/service/shared_image/gl_texture_image_backing_factory.cc
@@ -182,6 +182,7 @@ const FormatInfo& format_info = GetFormatInfo(format); GLenum target = GL_TEXTURE_2D; + const bool is_cleared = !pixel_data.empty(); const bool for_framebuffer_attachment = (usage & (SHARED_IMAGE_USAGE_RASTER | SHARED_IMAGE_USAGE_GLES2_FRAMEBUFFER_HINT)) != 0; @@ -191,7 +192,8 @@ auto result = std::make_unique<GLTextureImageBacking>( mailbox, format, size, color_space, surface_origin, alpha_type, usage, use_passthrough_); - result->InitializeGLTexture(format_info, framebuffer_attachment_angle); + result->InitializeGLTexture(format_info, is_cleared, + framebuffer_attachment_angle); gl::GLApi* api = gl::g_current_gl_context; ScopedRestoreTexture scoped_restore(api, target); @@ -227,10 +229,6 @@ pixel_data.data()); } - if (!pixel_data.empty()) { - result->SetCleared(); - } - if (gl::g_current_gl_driver->ext.b_GL_KHR_debug) { const std::string label = "SharedImage_GLTexture" + CreateLabelForSharedImageUsage(usage);
diff --git a/headless/BUILD.gn b/headless/BUILD.gn index f654e75..7987fdf 100644 --- a/headless/BUILD.gn +++ b/headless/BUILD.gn
@@ -172,26 +172,6 @@ deps = [ ":resource_pack_strings" ] } -if (headless_enable_commands) { - grit("headless_command_resources") { - source = "app/headless_command.grd" - outputs = [ - "grit/headless_command_resources.h", - "$root_gen_dir/headless/headless_command_resources.pak", - ] - - use_brotli = true - } - - repack("headless_command_resources_pack") { - sources = [ "$root_gen_dir/headless/headless_command_resources.pak" ] - - output = "$root_out_dir/headless_command_resources.pak" - - deps = [ ":headless_command_resources" ] - } -} - devtools_domains = [ "accessibility", "animation", @@ -398,13 +378,6 @@ ] } - if (headless_enable_commands) { - sources += [ - "app/headless_command_switches.cc", - "app/headless_command_switches.h", - ] - } - if (is_linux || is_chromeos) { sources += [ "lib/browser/headless_browser_main_parts_linux.cc" ] } @@ -778,12 +751,13 @@ "//third_party/pywebsocket3/", ] + data_deps = [] + if (headless_enable_commands) { data += [ "$root_out_dir/headless_command_resources.pak" ] + data_deps += [ "//components/headless/command_handler" ] } - data_deps = [] - if (is_fuchsia) { # TODO(https://crbug.com/1185811): Investigate removing the requirement for # job_policy_ambient_mark_vmo_exec for the sake of V8's allocator in tests. @@ -848,6 +822,10 @@ deps += [ "//components/policy/core/common:test_support" ] } + if (headless_enable_commands) { + deps += [ "//components/headless/command_handler" ] + } + configs += [ ":headless_defines_config" ] } @@ -885,14 +863,7 @@ deps += [ "//components/printing/browser/headless:headless" ] } if (headless_enable_commands) { - sources += [ - "app/headless_command_handler.cc", - "app/headless_command_handler.h", - ] - deps += [ - ":headless_command_resources", - ":headless_command_resources_pack", - ] + deps += [ "//components/headless/command_handler" ] } configs += [ ":headless_defines_config" ] @@ -963,14 +934,7 @@ } if (headless_enable_commands) { - sources += [ - "app/headless_command_handler.cc", - "app/headless_command_handler.h", - ] - deps += [ - ":headless_command_resources", - ":headless_command_resources_pack", - ] + deps += [ "//components/headless/command_handler" ] } if (is_win) {
diff --git a/headless/DEPS b/headless/DEPS index b929380..a84e80493 100644 --- a/headless/DEPS +++ b/headless/DEPS
@@ -2,6 +2,7 @@ "+components/cookie_config", "+components/crash/content/browser", "+components/crash/core", + "+components/headless", "+components/os_crypt", "+components/services/print_compositor/public", "+content/public/app",
diff --git a/headless/app/headless_command.js b/headless/app/headless_command.js deleted file mode 100644 index b0485c1..0000000 --- a/headless/app/headless_command.js +++ /dev/null
@@ -1,301 +0,0 @@ -// 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. - -// -// CDPClient -// -class CDPClient { - constructor() { - this._requestId = 0; - this._sessions = new Map(); - } - - nextRequestId() { - return ++this._requestId; - } - - addSession(session) { - this._sessions.set(session.sessionId(), session); - } - - getSession(sessionId) { - this._sessions.get(sessionId); - } - - async dispatchMessage(message) { - const messageObject = JSON.parse(message); - const session = this._sessions.get(messageObject.sessionId || ''); - if (session) - session.dispatchMessage(messageObject); - } - - reportError(message, error) { - if (error) - console.error(`${message}: ${error}\n${error.stack}`); - else - console.error(message); - } -} - -const cdpClient = new CDPClient(); - -// -// CDPSession -// -class CDPSession { - constructor(sessionId) { - this._sessionId = sessionId || ''; - this._parentSessionId = null; - this._dispatchTable = new Map(); - this._eventHandlers = new Map(); - this._protocol = this._getProtocol(); - cdpClient.addSession(this); - } - - sessionId() { - return this._sessionId; - } - - protocol() { - return this._protocol; - } - - createSession(sessionId) { - const session = new CDPSession(sessionId); - session._parentSessionId = this._sessionId; - return session; - } - - async sendCommand(method, params) { - const requestId = cdpClient.nextRequestId(); - const messageObject = {'id': requestId, 'method': method, 'params': params}; - if (this._sessionId) - messageObject.sessionId = this._sessionId; - sendDevToolsMessage(JSON.stringify(messageObject)); - return new Promise(f => this._dispatchTable.set(requestId, f)); - } - - async dispatchMessage(message) { - try { - const messageId = message.id; - if (typeof messageId === 'number') { - const handler = this._dispatchTable.get(messageId); - if (handler) { - this._dispatchTable.delete(messageId); - handler(message); - } else { - cdpClient.reportError(`Unexpected result id ${messageId}`); - } - } else { - const eventName = message.method; - for (const handler of (this._eventHandlers.get(eventName) || [])) - handler(message); - } - } catch (e) { - cdpClient.reportError(`Exception when dispatching message\n' + - '${JSON.stringify(message)}`, e); - } - } - - _getProtocol() { - return new Proxy({}, { - get: (target, domainName, receiver) => new Proxy({}, { - get: (target, methodName, receiver) => { - const eventPattern = /^(on(ce)?|off)([A-Z][A-Za-z0-9]*)/; - const match = eventPattern.exec(methodName); - if (!match) { - return args => this.sendCommand( - `${domainName}.${methodName}`, args || {}); - } - let eventName = match[3]; - eventName = eventName.charAt(0).toLowerCase() + eventName.slice(1); - if (match[1] === 'once') { - return eventMatcher => this._waitForEvent( - `${domainName}.${eventName}`, eventMatcher); - } - if (match[1] === 'off') { - return listener => this._removeEventHandler( - `${domainName}.${eventName}`, listener); - } - return listener => this._addEventHandler( - `${domainName}.${eventName}`, listener); - } - }) - }); - } - - _waitForEvent(eventName, eventMatcher) { - return new Promise(callback => { - const handler = result => { - if (eventMatcher && !eventMatcher(result)) - return; - this._removeEventHandler(eventName, handler); - callback(result); - }; - this._addEventHandler(eventName, handler); - }); - } - - _addEventHandler(eventName, handler) { - const handlers = this._eventHandlers.get(eventName) || []; - handlers.push(handler); - this._eventHandlers.set(eventName, handlers); - } - - _removeEventHandler(eventName, handler) { - const handlers = this._eventHandlers.get(eventName) || []; - const index = handlers.indexOf(handler); - if (index === -1) - return; - handlers.splice(index, 1); - this._eventHandlers.set(eventName, handlers); - } -} - -// -// TargetPage -// -class TargetPage { - constructor(browserSession) { - this._browserSession = browserSession; - this._targetId = ''; - this._session; - } - - static async createAndNavigate(browserSession, url) { - const targetPage = new TargetPage(browserSession); - - const dp = browserSession.protocol(); - const params = {url: 'about:blank', width: 800, height: 600}; - const createContextOptions = {}; - params.browserContextId = (await dp.Target.createBrowserContext( - createContextOptions)).result.browserContextId; - targetPage._targetId = - (await dp.Target.createTarget(params)).result.targetId; - - const sessionId = (await dp.Target.attachToTarget( - {targetId: targetPage._targetId, flatten: true})).result.sessionId; - targetPage._session = browserSession.createSession(sessionId); - - await targetPage._navigate(url); - - return targetPage; - } - - targetId() { - return this._targetId; - } - - session() { - return this._session; - } - - async _navigate(url) { - const dp = this._session.protocol(); - await dp.Page.enable(); - await dp.Page.setLifecycleEventsEnabled({enabled: true}); - const frameId = (await dp.Page.navigate({url})).result.frameId; - await dp.Page.onceLifecycleEvent( - event => event.params.name === 'load' && - event.params.frameId === frameId); - } -} - -// -// Command handlers -// -async function dumpDOM(dp) { - const script = - "(document.doctype ? new " + - "XMLSerializer().serializeToString(document.doctype) + '\\n' : '')" + - " + document.documentElement.outerHTML"; - - const response = await dp.Runtime.evaluate({expression: script}); - return response.result.result.value; -} - -async function printToPDF(dp, params) { - const displayHeaderFooter = !params.noHeaderFooter; - - const printToPDFParams = { - displayHeaderFooter, - printBackground: true, - preferCSSPageSize: true, - }; - - const response = await dp.Page.printToPDF(printToPDFParams); - return response.result.data; -} - -async function screenshot(dp, params) { - const format = params.format || 'png'; - const screenshotParams = { - format, - }; - const response = await dp.Page.captureScreenshot(screenshotParams); - return response.result.data; -} - -async function handleCommands(dp, commands) { - const result = {}; - if ('dumpDom' in commands) - result.dumpDomResult = await dumpDOM(dp); - - if ('printToPDF' in commands) - result.printToPdfResult = await printToPDF(dp, commands.printToPDF); - - if ('screenshot' in commands) - result.screenshotResult = await screenshot(dp, commands.screenshot); - - return result; -} - -// -// Target.exposeDevToolsProtocol() communication functions. -// -window.cdp.onmessage = json => { - //console.log('[recv] ' + json); - cdpClient.dispatchMessage(json); -} - -function sendDevToolsMessage(json) { - //console.log('[send] ' + json); - window.cdp.send(json); -} - -// -// This is called from the host. -// -async function executeCommands(commands) { - const browserSession = new CDPSession(); - const targetPage = await TargetPage.createAndNavigate( - browserSession, commands.targetUrl); - const dp = targetPage.session().protocol(); - - if ('defaultBackgroundColor' in commands) { - await dp.Emulation.setDefaultBackgroundColorOverride( - {color: commands.defaultBackgroundColor}); - } - - let promises = []; - if ('timeout' in commands) { - const timeoutPromise = new Promise(resolve => { - setTimeout(resolve, commands.timeout); - }); - promises.push(timeoutPromise); - } - - if ('virtualTimeBudget' in commands) { - await dp.Emulation.setVirtualTimePolicy( - {budget: commands.virtualTimeBudget, - maxVirtualTimeTaskStarvationCount: 9999, - policy: 'pauseIfNetworkFetchesPending' }); - promises.push(dp.Emulation.onceVirtualTimeBudgetExpired()); - } - - if (promises.length > 0) - await Promise.race(promises); - - return await handleCommands(dp, commands); -}
diff --git a/headless/app/headless_command_handler.cc b/headless/app/headless_command_handler.cc deleted file mode 100644 index 31f68f42..0000000 --- a/headless/app/headless_command_handler.cc +++ /dev/null
@@ -1,357 +0,0 @@ -// 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. - -#include "headless/app/headless_command_handler.h" - -#include <cstdint> -#include <iostream> -#include <map> - -#include "base/base64.h" -#include "base/bind.h" -#include "base/callback.h" -#include "base/command_line.h" -#include "base/containers/adapters.h" -#include "base/containers/span.h" -#include "base/files/file.h" -#include "base/files/file_path.h" -#include "base/files/file_util.h" -#include "base/i18n/rtl.h" -#include "base/json/json_writer.h" -#include "base/logging.h" -#include "base/path_service.h" -#include "base/strings/strcat.h" -#include "base/strings/string_number_conversions.h" -#include "base/strings/string_util.h" -#include "base/task/sequenced_task_runner.h" -#include "base/task/task_traits.h" -#include "base/task/thread_pool.h" -#include "build/build_config.h" -#include "content/public/app/content_main.h" -#include "content/public/browser/browser_task_traits.h" -#include "content/public/browser/browser_thread.h" -#include "content/public/browser/web_contents.h" -#include "content/public/browser/web_ui_data_source.h" -#include "headless/app/headless_command_switches.h" -#include "headless/grit/headless_command_resources.h" -#include "ui/base/resource/resource_bundle.h" - -namespace headless { - -namespace { - -// Default file name for screenshot. Can be overridden by "--screenshot" switch. -const char kDefaultScreenshotFileName[] = "screenshot.png"; -// Default file name for pdf. Can be overridden by "--print-to-pdf" switch. -const char kDefaultPDFFileName[] = "output.pdf"; - -const char kChromeHeadlessHost[] = "headless"; -const char kChromeHeadlessURL[] = "chrome://headless/"; - -const char kHeadlessCommandHtml[] = "headless_command.html"; -const char kHeadlessCommandJs[] = "headless_command.js"; - -content::WebUIDataSource* CreateHeadlessHostDataSource() { - base::FilePath resource_dir; - bool result = base::PathService::Get(base::DIR_ASSETS, &resource_dir); - DCHECK(result); - - // Try loading the headless library pak file first. If it doesn't exist (i.e., - // when we're running with the --headless switch), fall back to the browser's - // resource pak. - base::FilePath resource_pack = - resource_dir.Append(FILE_PATH_LITERAL("headless_command_resources.pak")); - if (base::PathExists(resource_pack)) { - ui::ResourceBundle::GetSharedInstance().AddDataPackFromPath( - resource_pack, ui::kScaleFactorNone); - } - - content::WebUIDataSource* source = - content::WebUIDataSource::Create(kChromeHeadlessHost); - - source->AddResourcePath(kHeadlessCommandHtml, IDR_HEADLESS_COMMAND_HTML); - source->AddResourcePath(kHeadlessCommandJs, IDR_HEADLESS_COMMAND_JS); - - return source; -} - -base::Value::Dict GetColorDictFromHexColor(uint32_t color, bool has_alpha) { - base::Value::Dict dict; - if (has_alpha) { - dict.Set("r", static_cast<int>((color & 0xff000000) >> 24)); - dict.Set("g", static_cast<int>((color & 0x00ff0000) >> 16)); - dict.Set("b", static_cast<int>((color & 0x0000ff00) >> 8)); - dict.Set("a", static_cast<int>((color & 0x000000ff))); - } else { - dict.Set("r", static_cast<int>((color & 0xff0000) >> 16)); - dict.Set("g", static_cast<int>((color & 0x00ff00) >> 8)); - dict.Set("b", static_cast<int>((color & 0x0000ff))); - } - - return dict; -} - -bool GetCommandDictAndOutputPaths(base::Value::Dict* commands, - base::FilePath* pdf_file_path, - base::FilePath* screenshot_file_path) { - const base::CommandLine* command_line = - base::CommandLine::ForCurrentProcess(); - - // --dump-dom - if (command_line->HasSwitch(switches::kDumpDom)) { - commands->Set("dumpDom", true); - } - - // --print-to-pdf=[output path] - if (command_line->HasSwitch(switches::kPrintToPDF)) { - base::FilePath path = - command_line->GetSwitchValuePath(switches::kPrintToPDF); - if (path.empty()) { - path = base::FilePath().AppendASCII(kDefaultPDFFileName); - } - *pdf_file_path = path; - - base::Value::Dict params; - if (command_line->HasSwitch(switches::kPrintToPDFNoHeader)) { - params.Set("noHeaderFooter", true); - } - - commands->Set("printToPDF", std::move(params)); - } - - // --screenshot=[output path] - if (command_line->HasSwitch(switches::kScreenshot)) { - base::FilePath path = - command_line->GetSwitchValuePath(switches::kScreenshot); - if (path.empty()) { - path = base::FilePath().AppendASCII(kDefaultScreenshotFileName); - } - *screenshot_file_path = path; - - base::FilePath::StringType extension = - base::ToLowerASCII(path.FinalExtension()); - - static const std::map<const base::FilePath::StringType, const char*> - kImageFileTypes{ - {FILE_PATH_LITERAL(".jpeg"), "jpeg"}, - {FILE_PATH_LITERAL(".jpg"), "jpeg"}, - {FILE_PATH_LITERAL(".png"), "png"}, - {FILE_PATH_LITERAL(".webp"), "webp"}, - }; - - auto it = kImageFileTypes.find(extension); - if (it == kImageFileTypes.cend()) { - LOG(ERROR) << "Unsupported screenshot image file type: " - << path.FinalExtension(); - return false; - } - - base::Value::Dict params; - params.Set("format", it->second); - commands->Set("screenshot", std::move(params)); - } - - // --default-background-color=rrggbb[aa] - if (command_line->HasSwitch(switches::kDefaultBackgroundColor)) { - std::string hex_color = - command_line->GetSwitchValueASCII(switches::kDefaultBackgroundColor); - uint32_t color; - if (!(hex_color.length() == 6 || hex_color.length() == 8) || - !base::HexStringToUInt(hex_color, &color)) { - LOG(ERROR) - << "Expected a hex RGB or RGBA value for --default-background-color=" - << hex_color; - return false; - } - - commands->Set("defaultBackgroundColor", - GetColorDictFromHexColor(color, hex_color.length() == 8)); - } - - // virtual-time-budget=[ms] - if (command_line->HasSwitch(switches::kVirtualTimeBudget)) { - std::string budget_ms_str = - command_line->GetSwitchValueASCII(switches::kVirtualTimeBudget); - int budget_ms; - if (!base::StringToInt(budget_ms_str, &budget_ms)) { - LOG(ERROR) << "Expected an integer value for --virtual-time-budget=" - << budget_ms_str; - return false; - } - - commands->Set("virtualTimeBudget", budget_ms); - } - - // timeout=[ms] - if (command_line->HasSwitch(switches::kTimeout)) { - std::string timeout_ms_str = - command_line->GetSwitchValueASCII(switches::kTimeout); - int timeout_ms; - if (!base::StringToInt(timeout_ms_str, &timeout_ms)) { - LOG(ERROR) << "Expected an integer value for --timeout=" - << timeout_ms_str; - return false; - } - - commands->Set("timeout", timeout_ms); - } - - return true; -} - -void WriteFileTask(base::FilePath file_path, std::string file_data) { - auto file_span = base::make_span( - reinterpret_cast<const uint8_t*>(file_data.data()), file_data.size()); - if (base::WriteFile(file_path, file_span)) { - std::cerr << file_data.size() << " bytes written to file " << file_path - << std::endl; - } else { - PLOG(ERROR) << "Failed to write file " << file_path; - } -} - -void WriteFile(base::FilePath file_path, - std::string base64_file_data, - scoped_refptr<base::SequencedTaskRunner> io_task_runner) { - std::string file_data; - CHECK(base::Base64Decode(base64_file_data, &file_data)); - - io_task_runner->PostTask(FROM_HERE, - base::BindOnce(&WriteFileTask, std::move(file_path), - std::move(file_data))); -} - -} // namespace - -HeadlessCommandHandler::HeadlessCommandHandler( - content::WebContents* web_contents, - GURL target_url, - DoneCallback done_callback, - scoped_refptr<base::SequencedTaskRunner> io_task_runner) - : web_contents_(web_contents), - target_url_(std::move(target_url)), - done_callback_(std::move(done_callback)), - io_task_runner_(std::move(io_task_runner)) { - DCHECK(io_task_runner_); - - // Load command execution harness resources and create URL data source - // for chrome://headless. - content::WebUIDataSource::Add(web_contents_->GetBrowserContext(), - CreateHeadlessHostDataSource()); - - content::WebContentsObserver::Observe(web_contents_); - - browser_devtools_client_.AttachToBrowser(); - devtools_client_.AttachToWebContents(web_contents_); -} - -HeadlessCommandHandler::~HeadlessCommandHandler() = default; - -// static -GURL HeadlessCommandHandler::GetHandlerUrl() { - const std::string url = - base::StrCat({kChromeHeadlessURL, kHeadlessCommandHtml}); - return GURL(url); -} - -// static -void HeadlessCommandHandler::ProcessCommands( - content::WebContents* web_contents, - GURL target_url, - DoneCallback done_callback, - scoped_refptr<base::SequencedTaskRunner> io_task_runner) { - if (!io_task_runner) { - io_task_runner = base::ThreadPool::CreateSequencedTaskRunner( - {base::MayBlock(), base::TaskPriority::USER_BLOCKING, - base::TaskShutdownBehavior::BLOCK_SHUTDOWN}); - } - // Headless Command Handler instance will self delete when done. - HeadlessCommandHandler* command_handler = - new HeadlessCommandHandler(web_contents, std::move(target_url), - std::move(done_callback), io_task_runner); - - command_handler->ExecuteCommands(); -} - -void HeadlessCommandHandler::ExecuteCommands() { - // Expose DevTools protocol to the target. - base::Value::Dict params; - params.Set("targetId", devtools_client_.GetTargetId()); - browser_devtools_client_.SendCommand("Target.exposeDevToolsProtocol", - std::move(params)); - - // Set up Inspector domain. - devtools_client_.AddEventHandler( - "Inspector.targetCrashed", - base::BindRepeating(&HeadlessCommandHandler::OnTargetCrashed, - base::Unretained(this))); - devtools_client_.SendCommand("Inspector.enable"); -} - -void HeadlessCommandHandler::DocumentOnLoadCompletedInPrimaryMainFrame() { - base::Value::Dict commands; - if (!GetCommandDictAndOutputPaths(&commands, &pdf_file_path_, - &screenshot_file_path_) || - commands.empty()) { - Done(); - return; - } - - commands.Set("targetUrl", target_url_.spec()); - - std::string json_commands; - base::JSONWriter::Write(commands, &json_commands); - std::string script = "executeCommands(JSON.parse('" + json_commands + "'))"; - - base::Value::Dict params; - params.Set("expression", script); - params.Set("awaitPromise", true); - params.Set("returnByValue", true); - devtools_client_.SendCommand( - "Runtime.evaluate", std::move(params), - base::BindOnce(&HeadlessCommandHandler::OnCommandsResult, - base::Unretained(this))); -} - -void HeadlessCommandHandler::WebContentsDestroyed() { - CHECK(false); -} - -void HeadlessCommandHandler::OnTargetCrashed(const base::Value::Dict&) { - LOG(ERROR) << "Abnormal renderer termination."; - Done(); -} - -void HeadlessCommandHandler::OnCommandsResult(base::Value::Dict result) { - if (std::string* dom_dump = - result.FindStringByDottedPath("result.result.value.dumpDomResult")) { - std::cout << *dom_dump << std::endl; - } - - if (std::string* base64_data = result.FindStringByDottedPath( - "result.result.value.screenshotResult")) { - WriteFile(std::move(screenshot_file_path_), std::move(*base64_data), - io_task_runner_); - } - - if (std::string* base64_data = result.FindStringByDottedPath( - "result.result.value.printToPdfResult")) { - WriteFile(std::move(pdf_file_path_), std::move(*base64_data), - io_task_runner_); - } - - Done(); -} - -void HeadlessCommandHandler::Done() { - DCHECK(web_contents_); - devtools_client_.DetachClient(); - browser_devtools_client_.DetachClient(); - - DoneCallback done_callback(std::move(done_callback_)); - delete this; - std::move(done_callback).Run(); -} - -} // namespace headless
diff --git a/headless/app/headless_command_handler.h b/headless/app/headless_command_handler.h deleted file mode 100644 index 6c0e47a..0000000 --- a/headless/app/headless_command_handler.h +++ /dev/null
@@ -1,76 +0,0 @@ -// 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 HEADLESS_APP_HEADLESS_COMMAND_HANDLER_H_ -#define HEADLESS_APP_HEADLESS_COMMAND_HANDLER_H_ - -#include "base/files/file_path.h" -#include "base/functional/callback.h" -#include "base/memory/raw_ptr.h" -#include "base/task/sequenced_task_runner.h" -#include "base/values.h" -#include "components/devtools/simple_devtools_protocol_client/simple_devtools_protocol_client.h" -#include "content/public/browser/web_contents_observer.h" -#include "url/gurl.h" - -namespace content { -class WebContents; -} // namespace content - -namespace headless { - -class HeadlessCommandHandler : public content::WebContentsObserver { - public: - typedef base::OnceCallback<void()> DoneCallback; - - HeadlessCommandHandler(const HeadlessCommandHandler&) = delete; - HeadlessCommandHandler& operator=(const HeadlessCommandHandler&) = delete; - - static GURL GetHandlerUrl(); - - // The caller may override the TaskRunner used for file I/O by providing - // a value for |io_task_runner|. - static void ProcessCommands( - content::WebContents* web_contents, - GURL target_url, - DoneCallback done_callback, - scoped_refptr<base::SequencedTaskRunner> io_task_runner = {}); - - private: - using SimpleDevToolsProtocolClient = - simple_devtools_protocol_client::SimpleDevToolsProtocolClient; - - HeadlessCommandHandler( - content::WebContents* web_contents, - GURL target_url, - DoneCallback done_callback, - scoped_refptr<base::SequencedTaskRunner> io_task_runner); - ~HeadlessCommandHandler() override; - - void ExecuteCommands(); - - // content::WebContentsObserver implementation: - void DocumentOnLoadCompletedInPrimaryMainFrame() override; - void WebContentsDestroyed() override; - - void OnTargetCrashed(const base::Value::Dict&); - - void OnCommandsResult(base::Value::Dict result); - - void Done(); - - SimpleDevToolsProtocolClient devtools_client_; - SimpleDevToolsProtocolClient browser_devtools_client_; - raw_ptr<content::WebContents> web_contents_; - GURL target_url_; - DoneCallback done_callback_; - scoped_refptr<base::SequencedTaskRunner> io_task_runner_; - - base::FilePath pdf_file_path_; - base::FilePath screenshot_file_path_; -}; - -} // namespace headless - -#endif // HEADLESS_APP_HEADLESS_COMMAND_HANDLER_H_
diff --git a/headless/app/headless_command_switches.cc b/headless/app/headless_command_switches.cc deleted file mode 100644 index 579d2afe..0000000 --- a/headless/app/headless_command_switches.cc +++ /dev/null
@@ -1,38 +0,0 @@ -// 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. - -#include "headless/app/headless_command_switches.h" - -namespace headless::switches { - -// The background color to be used if the page doesn't specify one. Provided as -// RGB or RGBA integer value in hex, e.g. 'ff0000ff' for red or '00000000' for -// transparent. -const char kDefaultBackgroundColor[] = "default-background-color"; - -// Instructs headless_shell to print document.body.innerHTML to stdout. -const char kDumpDom[] = "dump-dom"; - -// Save a pdf file of the loaded page. -const char kPrintToPDF[] = "print-to-pdf"; - -// Do not display header and footer in the pdf file. -const char kPrintToPDFNoHeader[] = "print-to-pdf-no-header"; - -// Save a screenshot of the loaded page. -const char kScreenshot[] = "screenshot"; - -// Issues a stop after the specified number of milliseconds. This cancels all -// navigation and causes the DOMContentLoaded event to fire. -const char kTimeout[] = "timeout"; - -// If set the system waits the specified number of virtual milliseconds before -// deeming the page to be ready. For determinism virtual time does not advance -// while there are pending network fetches (i.e no timers will fire). Once all -// network fetches have completed, timers fire and if the system runs out of -// virtual time is fastforwarded so the next timer fires immediately, until the -// specified virtual time budget is exhausted. -const char kVirtualTimeBudget[] = "virtual-time-budget"; - -} // namespace headless::switches
diff --git a/headless/app/headless_command_switches.h b/headless/app/headless_command_switches.h deleted file mode 100644 index feff139..0000000 --- a/headless/app/headless_command_switches.h +++ /dev/null
@@ -1,22 +0,0 @@ -// 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 HEADLESS_APP_HEADLESS_COMMAND_SWITCHES_H_ -#define HEADLESS_APP_HEADLESS_COMMAND_SWITCHES_H_ - -#include "headless/public/headless_export.h" - -namespace headless::switches { - -HEADLESS_EXPORT extern const char kDefaultBackgroundColor[]; -HEADLESS_EXPORT extern const char kDumpDom[]; -HEADLESS_EXPORT extern const char kPrintToPDF[]; -HEADLESS_EXPORT extern const char kPrintToPDFNoHeader[]; -HEADLESS_EXPORT extern const char kScreenshot[]; -HEADLESS_EXPORT extern const char kTimeout[]; -HEADLESS_EXPORT extern const char kVirtualTimeBudget[]; - -} // namespace headless::switches - -#endif // HEADLESS_APP_HEADLESS_COMMAND_SWITCHES_H_
diff --git a/headless/app/headless_shell.cc b/headless/app/headless_shell.cc index 1a61031ff..6d39be1 100644 --- a/headless/app/headless_shell.cc +++ b/headless/app/headless_shell.cc
@@ -11,11 +11,11 @@ #include "base/command_line.h" #include "base/files/file_util.h" #include "base/i18n/rtl.h" +#include "base/logging.h" #include "base/task/thread_pool.h" #include "build/branding_buildflags.h" #include "build/build_config.h" #include "content/public/app/content_main.h" -#include "headless/app/headless_command_handler.h" #include "headless/app/headless_shell_command_line.h" #include "headless/app/headless_shell_switches.h" #include "headless/lib/browser/headless_browser_impl.h" @@ -44,7 +44,7 @@ #endif #if defined(HEADLESS_ENABLE_COMMANDS) -#include "headless/app/headless_command_handler.h" +#include "components/headless/command_handler/headless_command_handler.h" #endif namespace headless { @@ -199,8 +199,18 @@ return EXIT_FAILURE; } - if (!HandleCommandLineSwitches(command_line, builder)) +#if defined(HEADLESS_ENABLE_COMMANDS) + if ((command_line.HasSwitch(::switches::kRemoteDebuggingPort) || + command_line.HasSwitch(::switches::kRemoteDebuggingPipe)) && + HeadlessCommandHandler::HasHeadlessCommandSwitches(command_line)) { + LOG(ERROR) << "Headless commands are not compatible with remote debugging."; return EXIT_FAILURE; + } +#endif + + if (!HandleCommandLineSwitches(command_line, builder)) { + return EXIT_FAILURE; + } HeadlessShell shell;
diff --git a/headless/app/headless_shell_command_line.cc b/headless/app/headless_shell_command_line.cc index df1b7d8c..72f7f85 100644 --- a/headless/app/headless_shell_command_line.cc +++ b/headless/app/headless_shell_command_line.cc
@@ -20,10 +20,6 @@ #include "ui/gfx/font_render_params.h" #include "ui/gfx/geometry/size.h" -#if defined(HEADLESS_ENABLE_COMMANDS) -#include "headless/app/headless_command_switches.h" -#endif - namespace headless { namespace { @@ -31,33 +27,6 @@ // By default listen to incoming DevTools connections on localhost. const char kLocalHost[] = "localhost"; -bool ValidateCommandLineSwitches(const base::CommandLine& command_line) { -#if defined(HEADLESS_ENABLE_COMMANDS) - if (command_line.HasSwitch(switches::kRemoteDebuggingPort) || - command_line.HasSwitch(switches::kRemoteDebuggingPipe)) { - static const char* kIncompatibleSwitches[] = { - switches::kDefaultBackgroundColor, - switches::kDumpDom, - switches::kPrintToPDF, - switches::kRepl, - switches::kScreenshot, - switches::kTimeout, - switches::kVirtualTimeBudget, - }; - - for (const char* incompatible_switch : kIncompatibleSwitches) { - if (command_line.HasSwitch(incompatible_switch)) { - LOG(ERROR) << "--" << incompatible_switch - << " is not supported with remote debugging."; - return false; - } - } - } -#endif // defined(HEADLESS_ENABLE_COMMANDS) - - return true; -} - void HandleDeterministicModeSwitch(base::CommandLine& command_line) { DCHECK(command_line.HasSwitch(switches::kDeterministicMode)); @@ -167,9 +136,6 @@ bool HandleCommandLineSwitches(base::CommandLine& command_line, HeadlessBrowser::Options::Builder& builder) { - if (!ValidateCommandLineSwitches(command_line)) - return false; - if (command_line.HasSwitch(switches::kDeterministicMode)) HandleDeterministicModeSwitch(command_line);
diff --git a/headless/app/headless_shell_switches.cc b/headless/app/headless_shell_switches.cc index abf91d1c..87cd096 100644 --- a/headless/app/headless_shell_switches.cc +++ b/headless/app/headless_shell_switches.cc
@@ -65,10 +65,6 @@ // so exposing it too widely can be a security risk. const char kRemoteDebuggingAddress[] = "remote-debugging-address"; -// Runs a read-eval-print loop that allows the user to evaluate Javascript -// expressions. -const char kRepl[] = "repl"; - // A string used to override the default user agent with a custom one. const char kUserAgent[] = "user-agent";
diff --git a/headless/app/headless_shell_switches.h b/headless/app/headless_shell_switches.h index d4b1420b..46587c51 100644 --- a/headless/app/headless_shell_switches.h +++ b/headless/app/headless_shell_switches.h
@@ -24,7 +24,6 @@ HEADLESS_EXPORT extern const char kProxyServer[]; HEADLESS_EXPORT extern const char kNoSystemProxyConfigService[]; HEADLESS_EXPORT extern const char kRemoteDebuggingAddress[]; -HEADLESS_EXPORT extern const char kRepl[]; HEADLESS_EXPORT extern const char kUserAgent[]; HEADLESS_EXPORT extern const char kUserDataDir[]; HEADLESS_EXPORT extern const char kIncognito[];
diff --git a/headless/test/headless_command_browsertest.cc b/headless/test/headless_command_browsertest.cc index 82dc71f6..67420b30 100644 --- a/headless/test/headless_command_browsertest.cc +++ b/headless/test/headless_command_browsertest.cc
@@ -13,9 +13,9 @@ #include "base/task/single_thread_task_runner.h" #include "base/threading/thread_restrictions.h" #include "build/build_config.h" +#include "components/headless/command_handler/headless_command_handler.h" +#include "components/headless/command_handler/headless_command_switches.h" #include "content/public/test/browser_test.h" -#include "headless/app/headless_command_handler.h" -#include "headless/app/headless_command_switches.h" #include "headless/lib/browser/headless_browser_context_impl.h" #include "headless/lib/browser/headless_browser_impl.h" #include "headless/lib/browser/headless_web_contents_impl.h"
diff --git a/infra/config/generated/builders/ci/lacros-arm64-generic-rel-skylab/properties.json b/infra/config/generated/builders/ci/lacros-arm64-generic-rel-skylab/properties.json new file mode 100644 index 0000000..97dd5ec8 --- /dev/null +++ b/infra/config/generated/builders/ci/lacros-arm64-generic-rel-skylab/properties.json
@@ -0,0 +1,67 @@ +{ + "$build/chromium_tests_builder_config": { + "builder_config": { + "builder_db": { + "entries": [ + { + "builder_id": { + "bucket": "ci", + "builder": "lacros-arm64-generic-rel-skylab", + "project": "chromium" + }, + "builder_spec": { + "build_gs_bucket": "chromium-chromiumos-archive", + "builder_group": "chromium.chromiumos", + "execution_mode": "COMPILE_AND_TEST", + "legacy_chromium_config": { + "apply_configs": [ + "mb", + "mb_no_luci_auth" + ], + "build_config": "Release", + "config": "chromium", + "target_arch": "arm", + "target_bits": 64, + "target_cros_boards": [ + "kevin:arm64-generic" + ], + "target_platform": "chromeos" + }, + "legacy_gclient_config": { + "apply_configs": [ + "chromeos", + "checkout_lacros_sdk" + ], + "config": "chromium" + }, + "skylab_upload_location": { + "gs_bucket": "chromium-ci-skylab" + } + } + } + ] + }, + "builder_ids": [ + { + "bucket": "ci", + "builder": "lacros-arm64-generic-rel-skylab", + "project": "chromium" + } + ] + } + }, + "$build/reclient": { + "instance": "rbe-chromium-trusted", + "jobs": 500, + "metrics_project": "chromium-reclient-metrics" + }, + "$recipe_engine/resultdb/test_presentation": { + "column_keys": [], + "grouping_keys": [ + "status", + "v.test_suite" + ] + }, + "builder_group": "chromium.chromiumos", + "recipe": "chromium" +} \ No newline at end of file
diff --git a/infra/config/generated/builders/ci/win-updater-builder-rel/properties.json b/infra/config/generated/builders/ci/win-updater-builder-rel/properties.json index be6139a6..aa35e93 100644 --- a/infra/config/generated/builders/ci/win-updater-builder-rel/properties.json +++ b/infra/config/generated/builders/ci/win-updater-builder-rel/properties.json
@@ -57,6 +57,34 @@ { "builder_id": { "bucket": "ci", + "builder": "win10-updater-tester-rel-uac", + "project": "chromium" + }, + "builder_spec": { + "builder_group": "chromium.updater", + "execution_mode": "TEST", + "legacy_chromium_config": { + "apply_configs": [ + "mb" + ], + "build_config": "Release", + "config": "chromium", + "target_bits": 64, + "target_platform": "win" + }, + "legacy_gclient_config": { + "config": "chromium" + }, + "parent": { + "bucket": "ci", + "builder": "win-updater-builder-rel", + "project": "chromium" + } + } + }, + { + "builder_id": { + "bucket": "ci", "builder": "win11-updater-tester-rel", "project": "chromium" }, @@ -99,6 +127,11 @@ }, { "bucket": "ci", + "builder": "win10-updater-tester-rel-uac", + "project": "chromium" + }, + { + "bucket": "ci", "builder": "win11-updater-tester-rel", "project": "chromium" }
diff --git a/infra/config/generated/builders/ci/win10-updater-tester-rel-uac/properties.json b/infra/config/generated/builders/ci/win10-updater-tester-rel-uac/properties.json new file mode 100644 index 0000000..5009bb1 --- /dev/null +++ b/infra/config/generated/builders/ci/win10-updater-tester-rel-uac/properties.json
@@ -0,0 +1,77 @@ +{ + "$build/chromium_tests_builder_config": { + "builder_config": { + "builder_db": { + "entries": [ + { + "builder_id": { + "bucket": "ci", + "builder": "win-updater-builder-rel", + "project": "chromium" + }, + "builder_spec": { + "builder_group": "chromium.updater", + "execution_mode": "COMPILE_AND_TEST", + "legacy_chromium_config": { + "apply_configs": [ + "mb" + ], + "build_config": "Release", + "config": "chromium", + "target_bits": 64, + "target_platform": "win" + }, + "legacy_gclient_config": { + "config": "chromium" + } + } + }, + { + "builder_id": { + "bucket": "ci", + "builder": "win10-updater-tester-rel-uac", + "project": "chromium" + }, + "builder_spec": { + "builder_group": "chromium.updater", + "execution_mode": "TEST", + "legacy_chromium_config": { + "apply_configs": [ + "mb" + ], + "build_config": "Release", + "config": "chromium", + "target_bits": 64, + "target_platform": "win" + }, + "legacy_gclient_config": { + "config": "chromium" + }, + "parent": { + "bucket": "ci", + "builder": "win-updater-builder-rel", + "project": "chromium" + } + } + } + ] + }, + "builder_ids": [ + { + "bucket": "ci", + "builder": "win10-updater-tester-rel-uac", + "project": "chromium" + } + ] + } + }, + "$recipe_engine/resultdb/test_presentation": { + "column_keys": [], + "grouping_keys": [ + "status", + "v.test_suite" + ] + }, + "builder_group": "chromium.updater", + "recipe": "chromium" +} \ No newline at end of file
diff --git a/infra/config/generated/luci/cr-buildbucket.cfg b/infra/config/generated/luci/cr-buildbucket.cfg index e6f7999..3871b85 100644 --- a/infra/config/generated/luci/cr-buildbucket.cfg +++ b/infra/config/generated/luci/cr-buildbucket.cfg
@@ -36213,6 +36213,94 @@ } } builders { + name: "lacros-arm64-generic-rel-skylab" + swarming_host: "chromium-swarm.appspot.com" + dimensions: "builderless:1" + dimensions: "cores:8" + dimensions: "cpu:x86-64" + dimensions: "free_space:standard" + dimensions: "os:Ubuntu-18.04" + dimensions: "pool:luci.chromium.ci" + dimensions: "ssd:0" + 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/lacros-arm64-generic-rel-skylab/properties.json",' + ' "top_level_project": {' + ' "ref": "refs/heads/main",' + ' "repo": {' + ' "host": "chromium.googlesource.com",' + ' "project": "chromium/src"' + ' }' + ' }' + ' },' + ' "builder_group": "chromium.chromiumos",' + ' "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: 100 + } + 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: "lacros-arm64-generic-rel-skylab-fyi" swarming_host: "chromium-swarm.appspot.com" dimensions: "builderless:1" @@ -48706,6 +48794,94 @@ } } builders { + name: "win10-updater-tester-rel-uac" + swarming_host: "chromium-swarm.appspot.com" + dimensions: "builderless:1" + dimensions: "cores:8" + dimensions: "cpu:x86-64" + dimensions: "free_space:standard" + dimensions: "os:Ubuntu-18.04" + dimensions: "pool:luci.chromium.ci" + dimensions: "ssd:0" + 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/win10-updater-tester-rel-uac/properties.json",' + ' "top_level_project": {' + ' "ref": "refs/heads/main",' + ' "repo": {' + ' "host": "chromium.googlesource.com",' + ' "project": "chromium/src"' + ' }' + ' }' + ' },' + ' "builder_group": "chromium.updater",' + ' "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: 100 + } + 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: "win10-wpt-content-shell-fyi-rel" swarming_host: "chromium-swarm.appspot.com" dimensions: "builderless:1"
diff --git a/infra/config/generated/luci/luci-milo.cfg b/infra/config/generated/luci/luci-milo.cfg index 5abcd6c..ec29fd9 100644 --- a/infra/config/generated/luci/luci-milo.cfg +++ b/infra/config/generated/luci/luci-milo.cfg
@@ -375,6 +375,11 @@ short_name: "arm64" } builders { + name: "buildbucket/luci.chromium.ci/lacros-arm64-generic-rel-skylab" + category: "chromium.chromiumos|lacros|arm64" + short_name: "sky" + } + builders { name: "buildbucket/luci.chromium.ci/lacros-amd64-generic-binary-size-rel" category: "chromium.chromiumos|lacros|size" } @@ -1080,6 +1085,11 @@ short_name: "arm64" } builders { + name: "buildbucket/luci.chromium.ci/lacros-arm64-generic-rel-skylab" + category: "chromium.chromiumos|lacros|arm64" + short_name: "sky" + } + builders { name: "buildbucket/luci.chromium.ci/chromeos-amd64-generic-lacros-dbg" category: "chromium.chromiumos|lacros|x64" short_name: "dbg" @@ -5885,6 +5895,11 @@ short_name: "arm64" } builders { + name: "buildbucket/luci.chromium.ci/lacros-arm64-generic-rel-skylab" + category: "lacros|arm64" + short_name: "sky" + } + builders { name: "buildbucket/luci.chromium.ci/lacros-amd64-generic-binary-size-rel" category: "lacros|size" } @@ -14399,6 +14414,11 @@ short_name: "11" } builders { + name: "buildbucket/luci.chromium.ci/win10-updater-tester-rel-uac" + category: "release|win (64)" + short_name: "UAC10" + } + builders { name: "buildbucket/luci.chromium.ci/win-updater-builder-rel" category: "release|win (64)" short_name: "bld"
diff --git a/infra/config/generated/luci/luci-scheduler.cfg b/infra/config/generated/luci/luci-scheduler.cfg index 353fc70..98287d7 100644 --- a/infra/config/generated/luci/luci-scheduler.cfg +++ b/infra/config/generated/luci/luci-scheduler.cfg
@@ -4562,6 +4562,15 @@ } } job { + id: "lacros-arm64-generic-rel-skylab" + realm: "ci" + buildbucket { + server: "cr-buildbucket.appspot.com" + bucket: "ci" + builder: "lacros-arm64-generic-rel-skylab" + } +} +job { id: "lacros-arm64-generic-rel-skylab-fyi" realm: "ci" buildbucket { @@ -5864,6 +5873,15 @@ } } job { + id: "win10-updater-tester-rel-uac" + realm: "ci" + buildbucket { + server: "cr-buildbucket.appspot.com" + bucket: "ci" + builder: "win10-updater-tester-rel-uac" + } +} +job { id: "win10-wpt-content-shell-fyi-rel" realm: "ci" schedule: "with 5h interval" @@ -6233,6 +6251,7 @@ triggers: "lacros-arm-generic-rel" triggers: "lacros-arm64-archive-rel" triggers: "lacros-arm64-generic-rel" + triggers: "lacros-arm64-generic-rel-skylab" triggers: "lacros-arm64-generic-rel-skylab-fyi" triggers: "lacros64-archive-rel" triggers: "linux-angle-chromium-builder"
diff --git a/infra/config/generated/luci/realms.cfg b/infra/config/generated/luci/realms.cfg index b833d10..6427347 100644 --- a/infra/config/generated/luci/realms.cfg +++ b/infra/config/generated/luci/realms.cfg
@@ -181,6 +181,7 @@ values: "win10-updater-tester-dbg" values: "win10-updater-tester-dbg-uac" values: "win10-updater-tester-rel" + values: "win10-updater-tester-rel-uac" values: "win11-updater-tester-dbg-uac" values: "win11-updater-tester-rel" }
diff --git a/infra/config/subprojects/chromium/ci/chromium.chromiumos.star b/infra/config/subprojects/chromium/ci/chromium.chromiumos.star index eaac513..9af0c04 100644 --- a/infra/config/subprojects/chromium/ci/chromium.chromiumos.star +++ b/infra/config/subprojects/chromium/ci/chromium.chromiumos.star
@@ -587,6 +587,43 @@ ) ci.builder( + name = "lacros-arm64-generic-rel-skylab", + builder_spec = builder_config.builder_spec( + gclient_config = builder_config.gclient_config( + config = "chromium", + apply_configs = [ + "chromeos", + "checkout_lacros_sdk", + ], + ), + chromium_config = builder_config.chromium_config( + config = "chromium", + apply_configs = ["mb", "mb_no_luci_auth"], + build_config = builder_config.build_config.RELEASE, + target_arch = builder_config.target_arch.ARM, + target_bits = 64, + target_platform = builder_config.target_platform.CHROMEOS, + target_cros_boards = "kevin:arm64-generic", + ), + build_gs_bucket = "chromium-chromiumos-archive", + skylab_upload_location = builder_config.skylab_upload_location( + gs_bucket = "chromium-ci-skylab", + ), + ), + os = os.LINUX_DEFAULT, + console_view_entry = consoles.console_view_entry( + category = "lacros|arm64", + short_name = "sky", + ), + # TODO(crbug.com/1406052): Enable when stable. + sheriff_rotations = args.ignore_default(None), + tree_closing = False, + main_console_view = "main", + cq_mirrors_console_view = "mirrors", + reclient_jobs = reclient.jobs.HIGH_JOBS_FOR_CI, +) + +ci.builder( name = "lacros-arm-generic-rel", branch_selector = branches.STANDARD_MILESTONE, builder_spec = builder_config.builder_spec(
diff --git a/infra/config/subprojects/chromium/ci/chromium.updater.star b/infra/config/subprojects/chromium/ci/chromium.updater.star index 029a027..8ff92f1a 100644 --- a/infra/config/subprojects/chromium/ci/chromium.updater.star +++ b/infra/config/subprojects/chromium/ci/chromium.updater.star
@@ -701,6 +701,30 @@ ) ci.thin_tester( + name = "win10-updater-tester-rel-uac", + builder_spec = builder_config.builder_spec( + execution_mode = builder_config.execution_mode.TEST, + gclient_config = builder_config.gclient_config( + config = "chromium", + ), + chromium_config = builder_config.chromium_config( + config = "chromium", + apply_configs = [ + "mb", + ], + build_config = builder_config.build_config.RELEASE, + target_bits = 64, + target_platform = builder_config.target_platform.WIN, + ), + ), + triggered_by = ["win-updater-builder-rel"], + console_view_entry = consoles.console_view_entry( + category = "release|win (64)", + short_name = "UAC10", + ), +) + +ci.thin_tester( name = "win11-updater-tester-dbg-uac", builder_spec = builder_config.builder_spec( execution_mode = builder_config.execution_mode.TEST,
diff --git a/ios/chrome/browser/providers/lens/chromium_lens.mm b/ios/chrome/browser/providers/lens/chromium_lens.mm index 69f597e2..73e38e61c 100644 --- a/ios/chrome/browser/providers/lens/chromium_lens.mm +++ b/ios/chrome/browser/providers/lens/chromium_lens.mm
@@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import "ios/public/provider/chrome/browser/lens/lens_api.h" -#import "ios/public/provider/chrome/browser/lens/lens_configuration.h" -#import "ios/web/public/navigation/navigation_manager.h" +#import <UIKit/UIKit.h> +#import <ostream> #import "base/bind.h" #import "base/notreached.h" - -#import <UIKit/UIKit.h> +#import "ios/public/provider/chrome/browser/lens/lens_api.h" +#import "ios/public/provider/chrome/browser/lens/lens_configuration.h" +#import "ios/web/public/navigation/navigation_manager.h" #if !defined(__has_feature) || !__has_feature(objc_arc) #error "This file requires ARC support."
diff --git a/ios/chrome/browser/ui/ntp/metrics/BUILD.gn b/ios/chrome/browser/ui/ntp/metrics/BUILD.gn index a189b6fb..f901c1f 100644 --- a/ios/chrome/browser/ui/ntp/metrics/BUILD.gn +++ b/ios/chrome/browser/ui/ntp/metrics/BUILD.gn
@@ -44,6 +44,7 @@ "//base", "//base/test:test_support", "//components/feed/core/v2/public:common", + "//ios/chrome/browser/ui/ntp", "//ios/chrome/test:test_support", "//ios/web/public/test", "//testing/gtest",
diff --git a/ios/chrome/browser/ui/ntp/metrics/feed_metrics_constants.h b/ios/chrome/browser/ui/ntp/metrics/feed_metrics_constants.h index 8cc208c..85b200c2 100644 --- a/ios/chrome/browser/ui/ntp/metrics/feed_metrics_constants.h +++ b/ios/chrome/browser/ui/ntp/metrics/feed_metrics_constants.h
@@ -35,6 +35,13 @@ extern NSString* const kArticleVisitTimestampKey; // Stores the time elapsed on the feed when the user leaves. extern NSString* const kLongFeedVisitTimeAggregateKey; +extern NSString* const kLongFollowingFeedVisitTimeAggregateKey; +extern NSString* const kLongDiscoverFeedVisitTimeAggregateKey; +extern NSString* const kLastUsedFeedForGoodVisitsKey; +// Stores the last interaction time for Good Visits (NSDate). +extern NSString* const kLastInteractionTimeForGoodVisits; +extern NSString* const kLastInteractionTimeForDiscoverGoodVisits; +extern NSString* const kLastInteractionTimeForFollowingGoodVisits; #pragma mark - Enums
diff --git a/ios/chrome/browser/ui/ntp/metrics/feed_metrics_constants.mm b/ios/chrome/browser/ui/ntp/metrics/feed_metrics_constants.mm index b86e841..28356ae 100644 --- a/ios/chrome/browser/ui/ntp/metrics/feed_metrics_constants.mm +++ b/ios/chrome/browser/ui/ntp/metrics/feed_metrics_constants.mm
@@ -17,6 +17,17 @@ NSString* const kArticleVisitTimestampKey = @"ShortClickInteractionTimestamp"; NSString* const kLongFeedVisitTimeAggregateKey = @"LongFeedInteractionTimeDelta"; +NSString* const kLongDiscoverFeedVisitTimeAggregateKey = + @"LongDiscoverFeedInteractionTimeDelta"; +NSString* const kLongFollowingFeedVisitTimeAggregateKey = + @"LongFollowingFeedInteractionTimeDelta"; +NSString* const kLastUsedFeedForGoodVisitsKey = @"LastUsedFeedForGoodVisits"; +NSString* const kLastInteractionTimeForGoodVisits = + @"LastInteractionTimeForGoodVisits"; +NSString* const kLastInteractionTimeForDiscoverGoodVisits = + @"LastInteractionTimeForGoodVisitsDiscover"; +NSString* const kLastInteractionTimeForFollowingGoodVisits = + @"LastInteractionTimeForGoodVisitsFollowing"; #pragma mark - Histograms
diff --git a/ios/chrome/browser/ui/ntp/metrics/feed_metrics_recorder.h b/ios/chrome/browser/ui/ntp/metrics/feed_metrics_recorder.h index 6d51819..48dba11 100644 --- a/ios/chrome/browser/ui/ntp/metrics/feed_metrics_recorder.h +++ b/ios/chrome/browser/ui/ntp/metrics/feed_metrics_recorder.h
@@ -40,6 +40,9 @@ // visible. - (void)recordDeviceOrientationChanged:(UIDeviceOrientation)orientation; +// Tracks time spent in a specific Feed for a Good Visit. +- (void)recordFeedTypeChangedFromFeed:(FeedType)previousFeed; + // Record when the NTP changes visibility. - (void)recordNTPDidChangeVisibility:(BOOL)visible;
diff --git a/ios/chrome/browser/ui/ntp/metrics/feed_metrics_recorder.mm b/ios/chrome/browser/ui/ntp/metrics/feed_metrics_recorder.mm index 16fbf43..3ec6888f 100644 --- a/ios/chrome/browser/ui/ntp/metrics/feed_metrics_recorder.mm +++ b/ios/chrome/browser/ui/ntp/metrics/feed_metrics_recorder.mm
@@ -42,7 +42,10 @@ // Tracking property to avoid duplicate recordings of // FeedEngagementType::kGoodVisit. -@property(nonatomic, assign) BOOL goodVisitReported; +@property(nonatomic, assign) BOOL goodVisitReportedAllFeeds; +@property(nonatomic, assign) BOOL goodVisitReportedDiscover; +@property(nonatomic, assign) BOOL goodVisitReportedFollowing; + // Tracking property to record a scroll for Good Visits. // TODO(crbug.com/1373650) separate the property below in two, one for each // feed. @@ -51,6 +54,10 @@ @property(nonatomic, assign) base::Time sessionStartTime; // The timestamp when the last interaction happens for Good Visits. @property(nonatomic, assign) base::Time lastInteractionTimeForGoodVisits; +@property(nonatomic, assign) + base::Time lastInteractionTimeForDiscoverGoodVisits; +@property(nonatomic, assign) + base::Time lastInteractionTimeForFollowingGoodVisits; // The timestamp when the feed becomes visible again for Good Visits. It // is reset when a new Good Visit session starts @property(nonatomic, assign) @@ -60,6 +67,8 @@ // Good Visit Session. @property(nonatomic, assign) NSTimeInterval previousTimeInFeedForGoodVisitSession; +@property(nonatomic, assign) NSTimeInterval discoverPreviousTimeInFeedGV; +@property(nonatomic, assign) NSTimeInterval followingPreviousTimeInFeedGV; @end @@ -122,14 +131,47 @@ } } +- (void)recordFeedTypeChangedFromFeed:(FeedType)previousFeed { + // Recalculate time spent in previous surface. + [self timeSpentForCurrentGoodVisitSessionInFeed:previousFeed]; +} + - (void)recordNTPDidChangeVisibility:(BOOL)visible { if (!IsGoodVisitsMetricEnabled()) { return; } NSUserDefaults* defaults = [NSUserDefaults standardUserDefaults]; if (visible) { + NSDate* lastInteractionTimeForGoodVisitsDate = base::mac::ObjCCast<NSDate>( + [defaults objectForKey:kLastInteractionTimeForGoodVisits]); + if (lastInteractionTimeForGoodVisitsDate != nil) { + self.lastInteractionTimeForGoodVisits = + base::Time::FromNSDate(lastInteractionTimeForGoodVisitsDate); + } + + NSDate* lastInteractionTimeForDiscoverGoodVisitsDate = + base::mac::ObjCCast<NSDate>( + [defaults objectForKey:kLastInteractionTimeForDiscoverGoodVisits]); + if (lastInteractionTimeForDiscoverGoodVisitsDate != nil) { + self.lastInteractionTimeForDiscoverGoodVisits = + base::Time::FromNSDate(lastInteractionTimeForDiscoverGoodVisitsDate); + } + + NSDate* lastInteractionTimeForFollowingGoodVisitsDate = + base::mac::ObjCCast<NSDate>( + [defaults objectForKey:kLastInteractionTimeForFollowingGoodVisits]); + if (lastInteractionTimeForFollowingGoodVisitsDate != nil) { + self.lastInteractionTimeForFollowingGoodVisits = + base::Time::FromNSDate(lastInteractionTimeForFollowingGoodVisitsDate); + } + self.previousTimeInFeedForGoodVisitSession = [defaults doubleForKey:kLongFeedVisitTimeAggregateKey]; + self.discoverPreviousTimeInFeedGV = + [defaults doubleForKey:kLongDiscoverFeedVisitTimeAggregateKey]; + self.followingPreviousTimeInFeedGV = + [defaults doubleForKey:kLongFollowingFeedVisitTimeAggregateKey]; + // Checks if there is a timestamp in defaults for when a user clicked // on an article in order to be able to trigger a non-short click // interaction. @@ -142,7 +184,11 @@ // kNonShortClickSeconds in a feed article. if (base::Time::FromNSDate(articleVisitStart) - base::Time::Now() > base::Seconds(kNonShortClickSeconds)) { - [self recordEngagedGoodVisits]; + // Trigger a GV for a specific feed. + [self + recordEngagedGoodVisits: + (FeedType)[defaults integerForKey:kLastUsedFeedForGoodVisitsKey] + allFeedsOnly:NO]; } // Clear defaults for new session. [defaults setObject:nil forKey:kArticleVisitTimestampKey]; @@ -154,6 +200,10 @@ [self checkEngagementGoodVisitWithInteraction:NO]; [defaults setDouble:self.previousTimeInFeedForGoodVisitSession forKey:kLongFeedVisitTimeAggregateKey]; + [defaults setDouble:self.discoverPreviousTimeInFeedGV + forKey:kLongDiscoverFeedVisitTimeAggregateKey]; + [defaults setDouble:self.followingPreviousTimeInFeedGV + forKey:kLongFollowingFeedVisitTimeAggregateKey]; } } @@ -807,12 +857,29 @@ if ((now - self.lastInteractionTimeForGoodVisits) > base::Minutes(kMinutesBetweenSessions)) { [self resetGoodVisitSession]; + } else { + // Check if Discover only session has expired. + if ((now - self.lastInteractionTimeForDiscoverGoodVisits) > + base::Minutes(kMinutesBetweenSessions)) { + [self resetGoodVisitSessionForFeed:FeedTypeDiscover]; + } + // Check if Following only session has expired. + if ((now - self.lastInteractionTimeForFollowingGoodVisits) > + base::Minutes(kMinutesBetweenSessions)) { + [self resetGoodVisitSessionForFeed:FeedTypeFollowing]; + } } self.lastInteractionTimeForGoodVisits = now; - - // If the sessions hasn't been reseted and a GoodVisit has already been - // reported return early as an optimization - if (self.goodVisitReported) { + if ([self.feedControlDelegate selectedFeed] == FeedTypeDiscover) { + self.lastInteractionTimeForDiscoverGoodVisits = now; + } + if ([self.feedControlDelegate selectedFeed] == FeedTypeFollowing) { + self.lastInteractionTimeForFollowingGoodVisits = now; + } + // If the session hasn't been reset and a GoodVisit has already been + // reported for all possible surfaces return early as an optimization. + if (self.goodVisitReportedDiscover && self.goodVisitReportedFollowing && + self.goodVisitReportedAllFeeds) { return; } @@ -822,15 +889,28 @@ // new incognito tab ...). if (interacted) { - [self recordEngagedGoodVisits]; + [self recordEngagedGoodVisits:[self.feedControlDelegate selectedFeed] + allFeedsOnly:NO]; return; } // 2. Good time in feed (`kGoodVisitTimeInFeedSeconds` with >= 1 scroll in an // entire session). - if (([self timeSpentInFeedForCurrentGoodVisitSession] > + if (([self timeSpentForCurrentGoodVisitSessionInFeed:[self.feedControlDelegate + selectedFeed]] > kGoodVisitTimeInFeedSeconds) && self.goodVisitScroll) { - [self recordEngagedGoodVisits]; + [self recordEngagedGoodVisits:[self.feedControlDelegate selectedFeed] + allFeedsOnly:YES]; + + // Check if Good Visit should be triggered for Discover feed. + if (self.discoverPreviousTimeInFeedGV > kGoodVisitTimeInFeedSeconds) { + [self recordEngagedGoodVisits:FeedTypeDiscover allFeedsOnly:NO]; + } + + // Check if Good Visit should be triggered for Following feed. + if (self.followingPreviousTimeInFeedGV > kGoodVisitTimeInFeedSeconds) { + [self recordEngagedGoodVisits:FeedTypeFollowing allFeedsOnly:NO]; + } return; } } @@ -920,29 +1000,50 @@ // `recordFollowCount` should be called here. } - // TODO(crbug.com/1322640): Separate user action for Following feed + // TODO(crbug.com/1322640): Separate user action for Following feed. base::RecordAction(base::UserMetricsAction(kDiscoverFeedUserActionEngaged)); } // Records Good Visits for both the Following and Discover feed. -- (void)recordEngagedGoodVisits { +// `allFeedsOnly` will be YES when no individual feed should report a Good +// Visit, but a Good Visit should be triggered for all Feeds. +- (void)recordEngagedGoodVisits:(FeedType)feedType + allFeedsOnly:(BOOL)allFeedsOnly { // Check if the user has previously engaged with the feed in the same // session. // If neither feed has been engaged with, log "AllFeeds" engagement. DCHECK(IsGoodVisitsMetricEnabled()); - if (!self.goodVisitReported) { + if (!self.goodVisitReportedAllFeeds) { + // Log for the all feeds aggregate. UMA_HISTOGRAM_ENUMERATION(kAllFeedsEngagementTypeHistogram, FeedEngagementType::kGoodVisit); - self.goodVisitReported = YES; + self.goodVisitReportedAllFeeds = YES; + } + if (allFeedsOnly) { + return; + } + // A Good Visit for AllFeeds should have been reported in order to report feed + // specific Good Visits. + DCHECK(self.goodVisitReportedAllFeeds); + // Log interaction for Discover feed. + if (feedType == FeedTypeDiscover && !self.goodVisitReportedDiscover) { + UMA_HISTOGRAM_ENUMERATION(kDiscoverFeedEngagementTypeHistogram, + FeedEngagementType::kGoodVisit); + self.goodVisitReportedDiscover = YES; } - // TODO(crbug.com/1373650): Implement separate feed logging for - // Good Visits. + // Log interaction for Following feed. + if (feedType == FeedTypeFollowing && !self.goodVisitReportedFollowing) { + UMA_HISTOGRAM_ENUMERATION(kFollowingFeedEngagementTypeHistogram, + FeedEngagementType::kGoodVisit); + self.goodVisitReportedFollowing = YES; + } } // Calculates the time the user has spent in the feed during a good // visit session. -- (NSTimeInterval)timeSpentInFeedForCurrentGoodVisitSession { +- (NSTimeInterval)timeSpentForCurrentGoodVisitSessionInFeed: + (FeedType)currentFeed { // Add the time spent since last recording. base::Time now = base::Time::Now(); base::TimeDelta additionalTimeInFeed = @@ -951,6 +1052,21 @@ self.previousTimeInFeedForGoodVisitSession + additionalTimeInFeed.InSecondsF(); + // Calculate for specific feed. + switch (currentFeed) { + case FeedTypeFollowing: + self.followingPreviousTimeInFeedGV += additionalTimeInFeed.InSecondsF(); + break; + case FeedTypeDiscover: + self.discoverPreviousTimeInFeedGV += additionalTimeInFeed.InSecondsF(); + break; + } + + DCHECK(self.followingPreviousTimeInFeedGV <= + self.previousTimeInFeedForGoodVisitSession); + DCHECK(self.discoverPreviousTimeInFeedGV <= + self.previousTimeInFeedForGoodVisitSession); + return self.previousTimeInFeedForGoodVisitSession; } @@ -982,13 +1098,42 @@ [defaults setObject:nil forKey:kArticleVisitTimestampKey]; [defaults setDouble:0 forKey:kLongFeedVisitTimeAggregateKey]; - self.lastInteractionTimeForGoodVisits = base::Time::Now(); - self.feedBecameVisibleTimeForGoodVisitSession = base::Time::Now(); + base::Time now = base::Time::Now(); - self.previousTimeInFeedForGoodVisitSession = 0; + self.lastInteractionTimeForGoodVisits = now; + [defaults setObject:now.ToNSDate() forKey:kLastInteractionTimeForGoodVisits]; + + self.feedBecameVisibleTimeForGoodVisitSession = now; self.goodVisitScroll = NO; - self.goodVisitReported = NO; + + self.goodVisitReportedAllFeeds = NO; + // Reset individual feeds. + [self resetGoodVisitSessionForFeed:FeedTypeFollowing]; + [self resetGoodVisitSessionForFeed:FeedTypeDiscover]; +} + +// Resets a Good Visit session for an individual feed. Used to allow for +// sessions to expire only for specific feeds. +- (void)resetGoodVisitSessionForFeed:(FeedType)feedType { + base::Time now = base::Time::Now(); + NSUserDefaults* defaults = [NSUserDefaults standardUserDefaults]; + if (feedType == FeedTypeDiscover) { + [defaults setDouble:0 forKey:kLongDiscoverFeedVisitTimeAggregateKey]; + self.lastInteractionTimeForDiscoverGoodVisits = now; + [defaults setObject:now.ToNSDate() + forKey:kLastInteractionTimeForDiscoverGoodVisits]; + self.discoverPreviousTimeInFeedGV = 0; + self.goodVisitReportedDiscover = NO; + } + if (feedType == FeedTypeFollowing) { + [defaults setDouble:0 forKey:kLongFollowingFeedVisitTimeAggregateKey]; + self.lastInteractionTimeForFollowingGoodVisits = now; + [defaults setObject:now.ToNSDate() + forKey:kLastInteractionTimeForFollowingGoodVisits]; + self.followingPreviousTimeInFeedGV = 0; + self.goodVisitReportedFollowing = NO; + } } // Records the `duration` it took to Discover feed to perform any @@ -998,12 +1143,14 @@ } // Records that a URL was opened regardless of the target surface (e.g. New Tab, -// Same Tab, Incognito Tab, etc.) +// Same Tab, Incognito Tab, etc.). - (void)recordOpenURL { // Save the time of the open so we can then calculate how long the user spent // in that page. - [[NSUserDefaults standardUserDefaults] setObject:[[NSDate alloc] init] - forKey:kArticleVisitTimestampKey]; + NSUserDefaults* defaults = [NSUserDefaults standardUserDefaults]; + [defaults setObject:[[NSDate alloc] init] forKey:kArticleVisitTimestampKey]; + [defaults setInteger:[self.feedControlDelegate selectedFeed] + forKey:kLastUsedFeedForGoodVisitsKey]; if (self.isShownOnStartSurface) { UMA_HISTOGRAM_ENUMERATION(kActionOnStartSurface,
diff --git a/ios/chrome/browser/ui/ntp/metrics/feed_metrics_recorder_unittest.mm b/ios/chrome/browser/ui/ntp/metrics/feed_metrics_recorder_unittest.mm index b451b11f..35845f45 100644 --- a/ios/chrome/browser/ui/ntp/metrics/feed_metrics_recorder_unittest.mm +++ b/ios/chrome/browser/ui/ntp/metrics/feed_metrics_recorder_unittest.mm
@@ -8,10 +8,16 @@ #import "base/test/metrics/histogram_tester.h" #import "components/feed/core/v2/public/common_enums.h" +#import "ios/chrome/browser/ui/ntp/feed_control_delegate.h" #import "ios/chrome/browser/ui/ntp/metrics/feed_metrics_recorder+testing.h" #import "testing/gtest/include/gtest/gtest.h" #import "testing/gtest_mac.h" #import "testing/platform_test.h" +#import "third_party/ocmock/OCMock/OCMock.h" + +#import "base/build_time.h" +#import "base/test/ios/wait_util.h" +#import "base/test/scoped_mock_clock_override.h" #if !defined(__has_feature) || !__has_feature(objc_arc) #error "This file requires ARC support." @@ -23,18 +29,28 @@ public: FeedMetricsRecorderTest() { recorder = [[FeedMetricsRecorder alloc] init]; + // Mock Delegate to change currently used feed. + mockedDelegate = OCMProtocolMock(@protocol(FeedControlDelegate)); + recorder.feedControlDelegate = mockedDelegate; histogram_tester_.reset(new base::HistogramTester()); } protected: + // Constant used to set a standard minimum scroll for testing. + const int kMinScrollForGoodVisitTests = 50; + // Used for time based tests. + const base::TimeDelta kAddedTimeForMockClock = base::Seconds(5); void TearDown() override { [recorder resetGoodVisitSession]; PlatformTest::TearDown(); } FeedMetricsRecorder* recorder; + id<FeedControlDelegate> mockedDelegate; std::unique_ptr<base::HistogramTester> histogram_tester_; }; +#pragma mark - All Feeds Good Visit tests + // Tests that a Good Visit is recorded when a url is added to Read Later. TEST_F(FeedMetricsRecorderTest, GoodExplicitInteraction) { // There should not be a Good Visit recorded. @@ -100,4 +116,325 @@ FeedEngagementType::kGoodVisit, 0); } -// TODO(crbug.com/1399110): Add Time-Based tests in follow up CL. +// Tests for switching feeds + +// Tests that a Good Visit is recorded when a url is added to Read Later and +// switching between feeds. +TEST_F(FeedMetricsRecorderTest, + GoodExplicitInteraction_SeparateFeedGoodVisits) { + // All histograms should be 0 + histogram_tester_->ExpectBucketCount(kAllFeedsEngagementTypeHistogram, + FeedEngagementType::kGoodVisit, 0); + histogram_tester_->ExpectBucketCount(kFollowingFeedEngagementTypeHistogram, + FeedEngagementType::kGoodVisit, 0); + histogram_tester_->ExpectBucketCount(kDiscoverFeedEngagementTypeHistogram, + FeedEngagementType::kGoodVisit, 0); + // Default feed is Discover + // Add URL to Read Later constitutes a Good Visit for AllFeeds and Discover. + [recorder recordAddURLToReadLater]; + // There should be a Good Visit recorded. + histogram_tester_->ExpectBucketCount(kAllFeedsEngagementTypeHistogram, + FeedEngagementType::kGoodVisit, 1); + histogram_tester_->ExpectBucketCount(kFollowingFeedEngagementTypeHistogram, + FeedEngagementType::kGoodVisit, 0); + histogram_tester_->ExpectBucketCount(kDiscoverFeedEngagementTypeHistogram, + FeedEngagementType::kGoodVisit, 1); + // Change feed to Following. + OCMStub([mockedDelegate selectedFeed]).andReturn(FeedTypeFollowing); + + // Add URL to Read Later constitutes a Good Visit for AllFeeds (not counted as + // one has been triggered already this session) and Following. The Discover + // histogram should still have 1 Good Visit reported. + [recorder recordAddURLToReadLater]; + histogram_tester_->ExpectBucketCount(kAllFeedsEngagementTypeHistogram, + FeedEngagementType::kGoodVisit, 1); + histogram_tester_->ExpectBucketCount(kFollowingFeedEngagementTypeHistogram, + FeedEngagementType::kGoodVisit, 1); + histogram_tester_->ExpectBucketCount(kDiscoverFeedEngagementTypeHistogram, + FeedEngagementType::kGoodVisit, 1); +} + +#pragma mark - AllFeeds Time Based Tests + +TEST_F(FeedMetricsRecorderTest, GoodVisit_GoodTimeInFeed) { + // Fast forward the clock to build time. + base::ScopedMockClockOverride mock_clock; + + [recorder recordNTPDidChangeVisibility:YES]; + [recorder recordFeedScrolled:kMinScrollForGoodVisitTests]; + + histogram_tester_->ExpectBucketCount(kAllFeedsEngagementTypeHistogram, + FeedEngagementType::kGoodVisit, 0); + mock_clock.Advance(base::Seconds(kGoodVisitTimeInFeedSeconds) + + kAddedTimeForMockClock); + // Calling an arbitrary GV action. This action should not trigger a GV by + // itself, but cycles the checks for other GV paths. + [recorder recordFeedScrolled:kMinScrollForGoodVisitTests]; + histogram_tester_->ExpectBucketCount(kAllFeedsEngagementTypeHistogram, + FeedEngagementType::kGoodVisit, 1); +} + +// Tests that a Short Click Visit is recorded appropriately. +TEST_F(FeedMetricsRecorderTest, GoodVisit_ShortClickVisit) { + // Fast forward the clock to build time. + base::ScopedMockClockOverride mock_clock; + // Trigger article click + [recorder recordOpenURLInSameTab]; + [recorder recordNTPDidChangeVisibility:NO]; + histogram_tester_->ExpectBucketCount(kAllFeedsEngagementTypeHistogram, + FeedEngagementType::kGoodVisit, 0); + mock_clock.Advance( + (base::Seconds(kNonShortClickSeconds) + kAddedTimeForMockClock)); + // Coming back to the main feed. There should be a Good Visit. + [recorder recordNTPDidChangeVisibility:YES]; + histogram_tester_->ExpectBucketCount(kAllFeedsEngagementTypeHistogram, + FeedEngagementType::kGoodVisit, 1); +} + +// Tests that the session expires accordingly. +TEST_F(FeedMetricsRecorderTest, GoodVisit_SessionExpiration) { + // Fast forward the clock to build time. + base::ScopedMockClockOverride mock_clock; + histogram_tester_->ExpectBucketCount(kAllFeedsEngagementTypeHistogram, + FeedEngagementType::kGoodVisit, 0); + // Trigger Good Visit + [recorder recordAddURLToReadLater]; + histogram_tester_->ExpectBucketCount(kAllFeedsEngagementTypeHistogram, + FeedEngagementType::kGoodVisit, 1); + [recorder recordAddURLToReadLater]; + // Check it's not double logged + histogram_tester_->ExpectBucketCount(kAllFeedsEngagementTypeHistogram, + FeedEngagementType::kGoodVisit, 1); + [recorder recordNTPDidChangeVisibility:NO]; + + // Trigger session expiration by waiting `kMinutesBetweenSessions` + mock_clock.Advance( + (base::Minutes(kMinutesBetweenSessions) + kAddedTimeForMockClock)); + // Coming back to the main feed. Session should have been reset so there + // should be 2 histograms. + [recorder recordNTPDidChangeVisibility:YES]; + [recorder recordAddURLToReadLater]; + histogram_tester_->ExpectBucketCount(kAllFeedsEngagementTypeHistogram, + FeedEngagementType::kGoodVisit, 2); +} + +#pragma mark - Discover Feed Good Visit tests + +// Tests that a Good Visit is recorded when a url is added to Read Later. +TEST_F(FeedMetricsRecorderTest, GoodExplicitInteraction_Discover) { + // Default feed should be Discover. + // There should not be a Good Visit recorded. + histogram_tester_->ExpectBucketCount(kDiscoverFeedEngagementTypeHistogram, + FeedEngagementType::kGoodVisit, 0); + // Add URL to Read Later constitutes a Good Visit by itself. + [recorder recordAddURLToReadLater]; + // There should be a Good Visit recorded. + histogram_tester_->ExpectBucketCount(kDiscoverFeedEngagementTypeHistogram, + FeedEngagementType::kGoodVisit, 1); +} + +// Tests that a Good Visit is recorded when we open a url in a new incognito +// tab. +TEST_F(FeedMetricsRecorderTest, GoodVisit_OpenInNewIncognitoTab_Discover) { + // Default feed should be Discover. + // There should not be a Good Visit recorded. + histogram_tester_->ExpectBucketCount(kDiscoverFeedEngagementTypeHistogram, + FeedEngagementType::kGoodVisit, 0); + // After Action, Good Visit should be recorded. + [recorder recordOpenURLInIncognitoTab]; + histogram_tester_->ExpectBucketCount(kDiscoverFeedEngagementTypeHistogram, + FeedEngagementType::kGoodVisit, 1); +} + +// Tests that a Good Visit is recorded when we do a long press on a card. +TEST_F(FeedMetricsRecorderTest, GoodVisit_LongPress_Discover) { + // Default feed should be Discover. + // There should not be a Good Visit recorded. + histogram_tester_->ExpectBucketCount(kDiscoverFeedEngagementTypeHistogram, + FeedEngagementType::kGoodVisit, 0); + // After Action, Good Visit should be recorded. + [recorder recordNativeContextMenuVisibilityChanged:YES]; + histogram_tester_->ExpectBucketCount(kDiscoverFeedEngagementTypeHistogram, + FeedEngagementType::kGoodVisit, 1); +} + +// Tests that a Good Visit is only logged once for each Good Visit session. +TEST_F(FeedMetricsRecorderTest, GoodVisit_OnlyLoggedOncePerVisit_Discover) { + // Default feed should be Discover. + // There should not be a Good Visit recorded. + histogram_tester_->ExpectBucketCount(kDiscoverFeedEngagementTypeHistogram, + FeedEngagementType::kGoodVisit, 0); + // Start with a Good Visit. + [recorder recordAddURLToReadLater]; + histogram_tester_->ExpectBucketCount(kDiscoverFeedEngagementTypeHistogram, + FeedEngagementType::kGoodVisit, 1); + // Adding to Read Later should count as a Good Visit, but we only log one Good + // Visit per session, so the histogram count should remain at 1. + [recorder recordAddURLToReadLater]; + histogram_tester_->ExpectBucketCount(kDiscoverFeedEngagementTypeHistogram, + FeedEngagementType::kGoodVisit, 1); +} + +// Tests that a Good Visit is not logged when a non-Good Visit action is +// triggered. +TEST_F(FeedMetricsRecorderTest, + GoodVisit_NonGoodVisitActionTriggered_Discover) { + // Default feed should be Discover. + // There should not be a Good Visit recorded. + histogram_tester_->ExpectBucketCount(kDiscoverFeedEngagementTypeHistogram, + FeedEngagementType::kGoodVisit, 0); + // Trigger a non-Good Visit action. + [recorder recordHeaderMenuManageTapped]; + // There should not be a Good Visit recorded as the action was not a trigger + // for a Good Visit. + histogram_tester_->ExpectBucketCount(kDiscoverFeedEngagementTypeHistogram, + FeedEngagementType::kGoodVisit, 0); +} + +#pragma mark - Discover Feed Time Based Good Visit tests + +TEST_F(FeedMetricsRecorderTest, GoodVisit_GoodTimeInFeedDiscover) { + // Fast forward the clock to build time. + base::ScopedMockClockOverride mock_clock; + + [recorder recordNTPDidChangeVisibility:YES]; + [recorder recordFeedScrolled:kMinScrollForGoodVisitTests]; + histogram_tester_->ExpectBucketCount(kDiscoverFeedEngagementTypeHistogram, + FeedEngagementType::kGoodVisit, 0); + mock_clock.Advance(base::Seconds(kGoodVisitTimeInFeedSeconds) + + kAddedTimeForMockClock); + [recorder recordFeedScrolled:kMinScrollForGoodVisitTests]; + histogram_tester_->ExpectBucketCount(kDiscoverFeedEngagementTypeHistogram, + FeedEngagementType::kGoodVisit, 1); +} + +// Tests that a Short Click Visit is recorded appropriately. +TEST_F(FeedMetricsRecorderTest, GoodVisit_ShortClickVisitDiscover) { + // Fast forward the clock to build time. + base::ScopedMockClockOverride mock_clock; + // Trigger article click + [recorder recordOpenURLInSameTab]; + histogram_tester_->ExpectBucketCount(kDiscoverFeedEngagementTypeHistogram, + FeedEngagementType::kGoodVisit, 0); + mock_clock.Advance( + (base::Seconds(kNonShortClickSeconds) + kAddedTimeForMockClock)); + // Coming back to the main feed. There should be a Good Visit. + [recorder recordNTPDidChangeVisibility:YES]; + histogram_tester_->ExpectBucketCount(kDiscoverFeedEngagementTypeHistogram, + FeedEngagementType::kGoodVisit, 1); +} + +#pragma mark - Following Feed Good Visit tests + +// Tests that a Good Visit is recorded when a url is added to Read Later. +TEST_F(FeedMetricsRecorderTest, GoodExplicitInteraction_Following) { + // Change feed to Following. + OCMStub([mockedDelegate selectedFeed]).andReturn(FeedTypeFollowing); + // There should not be a Good Visit recorded. + histogram_tester_->ExpectBucketCount(kFollowingFeedEngagementTypeHistogram, + FeedEngagementType::kGoodVisit, 0); + // Add URL to Read Later constitutes a Good Visit by itself. + [recorder recordAddURLToReadLater]; + // There should be a Good Visit recorded. + histogram_tester_->ExpectBucketCount(kFollowingFeedEngagementTypeHistogram, + FeedEngagementType::kGoodVisit, 1); +} + +// Tests that a Good Visit is recorded when we open a url in a new incognito +// tab. +TEST_F(FeedMetricsRecorderTest, GoodVisit_OpenInNewIncognitoTab_Following) { + // Change feed to Following. + OCMStub([mockedDelegate selectedFeed]).andReturn(FeedTypeFollowing); + // There should not be a Good Visit recorded. + histogram_tester_->ExpectBucketCount(kFollowingFeedEngagementTypeHistogram, + FeedEngagementType::kGoodVisit, 0); + // After Action, Good Visit should be recorded. + [recorder recordOpenURLInIncognitoTab]; + histogram_tester_->ExpectBucketCount(kFollowingFeedEngagementTypeHistogram, + FeedEngagementType::kGoodVisit, 1); +} + +// Tests that a Good Visit is recorded when we do a long press on a card. +TEST_F(FeedMetricsRecorderTest, GoodVisit_LongPress_Following) { + // Change feed to Following. + OCMStub([mockedDelegate selectedFeed]).andReturn(FeedTypeFollowing); + // There should not be a Good Visit recorded. + histogram_tester_->ExpectBucketCount(kFollowingFeedEngagementTypeHistogram, + FeedEngagementType::kGoodVisit, 0); + // After Action, Good Visit should be recorded. + [recorder recordNativeContextMenuVisibilityChanged:YES]; + histogram_tester_->ExpectBucketCount(kFollowingFeedEngagementTypeHistogram, + FeedEngagementType::kGoodVisit, 1); +} + +// Tests that a Good Visit is only logged once for each Good Visit session. +TEST_F(FeedMetricsRecorderTest, GoodVisit_OnlyLoggedOncePerVisit_Following) { + // Change feed to Following. + OCMStub([mockedDelegate selectedFeed]).andReturn(FeedTypeFollowing); + // There should not be a Good Visit recorded. + histogram_tester_->ExpectBucketCount(kFollowingFeedEngagementTypeHistogram, + FeedEngagementType::kGoodVisit, 0); + // Start with a Good Visit. + [recorder recordAddURLToReadLater]; + histogram_tester_->ExpectBucketCount(kFollowingFeedEngagementTypeHistogram, + FeedEngagementType::kGoodVisit, 1); + // Adding to Read Later should count as a Good Visit, but we only log one Good + // Visit per session, so the histogram count should remain at 1. + [recorder recordAddURLToReadLater]; + histogram_tester_->ExpectBucketCount(kFollowingFeedEngagementTypeHistogram, + FeedEngagementType::kGoodVisit, 1); +} + +// Tests that a Good Visit is not logged when a non-Good Visit action is +// triggered. +TEST_F(FeedMetricsRecorderTest, + GoodVisit_NonGoodVisitActionTriggered_Following) { + // Change feed to Following. + OCMStub([mockedDelegate selectedFeed]).andReturn(FeedTypeFollowing); + // There should not be a Good Visit recorded. + histogram_tester_->ExpectBucketCount(kFollowingFeedEngagementTypeHistogram, + FeedEngagementType::kGoodVisit, 0); + // Trigger a non-Good Visit action. + [recorder recordHeaderMenuManageTapped]; + // There should not be a Good Visit recorded as the action was not a trigger + // for a Good Visit. + histogram_tester_->ExpectBucketCount(kFollowingFeedEngagementTypeHistogram, + FeedEngagementType::kGoodVisit, 0); +} + +#pragma mark - Following Feed Time Based Good Visit tests + +TEST_F(FeedMetricsRecorderTest, GoodVisit_GoodTimeInFeedFollowing) { + // Fast forward the clock to build time. + base::ScopedMockClockOverride mock_clock; + // Change feed to Following. + OCMStub([mockedDelegate selectedFeed]).andReturn(FeedTypeFollowing); + + [recorder recordNTPDidChangeVisibility:YES]; + [recorder recordFeedScrolled:kMinScrollForGoodVisitTests]; + histogram_tester_->ExpectBucketCount(kFollowingFeedEngagementTypeHistogram, + FeedEngagementType::kGoodVisit, 0); + mock_clock.Advance(base::Seconds(kGoodVisitTimeInFeedSeconds) + + kAddedTimeForMockClock); + [recorder recordFeedScrolled:kMinScrollForGoodVisitTests]; + histogram_tester_->ExpectBucketCount(kFollowingFeedEngagementTypeHistogram, + FeedEngagementType::kGoodVisit, 1); +} + +// Tests that a Short Click Visit is recorded appropriately. +TEST_F(FeedMetricsRecorderTest, GoodVisit_ShortClickVisitFollowing) { + // Fast forward the clock to build time. + base::ScopedMockClockOverride mock_clock; + // Change feed to Following. + OCMStub([mockedDelegate selectedFeed]).andReturn(FeedTypeFollowing); + // Trigger article click + [recorder recordOpenURLInSameTab]; + histogram_tester_->ExpectBucketCount(kFollowingFeedEngagementTypeHistogram, + FeedEngagementType::kGoodVisit, 0); + mock_clock.Advance( + (base::Seconds(kNonShortClickSeconds) + kAddedTimeForMockClock)); + // Coming back to the main feed. There should be a Good Visit. + [recorder recordNTPDidChangeVisibility:YES]; + histogram_tester_->ExpectBucketCount(kFollowingFeedEngagementTypeHistogram, + FeedEngagementType::kGoodVisit, 1); +}
diff --git a/ios/chrome/browser/ui/ntp/new_tab_page_coordinator.mm b/ios/chrome/browser/ui/ntp/new_tab_page_coordinator.mm index 63554a2..275d80f 100644 --- a/ios/chrome/browser/ui/ntp/new_tab_page_coordinator.mm +++ b/ios/chrome/browser/ui/ntp/new_tab_page_coordinator.mm
@@ -354,15 +354,6 @@ #pragma mark - Public -- (void)setWebState:(web::WebState*)webState { - if (_webState == webState) { - return; - } - self.contentSuggestionsCoordinator.webState = webState; - self.ntpMediator.webState = webState; - _webState = webState; -} - - (void)stopScrolling { if (!self.contentSuggestionsCoordinator) { return; @@ -473,6 +464,26 @@ [self updateVisible]; } +#pragma mark - Setters + +- (void)setSelectedFeed:(FeedType)selectedFeed { + if (_selectedFeed == selectedFeed) { + return; + } + // Tell Metrics Recorder the feed has changed. + [self.feedMetricsRecorder recordFeedTypeChangedFromFeed:_selectedFeed]; + _selectedFeed = selectedFeed; +} + +- (void)setWebState:(web::WebState*)webState { + if (_webState == webState) { + return; + } + self.contentSuggestionsCoordinator.webState = webState; + self.ntpMediator.webState = webState; + _webState = webState; +} + #pragma mark - Initializers // Gets all NTP services from the browser state. @@ -879,7 +890,6 @@ if (self.selectedFeed == feedType) { return; } - self.selectedFeed = feedType; // Saves scroll position before changing feed.
diff --git a/ios/chrome/test/providers/lens/test_lens.mm b/ios/chrome/test/providers/lens/test_lens.mm index 6be4dbc..6f628951 100644 --- a/ios/chrome/test/providers/lens/test_lens.mm +++ b/ios/chrome/test/providers/lens/test_lens.mm
@@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#import "ios/public/provider/chrome/browser/lens/lens_api.h" -#import "ios/public/provider/chrome/browser/lens/lens_configuration.h" -#import "url/url_constants.h" +#import <UIKit/UIKit.h> +#import <ostream> #import "base/bind.h" #import "base/notreached.h" - -#import <UIKit/UIKit.h> +#import "ios/public/provider/chrome/browser/lens/lens_api.h" +#import "ios/public/provider/chrome/browser/lens/lens_configuration.h" +#import "url/url_constants.h" #if !defined(__has_feature) || !__has_feature(objc_arc) #error "This file requires ARC support."
diff --git a/media/audio/aecdump_recording_manager.cc b/media/audio/aecdump_recording_manager.cc index fb2abc79..86f9232 100644 --- a/media/audio/aecdump_recording_manager.cc +++ b/media/audio/aecdump_recording_manager.cc
@@ -4,8 +4,8 @@ #include "media/audio/aecdump_recording_manager.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/task/single_thread_task_runner.h" #include "base/task/thread_pool.h" #include "media/audio/audio_manager.h"
diff --git a/media/audio/aecdump_recording_manager.h b/media/audio/aecdump_recording_manager.h index 8a7b103..a840784 100644 --- a/media/audio/aecdump_recording_manager.h +++ b/media/audio/aecdump_recording_manager.h
@@ -7,8 +7,8 @@ #include <map> -#include "base/callback.h" #include "base/files/file.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "media/base/media_export.h"
diff --git a/media/audio/aecdump_recording_manager_unittest.cc b/media/audio/aecdump_recording_manager_unittest.cc index 87bb29f..ebb87c9 100644 --- a/media/audio/aecdump_recording_manager_unittest.cc +++ b/media/audio/aecdump_recording_manager_unittest.cc
@@ -4,10 +4,10 @@ #include "media/audio/aecdump_recording_manager.h" -#include "base/bind.h" #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" #include "base/test/task_environment.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/media/audio/alive_checker.cc b/media/audio/alive_checker.cc index eec22fc..a7df61a 100644 --- a/media/audio/alive_checker.cc +++ b/media/audio/alive_checker.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/task/single_thread_task_runner.h" namespace media {
diff --git a/media/audio/alive_checker.h b/media/audio/alive_checker.h index 2df39711..11c00453 100644 --- a/media/audio/alive_checker.h +++ b/media/audio/alive_checker.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h" #include "base/task/sequenced_task_runner.h"
diff --git a/media/audio/alive_checker_unittest.cc b/media/audio/alive_checker_unittest.cc index 567198e..bab382de 100644 --- a/media/audio/alive_checker_unittest.cc +++ b/media/audio/alive_checker_unittest.cc
@@ -5,7 +5,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/synchronization/waitable_event.h" #include "base/task/sequenced_task_runner.h"
diff --git a/media/audio/alsa/alsa_input.cc b/media/audio/alsa/alsa_input.cc index ad33463..05073624 100644 --- a/media/audio/alsa/alsa_input.cc +++ b/media/audio/alsa/alsa_input.cc
@@ -6,7 +6,7 @@ #include <stddef.h> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/logging.h" #include "base/task/single_thread_task_runner.h"
diff --git a/media/audio/alsa/alsa_output.cc b/media/audio/alsa/alsa_output.cc index 40fed95d..08e8e8b 100644 --- a/media/audio/alsa/alsa_output.cc +++ b/media/audio/alsa/alsa_output.cc
@@ -40,7 +40,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/memory/free_deleter.h" #include "base/task/single_thread_task_runner.h"
diff --git a/media/audio/android/aaudio_output.cc b/media/audio/android/aaudio_output.cc index 4ca3bf3b..269aa135 100644 --- a/media/audio/android/aaudio_output.cc +++ b/media/audio/android/aaudio_output.cc
@@ -5,7 +5,7 @@ #include "media/audio/android/aaudio_output.h" #include "base/android/build_info.h" -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/memory/raw_ptr.h" #include "base/task/sequenced_task_runner.h"
diff --git a/media/audio/android/audio_android_unittest.cc b/media/audio/android/audio_android_unittest.cc index 31cd9dd..552a900 100644 --- a/media/audio/android/audio_android_unittest.cc +++ b/media/audio/android/audio_android_unittest.cc
@@ -7,8 +7,8 @@ #include <memory> #include "base/android/build_info.h" -#include "base/bind.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/memory/raw_ptr.h" #include "base/path_service.h"
diff --git a/media/audio/android/audio_manager_android.cc b/media/audio/android/audio_manager_android.cc index b2f3d2b..974fe55 100644 --- a/media/audio/android/audio_manager_android.cc +++ b/media/audio/android/audio_manager_android.cc
@@ -10,8 +10,8 @@ #include "base/android/jni_array.h" #include "base/android/jni_string.h" #include "base/android/scoped_java_ref.h" -#include "base/bind.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/strings/string_number_conversions.h" #include "media/audio/android/aaudio_output.h"
diff --git a/media/audio/android/audio_track_output_stream.cc b/media/audio/android/audio_track_output_stream.cc index e3bb633..8d8b320c6 100644 --- a/media/audio/android/audio_track_output_stream.cc +++ b/media/audio/android/audio_track_output_stream.cc
@@ -6,8 +6,8 @@ #include <cmath> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/task/single_thread_task_runner.h" #include "base/time/default_tick_clock.h"
diff --git a/media/audio/audio_debug_file_writer.cc b/media/audio/audio_debug_file_writer.cc index 823f3839..21bc740 100644 --- a/media/audio/audio_debug_file_writer.cc +++ b/media/audio/audio_debug_file_writer.cc
@@ -10,7 +10,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h"
diff --git a/media/audio/audio_debug_file_writer_unittest.cc b/media/audio/audio_debug_file_writer_unittest.cc index 1c5466b..83d3bd81 100644 --- a/media/audio/audio_debug_file_writer_unittest.cc +++ b/media/audio/audio_debug_file_writer_unittest.cc
@@ -8,8 +8,8 @@ #include <memory> #include <utility> -#include "base/bind.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h" #include "base/synchronization/waitable_event.h"
diff --git a/media/audio/audio_debug_recording_helper.cc b/media/audio/audio_debug_recording_helper.cc index 5a284ef..c58521c0 100644 --- a/media/audio/audio_debug_recording_helper.cc +++ b/media/audio/audio_debug_recording_helper.cc
@@ -7,8 +7,8 @@ #include <memory> #include <utility> -#include "base/bind.h" #include "base/files/file.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/memory/ptr_util.h" #include "base/sequence_checker.h"
diff --git a/media/audio/audio_debug_recording_helper.h b/media/audio/audio_debug_recording_helper.h index 2283a95..5235eaa 100644 --- a/media/audio/audio_debug_recording_helper.h +++ b/media/audio/audio_debug_recording_helper.h
@@ -6,7 +6,7 @@ #define MEDIA_AUDIO_AUDIO_DEBUG_RECORDING_HELPER_H_ #include "base/atomicops.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/gtest_prod_util.h" #include "base/memory/weak_ptr.h" #include "base/thread_annotations.h"
diff --git a/media/audio/audio_debug_recording_helper_unittest.cc b/media/audio/audio_debug_recording_helper_unittest.cc index d14c585b..970b03c 100644 --- a/media/audio/audio_debug_recording_helper_unittest.cc +++ b/media/audio/audio_debug_recording_helper_unittest.cc
@@ -8,12 +8,12 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/check_op.h" #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/functional/callback_forward.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h"
diff --git a/media/audio/audio_debug_recording_manager.cc b/media/audio/audio_debug_recording_manager.cc index 9292e2d..1794b7a8 100644 --- a/media/audio/audio_debug_recording_manager.cc +++ b/media/audio/audio_debug_recording_manager.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/threading/thread_checker.h"
diff --git a/media/audio/audio_debug_recording_manager.h b/media/audio/audio_debug_recording_manager.h index 8cf8a60..ed0c167 100644 --- a/media/audio/audio_debug_recording_manager.h +++ b/media/audio/audio_debug_recording_manager.h
@@ -9,7 +9,7 @@ #include <memory> #include <utility> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/gtest_prod_util.h" #include "base/memory/weak_ptr.h" #include "base/threading/thread_checker.h"
diff --git a/media/audio/audio_debug_recording_manager_unittest.cc b/media/audio/audio_debug_recording_manager_unittest.cc index 2afa476..5b161a58 100644 --- a/media/audio/audio_debug_recording_manager_unittest.cc +++ b/media/audio/audio_debug_recording_manager_unittest.cc
@@ -7,8 +7,8 @@ #include <memory> #include <vector> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/test/task_environment.h" #include "media/audio/audio_debug_recording_helper.h" #include "testing/gmock/include/gmock/gmock.h"
diff --git a/media/audio/audio_device_description.cc b/media/audio/audio_device_description.cc index 4671aaf6..12ed90b 100644 --- a/media/audio/audio_device_description.cc +++ b/media/audio/audio_device_description.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/notreached.h" #include "build/build_config.h" #include "build/chromecast_buildflags.h"
diff --git a/media/audio/audio_encoders_unittest.cc b/media/audio/audio_encoders_unittest.cc index 1d146dd..849e7ce7 100644 --- a/media/audio/audio_encoders_unittest.cc +++ b/media/audio/audio_encoders_unittest.cc
@@ -8,7 +8,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/task/sequenced_task_runner.h" #include "base/test/bind.h" #include "base/test/task_environment.h"
diff --git a/media/audio/audio_input_device.cc b/media/audio/audio_input_device.cc index cb8760b..df9cfd27 100644 --- a/media/audio/audio_input_device.cc +++ b/media/audio/audio_input_device.cc
@@ -8,9 +8,9 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/format_macros.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h"
diff --git a/media/audio/audio_input_stream_data_interceptor.h b/media/audio/audio_input_stream_data_interceptor.h index c406acf..676ceba 100644 --- a/media/audio/audio_input_stream_data_interceptor.h +++ b/media/audio/audio_input_stream_data_interceptor.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/sequence_checker.h" #include "media/audio/audio_io.h"
diff --git a/media/audio/audio_input_stream_data_interceptor_unittest.cc b/media/audio/audio_input_stream_data_interceptor_unittest.cc index 0125660..6b0a928 100644 --- a/media/audio/audio_input_stream_data_interceptor_unittest.cc +++ b/media/audio/audio_input_stream_data_interceptor_unittest.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/ptr_util.h" #include "media/audio/audio_debug_recording_helper.h" #include "media/audio/audio_io.h"
diff --git a/media/audio/audio_input_unittest.cc b/media/audio/audio_input_unittest.cc index 5602d3d..78dc5b0 100644 --- a/media/audio/audio_input_unittest.cc +++ b/media/audio/audio_input_unittest.cc
@@ -7,10 +7,10 @@ #include <memory> #include <vector> -#include "base/bind.h" -#include "base/callback.h" #include "base/command_line.h" #include "base/environment.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/message_loop/message_pump_type.h" #include "base/run_loop.h"
diff --git a/media/audio/audio_low_latency_input_output_unittest.cc b/media/audio/audio_low_latency_input_output_unittest.cc index 3addbf7..6e2bf000 100644 --- a/media/audio/audio_low_latency_input_output_unittest.cc +++ b/media/audio/audio_low_latency_input_output_unittest.cc
@@ -8,9 +8,9 @@ #include <algorithm> #include <memory> -#include "base/bind.h" #include "base/environment.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/memory/raw_ptr.h" #include "base/path_service.h"
diff --git a/media/audio/audio_manager.cc b/media/audio/audio_manager.cc index 6305a9a..5b1e653 100644 --- a/media/audio/audio_manager.cc +++ b/media/audio/audio_manager.cc
@@ -9,9 +9,9 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/metrics/histogram_macros.h" #include "base/power_monitor/power_monitor.h"
diff --git a/media/audio/audio_manager.h b/media/audio/audio_manager.h index e23ae99..7842a16 100644 --- a/media/audio/audio_manager.h +++ b/media/audio/audio_manager.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/gtest_prod_util.h" #include "base/threading/thread_checker.h" #include "build/build_config.h"
diff --git a/media/audio/audio_manager_base.cc b/media/audio/audio_manager_base.cc index 24d8678..655bc60 100644 --- a/media/audio/audio_manager_base.cc +++ b/media/audio/audio_manager_base.cc
@@ -6,9 +6,9 @@ #include <memory> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/metrics/histogram_macros.h" #include "base/observer_list.h"
diff --git a/media/audio/audio_manager_unittest.cc b/media/audio/audio_manager_unittest.cc index 83248d8..d34c6d8 100644 --- a/media/audio/audio_manager_unittest.cc +++ b/media/audio/audio_manager_unittest.cc
@@ -9,9 +9,9 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/command_line.h" #include "base/environment.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/memory/raw_ptr.h" #include "base/ranges/algorithm.h"
diff --git a/media/audio/audio_opus_encoder.cc b/media/audio/audio_opus_encoder.cc index f564885..80cd79f2 100644 --- a/media/audio/audio_opus_encoder.cc +++ b/media/audio/audio_opus_encoder.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/memory/raw_ptr.h" #include "base/numerics/checked_math.h"
diff --git a/media/audio/audio_output_device.cc b/media/audio/audio_output_device.cc index 2a0ac29..be6cf5c6 100644 --- a/media/audio/audio_output_device.cc +++ b/media/audio/audio_output_device.cc
@@ -11,7 +11,7 @@ #include <memory> #include <utility> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/metrics/histogram_macros.h" #include "base/synchronization/waitable_event.h"
diff --git a/media/audio/audio_output_device.h b/media/audio/audio_output_device.h index e6178da..abf8432 100644 --- a/media/audio/audio_output_device.h +++ b/media/audio/audio_output_device.h
@@ -66,7 +66,7 @@ #include <memory> #include <string> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/memory/unsafe_shared_memory_region.h" #include "base/synchronization/waitable_event.h"
diff --git a/media/audio/audio_output_device_unittest.cc b/media/audio/audio_output_device_unittest.cc index 7e008a8..89d675e 100644 --- a/media/audio/audio_output_device_unittest.cc +++ b/media/audio/audio_output_device_unittest.cc
@@ -9,9 +9,9 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h" #include "base/memory/shared_memory_mapping.h"
diff --git a/media/audio/audio_output_dispatcher_impl.cc b/media/audio/audio_output_dispatcher_impl.cc index 231f565..2a93389 100644 --- a/media/audio/audio_output_dispatcher_impl.cc +++ b/media/audio/audio_output_dispatcher_impl.cc
@@ -7,9 +7,9 @@ #include <algorithm> #include <utility> -#include "base/bind.h" #include "base/compiler_specific.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/task/single_thread_task_runner.h" #include "base/time/time.h" #include "media/audio/audio_logging.h"
diff --git a/media/audio/audio_output_proxy_unittest.cc b/media/audio/audio_output_proxy_unittest.cc index 9ba7511..76ffc17 100644 --- a/media/audio/audio_output_proxy_unittest.cc +++ b/media/audio/audio_output_proxy_unittest.cc
@@ -8,7 +8,7 @@ #include <string> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/task/single_thread_task_runner.h" #include "base/test/task_environment.h"
diff --git a/media/audio/audio_output_resampler.cc b/media/audio/audio_output_resampler.cc index a9117a8..9bc91de 100644 --- a/media/audio/audio_output_resampler.cc +++ b/media/audio/audio_output_resampler.cc
@@ -11,9 +11,9 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/compiler_specific.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h"
diff --git a/media/audio/audio_system.cc b/media/audio/audio_system.cc index 132cbfbf..e014ee6 100644 --- a/media/audio/audio_system.cc +++ b/media/audio/audio_system.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "media/audio/audio_device_description.h" namespace media {
diff --git a/media/audio/audio_system.h b/media/audio/audio_system.h index 0781159..5a58b03 100644 --- a/media/audio/audio_system.h +++ b/media/audio/audio_system.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "media/audio/audio_device_description.h" #include "media/base/audio_parameters.h" #include "media/base/media_export.h"
diff --git a/media/audio/audio_system_impl.cc b/media/audio/audio_system_impl.cc index 905b8480..ea3d783 100644 --- a/media/audio/audio_system_impl.cc +++ b/media/audio/audio_system_impl.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/task/single_thread_task_runner.h" #include "media/audio/audio_device_description.h"
diff --git a/media/audio/audio_system_impl.h b/media/audio/audio_system_impl.h index 207b327..ba545dc2 100644 --- a/media/audio/audio_system_impl.h +++ b/media/audio/audio_system_impl.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/threading/thread_checker.h" #include "media/audio/audio_system.h"
diff --git a/media/audio/audio_system_test_util.cc b/media/audio/audio_system_test_util.cc index afac0bb..3e14f8a 100644 --- a/media/audio/audio_system_test_util.cc +++ b/media/audio/audio_system_test_util.cc
@@ -4,7 +4,7 @@ #include "media/audio/audio_system_test_util.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" namespace media {
diff --git a/media/audio/audio_system_test_util.h b/media/audio/audio_system_test_util.h index 71ebca8..1e302064 100644 --- a/media/audio/audio_system_test_util.h +++ b/media/audio/audio_system_test_util.h
@@ -5,7 +5,7 @@ #ifndef MEDIA_AUDIO_AUDIO_SYSTEM_TEST_UTIL_H_ #define MEDIA_AUDIO_AUDIO_SYSTEM_TEST_UTIL_H_ -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/run_loop.h" #include "base/threading/thread_checker.h"
diff --git a/media/audio/audio_thread_hang_monitor.cc b/media/audio/audio_thread_hang_monitor.cc index 4dfa368..6a1ab234 100644 --- a/media/audio/audio_thread_hang_monitor.cc +++ b/media/audio/audio_thread_hang_monitor.cc
@@ -7,9 +7,9 @@ #include <algorithm> #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/debug/dump_without_crashing.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/location.h" #include "base/logging.h" #include "base/metrics/histogram_macros.h"
diff --git a/media/audio/audio_thread_hang_monitor.h b/media/audio/audio_thread_hang_monitor.h index b6975ac..68831f0 100644 --- a/media/audio/audio_thread_hang_monitor.h +++ b/media/audio/audio_thread_hang_monitor.h
@@ -11,7 +11,7 @@ #include <atomic> #include <memory> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/gtest_prod_util.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_refptr.h"
diff --git a/media/audio/audio_thread_hang_monitor_unittest.cc b/media/audio/audio_thread_hang_monitor_unittest.cc index a55a2fb..71594c41 100644 --- a/media/audio/audio_thread_hang_monitor_unittest.cc +++ b/media/audio/audio_thread_hang_monitor_unittest.cc
@@ -4,7 +4,7 @@ #include "media/audio/audio_thread_hang_monitor.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/synchronization/waitable_event.h" #include "base/test/metrics/histogram_tester.h"
diff --git a/media/audio/clockless_audio_sink.cc b/media/audio/clockless_audio_sink.cc index ad2931c..d0d1311f 100644 --- a/media/audio/clockless_audio_sink.cc +++ b/media/audio/clockless_audio_sink.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/memory/raw_ptr.h" #include "base/synchronization/waitable_event.h"
diff --git a/media/audio/cras/audio_manager_cras.cc b/media/audio/cras/audio_manager_cras.cc index 32718c2e..aaccd6f 100644 --- a/media/audio/cras/audio_manager_cras.cc +++ b/media/audio/cras/audio_manager_cras.cc
@@ -10,10 +10,10 @@ #include <map> #include <utility> -#include "base/bind.h" #include "base/check_op.h" #include "base/command_line.h" #include "base/environment.h" +#include "base/functional/bind.h" #include "base/metrics/field_trial_params.h" #include "base/nix/xdg_util.h" #include "base/strings/string_number_conversions.h"
diff --git a/media/audio/cras/audio_manager_cras_base.cc b/media/audio/cras/audio_manager_cras_base.cc index 2fa24da..62294a1 100644 --- a/media/audio/cras/audio_manager_cras_base.cc +++ b/media/audio/cras/audio_manager_cras_base.cc
@@ -10,10 +10,10 @@ #include <map> #include <utility> -#include "base/bind.h" #include "base/check_op.h" #include "base/command_line.h" #include "base/environment.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/metrics/field_trial_params.h" #include "base/nix/xdg_util.h"
diff --git a/media/audio/fake_audio_input_stream.cc b/media/audio/fake_audio_input_stream.cc index 587fa66..7c0acbcd4 100644 --- a/media/audio/fake_audio_input_stream.cc +++ b/media/audio/fake_audio_input_stream.cc
@@ -8,10 +8,10 @@ #include <string> #include "base/atomicops.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/memory/ptr_util.h" #include "base/memory/ref_counted.h"
diff --git a/media/audio/fake_audio_input_stream.h b/media/audio/fake_audio_input_stream.h index d4245553..e429eeda 100644 --- a/media/audio/fake_audio_input_stream.h +++ b/media/audio/fake_audio_input_stream.h
@@ -11,7 +11,7 @@ #include <string> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h" #include "base/threading/thread.h"
diff --git a/media/audio/fake_audio_output_stream.cc b/media/audio/fake_audio_output_stream.cc index 1276bbfcc..ce67c601 100644 --- a/media/audio/fake_audio_output_stream.cc +++ b/media/audio/fake_audio_output_stream.cc
@@ -4,9 +4,9 @@ #include "media/audio/fake_audio_output_stream.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/check.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/task/single_thread_task_runner.h" #include "base/time/time.h" #include "media/audio/audio_manager_base.h"
diff --git a/media/audio/fuchsia/audio_manager_fuchsia.cc b/media/audio/fuchsia/audio_manager_fuchsia.cc index d0f9a051..2d4307a 100644 --- a/media/audio/fuchsia/audio_manager_fuchsia.cc +++ b/media/audio/fuchsia/audio_manager_fuchsia.cc
@@ -8,12 +8,12 @@ #include <memory> -#include "base/callback.h" #include "base/command_line.h" #include "base/containers/contains.h" #include "base/fuchsia/fuchsia_logging.h" #include "base/fuchsia/process_context.h" #include "base/fuchsia/scheduler.h" +#include "base/functional/callback.h" #include "base/time/time.h" #include "media/audio/fuchsia/audio_input_stream_fuchsia.h" #include "media/audio/fuchsia/audio_output_stream_fuchsia.h"
diff --git a/media/audio/fuchsia/audio_output_stream_fuchsia.cc b/media/audio/fuchsia/audio_output_stream_fuchsia.cc index 6a16f44..ed3c151 100644 --- a/media/audio/fuchsia/audio_output_stream_fuchsia.cc +++ b/media/audio/fuchsia/audio_output_stream_fuchsia.cc
@@ -8,9 +8,9 @@ #include <lib/sys/cpp/component_context.h> #include <zircon/syscalls.h> -#include "base/bind.h" #include "base/fuchsia/fuchsia_logging.h" #include "base/fuchsia/process_context.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/memory/writable_shared_memory_region.h" #include "media/audio/fuchsia/audio_manager_fuchsia.h"
diff --git a/media/audio/mac/audio_auhal_mac.cc b/media/audio/mac/audio_auhal_mac.cc index 804e1ac..74a4266 100644 --- a/media/audio/mac/audio_auhal_mac.cc +++ b/media/audio/mac/audio_auhal_mac.cc
@@ -12,8 +12,8 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/mac/mac_logging.h" #include "base/metrics/histogram_functions.h"
diff --git a/media/audio/mac/audio_auhal_mac_unittest.cc b/media/audio/mac/audio_auhal_mac_unittest.cc index ba90bd34..ea5fc10 100644 --- a/media/audio/mac/audio_auhal_mac_unittest.cc +++ b/media/audio/mac/audio_auhal_mac_unittest.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 "base/bind.h" +#include "base/functional/bind.h" #include "base/message_loop/message_pump_type.h" #include "base/run_loop.h" #include "base/synchronization/waitable_event.h"
diff --git a/media/audio/mac/audio_device_listener_mac.cc b/media/audio/mac/audio_device_listener_mac.cc index 6c08f8a7..4c02a4d0 100644 --- a/media/audio/mac/audio_device_listener_mac.cc +++ b/media/audio/mac/audio_device_listener_mac.cc
@@ -6,8 +6,8 @@ #include <vector> -#include "base/bind.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/mac/mac_logging.h" #include "base/memory/raw_ptr.h"
diff --git a/media/audio/mac/audio_device_listener_mac.h b/media/audio/mac/audio_device_listener_mac.h index a1c19b5..67dfd8a 100644 --- a/media/audio/mac/audio_device_listener_mac.h +++ b/media/audio/mac/audio_device_listener_mac.h
@@ -11,8 +11,8 @@ #include <memory> #include <utility> -#include "base/callback.h" #include "base/containers/flat_map.h" +#include "base/functional/callback.h" #include "base/threading/thread_checker.h" #include "media/base/media_export.h" #include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/media/audio/mac/audio_device_listener_mac_unittest.cc b/media/audio/mac/audio_device_listener_mac_unittest.cc index 509e4b21..3630bd89 100644 --- a/media/audio/mac/audio_device_listener_mac_unittest.cc +++ b/media/audio/mac/audio_device_listener_mac_unittest.cc
@@ -8,8 +8,8 @@ #include <memory> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "base/task/single_thread_task_runner.h" #include "base/test/task_environment.h"
diff --git a/media/audio/mac/audio_input_mac.cc b/media/audio/mac/audio_input_mac.cc index 852a2b9..3eb0162 100644 --- a/media/audio/mac/audio_input_mac.cc +++ b/media/audio/mac/audio_input_mac.cc
@@ -8,7 +8,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/mac/mac_logging.h" #include "base/metrics/histogram_macros.h"
diff --git a/media/audio/mac/audio_low_latency_input_mac.cc b/media/audio/mac/audio_low_latency_input_mac.cc index fa83b9cd..72b78e9 100644 --- a/media/audio/mac/audio_low_latency_input_mac.cc +++ b/media/audio/mac/audio_low_latency_input_mac.cc
@@ -9,7 +9,7 @@ #include <memory> #include <string> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/mac/foundation_util.h" #include "base/mac/mac_logging.h"
diff --git a/media/audio/mac/audio_low_latency_input_mac_unittest.cc b/media/audio/mac/audio_low_latency_input_mac_unittest.cc index 58d8676..3c3d1c2f 100644 --- a/media/audio/mac/audio_low_latency_input_mac_unittest.cc +++ b/media/audio/mac/audio_low_latency_input_mac_unittest.cc
@@ -6,8 +6,8 @@ #include <memory> -#include "base/bind.h" #include "base/environment.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h"
diff --git a/media/audio/mac/audio_manager_mac.cc b/media/audio/mac/audio_manager_mac.cc index b5ad37cb..b8e7c10 100644 --- a/media/audio/mac/audio_manager_mac.cc +++ b/media/audio/mac/audio_manager_mac.cc
@@ -9,9 +9,9 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/command_line.h" #include "base/containers/flat_set.h" +#include "base/functional/bind.h" #include "base/mac/mac_logging.h" #include "base/mac/mac_util.h" #include "base/mac/scoped_cftyperef.h"
diff --git a/media/audio/mock_audio_manager.cc b/media/audio/mock_audio_manager.cc index daaef3a..23ad9003 100644 --- a/media/audio/mock_audio_manager.cc +++ b/media/audio/mock_audio_manager.cc
@@ -6,9 +6,9 @@ #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/check.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "media/audio/mock_audio_debug_recording_manager.h" #include "media/base/audio_parameters.h"
diff --git a/media/audio/mock_audio_manager.h b/media/audio/mock_audio_manager.h index 2b46355..94e1fee 100644 --- a/media/audio/mock_audio_manager.h +++ b/media/audio/mock_audio_manager.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "media/audio/audio_debug_recording_manager.h" #include "media/audio/audio_manager.h" #include "testing/gmock/include/gmock/gmock.h"
diff --git a/media/audio/null_audio_sink.cc b/media/audio/null_audio_sink.cc index a82d045..bd5a1ce 100644 --- a/media/audio/null_audio_sink.cc +++ b/media/audio/null_audio_sink.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/task/sequenced_task_runner.h" #include "base/task/single_thread_task_runner.h"
diff --git a/media/audio/power_observer_helper.cc b/media/audio/power_observer_helper.cc index b1efe8cf5..2293be9c 100644 --- a/media/audio/power_observer_helper.cc +++ b/media/audio/power_observer_helper.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/power_monitor/power_monitor.h" #include "base/task/sequenced_task_runner.h"
diff --git a/media/audio/power_observer_helper.h b/media/audio/power_observer_helper.h index 46e1527..21c9a60 100644 --- a/media/audio/power_observer_helper.h +++ b/media/audio/power_observer_helper.h
@@ -5,7 +5,7 @@ #ifndef MEDIA_AUDIO_POWER_OBSERVER_HELPER_H_ #define MEDIA_AUDIO_POWER_OBSERVER_HELPER_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/gtest_prod_util.h" #include "base/memory/weak_ptr.h" #include "base/power_monitor/power_observer.h"
diff --git a/media/audio/power_observer_helper_unittest.cc b/media/audio/power_observer_helper_unittest.cc index 5ad44287..7aa76abb 100644 --- a/media/audio/power_observer_helper_unittest.cc +++ b/media/audio/power_observer_helper_unittest.cc
@@ -4,7 +4,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/synchronization/waitable_event.h" #include "base/test/task_environment.h" #include "base/threading/thread.h"
diff --git a/media/audio/scoped_task_runner_observer.cc b/media/audio/scoped_task_runner_observer.cc index ecfa4c6..ffdb56af 100644 --- a/media/audio/scoped_task_runner_observer.cc +++ b/media/audio/scoped_task_runner_observer.cc
@@ -4,7 +4,7 @@ #include "media/audio/scoped_task_runner_observer.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/synchronization/waitable_event.h" #include "base/task/single_thread_task_runner.h"
diff --git a/media/audio/win/audio_device_listener_win.h b/media/audio/win/audio_device_listener_win.h index f605959..d650574 100644 --- a/media/audio/win/audio_device_listener_win.h +++ b/media/audio/win/audio_device_listener_win.h
@@ -11,7 +11,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/threading/thread_checker.h" #include "base/time/time.h"
diff --git a/media/audio/win/audio_device_listener_win_unittest.cc b/media/audio/win/audio_device_listener_win_unittest.cc index 964e726..739792f6 100644 --- a/media/audio/win/audio_device_listener_win_unittest.cc +++ b/media/audio/win/audio_device_listener_win_unittest.cc
@@ -7,8 +7,8 @@ #include <memory> #include <string> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/strings/utf_string_conversions.h" #include "base/system/system_monitor.h" #include "base/test/simple_test_tick_clock.h"
diff --git a/media/audio/win/audio_low_latency_input_win_unittest.cc b/media/audio/win/audio_low_latency_input_win_unittest.cc index a4daa049..4504dedea 100644 --- a/media/audio/win/audio_low_latency_input_win_unittest.cc +++ b/media/audio/win/audio_low_latency_input_win_unittest.cc
@@ -11,9 +11,9 @@ #include <memory> -#include "base/bind.h" #include "base/environment.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/path_service.h" #include "base/run_loop.h"
diff --git a/media/audio/win/audio_low_latency_output_win.cc b/media/audio/win/audio_low_latency_output_win.cc index c9d66cb..8eacf9d 100644 --- a/media/audio/win/audio_low_latency_output_win.cc +++ b/media/audio/win/audio_low_latency_output_win.cc
@@ -12,8 +12,8 @@ #include <climits> #include <memory> -#include "base/callback.h" #include "base/command_line.h" +#include "base/functional/callback.h" #include "base/logging.h" #include "base/metrics/histogram.h" #include "base/metrics/histogram_functions.h"
diff --git a/media/audio/win/audio_manager_win.cc b/media/audio/win/audio_manager_win.cc index ef35a3d..88911a79 100644 --- a/media/audio/win/audio_manager_win.cc +++ b/media/audio/win/audio_manager_win.cc
@@ -15,9 +15,9 @@ #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/strings/string_number_conversions.h" #include "base/win/windows_version.h" #include "media/audio/audio_device_description.h"
diff --git a/media/audio/win/audio_session_event_listener_win.h b/media/audio/win/audio_session_event_listener_win.h index 753ee3d..2591f9c 100644 --- a/media/audio/win/audio_session_event_listener_win.h +++ b/media/audio/win/audio_session_event_listener_win.h
@@ -8,7 +8,7 @@ #include <audiopolicy.h> #include <wrl/client.h> -#include "base/callback.h" +#include "base/functional/callback.h" #include "media/base/media_export.h" namespace media {
diff --git a/media/audio/win/audio_session_event_listener_win_unittest.cc b/media/audio/win/audio_session_event_listener_win_unittest.cc index 7723fc0..c7338fc 100644 --- a/media/audio/win/audio_session_event_listener_win_unittest.cc +++ b/media/audio/win/audio_session_event_listener_win_unittest.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/win/scoped_com_initializer.h" #include "media/audio/audio_unittest_util.h" #include "media/audio/win/core_audio_util_win.h"
diff --git a/media/audio/win/core_audio_util_win.cc b/media/audio/win/core_audio_util_win.cc index 5c84f4f..d4c94d3c0 100644 --- a/media/audio/win/core_audio_util_win.cc +++ b/media/audio/win/core_audio_util_win.cc
@@ -11,9 +11,9 @@ #include <stddef.h> #include <bitset> -#include "base/bind.h" -#include "base/callback.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/logging.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h"
diff --git a/media/base/android/android_cdm_factory.cc b/media/base/android/android_cdm_factory.cc index a6346151..78d8ff3 100644 --- a/media/base/android/android_cdm_factory.cc +++ b/media/base/android/android_cdm_factory.cc
@@ -4,8 +4,8 @@ #include "media/base/android/android_cdm_factory.h" -#include "base/bind.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/metrics/histogram_macros.h" #include "base/strings/string_number_conversions.h"
diff --git a/media/base/android/android_overlay.h b/media/base/android/android_overlay.h index 67c7753..87904a4 100644 --- a/media/base/android/android_overlay.h +++ b/media/base/android/android_overlay.h
@@ -8,7 +8,7 @@ #include <list> #include "base/android/scoped_java_ref.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "media/base/android_overlay_config.h" #include "media/base/media_export.h"
diff --git a/media/base/android/media_codec_bridge_impl.h b/media/base/android/media_codec_bridge_impl.h index df27b74..fcd4e58 100644 --- a/media/base/android/media_codec_bridge_impl.h +++ b/media/base/android/media_codec_bridge_impl.h
@@ -11,7 +11,7 @@ #include <string> #include "base/android/scoped_java_ref.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/time/time.h" #include "media/base/android/media_codec_bridge.h" #include "media/base/android/media_codec_direction.h"
diff --git a/media/base/android/media_codec_loop.cc b/media/base/android/media_codec_loop.cc index 010c5056..3a668f41 100644 --- a/media/base/android/media_codec_loop.cc +++ b/media/base/android/media_codec_loop.cc
@@ -5,8 +5,8 @@ #include "media/base/android/media_codec_loop.h" #include "base/android/build_info.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/task/single_thread_task_runner.h" #include "media/base/bind_to_current_loop.h"
diff --git a/media/base/android/media_crypto_context.h b/media/base/android/media_crypto_context.h index de881085..545aace0 100644 --- a/media/base/android/media_crypto_context.h +++ b/media/base/android/media_crypto_context.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "media/base/android/android_util.h" #include "media/base/media_export.h"
diff --git a/media/base/android/media_drm_bridge.cc b/media/base/android/media_drm_bridge.cc index f547696..5084f648 100644 --- a/media/base/android/media_drm_bridge.cc +++ b/media/base/android/media_drm_bridge.cc
@@ -13,9 +13,9 @@ #include "base/android/build_info.h" #include "base/android/jni_array.h" #include "base/android/jni_string.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/logging.h" #include "base/metrics/histogram_macros.h"
diff --git a/media/base/android/media_drm_bridge.h b/media/base/android/media_drm_bridge.h index 9ffac990..b42da25f 100644 --- a/media/base/android/media_drm_bridge.h +++ b/media/base/android/media_drm_bridge.h
@@ -13,7 +13,7 @@ #include <vector> #include "base/android/scoped_java_ref.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h" #include "base/task/sequenced_task_runner_helpers.h"
diff --git a/media/base/android/media_drm_bridge_factory.cc b/media/base/android/media_drm_bridge_factory.cc index 11054d7ce..7c856695 100644 --- a/media/base/android/media_drm_bridge_factory.cc +++ b/media/base/android/media_drm_bridge_factory.cc
@@ -4,8 +4,8 @@ #include "media/base/android/media_drm_bridge_factory.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "media/base/cdm_config.h" #include "media/base/content_decryption_module.h" #include "third_party/widevine/cdm/widevine_cdm_common.h"
diff --git a/media/base/android/media_drm_bridge_unittest.cc b/media/base/android/media_drm_bridge_unittest.cc index acbf968..45678a8 100644 --- a/media/base/android/media_drm_bridge_unittest.cc +++ b/media/base/android/media_drm_bridge_unittest.cc
@@ -5,8 +5,8 @@ #include <memory> #include "base/android/build_info.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h"
diff --git a/media/base/android/media_drm_storage_bridge.cc b/media/base/android/media_drm_storage_bridge.cc index 2349133..b253609 100644 --- a/media/base/android/media_drm_storage_bridge.cc +++ b/media/base/android/media_drm_storage_bridge.cc
@@ -12,7 +12,7 @@ #include "base/android/callback_android.h" #include "base/android/jni_array.h" #include "base/android/jni_string.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/task/single_thread_task_runner.h" #include "base/unguessable_token.h" #include "media/base/android/android_util.h"
diff --git a/media/base/android/media_drm_storage_bridge.h b/media/base/android/media_drm_storage_bridge.h index 4978359f..2f3b0e3b 100644 --- a/media/base/android/media_drm_storage_bridge.h +++ b/media/base/android/media_drm_storage_bridge.h
@@ -10,7 +10,7 @@ #include <string> #include "base/android/scoped_java_ref.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h" #include "media/base/android/android_util.h"
diff --git a/media/base/android/media_player_bridge.cc b/media/base/android/media_player_bridge.cc index 3eee39f..ad12dda 100644 --- a/media/base/android/media_player_bridge.cc +++ b/media/base/android/media_player_bridge.cc
@@ -10,9 +10,9 @@ #include "base/android/jni_android.h" #include "base/android/jni_string.h" #include "base/android/scoped_java_ref.h" -#include "base/bind.h" #include "base/check_op.h" #include "base/cxx17_backports.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_macros.h" #include "base/notreached.h" #include "base/strings/string_util.h"
diff --git a/media/base/android/media_player_bridge.h b/media/base/android/media_player_bridge.h index a6426d49..9d08747 100644 --- a/media/base/android/media_player_bridge.h +++ b/media/base/android/media_player_bridge.h
@@ -13,7 +13,7 @@ #include <string> #include "base/android/scoped_java_ref.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/time/time.h"
diff --git a/media/base/android/media_player_bridge_unittest.cc b/media/base/android/media_player_bridge_unittest.cc index fdd0171..2041e3d 100644 --- a/media/base/android/media_player_bridge_unittest.cc +++ b/media/base/android/media_player_bridge_unittest.cc
@@ -4,7 +4,7 @@ #include "media/base/android/media_player_bridge.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/test/task_environment.h" #include "net/cookies/site_for_cookies.h" #include "testing/gmock/include/gmock/gmock.h"
diff --git a/media/base/android/media_player_listener.cc b/media/base/android/media_player_listener.cc index 249a329..9d1cfdfc 100644 --- a/media/base/android/media_player_listener.cc +++ b/media/base/android/media_player_listener.cc
@@ -6,8 +6,8 @@ #include "base/android/jni_android.h" #include "base/android/scoped_java_ref.h" -#include "base/bind.h" #include "base/check.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/task/single_thread_task_runner.h" #include "media/base/android/media_jni_headers/MediaPlayerListener_jni.h"
diff --git a/media/base/android/media_resource_getter.h b/media/base/android/media_resource_getter.h index 32712c2..d454657 100644 --- a/media/base/android/media_resource_getter.h +++ b/media/base/android/media_resource_getter.h
@@ -9,7 +9,7 @@ #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/time/time.h" #include "media/base/media_export.h" #include "url/gurl.h"
diff --git a/media/base/android/media_server_crash_listener.h b/media/base/android/media_server_crash_listener.h index 9bdb8471..461bb94 100644 --- a/media/base/android/media_server_crash_listener.h +++ b/media/base/android/media_server_crash_listener.h
@@ -8,8 +8,8 @@ #include <jni.h> #include "base/android/scoped_java_ref.h" -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/task/single_thread_task_runner.h" namespace media {
diff --git a/media/base/android/media_service_throttler.cc b/media/base/android/media_service_throttler.cc index 8acea0cc..a99807e 100644 --- a/media/base/android/media_service_throttler.cc +++ b/media/base/android/media_service_throttler.cc
@@ -6,8 +6,8 @@ #include <memory> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/task/single_thread_task_runner.h" #include "base/time/default_tick_clock.h" #include "media/base/android/media_server_crash_listener.h"
diff --git a/media/base/android/media_service_throttler.h b/media/base/android/media_service_throttler.h index 1bae14a..80d9b800 100644 --- a/media/base/android/media_service_throttler.h +++ b/media/base/android/media_service_throttler.h
@@ -7,8 +7,8 @@ #include <memory> -#include "base/callback_forward.h" #include "base/cancelable_callback.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/task/single_thread_task_runner.h" #include "base/time/tick_clock.h"
diff --git a/media/base/android/mock_android_overlay.cc b/media/base/android/mock_android_overlay.cc index b2155f4..870c402 100644 --- a/media/base/android/mock_android_overlay.cc +++ b/media/base/android/mock_android_overlay.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "testing/gtest/include/gtest/gtest.h" namespace media {
diff --git a/media/base/android/mock_android_overlay.h b/media/base/android/mock_android_overlay.h index cbfbf2d..1a383ee 100644 --- a/media/base/android/mock_android_overlay.h +++ b/media/base/android/mock_android_overlay.h
@@ -7,7 +7,7 @@ #include "media/base/android/android_overlay.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "media/base/android/test_destruction_observable.h" #include "testing/gmock/include/gmock/gmock.h"
diff --git a/media/base/android/test_destruction_observable.cc b/media/base/android/test_destruction_observable.cc index 035e441..8c122c1 100644 --- a/media/base/android/test_destruction_observable.cc +++ b/media/base/android/test_destruction_observable.cc
@@ -4,7 +4,7 @@ #include "media/base/android/test_destruction_observable.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "testing/gtest/include/gtest/gtest.h" namespace media {
diff --git a/media/base/android/test_destruction_observable.h b/media/base/android/test_destruction_observable.h index 5993bf84..4e43417 100644 --- a/media/base/android/test_destruction_observable.h +++ b/media/base/android/test_destruction_observable.h
@@ -5,7 +5,7 @@ #ifndef MEDIA_BASE_ANDROID_TEST_DESTRUCTION_OBSERVABLE_H_ #define MEDIA_BASE_ANDROID_TEST_DESTRUCTION_OBSERVABLE_H_ -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/memory/weak_ptr.h" #include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/media/base/android_overlay_config.h b/media/base/android_overlay_config.h index a9c401d4..4fe5f878 100644 --- a/media/base/android_overlay_config.h +++ b/media/base/android_overlay_config.h
@@ -5,7 +5,7 @@ #ifndef MEDIA_BASE_ANDROID_OVERLAY_CONFIG_H_ #define MEDIA_BASE_ANDROID_OVERLAY_CONFIG_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "media/base/media_export.h" #include "ui/gfx/geometry/rect.h"
diff --git a/media/base/android_overlay_mojo_factory.h b/media/base/android_overlay_mojo_factory.h index ecfd70b1..1118068 100644 --- a/media/base/android_overlay_mojo_factory.h +++ b/media/base/android_overlay_mojo_factory.h
@@ -5,7 +5,7 @@ #ifndef MEDIA_BASE_ANDROID_OVERLAY_MOJO_FACTORY_H_ #define MEDIA_BASE_ANDROID_OVERLAY_MOJO_FACTORY_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/unguessable_token.h" #include "media/base/android_overlay_config.h"
diff --git a/media/base/audio_buffer.cc b/media/base/audio_buffer.cc index accf351..26b036b 100644 --- a/media/base/audio_buffer.cc +++ b/media/base/audio_buffer.cc
@@ -6,7 +6,7 @@ #include <cmath> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/notreached.h" #include "media/base/audio_bus.h"
diff --git a/media/base/audio_bus.h b/media/base/audio_bus.h index 62ab56d..a8b619e 100644 --- a/media/base/audio_bus.h +++ b/media/base/audio_bus.h
@@ -10,7 +10,7 @@ #include <memory> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/aligned_memory.h" #include "media/base/audio_sample_types.h" #include "media/base/media_shmem_export.h"
diff --git a/media/base/audio_converter.cc b/media/base/audio_converter.cc index df839f13..c8a1befd 100644 --- a/media/base/audio_converter.cc +++ b/media/base/audio_converter.cc
@@ -12,9 +12,9 @@ #include <memory> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/trace_event/trace_event.h" #include "media/base/audio_bus.h"
diff --git a/media/base/audio_converter.h b/media/base/audio_converter.h index 26bd7ec..b1cf18a 100644 --- a/media/base/audio_converter.h +++ b/media/base/audio_converter.h
@@ -21,7 +21,7 @@ #include <list> #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "media/base/audio_glitch_info.h" #include "media/base/audio_parameters.h" #include "media/base/media_export.h"
diff --git a/media/base/audio_decoder.h b/media/base/audio_decoder.h index 0cfc33b..76805417 100644 --- a/media/base/audio_decoder.h +++ b/media/base/audio_decoder.h
@@ -5,7 +5,7 @@ #ifndef MEDIA_BASE_AUDIO_DECODER_H_ #define MEDIA_BASE_AUDIO_DECODER_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" #include "media/base/audio_decoder_config.h" #include "media/base/channel_layout.h"
diff --git a/media/base/audio_encoder.h b/media/base/audio_encoder.h index 1426266..f60affa 100644 --- a/media/base/audio_encoder.h +++ b/media/base/audio_encoder.h
@@ -8,7 +8,7 @@ #include <memory> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/sequence_checker.h" #include "base/time/time.h" #include "media/base/audio_bus.h"
diff --git a/media/base/audio_processor_controls.h b/media/base/audio_processor_controls.h index b7c870a..305bb70 100644 --- a/media/base/audio_processor_controls.h +++ b/media/base/audio_processor_controls.h
@@ -5,7 +5,7 @@ #ifndef MEDIA_BASE_AUDIO_PROCESSOR_CONTROLS_H_ #define MEDIA_BASE_AUDIO_PROCESSOR_CONTROLS_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "media/base/media_export.h" #include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/media/base/audio_pull_fifo.h b/media/base/audio_pull_fifo.h index d46cb70..7abc0dd 100644 --- a/media/base/audio_pull_fifo.h +++ b/media/base/audio_pull_fifo.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "media/base/media_export.h" namespace media {
diff --git a/media/base/audio_pull_fifo_unittest.cc b/media/base/audio_pull_fifo_unittest.cc index 382161c5..36db55c 100644 --- a/media/base/audio_pull_fifo_unittest.cc +++ b/media/base/audio_pull_fifo_unittest.cc
@@ -4,8 +4,8 @@ #include <memory> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/strings/stringprintf.h" #include "media/base/audio_bus.h" #include "media/base/audio_pull_fifo.h"
diff --git a/media/base/audio_push_fifo.h b/media/base/audio_push_fifo.h index f0c56af..21e8586f 100644 --- a/media/base/audio_push_fifo.h +++ b/media/base/audio_push_fifo.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "media/base/audio_bus.h" #include "media/base/media_export.h"
diff --git a/media/base/audio_push_fifo_unittest.cc b/media/base/audio_push_fifo_unittest.cc index 4fd4a861..52a137e 100644 --- a/media/base/audio_push_fifo_unittest.cc +++ b/media/base/audio_push_fifo_unittest.cc
@@ -6,8 +6,8 @@ #include <memory> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "media/base/audio_bus.h" #include "media/base/audio_push_fifo.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/media/base/audio_renderer.h b/media/base/audio_renderer.h index 173380d..7a1123e 100644 --- a/media/base/audio_renderer.h +++ b/media/base/audio_renderer.h
@@ -5,7 +5,7 @@ #ifndef MEDIA_BASE_AUDIO_RENDERER_H_ #define MEDIA_BASE_AUDIO_RENDERER_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/time/time.h" #include "media/base/buffering_state.h" #include "media/base/media_export.h"
diff --git a/media/base/audio_renderer_mixer_input.cc b/media/base/audio_renderer_mixer_input.cc index 14519b0..78723dd 100644 --- a/media/base/audio_renderer_mixer_input.cc +++ b/media/base/audio_renderer_mixer_input.cc
@@ -6,8 +6,8 @@ #include <cmath> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/task/sequenced_task_runner.h" #include "base/trace_event/trace_event.h" #include "media/base/audio_renderer_mixer.h"
diff --git a/media/base/audio_renderer_mixer_input.h b/media/base/audio_renderer_mixer_input.h index 46639bd0..9c2ed5a7ff 100644 --- a/media/base/audio_renderer_mixer_input.h +++ b/media/base/audio_renderer_mixer_input.h
@@ -18,7 +18,7 @@ #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/synchronization/lock.h" #include "base/thread_annotations.h"
diff --git a/media/base/audio_renderer_mixer_input_unittest.cc b/media/base/audio_renderer_mixer_input_unittest.cc index 9ac03f44..b609425 100644 --- a/media/base/audio_renderer_mixer_input_unittest.cc +++ b/media/base/audio_renderer_mixer_input_unittest.cc
@@ -5,8 +5,8 @@ #include <stddef.h> #include <memory> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "base/test/task_environment.h" #include "media/base/audio_latency.h"
diff --git a/media/base/audio_renderer_mixer_unittest.cc b/media/base/audio_renderer_mixer_unittest.cc index cda235c..d2d49bc 100644 --- a/media/base/audio_renderer_mixer_unittest.cc +++ b/media/base/audio_renderer_mixer_unittest.cc
@@ -12,8 +12,8 @@ #include <tuple> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/synchronization/waitable_event.h" #include "base/test/task_environment.h"
diff --git a/media/base/audio_renderer_sink.h b/media/base/audio_renderer_sink.h index d2336388..1ece071 100644 --- a/media/base/audio_renderer_sink.h +++ b/media/base/audio_renderer_sink.h
@@ -9,7 +9,7 @@ #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/ref_counted.h" #include "media/base/audio_bus.h" #include "media/base/audio_parameters.h"
diff --git a/media/base/audio_shifter.cc b/media/base/audio_shifter.cc index bbb2785..fdc94b9 100644 --- a/media/base/audio_shifter.cc +++ b/media/base/audio_shifter.cc
@@ -8,9 +8,9 @@ #include <cmath> #include <utility> -#include "base/bind.h" #include "base/containers/circular_deque.h" #include "base/cxx17_backports.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/trace_event/trace_event.h" #include "media/base/audio_bus.h"
diff --git a/media/base/bind_to_current_loop.h b/media/base/bind_to_current_loop.h index 746136e8..42d16df 100644 --- a/media/base/bind_to_current_loop.h +++ b/media/base/bind_to_current_loop.h
@@ -5,7 +5,7 @@ #ifndef MEDIA_BASE_BIND_TO_CURRENT_LOOP_H_ #define MEDIA_BASE_BIND_TO_CURRENT_LOOP_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/location.h" #include "base/task/bind_post_task.h" #include "base/task/sequenced_task_runner.h"
diff --git a/media/base/buffering_state.h b/media/base/buffering_state.h index 134d685..317bfb2c 100644 --- a/media/base/buffering_state.h +++ b/media/base/buffering_state.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" namespace media {
diff --git a/media/base/callback_holder.h b/media/base/callback_holder.h index 3144f1de..b1cc2d41 100644 --- a/media/base/callback_holder.h +++ b/media/base/callback_holder.h
@@ -5,9 +5,9 @@ #ifndef MEDIA_BASE_CALLBACK_HOLDER_H_ #define MEDIA_BASE_CALLBACK_HOLDER_H_ -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" namespace media {
diff --git a/media/base/callback_holder_unittest.cc b/media/base/callback_holder_unittest.cc index c9f13bcf..25ef13b 100644 --- a/media/base/callback_holder_unittest.cc +++ b/media/base/callback_holder_unittest.cc
@@ -4,7 +4,7 @@ #include "media/base/callback_holder.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "testing/gtest/include/gtest/gtest.h" namespace media {
diff --git a/media/base/callback_registry.h b/media/base/callback_registry.h index 85252739..878d9f5 100644 --- a/media/base/callback_registry.h +++ b/media/base/callback_registry.h
@@ -10,7 +10,7 @@ #include <map> #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/logging.h" #include "base/memory/raw_ptr.h" #include "base/synchronization/lock.h"
diff --git a/media/base/callback_registry_unittest.cc b/media/base/callback_registry_unittest.cc index bbeb084..7db7e64 100644 --- a/media/base/callback_registry_unittest.cc +++ b/media/base/callback_registry_unittest.cc
@@ -4,7 +4,7 @@ #include "media/base/callback_registry.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/test/mock_callback.h" #include "base/test/task_environment.h" #include "testing/gmock/include/gmock/gmock.h"
diff --git a/media/base/callback_timeout_helpers.h b/media/base/callback_timeout_helpers.h index 9568d9df..3da31226 100644 --- a/media/base/callback_timeout_helpers.h +++ b/media/base/callback_timeout_helpers.h
@@ -8,8 +8,8 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/ptr_util.h" #include "base/memory/weak_ptr.h" #include "base/sequence_checker.h"
diff --git a/media/base/cdm_callback_promise.cc b/media/base/cdm_callback_promise.cc index 243cfa88..d3fa70a 100644 --- a/media/base/cdm_callback_promise.cc +++ b/media/base/cdm_callback_promise.cc
@@ -4,8 +4,8 @@ #include "media/base/cdm_callback_promise.h" -#include "base/callback_helpers.h" #include "base/check.h" +#include "base/functional/callback_helpers.h" namespace media {
diff --git a/media/base/cdm_callback_promise.h b/media/base/cdm_callback_promise.h index cee0a35..1cbb6c8e9 100644 --- a/media/base/cdm_callback_promise.h +++ b/media/base/cdm_callback_promise.h
@@ -9,7 +9,7 @@ #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "media/base/cdm_promise.h" #include "media/base/media_export.h"
diff --git a/media/base/cdm_context.h b/media/base/cdm_context.h index 94df106..260251b 100644 --- a/media/base/cdm_context.h +++ b/media/base/cdm_context.h
@@ -5,7 +5,7 @@ #ifndef MEDIA_BASE_CDM_CONTEXT_H_ #define MEDIA_BASE_CDM_CONTEXT_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" #include "base/unguessable_token.h" #include "build/build_config.h"
diff --git a/media/base/cdm_initialized_promise.h b/media/base/cdm_initialized_promise.h index 2d82fff..0120652 100644 --- a/media/base/cdm_initialized_promise.h +++ b/media/base/cdm_initialized_promise.h
@@ -7,7 +7,7 @@ #include <stdint.h> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" #include "media/base/cdm_factory.h" #include "media/base/cdm_promise.h"
diff --git a/media/base/cdm_session_tracker.cc b/media/base/cdm_session_tracker.cc index a21dc78..ace6e50d 100644 --- a/media/base/cdm_session_tracker.cc +++ b/media/base/cdm_session_tracker.cc
@@ -4,7 +4,7 @@ #include "media/base/cdm_session_tracker.h" -#include "base/callback.h" +#include "base/functional/callback.h" namespace media {
diff --git a/media/base/content_decryption_module.h b/media/base/content_decryption_module.h index 531b065..99bb2b8 100644 --- a/media/base/content_decryption_module.h +++ b/media/base/content_decryption_module.h
@@ -11,7 +11,7 @@ #include <string> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/ref_counted.h" #include "media/base/cdm_key_information.h" #include "media/base/eme_constants.h"
diff --git a/media/base/converting_audio_fifo.h b/media/base/converting_audio_fifo.h index 10eec98f..731b75a 100644 --- a/media/base/converting_audio_fifo.h +++ b/media/base/converting_audio_fifo.h
@@ -5,8 +5,8 @@ #ifndef MEDIA_BASE_CONVERTING_AUDIO_FIFO_H_ #define MEDIA_BASE_CONVERTING_AUDIO_FIFO_H_ -#include "base/callback.h" #include "base/containers/circular_deque.h" +#include "base/functional/callback.h" #include "base/sequence_checker.h" #include "media/base/audio_converter.h" #include "media/base/audio_parameters.h"
diff --git a/media/base/converting_audio_fifo_unittest.cc b/media/base/converting_audio_fifo_unittest.cc index 04643aa3..0813ae4 100644 --- a/media/base/converting_audio_fifo_unittest.cc +++ b/media/base/converting_audio_fifo_unittest.cc
@@ -9,7 +9,7 @@ #include "base/logging.h" -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/test/bind.h" #include "base/time/time.h"
diff --git a/media/base/data_source.h b/media/base/data_source.h index a261bb2..b86e422f 100644 --- a/media/base/data_source.h +++ b/media/base/data_source.h
@@ -7,7 +7,7 @@ #include <stdint.h> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "media/base/media_export.h" #include "url/gurl.h"
diff --git a/media/base/decryptor.h b/media/base/decryptor.h index de72e07d..5e67e624 100644 --- a/media/base/decryptor.h +++ b/media/base/decryptor.h
@@ -7,7 +7,7 @@ #include <list> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" #include "media/base/audio_buffer.h" #include "media/base/media_export.h"
diff --git a/media/base/demuxer_stream.h b/media/base/demuxer_stream.h index f0a0a6d..d01e266 100644 --- a/media/base/demuxer_stream.h +++ b/media/base/demuxer_stream.h
@@ -7,7 +7,7 @@ #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" #include "media/base/media_export.h" #include "media/base/video_transformation.h"
diff --git a/media/base/fake_audio_renderer_sink.cc b/media/base/fake_audio_renderer_sink.cc index ba33af0..68f4a1c 100644 --- a/media/base/fake_audio_renderer_sink.cc +++ b/media/base/fake_audio_renderer_sink.cc
@@ -4,7 +4,7 @@ #include "media/base/fake_audio_renderer_sink.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/logging.h" #include "base/task/sequenced_task_runner.h"
diff --git a/media/base/fake_audio_worker.cc b/media/base/fake_audio_worker.cc index 000a5e0..109924d 100644 --- a/media/base/fake_audio_worker.cc +++ b/media/base/fake_audio_worker.cc
@@ -6,10 +6,10 @@ #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/cancelable_callback.h" #include "base/check_op.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/synchronization/lock.h" #include "base/task/sequenced_task_runner.h"
diff --git a/media/base/fake_audio_worker.h b/media/base/fake_audio_worker.h index c94be72..ea1afe7 100644 --- a/media/base/fake_audio_worker.h +++ b/media/base/fake_audio_worker.h
@@ -5,7 +5,7 @@ #ifndef MEDIA_BASE_FAKE_AUDIO_WORKER_H_ #define MEDIA_BASE_FAKE_AUDIO_WORKER_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/scoped_refptr.h" #include "base/task/sequenced_task_runner.h" #include "media/base/media_export.h"
diff --git a/media/base/fake_audio_worker_unittest.cc b/media/base/fake_audio_worker_unittest.cc index f46bdeb1..7c7ceb6 100644 --- a/media/base/fake_audio_worker_unittest.cc +++ b/media/base/fake_audio_worker_unittest.cc
@@ -9,7 +9,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/scoped_refptr.h" #include "base/task/single_thread_task_runner.h" #include "base/test/task_environment.h"
diff --git a/media/base/fake_demuxer_stream.cc b/media/base/fake_demuxer_stream.cc index 2f0f4d3..9151013 100644 --- a/media/base/fake_demuxer_stream.cc +++ b/media/base/fake_demuxer_stream.cc
@@ -9,9 +9,9 @@ #include <memory> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/check_op.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/notreached.h" #include "base/task/single_thread_task_runner.h"
diff --git a/media/base/fake_demuxer_stream_unittest.cc b/media/base/fake_demuxer_stream_unittest.cc index 27ecf6c4..02206943 100644 --- a/media/base/fake_demuxer_stream_unittest.cc +++ b/media/base/fake_demuxer_stream_unittest.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/test/task_environment.h" #include "media/base/decoder_buffer.h"
diff --git a/media/base/fake_single_thread_task_runner.h b/media/base/fake_single_thread_task_runner.h index 275bcbaa..2765cae 100644 --- a/media/base/fake_single_thread_task_runner.h +++ b/media/base/fake_single_thread_task_runner.h
@@ -7,7 +7,7 @@ #include <map> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/task/single_thread_task_runner.h" #include "base/test/simple_test_tick_clock.h"
diff --git a/media/base/fake_text_track_stream.cc b/media/base/fake_text_track_stream.cc index fac4d15..0058058 100644 --- a/media/base/fake_text_track_stream.cc +++ b/media/base/fake_text_track_stream.cc
@@ -6,8 +6,8 @@ #include <stdint.h> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/task/single_thread_task_runner.h" #include "media/base/decoder_buffer.h" #include "media/base/webvtt_util.h"
diff --git a/media/base/key_system_info.h b/media/base/key_system_info.h index 416fe45..529ece2 100644 --- a/media/base/key_system_info.h +++ b/media/base/key_system_info.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "build/build_config.h" #include "media/base/decrypt_config.h" #include "media/base/eme_constants.h"
diff --git a/media/base/key_systems.cc b/media/base/key_systems.cc index bf7c68ba..7d0d480 100644 --- a/media/base/key_systems.cc +++ b/media/base/key_systems.cc
@@ -9,9 +9,9 @@ #include <memory> #include <unordered_map> -#include "base/callback_helpers.h" #include "base/callback_list.h" #include "base/cxx17_backports.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/memory/weak_ptr.h" #include "base/no_destructor.h"
diff --git a/media/base/key_systems.h b/media/base/key_systems.h index 2edc4d2..6965b8e 100644 --- a/media/base/key_systems.h +++ b/media/base/key_systems.h
@@ -10,7 +10,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "media/base/decrypt_config.h" #include "media/base/eme_constants.h" #include "media/base/media_export.h"
diff --git a/media/base/mac/video_frame_mac_unittests.cc b/media/base/mac/video_frame_mac_unittests.cc index 8ccb45e1..622bd51e 100644 --- a/media/base/mac/video_frame_mac_unittests.cc +++ b/media/base/mac/video_frame_mac_unittests.cc
@@ -8,8 +8,8 @@ #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "media/base/video_frame.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/media/base/media_drm_storage.h b/media/base/media_drm_storage.h index f3c7f68..7d1f5de 100644 --- a/media/base/media_drm_storage.h +++ b/media/base/media_drm_storage.h
@@ -11,7 +11,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "media/base/media_drm_key_type.h" #include "media/base/media_export.h"
diff --git a/media/base/media_permission.h b/media/base/media_permission.h index 99df419..42b30ca 100644 --- a/media/base/media_permission.h +++ b/media/base/media_permission.h
@@ -5,7 +5,7 @@ #ifndef MEDIA_BASE_MEDIA_PERMISSION_H_ #define MEDIA_BASE_MEDIA_PERMISSION_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "media/base/media_export.h" namespace media {
diff --git a/media/base/media_status.h b/media/base/media_status.h index 06129048..4335116c 100644 --- a/media/base/media_status.h +++ b/media/base/media_status.h
@@ -5,7 +5,7 @@ #ifndef MEDIA_BASE_MEDIA_STATUS_H_ #define MEDIA_BASE_MEDIA_STATUS_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/time/time.h" #include "media/base/media_export.h"
diff --git a/media/base/media_tracks.cc b/media/base/media_tracks.cc index 2576361..a7b1bcc 100644 --- a/media/base/media_tracks.cc +++ b/media/base/media_tracks.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/no_destructor.h" #include "media/base/audio_decoder_config.h" #include "media/base/video_decoder_config.h"
diff --git a/media/base/media_url_demuxer.cc b/media/base/media_url_demuxer.cc index cdb46e1..94ff74ff 100644 --- a/media/base/media_url_demuxer.cc +++ b/media/base/media_url_demuxer.cc
@@ -4,7 +4,7 @@ #include "media/base/media_url_demuxer.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/task/sequenced_task_runner.h" #include "base/task/single_thread_task_runner.h"
diff --git a/media/base/media_url_demuxer.h b/media/base/media_url_demuxer.h index 8a7b0f4..97e3740 100644 --- a/media/base/media_url_demuxer.h +++ b/media/base/media_url_demuxer.h
@@ -7,7 +7,7 @@ #include <stddef.h> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/task/sequenced_task_runner.h"
diff --git a/media/base/media_url_demuxer_unittest.cc b/media/base/media_url_demuxer_unittest.cc index 16be246..514d6ebd 100644 --- a/media/base/media_url_demuxer_unittest.cc +++ b/media/base/media_url_demuxer_unittest.cc
@@ -6,8 +6,8 @@ #include <memory> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "base/task/single_thread_task_runner.h" #include "base/test/task_environment.h"
diff --git a/media/base/mock_audio_renderer_sink.cc b/media/base/mock_audio_renderer_sink.cc index e0efaab..29fc0cf 100644 --- a/media/base/mock_audio_renderer_sink.cc +++ b/media/base/mock_audio_renderer_sink.cc
@@ -4,7 +4,7 @@ #include "media/base/mock_audio_renderer_sink.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/task/sequenced_task_runner.h" namespace media {
diff --git a/media/base/mock_filters.h b/media/base/mock_filters.h index 04afce8..43bc904 100644 --- a/media/base/mock_filters.h +++ b/media/base/mock_filters.h
@@ -11,7 +11,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/task/sequenced_task_runner.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h"
diff --git a/media/base/multi_channel_resampler.cc b/media/base/multi_channel_resampler.cc index d7ce47b..8610b08 100644 --- a/media/base/multi_channel_resampler.cc +++ b/media/base/multi_channel_resampler.cc
@@ -7,9 +7,9 @@ #include <algorithm> #include <memory> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/check_op.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "media/base/audio_bus.h" namespace media {
diff --git a/media/base/multi_channel_resampler.h b/media/base/multi_channel_resampler.h index 9d3c4bd..8527d84 100644 --- a/media/base/multi_channel_resampler.h +++ b/media/base/multi_channel_resampler.h
@@ -10,7 +10,7 @@ #include <memory> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "media/base/sinc_resampler.h" namespace media {
diff --git a/media/base/multi_channel_resampler_unittest.cc b/media/base/multi_channel_resampler_unittest.cc index b106375d..8411e717 100644 --- a/media/base/multi_channel_resampler_unittest.cc +++ b/media/base/multi_channel_resampler_unittest.cc
@@ -7,8 +7,8 @@ #include <cmath> #include <memory> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "media/base/audio_bus.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/media/base/null_video_sink.cc b/media/base/null_video_sink.cc index d1b0f86c..1f69f9d 100644 --- a/media/base/null_video_sink.cc +++ b/media/base/null_video_sink.cc
@@ -4,8 +4,8 @@ #include "media/base/null_video_sink.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/task/single_thread_task_runner.h"
diff --git a/media/base/null_video_sink_unittest.cc b/media/base/null_video_sink_unittest.cc index 47a301b..0b8218c3 100644 --- a/media/base/null_video_sink_unittest.cc +++ b/media/base/null_video_sink_unittest.cc
@@ -4,8 +4,8 @@ #include <memory> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/test/gmock_callback_support.h" #include "base/test/simple_test_tick_clock.h" #include "base/test/task_environment.h"
diff --git a/media/base/offloading_audio_encoder_unittest.cc b/media/base/offloading_audio_encoder_unittest.cc index 243bf97..4c10cd9 100644 --- a/media/base/offloading_audio_encoder_unittest.cc +++ b/media/base/offloading_audio_encoder_unittest.cc
@@ -5,8 +5,8 @@ #include <memory> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/task/sequenced_task_runner.h"
diff --git a/media/base/output_device_info.h b/media/base/output_device_info.h index 7387896..09cb94c6 100644 --- a/media/base/output_device_info.h +++ b/media/base/output_device_info.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "media/base/audio_parameters.h" #include "media/base/media_export.h"
diff --git a/media/base/overlay_info.h b/media/base/overlay_info.h index 88b0b22..00f4e345 100644 --- a/media/base/overlay_info.h +++ b/media/base/overlay_info.h
@@ -5,7 +5,7 @@ #ifndef MEDIA_BASE_OVERLAY_INFO_H_ #define MEDIA_BASE_OVERLAY_INFO_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/unguessable_token.h" #include "media/base/media_export.h" #include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/media/base/pipeline_impl.cc b/media/base/pipeline_impl.cc index 8d8b6e95..ec1895ec 100644 --- a/media/base/pipeline_impl.cc +++ b/media/base/pipeline_impl.cc
@@ -8,10 +8,10 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/memory/raw_ptr.h" #include "base/metrics/histogram_macros.h"
diff --git a/media/base/pipeline_impl_unittest.cc b/media/base/pipeline_impl_unittest.cc index 002f2bb0..56e5aba 100644 --- a/media/base/pipeline_impl_unittest.cc +++ b/media/base/pipeline_impl_unittest.cc
@@ -9,7 +9,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h"
diff --git a/media/base/pipeline_status.h b/media/base/pipeline_status.h index b9858492..cd3097f 100644 --- a/media/base/pipeline_status.h +++ b/media/base/pipeline_status.h
@@ -9,7 +9,7 @@ #include <iosfwd> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/time/time.h" #include "media/base/decoder.h" #include "media/base/media_export.h"
diff --git a/media/base/provision_fetcher.h b/media/base/provision_fetcher.h index 9a073997..db2a480 100644 --- a/media/base/provision_fetcher.h +++ b/media/base/provision_fetcher.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "url/gurl.h" namespace media {
diff --git a/media/base/renderer.h b/media/base/renderer.h index 75276fc0..65d3036f 100644 --- a/media/base/renderer.h +++ b/media/base/renderer.h
@@ -5,7 +5,7 @@ #ifndef MEDIA_BASE_RENDERER_H_ #define MEDIA_BASE_RENDERER_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/time/time.h" #include "media/base/buffering_state.h" #include "media/base/demuxer_stream.h"
diff --git a/media/base/renderer_factory_selector.h b/media/base/renderer_factory_selector.h index 7ca640a..5ab0db1 100644 --- a/media/base/renderer_factory_selector.h +++ b/media/base/renderer_factory_selector.h
@@ -7,7 +7,7 @@ #include <map> -#include "base/callback.h" +#include "base/functional/callback.h" #include "build/build_config.h" #include "media/base/media_export.h" #include "media/base/media_status.h"
diff --git a/media/base/renderer_factory_selector_unittest.cc b/media/base/renderer_factory_selector_unittest.cc index 719c836..69a4a8b8 100644 --- a/media/base/renderer_factory_selector_unittest.cc +++ b/media/base/renderer_factory_selector_unittest.cc
@@ -4,7 +4,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/task/sequenced_task_runner.h" #include "media/base/overlay_info.h" #include "media/base/renderer_factory_selector.h"
diff --git a/media/base/routing_token_callback.h b/media/base/routing_token_callback.h index 66032605..2630d69 100644 --- a/media/base/routing_token_callback.h +++ b/media/base/routing_token_callback.h
@@ -5,7 +5,7 @@ #ifndef MEDIA_BASE_ROUTING_TOKEN_CALLBACK_H_ #define MEDIA_BASE_ROUTING_TOKEN_CALLBACK_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/unguessable_token.h" namespace media {
diff --git a/media/base/run_all_perftests.cc b/media/base/run_all_perftests.cc index ba1663f..39aee4a7 100644 --- a/media/base/run_all_perftests.cc +++ b/media/base/run_all_perftests.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 "base/bind.h" +#include "base/functional/bind.h" #include "base/test/launcher/unit_test_launcher.h" #include "base/test/test_suite.h" #include "build/build_config.h"
diff --git a/media/base/serial_runner.cc b/media/base/serial_runner.cc index 80106a8..207ed09 100644 --- a/media/base/serial_runner.cc +++ b/media/base/serial_runner.cc
@@ -4,8 +4,8 @@ #include "media/base/serial_runner.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/task/sequenced_task_runner.h" #include "base/task/single_thread_task_runner.h"
diff --git a/media/base/serial_runner.h b/media/base/serial_runner.h index d1c9487..d288f597 100644 --- a/media/base/serial_runner.h +++ b/media/base/serial_runner.h
@@ -7,8 +7,8 @@ #include <memory> -#include "base/callback.h" #include "base/containers/circular_deque.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h" #include "base/task/sequenced_task_runner.h"
diff --git a/media/base/serial_runner_unittest.cc b/media/base/serial_runner_unittest.cc index e3e4a40d..eaff6be1 100644 --- a/media/base/serial_runner_unittest.cc +++ b/media/base/serial_runner_unittest.cc
@@ -5,8 +5,8 @@ #include <stddef.h> #include <memory> -#include "base/bind.h" #include "base/debug/stack_trace.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/task/single_thread_task_runner.h" #include "base/test/task_environment.h"
diff --git a/media/base/silent_sink_suspender.cc b/media/base/silent_sink_suspender.cc index 2f74573..bfb76d89 100644 --- a/media/base/silent_sink_suspender.cc +++ b/media/base/silent_sink_suspender.cc
@@ -4,7 +4,7 @@ #include "media/base/silent_sink_suspender.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/task/single_thread_task_runner.h" #include "media/base/audio_glitch_info.h"
diff --git a/media/base/simple_watch_timer.h b/media/base/simple_watch_timer.h index 152ff7d..7be8a4b 100644 --- a/media/base/simple_watch_timer.h +++ b/media/base/simple_watch_timer.h
@@ -5,7 +5,7 @@ #ifndef MEDIA_BASE_SIMPLE_WATCH_TIMER_H_ #define MEDIA_BASE_SIMPLE_WATCH_TIMER_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/time/time.h" #include "base/timer/timer.h" #include "media/base/media_export.h"
diff --git a/media/base/sinc_resampler.h b/media/base/sinc_resampler.h index 5ba1ada..88774a97 100644 --- a/media/base/sinc_resampler.h +++ b/media/base/sinc_resampler.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/gtest_prod_util.h" #include "base/memory/aligned_memory.h" #include "base/memory/raw_ptr.h"
diff --git a/media/base/sinc_resampler_perftest.cc b/media/base/sinc_resampler_perftest.cc index 122e696..da43f55 100644 --- a/media/base/sinc_resampler_perftest.cc +++ b/media/base/sinc_resampler_perftest.cc
@@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/cpu.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/time/time.h" #include "build/build_config.h" #include "media/base/sinc_resampler.h"
diff --git a/media/base/sinc_resampler_unittest.cc b/media/base/sinc_resampler_unittest.cc index f77053c..fdcb12c 100644 --- a/media/base/sinc_resampler_unittest.cc +++ b/media/base/sinc_resampler_unittest.cc
@@ -4,8 +4,8 @@ #include <memory> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/numerics/math_constants.h" #include "base/strings/string_number_conversions.h" #include "base/time/time.h"
diff --git a/media/base/speech_recognition_client.h b/media/base/speech_recognition_client.h index 6182c2e..d433ef4 100644 --- a/media/base/speech_recognition_client.h +++ b/media/base/speech_recognition_client.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "media/base/audio_buffer.h" #include "media/base/audio_bus.h" #include "media/base/media_export.h"
diff --git a/media/base/stream_parser.h b/media/base/stream_parser.h index e582b9a4..81b867d 100644 --- a/media/base/stream_parser.h +++ b/media/base/stream_parser.h
@@ -12,8 +12,8 @@ #include <memory> #include <vector> -#include "base/callback_forward.h" #include "base/containers/circular_deque.h" +#include "base/functional/callback_forward.h" #include "base/memory/scoped_refptr.h" #include "base/time/time.h" #include "media/base/demuxer_stream.h"
diff --git a/media/base/test_helpers.cc b/media/base/test_helpers.cc index bb991588..871d6df 100644 --- a/media/base/test_helpers.cc +++ b/media/base/test_helpers.cc
@@ -8,8 +8,8 @@ #include <memory> -#include "base/bind.h" #include "base/check_op.h" +#include "base/functional/bind.h" #include "base/notreached.h" #include "base/pickle.h" #include "base/run_loop.h"
diff --git a/media/base/test_helpers.h b/media/base/test_helpers.h index 6c8e95b..1f05c20 100644 --- a/media/base/test_helpers.h +++ b/media/base/test_helpers.h
@@ -8,7 +8,7 @@ #include <stddef.h> #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" #include "base/sequence_checker.h" #include "base/strings/string_number_conversions.h"
diff --git a/media/base/text_renderer.cc b/media/base/text_renderer.cc index e970f5ba..f2d6ac8 100644 --- a/media/base/text_renderer.cc +++ b/media/base/text_renderer.cc
@@ -8,9 +8,9 @@ #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/check_op.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/notreached.h" #include "base/task/single_thread_task_runner.h" #include "media/base/bind_to_current_loop.h"
diff --git a/media/base/text_renderer.h b/media/base/text_renderer.h index b1fd5bd..99942ce 100644 --- a/media/base/text_renderer.h +++ b/media/base/text_renderer.h
@@ -9,7 +9,7 @@ #include <memory> #include <set> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "media/base/demuxer_stream.h" #include "media/base/media_export.h"
diff --git a/media/base/text_renderer_unittest.cc b/media/base/text_renderer_unittest.cc index 294f4253..f326c16f 100644 --- a/media/base/text_renderer_unittest.cc +++ b/media/base/text_renderer_unittest.cc
@@ -9,8 +9,8 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "base/test/task_environment.h" #include "base/time/time.h"
diff --git a/media/base/text_track.h b/media/base/text_track.h index abe4970..9e712f6 100644 --- a/media/base/text_track.h +++ b/media/base/text_track.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/time/time.h" namespace media {
diff --git a/media/base/time_source.h b/media/base/time_source.h index 3dc2b8a..b5a429dd 100644 --- a/media/base/time_source.h +++ b/media/base/time_source.h
@@ -7,7 +7,7 @@ #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/time/time.h" #include "media/base/media_export.h"
diff --git a/media/base/user_input_monitor_linux.cc b/media/base/user_input_monitor_linux.cc index 3fc7a43f..5320828 100644 --- a/media/base/user_input_monitor_linux.cc +++ b/media/base/user_input_monitor_linux.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/task/single_thread_task_runner.h" #include "ui/ozone/public/ozone_platform.h"
diff --git a/media/base/user_input_monitor_win.cc b/media/base/user_input_monitor_win.cc index 56c9f5e..957818c 100644 --- a/media/base/user_input_monitor_win.cc +++ b/media/base/user_input_monitor_win.cc
@@ -8,7 +8,7 @@ #include <stdint.h> #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/logging.h" #include "base/memory/raw_ptr.h"
diff --git a/media/base/video_encoder.h b/media/base/video_encoder.h index 83456ee..5abc201 100644 --- a/media/base/video_encoder.h +++ b/media/base/video_encoder.h
@@ -5,7 +5,7 @@ #ifndef MEDIA_BASE_VIDEO_ENCODER_H_ #define MEDIA_BASE_VIDEO_ENCODER_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/time/time.h" #include "media/base/bind_to_current_loop.h" #include "media/base/bitrate.h"
diff --git a/media/base/video_frame.cc b/media/base/video_frame.cc index 56dca1c..e8c3e2b0 100644 --- a/media/base/video_frame.cc +++ b/media/base/video_frame.cc
@@ -13,9 +13,9 @@ #include <numeric> #include <utility> -#include "base/bind.h" #include "base/bits.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/process/memory.h" #include "base/strings/string_piece.h"
diff --git a/media/base/video_frame.h b/media/base/video_frame.h index bba57d6..9e8ff2a 100644 --- a/media/base/video_frame.h +++ b/media/base/video_frame.h
@@ -13,8 +13,8 @@ #include <utility> #include <vector> -#include "base/callback.h" #include "base/check_op.h" +#include "base/functional/callback.h" #include "base/hash/md5.h" #include "base/memory/raw_ptr.h" #include "base/memory/read_only_shared_memory_region.h"
diff --git a/media/base/video_frame_pool.cc b/media/base/video_frame_pool.cc index ec53bad..b1a42377 100644 --- a/media/base/video_frame_pool.cc +++ b/media/base/video_frame_pool.cc
@@ -4,8 +4,8 @@ #include "media/base/video_frame_pool.h" -#include "base/bind.h" #include "base/containers/circular_deque.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h"
diff --git a/media/base/video_frame_unittest.cc b/media/base/video_frame_unittest.cc index 2b8b48e6..c34c439 100644 --- a/media/base/video_frame_unittest.cc +++ b/media/base/video_frame_unittest.cc
@@ -9,9 +9,9 @@ #include <memory> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/format_macros.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/aligned_memory.h" #include "base/memory/read_only_shared_memory_region.h" #include "base/strings/stringprintf.h"
diff --git a/media/base/video_renderer.h b/media/base/video_renderer.h index 1a5a9fa..d4a84a4 100644 --- a/media/base/video_renderer.h +++ b/media/base/video_renderer.h
@@ -5,7 +5,7 @@ #ifndef MEDIA_BASE_VIDEO_RENDERER_H_ #define MEDIA_BASE_VIDEO_RENDERER_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "media/base/media_export.h" #include "media/base/pipeline_status.h" #include "media/base/time_source.h"
diff --git a/media/base/video_thumbnail_decoder.cc b/media/base/video_thumbnail_decoder.cc index a6d8e096..ff18d6b 100644 --- a/media/base/video_thumbnail_decoder.cc +++ b/media/base/video_thumbnail_decoder.cc
@@ -4,8 +4,8 @@ #include "media/base/video_thumbnail_decoder.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "media/base/decoder_buffer.h" #include "media/base/video_frame.h"
diff --git a/media/base/video_thumbnail_decoder.h b/media/base/video_thumbnail_decoder.h index f7eec96..612b8bb 100644 --- a/media/base/video_thumbnail_decoder.h +++ b/media/base/video_thumbnail_decoder.h
@@ -8,7 +8,7 @@ #include <memory> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h" #include "media/base/media_export.h"
diff --git a/media/base/video_thumbnail_decoder_unittest.cc b/media/base/video_thumbnail_decoder_unittest.cc index e6856860..549c8de 100644 --- a/media/base/video_thumbnail_decoder_unittest.cc +++ b/media/base/video_thumbnail_decoder_unittest.cc
@@ -5,8 +5,8 @@ #include <memory> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/test/gmock_callback_support.h"
diff --git a/media/base/video_util.cc b/media/base/video_util.cc index 835b0ef..c9e47e7 100644 --- a/media/base/video_util.cc +++ b/media/base/video_util.cc
@@ -6,10 +6,10 @@ #include <cmath> -#include "base/bind.h" #include "base/bits.h" -#include "base/callback_helpers.h" #include "base/check_op.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/notreached.h" #include "base/numerics/safe_conversions.h"
diff --git a/media/base/waiting.h b/media/base/waiting.h index ec09d828..9ea0df4 100644 --- a/media/base/waiting.h +++ b/media/base/waiting.h
@@ -5,7 +5,7 @@ #ifndef MEDIA_BASE_WAITING_H_ #define MEDIA_BASE_WAITING_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" namespace media {
diff --git a/media/base/win/dcomp_texture_wrapper.h b/media/base/win/dcomp_texture_wrapper.h index 511621c..44aee4b 100644 --- a/media/base/win/dcomp_texture_wrapper.h +++ b/media/base/win/dcomp_texture_wrapper.h
@@ -5,7 +5,7 @@ #ifndef MEDIA_BASE_WIN_DCOMP_TEXTURE_WRAPPER_H_ #define MEDIA_BASE_WIN_DCOMP_TEXTURE_WRAPPER_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/unguessable_token.h" #include "ui/gfx/gpu_memory_buffer.h"
diff --git a/media/base/win/overlay_state_observer_subscription.h b/media/base/win/overlay_state_observer_subscription.h index 2a9ce8d..bcec257 100644 --- a/media/base/win/overlay_state_observer_subscription.h +++ b/media/base/win/overlay_state_observer_subscription.h
@@ -5,7 +5,7 @@ #ifndef MEDIA_BASE_WIN_OVERLAY_STATE_OBSERVER_SUBSCRIPTION_H_ #define MEDIA_BASE_WIN_OVERLAY_STATE_OBSERVER_SUBSCRIPTION_H_ -#include "base/callback.h" +#include "base/functional/callback.h" namespace gpu { struct Mailbox;
diff --git a/media/capabilities/in_memory_video_decode_stats_db_impl.cc b/media/capabilities/in_memory_video_decode_stats_db_impl.cc index 6ba99b5a..7f2534f8 100644 --- a/media/capabilities/in_memory_video_decode_stats_db_impl.cc +++ b/media/capabilities/in_memory_video_decode_stats_db_impl.cc
@@ -7,9 +7,9 @@ #include <memory> #include <tuple> -#include "base/bind.h" #include "base/files/file_path.h" #include "base/format_macros.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/metrics/histogram_macros.h" #include "base/sequence_checker.h"
diff --git a/media/capabilities/in_memory_video_decode_stats_db_unittest.cc b/media/capabilities/in_memory_video_decode_stats_db_unittest.cc index 745863e..822ce7b 100644 --- a/media/capabilities/in_memory_video_decode_stats_db_unittest.cc +++ b/media/capabilities/in_memory_video_decode_stats_db_unittest.cc
@@ -4,9 +4,9 @@ #include <memory> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/check_op.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ptr_util.h" #include "base/test/gtest_util.h" #include "base/test/task_environment.h"
diff --git a/media/capabilities/pending_operations.cc b/media/capabilities/pending_operations.cc index 0cd8066..99fa130 100644 --- a/media/capabilities/pending_operations.cc +++ b/media/capabilities/pending_operations.cc
@@ -6,7 +6,7 @@ #include <string> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/metrics/histogram_functions.h" #include "base/task/single_thread_task_runner.h"
diff --git a/media/capabilities/pending_operations_unittest.cc b/media/capabilities/pending_operations_unittest.cc index 2af3fdb3..05cbadfd 100644 --- a/media/capabilities/pending_operations_unittest.cc +++ b/media/capabilities/pending_operations_unittest.cc
@@ -4,7 +4,7 @@ #include <string> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/task_environment.h" #include "base/time/time.h"
diff --git a/media/capabilities/video_decode_stats_db.h b/media/capabilities/video_decode_stats_db.h index 5df12e6d..f58b6ca 100644 --- a/media/capabilities/video_decode_stats_db.h +++ b/media/capabilities/video_decode_stats_db.h
@@ -8,8 +8,8 @@ #include <memory> #include <string> -#include "base/callback_forward.h" #include "base/check.h" +#include "base/functional/callback_forward.h" #include "media/base/media_export.h" #include "media/base/video_codecs.h" #include "ui/gfx/geometry/size.h"
diff --git a/media/capabilities/video_decode_stats_db_impl.cc b/media/capabilities/video_decode_stats_db_impl.cc index 0638f60..b498ea7f7 100644 --- a/media/capabilities/video_decode_stats_db_impl.cc +++ b/media/capabilities/video_decode_stats_db_impl.cc
@@ -8,9 +8,9 @@ #include <string> #include <tuple> -#include "base/bind.h" #include "base/debug/alias.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/memory/ptr_util.h" #include "base/metrics/field_trial_params.h"
diff --git a/media/capabilities/video_decode_stats_db_impl_unittest.cc b/media/capabilities/video_decode_stats_db_impl_unittest.cc index cd33fcff..2d374b0 100644 --- a/media/capabilities/video_decode_stats_db_impl_unittest.cc +++ b/media/capabilities/video_decode_stats_db_impl_unittest.cc
@@ -5,11 +5,11 @@ #include <map> #include <memory> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/check.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h"
diff --git a/media/capabilities/video_decode_stats_db_provider.h b/media/capabilities/video_decode_stats_db_provider.h index 649541bc..3940281 100644 --- a/media/capabilities/video_decode_stats_db_provider.h +++ b/media/capabilities/video_decode_stats_db_provider.h
@@ -5,7 +5,7 @@ #ifndef MEDIA_CAPABILITIES_VIDEO_DECODE_STATS_DB_PROVIDER_H_ #define MEDIA_CAPABILITIES_VIDEO_DECODE_STATS_DB_PROVIDER_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "media/base/media_export.h" namespace media {
diff --git a/media/capabilities/webrtc_video_stats_db.h b/media/capabilities/webrtc_video_stats_db.h index e9687cf..3305521 100644 --- a/media/capabilities/webrtc_video_stats_db.h +++ b/media/capabilities/webrtc_video_stats_db.h
@@ -9,9 +9,9 @@ #include <string> #include <vector> -#include "base/callback_forward.h" #include "base/check.h" #include "base/containers/flat_map.h" +#include "base/functional/callback_forward.h" #include "base/time/time.h" #include "media/base/media_export.h" #include "media/base/video_codecs.h"
diff --git a/media/capabilities/webrtc_video_stats_db_impl.cc b/media/capabilities/webrtc_video_stats_db_impl.cc index 2fd1b7d..d9764616 100644 --- a/media/capabilities/webrtc_video_stats_db_impl.cc +++ b/media/capabilities/webrtc_video_stats_db_impl.cc
@@ -8,9 +8,9 @@ #include <string> #include <tuple> -#include "base/bind.h" #include "base/debug/alias.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/memory/ptr_util.h" #include "base/metrics/field_trial_params.h"
diff --git a/media/capabilities/webrtc_video_stats_db_impl_unittest.cc b/media/capabilities/webrtc_video_stats_db_impl_unittest.cc index babb4b03..064139c 100644 --- a/media/capabilities/webrtc_video_stats_db_impl_unittest.cc +++ b/media/capabilities/webrtc_video_stats_db_impl_unittest.cc
@@ -5,11 +5,11 @@ #include <map> #include <memory> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/check.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h"
diff --git a/media/capabilities/webrtc_video_stats_db_provider.h b/media/capabilities/webrtc_video_stats_db_provider.h index d1927d5..94a30bb 100644 --- a/media/capabilities/webrtc_video_stats_db_provider.h +++ b/media/capabilities/webrtc_video_stats_db_provider.h
@@ -5,7 +5,7 @@ #ifndef MEDIA_CAPABILITIES_WEBRTC_VIDEO_STATS_DB_PROVIDER_H_ #define MEDIA_CAPABILITIES_WEBRTC_VIDEO_STATS_DB_PROVIDER_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "media/base/media_export.h" namespace media {
diff --git a/media/capture/content/android/thread_safe_capture_oracle.cc b/media/capture/content/android/thread_safe_capture_oracle.cc index cbbbd367..5d76242 100644 --- a/media/capture/content/android/thread_safe_capture_oracle.cc +++ b/media/capture/content/android/thread_safe_capture_oracle.cc
@@ -9,8 +9,8 @@ #include <memory> #include <utility> -#include "base/bind.h" #include "base/bits.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/numerics/safe_conversions.h" #include "base/time/time.h"
diff --git a/media/capture/content/screen_enumerator.h b/media/capture/content/screen_enumerator.h index a28dd48b..5f41b14 100644 --- a/media/capture/content/screen_enumerator.h +++ b/media/capture/content/screen_enumerator.h
@@ -5,7 +5,7 @@ #ifndef MEDIA_CAPTURE_CONTENT_SCREEN_ENUMERATOR_H_ #define MEDIA_CAPTURE_CONTENT_SCREEN_ENUMERATOR_H_ -#include "base/callback.h" +#include "base/functional/callback.h" namespace blink::mojom { class StreamDevicesSet;
diff --git a/media/capture/content/video_capture_oracle.cc b/media/capture/content/video_capture_oracle.cc index 1e9cd2de..7160b29 100644 --- a/media/capture/content/video_capture_oracle.cc +++ b/media/capture/content/video_capture_oracle.cc
@@ -8,9 +8,9 @@ #include <limits> #include <utility> -#include "base/callback.h" #include "base/compiler_specific.h" #include "base/format_macros.h" +#include "base/functional/callback.h" #include "base/logging.h" #include "base/numerics/safe_conversions.h" #include "base/strings/stringprintf.h"
diff --git a/media/capture/content/video_capture_oracle.h b/media/capture/content/video_capture_oracle.h index 78d87014..ecd42fc1 100644 --- a/media/capture/content/video_capture_oracle.h +++ b/media/capture/content/video_capture_oracle.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/time/time.h" #include "media/base/feedback_signal_accumulator.h" #include "media/capture/capture_export.h"
diff --git a/media/capture/run_all_unittests.cc b/media/capture/run_all_unittests.cc index 1a09d26..9b32da1 100644 --- a/media/capture/run_all_unittests.cc +++ b/media/capture/run_all_unittests.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/message_loop/message_pump_type.h" #include "base/test/launcher/unit_test_launcher.h"
diff --git a/media/capture/video/android/video_capture_device_android.cc b/media/capture/video/android/video_capture_device_android.cc index cefadded..cd22cf36 100644 --- a/media/capture/video/android/video_capture_device_android.cc +++ b/media/capture/video/android/video_capture_device_android.cc
@@ -10,7 +10,7 @@ #include "base/android/jni_android.h" #include "base/android/jni_array.h" #include "base/android/jni_string.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/numerics/safe_conversions.h" #include "base/ranges/algorithm.h" #include "base/strings/string_number_conversions.h"
diff --git a/media/capture/video/chromeos/camera_3a_controller.cc b/media/capture/video/chromeos/camera_3a_controller.cc index b497c42..53dfdc3 100644 --- a/media/capture/video/chromeos/camera_3a_controller.cc +++ b/media/capture/video/chromeos/camera_3a_controller.cc
@@ -6,9 +6,9 @@ #include <utility> -#include "base/bind.h" #include "base/containers/contains.h" #include "base/cxx17_backports.h" +#include "base/functional/bind.h" #include "base/task/single_thread_task_runner.h" #include "base/trace_event/typed_macros.h" #include "media/capture/video/chromeos/camera_metadata_utils.h"
diff --git a/media/capture/video/chromeos/camera_3a_controller_unittest.cc b/media/capture/video/chromeos/camera_3a_controller_unittest.cc index ccc5b7b..3a71663 100644 --- a/media/capture/video/chromeos/camera_3a_controller_unittest.cc +++ b/media/capture/video/chromeos/camera_3a_controller_unittest.cc
@@ -7,7 +7,7 @@ #include <functional> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/synchronization/waitable_event.h" #include "base/threading/thread.h" #include "base/time/time.h"
diff --git a/media/capture/video/chromeos/camera_app_device_bridge_impl.cc b/media/capture/video/chromeos/camera_app_device_bridge_impl.cc index 90e6035f..cacf35d 100644 --- a/media/capture/video/chromeos/camera_app_device_bridge_impl.cc +++ b/media/capture/video/chromeos/camera_app_device_bridge_impl.cc
@@ -6,8 +6,8 @@ #include <string> -#include "base/callback_helpers.h" #include "base/command_line.h" +#include "base/functional/callback_helpers.h" #include "base/task/single_thread_task_runner.h" #include "media/base/bind_to_current_loop.h" #include "media/base/media_switches.h"
diff --git a/media/capture/video/chromeos/camera_device_delegate.cc b/media/capture/video/chromeos/camera_device_delegate.cc index 826d00a..935824d9a0 100644 --- a/media/capture/video/chromeos/camera_device_delegate.cc +++ b/media/capture/video/chromeos/camera_device_delegate.cc
@@ -12,11 +12,10 @@ #include <vector> #include "ash/constants/ash_features.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/containers/contains.h" #include "base/cxx17_backports.h" #include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/no_destructor.h" #include "base/posix/safe_strerror.h" #include "base/strings/string_number_conversions.h"
diff --git a/media/capture/video/chromeos/camera_device_delegate_unittest.cc b/media/capture/video/chromeos/camera_device_delegate_unittest.cc index 49d4bde..b27840f 100644 --- a/media/capture/video/chromeos/camera_device_delegate_unittest.cc +++ b/media/capture/video/chromeos/camera_device_delegate_unittest.cc
@@ -10,8 +10,8 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "base/task/thread_pool.h" #include "base/test/bind.h"
diff --git a/media/capture/video/chromeos/camera_hal_delegate.cc b/media/capture/video/chromeos/camera_hal_delegate.cc index a017e90e..ff478bf 100644 --- a/media/capture/video/chromeos/camera_hal_delegate.cc +++ b/media/capture/video/chromeos/camera_hal_delegate.cc
@@ -9,9 +9,9 @@ #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/containers/flat_set.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/posix/safe_strerror.h" #include "base/process/launch.h" #include "base/ranges/algorithm.h"
diff --git a/media/capture/video/chromeos/camera_hal_dispatcher_impl.cc b/media/capture/video/chromeos/camera_hal_dispatcher_impl.cc index 06a9d3f..cd93acf9 100644 --- a/media/capture/video/chromeos/camera_hal_dispatcher_impl.cc +++ b/media/capture/video/chromeos/camera_hal_dispatcher_impl.cc
@@ -13,11 +13,11 @@ #include <vector> #include "ash/constants/ash_features.h" -#include "base/bind.h" #include "base/command_line.h" #include "base/files/file.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/notreached.h" #include "base/posix/eintr_wrapper.h"
diff --git a/media/capture/video/chromeos/camera_hal_dispatcher_impl_unittest.cc b/media/capture/video/chromeos/camera_hal_dispatcher_impl_unittest.cc index 52c85db..6c3e77f 100644 --- a/media/capture/video/chromeos/camera_hal_dispatcher_impl_unittest.cc +++ b/media/capture/video/chromeos/camera_hal_dispatcher_impl_unittest.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/posix/safe_strerror.h" #include "base/run_loop.h" #include "base/synchronization/waitable_event.h"
diff --git a/media/capture/video/chromeos/display_rotation_observer.cc b/media/capture/video/chromeos/display_rotation_observer.cc index 9f38432..b2de6b8 100644 --- a/media/capture/video/chromeos/display_rotation_observer.cc +++ b/media/capture/video/chromeos/display_rotation_observer.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/task/single_thread_task_runner.h" namespace media {
diff --git a/media/capture/video/chromeos/mock_camera_module.cc b/media/capture/video/chromeos/mock_camera_module.cc index c22a7ce..450e569e 100644 --- a/media/capture/video/chromeos/mock_camera_module.cc +++ b/media/capture/video/chromeos/mock_camera_module.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" namespace media { namespace unittest_internal {
diff --git a/media/capture/video/chromeos/mock_vendor_tag_ops.cc b/media/capture/video/chromeos/mock_vendor_tag_ops.cc index 0a74d16..49451d931 100644 --- a/media/capture/video/chromeos/mock_vendor_tag_ops.cc +++ b/media/capture/video/chromeos/mock_vendor_tag_ops.cc
@@ -4,8 +4,8 @@ #include "media/capture/video/chromeos/mock_vendor_tag_ops.h" -#include "base/bind.h" #include "base/check.h" +#include "base/functional/bind.h" #include "base/synchronization/waitable_event.h" namespace media {
diff --git a/media/capture/video/chromeos/request_manager.cc b/media/capture/video/chromeos/request_manager.cc index e56ba96..28e340f 100644 --- a/media/capture/video/chromeos/request_manager.cc +++ b/media/capture/video/chromeos/request_manager.cc
@@ -12,9 +12,8 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/functional/callback_helpers.h" #include "base/posix/safe_strerror.h" #include "base/strings/string_number_conversions.h"
diff --git a/media/capture/video/chromeos/request_manager_unittest.cc b/media/capture/video/chromeos/request_manager_unittest.cc index 27c639f..3f0a0161 100644 --- a/media/capture/video/chromeos/request_manager_unittest.cc +++ b/media/capture/video/chromeos/request_manager_unittest.cc
@@ -9,7 +9,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/task/single_thread_task_runner.h" #include "base/test/task_environment.h"
diff --git a/media/capture/video/chromeos/stream_buffer_manager.cc b/media/capture/video/chromeos/stream_buffer_manager.cc index 4a6a004..5cef5d4 100644 --- a/media/capture/video/chromeos/stream_buffer_manager.cc +++ b/media/capture/video/chromeos/stream_buffer_manager.cc
@@ -7,8 +7,8 @@ #include <memory> #include <string> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/posix/safe_strerror.h" #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h"
diff --git a/media/capture/video/chromeos/vendor_tag_ops_delegate.cc b/media/capture/video/chromeos/vendor_tag_ops_delegate.cc index 1bc025c..3bcb91f 100644 --- a/media/capture/video/chromeos/vendor_tag_ops_delegate.cc +++ b/media/capture/video/chromeos/vendor_tag_ops_delegate.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/strcat.h" #include "base/task/single_thread_task_runner.h"
diff --git a/media/capture/video/chromeos/video_capture_device_chromeos_delegate.cc b/media/capture/video/chromeos/video_capture_device_chromeos_delegate.cc index 356ab28..d19d3cf5 100644 --- a/media/capture/video/chromeos/video_capture_device_chromeos_delegate.cc +++ b/media/capture/video/chromeos/video_capture_device_chromeos_delegate.cc
@@ -8,7 +8,7 @@ #include <string> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/synchronization/waitable_event.h" #include "base/task/single_thread_task_runner.h"
diff --git a/media/capture/video/chromeos/video_capture_jpeg_decoder.h b/media/capture/video/chromeos/video_capture_jpeg_decoder.h index f5948d4..ade6f343 100644 --- a/media/capture/video/chromeos/video_capture_jpeg_decoder.h +++ b/media/capture/video/chromeos/video_capture_jpeg_decoder.h
@@ -5,7 +5,7 @@ #ifndef MEDIA_CAPTURE_VIDEO_CHROMEOS_VIDEO_CAPTURE_JPEG_DECODER_H_ #define MEDIA_CAPTURE_VIDEO_CHROMEOS_VIDEO_CAPTURE_JPEG_DECODER_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "media/capture/capture_export.h" #include "media/capture/video/video_capture_device.h" #include "media/capture/video/video_frame_receiver.h"
diff --git a/media/capture/video/chromeos/video_capture_jpeg_decoder_impl.cc b/media/capture/video/chromeos/video_capture_jpeg_decoder_impl.cc index 17a4700..ef4f76a 100644 --- a/media/capture/video/chromeos/video_capture_jpeg_decoder_impl.cc +++ b/media/capture/video/chromeos/video_capture_jpeg_decoder_impl.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/metrics/histogram_macros.h" #include "base/task/sequenced_task_runner.h" #include "base/trace_event/typed_macros.h"
diff --git a/media/capture/video/chromeos/video_capture_jpeg_decoder_impl.h b/media/capture/video/chromeos/video_capture_jpeg_decoder_impl.h index 82659238..64f3375 100644 --- a/media/capture/video/chromeos/video_capture_jpeg_decoder_impl.h +++ b/media/capture/video/chromeos/video_capture_jpeg_decoder_impl.h
@@ -11,7 +11,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/unsafe_shared_memory_region.h" #include "base/memory/weak_ptr.h" #include "base/sequence_checker.h"
diff --git a/media/capture/video/fake_video_capture_device.cc b/media/capture/video/fake_video_capture_device.cc index e0ed905..201db586 100644 --- a/media/capture/video/fake_video_capture_device.cc +++ b/media/capture/video/fake_video_capture_device.cc
@@ -8,8 +8,8 @@ #include <algorithm> #include <utility> -#include "base/bind.h" #include "base/cxx17_backports.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h"
diff --git a/media/capture/video/fake_video_capture_device_unittest.cc b/media/capture/video/fake_video_capture_device_unittest.cc index 6ba66336..72410558 100644 --- a/media/capture/video/fake_video_capture_device_unittest.cc +++ b/media/capture/video/fake_video_capture_device_unittest.cc
@@ -10,8 +10,8 @@ #include <memory> #include <utility> -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/ranges/algorithm.h" #include "base/run_loop.h" #include "base/test/bind.h"
diff --git a/media/capture/video/file_video_capture_device.cc b/media/capture/video/file_video_capture_device.cc index 96a1fd4..6061afc 100644 --- a/media/capture/video/file_video_capture_device.cc +++ b/media/capture/video/file_video_capture_device.cc
@@ -9,8 +9,8 @@ #include <memory> #include <utility> -#include "base/bind.h" #include "base/cxx17_backports.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/logging.h" #include "base/strings/string_number_conversions.h"
diff --git a/media/capture/video/file_video_capture_device_unittest.cc b/media/capture/video/file_video_capture_device_unittest.cc index 9a8c848..94d042c 100644 --- a/media/capture/video/file_video_capture_device_unittest.cc +++ b/media/capture/video/file_video_capture_device_unittest.cc
@@ -8,7 +8,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/synchronization/waitable_event.h" #include "base/test/task_environment.h" #include "media/base/bind_to_current_loop.h"
diff --git a/media/capture/video/gpu_memory_buffer_utils.cc b/media/capture/video/gpu_memory_buffer_utils.cc index 2328ed7..4aa7c97 100644 --- a/media/capture/video/gpu_memory_buffer_utils.cc +++ b/media/capture/video/gpu_memory_buffer_utils.cc
@@ -4,7 +4,7 @@ #include "media/capture/video/gpu_memory_buffer_utils.h" -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "gpu/ipc/common/gpu_memory_buffer_support.h" #include "ui/gfx/gpu_memory_buffer.h"
diff --git a/media/capture/video/linux/fake_v4l2_impl.cc b/media/capture/video/linux/fake_v4l2_impl.cc index 80d38e76..a7b1689 100644 --- a/media/capture/video/linux/fake_v4l2_impl.cc +++ b/media/capture/video/linux/fake_v4l2_impl.cc
@@ -11,8 +11,8 @@ #include <queue> -#include "base/bind.h" #include "base/bits.h" +#include "base/functional/bind.h" #include "base/ranges/algorithm.h" #include "base/synchronization/waitable_event.h" #include "base/threading/thread.h"
diff --git a/media/capture/video/linux/v4l2_capture_delegate.cc b/media/capture/video/linux/v4l2_capture_delegate.cc index 5c23595be..c447d607 100644 --- a/media/capture/video/linux/v4l2_capture_delegate.cc +++ b/media/capture/video/linux/v4l2_capture_delegate.cc
@@ -14,7 +14,7 @@ #include <algorithm> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/posix/eintr_wrapper.h" #include "base/task/single_thread_task_runner.h"
diff --git a/media/capture/video/linux/video_capture_device_linux.cc b/media/capture/video/linux/video_capture_device_linux.cc index 234dc74..819d417 100644 --- a/media/capture/video/linux/video_capture_device_linux.cc +++ b/media/capture/video/linux/video_capture_device_linux.cc
@@ -8,7 +8,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/synchronization/waitable_event.h" #include "base/task/single_thread_task_runner.h" #include "base/task/thread_pool.h"
diff --git a/media/capture/video/mac/pixel_buffer_pool_mac_unittest.mm b/media/capture/video/mac/pixel_buffer_pool_mac_unittest.mm index 7e2e8a1..06a36ca1 100644 --- a/media/capture/video/mac/pixel_buffer_pool_mac_unittest.mm +++ b/media/capture/video/mac/pixel_buffer_pool_mac_unittest.mm
@@ -4,7 +4,7 @@ #include "media/capture/video/mac/pixel_buffer_pool_mac.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/mac/scoped_nsobject.h" #import "media/capture/video/mac/test/video_capture_test_utils_mac.h" #include "testing/gmock/include/gmock/gmock.h"
diff --git a/media/capture/video/mac/test/video_capture_test_utils_mac.h b/media/capture/video/mac/test/video_capture_test_utils_mac.h index cd0295af..e5785fa7 100644 --- a/media/capture/video/mac/test/video_capture_test_utils_mac.h +++ b/media/capture/video/mac/test/video_capture_test_utils_mac.h
@@ -8,7 +8,7 @@ #import <Foundation/Foundation.h> #include <memory> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "media/capture/video/mac/video_capture_device_factory_mac.h" namespace media {
diff --git a/media/capture/video/mac/video_capture_device_avfoundation_mac.h b/media/capture/video/mac/video_capture_device_avfoundation_mac.h index e631435..a430689 100644 --- a/media/capture/video/mac/video_capture_device_avfoundation_mac.h +++ b/media/capture/video/mac/video_capture_device_avfoundation_mac.h
@@ -9,7 +9,7 @@ #import <AVFoundation/AVFoundation.h> #import <Foundation/Foundation.h> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/task/single_thread_task_runner.h" #include "base/mac/scoped_dispatch_object.h"
diff --git a/media/capture/video/mac/video_capture_device_avfoundation_mac_unittest.mm b/media/capture/video/mac/video_capture_device_avfoundation_mac_unittest.mm index 98286d3a..18cf1b1 100644 --- a/media/capture/video/mac/video_capture_device_avfoundation_mac_unittest.mm +++ b/media/capture/video/mac/video_capture_device_avfoundation_mac_unittest.mm
@@ -7,7 +7,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/mac/scoped_nsobject.h" #include "base/run_loop.h" #include "base/strings/sys_string_conversions.h"
diff --git a/media/capture/video/mac/video_capture_device_factory_mac.mm b/media/capture/video/mac/video_capture_device_factory_mac.mm index a5b015ae..31e63ae 100644 --- a/media/capture/video/mac/video_capture_device_factory_mac.mm +++ b/media/capture/video/mac/video_capture_device_factory_mac.mm
@@ -10,7 +10,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/strings/string_util.h" #include "base/strings/sys_string_conversions.h"
diff --git a/media/capture/video/mac/video_capture_device_factory_mac_unittest.mm b/media/capture/video/mac/video_capture_device_factory_mac_unittest.mm index b8fc999..e660436 100644 --- a/media/capture/video/mac/video_capture_device_factory_mac_unittest.mm +++ b/media/capture/video/mac/video_capture_device_factory_mac_unittest.mm
@@ -3,7 +3,7 @@ // found in the LICENSE file. #include "media/capture/video/mac/video_capture_device_factory_mac.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/test/bind.h" #include "base/test/task_environment.h"
diff --git a/media/capture/video/mac/video_capture_device_mac.mm b/media/capture/video/mac/video_capture_device_mac.mm index 5c9a17c4..7a29cb8 100644 --- a/media/capture/video/mac/video_capture_device_mac.mm +++ b/media/capture/video/mac/video_capture_device_mac.mm
@@ -13,7 +13,7 @@ #include <limits> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/logging.h" #include "base/mac/foundation_util.h"
diff --git a/media/capture/video/video_capture_device.cc b/media/capture/video/video_capture_device.cc index b26304b0..4910027 100644 --- a/media/capture/video/video_capture_device.cc +++ b/media/capture/video/video_capture_device.cc
@@ -4,9 +4,9 @@ #include "media/capture/video/video_capture_device.h" -#include "base/callback.h" #include "base/command_line.h" #include "base/containers/contains.h" +#include "base/functional/callback.h" #include "base/i18n/timezone.h" #include "base/strings/string_util.h" #include "base/token.h"
diff --git a/media/capture/video/video_capture_device.h b/media/capture/video/video_capture_device.h index f0ed8e81..94f6e8e 100644 --- a/media/capture/video/video_capture_device.h +++ b/media/capture/video/video_capture_device.h
@@ -18,8 +18,8 @@ #include <memory> #include <string> -#include "base/callback.h" #include "base/files/file.h" +#include "base/functional/callback.h" #include "base/memory/unsafe_shared_memory_region.h" #include "base/task/single_thread_task_runner.h" #include "base/time/time.h"
diff --git a/media/capture/video/video_capture_device_client.cc b/media/capture/video/video_capture_device_client.cc index 6f52d1f..284a61a 100644 --- a/media/capture/video/video_capture_device_client.cc +++ b/media/capture/video/video_capture_device_client.cc
@@ -7,9 +7,9 @@ #include <memory> #include <utility> -#include "base/bind.h" #include "base/command_line.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/ranges/algorithm.h"
diff --git a/media/capture/video/video_capture_device_client_unittest.cc b/media/capture/video/video_capture_device_client_unittest.cc index 8cca1ac5..b4c217b 100644 --- a/media/capture/video/video_capture_device_client_unittest.cc +++ b/media/capture/video/video_capture_device_client_unittest.cc
@@ -8,8 +8,8 @@ #include <memory> -#include "base/bind.h" #include "base/check.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h"
diff --git a/media/capture/video/video_capture_device_unittest.cc b/media/capture/video/video_capture_device_unittest.cc index fbf191e..30a6f26 100644 --- a/media/capture/video/video_capture_device_unittest.cc +++ b/media/capture/video/video_capture_device_unittest.cc
@@ -10,9 +10,9 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ref_counted.h" #include "base/run_loop.h" #include "base/task/single_thread_task_runner.h"
diff --git a/media/capture/video/video_capture_feedback.h b/media/capture/video/video_capture_feedback.h index 511bdb1..ac534e11 100644 --- a/media/capture/video/video_capture_feedback.h +++ b/media/capture/video/video_capture_feedback.h
@@ -8,7 +8,7 @@ #include <limits> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "media/capture/capture_export.h" #include "third_party/abseil-cpp/absl/types/optional.h" #include "ui/gfx/geometry/size.h"
diff --git a/media/capture/video/video_capture_system_impl.cc b/media/capture/video/video_capture_system_impl.cc index 5ceae503..d6e1383 100644 --- a/media/capture/video/video_capture_system_impl.cc +++ b/media/capture/video/video_capture_system_impl.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/ranges/algorithm.h" #include "base/trace_event/trace_event.h" #include "build/build_config.h"
diff --git a/media/capture/video/video_frame_receiver.h b/media/capture/video/video_frame_receiver.h index 993bc9b..79025ae 100644 --- a/media/capture/video/video_frame_receiver.h +++ b/media/capture/video/video_frame_receiver.h
@@ -5,7 +5,7 @@ #ifndef MEDIA_CAPTURE_VIDEO_VIDEO_FRAME_RECEIVER_H_ #define MEDIA_CAPTURE_VIDEO_VIDEO_FRAME_RECEIVER_H_ -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "media/capture/capture_export.h" #include "media/capture/mojom/video_capture_buffer.mojom.h" #include "media/capture/mojom/video_capture_types.mojom.h"
diff --git a/media/capture/video/video_frame_receiver_on_task_runner.cc b/media/capture/video/video_frame_receiver_on_task_runner.cc index 8f0fe8f..adf0879 100644 --- a/media/capture/video/video_frame_receiver_on_task_runner.cc +++ b/media/capture/video/video_frame_receiver_on_task_runner.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/task/single_thread_task_runner.h" namespace media {
diff --git a/media/capture/video/win/video_capture_device_factory_win.cc b/media/capture/video/win/video_capture_device_factory_win.cc index b881e2f0..d2a7e74 100644 --- a/media/capture/video/win/video_capture_device_factory_win.cc +++ b/media/capture/video/win/video_capture_device_factory_win.cc
@@ -19,10 +19,10 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/command_line.h" #include "base/containers/contains.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_macros.h" #include "base/no_destructor.h" #include "base/ranges/algorithm.h"
diff --git a/media/capture/video/win/video_capture_device_factory_win_unittest.cc b/media/capture/video/win/video_capture_device_factory_win_unittest.cc index c4d6a833..766b11fe 100644 --- a/media/capture/video/win/video_capture_device_factory_win_unittest.cc +++ b/media/capture/video/win/video_capture_device_factory_win_unittest.cc
@@ -19,7 +19,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/scoped_refptr.h" #include "base/ranges/algorithm.h" #include "base/run_loop.h"
diff --git a/media/capture/video/win/video_capture_device_mf_win.cc b/media/capture/video/win/video_capture_device_mf_win.cc index c35686dc..3c4f7015 100644 --- a/media/capture/video/win/video_capture_device_mf_win.cc +++ b/media/capture/video/win/video_capture_device_mf_win.cc
@@ -16,7 +16,7 @@ #include <thread> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/logging.h" #include "base/memory/raw_ptr.h"
diff --git a/media/capture/video/win/video_capture_device_mf_win.h b/media/capture/video/win/video_capture_device_mf_win.h index 7b04de6f..f3d70075 100644 --- a/media/capture/video/win/video_capture_device_mf_win.h +++ b/media/capture/video/win/video_capture_device_mf_win.h
@@ -18,8 +18,8 @@ #include <vector> -#include "base/callback_forward.h" #include "base/containers/queue.h" +#include "base/functional/callback_forward.h" #include "base/sequence_checker.h" #include "base/synchronization/waitable_event.h" #include "base/task/sequenced_task_runner.h"
diff --git a/media/capture/video/win/video_capture_device_mf_win_unittest.cc b/media/capture/video/win/video_capture_device_mf_win_unittest.cc index 9e0c3e6c..c114098 100644 --- a/media/capture/video/win/video_capture_device_mf_win_unittest.cc +++ b/media/capture/video/win/video_capture_device_mf_win_unittest.cc
@@ -15,8 +15,8 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/ranges/algorithm.h" #include "base/task/sequenced_task_runner.h" #include "base/task/thread_pool.h"
diff --git a/media/cast/cast_callbacks.h b/media/cast/cast_callbacks.h index 0fa4637..d36b3ff1 100644 --- a/media/cast/cast_callbacks.h +++ b/media/cast/cast_callbacks.h
@@ -5,7 +5,7 @@ #ifndef MEDIA_CAST_CAST_CALLBACKS_H_ #define MEDIA_CAST_CAST_CALLBACKS_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "media/cast/constants.h" namespace media {
diff --git a/media/cast/cast_config.h b/media/cast/cast_config.h index 13b4533c9..38f35258 100644 --- a/media/cast/cast_config.h +++ b/media/cast/cast_config.h
@@ -10,7 +10,7 @@ #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" #include "base/memory/unsafe_shared_memory_region.h" #include "base/task/single_thread_task_runner.h"
diff --git a/media/cast/cast_environment.cc b/media/cast/cast_environment.cc index cb9b04e..189b439f 100644 --- a/media/cast/cast_environment.cc +++ b/media/cast/cast_environment.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/notreached.h" #include "base/task/single_thread_task_runner.h"
diff --git a/media/cast/cast_sender.h b/media/cast/cast_sender.h index cb68645..8fe46874 100644 --- a/media/cast/cast_sender.h +++ b/media/cast/cast_sender.h
@@ -12,7 +12,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/ref_counted.h" #include "base/time/tick_clock.h" #include "base/time/time.h"
diff --git a/media/cast/cast_sender_impl.cc b/media/cast/cast_sender_impl.cc index f8a9c4bf..3d2d5297 100644 --- a/media/cast/cast_sender_impl.cc +++ b/media/cast/cast_sender_impl.cc
@@ -6,9 +6,9 @@ #include <utility> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "media/base/video_frame.h" #include "media/cast/common/video_frame_factory.h"
diff --git a/media/cast/encoding/audio_encoder.cc b/media/cast/encoding/audio_encoder.cc index 280f59a0..e724ae6f 100644 --- a/media/cast/encoding/audio_encoder.cc +++ b/media/cast/encoding/audio_encoder.cc
@@ -11,8 +11,8 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/logging.h" #include "base/memory/raw_ptr.h"
diff --git a/media/cast/encoding/audio_encoder_unittest.cc b/media/cast/encoding/audio_encoder_unittest.cc index 5ef7e351..2bd5f832 100644 --- a/media/cast/encoding/audio_encoder_unittest.cc +++ b/media/cast/encoding/audio_encoder_unittest.cc
@@ -11,8 +11,8 @@ #include <sstream> #include <string> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/memory/raw_ptr.h" #include "base/time/time.h"
diff --git a/media/cast/encoding/external_video_encoder.cc b/media/cast/encoding/external_video_encoder.cc index 89dd54a..fd866f99 100644 --- a/media/cast/encoding/external_video_encoder.cc +++ b/media/cast/encoding/external_video_encoder.cc
@@ -10,9 +10,9 @@ #include <sstream> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/memory/read_only_shared_memory_region.h" #include "base/memory/shared_memory_mapping.h"
diff --git a/media/cast/encoding/h264_vt_encoder.cc b/media/cast/encoding/h264_vt_encoder.cc index 2faffd8..f71a0c5 100644 --- a/media/cast/encoding/h264_vt_encoder.cc +++ b/media/cast/encoding/h264_vt_encoder.cc
@@ -11,8 +11,8 @@ #include <vector> #include "base/big_endian.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/logging.h" #include "base/memory/ptr_util.h"
diff --git a/media/cast/encoding/h264_vt_encoder_unittest.cc b/media/cast/encoding/h264_vt_encoder_unittest.cc index 8e08af0..cd19b22 100644 --- a/media/cast/encoding/h264_vt_encoder_unittest.cc +++ b/media/cast/encoding/h264_vt_encoder_unittest.cc
@@ -4,9 +4,9 @@ #include <stdint.h> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/containers/queue.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h" #include "base/power_monitor/power_monitor.h"
diff --git a/media/cast/encoding/size_adaptable_video_encoder_base.cc b/media/cast/encoding/size_adaptable_video_encoder_base.cc index 0f05aef..aa748bd 100644 --- a/media/cast/encoding/size_adaptable_video_encoder_base.cc +++ b/media/cast/encoding/size_adaptable_video_encoder_base.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/logging.h" #include "media/base/video_frame.h"
diff --git a/media/cast/encoding/video_encoder.h b/media/cast/encoding/video_encoder.h index dfcb4d4..865d21b 100644 --- a/media/cast/encoding/video_encoder.h +++ b/media/cast/encoding/video_encoder.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" #include "base/time/time.h" #include "media/base/video_frame.h"
diff --git a/media/cast/encoding/video_encoder_impl.cc b/media/cast/encoding/video_encoder_impl.cc index f3662e3..ccb7c43 100644 --- a/media/cast/encoding/video_encoder_impl.cc +++ b/media/cast/encoding/video_encoder_impl.cc
@@ -7,10 +7,10 @@ #include <utility> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/check.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "media/base/video_frame.h" #if BUILDFLAG(ENABLE_LIBAOM) #include "media/cast/encoding/av1_encoder.h"
diff --git a/media/cast/encoding/video_encoder_unittest.cc b/media/cast/encoding/video_encoder_unittest.cc index ffc61eb..17bc331fb 100644 --- a/media/cast/encoding/video_encoder_unittest.cc +++ b/media/cast/encoding/video_encoder_unittest.cc
@@ -10,8 +10,8 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h"
diff --git a/media/cast/logging/log_event_dispatcher.cc b/media/cast/logging/log_event_dispatcher.cc index 418b55f7..2d05a16c 100644 --- a/media/cast/logging/log_event_dispatcher.cc +++ b/media/cast/logging/log_event_dispatcher.cc
@@ -6,9 +6,9 @@ #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/ranges/algorithm.h" #include "base/synchronization/waitable_event.h"
diff --git a/media/cast/net/cast_transport.h b/media/cast/net/cast_transport.h index 8a912d6f..d34ff03 100644 --- a/media/cast/net/cast_transport.h +++ b/media/cast/net/cast_transport.h
@@ -22,7 +22,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/task/single_thread_task_runner.h" #include "base/time/tick_clock.h" #include "base/values.h"
diff --git a/media/cast/net/cast_transport_config.h b/media/cast/net/cast_transport_config.h index 99860922..fc70e0c 100644 --- a/media/cast/net/cast_transport_config.h +++ b/media/cast/net/cast_transport_config.h
@@ -11,7 +11,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/time/time.h" #include "media/cast/cast_config.h" #include "media/cast/common/rtp_time.h"
diff --git a/media/cast/net/cast_transport_impl.cc b/media/cast/net/cast_transport_impl.cc index 70136aad..d7c26b25 100644 --- a/media/cast/net/cast_transport_impl.cc +++ b/media/cast/net/cast_transport_impl.cc
@@ -11,8 +11,8 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/task/single_thread_task_runner.h" #include "build/build_config.h"
diff --git a/media/cast/net/cast_transport_impl.h b/media/cast/net/cast_transport_impl.h index 1fd4a0b..f263511d 100644 --- a/media/cast/net/cast_transport_impl.h +++ b/media/cast/net/cast_transport_impl.h
@@ -30,7 +30,7 @@ #include <set> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/gtest_prod_util.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h"
diff --git a/media/cast/net/cast_transport_impl_unittest.cc b/media/cast/net/cast_transport_impl_unittest.cc index 6e9df49..de556b2 100644 --- a/media/cast/net/cast_transport_impl_unittest.cc +++ b/media/cast/net/cast_transport_impl_unittest.cc
@@ -10,9 +10,9 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h" #include "base/test/simple_test_tick_clock.h"
diff --git a/media/cast/net/pacing/paced_sender.cc b/media/cast/net/pacing/paced_sender.cc index 103b9bd..6459bcdc 100644 --- a/media/cast/net/pacing/paced_sender.cc +++ b/media/cast/net/pacing/paced_sender.cc
@@ -5,8 +5,8 @@ #include "media/cast/net/pacing/paced_sender.h" #include "base/big_endian.h" -#include "base/bind.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/numerics/safe_conversions.h" #include "base/task/single_thread_task_runner.h"
diff --git a/media/cast/net/rtcp/rtcp_unittest.cc b/media/cast/net/rtcp/rtcp_unittest.cc index fe8d09b..e3d4d1ef 100644 --- a/media/cast/net/rtcp/rtcp_unittest.cc +++ b/media/cast/net/rtcp/rtcp_unittest.cc
@@ -7,7 +7,7 @@ #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/ranges/algorithm.h" #include "base/test/simple_test_tick_clock.h"
diff --git a/media/cast/net/udp_packet_pipe.cc b/media/cast/net/udp_packet_pipe.cc index 7cf6bd5..8211da4 100644 --- a/media/cast/net/udp_packet_pipe.cc +++ b/media/cast/net/udp_packet_pipe.cc
@@ -6,8 +6,8 @@ #include <cstring> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/logging.h" #include "base/memory/ptr_util.h"
diff --git a/media/cast/net/udp_packet_pipe_unittest.cc b/media/cast/net/udp_packet_pipe_unittest.cc index fd8e2f47..14e4e17 100644 --- a/media/cast/net/udp_packet_pipe_unittest.cc +++ b/media/cast/net/udp_packet_pipe_unittest.cc
@@ -8,9 +8,9 @@ #include <memory> #include <string> -#include "base/bind.h" -#include "base/callback.h" #include "base/containers/circular_deque.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/test/mock_callback.h" #include "base/test/task_environment.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/media/cast/net/udp_transport_impl.cc b/media/cast/net/udp_transport_impl.cc index c400a94..63f4fbc 100644 --- a/media/cast/net/udp_transport_impl.cc +++ b/media/cast/net/udp_transport_impl.cc
@@ -9,8 +9,8 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/logging.h" #include "base/task/sequenced_task_runner.h" #include "base/task/single_thread_task_runner.h"
diff --git a/media/cast/net/udp_transport_unittest.cc b/media/cast/net/udp_transport_unittest.cc index a0b51e7..54e83ed1 100644 --- a/media/cast/net/udp_transport_unittest.cc +++ b/media/cast/net/udp_transport_unittest.cc
@@ -8,8 +8,8 @@ #include <string> #include <vector> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/ranges/algorithm.h" #include "base/run_loop.h" #include "base/test/mock_callback.h"
diff --git a/media/cast/sender/audio_sender.cc b/media/cast/sender/audio_sender.cc index e04b4b5..ca650dd62 100644 --- a/media/cast/sender/audio_sender.cc +++ b/media/cast/sender/audio_sender.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" #include "base/check_op.h" +#include "base/functional/bind.h" #include "base/notreached.h" #include "base/trace_event/trace_event.h" #include "media/base/media_switches.h"
diff --git a/media/cast/sender/audio_sender.h b/media/cast/sender/audio_sender.h index 5f3d61b..d6a300b 100644 --- a/media/cast/sender/audio_sender.h +++ b/media/cast/sender/audio_sender.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h" #include "base/time/tick_clock.h"
diff --git a/media/cast/sender/audio_sender_unittest.cc b/media/cast/sender/audio_sender_unittest.cc index 551c0b1a..bb08d45 100644 --- a/media/cast/sender/audio_sender_unittest.cc +++ b/media/cast/sender/audio_sender_unittest.cc
@@ -9,8 +9,8 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h"
diff --git a/media/cast/sender/congestion_control_unittest.cc b/media/cast/sender/congestion_control_unittest.cc index 7840fc56..661e06c6 100644 --- a/media/cast/sender/congestion_control_unittest.cc +++ b/media/cast/sender/congestion_control_unittest.cc
@@ -6,7 +6,7 @@ #include <stdint.h> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/test/simple_test_tick_clock.h" #include "media/base/fake_single_thread_task_runner.h"
diff --git a/media/cast/sender/frame_sender_impl.cc b/media/cast/sender/frame_sender_impl.cc index b6b9ac9..8c4a537a 100644 --- a/media/cast/sender/frame_sender_impl.cc +++ b/media/cast/sender/frame_sender_impl.cc
@@ -10,8 +10,8 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/numerics/safe_conversions.h" #include "base/trace_event/trace_event.h"
diff --git a/media/cast/sender/openscreen_frame_sender.cc b/media/cast/sender/openscreen_frame_sender.cc index 8922a4b1..06115e43 100644 --- a/media/cast/sender/openscreen_frame_sender.cc +++ b/media/cast/sender/openscreen_frame_sender.cc
@@ -10,9 +10,9 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/cxx17_backports.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/numerics/safe_conversions.h" #include "base/trace_event/trace_event.h"
diff --git a/media/cast/sender/performance_metrics_overlay.cc b/media/cast/sender/performance_metrics_overlay.cc index 097ebce..c36eb65 100644 --- a/media/cast/sender/performance_metrics_overlay.cc +++ b/media/cast/sender/performance_metrics_overlay.cc
@@ -10,7 +10,7 @@ #include <algorithm> #include <string> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/numerics/safe_conversions.h" #include "base/strings/stringprintf.h"
diff --git a/media/cast/sender/video_sender.cc b/media/cast/sender/video_sender.cc index d634127..4fe138e 100644 --- a/media/cast/sender/video_sender.cc +++ b/media/cast/sender/video_sender.cc
@@ -10,7 +10,7 @@ #include <cstring> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/trace_event/trace_event.h" #include "media/base/media_switches.h"
diff --git a/media/cast/sender/video_sender.h b/media/cast/sender/video_sender.h index e029281..4c85f28 100644 --- a/media/cast/sender/video_sender.h +++ b/media/cast/sender/video_sender.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h" #include "base/time/tick_clock.h"
diff --git a/media/cast/sender/video_sender_unittest.cc b/media/cast/sender/video_sender_unittest.cc index 2c3c845..a4a9a5f9 100644 --- a/media/cast/sender/video_sender_unittest.cc +++ b/media/cast/sender/video_sender_unittest.cc
@@ -10,9 +10,9 @@ #include <memory> #include <vector> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h"
diff --git a/media/cast/test/cast_benchmarks.cc b/media/cast/test/cast_benchmarks.cc index 3d544326..92b0b3d0 100644 --- a/media/cast/test/cast_benchmarks.cc +++ b/media/cast/test/cast_benchmarks.cc
@@ -31,10 +31,10 @@ #include <vector> #include "base/at_exit.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/debug/profiler.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h"
diff --git a/media/cast/test/end2end_unittest.cc b/media/cast/test/end2end_unittest.cc index 94e80c9..2d458371 100644 --- a/media/cast/test/end2end_unittest.cc +++ b/media/cast/test/end2end_unittest.cc
@@ -13,8 +13,8 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h"
diff --git a/media/cast/test/fake_media_source.cc b/media/cast/test/fake_media_source.cc index fd1eaf5..94c3f6d 100644 --- a/media/cast/test/fake_media_source.cc +++ b/media/cast/test/fake_media_source.cc
@@ -7,8 +7,8 @@ #include <memory> #include <utility> -#include "base/bind.h" #include "base/files/scoped_file.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/rand_util.h" #include "base/strings/string_number_conversions.h"
diff --git a/media/cast/test/fake_video_encode_accelerator_factory.cc b/media/cast/test/fake_video_encode_accelerator_factory.cc index fcbb40c5..19019c13 100644 --- a/media/cast/test/fake_video_encode_accelerator_factory.cc +++ b/media/cast/test/fake_video_encode_accelerator_factory.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/task/single_thread_task_runner.h" namespace media {
diff --git a/media/cast/test/fake_video_encode_accelerator_factory.h b/media/cast/test/fake_video_encode_accelerator_factory.h index 00ad42a8..e506100 100644 --- a/media/cast/test/fake_video_encode_accelerator_factory.h +++ b/media/cast/test/fake_video_encode_accelerator_factory.h
@@ -9,7 +9,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" #include "base/memory/unsafe_shared_memory_region.h" #include "base/task/single_thread_task_runner.h"
diff --git a/media/cast/test/receiver/audio_decoder.cc b/media/cast/test/receiver/audio_decoder.cc index 2b951a6c..39a6d3f 100644 --- a/media/cast/test/receiver/audio_decoder.cc +++ b/media/cast/test/receiver/audio_decoder.cc
@@ -8,8 +8,8 @@ #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/logging.h" #include "base/memory/ptr_util.h"
diff --git a/media/cast/test/receiver/audio_decoder.h b/media/cast/test/receiver/audio_decoder.h index 3d5d0100..556562d 100644 --- a/media/cast/test/receiver/audio_decoder.h +++ b/media/cast/test/receiver/audio_decoder.h
@@ -5,7 +5,7 @@ #ifndef MEDIA_CAST_TEST_RECEIVER_AUDIO_DECODER_H_ #define MEDIA_CAST_TEST_RECEIVER_AUDIO_DECODER_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" #include "media/base/audio_bus.h" #include "media/cast/cast_config.h"
diff --git a/media/cast/test/receiver/audio_decoder_unittest.cc b/media/cast/test/receiver/audio_decoder_unittest.cc index 122a386d..f0831ce 100644 --- a/media/cast/test/receiver/audio_decoder_unittest.cc +++ b/media/cast/test/receiver/audio_decoder_unittest.cc
@@ -9,8 +9,8 @@ #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/synchronization/condition_variable.h" #include "base/synchronization/lock.h" #include "base/sys_byteorder.h"
diff --git a/media/cast/test/receiver/cast_receiver.h b/media/cast/test/receiver/cast_receiver.h index cf4229f0..3e25436 100644 --- a/media/cast/test/receiver/cast_receiver.h +++ b/media/cast/test/receiver/cast_receiver.h
@@ -10,7 +10,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" #include "base/time/time.h" #include "media/base/audio_bus.h"
diff --git a/media/cast/test/receiver/cast_receiver_impl.cc b/media/cast/test/receiver/cast_receiver_impl.cc index 58078a5..e80c743 100644 --- a/media/cast/test/receiver/cast_receiver_impl.cc +++ b/media/cast/test/receiver/cast_receiver_impl.cc
@@ -8,9 +8,9 @@ #include <utility> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/memory/ptr_util.h" #include "base/time/time.h"
diff --git a/media/cast/test/receiver/frame_receiver.cc b/media/cast/test/receiver/frame_receiver.cc index febaaca8..81bc6cf 100644 --- a/media/cast/test/receiver/frame_receiver.cc +++ b/media/cast/test/receiver/frame_receiver.cc
@@ -9,7 +9,7 @@ #include <utility> #include "base/big_endian.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/numerics/safe_conversions.h" #include "media/cast/cast_config.h"
diff --git a/media/cast/test/receiver/frame_receiver_unittest.cc b/media/cast/test/receiver/frame_receiver_unittest.cc index 024a070..0c278fa9 100644 --- a/media/cast/test/receiver/frame_receiver_unittest.cc +++ b/media/cast/test/receiver/frame_receiver_unittest.cc
@@ -10,8 +10,8 @@ #include <memory> #include <utility> -#include "base/bind.h" #include "base/containers/circular_deque.h" +#include "base/functional/bind.h" #include "base/memory/ref_counted.h" #include "base/test/simple_test_tick_clock.h" #include "base/time/time.h"
diff --git a/media/cast/test/receiver/video_decoder.cc b/media/cast/test/receiver/video_decoder.cc index 6d3b05c..3ac8cf3 100644 --- a/media/cast/test/receiver/video_decoder.cc +++ b/media/cast/test/receiver/video_decoder.cc
@@ -7,8 +7,8 @@ #include <stdint.h> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/json/json_reader.h" #include "base/location.h" #include "base/logging.h"
diff --git a/media/cast/test/receiver/video_decoder.h b/media/cast/test/receiver/video_decoder.h index 79a2073..499310e 100644 --- a/media/cast/test/receiver/video_decoder.h +++ b/media/cast/test/receiver/video_decoder.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" #include "media/base/video_frame.h" #include "media/cast/cast_config.h"
diff --git a/media/cast/test/receiver/video_decoder_unittest.cc b/media/cast/test/receiver/video_decoder_unittest.cc index 2502a69..0ffe737 100644 --- a/media/cast/test/receiver/video_decoder_unittest.cc +++ b/media/cast/test/receiver/video_decoder_unittest.cc
@@ -9,8 +9,8 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/synchronization/condition_variable.h" #include "base/synchronization/lock.h" #include "base/time/time.h"
diff --git a/media/cast/test/sender.cc b/media/cast/test/sender.cc index 81b49841..24c4fa97 100644 --- a/media/cast/test/sender.cc +++ b/media/cast/test/sender.cc
@@ -12,10 +12,10 @@ #include "base/at_exit.h" #include "base/base_paths.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/json/json_writer.h" #include "base/logging.h" #include "base/memory/raw_ptr.h"
diff --git a/media/cast/test/simulator.cc b/media/cast/test/simulator.cc index 0925d31..36e8dbc 100644 --- a/media/cast/test/simulator.cc +++ b/media/cast/test/simulator.cc
@@ -42,8 +42,6 @@ #include "base/at_exit.h" #include "base/base_paths.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/containers/queue.h" #include "base/containers/span.h" @@ -51,6 +49,8 @@ #include "base/files/file_util.h" #include "base/files/memory_mapped_file.h" #include "base/files/scoped_file.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/json/json_writer.h" #include "base/logging.h" #include "base/memory/ptr_util.h"
diff --git a/media/cast/test/skewed_single_thread_task_runner.h b/media/cast/test/skewed_single_thread_task_runner.h index add2c568..961531a 100644 --- a/media/cast/test/skewed_single_thread_task_runner.h +++ b/media/cast/test/skewed_single_thread_task_runner.h
@@ -5,7 +5,7 @@ #ifndef MEDIA_CAST_TEST_SKEWED_SINGLE_THREAD_TASK_RUNNER_H_ #define MEDIA_CAST_TEST_SKEWED_SINGLE_THREAD_TASK_RUNNER_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/task/single_thread_task_runner.h" #include "base/test/simple_test_tick_clock.h" #include "base/test/test_pending_task.h"
diff --git a/media/cast/test/utility/default_config.cc b/media/cast/test/utility/default_config.cc index ffb03ae1..995396e 100644 --- a/media/cast/test/utility/default_config.cc +++ b/media/cast/test/utility/default_config.cc
@@ -6,7 +6,7 @@ #include <stddef.h> -#include "base/bind.h" +#include "base/functional/bind.h" #include "media/cast/cast_config.h" #include "media/cast/constants.h" #include "media/cast/net/cast_transport_config.h"
diff --git a/media/cast/test/utility/in_process_receiver.cc b/media/cast/test/utility/in_process_receiver.cc index 469fa8f..981ad30b 100644 --- a/media/cast/test/utility/in_process_receiver.cc +++ b/media/cast/test/utility/in_process_receiver.cc
@@ -7,8 +7,8 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/memory/ptr_util.h" #include "base/synchronization/waitable_event.h"
diff --git a/media/cast/test/utility/tap_proxy.cc b/media/cast/test/utility/tap_proxy.cc index aad943d..7c61a75 100644 --- a/media/cast/test/utility/tap_proxy.cc +++ b/media/cast/test/utility/tap_proxy.cc
@@ -23,10 +23,10 @@ #include <utility> #include "base/at_exit.h" -#include "base/bind.h" #include "base/command_line.h" #include "base/containers/circular_deque.h" #include "base/files/file_descriptor_watcher_posix.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/rand_util.h" #include "base/run_loop.h"
diff --git a/media/cast/test/utility/udp_proxy.cc b/media/cast/test/utility/udp_proxy.cc index 416a582..343931b 100644 --- a/media/cast/test/utility/udp_proxy.cc +++ b/media/cast/test/utility/udp_proxy.cc
@@ -11,8 +11,8 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/containers/circular_deque.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/memory/raw_ptr.h" #include "base/message_loop/message_pump_type.h"
diff --git a/media/cast/test/utility/udp_proxy_main.cc b/media/cast/test/utility/udp_proxy_main.cc index fe36b0f..36d0ed62 100644 --- a/media/cast/test/utility/udp_proxy_main.cc +++ b/media/cast/test/utility/udp_proxy_main.cc
@@ -9,9 +9,9 @@ #include <utility> #include "base/at_exit.h" -#include "base/bind.h" #include "base/command_line.h" #include "base/containers/circular_deque.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h"
diff --git a/media/cdm/aes_decryptor_unittest.cc b/media/cdm/aes_decryptor_unittest.cc index b5db765..0dc2d8b2 100644 --- a/media/cdm/aes_decryptor_unittest.cc +++ b/media/cdm/aes_decryptor_unittest.cc
@@ -11,8 +11,8 @@ #include <string> #include <vector> -#include "base/bind.h" #include "base/debug/leak_annotations.h" +#include "base/functional/bind.h" #include "base/json/json_reader.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h"
diff --git a/media/cdm/cdm_adapter.cc b/media/cdm/cdm_adapter.cc index 58f82bfa..2ac4602 100644 --- a/media/cdm/cdm_adapter.cc +++ b/media/cdm/cdm_adapter.cc
@@ -9,8 +9,8 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/metrics/histogram_functions.h" #include "base/metrics/histogram_macros.h"
diff --git a/media/cdm/cdm_adapter.h b/media/cdm/cdm_adapter.h index 0b4e3a40..cd816a30 100644 --- a/media/cdm/cdm_adapter.h +++ b/media/cdm/cdm_adapter.h
@@ -11,8 +11,8 @@ #include <string> #include <vector> -#include "base/callback.h" #include "base/compiler_specific.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h" #include "base/scoped_native_library.h"
diff --git a/media/cdm/cdm_adapter_factory.cc b/media/cdm/cdm_adapter_factory.cc index f9538ff..e99eba16 100644 --- a/media/cdm/cdm_adapter_factory.cc +++ b/media/cdm/cdm_adapter_factory.cc
@@ -4,7 +4,7 @@ #include "media/cdm/cdm_adapter_factory.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/task/single_thread_task_runner.h" #include "media/base/cdm_factory.h" #include "media/cdm/cdm_adapter.h"
diff --git a/media/cdm/cdm_adapter_factory.h b/media/cdm/cdm_adapter_factory.h index a82ee3b3..a9508c12 100644 --- a/media/cdm/cdm_adapter_factory.h +++ b/media/cdm/cdm_adapter_factory.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "media/base/cdm_factory.h" #include "media/base/media_export.h" #include "media/cdm/cdm_auxiliary_helper.h"
diff --git a/media/cdm/cdm_adapter_unittest.cc b/media/cdm/cdm_adapter_unittest.cc index c0a1718f..043483a 100644 --- a/media/cdm/cdm_adapter_unittest.cc +++ b/media/cdm/cdm_adapter_unittest.cc
@@ -8,9 +8,9 @@ #include <memory> -#include "base/bind.h" #include "base/check.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/strings/string_number_conversions.h"
diff --git a/media/cdm/cdm_allocator.h b/media/cdm/cdm_allocator.h index fb888d6..464c71f 100644 --- a/media/cdm/cdm_allocator.h +++ b/media/cdm/cdm_allocator.h
@@ -10,7 +10,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "media/base/media_export.h" namespace cdm {
diff --git a/media/cdm/cdm_auxiliary_helper.h b/media/cdm/cdm_auxiliary_helper.h index 6d953f3..30628a6 100644 --- a/media/cdm/cdm_auxiliary_helper.h +++ b/media/cdm/cdm_auxiliary_helper.h
@@ -10,7 +10,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/unguessable_token.h" #include "build/build_config.h" #include "media/base/media_export.h"
diff --git a/media/cdm/cdm_capability.h b/media/cdm/cdm_capability.h index 5c4759c..67e52ca 100644 --- a/media/cdm/cdm_capability.h +++ b/media/cdm/cdm_capability.h
@@ -7,8 +7,8 @@ #include <map> -#include "base/callback.h" #include "base/containers/flat_set.h" +#include "base/functional/callback.h" #include "media/base/audio_codecs.h" #include "media/base/content_decryption_module.h" #include "media/base/encryption_scheme.h"
diff --git a/media/cdm/cdm_document_service.h b/media/cdm/cdm_document_service.h index 726e1ce..a8a85d3 100644 --- a/media/cdm/cdm_document_service.h +++ b/media/cdm/cdm_document_service.h
@@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "build/build_config.h" #include "media/base/media_export.h"
diff --git a/media/cdm/default_cdm_factory.cc b/media/cdm/default_cdm_factory.cc index 2eab549f..ace2bf9d 100644 --- a/media/cdm/default_cdm_factory.cc +++ b/media/cdm/default_cdm_factory.cc
@@ -4,8 +4,8 @@ #include "media/cdm/default_cdm_factory.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/task/single_thread_task_runner.h" #include "media/base/cdm_config.h"
diff --git a/media/cdm/library_cdm/clear_key_cdm/cdm_file_adapter.cc b/media/cdm/library_cdm/clear_key_cdm/cdm_file_adapter.cc index 4bb44a9..4f79142 100644 --- a/media/cdm/library_cdm/clear_key_cdm/cdm_file_adapter.cc +++ b/media/cdm/library_cdm/clear_key_cdm/cdm_file_adapter.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "media/cdm/library_cdm/cdm_host_proxy.h"
diff --git a/media/cdm/library_cdm/clear_key_cdm/cdm_file_adapter.h b/media/cdm/library_cdm/clear_key_cdm/cdm_file_adapter.h index b9e3dd2..56bab49 100644 --- a/media/cdm/library_cdm/clear_key_cdm/cdm_file_adapter.h +++ b/media/cdm/library_cdm/clear_key_cdm/cdm_file_adapter.h
@@ -10,8 +10,8 @@ #include <string> #include <vector> -#include "base/callback.h" #include "base/compiler_specific.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "media/cdm/api/content_decryption_module.h"
diff --git a/media/cdm/library_cdm/clear_key_cdm/cdm_file_io_test.cc b/media/cdm/library_cdm/clear_key_cdm/cdm_file_io_test.cc index 0eaf846..2f9b3d4 100644 --- a/media/cdm/library_cdm/clear_key_cdm/cdm_file_io_test.cc +++ b/media/cdm/library_cdm/clear_key_cdm/cdm_file_io_test.cc
@@ -7,8 +7,8 @@ #include <algorithm> #include <limits> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/strings/string_number_conversions.h"
diff --git a/media/cdm/library_cdm/clear_key_cdm/cdm_file_io_test.h b/media/cdm/library_cdm/clear_key_cdm/cdm_file_io_test.h index b8ad857..75d653f 100644 --- a/media/cdm/library_cdm/clear_key_cdm/cdm_file_io_test.h +++ b/media/cdm/library_cdm/clear_key_cdm/cdm_file_io_test.h
@@ -13,9 +13,9 @@ #include <string> #include <vector> -#include "base/callback.h" #include "base/compiler_specific.h" #include "base/containers/stack.h" +#include "base/functional/callback.h" #include "media/cdm/api/content_decryption_module.h" namespace media {
diff --git a/media/cdm/library_cdm/clear_key_cdm/cdm_video_decoder.cc b/media/cdm/library_cdm/clear_key_cdm/cdm_video_decoder.cc index c7804728..1a44c0b 100644 --- a/media/cdm/library_cdm/clear_key_cdm/cdm_video_decoder.cc +++ b/media/cdm/library_cdm/clear_key_cdm/cdm_video_decoder.cc
@@ -7,11 +7,11 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/containers/queue.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/no_destructor.h"
diff --git a/media/cdm/library_cdm/clear_key_cdm/clear_key_cdm.cc b/media/cdm/library_cdm/clear_key_cdm/clear_key_cdm.cc index f5f0703..bdc9878 100644 --- a/media/cdm/library_cdm/clear_key_cdm/clear_key_cdm.cc +++ b/media/cdm/library_cdm/clear_key_cdm/clear_key_cdm.cc
@@ -10,8 +10,8 @@ #include <sstream> #include <utility> -#include "base/bind.h" #include "base/files/file.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h"
diff --git a/media/cdm/library_cdm/clear_key_cdm/clear_key_persistent_session_cdm.cc b/media/cdm/library_cdm/clear_key_cdm/clear_key_persistent_session_cdm.cc index 0385ac97..844b3568 100644 --- a/media/cdm/library_cdm/clear_key_cdm/clear_key_persistent_session_cdm.cc +++ b/media/cdm/library_cdm/clear_key_cdm/clear_key_persistent_session_cdm.cc
@@ -7,8 +7,8 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/ref_counted.h" #include "media/base/cdm_promise.h" #include "media/cdm/json_web_key.h"
diff --git a/media/cdm/library_cdm/clear_key_cdm/ffmpeg_cdm_audio_decoder.cc b/media/cdm/library_cdm/clear_key_cdm/ffmpeg_cdm_audio_decoder.cc index eb7765ec..7fdb81b 100644 --- a/media/cdm/library_cdm/clear_key_cdm/ffmpeg_cdm_audio_decoder.cc +++ b/media/cdm/library_cdm/clear_key_cdm/ffmpeg_cdm_audio_decoder.cc
@@ -9,9 +9,9 @@ #include <algorithm> #include <memory> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "media/base/audio_bus.h" #include "media/base/audio_timestamp_helper.h"
diff --git a/media/cdm/mock_helpers.h b/media/cdm/mock_helpers.h index 00bf6abc..06b1a34 100644 --- a/media/cdm/mock_helpers.h +++ b/media/cdm/mock_helpers.h
@@ -10,7 +10,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "build/build_config.h" #include "media/cdm/cdm_allocator.h" #include "media/cdm/cdm_auxiliary_helper.h"
diff --git a/media/cdm/output_protection.h b/media/cdm/output_protection.h index 0d543a7c..20374db 100644 --- a/media/cdm/output_protection.h +++ b/media/cdm/output_protection.h
@@ -7,7 +7,7 @@ #include <stdint.h> -#include "base/callback.h" +#include "base/functional/callback.h" #include "media/base/media_export.h" namespace media {
diff --git a/media/cdm/simple_cdm_allocator.cc b/media/cdm/simple_cdm_allocator.cc index 45e39b9..0391a38 100644 --- a/media/cdm/simple_cdm_allocator.cc +++ b/media/cdm/simple_cdm_allocator.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "media/base/video_frame.h" #include "media/cdm/cdm_helpers.h" #include "media/cdm/simple_cdm_buffer.h"
diff --git a/media/cdm/win/media_foundation_cdm.cc b/media/cdm/win/media_foundation_cdm.cc index ad392c27..68c0498 100644 --- a/media/cdm/win/media_foundation_cdm.cc +++ b/media/cdm/win/media_foundation_cdm.cc
@@ -9,7 +9,7 @@ #include <stdlib.h> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/metrics/histogram_functions.h" #include "base/rand_util.h"
diff --git a/media/cdm/win/media_foundation_cdm_factory.cc b/media/cdm/win/media_foundation_cdm_factory.cc index 670ec04e..e6d03b2 100644 --- a/media/cdm/win/media_foundation_cdm_factory.cc +++ b/media/cdm/win/media_foundation_cdm_factory.cc
@@ -8,8 +8,8 @@ #include <mferror.h> #include <mfmediaengine.h> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/metrics/histogram_functions.h" #include "base/strings/utf_string_conversions.h" #include "base/task/thread_pool.h"
diff --git a/media/cdm/win/media_foundation_cdm_factory.h b/media/cdm/win/media_foundation_cdm_factory.h index 8903b420..3e72c81 100644 --- a/media/cdm/win/media_foundation_cdm_factory.h +++ b/media/cdm/win/media_foundation_cdm_factory.h
@@ -12,8 +12,8 @@ #include <memory> #include <string> -#include "base/callback.h" #include "base/files/file_path.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "base/unguessable_token.h" #include "base/win/scoped_com_initializer.h"
diff --git a/media/cdm/win/media_foundation_cdm_factory_unittest.cc b/media/cdm/win/media_foundation_cdm_factory_unittest.cc index f48160c8..9d3dbdc 100644 --- a/media/cdm/win/media_foundation_cdm_factory_unittest.cc +++ b/media/cdm/win/media_foundation_cdm_factory_unittest.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/test/gmock_callback_support.h" #include "base/test/mock_callback.h"
diff --git a/media/cdm/win/media_foundation_cdm_session.h b/media/cdm/win/media_foundation_cdm_session.h index 054af661..f25daac8 100644 --- a/media/cdm/win/media_foundation_cdm_session.h +++ b/media/cdm/win/media_foundation_cdm_session.h
@@ -11,7 +11,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "base/time/time.h" #include "media/base/content_decryption_module.h"
diff --git a/media/cdm/win/media_foundation_cdm_session_unittest.cc b/media/cdm/win/media_foundation_cdm_session_unittest.cc index f06f244..daddfaf 100644 --- a/media/cdm/win/media_foundation_cdm_session_unittest.cc +++ b/media/cdm/win/media_foundation_cdm_session_unittest.cc
@@ -6,7 +6,7 @@ #include <wchar.h> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/test/mock_callback.h" #include "base/test/task_environment.h" #include "media/base/mock_filters.h"
diff --git a/media/cdm/win/media_foundation_cdm_unittest.cc b/media/cdm/win/media_foundation_cdm_unittest.cc index c429aed..890b676 100644 --- a/media/cdm/win/media_foundation_cdm_unittest.cc +++ b/media/cdm/win/media_foundation_cdm_unittest.cc
@@ -6,7 +6,7 @@ #include <wchar.h> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/utf_string_conversions.h" #include "base/test/mock_callback.h" #include "base/test/task_environment.h"
diff --git a/media/device_monitors/device_monitor_mac.mm b/media/device_monitors/device_monitor_mac.mm index 25cf3b4ed..6a9f905 100644 --- a/media/device_monitors/device_monitor_mac.mm +++ b/media/device_monitors/device_monitor_mac.mm
@@ -8,10 +8,10 @@ #include <set> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/containers/contains.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/mac/scoped_nsobject.h" #include "base/memory/raw_ptr.h"
diff --git a/media/device_monitors/device_monitor_udev.cc b/media/device_monitors/device_monitor_udev.cc index 0a3d067..8dd628a 100644 --- a/media/device_monitors/device_monitor_udev.cc +++ b/media/device_monitors/device_monitor_udev.cc
@@ -9,7 +9,7 @@ #include <string> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/sequence_checker.h" #include "base/system/system_monitor.h" #include "base/task/thread_pool.h"
diff --git a/media/ffmpeg/ffmpeg_common_unittest.cc b/media/ffmpeg/ffmpeg_common_unittest.cc index 815243c1..94a3936 100644 --- a/media/ffmpeg/ffmpeg_common_unittest.cc +++ b/media/ffmpeg/ffmpeg_common_unittest.cc
@@ -9,8 +9,8 @@ #include <cstring> -#include "base/bind.h" #include "base/files/memory_mapped_file.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "media/base/audio_decoder_config.h" #include "media/base/media.h"
diff --git a/media/ffmpeg/ffmpeg_decoding_loop.cc b/media/ffmpeg/ffmpeg_decoding_loop.cc index 63de64aeb..f32ffa9 100644 --- a/media/ffmpeg/ffmpeg_decoding_loop.cc +++ b/media/ffmpeg/ffmpeg_decoding_loop.cc
@@ -3,7 +3,7 @@ // found in the LICENSE file. #include "media/ffmpeg/ffmpeg_decoding_loop.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/logging.h" #include "media/ffmpeg/ffmpeg_common.h"
diff --git a/media/ffmpeg/ffmpeg_decoding_loop.h b/media/ffmpeg/ffmpeg_decoding_loop.h index ab71f71..b277607 100644 --- a/media/ffmpeg/ffmpeg_decoding_loop.h +++ b/media/ffmpeg/ffmpeg_decoding_loop.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "media/base/media_export.h" #include "media/ffmpeg/ffmpeg_deleters.h"
diff --git a/media/ffmpeg/ffmpeg_regression_tests.cc b/media/ffmpeg/ffmpeg_regression_tests.cc index ba71809..05dcb1c 100644 --- a/media/ffmpeg/ffmpeg_regression_tests.cc +++ b/media/ffmpeg/ffmpeg_regression_tests.cc
@@ -21,7 +21,7 @@ #include <string> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/time/time.h" #include "media/test/pipeline_integration_test_base.h"
diff --git a/media/filters/android/media_codec_audio_decoder.cc b/media/filters/android/media_codec_audio_decoder.cc index ef2ffce..c80e0bf 100644 --- a/media/filters/android/media_codec_audio_decoder.cc +++ b/media/filters/android/media_codec_audio_decoder.cc
@@ -8,9 +8,9 @@ #include <memory> #include "base/android/build_info.h" -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/task/single_thread_task_runner.h" #include "media/base/android/media_codec_bridge_impl.h"
diff --git a/media/filters/android/video_frame_extractor.cc b/media/filters/android/video_frame_extractor.cc index 292981b..0997aba 100644 --- a/media/filters/android/video_frame_extractor.cc +++ b/media/filters/android/video_frame_extractor.cc
@@ -5,7 +5,7 @@ #include "media/filters/android/video_frame_extractor.h" #include "base/android/build_info.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/threading/thread.h" #include "media/base/android/media_codec_bridge_impl.h" #include "media/base/data_source.h"
diff --git a/media/filters/android/video_frame_extractor.h b/media/filters/android/video_frame_extractor.h index 9203a07f..890943b 100644 --- a/media/filters/android/video_frame_extractor.h +++ b/media/filters/android/video_frame_extractor.h
@@ -8,7 +8,7 @@ #include <stdint.h> #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "media/base/media_export.h"
diff --git a/media/filters/android/video_frame_extractor_unittest.cc b/media/filters/android/video_frame_extractor_unittest.cc index 82425e7..31dc97c 100644 --- a/media/filters/android/video_frame_extractor_unittest.cc +++ b/media/filters/android/video_frame_extractor_unittest.cc
@@ -6,9 +6,9 @@ #include <memory> -#include "base/bind.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/test/task_environment.h" #include "base/test/test_mock_time_task_runner.h"
diff --git a/media/filters/audio_decoder_stream_unittest.cc b/media/filters/audio_decoder_stream_unittest.cc index 2620bb8a..2a5c1d4 100644 --- a/media/filters/audio_decoder_stream_unittest.cc +++ b/media/filters/audio_decoder_stream_unittest.cc
@@ -5,8 +5,8 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/task/sequenced_task_runner.h"
diff --git a/media/filters/audio_decoder_unittest.cc b/media/filters/audio_decoder_unittest.cc index e7f422a3..8cfa221 100644 --- a/media/filters/audio_decoder_unittest.cc +++ b/media/filters/audio_decoder_unittest.cc
@@ -8,10 +8,10 @@ #include <memory> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/containers/circular_deque.h" #include "base/format_macros.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/hash/md5.h" #include "base/run_loop.h" #include "base/strings/stringprintf.h"
diff --git a/media/filters/audio_file_reader.cc b/media/filters/audio_file_reader.cc index 200788ed..9d37f32 100644 --- a/media/filters/audio_file_reader.cc +++ b/media/filters/audio_file_reader.cc
@@ -10,8 +10,8 @@ #include <memory> #include <vector> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/logging.h" #include "base/numerics/safe_math.h" #include "base/time/time.h"
diff --git a/media/filters/audio_renderer_algorithm.cc b/media/filters/audio_renderer_algorithm.cc index 9fe0703..34a5cc8 100644 --- a/media/filters/audio_renderer_algorithm.cc +++ b/media/filters/audio_renderer_algorithm.cc
@@ -7,7 +7,7 @@ #include <algorithm> #include <cmath> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "cc/base/math_util.h" #include "media/base/audio_bus.h"
diff --git a/media/filters/audio_renderer_algorithm_unittest.cc b/media/filters/audio_renderer_algorithm_unittest.cc index f39cc12..a52f86be 100644 --- a/media/filters/audio_renderer_algorithm_unittest.cc +++ b/media/filters/audio_renderer_algorithm_unittest.cc
@@ -18,8 +18,8 @@ #include <memory> #include <vector> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "media/base/audio_buffer.h" #include "media/base/audio_bus.h" #include "media/base/audio_timestamp_helper.h"
diff --git a/media/filters/audio_video_metadata_extractor.cc b/media/filters/audio_video_metadata_extractor.cc index c2eb016..cb00249 100644 --- a/media/filters/audio_video_metadata_extractor.cc +++ b/media/filters/audio_video_metadata_extractor.cc
@@ -4,7 +4,7 @@ #include "media/filters/audio_video_metadata_extractor.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" #include "base/time/time.h"
diff --git a/media/filters/blocking_url_protocol.cc b/media/filters/blocking_url_protocol.cc index 3df4b70..4012605 100644 --- a/media/filters/blocking_url_protocol.cc +++ b/media/filters/blocking_url_protocol.cc
@@ -6,7 +6,7 @@ #include <stddef.h> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/synchronization/waitable_event.h" #include "base/threading/thread_restrictions.h" #include "media/base/data_source.h"
diff --git a/media/filters/blocking_url_protocol.h b/media/filters/blocking_url_protocol.h index f8bc159..c72ecf3 100644 --- a/media/filters/blocking_url_protocol.h +++ b/media/filters/blocking_url_protocol.h
@@ -7,7 +7,7 @@ #include <stdint.h> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/synchronization/lock.h" #include "base/synchronization/waitable_event.h"
diff --git a/media/filters/blocking_url_protocol_unittest.cc b/media/filters/blocking_url_protocol_unittest.cc index 21b20e1..7040507 100644 --- a/media/filters/blocking_url_protocol_unittest.cc +++ b/media/filters/blocking_url_protocol_unittest.cc
@@ -6,8 +6,8 @@ #include <memory> -#include "base/bind.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/synchronization/waitable_event.h" #include "media/base/test_data_util.h" #include "media/ffmpeg/ffmpeg_common.h"
diff --git a/media/filters/chunk_demuxer.cc b/media/filters/chunk_demuxer.cc index 3e8ea63..0805876 100644 --- a/media/filters/chunk_demuxer.cc +++ b/media/filters/chunk_demuxer.cc
@@ -9,8 +9,8 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/strings/string_number_conversions.h" #include "base/trace_event/trace_event.h" #include "media/base/audio_decoder_config.h"
diff --git a/media/filters/chunk_demuxer_unittest.cc b/media/filters/chunk_demuxer_unittest.cc index d74e2eb4..13508bb 100644 --- a/media/filters/chunk_demuxer_unittest.cc +++ b/media/filters/chunk_demuxer_unittest.cc
@@ -12,9 +12,9 @@ #include <queue> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/strings/string_number_conversions.h"
diff --git a/media/filters/dav1d_video_decoder.cc b/media/filters/dav1d_video_decoder.cc index ba69386..ad5ab1c8 100644 --- a/media/filters/dav1d_video_decoder.cc +++ b/media/filters/dav1d_video_decoder.cc
@@ -8,10 +8,10 @@ #include <string> #include <utility> -#include "base/bind.h" #include "base/bits.h" -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/strings/stringprintf.h" #include "base/task/sequenced_task_runner.h"
diff --git a/media/filters/dav1d_video_decoder.h b/media/filters/dav1d_video_decoder.h index fcb444e..b2a8557 100644 --- a/media/filters/dav1d_video_decoder.h +++ b/media/filters/dav1d_video_decoder.h
@@ -5,7 +5,7 @@ #ifndef MEDIA_FILTERS_DAV1D_VIDEO_DECODER_H_ #define MEDIA_FILTERS_DAV1D_VIDEO_DECODER_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted_memory.h" #include "base/sequence_checker.h"
diff --git a/media/filters/dav1d_video_decoder_unittest.cc b/media/filters/dav1d_video_decoder_unittest.cc index 4709254..b5d1bf1c 100644 --- a/media/filters/dav1d_video_decoder_unittest.cc +++ b/media/filters/dav1d_video_decoder_unittest.cc
@@ -7,8 +7,8 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/hash/md5.h" #include "base/run_loop.h" #include "base/test/task_environment.h"
diff --git a/media/filters/decoder_selector.cc b/media/filters/decoder_selector.cc index e83a9a3..b9d8568d 100644 --- a/media/filters/decoder_selector.cc +++ b/media/filters/decoder_selector.cc
@@ -7,9 +7,9 @@ #include <algorithm> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/logging.h" #include "base/metrics/histogram_functions.h"
diff --git a/media/filters/decoder_selector.h b/media/filters/decoder_selector.h index 16d3e07..38fd047 100644 --- a/media/filters/decoder_selector.h +++ b/media/filters/decoder_selector.h
@@ -8,7 +8,7 @@ #include <memory> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h"
diff --git a/media/filters/decoder_selector_unittest.cc b/media/filters/decoder_selector_unittest.cc index ffb91ce..b6275f1 100644 --- a/media/filters/decoder_selector_unittest.cc +++ b/media/filters/decoder_selector_unittest.cc
@@ -5,8 +5,8 @@ #include <memory> #include <tuple> -#include "base/bind.h" #include "base/check.h" +#include "base/functional/bind.h" #include "base/memory/scoped_refptr.h" #include "base/notreached.h" #include "base/test/gmock_callback_support.h"
diff --git a/media/filters/decoder_stream.cc b/media/filters/decoder_stream.cc index 0e96f04..215a17c0 100644 --- a/media/filters/decoder_stream.cc +++ b/media/filters/decoder_stream.cc
@@ -6,9 +6,9 @@ #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/logging.h" #include "base/task/sequenced_task_runner.h"
diff --git a/media/filters/decoder_stream.h b/media/filters/decoder_stream.h index ca62663..34c46d70 100644 --- a/media/filters/decoder_stream.h +++ b/media/filters/decoder_stream.h
@@ -8,9 +8,9 @@ #include <memory> #include <vector> -#include "base/callback.h" #include "base/compiler_specific.h" #include "base/containers/circular_deque.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h"
diff --git a/media/filters/decrypting_audio_decoder.cc b/media/filters/decrypting_audio_decoder.cc index cd48483..d361f58 100644 --- a/media/filters/decrypting_audio_decoder.cc +++ b/media/filters/decrypting_audio_decoder.cc
@@ -9,8 +9,8 @@ #include <cstdlib> #include <memory> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/logging.h" #include "base/strings/string_number_conversions.h"
diff --git a/media/filters/decrypting_audio_decoder.h b/media/filters/decrypting_audio_decoder.h index 82e3fe5..74f16858 100644 --- a/media/filters/decrypting_audio_decoder.h +++ b/media/filters/decrypting_audio_decoder.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h"
diff --git a/media/filters/decrypting_audio_decoder_unittest.cc b/media/filters/decrypting_audio_decoder_unittest.cc index 190007e..327c2578 100644 --- a/media/filters/decrypting_audio_decoder_unittest.cc +++ b/media/filters/decrypting_audio_decoder_unittest.cc
@@ -9,8 +9,8 @@ #include <string> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "base/test/gmock_callback_support.h" #include "base/test/gmock_move_support.h"
diff --git a/media/filters/decrypting_demuxer_stream.cc b/media/filters/decrypting_demuxer_stream.cc index 4c58288..6edb4a8 100644 --- a/media/filters/decrypting_demuxer_stream.cc +++ b/media/filters/decrypting_demuxer_stream.cc
@@ -4,8 +4,8 @@ #include "media/filters/decrypting_demuxer_stream.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/logging.h" #include "base/strings/string_number_conversions.h"
diff --git a/media/filters/decrypting_demuxer_stream.h b/media/filters/decrypting_demuxer_stream.h index 3c716ecb..7f00f05 100644 --- a/media/filters/decrypting_demuxer_stream.h +++ b/media/filters/decrypting_demuxer_stream.h
@@ -5,7 +5,7 @@ #ifndef MEDIA_FILTERS_DECRYPTING_DEMUXER_STREAM_H_ #define MEDIA_FILTERS_DECRYPTING_DEMUXER_STREAM_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h"
diff --git a/media/filters/decrypting_demuxer_stream_unittest.cc b/media/filters/decrypting_demuxer_stream_unittest.cc index 6864b9f4..89e42ae 100644 --- a/media/filters/decrypting_demuxer_stream_unittest.cc +++ b/media/filters/decrypting_demuxer_stream_unittest.cc
@@ -9,8 +9,8 @@ #include <string> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "base/test/gmock_callback_support.h" #include "base/test/gmock_move_support.h"
diff --git a/media/filters/decrypting_media_resource.cc b/media/filters/decrypting_media_resource.cc index 4d1621ff..a20ad43 100644 --- a/media/filters/decrypting_media_resource.cc +++ b/media/filters/decrypting_media_resource.cc
@@ -7,8 +7,8 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/task/sequenced_task_runner.h" #include "media/base/cdm_context.h"
diff --git a/media/filters/decrypting_media_resource.h b/media/filters/decrypting_media_resource.h index eeadcf95..be4f5f9 100644 --- a/media/filters/decrypting_media_resource.h +++ b/media/filters/decrypting_media_resource.h
@@ -7,7 +7,7 @@ #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h"
diff --git a/media/filters/decrypting_media_resource_unittest.cc b/media/filters/decrypting_media_resource_unittest.cc index 28cffbdf..037a360 100644 --- a/media/filters/decrypting_media_resource_unittest.cc +++ b/media/filters/decrypting_media_resource_unittest.cc
@@ -6,8 +6,8 @@ #include <string> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/test/gmock_callback_support.h" #include "base/test/mock_callback.h" #include "base/test/task_environment.h"
diff --git a/media/filters/decrypting_video_decoder.cc b/media/filters/decrypting_video_decoder.cc index 97a56f3..1f0ba6f 100644 --- a/media/filters/decrypting_video_decoder.cc +++ b/media/filters/decrypting_video_decoder.cc
@@ -4,8 +4,8 @@ #include "media/filters/decrypting_video_decoder.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/logging.h" #include "base/strings/string_number_conversions.h"
diff --git a/media/filters/decrypting_video_decoder.h b/media/filters/decrypting_video_decoder.h index 7d3dff1..0ef51d9a 100644 --- a/media/filters/decrypting_video_decoder.h +++ b/media/filters/decrypting_video_decoder.h
@@ -7,7 +7,7 @@ #include <stdint.h> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/sequence_checker.h"
diff --git a/media/filters/decrypting_video_decoder_unittest.cc b/media/filters/decrypting_video_decoder_unittest.cc index 605439b..b54b4c14 100644 --- a/media/filters/decrypting_video_decoder_unittest.cc +++ b/media/filters/decrypting_video_decoder_unittest.cc
@@ -9,8 +9,8 @@ #include <string> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "base/test/gmock_callback_support.h" #include "base/test/gmock_move_support.h"
diff --git a/media/filters/demuxer_perftest.cc b/media/filters/demuxer_perftest.cc index b7ee94d..70274b8 100644 --- a/media/filters/demuxer_perftest.cc +++ b/media/filters/demuxer_perftest.cc
@@ -7,7 +7,7 @@ #include <memory> #include "base/at_exit.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/strings/string_number_conversions.h" #include "base/task/single_thread_task_runner.h"
diff --git a/media/filters/fake_video_decoder.h b/media/filters/fake_video_decoder.h index 7c1def6..8687c82 100644 --- a/media/filters/fake_video_decoder.h +++ b/media/filters/fake_video_decoder.h
@@ -9,9 +9,9 @@ #include <list> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/memory/weak_ptr.h" #include "base/sequence_checker.h" #include "media/base/callback_holder.h"
diff --git a/media/filters/fake_video_decoder_unittest.cc b/media/filters/fake_video_decoder_unittest.cc index 4e9d2a7..f561d7b 100644 --- a/media/filters/fake_video_decoder_unittest.cc +++ b/media/filters/fake_video_decoder_unittest.cc
@@ -7,8 +7,8 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "base/test/task_environment.h" #include "media/base/decoder_buffer.h"
diff --git a/media/filters/ffmpeg_audio_decoder.cc b/media/filters/ffmpeg_audio_decoder.cc index dc0b292..3391ec3 100644 --- a/media/filters/ffmpeg_audio_decoder.cc +++ b/media/filters/ffmpeg_audio_decoder.cc
@@ -9,8 +9,8 @@ #include <functional> #include <memory> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/task/sequenced_task_runner.h" #include "base/task/single_thread_task_runner.h" #include "media/base/audio_buffer.h"
diff --git a/media/filters/ffmpeg_audio_decoder.h b/media/filters/ffmpeg_audio_decoder.h index 0a0bcbf8..83b5759a 100644 --- a/media/filters/ffmpeg_audio_decoder.h +++ b/media/filters/ffmpeg_audio_decoder.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/sequence_checker.h" #include "media/base/audio_buffer.h"
diff --git a/media/filters/ffmpeg_demuxer.cc b/media/filters/ffmpeg_demuxer.cc index 34c2fec..8438d37f 100644 --- a/media/filters/ffmpeg_demuxer.cc +++ b/media/filters/ffmpeg_demuxer.cc
@@ -10,9 +10,9 @@ #include <utility> #include "base/base64.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ptr_util.h" #include "base/metrics/histogram_functions.h" #include "base/metrics/histogram_macros.h"
diff --git a/media/filters/ffmpeg_demuxer.h b/media/filters/ffmpeg_demuxer.h index 4a614a514..5ebe7e0 100644 --- a/media/filters/ffmpeg_demuxer.h +++ b/media/filters/ffmpeg_demuxer.h
@@ -30,7 +30,7 @@ #include <utility> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/task/sequenced_task_runner.h"
diff --git a/media/filters/ffmpeg_demuxer_unittest.cc b/media/filters/ffmpeg_demuxer_unittest.cc index 45236c2..8e46897 100644 --- a/media/filters/ffmpeg_demuxer_unittest.cc +++ b/media/filters/ffmpeg_demuxer_unittest.cc
@@ -12,8 +12,8 @@ #include <string> #include <utility> -#include "base/bind.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/logging.h" #include "base/path_service.h"
diff --git a/media/filters/ffmpeg_video_decoder.cc b/media/filters/ffmpeg_video_decoder.cc index 7673e9c..0945657 100644 --- a/media/filters/ffmpeg_video_decoder.cc +++ b/media/filters/ffmpeg_video_decoder.cc
@@ -10,8 +10,8 @@ #include <algorithm> #include <memory> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/task/sequenced_task_runner.h" #include "media/base/bind_to_current_loop.h"
diff --git a/media/filters/ffmpeg_video_decoder.h b/media/filters/ffmpeg_video_decoder.h index ec7cfbb..e11cada7 100644 --- a/media/filters/ffmpeg_video_decoder.h +++ b/media/filters/ffmpeg_video_decoder.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h" #include "base/sequence_checker.h"
diff --git a/media/filters/ffmpeg_video_decoder_unittest.cc b/media/filters/ffmpeg_video_decoder_unittest.cc index a44a832..8b5daa3 100644 --- a/media/filters/ffmpeg_video_decoder_unittest.cc +++ b/media/filters/ffmpeg_video_decoder_unittest.cc
@@ -8,8 +8,8 @@ #include <string> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ref_counted.h" #include "base/memory/singleton.h" #include "base/run_loop.h"
diff --git a/media/filters/file_data_source.cc b/media/filters/file_data_source.cc index 180989a7..86b11793 100644 --- a/media/filters/file_data_source.cc +++ b/media/filters/file_data_source.cc
@@ -7,8 +7,8 @@ #include <algorithm> #include <utility> -#include "base/callback.h" #include "base/check_op.h" +#include "base/functional/callback.h" namespace media {
diff --git a/media/filters/file_data_source_unittest.cc b/media/filters/file_data_source_unittest.cc index bbb0c00..3c7155db 100644 --- a/media/filters/file_data_source_unittest.cc +++ b/media/filters/file_data_source_unittest.cc
@@ -7,8 +7,8 @@ #include <string> #include "base/base_paths.h" -#include "base/bind.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/path_service.h" #include "base/strings/utf_string_conversions.h" #include "media/base/test_helpers.h"
diff --git a/media/filters/frame_buffer_pool.cc b/media/filters/frame_buffer_pool.cc index c3b9665..96aef0e 100644 --- a/media/filters/frame_buffer_pool.cc +++ b/media/filters/frame_buffer_pool.cc
@@ -4,10 +4,10 @@ #include "media/filters/frame_buffer_pool.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/check_op.h" #include "base/containers/cxx20_erase.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/process/memory.h" #include "base/ranges/algorithm.h"
diff --git a/media/filters/frame_buffer_pool.h b/media/filters/frame_buffer_pool.h index 11224d4e..613d813 100644 --- a/media/filters/frame_buffer_pool.h +++ b/media/filters/frame_buffer_pool.h
@@ -9,7 +9,7 @@ #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h" #include "base/sequence_checker.h"
diff --git a/media/filters/frame_processor.h b/media/filters/frame_processor.h index bc96a76..d68f9211 100644 --- a/media/filters/frame_processor.h +++ b/media/filters/frame_processor.h
@@ -8,7 +8,7 @@ #include <map> #include <memory> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/time/time.h" #include "media/base/media_export.h"
diff --git a/media/filters/frame_processor_unittest.cc b/media/filters/frame_processor_unittest.cc index 51a7f1e3..12d306c3 100644 --- a/media/filters/frame_processor_unittest.cc +++ b/media/filters/frame_processor_unittest.cc
@@ -11,7 +11,7 @@ #include <string> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h"
diff --git a/media/filters/hls_data_source_provider.h b/media/filters/hls_data_source_provider.h index a19c49bb8..98133da 100644 --- a/media/filters/hls_data_source_provider.h +++ b/media/filters/hls_data_source_provider.h
@@ -8,7 +8,7 @@ #include <cstdint> #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/strings/string_piece_forward.h" #include "media/base/media_export.h" #include "media/base/status.h"
diff --git a/media/filters/mac/audio_toolbox_audio_decoder.cc b/media/filters/mac/audio_toolbox_audio_decoder.cc index e837d96..659e303 100644 --- a/media/filters/mac/audio_toolbox_audio_decoder.cc +++ b/media/filters/mac/audio_toolbox_audio_decoder.cc
@@ -5,7 +5,7 @@ #include "media/filters/mac/audio_toolbox_audio_decoder.h" #include "base/auto_reset.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/mac/mac_logging.h" #include "base/ranges/algorithm.h"
diff --git a/media/filters/mac/audio_toolbox_audio_encoder.cc b/media/filters/mac/audio_toolbox_audio_encoder.cc index ffd30ec7a..c187527 100644 --- a/media/filters/mac/audio_toolbox_audio_encoder.cc +++ b/media/filters/mac/audio_toolbox_audio_encoder.cc
@@ -4,7 +4,7 @@ #include "media/filters/mac/audio_toolbox_audio_encoder.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/mac/mac_logging.h" #include "base/memory/raw_ptr.h"
diff --git a/media/filters/media_file_checker.cc b/media/filters/media_file_checker.cc index 422068b..dca328bc 100644 --- a/media/filters/media_file_checker.cc +++ b/media/filters/media_file_checker.cc
@@ -10,7 +10,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/time/time.h" #include "media/ffmpeg/ffmpeg_common.h" #include "media/ffmpeg/ffmpeg_decoding_loop.h"
diff --git a/media/filters/memory_data_source.cc b/media/filters/memory_data_source.cc index 487282a..516055b6 100644 --- a/media/filters/memory_data_source.cc +++ b/media/filters/memory_data_source.cc
@@ -6,8 +6,8 @@ #include <algorithm> -#include "base/callback.h" #include "base/check.h" +#include "base/functional/callback.h" namespace media {
diff --git a/media/filters/memory_data_source_unittest.cc b/media/filters/memory_data_source_unittest.cc index af1908c..722f191 100644 --- a/media/filters/memory_data_source_unittest.cc +++ b/media/filters/memory_data_source_unittest.cc
@@ -6,8 +6,8 @@ #include <memory> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/rand_util.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/media/filters/offloading_video_decoder.cc b/media/filters/offloading_video_decoder.cc index fd67c591..2805443 100644 --- a/media/filters/offloading_video_decoder.cc +++ b/media/filters/offloading_video_decoder.cc
@@ -6,9 +6,9 @@ #include <memory> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/synchronization/atomic_flag.h" #include "base/task/sequenced_task_runner.h" #include "base/task/thread_pool.h"
diff --git a/media/filters/offloading_video_decoder.h b/media/filters/offloading_video_decoder.h index c3c1a79..9deee09 100644 --- a/media/filters/offloading_video_decoder.h +++ b/media/filters/offloading_video_decoder.h
@@ -5,7 +5,7 @@ #ifndef MEDIA_FILTERS_OFFLOADING_VIDEO_DECODER_H_ #define MEDIA_FILTERS_OFFLOADING_VIDEO_DECODER_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/weak_ptr.h" #include "base/sequence_checker.h" #include "media/base/video_codecs.h"
diff --git a/media/filters/offloading_video_decoder_unittest.cc b/media/filters/offloading_video_decoder_unittest.cc index 1ae7d50..95cbe172 100644 --- a/media/filters/offloading_video_decoder_unittest.cc +++ b/media/filters/offloading_video_decoder_unittest.cc
@@ -4,8 +4,8 @@ #include "media/filters/offloading_video_decoder.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/test/gmock_callback_support.h"
diff --git a/media/filters/pipeline_controller.cc b/media/filters/pipeline_controller.cc index 62f8d171..35dc4f32 100644 --- a/media/filters/pipeline_controller.cc +++ b/media/filters/pipeline_controller.cc
@@ -4,7 +4,7 @@ #include "media/filters/pipeline_controller.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "media/base/demuxer.h" namespace media {
diff --git a/media/filters/pipeline_controller.h b/media/filters/pipeline_controller.h index 4eff4f7..d50290a 100644 --- a/media/filters/pipeline_controller.h +++ b/media/filters/pipeline_controller.h
@@ -5,7 +5,7 @@ #ifndef MEDIA_FILTERS_PIPELINE_CONTROLLER_H_ #define MEDIA_FILTERS_PIPELINE_CONTROLLER_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/threading/thread_checker.h"
diff --git a/media/filters/pipeline_controller_unittest.cc b/media/filters/pipeline_controller_unittest.cc index 823adbadb0..a590c62e 100644 --- a/media/filters/pipeline_controller_unittest.cc +++ b/media/filters/pipeline_controller_unittest.cc
@@ -6,8 +6,8 @@ #include <memory> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h" #include "base/notreached.h"
diff --git a/media/filters/source_buffer_parse_warnings.h b/media/filters/source_buffer_parse_warnings.h index f921d49..41b89eb 100644 --- a/media/filters/source_buffer_parse_warnings.h +++ b/media/filters/source_buffer_parse_warnings.h
@@ -5,7 +5,7 @@ #ifndef MEDIA_FILTERS_SOURCE_BUFFER_PARSE_WARNINGS_H_ #define MEDIA_FILTERS_SOURCE_BUFFER_PARSE_WARNINGS_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" namespace media {
diff --git a/media/filters/source_buffer_range.h b/media/filters/source_buffer_range.h index 51d734a..f6d36ec 100644 --- a/media/filters/source_buffer_range.h +++ b/media/filters/source_buffer_range.h
@@ -9,7 +9,7 @@ #include <map> #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" #include "base/time/time.h" #include "media/base/media_export.h"
diff --git a/media/filters/source_buffer_state.cc b/media/filters/source_buffer_state.cc index 7d18724..ca3c451 100644 --- a/media/filters/source_buffer_state.cc +++ b/media/filters/source_buffer_state.cc
@@ -6,9 +6,9 @@ #include <set> -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/feature_list.h" +#include "base/functional/callback_helpers.h" #include "base/ranges/algorithm.h" #include "base/strings/string_number_conversions.h" #include "build/build_config.h"
diff --git a/media/filters/source_buffer_state.h b/media/filters/source_buffer_state.h index e7eff93..77a7303 100644 --- a/media/filters/source_buffer_state.h +++ b/media/filters/source_buffer_state.h
@@ -5,7 +5,7 @@ #ifndef MEDIA_FILTERS_SOURCE_BUFFER_STATE_H_ #define MEDIA_FILTERS_SOURCE_BUFFER_STATE_H_ -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/memory_pressure_listener.h" #include "base/memory/raw_ptr.h" #include "base/time/time.h"
diff --git a/media/filters/source_buffer_state_unittest.cc b/media/filters/source_buffer_state_unittest.cc index 78f137d..184c98a 100644 --- a/media/filters/source_buffer_state_unittest.cc +++ b/media/filters/source_buffer_state_unittest.cc
@@ -6,7 +6,7 @@ #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h" #include "base/strings/string_number_conversions.h"
diff --git a/media/filters/source_buffer_stream.cc b/media/filters/source_buffer_stream.cc index dfa917c..d7412584 100644 --- a/media/filters/source_buffer_stream.cc +++ b/media/filters/source_buffer_stream.cc
@@ -10,7 +10,7 @@ #include <sstream> #include <string> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/trace_event/trace_event.h" #include "media/base/demuxer_memory_limit.h"
diff --git a/media/filters/source_buffer_stream_unittest.cc b/media/filters/source_buffer_stream_unittest.cc index 4f92d6d..81af440 100644 --- a/media/filters/source_buffer_stream_unittest.cc +++ b/media/filters/source_buffer_stream_unittest.cc
@@ -11,8 +11,8 @@ #include <string> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/numerics/safe_conversions.h" #include "base/strings/string_number_conversions.h"
diff --git a/media/filters/video_decoder_stream_unittest.cc b/media/filters/video_decoder_stream_unittest.cc index 2f27ea8..5404e13 100644 --- a/media/filters/video_decoder_stream_unittest.cc +++ b/media/filters/video_decoder_stream_unittest.cc
@@ -6,8 +6,8 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/strings/string_number_conversions.h"
diff --git a/media/filters/video_renderer_algorithm.h b/media/filters/video_renderer_algorithm.h index 58e1a725..aeacd6d 100644 --- a/media/filters/video_renderer_algorithm.h +++ b/media/filters/video_renderer_algorithm.h
@@ -8,8 +8,8 @@ #include <stddef.h> #include <stdint.h> -#include "base/callback.h" #include "base/containers/circular_deque.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h" #include "base/time/time.h"
diff --git a/media/filters/video_renderer_algorithm_unittest.cc b/media/filters/video_renderer_algorithm_unittest.cc index f4a6262..231dce2 100644 --- a/media/filters/video_renderer_algorithm_unittest.cc +++ b/media/filters/video_renderer_algorithm_unittest.cc
@@ -10,8 +10,8 @@ #include <cmath> #include <tuple> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ref_counted.h" #include "base/strings/stringprintf.h" #include "base/test/simple_test_tick_clock.h"
diff --git a/media/filters/vp9_parser.cc b/media/filters/vp9_parser.cc index 3cbc758d..0e2bb6e 100644 --- a/media/filters/vp9_parser.cc +++ b/media/filters/vp9_parser.cc
@@ -13,10 +13,10 @@ #include <algorithm> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/containers/circular_deque.h" #include "base/cxx17_backports.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/numerics/safe_conversions.h" #include "base/sys_byteorder.h"
diff --git a/media/filters/vp9_parser.h b/media/filters/vp9_parser.h index e58a4c5..e76701b6 100644 --- a/media/filters/vp9_parser.h +++ b/media/filters/vp9_parser.h
@@ -18,8 +18,8 @@ #include <memory> -#include "base/callback.h" #include "base/containers/circular_deque.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "media/base/decrypt_config.h" #include "media/base/media_export.h"
diff --git a/media/filters/vpx_video_decoder.cc b/media/filters/vpx_video_decoder.cc index 09b0846..3bff7689 100644 --- a/media/filters/vpx_video_decoder.cc +++ b/media/filters/vpx_video_decoder.cc
@@ -11,9 +11,9 @@ #include <string> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/logging.h" #include "base/metrics/histogram_macros.h"
diff --git a/media/filters/vpx_video_decoder.h b/media/filters/vpx_video_decoder.h index eb0bc74..cdb2a917 100644 --- a/media/filters/vpx_video_decoder.h +++ b/media/filters/vpx_video_decoder.h
@@ -5,7 +5,7 @@ #ifndef MEDIA_FILTERS_VPX_VIDEO_DECODER_H_ #define MEDIA_FILTERS_VPX_VIDEO_DECODER_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/sequence_checker.h" #include "media/base/supported_video_decoder_config.h" #include "media/base/video_decoder.h"
diff --git a/media/filters/vpx_video_decoder_fuzzertest.cc b/media/filters/vpx_video_decoder_fuzzertest.cc index c86eb0c..1f7aa91e 100644 --- a/media/filters/vpx_video_decoder_fuzzertest.cc +++ b/media/filters/vpx_video_decoder_fuzzertest.cc
@@ -8,9 +8,9 @@ #include <random> #include "base/at_exit.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/run_loop.h" #include "base/test/task_environment.h"
diff --git a/media/filters/vpx_video_decoder_unittest.cc b/media/filters/vpx_video_decoder_unittest.cc index ac28313..0df350a 100644 --- a/media/filters/vpx_video_decoder_unittest.cc +++ b/media/filters/vpx_video_decoder_unittest.cc
@@ -6,8 +6,8 @@ #include <string> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "base/test/task_environment.h" #include "build/build_config.h"
diff --git a/media/filters/win/media_foundation_audio_decoder.cc b/media/filters/win/media_foundation_audio_decoder.cc index aa86d56..b84418e 100644 --- a/media/filters/win/media_foundation_audio_decoder.cc +++ b/media/filters/win/media_foundation_audio_decoder.cc
@@ -8,7 +8,7 @@ #include <wmcodecdsp.h> #include "base/auto_reset.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/task/single_thread_task_runner.h" #include "base/win/scoped_co_mem.h"
diff --git a/media/filters/win/media_foundation_audio_decoder.h b/media/filters/win/media_foundation_audio_decoder.h index d684182..2ebb53c 100644 --- a/media/filters/win/media_foundation_audio_decoder.h +++ b/media/filters/win/media_foundation_audio_decoder.h
@@ -10,7 +10,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/sequence_checker.h" #include "media/base/audio_buffer.h" #include "media/base/audio_decoder.h"
diff --git a/media/formats/common/stream_parser_test_base.cc b/media/formats/common/stream_parser_test_base.cc index c174730..ab13eaa 100644 --- a/media/formats/common/stream_parser_test_base.cc +++ b/media/formats/common/stream_parser_test_base.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "media/base/media_log.h" #include "media/base/media_track.h" #include "media/base/media_tracks.h"
diff --git a/media/formats/hls/media_playlist_test_builder.h b/media/formats/hls/media_playlist_test_builder.h index c9a703ec8..862e38c 100644 --- a/media/formats/hls/media_playlist_test_builder.h +++ b/media/formats/hls/media_playlist_test_builder.h
@@ -5,8 +5,8 @@ #ifndef MEDIA_FORMATS_HLS_MEDIA_PLAYLIST_TEST_BUILDER_H_ #define MEDIA_FORMATS_HLS_MEDIA_PLAYLIST_TEST_BUILDER_H_ -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/location.h" #include "base/memory/raw_ptr.h" #include "base/time/time.h"
diff --git a/media/formats/hls/multivariant_playlist_test_builder.cc b/media/formats/hls/multivariant_playlist_test_builder.cc index 84034ff..b559ff9 100644 --- a/media/formats/hls/multivariant_playlist_test_builder.cc +++ b/media/formats/hls/multivariant_playlist_test_builder.cc
@@ -4,7 +4,7 @@ #include "media/formats/hls/multivariant_playlist_test_builder.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/location.h" #include "media/formats/hls/audio_rendition.h" #include "media/formats/hls/multivariant_playlist.h"
diff --git a/media/formats/hls/multivariant_playlist_test_builder.h b/media/formats/hls/multivariant_playlist_test_builder.h index 3f22182..2df3158 100644 --- a/media/formats/hls/multivariant_playlist_test_builder.h +++ b/media/formats/hls/multivariant_playlist_test_builder.h
@@ -8,8 +8,8 @@ #include <string> #include <vector> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/location.h" #include "base/strings/string_piece.h" #include "media/formats/hls/audio_rendition.h"
diff --git a/media/formats/hls/playlist_test_builder.h b/media/formats/hls/playlist_test_builder.h index ecede1b..2d2279c6 100644 --- a/media/formats/hls/playlist_test_builder.h +++ b/media/formats/hls/playlist_test_builder.h
@@ -9,8 +9,8 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/location.h" #include "media/formats/hls/playlist.h" #include "media/formats/hls/source_string.h"
diff --git a/media/formats/mp2t/es_adapter_video.h b/media/formats/mp2t/es_adapter_video.h index 453026c93..14c0498c 100644 --- a/media/formats/mp2t/es_adapter_video.h +++ b/media/formats/mp2t/es_adapter_video.h
@@ -10,8 +10,8 @@ #include <list> #include <utility> -#include "base/callback.h" #include "base/containers/circular_deque.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" #include "base/time/time.h" #include "media/base/media_export.h"
diff --git a/media/formats/mp2t/es_adapter_video_unittest.cc b/media/formats/mp2t/es_adapter_video_unittest.cc index edb0ee8..a7d3be73 100644 --- a/media/formats/mp2t/es_adapter_video_unittest.cc +++ b/media/formats/mp2t/es_adapter_video_unittest.cc
@@ -11,7 +11,7 @@ #include <string> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/string_util.h" #include "base/time/time.h" #include "media/base/media_util.h"
diff --git a/media/formats/mp2t/es_parser.h b/media/formats/mp2t/es_parser.h index 3d9e2cf..6e7b482 100644 --- a/media/formats/mp2t/es_parser.h +++ b/media/formats/mp2t/es_parser.h
@@ -11,7 +11,7 @@ #include <memory> #include <utility> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" #include "base/time/time.h" #include "media/base/media_export.h"
diff --git a/media/formats/mp2t/es_parser_adts.h b/media/formats/mp2t/es_parser_adts.h index dbadd992..ae7316a 100644 --- a/media/formats/mp2t/es_parser_adts.h +++ b/media/formats/mp2t/es_parser_adts.h
@@ -10,8 +10,8 @@ #include <memory> #include <utility> -#include "base/callback.h" #include "base/compiler_specific.h" +#include "base/functional/callback.h" #include "media/base/audio_decoder_config.h" #include "media/base/decrypt_config.h" #include "media/base/media_export.h"
diff --git a/media/formats/mp2t/es_parser_adts_fuzzer.cc b/media/formats/mp2t/es_parser_adts_fuzzer.cc index 12e290e..369d3a2 100644 --- a/media/formats/mp2t/es_parser_adts_fuzzer.cc +++ b/media/formats/mp2t/es_parser_adts_fuzzer.cc
@@ -5,7 +5,7 @@ #include <stddef.h> #include <stdint.h> -#include "base/bind.h" +#include "base/functional/bind.h" #include "media/base/stream_parser_buffer.h" #include "media/formats/mp2t/es_parser_adts.h"
diff --git a/media/formats/mp2t/es_parser_adts_unittest.cc b/media/formats/mp2t/es_parser_adts_unittest.cc index ee7cbf1..db62bac 100644 --- a/media/formats/mp2t/es_parser_adts_unittest.cc +++ b/media/formats/mp2t/es_parser_adts_unittest.cc
@@ -4,7 +4,7 @@ #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/time/time.h" #include "media/base/stream_parser_buffer.h" #include "media/formats/mp2t/es_parser_adts.h"
diff --git a/media/formats/mp2t/es_parser_h264.h b/media/formats/mp2t/es_parser_h264.h index 6769b6f..a790cc16 100644 --- a/media/formats/mp2t/es_parser_h264.h +++ b/media/formats/mp2t/es_parser_h264.h
@@ -10,8 +10,8 @@ #include <memory> #include <utility> -#include "base/callback.h" #include "base/compiler_specific.h" +#include "base/functional/callback.h" #include "media/base/media_export.h" #include "media/base/ranges.h" #include "media/base/video_decoder_config.h"
diff --git a/media/formats/mp2t/es_parser_h264_fuzzer.cc b/media/formats/mp2t/es_parser_h264_fuzzer.cc index e90d685..078794c1f 100644 --- a/media/formats/mp2t/es_parser_h264_fuzzer.cc +++ b/media/formats/mp2t/es_parser_h264_fuzzer.cc
@@ -5,7 +5,7 @@ #include <stddef.h> #include <stdint.h> -#include "base/bind.h" +#include "base/functional/bind.h" #include "media/base/stream_parser_buffer.h" #include "media/formats/mp2t/es_parser_h264.h"
diff --git a/media/formats/mp2t/es_parser_h264_unittest.cc b/media/formats/mp2t/es_parser_h264_unittest.cc index 428939e7..c15cd7c 100644 --- a/media/formats/mp2t/es_parser_h264_unittest.cc +++ b/media/formats/mp2t/es_parser_h264_unittest.cc
@@ -9,8 +9,8 @@ #include <string> #include <vector> -#include "base/bind.h" #include "base/check.h" +#include "base/functional/bind.h" #include "base/strings/string_util.h" #include "base/time/time.h" #include "media/base/stream_parser_buffer.h"
diff --git a/media/formats/mp2t/es_parser_mpeg1audio.cc b/media/formats/mp2t/es_parser_mpeg1audio.cc index eb046520..46919d8a2 100644 --- a/media/formats/mp2t/es_parser_mpeg1audio.cc +++ b/media/formats/mp2t/es_parser_mpeg1audio.cc
@@ -6,7 +6,7 @@ #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/strings/string_number_conversions.h" #include "media/base/audio_timestamp_helper.h"
diff --git a/media/formats/mp2t/es_parser_mpeg1audio.h b/media/formats/mp2t/es_parser_mpeg1audio.h index 41723de..550eab5 100644 --- a/media/formats/mp2t/es_parser_mpeg1audio.h +++ b/media/formats/mp2t/es_parser_mpeg1audio.h
@@ -11,8 +11,8 @@ #include <memory> #include <utility> -#include "base/callback.h" #include "base/compiler_specific.h" +#include "base/functional/callback.h" #include "base/time/time.h" #include "media/base/audio_decoder_config.h" #include "media/base/media_export.h"
diff --git a/media/formats/mp2t/es_parser_mpeg1audio_fuzzer.cc b/media/formats/mp2t/es_parser_mpeg1audio_fuzzer.cc index 62f5436e..97d1e1d8 100644 --- a/media/formats/mp2t/es_parser_mpeg1audio_fuzzer.cc +++ b/media/formats/mp2t/es_parser_mpeg1audio_fuzzer.cc
@@ -7,7 +7,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "media/base/media_util.h" #include "media/base/stream_parser_buffer.h" #include "media/formats/mp2t/es_parser_mpeg1audio.h"
diff --git a/media/formats/mp2t/es_parser_mpeg1audio_unittest.cc b/media/formats/mp2t/es_parser_mpeg1audio_unittest.cc index e4361176..ff81413d 100644 --- a/media/formats/mp2t/es_parser_mpeg1audio_unittest.cc +++ b/media/formats/mp2t/es_parser_mpeg1audio_unittest.cc
@@ -4,7 +4,7 @@ #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/time/time.h" #include "media/base/media_util.h" #include "media/base/stream_parser_buffer.h"
diff --git a/media/formats/mp2t/mp2t_stream_parser.cc b/media/formats/mp2t/mp2t_stream_parser.cc index 0e7fc3d..5e60463a 100644 --- a/media/formats/mp2t/mp2t_stream_parser.cc +++ b/media/formats/mp2t/mp2t_stream_parser.cc
@@ -7,8 +7,8 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/numerics/checked_math.h" #include "media/base/byte_queue.h" #include "media/base/media_tracks.h"
diff --git a/media/formats/mp2t/mp2t_stream_parser_unittest.cc b/media/formats/mp2t/mp2t_stream_parser_unittest.cc index 0e095685..e15410c 100644 --- a/media/formats/mp2t/mp2t_stream_parser_unittest.cc +++ b/media/formats/mp2t/mp2t_stream_parser_unittest.cc
@@ -11,8 +11,8 @@ #include <memory> #include <string> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/memory/ref_counted.h" #include "base/strings/string_number_conversions.h"
diff --git a/media/formats/mp2t/ts_section_cat.h b/media/formats/mp2t/ts_section_cat.h index 6bc5c74..9d2e34a4 100644 --- a/media/formats/mp2t/ts_section_cat.h +++ b/media/formats/mp2t/ts_section_cat.h
@@ -5,7 +5,7 @@ #ifndef MEDIA_FORMATS_MP2T_TS_SECTION_CAT_H_ #define MEDIA_FORMATS_MP2T_TS_SECTION_CAT_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "media/base/encryption_scheme.h" #include "media/formats/mp2t/ts_section_psi.h"
diff --git a/media/formats/mp2t/ts_section_cets_ecm.h b/media/formats/mp2t/ts_section_cets_ecm.h index 7ea876f..8bc59f5 100644 --- a/media/formats/mp2t/ts_section_cets_ecm.h +++ b/media/formats/mp2t/ts_section_cets_ecm.h
@@ -9,7 +9,7 @@ #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "media/formats/mp2t/ts_section.h" namespace media {
diff --git a/media/formats/mp2t/ts_section_cets_pssh.h b/media/formats/mp2t/ts_section_cets_pssh.h index d358f85b..94416d4 100644 --- a/media/formats/mp2t/ts_section_cets_pssh.h +++ b/media/formats/mp2t/ts_section_cets_pssh.h
@@ -8,7 +8,7 @@ #include <stdint.h> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "media/base/byte_queue.h" #include "media/formats/mp2t/ts_section.h"
diff --git a/media/formats/mp2t/ts_section_pat.h b/media/formats/mp2t/ts_section_pat.h index f865296..52a470c 100644 --- a/media/formats/mp2t/ts_section_pat.h +++ b/media/formats/mp2t/ts_section_pat.h
@@ -5,8 +5,8 @@ #ifndef MEDIA_FORMATS_MP2T_TS_SECTION_PAT_H_ #define MEDIA_FORMATS_MP2T_TS_SECTION_PAT_H_ -#include "base/callback.h" #include "base/compiler_specific.h" +#include "base/functional/callback.h" #include "media/formats/mp2t/ts_section_psi.h" namespace media {
diff --git a/media/formats/mp2t/ts_section_pmt.h b/media/formats/mp2t/ts_section_pmt.h index 10c76c0..d5fc6a0 100644 --- a/media/formats/mp2t/ts_section_pmt.h +++ b/media/formats/mp2t/ts_section_pmt.h
@@ -5,8 +5,8 @@ #ifndef MEDIA_FORMATS_MP2T_TS_SECTION_PMT_H_ #define MEDIA_FORMATS_MP2T_TS_SECTION_PMT_H_ -#include "base/callback.h" #include "base/compiler_specific.h" +#include "base/functional/callback.h" #include "media/formats/mp2t/descriptors.h" #include "media/formats/mp2t/ts_section_psi.h"
diff --git a/media/formats/mp4/mp4_stream_parser.cc b/media/formats/mp4/mp4_stream_parser.cc index 27e2b9d..a8241e1 100644 --- a/media/formats/mp4/mp4_stream_parser.cc +++ b/media/formats/mp4/mp4_stream_parser.cc
@@ -11,7 +11,7 @@ #include <utility> #include <vector> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/numerics/math_constants.h" #include "base/strings/string_number_conversions.h"
diff --git a/media/formats/mp4/mp4_stream_parser.h b/media/formats/mp4/mp4_stream_parser.h index 4ded7cd..52ae44a6 100644 --- a/media/formats/mp4/mp4_stream_parser.h +++ b/media/formats/mp4/mp4_stream_parser.h
@@ -11,8 +11,8 @@ #include <set> #include <vector> -#include "base/callback.h" #include "base/compiler_specific.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "media/base/media_export.h" #include "media/base/stream_parser.h"
diff --git a/media/formats/mp4/mp4_stream_parser_unittest.cc b/media/formats/mp4/mp4_stream_parser_unittest.cc index e24fc69b5..42bd4d6 100644 --- a/media/formats/mp4/mp4_stream_parser_unittest.cc +++ b/media/formats/mp4/mp4_stream_parser_unittest.cc
@@ -12,8 +12,8 @@ #include <string> #include <tuple> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/memory/ref_counted.h" #include "base/test/metrics/histogram_tester.h"
diff --git a/media/formats/mpeg/mpeg_audio_stream_parser_base.cc b/media/formats/mpeg/mpeg_audio_stream_parser_base.cc index 5e77078..d4bc4fc 100644 --- a/media/formats/mpeg/mpeg_audio_stream_parser_base.cc +++ b/media/formats/mpeg/mpeg_audio_stream_parser_base.cc
@@ -6,8 +6,8 @@ #include <memory> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/numerics/checked_math.h" #include "base/time/time.h" #include "media/base/byte_queue.h"
diff --git a/media/formats/mpeg/mpeg_audio_stream_parser_base.h b/media/formats/mpeg/mpeg_audio_stream_parser_base.h index be776ce..b879f81b 100644 --- a/media/formats/mpeg/mpeg_audio_stream_parser_base.h +++ b/media/formats/mpeg/mpeg_audio_stream_parser_base.h
@@ -11,7 +11,7 @@ #include <set> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "media/base/audio_decoder_config.h" #include "media/base/audio_timestamp_helper.h"
diff --git a/media/formats/webcodecs/webcodecs_encoded_chunk_stream_parser.cc b/media/formats/webcodecs/webcodecs_encoded_chunk_stream_parser.cc index 6a0c6e1f..ad23416 100644 --- a/media/formats/webcodecs/webcodecs_encoded_chunk_stream_parser.cc +++ b/media/formats/webcodecs/webcodecs_encoded_chunk_stream_parser.cc
@@ -6,7 +6,7 @@ #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/logging.h" #include "base/notreached.h" #include "media/base/media_log.h"
diff --git a/media/formats/webm/webm_cluster_parser_unittest.cc b/media/formats/webm/webm_cluster_parser_unittest.cc index 4add1d85..4f6c180 100644 --- a/media/formats/webm/webm_cluster_parser_unittest.cc +++ b/media/formats/webm/webm_cluster_parser_unittest.cc
@@ -13,7 +13,7 @@ #include <string> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/strings/string_number_conversions.h" #include "media/base/audio_decoder_config.h"
diff --git a/media/formats/webm/webm_content_encodings_client.h b/media/formats/webm/webm_content_encodings_client.h index 16124f4a..1b3ad58 100644 --- a/media/formats/webm/webm_content_encodings_client.h +++ b/media/formats/webm/webm_content_encodings_client.h
@@ -10,8 +10,8 @@ #include <memory> #include <vector> -#include "base/callback.h" #include "base/compiler_specific.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "media/base/media_export.h" #include "media/base/media_log.h"
diff --git a/media/formats/webm/webm_content_encodings_client_unittest.cc b/media/formats/webm/webm_content_encodings_client_unittest.cc index b864bf7d..a9e8a12 100644 --- a/media/formats/webm/webm_content_encodings_client_unittest.cc +++ b/media/formats/webm/webm_content_encodings_client_unittest.cc
@@ -8,7 +8,7 @@ #include <string> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/string_number_conversions.h" #include "media/base/mock_media_log.h" #include "media/formats/webm/webm_constants.h"
diff --git a/media/formats/webm/webm_stream_parser.cc b/media/formats/webm/webm_stream_parser.cc index f3640d9..54d46f3 100644 --- a/media/formats/webm/webm_stream_parser.cc +++ b/media/formats/webm/webm_stream_parser.cc
@@ -7,8 +7,8 @@ #include <memory> #include <string> -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/numerics/checked_math.h" #include "base/strings/string_number_conversions.h"
diff --git a/media/formats/webm/webm_stream_parser_unittest.cc b/media/formats/webm/webm_stream_parser_unittest.cc index 45ebfc8..8bfa66e 100644 --- a/media/formats/webm/webm_stream_parser_unittest.cc +++ b/media/formats/webm/webm_stream_parser_unittest.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "media/base/decoder_buffer.h" #include "media/base/demuxer.h" #include "media/base/media_tracks.h"
diff --git a/media/fuchsia/audio/fake_audio_capturer.cc b/media/fuchsia/audio/fake_audio_capturer.cc index fff595c..a9a7e96 100644 --- a/media/fuchsia/audio/fake_audio_capturer.cc +++ b/media/fuchsia/audio/fake_audio_capturer.cc
@@ -6,8 +6,8 @@ #include <string.h> -#include "base/bind.h" #include "base/fuchsia/fuchsia_logging.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/notreached.h" #include "base/ranges/algorithm.h"
diff --git a/media/fuchsia/cdm/fuchsia_cdm.h b/media/fuchsia/cdm/fuchsia_cdm.h index 075c410c..94dc715e 100644 --- a/media/fuchsia/cdm/fuchsia_cdm.h +++ b/media/fuchsia/cdm/fuchsia_cdm.h
@@ -7,8 +7,8 @@ #include <fuchsia/media/drm/cpp/fidl.h> -#include "base/callback_forward.h" #include "base/containers/flat_map.h" +#include "base/functional/callback_forward.h" #include "media/base/callback_registry.h" #include "media/base/cdm_context.h" #include "media/base/cdm_promise_adapter.h"
diff --git a/media/fuchsia/cdm/fuchsia_cdm_factory.cc b/media/fuchsia/cdm/fuchsia_cdm_factory.cc index 2c7da55f..2d88003d 100644 --- a/media/fuchsia/cdm/fuchsia_cdm_factory.cc +++ b/media/fuchsia/cdm/fuchsia_cdm_factory.cc
@@ -4,7 +4,7 @@ #include "media/fuchsia/cdm/fuchsia_cdm_factory.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "media/base/bind_to_current_loop.h" #include "media/base/cdm_config.h" #include "media/base/key_systems.h"
diff --git a/media/fuchsia/cdm/fuchsia_stream_decryptor.cc b/media/fuchsia/cdm/fuchsia_stream_decryptor.cc index 2cbf5ba..a99105b 100644 --- a/media/fuchsia/cdm/fuchsia_stream_decryptor.cc +++ b/media/fuchsia/cdm/fuchsia_stream_decryptor.cc
@@ -7,8 +7,8 @@ #include <fuchsia/media/cpp/fidl.h> #include <fuchsia/media/drm/cpp/fidl.h> -#include "base/bind.h" #include "base/fuchsia/fuchsia_logging.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "media/base/bind_to_current_loop.h" #include "media/base/decoder_buffer.h"
diff --git a/media/fuchsia/cdm/service/fuchsia_cdm_manager.cc b/media/fuchsia/cdm/service/fuchsia_cdm_manager.cc index f8cbc90..3923af1a 100644 --- a/media/fuchsia/cdm/service/fuchsia_cdm_manager.cc +++ b/media/fuchsia/cdm/service/fuchsia_cdm_manager.cc
@@ -8,8 +8,6 @@ #include <lib/fidl/cpp/binding_set.h> #include <lib/fpromise/promise.h> -#include "base/bind.h" -#include "base/callback.h" #include "base/containers/flat_set.h" #include "base/containers/unique_ptr_adapters.h" #include "base/files/file_enumerator.h" @@ -17,6 +15,8 @@ #include "base/files/file_util.h" #include "base/fuchsia/file_utils.h" #include "base/fuchsia/fuchsia_logging.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/hash/hash.h" #include "base/logging.h" #include "base/strings/string_number_conversions.h"
diff --git a/media/fuchsia/cdm/service/fuchsia_cdm_manager.h b/media/fuchsia/cdm/service/fuchsia_cdm_manager.h index ff77398..aa4b510a 100644 --- a/media/fuchsia/cdm/service/fuchsia_cdm_manager.h +++ b/media/fuchsia/cdm/service/fuchsia_cdm_manager.h
@@ -8,10 +8,10 @@ #include <fuchsia/media/drm/cpp/fidl.h> #include <string> -#include "base/callback_forward.h" #include "base/containers/flat_map.h" #include "base/files/file.h" #include "base/files/file_path.h" +#include "base/functional/callback_forward.h" #include "base/memory/weak_ptr.h" #include "base/task/sequenced_task_runner.h" #include "base/threading/thread_checker.h"
diff --git a/media/fuchsia/cdm/service/fuchsia_cdm_manager_unittest.cc b/media/fuchsia/cdm/service/fuchsia_cdm_manager_unittest.cc index 7d77d764..30c124b3 100644 --- a/media/fuchsia/cdm/service/fuchsia_cdm_manager_unittest.cc +++ b/media/fuchsia/cdm/service/fuchsia_cdm_manager_unittest.cc
@@ -11,10 +11,10 @@ #include <lib/fpromise/promise.h> #include <map> -#include "base/bind.h" -#include "base/callback.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/run_loop.h" #include "base/test/bind.h" #include "base/test/task_environment.h"
diff --git a/media/fuchsia/cdm/service/provisioning_fetcher_impl.cc b/media/fuchsia/cdm/service/provisioning_fetcher_impl.cc index 040081c..4b3c797 100644 --- a/media/fuchsia/cdm/service/provisioning_fetcher_impl.cc +++ b/media/fuchsia/cdm/service/provisioning_fetcher_impl.cc
@@ -4,10 +4,10 @@ #include "media/fuchsia/cdm/service/provisioning_fetcher_impl.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/fuchsia/fuchsia_logging.h" #include "base/fuchsia/mem_buffer_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/logging.h" namespace media {
diff --git a/media/fuchsia/cdm/service/provisioning_fetcher_impl.h b/media/fuchsia/cdm/service/provisioning_fetcher_impl.h index 780df277..829f902 100644 --- a/media/fuchsia/cdm/service/provisioning_fetcher_impl.h +++ b/media/fuchsia/cdm/service/provisioning_fetcher_impl.h
@@ -10,7 +10,7 @@ #include <lib/fidl/cpp/interface_handle.h> #include <memory> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "media/base/provision_fetcher.h" namespace media {
diff --git a/media/fuchsia/cdm/service/provisioning_fetcher_impl_unittest.cc b/media/fuchsia/cdm/service/provisioning_fetcher_impl_unittest.cc index f8b3969..0bca19c 100644 --- a/media/fuchsia/cdm/service/provisioning_fetcher_impl_unittest.cc +++ b/media/fuchsia/cdm/service/provisioning_fetcher_impl_unittest.cc
@@ -7,8 +7,8 @@ #include <fuchsia/media/drm/cpp/fidl.h> #include <memory> -#include "base/bind.h" #include "base/fuchsia/mem_buffer_util.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/test/bind.h" #include "base/test/task_environment.h"
diff --git a/media/fuchsia/common/sysmem_client.cc b/media/fuchsia/common/sysmem_client.cc index b8160d2..c897a05 100644 --- a/media/fuchsia/common/sysmem_client.cc +++ b/media/fuchsia/common/sysmem_client.cc
@@ -9,9 +9,9 @@ #include <algorithm> -#include "base/bind.h" #include "base/fuchsia/fuchsia_logging.h" #include "base/fuchsia/process_context.h" +#include "base/functional/bind.h" #include "base/process/process_handle.h" #include "media/fuchsia/common/vmo_buffer.h"
diff --git a/media/fuchsia/common/sysmem_client.h b/media/fuchsia/common/sysmem_client.h index a88bca7..497bea8 100644 --- a/media/fuchsia/common/sysmem_client.h +++ b/media/fuchsia/common/sysmem_client.h
@@ -10,7 +10,7 @@ #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/threading/thread_checker.h" #include "media/base/media_export.h"
diff --git a/media/gpu/android/android_video_encode_accelerator.cc b/media/gpu/android/android_video_encode_accelerator.cc index 51054a3..ccd15573 100644 --- a/media/gpu/android/android_video_encode_accelerator.cc +++ b/media/gpu/android/android_video_encode_accelerator.cc
@@ -8,7 +8,7 @@ #include <set> #include <tuple> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/logging.h" #include "base/memory/shared_memory_mapping.h"
diff --git a/media/gpu/android/android_video_surface_chooser.h b/media/gpu/android/android_video_surface_chooser.h index acae9bf..0766163b 100644 --- a/media/gpu/android/android_video_surface_chooser.h +++ b/media/gpu/android/android_video_surface_chooser.h
@@ -5,7 +5,7 @@ #ifndef MEDIA_GPU_ANDROID_ANDROID_VIDEO_SURFACE_CHOOSER_H_ #define MEDIA_GPU_ANDROID_ANDROID_VIDEO_SURFACE_CHOOSER_H_ -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/weak_ptr.h" #include "media/base/android/android_overlay.h" #include "media/base/video_transformation.h"
diff --git a/media/gpu/android/android_video_surface_chooser_impl.h b/media/gpu/android/android_video_surface_chooser_impl.h index 0086bc0..8d0b062 100644 --- a/media/gpu/android/android_video_surface_chooser_impl.h +++ b/media/gpu/android/android_video_surface_chooser_impl.h
@@ -5,7 +5,7 @@ #ifndef MEDIA_GPU_ANDROID_ANDROID_VIDEO_SURFACE_CHOOSER_IMPL_H_ #define MEDIA_GPU_ANDROID_ANDROID_VIDEO_SURFACE_CHOOSER_IMPL_H_ -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/time/tick_clock.h"
diff --git a/media/gpu/android/android_video_surface_chooser_impl_unittest.cc b/media/gpu/android/android_video_surface_chooser_impl_unittest.cc index c479aaf35..27d7a159 100644 --- a/media/gpu/android/android_video_surface_chooser_impl_unittest.cc +++ b/media/gpu/android/android_video_surface_chooser_impl_unittest.cc
@@ -8,7 +8,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/test/simple_test_tick_clock.h" #include "media/base/android/mock_android_overlay.h" #include "testing/gmock/include/gmock/gmock.h"
diff --git a/media/gpu/android/codec_allocator.cc b/media/gpu/android/codec_allocator.cc index eb4bb5fc..f27fa7bc 100644 --- a/media/gpu/android/codec_allocator.cc +++ b/media/gpu/android/codec_allocator.cc
@@ -8,7 +8,7 @@ #include <memory> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/no_destructor.h" #include "base/ranges/algorithm.h"
diff --git a/media/gpu/android/codec_allocator.h b/media/gpu/android/codec_allocator.h index be14c88e..9f4fdda8 100644 --- a/media/gpu/android/codec_allocator.h +++ b/media/gpu/android/codec_allocator.h
@@ -9,8 +9,8 @@ #include <memory> -#include "base/callback.h" #include "base/containers/circular_deque.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/no_destructor.h" #include "base/task/sequenced_task_runner.h"
diff --git a/media/gpu/android/codec_allocator_unittest.cc b/media/gpu/android/codec_allocator_unittest.cc index 4ebc81a..9737f4d 100644 --- a/media/gpu/android/codec_allocator_unittest.cc +++ b/media/gpu/android/codec_allocator_unittest.cc
@@ -9,9 +9,9 @@ #include <memory> #include "base/android/build_info.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/check.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/task/sequenced_task_runner.h" #include "base/task/single_thread_task_runner.h"
diff --git a/media/gpu/android/codec_image.cc b/media/gpu/android/codec_image.cc index ae3a520..9517c26 100644 --- a/media/gpu/android/codec_image.cc +++ b/media/gpu/android/codec_image.cc
@@ -9,8 +9,8 @@ #include <memory> #include "base/android/scoped_hardware_buffer_fence_sync.h" -#include "base/callback_helpers.h" #include "base/debug/dump_without_crashing.h" +#include "base/functional/callback_helpers.h" #include "base/task/sequenced_task_runner.h" #include "gpu/command_buffer/service/gles2_cmd_decoder.h" #include "gpu/command_buffer/service/texture_manager.h"
diff --git a/media/gpu/android/codec_image.h b/media/gpu/android/codec_image.h index 79274b8..f9da311 100644 --- a/media/gpu/android/codec_image.h +++ b/media/gpu/android/codec_image.h
@@ -10,7 +10,7 @@ #include <memory> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/gtest_prod_util.h" #include "base/memory/ref_counted_delete_on_sequence.h" #include "base/task/sequenced_task_runner.h"
diff --git a/media/gpu/android/codec_image_group.cc b/media/gpu/android/codec_image_group.cc index d1ad68187..806af42 100644 --- a/media/gpu/android/codec_image_group.cc +++ b/media/gpu/android/codec_image_group.cc
@@ -4,7 +4,7 @@ #include "media/gpu/android/codec_image_group.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/task/sequenced_task_runner.h" #include "media/gpu/android/codec_surface_bundle.h"
diff --git a/media/gpu/android/codec_image_group_unittest.cc b/media/gpu/android/codec_image_group_unittest.cc index a08abc4..227e4561 100644 --- a/media/gpu/android/codec_image_group_unittest.cc +++ b/media/gpu/android/codec_image_group_unittest.cc
@@ -4,8 +4,8 @@ #include "media/gpu/android/codec_image_group.h" -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/ref_counted.h" #include "base/task/sequenced_task_runner.h" #include "base/test/task_environment.h"
diff --git a/media/gpu/android/codec_image_unittest.cc b/media/gpu/android/codec_image_unittest.cc index 125e2284..2b7430d0 100644 --- a/media/gpu/android/codec_image_unittest.cc +++ b/media/gpu/android/codec_image_unittest.cc
@@ -4,8 +4,8 @@ #include <memory> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/task/sequenced_task_runner.h" #include "base/test/mock_callback.h"
diff --git a/media/gpu/android/codec_output_buffer_renderer.cc b/media/gpu/android/codec_output_buffer_renderer.cc index c9030a5..6dbfb533 100644 --- a/media/gpu/android/codec_output_buffer_renderer.cc +++ b/media/gpu/android/codec_output_buffer_renderer.cc
@@ -6,7 +6,7 @@ #include <string.h> #include "base/android/scoped_hardware_buffer_fence_sync.h" -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "gpu/command_buffer/service/gles2_cmd_decoder.h" #include "gpu/command_buffer/service/texture_manager.h" #include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/media/gpu/android/codec_surface_bundle.cc b/media/gpu/android/codec_surface_bundle.cc index 9faa381..bb44360f 100644 --- a/media/gpu/android/codec_surface_bundle.cc +++ b/media/gpu/android/codec_surface_bundle.cc
@@ -4,7 +4,7 @@ #include "media/gpu/android/codec_surface_bundle.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/task/sequenced_task_runner.h" #include "media/base/android/android_overlay.h"
diff --git a/media/gpu/android/codec_wrapper.cc b/media/gpu/android/codec_wrapper.cc index a8567e64a..aa0bbd8 100644 --- a/media/gpu/android/codec_wrapper.cc +++ b/media/gpu/android/codec_wrapper.cc
@@ -10,8 +10,8 @@ #include <string> #include <vector> -#include "base/bind.h" #include "base/debug/crash_logging.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/metrics/histogram_macros.h" #include "base/task/sequenced_task_runner.h"
diff --git a/media/gpu/android/codec_wrapper_unittest.cc b/media/gpu/android/codec_wrapper_unittest.cc index 499cbbd..1f74c611 100644 --- a/media/gpu/android/codec_wrapper_unittest.cc +++ b/media/gpu/android/codec_wrapper_unittest.cc
@@ -4,7 +4,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h" #include "base/synchronization/waitable_event.h"
diff --git a/media/gpu/android/direct_shared_image_video_provider.cc b/media/gpu/android/direct_shared_image_video_provider.cc index 4c89007..5e2a0a0 100644 --- a/media/gpu/android/direct_shared_image_video_provider.cc +++ b/media/gpu/android/direct_shared_image_video_provider.cc
@@ -6,9 +6,9 @@ #include <memory> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ref_counted.h" #include "base/metrics/histogram_functions.h" #include "base/metrics/histogram_macros.h"
diff --git a/media/gpu/android/fake_codec_allocator.cc b/media/gpu/android/fake_codec_allocator.cc index c8783b2..2260f30 100644 --- a/media/gpu/android/fake_codec_allocator.cc +++ b/media/gpu/android/fake_codec_allocator.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/weak_ptr.h" #include "base/task/sequenced_task_runner.h" #include "media/base/android/mock_media_codec_bridge.h"
diff --git a/media/gpu/android/media_codec_video_decoder.cc b/media/gpu/android/media_codec_video_decoder.cc index 855013e..1b8e9356 100644 --- a/media/gpu/android/media_codec_video_decoder.cc +++ b/media/gpu/android/media_codec_video_decoder.cc
@@ -7,10 +7,10 @@ #include <memory> #include "base/android/build_info.h" -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/memory/ptr_util.h" #include "base/memory/weak_ptr.h"
diff --git a/media/gpu/android/media_codec_video_decoder_unittest.cc b/media/gpu/android/media_codec_video_decoder_unittest.cc index 1cce44a9..c90ebae 100644 --- a/media/gpu/android/media_codec_video_decoder_unittest.cc +++ b/media/gpu/android/media_codec_video_decoder_unittest.cc
@@ -5,8 +5,8 @@ #include "media/gpu/android/media_codec_video_decoder.h" #include "base/android/jni_android.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/task/single_thread_task_runner.h"
diff --git a/media/gpu/android/promotion_hint_aggregator.h b/media/gpu/android/promotion_hint_aggregator.h index 5ba33c64..b07f2ff 100644 --- a/media/gpu/android/promotion_hint_aggregator.h +++ b/media/gpu/android/promotion_hint_aggregator.h
@@ -5,8 +5,8 @@ #ifndef MEDIA_GPU_ANDROID_PROMOTION_HINT_AGGREGATOR_H_ #define MEDIA_GPU_ANDROID_PROMOTION_HINT_AGGREGATOR_H_ -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "media/gpu/media_gpu_export.h" #include "ui/gfx/geometry/rect.h"
diff --git a/media/gpu/android/promotion_hint_aggregator_impl.cc b/media/gpu/android/promotion_hint_aggregator_impl.cc index 8b4bbbc..bde1bb3 100644 --- a/media/gpu/android/promotion_hint_aggregator_impl.cc +++ b/media/gpu/android/promotion_hint_aggregator_impl.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/time/default_tick_clock.h" namespace media {
diff --git a/media/gpu/android/promotion_hint_aggregator_impl.h b/media/gpu/android/promotion_hint_aggregator_impl.h index 4a859a4c..6a617835 100644 --- a/media/gpu/android/promotion_hint_aggregator_impl.h +++ b/media/gpu/android/promotion_hint_aggregator_impl.h
@@ -5,7 +5,7 @@ #ifndef MEDIA_GPU_ANDROID_PROMOTION_HINT_AGGREGATOR_IMPL_H_ #define MEDIA_GPU_ANDROID_PROMOTION_HINT_AGGREGATOR_IMPL_H_ -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/time/tick_clock.h"
diff --git a/media/gpu/android/promotion_hint_aggregator_impl_unittest.cc b/media/gpu/android/promotion_hint_aggregator_impl_unittest.cc index fb9d956..f552a20 100644 --- a/media/gpu/android/promotion_hint_aggregator_impl_unittest.cc +++ b/media/gpu/android/promotion_hint_aggregator_impl_unittest.cc
@@ -8,7 +8,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/test/simple_test_tick_clock.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/media/gpu/android/shared_image_video_provider.h b/media/gpu/android/shared_image_video_provider.h index ccbbd6f..091596c 100644 --- a/media/gpu/android/shared_image_video_provider.h +++ b/media/gpu/android/shared_image_video_provider.h
@@ -5,7 +5,7 @@ #ifndef MEDIA_GPU_ANDROID_SHARED_IMAGE_VIDEO_PROVIDER_H_ #define MEDIA_GPU_ANDROID_SHARED_IMAGE_VIDEO_PROVIDER_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "gpu/command_buffer/service/mailbox_manager.h" #include "gpu/ipc/common/vulkan_ycbcr_info.h" #include "media/gpu/android/codec_image_group.h"
diff --git a/media/gpu/android/surface_chooser_helper_unittest.cc b/media/gpu/android/surface_chooser_helper_unittest.cc index 7eacffd..032be14 100644 --- a/media/gpu/android/surface_chooser_helper_unittest.cc +++ b/media/gpu/android/surface_chooser_helper_unittest.cc
@@ -8,7 +8,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/test/simple_test_tick_clock.h" #include "media/gpu/android/mock_android_video_surface_chooser.h"
diff --git a/media/gpu/android/video_frame_factory_impl.cc b/media/gpu/android/video_frame_factory_impl.cc index aae3389..59fb880b 100644 --- a/media/gpu/android/video_frame_factory_impl.cc +++ b/media/gpu/android/video_frame_factory_impl.cc
@@ -7,10 +7,10 @@ #include <memory> #include "base/android/android_image_reader_compat.h" -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/check_op.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "base/task/sequenced_task_runner.h"
diff --git a/media/gpu/android/video_frame_factory_impl_unittest.cc b/media/gpu/android/video_frame_factory_impl_unittest.cc index aea6dfb..d26858a 100644 --- a/media/gpu/android/video_frame_factory_impl_unittest.cc +++ b/media/gpu/android/video_frame_factory_impl_unittest.cc
@@ -4,8 +4,8 @@ #include "media/gpu/android/video_frame_factory_impl.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/task/single_thread_task_runner.h" #include "base/test/gmock_callback_support.h"
diff --git a/media/gpu/av1_decoder.cc b/media/gpu/av1_decoder.cc index 3e3eada..98ab17a1 100644 --- a/media/gpu/av1_decoder.cc +++ b/media/gpu/av1_decoder.cc
@@ -6,7 +6,7 @@ #include <bitset> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/memory/ptr_util.h" #include "base/metrics/histogram_functions.h"
diff --git a/media/gpu/buffer_validation.h b/media/gpu/buffer_validation.h index 2ddc301..a3e23bc 100644 --- a/media/gpu/buffer_validation.h +++ b/media/gpu/buffer_validation.h
@@ -5,8 +5,8 @@ #ifndef MEDIA_GPU_BUFFER_VALIDATION_H_ #define MEDIA_GPU_BUFFER_VALIDATION_H_ -#include "base/callback.h" #include "base/component_export.h" +#include "base/functional/callback.h" #include "media/base/video_types.h" namespace gfx {
diff --git a/media/gpu/buffer_validation_unittest.cc b/media/gpu/buffer_validation_unittest.cc index eadda4e..c91ac84 100644 --- a/media/gpu/buffer_validation_unittest.cc +++ b/media/gpu/buffer_validation_unittest.cc
@@ -6,8 +6,8 @@ #include <fcntl.h> -#include "base/bind.h" #include "base/files/scoped_file.h" +#include "base/functional/bind.h" #include "media/base/video_frame.h" #include "media/base/video_types.h" #include "media/video/fake_gpu_memory_buffer.h"
diff --git a/media/gpu/chromeos/decoder_buffer_transcryptor.cc b/media/gpu/chromeos/decoder_buffer_transcryptor.cc index 238785fb..a3bd51e2 100644 --- a/media/gpu/chromeos/decoder_buffer_transcryptor.cc +++ b/media/gpu/chromeos/decoder_buffer_transcryptor.cc
@@ -4,7 +4,7 @@ #include "media/gpu/chromeos/decoder_buffer_transcryptor.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "chromeos/components/cdm_factory_daemon/chromeos_cdm_context.h" #include "media/base/bind_to_current_loop.h"
diff --git a/media/gpu/chromeos/decoder_buffer_transcryptor.h b/media/gpu/chromeos/decoder_buffer_transcryptor.h index f604f63..6ead301d5 100644 --- a/media/gpu/chromeos/decoder_buffer_transcryptor.h +++ b/media/gpu/chromeos/decoder_buffer_transcryptor.h
@@ -7,8 +7,8 @@ #include <memory> -#include "base/callback_forward.h" #include "base/containers/queue.h" +#include "base/functional/callback_forward.h" #include "base/memory/weak_ptr.h" #include "base/sequence_checker.h" #include "media/base/callback_registry.h"
diff --git a/media/gpu/chromeos/fourcc_unittests.cc b/media/gpu/chromeos/fourcc_unittests.cc index ceec06de..6dcdb8d 100644 --- a/media/gpu/chromeos/fourcc_unittests.cc +++ b/media/gpu/chromeos/fourcc_unittests.cc
@@ -204,7 +204,7 @@ EXPECT_EQ(Fourcc(Fourcc::NM21).ToSinglePlanar(), Fourcc(Fourcc::NV21).ToSinglePlanar()); EXPECT_EQ(Fourcc(Fourcc::MT21).ToSinglePlanar(), absl::nullopt); - EXPECT_EQ(Fourcc(Fourcc::Q10C).ToSinglePlanar(), absl::nullopt); + EXPECT_EQ(Fourcc(Fourcc::Q08C).ToSinglePlanar(), absl::nullopt); EXPECT_EQ(Fourcc(Fourcc::Q10C).ToSinglePlanar(), absl::nullopt); } } // namespace media
diff --git a/media/gpu/chromeos/generic_dmabuf_video_frame_mapper.cc b/media/gpu/chromeos/generic_dmabuf_video_frame_mapper.cc index 1883444..76ae9fd 100644 --- a/media/gpu/chromeos/generic_dmabuf_video_frame_mapper.cc +++ b/media/gpu/chromeos/generic_dmabuf_video_frame_mapper.cc
@@ -9,8 +9,8 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "media/gpu/macros.h"
diff --git a/media/gpu/chromeos/gl_image_processor_backend.cc b/media/gpu/chromeos/gl_image_processor_backend.cc index c83e9094..45d4da70 100644 --- a/media/gpu/chromeos/gl_image_processor_backend.cc +++ b/media/gpu/chromeos/gl_image_processor_backend.cc
@@ -4,7 +4,7 @@ #include "media/gpu/chromeos/gl_image_processor_backend.h" -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/metrics/histogram_macros.h" #include "base/stl_util.h" #include "base/synchronization/waitable_event.h"
diff --git a/media/gpu/chromeos/gl_image_processor_backend.h b/media/gpu/chromeos/gl_image_processor_backend.h index d82e6471..03d9a48 100644 --- a/media/gpu/chromeos/gl_image_processor_backend.h +++ b/media/gpu/chromeos/gl_image_processor_backend.h
@@ -8,7 +8,7 @@ #include <memory> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h" #include "base/synchronization/waitable_event.h"
diff --git a/media/gpu/chromeos/gpu_memory_buffer_video_frame_mapper.cc b/media/gpu/chromeos/gpu_memory_buffer_video_frame_mapper.cc index 7445e5d..e204490b 100644 --- a/media/gpu/chromeos/gpu_memory_buffer_video_frame_mapper.cc +++ b/media/gpu/chromeos/gpu_memory_buffer_video_frame_mapper.cc
@@ -6,7 +6,7 @@ #include <sys/mman.h> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "media/gpu/macros.h" #include "ui/gfx/gpu_memory_buffer.h"
diff --git a/media/gpu/chromeos/image_processor.cc b/media/gpu/chromeos/image_processor.cc index 5fdfc425..0130ee4 100644 --- a/media/gpu/chromeos/image_processor.cc +++ b/media/gpu/chromeos/image_processor.cc
@@ -8,7 +8,7 @@ #include <ostream> #include <sstream> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/task/sequenced_task_runner.h" #include "base/task/task_traits.h"
diff --git a/media/gpu/chromeos/image_processor.h b/media/gpu/chromeos/image_processor.h index 58ebc68f..aac11f0 100644 --- a/media/gpu/chromeos/image_processor.h +++ b/media/gpu/chromeos/image_processor.h
@@ -11,7 +11,7 @@ #include <utility> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h" #include "base/sequence_checker.h"
diff --git a/media/gpu/chromeos/image_processor_backend.cc b/media/gpu/chromeos/image_processor_backend.cc index 3e8f3dac..9895f22 100644 --- a/media/gpu/chromeos/image_processor_backend.cc +++ b/media/gpu/chromeos/image_processor_backend.cc
@@ -8,7 +8,7 @@ #include <ostream> #include <sstream> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/stringprintf.h" #include "base/task/sequenced_task_runner.h" #include "base/task/task_traits.h"
diff --git a/media/gpu/chromeos/image_processor_backend.h b/media/gpu/chromeos/image_processor_backend.h index f07f811..d79921bd 100644 --- a/media/gpu/chromeos/image_processor_backend.h +++ b/media/gpu/chromeos/image_processor_backend.h
@@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/scoped_refptr.h" #include "base/sequence_checker.h" #include "base/task/sequenced_task_runner.h"
diff --git a/media/gpu/chromeos/image_processor_factory.cc b/media/gpu/chromeos/image_processor_factory.cc index 1b0dd67..b24fbf5 100644 --- a/media/gpu/chromeos/image_processor_factory.cc +++ b/media/gpu/chromeos/image_processor_factory.cc
@@ -6,10 +6,10 @@ #include <stddef.h> -#include "base/bind.h" -#include "base/callback.h" #include "base/containers/contains.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" #include "base/task/sequenced_task_runner.h" #include "media/base/media_switches.h"
diff --git a/media/gpu/chromeos/image_processor_factory.h b/media/gpu/chromeos/image_processor_factory.h index 994cc51..9160c93 100644 --- a/media/gpu/chromeos/image_processor_factory.h +++ b/media/gpu/chromeos/image_processor_factory.h
@@ -10,7 +10,7 @@ #include <memory> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/task/sequenced_task_runner.h" #include "media/gpu/chromeos/fourcc.h" #include "media/gpu/chromeos/image_processor.h"
diff --git a/media/gpu/chromeos/image_processor_with_pool.cc b/media/gpu/chromeos/image_processor_with_pool.cc index d9270fd5..1f360c793 100644 --- a/media/gpu/chromeos/image_processor_with_pool.cc +++ b/media/gpu/chromeos/image_processor_with_pool.cc
@@ -4,7 +4,7 @@ #include "media/gpu/chromeos/image_processor_with_pool.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/task/sequenced_task_runner.h" #include "media/base/media_serializers.h"
diff --git a/media/gpu/chromeos/mailbox_video_frame_converter.cc b/media/gpu/chromeos/mailbox_video_frame_converter.cc index 4280936c..ae33789 100644 --- a/media/gpu/chromeos/mailbox_video_frame_converter.cc +++ b/media/gpu/chromeos/mailbox_video_frame_converter.cc
@@ -4,9 +4,9 @@ #include "media/gpu/chromeos/mailbox_video_frame_converter.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/memory/ptr_util.h" #include "base/task/sequenced_task_runner.h"
diff --git a/media/gpu/chromeos/mailbox_video_frame_converter.h b/media/gpu/chromeos/mailbox_video_frame_converter.h index dba44b4e..f40576cd 100644 --- a/media/gpu/chromeos/mailbox_video_frame_converter.h +++ b/media/gpu/chromeos/mailbox_video_frame_converter.h
@@ -5,9 +5,9 @@ #ifndef MEDIA_GPU_CHROMEOS_MAILBOX_VIDEO_FRAME_CONVERTER_H_ #define MEDIA_GPU_CHROMEOS_MAILBOX_VIDEO_FRAME_CONVERTER_H_ -#include "base/callback_forward.h" #include "base/containers/queue.h" #include "base/containers/small_map.h" +#include "base/functional/callback_forward.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h" #include "gpu/command_buffer/common/mailbox.h"
diff --git a/media/gpu/chromeos/mailbox_video_frame_converter_unittest.cc b/media/gpu/chromeos/mailbox_video_frame_converter_unittest.cc index 4bee603..375c74f 100644 --- a/media/gpu/chromeos/mailbox_video_frame_converter_unittest.cc +++ b/media/gpu/chromeos/mailbox_video_frame_converter_unittest.cc
@@ -4,7 +4,7 @@ #include "media/gpu/chromeos/mailbox_video_frame_converter.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/task/single_thread_task_runner.h" #include "base/task/thread_pool.h"
diff --git a/media/gpu/chromeos/platform_video_frame_pool.h b/media/gpu/chromeos/platform_video_frame_pool.h index 05187c8..14882039 100644 --- a/media/gpu/chromeos/platform_video_frame_pool.h +++ b/media/gpu/chromeos/platform_video_frame_pool.h
@@ -10,9 +10,9 @@ #include <map> #include <vector> -#include "base/bind.h" #include "base/containers/circular_deque.h" #include "base/files/scoped_file.h" +#include "base/functional/bind.h" #include "base/memory/weak_ptr.h" #include "base/synchronization/lock.h" #include "base/task/sequenced_task_runner.h"
diff --git a/media/gpu/chromeos/platform_video_frame_pool_unittest.cc b/media/gpu/chromeos/platform_video_frame_pool_unittest.cc index 18d75690..56ad1dc6 100644 --- a/media/gpu/chromeos/platform_video_frame_pool_unittest.cc +++ b/media/gpu/chromeos/platform_video_frame_pool_unittest.cc
@@ -9,7 +9,7 @@ #include <memory> #include <vector> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/task/single_thread_task_runner.h" #include "base/test/task_environment.h" #include "gpu/command_buffer/common/mailbox_holder.h"
diff --git a/media/gpu/chromeos/platform_video_frame_utils.cc b/media/gpu/chromeos/platform_video_frame_utils.cc index 4e68e75..5875174 100644 --- a/media/gpu/chromeos/platform_video_frame_utils.cc +++ b/media/gpu/chromeos/platform_video_frame_utils.cc
@@ -9,13 +9,13 @@ #include <limits> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/containers/fixed_flat_set.h" #include "base/dcheck_is_on.h" #include "base/files/file.h" #include "base/files/file_path.h" #include "base/files/scoped_file.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/no_destructor.h" #include "base/posix/eintr_wrapper.h" #include "base/strings/string_util.h"
diff --git a/media/gpu/chromeos/vd_video_decode_accelerator.cc b/media/gpu/chromeos/vd_video_decode_accelerator.cc index 35b3eeb4..a5a9418 100644 --- a/media/gpu/chromeos/vd_video_decode_accelerator.cc +++ b/media/gpu/chromeos/vd_video_decode_accelerator.cc
@@ -7,8 +7,8 @@ #include <memory> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/memory/unsafe_shared_memory_region.h" #include "base/task/sequenced_task_runner.h"
diff --git a/media/gpu/chromeos/vd_video_decode_accelerator.h b/media/gpu/chromeos/vd_video_decode_accelerator.h index 5a6973a..56a149b4 100644 --- a/media/gpu/chromeos/vd_video_decode_accelerator.h +++ b/media/gpu/chromeos/vd_video_decode_accelerator.h
@@ -8,7 +8,7 @@ #include <map> #include <memory> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h"
diff --git a/media/gpu/chromeos/vda_video_frame_pool.cc b/media/gpu/chromeos/vda_video_frame_pool.cc index facf27e..990d6606 100644 --- a/media/gpu/chromeos/vda_video_frame_pool.cc +++ b/media/gpu/chromeos/vda_video_frame_pool.cc
@@ -4,7 +4,7 @@ #include "media/gpu/chromeos/vda_video_frame_pool.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/scoped_refptr.h" #include "base/synchronization/waitable_event.h" #include "base/task/sequenced_task_runner.h"
diff --git a/media/gpu/chromeos/video_decoder_pipeline.cc b/media/gpu/chromeos/video_decoder_pipeline.cc index b9db1ef9..9397cb7 100644 --- a/media/gpu/chromeos/video_decoder_pipeline.cc +++ b/media/gpu/chromeos/video_decoder_pipeline.cc
@@ -7,9 +7,9 @@ #include <atomic> #include <memory> -#include "base/bind.h" #include "base/command_line.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/no_destructor.h" #include "base/strings/string_number_conversions.h"
diff --git a/media/gpu/chromeos/video_decoder_pipeline.h b/media/gpu/chromeos/video_decoder_pipeline.h index 65f4554f..a24abc7 100644 --- a/media/gpu/chromeos/video_decoder_pipeline.h +++ b/media/gpu/chromeos/video_decoder_pipeline.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/weak_ptr.h" #include "base/sequence_checker.h" #include "build/build_config.h"
diff --git a/media/gpu/chromeos/video_decoder_pipeline_unittest.cc b/media/gpu/chromeos/video_decoder_pipeline_unittest.cc index 31fdc98..0cdc391d 100644 --- a/media/gpu/chromeos/video_decoder_pipeline_unittest.cc +++ b/media/gpu/chromeos/video_decoder_pipeline_unittest.cc
@@ -4,9 +4,9 @@ #include "media/gpu/chromeos/video_decoder_pipeline.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/check_op.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/task/sequenced_task_runner.h" #include "base/task/single_thread_task_runner.h"
diff --git a/media/gpu/chromeos/video_frame_converter.h b/media/gpu/chromeos/video_frame_converter.h index 5ccd2b6..fed2894 100644 --- a/media/gpu/chromeos/video_frame_converter.h +++ b/media/gpu/chromeos/video_frame_converter.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_refptr.h" #include "base/task/sequenced_task_runner.h"
diff --git a/media/gpu/command_buffer_helper.h b/media/gpu/command_buffer_helper.h index e279cdc..ddf7cf2 100644 --- a/media/gpu/command_buffer_helper.h +++ b/media/gpu/command_buffer_helper.h
@@ -5,7 +5,7 @@ #ifndef MEDIA_GPU_COMMAND_BUFFER_HELPER_H_ #define MEDIA_GPU_COMMAND_BUFFER_HELPER_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/ref_counted_delete_on_sequence.h" #include "base/memory/scoped_refptr.h" #include "base/task/sequenced_task_runner.h"
diff --git a/media/gpu/gpu_video_decode_accelerator_factory.h b/media/gpu/gpu_video_decode_accelerator_factory.h index 059778e..fadf951 100644 --- a/media/gpu/gpu_video_decode_accelerator_factory.h +++ b/media/gpu/gpu_video_decode_accelerator_factory.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/threading/thread_checker.h" #include "build/build_config.h" #include "gpu/config/gpu_driver_bug_workarounds.h"
diff --git a/media/gpu/gpu_video_decode_accelerator_helpers.h b/media/gpu/gpu_video_decode_accelerator_helpers.h index 571915a..6aea6b0 100644 --- a/media/gpu/gpu_video_decode_accelerator_helpers.h +++ b/media/gpu/gpu_video_decode_accelerator_helpers.h
@@ -5,7 +5,7 @@ #ifndef MEDIA_GPU_GPU_VIDEO_DECODE_ACCELERATOR_HELPERS_H_ #define MEDIA_GPU_GPU_VIDEO_DECODE_ACCELERATOR_HELPERS_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "media/base/supported_video_decoder_config.h" #include "media/gpu/media_gpu_export.h"
diff --git a/media/gpu/gpu_video_encode_accelerator_factory.cc b/media/gpu/gpu_video_encode_accelerator_factory.cc index e4683c3..2d74e6b 100644 --- a/media/gpu/gpu_video_encode_accelerator_factory.cc +++ b/media/gpu/gpu_video_encode_accelerator_factory.cc
@@ -4,10 +4,10 @@ #include "media/gpu/gpu_video_encode_accelerator_factory.h" -#include "base/bind.h" #include "base/command_line.h" #include "base/containers/cxx20_erase.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/task/single_thread_task_runner.h" #include "build/build_config.h"
diff --git a/media/gpu/h264_decoder.cc b/media/gpu/h264_decoder.cc index bc61a5e..5c94bb0 100644 --- a/media/gpu/h264_decoder.cc +++ b/media/gpu/h264_decoder.cc
@@ -7,9 +7,9 @@ #include <limits> #include <memory> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/metrics/histogram_functions.h" #include "base/numerics/safe_conversions.h"
diff --git a/media/gpu/ipc/client/gpu_video_decode_accelerator_host.cc b/media/gpu/ipc/client/gpu_video_decode_accelerator_host.cc index bd74fce..1aaef12e 100644 --- a/media/gpu/ipc/client/gpu_video_decode_accelerator_host.cc +++ b/media/gpu/ipc/client/gpu_video_decode_accelerator_host.cc
@@ -4,7 +4,7 @@ #include "media/gpu/ipc/client/gpu_video_decode_accelerator_host.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/task/sequenced_task_runner.h" #include "base/task/single_thread_task_runner.h"
diff --git a/media/gpu/ipc/service/gpu_video_decode_accelerator.cc b/media/gpu/ipc/service/gpu_video_decode_accelerator.cc index 81b5e85f..ac6e768 100644 --- a/media/gpu/ipc/service/gpu_video_decode_accelerator.cc +++ b/media/gpu/ipc/service/gpu_video_decode_accelerator.cc
@@ -7,7 +7,7 @@ #include <memory> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/logging.h" #include "base/memory/raw_ptr.h"
diff --git a/media/gpu/ipc/service/gpu_video_decode_accelerator.h b/media/gpu/ipc/service/gpu_video_decode_accelerator.h index 069c990c..6e7c0c0c 100644 --- a/media/gpu/ipc/service/gpu_video_decode_accelerator.h +++ b/media/gpu/ipc/service/gpu_video_decode_accelerator.h
@@ -11,9 +11,9 @@ #include <memory> #include <vector> -#include "base/callback.h" #include "base/compiler_specific.h" #include "base/containers/circular_deque.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h" #include "base/task/single_thread_task_runner.h"
diff --git a/media/gpu/ipc/service/media_gpu_channel.cc b/media/gpu/ipc/service/media_gpu_channel.cc index 60d3a0e19..9dc4d70 100644 --- a/media/gpu/ipc/service/media_gpu_channel.cc +++ b/media/gpu/ipc/service/media_gpu_channel.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/task/single_thread_task_runner.h" #include "base/unguessable_token.h"
diff --git a/media/gpu/ipc/service/picture_buffer_manager.cc b/media/gpu/ipc/service/picture_buffer_manager.cc index ef1af80e..5e96015e 100644 --- a/media/gpu/ipc/service/picture_buffer_manager.cc +++ b/media/gpu/ipc/service/picture_buffer_manager.cc
@@ -8,7 +8,7 @@ #include <set> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/logging.h" #include "base/synchronization/lock.h"
diff --git a/media/gpu/ipc/service/picture_buffer_manager.h b/media/gpu/ipc/service/picture_buffer_manager.h index dd6cbb20..f0476ec4 100644 --- a/media/gpu/ipc/service/picture_buffer_manager.h +++ b/media/gpu/ipc/service/picture_buffer_manager.h
@@ -9,7 +9,7 @@ #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_refptr.h" #include "base/task/single_thread_task_runner.h"
diff --git a/media/gpu/ipc/service/vda_video_decoder.cc b/media/gpu/ipc/service/vda_video_decoder.cc index 93edff3..2bc7251 100644 --- a/media/gpu/ipc/service/vda_video_decoder.cc +++ b/media/gpu/ipc/service/vda_video_decoder.cc
@@ -9,8 +9,8 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/logging.h" #include "base/memory/ptr_util.h"
diff --git a/media/gpu/ipc/service/vda_video_decoder.h b/media/gpu/ipc/service/vda_video_decoder.h index 12f0b1ac..505a44b 100644 --- a/media/gpu/ipc/service/vda_video_decoder.h +++ b/media/gpu/ipc/service/vda_video_decoder.h
@@ -10,8 +10,8 @@ #include <map> #include <memory> -#include "base/callback_forward.h" #include "base/containers/lru_cache.h" +#include "base/functional/callback_forward.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h" #include "base/task/single_thread_task_runner.h"
diff --git a/media/gpu/ipc/service/vda_video_decoder_unittest.cc b/media/gpu/ipc/service/vda_video_decoder_unittest.cc index 0a977651..5a353f7 100644 --- a/media/gpu/ipc/service/vda_video_decoder_unittest.cc +++ b/media/gpu/ipc/service/vda_video_decoder_unittest.cc
@@ -6,7 +6,7 @@ #include <stdint.h> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h"
diff --git a/media/gpu/mac/vt_video_decode_accelerator_mac.cc b/media/gpu/mac/vt_video_decode_accelerator_mac.cc index 57e12c1..c1b73080 100644 --- a/media/gpu/mac/vt_video_decode_accelerator_mac.cc +++ b/media/gpu/mac/vt_video_decode_accelerator_mac.cc
@@ -14,10 +14,10 @@ #include <memory> #include "base/atomic_sequence_num.h" -#include "base/bind.h" #include "base/containers/contains.h" #include "base/containers/span.h" #include "base/cxx17_backports.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/mac/mac_logging.h" #include "base/mac/mac_util.h"
diff --git a/media/gpu/mac/vt_video_encode_accelerator_mac.h b/media/gpu/mac/vt_video_encode_accelerator_mac.h index 76757f2..eee2063 100644 --- a/media/gpu/mac/vt_video_encode_accelerator_mac.h +++ b/media/gpu/mac/vt_video_encode_accelerator_mac.h
@@ -7,8 +7,8 @@ #include <memory> -#include "base/bind.h" #include "base/containers/circular_deque.h" +#include "base/functional/bind.h" #include "base/mac/scoped_cftyperef.h" #include "base/memory/weak_ptr.h" #include "base/task/sequenced_task_runner.h"
diff --git a/media/gpu/test/bitstream_helpers.h b/media/gpu/test/bitstream_helpers.h index ec1877b..8d87cd2 100644 --- a/media/gpu/test/bitstream_helpers.h +++ b/media/gpu/test/bitstream_helpers.h
@@ -5,7 +5,7 @@ #ifndef MEDIA_GPU_TEST_BITSTREAM_HELPERS_H_ #define MEDIA_GPU_TEST_BITSTREAM_HELPERS_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/ref_counted.h" #include "base/time/time.h" #include "media/video/video_encode_accelerator.h"
diff --git a/media/gpu/test/image_processor/image_processor_client.cc b/media/gpu/test/image_processor/image_processor_client.cc index 01576ee..9cb3c2a 100644 --- a/media/gpu/test/image_processor/image_processor_client.cc +++ b/media/gpu/test/image_processor/image_processor_client.cc
@@ -7,9 +7,9 @@ #include <functional> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/memory/ptr_util.h" #include "base/synchronization/waitable_event.h"
diff --git a/media/gpu/test/video.cc b/media/gpu/test/video.cc index d3943b4..187e334 100644 --- a/media/gpu/test/video.cc +++ b/media/gpu/test/video.cc
@@ -8,9 +8,9 @@ #include <numeric> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/json/json_reader.h" #include "base/numerics/safe_conversions.h" #include "base/run_loop.h"
diff --git a/media/gpu/test/video_encoder/bitstream_file_writer.cc b/media/gpu/test/video_encoder/bitstream_file_writer.cc index dd61384..17a505e 100644 --- a/media/gpu/test/video_encoder/bitstream_file_writer.cc +++ b/media/gpu/test/video_encoder/bitstream_file_writer.cc
@@ -4,8 +4,8 @@ #include "media/gpu/test/video_encoder/bitstream_file_writer.h" -#include "base/bind.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/memory/ptr_util.h" #include "base/ranges/algorithm.h"
diff --git a/media/gpu/test/video_encoder/bitstream_validator.cc b/media/gpu/test/video_encoder/bitstream_validator.cc index 6391053c..2f8a891 100644 --- a/media/gpu/test/video_encoder/bitstream_validator.cc +++ b/media/gpu/test/video_encoder/bitstream_validator.cc
@@ -6,8 +6,8 @@ #include <numeric> -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/memory/ptr_util.h" #include "base/ranges/algorithm.h"
diff --git a/media/gpu/test/video_encoder/video_encoder.cc b/media/gpu/test/video_encoder/video_encoder.cc index 8a8eed8..b90d18c 100644 --- a/media/gpu/test/video_encoder/video_encoder.cc +++ b/media/gpu/test/video_encoder/video_encoder.cc
@@ -4,7 +4,7 @@ #include "media/gpu/test/video_encoder/video_encoder.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "media/base/video_bitrate_allocation.h" #include "media/gpu/macros.h"
diff --git a/media/gpu/test/video_encoder/video_encoder.h b/media/gpu/test/video_encoder/video_encoder.h index 377125c..d6283a8 100644 --- a/media/gpu/test/video_encoder/video_encoder.h +++ b/media/gpu/test/video_encoder/video_encoder.h
@@ -11,7 +11,7 @@ #include <utility> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/sequence_checker.h" #include "base/synchronization/condition_variable.h"
diff --git a/media/gpu/test/video_encoder/video_encoder_client.cc b/media/gpu/test/video_encoder/video_encoder_client.cc index 69db78f..fb2e7b7 100644 --- a/media/gpu/test/video_encoder/video_encoder_client.cc +++ b/media/gpu/test/video_encoder/video_encoder_client.cc
@@ -9,7 +9,7 @@ #include <string> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/strings/string_number_conversions.h" #include "base/task/sequenced_task_runner.h"
diff --git a/media/gpu/test/video_frame_file_writer.cc b/media/gpu/test/video_frame_file_writer.cc index 9cfe516f..b87513f 100644 --- a/media/gpu/test/video_frame_file_writer.cc +++ b/media/gpu/test/video_frame_file_writer.cc
@@ -8,8 +8,8 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/memory/ptr_util.h" #include "base/strings/stringprintf.h"
diff --git a/media/gpu/test/video_frame_helpers.cc b/media/gpu/test/video_frame_helpers.cc index 4ed54bf8..07aed59 100644 --- a/media/gpu/test/video_frame_helpers.cc +++ b/media/gpu/test/video_frame_helpers.cc
@@ -9,7 +9,7 @@ #include <vector> #include "base/bits.h" -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/memory/scoped_refptr.h" #include "gpu/ipc/common/gpu_memory_buffer_support.h"
diff --git a/media/gpu/test/video_frame_validator.cc b/media/gpu/test/video_frame_validator.cc index cc07886..ed082bb 100644 --- a/media/gpu/test/video_frame_validator.cc +++ b/media/gpu/test/video_frame_validator.cc
@@ -6,9 +6,9 @@ #include <sys/mman.h> -#include "base/bind.h" #include "base/cpu.h" #include "base/files/file.h" +#include "base/functional/bind.h" #include "base/hash/md5.h" #include "base/memory/ptr_util.h" #include "base/no_destructor.h"
diff --git a/media/gpu/test/video_frame_validator.h b/media/gpu/test/video_frame_validator.h index fef2212..5831317 100644 --- a/media/gpu/test/video_frame_validator.h +++ b/media/gpu/test/video_frame_validator.h
@@ -11,8 +11,8 @@ #include <utility> #include <vector> -#include "base/callback.h" #include "base/files/file.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" #include "base/synchronization/condition_variable.h" #include "base/synchronization/lock.h" @@ -292,10 +292,8 @@ // passes. class LogLikelihoodRatioVideoFrameValidator : public VideoFrameValidator { public: - // TODO (b/262772938): Find an actual tolerance value for this validator. This - // is just a placeholder until we get some results on the range of this - // metric. - constexpr static double kDefaultTolerance = 50.0; + // Default tolerance value chosen empirically. + constexpr static double kDefaultTolerance = 1.015; static std::unique_ptr<LogLikelihoodRatioVideoFrameValidator> Create( const GetModelFrameCB& get_model_frame_cb,
diff --git a/media/gpu/test/video_player/decoder_listener.cc b/media/gpu/test/video_player/decoder_listener.cc index 0e8d043..41035c5 100644 --- a/media/gpu/test/video_player/decoder_listener.cc +++ b/media/gpu/test/video_player/decoder_listener.cc
@@ -4,7 +4,7 @@ #include "media/gpu/test/video_player/decoder_listener.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "media/gpu/macros.h" #include "media/gpu/test/video.h"
diff --git a/media/gpu/test/video_player/decoder_listener.h b/media/gpu/test/video_player/decoder_listener.h index 229fdf4..9b5cd7d 100644 --- a/media/gpu/test/video_player/decoder_listener.h +++ b/media/gpu/test/video_player/decoder_listener.h
@@ -9,8 +9,8 @@ #include <memory> #include <utility> -#include "base/callback.h" #include "base/containers/queue.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/sequence_checker.h" #include "base/synchronization/condition_variable.h"
diff --git a/media/gpu/test/video_player/decoder_wrapper.cc b/media/gpu/test/video_player/decoder_wrapper.cc index 8eb2e29..f79e937 100644 --- a/media/gpu/test/video_player/decoder_wrapper.cc +++ b/media/gpu/test/video_player/decoder_wrapper.cc
@@ -7,7 +7,7 @@ #include <string> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/task/sequenced_task_runner.h" #include "base/task/single_thread_task_runner.h"
diff --git a/media/gpu/test/video_player/test_vda_video_decoder.cc b/media/gpu/test/video_player/test_vda_video_decoder.cc index 021db0c3e..7faacd5 100644 --- a/media/gpu/test/video_player/test_vda_video_decoder.cc +++ b/media/gpu/test/video_player/test_vda_video_decoder.cc
@@ -10,7 +10,7 @@ #include <GLES2/gl2.h> #include <GLES2/gl2ext.h> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/task/sequenced_task_runner.h" #include "base/task/single_thread_task_runner.h"
diff --git a/media/gpu/test/video_test_helpers.cc b/media/gpu/test/video_test_helpers.cc index 42ebca4..0b83296 100644 --- a/media/gpu/test/video_test_helpers.cc +++ b/media/gpu/test/video_test_helpers.cc
@@ -6,7 +6,7 @@ #include <limits> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/memory/ptr_util.h" #include "base/memory/read_only_shared_memory_region.h"
diff --git a/media/gpu/v4l2/v4l2_decode_surface.h b/media/gpu/v4l2/v4l2_decode_surface.h index ea01b5f..0552b7a 100644 --- a/media/gpu/v4l2/v4l2_decode_surface.h +++ b/media/gpu/v4l2/v4l2_decode_surface.h
@@ -7,7 +7,7 @@ #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/ref_counted.h" #include "base/sequence_checker.h" #include "media/base/video_color_space.h"
diff --git a/media/gpu/v4l2/v4l2_device.cc b/media/gpu/v4l2/v4l2_device.cc index fcc52dd..6151f7e3f 100644 --- a/media/gpu/v4l2/v4l2_device.cc +++ b/media/gpu/v4l2/v4l2_device.cc
@@ -20,7 +20,7 @@ #include <string.h> #include <sys/mman.h> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/numerics/checked_math.h" #include "base/numerics/safe_conversions.h"
diff --git a/media/gpu/v4l2/v4l2_device_poller.cc b/media/gpu/v4l2/v4l2_device_poller.cc index cfb1eb6..8323cc7 100644 --- a/media/gpu/v4l2/v4l2_device_poller.cc +++ b/media/gpu/v4l2/v4l2_device_poller.cc
@@ -6,7 +6,7 @@ #include <string> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/task/sequenced_task_runner.h" #include "base/threading/thread_checker.h" #include "media/gpu/macros.h"
diff --git a/media/gpu/v4l2/v4l2_device_poller.h b/media/gpu/v4l2/v4l2_device_poller.h index 8469f9e..2e171e85 100644 --- a/media/gpu/v4l2/v4l2_device_poller.h +++ b/media/gpu/v4l2/v4l2_device_poller.h
@@ -6,7 +6,7 @@ #define MEDIA_GPU_V4L2_V4L2_DEVICE_POLLER_H_ #include <atomic> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/sequence_checker.h" #include "base/synchronization/waitable_event.h" #include "base/task/sequenced_task_runner.h"
diff --git a/media/gpu/v4l2/v4l2_image_processor_backend.cc b/media/gpu/v4l2/v4l2_image_processor_backend.cc index 090fddf..d95d9ab006 100644 --- a/media/gpu/v4l2/v4l2_image_processor_backend.cc +++ b/media/gpu/v4l2/v4l2_image_processor_backend.cc
@@ -16,8 +16,8 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/numerics/safe_conversions.h" #include "base/task/sequenced_task_runner.h" #include "base/task/task_traits.h"
diff --git a/media/gpu/v4l2/v4l2_jpeg_encode_accelerator.cc b/media/gpu/v4l2/v4l2_jpeg_encode_accelerator.cc index e1fdc8a6..fbdff0a8 100644 --- a/media/gpu/v4l2/v4l2_jpeg_encode_accelerator.cc +++ b/media/gpu/v4l2/v4l2_jpeg_encode_accelerator.cc
@@ -13,9 +13,9 @@ #include <tuple> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/cxx17_backports.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/task/single_thread_task_runner.h" #include "media/base/bind_to_current_loop.h" #include "media/gpu/chromeos/fourcc.h"
diff --git a/media/gpu/v4l2/v4l2_mjpeg_decode_accelerator.cc b/media/gpu/v4l2/v4l2_mjpeg_decode_accelerator.cc index c338fdbc..05f8911ef 100644 --- a/media/gpu/v4l2/v4l2_mjpeg_decode_accelerator.cc +++ b/media/gpu/v4l2/v4l2_mjpeg_decode_accelerator.cc
@@ -14,9 +14,9 @@ #include <utility> #include "base/big_endian.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/files/scoped_file.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/page_size.h" #include "base/memory/shared_memory_mapping.h" #include "base/memory/unsafe_shared_memory_region.h"
diff --git a/media/gpu/v4l2/v4l2_slice_video_decode_accelerator.cc b/media/gpu/v4l2/v4l2_slice_video_decode_accelerator.cc index 6ffc6c5..a8c51951 100644 --- a/media/gpu/v4l2/v4l2_slice_video_decode_accelerator.cc +++ b/media/gpu/v4l2/v4l2_slice_video_decode_accelerator.cc
@@ -16,11 +16,11 @@ #include <memory> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ptr_util.h" #include "base/numerics/safe_conversions.h" #include "base/posix/eintr_wrapper.h"
diff --git a/media/gpu/v4l2/v4l2_vda_helpers.cc b/media/gpu/v4l2/v4l2_vda_helpers.cc index 60001b3..1fda578e 100644 --- a/media/gpu/v4l2/v4l2_vda_helpers.cc +++ b/media/gpu/v4l2/v4l2_vda_helpers.cc
@@ -4,8 +4,8 @@ #include "media/gpu/v4l2/v4l2_vda_helpers.h" -#include "base/bind.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/ranges/algorithm.h" #include "base/task/sequenced_task_runner.h" #include "media/base/color_plane_layout.h"
diff --git a/media/gpu/v4l2/v4l2_video_decode_accelerator.cc b/media/gpu/v4l2/v4l2_video_decode_accelerator.cc index c364cf5..e47ed8f 100644 --- a/media/gpu/v4l2/v4l2_video_decode_accelerator.cc +++ b/media/gpu/v4l2/v4l2_video_decode_accelerator.cc
@@ -14,9 +14,9 @@ #include <sys/ioctl.h> #include <sys/mman.h> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/numerics/safe_conversions.h" #include "base/posix/eintr_wrapper.h" #include "base/ranges/algorithm.h"
diff --git a/media/gpu/v4l2/v4l2_video_decode_accelerator.h b/media/gpu/v4l2/v4l2_video_decode_accelerator.h index 9edb4cd5..8a6c688 100644 --- a/media/gpu/v4l2/v4l2_video_decode_accelerator.h +++ b/media/gpu/v4l2/v4l2_video_decode_accelerator.h
@@ -18,9 +18,9 @@ #include <utility> #include <vector> -#include "base/callback_forward.h" #include "base/cancelable_callback.h" #include "base/containers/queue.h" +#include "base/functional/callback_forward.h" #include "base/memory/scoped_refptr.h" #include "base/synchronization/waitable_event.h" #include "base/task/single_thread_task_runner.h"
diff --git a/media/gpu/v4l2/v4l2_video_decoder.cc b/media/gpu/v4l2/v4l2_video_decoder.cc index 839034c..e15c7bc 100644 --- a/media/gpu/v4l2/v4l2_video_decoder.cc +++ b/media/gpu/v4l2/v4l2_video_decoder.cc
@@ -6,9 +6,9 @@ #include <algorithm> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/memory/ptr_util.h" #include "base/task/sequenced_task_runner.h"
diff --git a/media/gpu/v4l2/v4l2_video_decoder.h b/media/gpu/v4l2/v4l2_video_decoder.h index 98bb71f..3b6c76a 100644 --- a/media/gpu/v4l2/v4l2_video_decoder.h +++ b/media/gpu/v4l2/v4l2_video_decoder.h
@@ -12,9 +12,9 @@ #include <utility> #include <vector> -#include "base/callback_forward.h" #include "base/containers/lru_cache.h" #include "base/containers/queue.h" +#include "base/functional/callback_forward.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h" #include "base/sequence_checker.h"
diff --git a/media/gpu/v4l2/v4l2_video_decoder_backend_stateful.cc b/media/gpu/v4l2/v4l2_video_decoder_backend_stateful.cc index a29af02..fcb58ad1 100644 --- a/media/gpu/v4l2/v4l2_video_decoder_backend_stateful.cc +++ b/media/gpu/v4l2/v4l2_video_decoder_backend_stateful.cc
@@ -9,9 +9,9 @@ #include <tuple> #include <utility> -#include "base/bind.h" #include "base/containers/contains.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/metrics/histogram_macros.h" #include "base/sequence_checker.h"
diff --git a/media/gpu/v4l2/v4l2_video_decoder_backend_stateless.cc b/media/gpu/v4l2/v4l2_video_decoder_backend_stateless.cc index f9f5724..a85a7bd 100644 --- a/media/gpu/v4l2/v4l2_video_decoder_backend_stateless.cc +++ b/media/gpu/v4l2/v4l2_video_decoder_backend_stateless.cc
@@ -10,9 +10,9 @@ #include <memory> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/metrics/histogram_macros.h" #include "base/numerics/safe_conversions.h" #include "base/posix/eintr_wrapper.h"
diff --git a/media/gpu/v4l2/v4l2_video_encode_accelerator.cc b/media/gpu/v4l2/v4l2_video_encode_accelerator.cc index c560d98..56389ea3ee 100644 --- a/media/gpu/v4l2/v4l2_video_encode_accelerator.cc +++ b/media/gpu/v4l2/v4l2_video_encode_accelerator.cc
@@ -16,11 +16,11 @@ #include <numeric> #include <utility> -#include "base/bind.h" #include "base/bits.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/memory/shared_memory_mapping.h" #include "base/memory/unsafe_shared_memory_region.h" #include "base/numerics/safe_conversions.h"
diff --git a/media/gpu/vaapi/av1_vaapi_video_decoder_delegate.cc b/media/gpu/vaapi/av1_vaapi_video_decoder_delegate.cc index 1760460..bc304cd 100644 --- a/media/gpu/vaapi/av1_vaapi_video_decoder_delegate.cc +++ b/media/gpu/vaapi/av1_vaapi_video_decoder_delegate.cc
@@ -9,7 +9,7 @@ #include <algorithm> #include <vector> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/memory/scoped_refptr.h" #include "build/chromeos_buildflags.h"
diff --git a/media/gpu/vaapi/fuzzers/jpeg_decoder/jpeg_decoder_fuzzertest.cc b/media/gpu/vaapi/fuzzers/jpeg_decoder/jpeg_decoder_fuzzertest.cc index 8a9d38c0..3a3cd744d 100644 --- a/media/gpu/vaapi/fuzzers/jpeg_decoder/jpeg_decoder_fuzzertest.cc +++ b/media/gpu/vaapi/fuzzers/jpeg_decoder/jpeg_decoder_fuzzertest.cc
@@ -9,7 +9,7 @@ #include <algorithm> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/numerics/safe_conversions.h" #include "media/gpu/vaapi/fuzzers/jpeg_decoder/jpeg_decoder_fuzzer_input.pb.h"
diff --git a/media/gpu/vaapi/h264_vaapi_video_decoder_delegate.h b/media/gpu/vaapi/h264_vaapi_video_decoder_delegate.h index 1cad17e..7d366ef1 100644 --- a/media/gpu/vaapi/h264_vaapi_video_decoder_delegate.h +++ b/media/gpu/vaapi/h264_vaapi_video_decoder_delegate.h
@@ -6,7 +6,7 @@ #define MEDIA_GPU_VAAPI_H264_VAAPI_VIDEO_DECODER_DELEGATE_H_ #include "base/atomic_sequence_num.h" -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/memory/scoped_refptr.h" #include "base/sequence_checker.h" #include "build/chromeos_buildflags.h"
diff --git a/media/gpu/vaapi/va_surface.h b/media/gpu/vaapi/va_surface.h index 60c41b2..2f1d3a702 100644 --- a/media/gpu/vaapi/va_surface.h +++ b/media/gpu/vaapi/va_surface.h
@@ -10,7 +10,7 @@ #include <va/va.h> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/ref_counted.h" #include "ui/gfx/geometry/size.h"
diff --git a/media/gpu/vaapi/vaapi_dmabuf_video_frame_mapper.cc b/media/gpu/vaapi/vaapi_dmabuf_video_frame_mapper.cc index 0158342..c893b43 100644 --- a/media/gpu/vaapi/vaapi_dmabuf_video_frame_mapper.cc +++ b/media/gpu/vaapi/vaapi_dmabuf_video_frame_mapper.cc
@@ -6,8 +6,8 @@ #include <sys/mman.h> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ptr_util.h" #include "build/build_config.h" #include "media/base/color_plane_layout.h"
diff --git a/media/gpu/vaapi/vaapi_image_decode_accelerator_worker.cc b/media/gpu/vaapi/vaapi_image_decode_accelerator_worker.cc index 296057a..02e7b0df 100644 --- a/media/gpu/vaapi/vaapi_image_decode_accelerator_worker.cc +++ b/media/gpu/vaapi/vaapi_image_decode_accelerator_worker.cc
@@ -9,9 +9,9 @@ #include <utility> -#include "base/bind.h" #include "base/containers/span.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/logging.h" #include "base/memory/ptr_util.h"
diff --git a/media/gpu/vaapi/vaapi_image_decode_accelerator_worker_unittest.cc b/media/gpu/vaapi/vaapi_image_decode_accelerator_worker_unittest.cc index 47295cd..9130b2a 100644 --- a/media/gpu/vaapi/vaapi_image_decode_accelerator_worker_unittest.cc +++ b/media/gpu/vaapi/vaapi_image_decode_accelerator_worker_unittest.cc
@@ -13,9 +13,9 @@ #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" -#include "base/bind.h" #include "base/check_op.h" #include "base/containers/span.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/memory/scoped_refptr.h" #include "base/notreached.h"
diff --git a/media/gpu/vaapi/vaapi_image_decoder.h b/media/gpu/vaapi/vaapi_image_decoder.h index fcbb0e0..ac654dc 100644 --- a/media/gpu/vaapi/vaapi_image_decoder.h +++ b/media/gpu/vaapi/vaapi_image_decoder.h
@@ -10,8 +10,8 @@ #include <memory> -#include "base/callback_forward.h" #include "base/containers/span.h" +#include "base/functional/callback_forward.h" #include "base/memory/scoped_refptr.h" #include "gpu/config/gpu_info.h" #include "third_party/skia/include/core/SkImageInfo.h"
diff --git a/media/gpu/vaapi/vaapi_image_decoder_test_common.cc b/media/gpu/vaapi/vaapi_image_decoder_test_common.cc index 960239e0..01fa165 100644 --- a/media/gpu/vaapi/vaapi_image_decoder_test_common.cc +++ b/media/gpu/vaapi/vaapi_image_decoder_test_common.cc
@@ -4,11 +4,11 @@ #include "media/gpu/vaapi/vaapi_image_decoder_test_common.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/command_line.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/logging.h" #include "media/base/test_data_util.h" #include "media/gpu/vaapi/vaapi_image_decoder.h"
diff --git a/media/gpu/vaapi/vaapi_image_processor_backend.cc b/media/gpu/vaapi/vaapi_image_processor_backend.cc index a557ff1..1662a47 100644 --- a/media/gpu/vaapi/vaapi_image_processor_backend.cc +++ b/media/gpu/vaapi/vaapi_image_processor_backend.cc
@@ -8,9 +8,9 @@ #include <va/va.h> -#include "base/bind.h" -#include "base/callback.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/ptr_util.h" #include "base/memory/scoped_refptr.h" #include "base/metrics/histogram_functions.h"
diff --git a/media/gpu/vaapi/vaapi_jpeg_encode_accelerator.cc b/media/gpu/vaapi/vaapi_jpeg_encode_accelerator.cc index 1b5345f..ab9cbb8 100644 --- a/media/gpu/vaapi/vaapi_jpeg_encode_accelerator.cc +++ b/media/gpu/vaapi/vaapi_jpeg_encode_accelerator.cc
@@ -9,8 +9,8 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/memory/shared_memory_mapping.h" #include "base/memory/unsafe_shared_memory_region.h"
diff --git a/media/gpu/vaapi/vaapi_mjpeg_decode_accelerator.cc b/media/gpu/vaapi/vaapi_mjpeg_decode_accelerator.cc index 908adb5..138fa237 100644 --- a/media/gpu/vaapi/vaapi_mjpeg_decode_accelerator.cc +++ b/media/gpu/vaapi/vaapi_mjpeg_decode_accelerator.cc
@@ -11,9 +11,9 @@ #include <array> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/files/scoped_file.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/logging.h" #include "base/memory/page_size.h"
diff --git a/media/gpu/vaapi/vaapi_unittest.cc b/media/gpu/vaapi/vaapi_unittest.cc index 9ade72a..2e055b0 100644 --- a/media/gpu/vaapi/vaapi_unittest.cc +++ b/media/gpu/vaapi/vaapi_unittest.cc
@@ -18,12 +18,12 @@ #include <xf86drm.h> #include "base/bits.h" -#include "base/callback_helpers.h" #include "base/containers/contains.h" #include "base/cpu.h" #include "base/files/file.h" #include "base/files/file_util.h" #include "base/files/scoped_file.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/process/launch.h" #include "base/strings/pattern.h"
diff --git a/media/gpu/vaapi/vaapi_utils.h b/media/gpu/vaapi/vaapi_utils.h index c475641..0d85a433 100644 --- a/media/gpu/vaapi/vaapi_utils.h +++ b/media/gpu/vaapi/vaapi_utils.h
@@ -7,8 +7,8 @@ #include <va/va.h> -#include "base/callback_forward.h" -#include "base/callback_helpers.h" +#include "base/functional/callback_forward.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/thread_annotations.h" #include "ui/gfx/geometry/size.h"
diff --git a/media/gpu/vaapi/vaapi_utils_unittest.cc b/media/gpu/vaapi/vaapi_utils_unittest.cc index 71d5435f..5602b85 100644 --- a/media/gpu/vaapi/vaapi_utils_unittest.cc +++ b/media/gpu/vaapi/vaapi_utils_unittest.cc
@@ -9,7 +9,7 @@ #include <memory> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/memory/scoped_refptr.h" #include "base/numerics/safe_conversions.h"
diff --git a/media/gpu/vaapi/vaapi_video_decode_accelerator.cc b/media/gpu/vaapi/vaapi_video_decode_accelerator.cc index 4e3a55f..07d39bae 100644 --- a/media/gpu/vaapi/vaapi_video_decode_accelerator.cc +++ b/media/gpu/vaapi/vaapi_video_decode_accelerator.cc
@@ -9,12 +9,12 @@ #include <memory> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/containers/contains.h" #include "base/containers/cxx20_erase.h" #include "base/cpu.h" #include "base/files/scoped_file.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/json/json_writer.h" #include "base/logging.h" #include "base/metrics/histogram_macros.h"
diff --git a/media/gpu/vaapi/vaapi_video_decode_accelerator_unittest.cc b/media/gpu/vaapi/vaapi_video_decode_accelerator_unittest.cc index 976daf1..6cc22e9c 100644 --- a/media/gpu/vaapi/vaapi_video_decode_accelerator_unittest.cc +++ b/media/gpu/vaapi/vaapi_video_decode_accelerator_unittest.cc
@@ -4,8 +4,8 @@ #include "media/gpu/vaapi/vaapi_video_decode_accelerator.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h"
diff --git a/media/gpu/vaapi/vaapi_video_decoder.cc b/media/gpu/vaapi/vaapi_video_decoder.cc index 83c7e46a..9ec8dde 100644 --- a/media/gpu/vaapi/vaapi_video_decoder.cc +++ b/media/gpu/vaapi/vaapi_video_decoder.cc
@@ -9,11 +9,11 @@ #include <limits> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/containers/contains.h" #include "base/containers/fixed_flat_map.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ptr_util.h" #include "base/metrics/histogram_macros.h" #include "base/task/sequenced_task_runner.h"
diff --git a/media/gpu/vaapi/vaapi_video_decoder_delegate.cc b/media/gpu/vaapi/vaapi_video_decoder_delegate.cc index ce605e5..0f238b0 100644 --- a/media/gpu/vaapi/vaapi_video_decoder_delegate.cc +++ b/media/gpu/vaapi/vaapi_video_decoder_delegate.cc
@@ -4,8 +4,8 @@ #include "media/gpu/vaapi/vaapi_video_decoder_delegate.h" -#include "base/bind.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/numerics/safe_conversions.h" #include "base/task/sequenced_task_runner.h"
diff --git a/media/gpu/vaapi/vaapi_video_decoder_delegate.h b/media/gpu/vaapi/vaapi_video_decoder_delegate.h index addff582..4177e4c0 100644 --- a/media/gpu/vaapi/vaapi_video_decoder_delegate.h +++ b/media/gpu/vaapi/vaapi_video_decoder_delegate.h
@@ -10,8 +10,8 @@ #include <string> #include <vector> -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h"
diff --git a/media/gpu/vaapi/vaapi_video_encode_accelerator.cc b/media/gpu/vaapi/vaapi_video_encode_accelerator.cc index 8b69d97..098117c 100644 --- a/media/gpu/vaapi/vaapi_video_encode_accelerator.cc +++ b/media/gpu/vaapi/vaapi_video_encode_accelerator.cc
@@ -13,13 +13,13 @@ #include <utility> #include <variant> -#include "base/bind.h" #include "base/bits.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/containers/contains.h" #include "base/cxx17_backports.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ptr_util.h" #include "base/memory/shared_memory_mapping.h" #include "base/memory/unsafe_shared_memory_region.h"
diff --git a/media/gpu/vaapi/vaapi_video_encoder_delegate.h b/media/gpu/vaapi/vaapi_video_encoder_delegate.h index 1af498e..b224a3f 100644 --- a/media/gpu/vaapi/vaapi_video_encoder_delegate.h +++ b/media/gpu/vaapi/vaapi_video_encoder_delegate.h
@@ -8,8 +8,8 @@ #include <va/va.h> #include <vector> -#include "base/callback.h" #include "base/containers/queue.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" #include "base/sequence_checker.h" #include "base/time/time.h"
diff --git a/media/gpu/vaapi/vaapi_wrapper.cc b/media/gpu/vaapi/vaapi_wrapper.cc index 77e0216..8c24925 100644 --- a/media/gpu/vaapi/vaapi_wrapper.cc +++ b/media/gpu/vaapi/vaapi_wrapper.cc
@@ -20,14 +20,14 @@ #include <type_traits> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/containers/contains.h" #include "base/containers/cxx20_erase.h" #include "base/containers/fixed_flat_set.h" #include "base/cpu.h" #include "base/environment.h" #include "base/files/scoped_file.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/metrics/histogram_macros.h" #include "base/no_destructor.h"
diff --git a/media/gpu/vaapi/vp8_vaapi_video_decoder_delegate.cc b/media/gpu/vaapi/vp8_vaapi_video_decoder_delegate.cc index cac6d9af..e7abc552 100644 --- a/media/gpu/vaapi/vp8_vaapi_video_decoder_delegate.cc +++ b/media/gpu/vaapi/vp8_vaapi_video_decoder_delegate.cc
@@ -4,7 +4,7 @@ #include "media/gpu/vaapi/vp8_vaapi_video_decoder_delegate.h" -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/trace_event/trace_event.h" #include "media/gpu/decode_surface_handler.h" #include "media/gpu/vaapi/va_surface.h"
diff --git a/media/gpu/vaapi/vp9_vaapi_video_decoder_delegate.h b/media/gpu/vaapi/vp9_vaapi_video_decoder_delegate.h index 0abe7312..2df02f9 100644 --- a/media/gpu/vaapi/vp9_vaapi_video_decoder_delegate.h +++ b/media/gpu/vaapi/vp9_vaapi_video_decoder_delegate.h
@@ -5,7 +5,7 @@ #ifndef MEDIA_GPU_VAAPI_VP9_VAAPI_VIDEO_DECODER_DELEGATE_H_ #define MEDIA_GPU_VAAPI_VP9_VAAPI_VIDEO_DECODER_DELEGATE_H_ -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/memory/scoped_refptr.h" #include "base/sequence_checker.h" #include "media/filters/vp9_parser.h"
diff --git a/media/gpu/vaapi/vp9_vaapi_video_encoder_delegate_unittest.cc b/media/gpu/vaapi/vp9_vaapi_video_encoder_delegate_unittest.cc index ef8fe00a7..f7f6ded 100644 --- a/media/gpu/vaapi/vp9_vaapi_video_encoder_delegate_unittest.cc +++ b/media/gpu/vaapi/vp9_vaapi_video_encoder_delegate_unittest.cc
@@ -10,9 +10,9 @@ #include <va/va.h> -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/cxx17_backports.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/memory/raw_ptr.h" #include "base/numerics/safe_conversions.h"
diff --git a/media/gpu/video_decode_accelerator_tests.cc b/media/gpu/video_decode_accelerator_tests.cc index 1a226b9..ed143f9 100644 --- a/media/gpu/video_decode_accelerator_tests.cc +++ b/media/gpu/video_decode_accelerator_tests.cc
@@ -4,9 +4,9 @@ #include <limits> -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/files/file_util.h" +#include "base/functional/callback_helpers.h" #include "base/numerics/safe_conversions.h" #include "base/strings/string_number_conversions.h" #include "build/build_config.h"
diff --git a/media/gpu/vp9_decoder.cc b/media/gpu/vp9_decoder.cc index d8974e0..202c3d0 100644 --- a/media/gpu/vp9_decoder.cc +++ b/media/gpu/vp9_decoder.cc
@@ -6,8 +6,8 @@ #include <memory> -#include "base/bind.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/metrics/histogram_functions.h" #include "build/build_config.h"
diff --git a/media/gpu/vp9_decoder.h b/media/gpu/vp9_decoder.h index 130e1e65..3486ed5 100644 --- a/media/gpu/vp9_decoder.h +++ b/media/gpu/vp9_decoder.h
@@ -11,7 +11,7 @@ #include <memory> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/scoped_refptr.h" #include "media/base/video_types.h" #include "media/filters/vp9_parser.h"
diff --git a/media/gpu/windows/d3d11_av1_accelerator.h b/media/gpu/windows/d3d11_av1_accelerator.h index df8b984..a0517fb 100644 --- a/media/gpu/windows/d3d11_av1_accelerator.h +++ b/media/gpu/windows/d3d11_av1_accelerator.h
@@ -11,7 +11,7 @@ #include <windows.h> #include <wrl/client.h> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "media/base/media_log.h" #include "media/gpu/av1_decoder.h"
diff --git a/media/gpu/windows/d3d11_copying_texture_wrapper_unittest.cc b/media/gpu/windows/d3d11_copying_texture_wrapper_unittest.cc index 24924c0..ad4ca6e 100644 --- a/media/gpu/windows/d3d11_copying_texture_wrapper_unittest.cc +++ b/media/gpu/windows/d3d11_copying_texture_wrapper_unittest.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/task/single_thread_task_runner.h" #include "base/test/task_environment.h" #include "media/gpu/windows/d3d11_copying_texture_wrapper.h"
diff --git a/media/gpu/windows/d3d11_picture_buffer_unittest.cc b/media/gpu/windows/d3d11_picture_buffer_unittest.cc index 8366b49..5a7be5de 100644 --- a/media/gpu/windows/d3d11_picture_buffer_unittest.cc +++ b/media/gpu/windows/d3d11_picture_buffer_unittest.cc
@@ -4,7 +4,7 @@ #include <utility> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/test/task_environment.h" #include "media/gpu/windows/d3d11_picture_buffer.h" #include "testing/gmock/include/gmock/gmock.h"
diff --git a/media/gpu/windows/d3d11_texture_wrapper_unittest.cc b/media/gpu/windows/d3d11_texture_wrapper_unittest.cc index 2a633a48..ad32cd3 100644 --- a/media/gpu/windows/d3d11_texture_wrapper_unittest.cc +++ b/media/gpu/windows/d3d11_texture_wrapper_unittest.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/task/single_thread_task_runner.h" #include "base/test/task_environment.h"
diff --git a/media/gpu/windows/d3d11_video_decoder.cc b/media/gpu/windows/d3d11_video_decoder.cc index 1f04bdf..60c0f80 100644 --- a/media/gpu/windows/d3d11_video_decoder.cc +++ b/media/gpu/windows/d3d11_video_decoder.cc
@@ -8,12 +8,12 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/debug/crash_logging.h" #include "base/debug/dump_without_crashing.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ptr_util.h" #include "base/memory/ref_counted_delete_on_sequence.h" #include "base/metrics/histogram_functions.h"
diff --git a/media/gpu/windows/d3d11_video_decoder_client.h b/media/gpu/windows/d3d11_video_decoder_client.h index aeeb694..17c8b03 100644 --- a/media/gpu/windows/d3d11_video_decoder_client.h +++ b/media/gpu/windows/d3d11_video_decoder_client.h
@@ -5,7 +5,7 @@ #ifndef MEDIA_GPU_WINDOWS_D3D11_VIDEO_DECODER_CLIENT_H_ #define MEDIA_GPU_WINDOWS_D3D11_VIDEO_DECODER_CLIENT_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "media/base/video_color_space.h" #include "media/gpu/windows/d3d11_com_defs.h"
diff --git a/media/gpu/windows/d3d11_video_decoder_impl.cc b/media/gpu/windows/d3d11_video_decoder_impl.cc index 954a440..cadf7fa2 100644 --- a/media/gpu/windows/d3d11_video_decoder_impl.cc +++ b/media/gpu/windows/d3d11_video_decoder_impl.cc
@@ -4,7 +4,7 @@ #include "media/gpu/windows/d3d11_video_decoder_impl.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "gpu/command_buffer/common/sync_token.h" #include "gpu/command_buffer/service/scheduler.h" #include "gpu/ipc/service/gpu_channel.h"
diff --git a/media/gpu/windows/d3d11_video_decoder_impl.h b/media/gpu/windows/d3d11_video_decoder_impl.h index 50a8924..ec071d04 100644 --- a/media/gpu/windows/d3d11_video_decoder_impl.h +++ b/media/gpu/windows/d3d11_video_decoder_impl.h
@@ -11,7 +11,7 @@ #include <memory> #include <tuple> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h" #include "base/threading/thread_checker.h"
diff --git a/media/gpu/windows/d3d11_video_decoder_unittest.cc b/media/gpu/windows/d3d11_video_decoder_unittest.cc index d0b51f4..a38caf9 100644 --- a/media/gpu/windows/d3d11_video_decoder_unittest.cc +++ b/media/gpu/windows/d3d11_video_decoder_unittest.cc
@@ -11,8 +11,8 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h"
diff --git a/media/gpu/windows/d3d11_video_processor_proxy_unittest.cc b/media/gpu/windows/d3d11_video_processor_proxy_unittest.cc index 50e7122..7f874c93 100644 --- a/media/gpu/windows/d3d11_video_processor_proxy_unittest.cc +++ b/media/gpu/windows/d3d11_video_processor_proxy_unittest.cc
@@ -5,7 +5,7 @@ #include <random> #include <utility> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "media/base/win/d3d11_mocks.h" #include "media/gpu/windows/d3d11_copying_texture_wrapper.h" #include "media/gpu/windows/d3d11_texture_wrapper.h"
diff --git a/media/gpu/windows/dxva_video_decode_accelerator_win.cc b/media/gpu/windows/dxva_video_decode_accelerator_win.cc index 7d08966..eaf93b8a 100644 --- a/media/gpu/windows/dxva_video_decode_accelerator_win.cc +++ b/media/gpu/windows/dxva_video_decode_accelerator_win.cc
@@ -22,12 +22,12 @@ #include "base/atomicops.h" #include "base/base_paths_win.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/command_line.h" #include "base/containers/contains.h" #include "base/file_version_info.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/location.h" #include "base/logging.h" #include "base/metrics/histogram_functions.h"
diff --git a/media/gpu/windows/media_foundation_video_encode_accelerator_win.h b/media/gpu/windows/media_foundation_video_encode_accelerator_win.h index 6660fb1..1ac8e2d5 100644 --- a/media/gpu/windows/media_foundation_video_encode_accelerator_win.h +++ b/media/gpu/windows/media_foundation_video_encode_accelerator_win.h
@@ -13,8 +13,8 @@ #include <memory> -#include "base/bind.h" #include "base/containers/circular_deque.h" +#include "base/functional/bind.h" #include "base/memory/weak_ptr.h" #include "base/task/sequenced_task_runner.h" #include "base/task/single_thread_task_runner.h"
diff --git a/media/gpu/windows/mf_audio_encoder.cc b/media/gpu/windows/mf_audio_encoder.cc index 4008c00..aa54a0a 100644 --- a/media/gpu/windows/mf_audio_encoder.cc +++ b/media/gpu/windows/mf_audio_encoder.cc
@@ -16,8 +16,8 @@ #include <algorithm> #include <utility> -#include "base/bind.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/memory/weak_ptr.h" #include "base/task/sequenced_task_runner.h"
diff --git a/media/gpu/windows/mf_audio_encoder.h b/media/gpu/windows/mf_audio_encoder.h index c257f31..1f721eb8 100644 --- a/media/gpu/windows/mf_audio_encoder.h +++ b/media/gpu/windows/mf_audio_encoder.h
@@ -9,9 +9,9 @@ #include <memory> -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/containers/circular_deque.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/memory/weak_ptr.h" #include "base/sequence_checker.h" #include "media/base/audio_encoder.h"
diff --git a/media/gpu/windows/output_with_release_mailbox_cb.h b/media/gpu/windows/output_with_release_mailbox_cb.h index 849d73f..3ea87c2 100644 --- a/media/gpu/windows/output_with_release_mailbox_cb.h +++ b/media/gpu/windows/output_with_release_mailbox_cb.h
@@ -5,7 +5,7 @@ #ifndef MEDIA_GPU_WINDOWS_OUTPUT_WITH_RELEASE_MAILBOX_CB_H_ #define MEDIA_GPU_WINDOWS_OUTPUT_WITH_RELEASE_MAILBOX_CB_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" #include "media/base/video_frame.h"
diff --git a/media/learning/common/learning_task_controller.h b/media/learning/common/learning_task_controller.h index 285e1e50..169d950 100644 --- a/media/learning/common/learning_task_controller.h +++ b/media/learning/common/learning_task_controller.h
@@ -5,8 +5,8 @@ #ifndef MEDIA_LEARNING_COMMON_LEARNING_TASK_CONTROLLER_H_ #define MEDIA_LEARNING_COMMON_LEARNING_TASK_CONTROLLER_H_ -#include "base/callback.h" #include "base/component_export.h" +#include "base/functional/callback.h" #include "base/unguessable_token.h" #include "media/learning/common/labelled_example.h" #include "media/learning/common/learning_task.h"
diff --git a/media/learning/common/media_learning_tasks.h b/media/learning/common/media_learning_tasks.h index b6b0c78..fd1ade54 100644 --- a/media/learning/common/media_learning_tasks.h +++ b/media/learning/common/media_learning_tasks.h
@@ -5,8 +5,8 @@ #ifndef MEDIA_LEARNING_COMMON_MEDIA_LEARNING_TASKS_H_ #define MEDIA_LEARNING_COMMON_MEDIA_LEARNING_TASKS_H_ -#include "base/callback.h" #include "base/component_export.h" +#include "base/functional/callback.h" #include "media/learning/common/learning_task.h" namespace media {
diff --git a/media/learning/common/media_learning_tasks_unittest.cc b/media/learning/common/media_learning_tasks_unittest.cc index 6eeeb5bb..38e7782 100644 --- a/media/learning/common/media_learning_tasks_unittest.cc +++ b/media/learning/common/media_learning_tasks_unittest.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/media/learning/impl/distribution_reporter.cc b/media/learning/impl/distribution_reporter.cc index d36da980..1e83192 100644 --- a/media/learning/impl/distribution_reporter.cc +++ b/media/learning/impl/distribution_reporter.cc
@@ -4,8 +4,8 @@ #include "media/learning/impl/distribution_reporter.h" -#include "base/bind.h" #include "base/cxx17_backports.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_functions.h" #include "services/metrics/public/cpp/ukm_builders.h" #include "services/metrics/public/cpp/ukm_recorder.h"
diff --git a/media/learning/impl/distribution_reporter.h b/media/learning/impl/distribution_reporter.h index d6b40a9b..6f9a41bc 100644 --- a/media/learning/impl/distribution_reporter.h +++ b/media/learning/impl/distribution_reporter.h
@@ -7,8 +7,8 @@ #include <set> -#include "base/callback.h" #include "base/component_export.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "media/learning/common/learning_task.h" #include "media/learning/common/target_histogram.h"
diff --git a/media/learning/impl/distribution_reporter_unittest.cc b/media/learning/impl/distribution_reporter_unittest.cc index 5020246..0e72a6c 100644 --- a/media/learning/impl/distribution_reporter_unittest.cc +++ b/media/learning/impl/distribution_reporter_unittest.cc
@@ -5,7 +5,7 @@ #include <memory> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/test/task_environment.h" #include "components/ukm/test_ukm_recorder.h" #include "media/learning/common/learning_task.h"
diff --git a/media/learning/impl/extra_trees_trainer.cc b/media/learning/impl/extra_trees_trainer.cc index 7e8d90c..e2f3f2c 100644 --- a/media/learning/impl/extra_trees_trainer.cc +++ b/media/learning/impl/extra_trees_trainer.cc
@@ -6,8 +6,8 @@ #include <set> -#include "base/bind.h" #include "base/check_op.h" +#include "base/functional/bind.h" #include "media/learning/impl/voting_ensemble.h" namespace media {
diff --git a/media/learning/impl/extra_trees_trainer_unittest.cc b/media/learning/impl/extra_trees_trainer_unittest.cc index f7c35a4..c269142 100644 --- a/media/learning/impl/extra_trees_trainer_unittest.cc +++ b/media/learning/impl/extra_trees_trainer_unittest.cc
@@ -4,7 +4,7 @@ #include "media/learning/impl/extra_trees_trainer.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ref_counted.h" #include "base/test/task_environment.h" #include "media/learning/impl/fisher_iris_dataset.h"
diff --git a/media/learning/impl/feature_provider.h b/media/learning/impl/feature_provider.h index 34cc9e2..cb56e0e 100644 --- a/media/learning/impl/feature_provider.h +++ b/media/learning/impl/feature_provider.h
@@ -5,8 +5,8 @@ #ifndef MEDIA_LEARNING_IMPL_FEATURE_PROVIDER_H_ #define MEDIA_LEARNING_IMPL_FEATURE_PROVIDER_H_ -#include "base/callback.h" #include "base/component_export.h" +#include "base/functional/callback.h" #include "base/threading/sequence_bound.h" #include "media/learning/common/labelled_example.h" #include "media/learning/common/learning_task.h"
diff --git a/media/learning/impl/learning_session_impl.cc b/media/learning/impl/learning_session_impl.cc index 987d631..bf24a2d0 100644 --- a/media/learning/impl/learning_session_impl.cc +++ b/media/learning/impl/learning_session_impl.cc
@@ -7,8 +7,8 @@ #include <set> #include <utility> -#include "base/bind.h" #include "base/check.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/task/sequenced_task_runner.h" #include "media/learning/impl/distribution_reporter.h"
diff --git a/media/learning/impl/learning_session_impl_unittest.cc b/media/learning/impl/learning_session_impl_unittest.cc index 11b10a3..38825f8e 100644 --- a/media/learning/impl/learning_session_impl_unittest.cc +++ b/media/learning/impl/learning_session_impl_unittest.cc
@@ -6,7 +6,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/task/sequenced_task_runner.h" #include "base/test/task_environment.h"
diff --git a/media/learning/impl/learning_task_controller_helper.cc b/media/learning/impl/learning_task_controller_helper.cc index 0b4be37..2e63468 100644 --- a/media/learning/impl/learning_task_controller_helper.cc +++ b/media/learning/impl/learning_task_controller_helper.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/task/sequenced_task_runner.h" namespace media {
diff --git a/media/learning/impl/learning_task_controller_helper.h b/media/learning/impl/learning_task_controller_helper.h index 8fda2c27..ba57eef 100644 --- a/media/learning/impl/learning_task_controller_helper.h +++ b/media/learning/impl/learning_task_controller_helper.h
@@ -8,8 +8,8 @@ #include <map> #include <memory> -#include "base/callback.h" #include "base/component_export.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h" #include "base/task/sequenced_task_runner.h"
diff --git a/media/learning/impl/learning_task_controller_helper_unittest.cc b/media/learning/impl/learning_task_controller_helper_unittest.cc index 7846583..7258cee 100644 --- a/media/learning/impl/learning_task_controller_helper_unittest.cc +++ b/media/learning/impl/learning_task_controller_helper_unittest.cc
@@ -6,7 +6,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/task/sequenced_task_runner.h" #include "base/test/task_environment.h"
diff --git a/media/learning/impl/learning_task_controller_impl.cc b/media/learning/impl/learning_task_controller_impl.cc index 21408ac..330fed3 100644 --- a/media/learning/impl/learning_task_controller_impl.cc +++ b/media/learning/impl/learning_task_controller_impl.cc
@@ -8,8 +8,8 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/check_op.h" +#include "base/functional/bind.h" #include "base/notreached.h" #include "media/learning/impl/distribution_reporter.h" #include "media/learning/impl/extra_trees_trainer.h"
diff --git a/media/learning/impl/learning_task_controller_impl.h b/media/learning/impl/learning_task_controller_impl.h index 4a9c3bf..7bf5bbab 100644 --- a/media/learning/impl/learning_task_controller_impl.h +++ b/media/learning/impl/learning_task_controller_impl.h
@@ -8,8 +8,8 @@ #include <memory> #include <set> -#include "base/callback.h" #include "base/component_export.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "media/learning/common/learning_task_controller.h" #include "media/learning/impl/distribution_reporter.h"
diff --git a/media/learning/impl/learning_task_controller_impl_unittest.cc b/media/learning/impl/learning_task_controller_impl_unittest.cc index 16031125..a9653a6 100644 --- a/media/learning/impl/learning_task_controller_impl_unittest.cc +++ b/media/learning/impl/learning_task_controller_impl_unittest.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/task/sequenced_task_runner.h" #include "base/test/task_environment.h"
diff --git a/media/learning/impl/lookup_table_trainer_unittest.cc b/media/learning/impl/lookup_table_trainer_unittest.cc index b8c114f..4cfec482 100644 --- a/media/learning/impl/lookup_table_trainer_unittest.cc +++ b/media/learning/impl/lookup_table_trainer_unittest.cc
@@ -4,7 +4,7 @@ #include "media/learning/impl/lookup_table_trainer.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/test/task_environment.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/media/learning/impl/model.h b/media/learning/impl/model.h index 7dd67da..6dccc2b 100644 --- a/media/learning/impl/model.h +++ b/media/learning/impl/model.h
@@ -5,8 +5,8 @@ #ifndef MEDIA_LEARNING_IMPL_MODEL_H_ #define MEDIA_LEARNING_IMPL_MODEL_H_ -#include "base/callback.h" #include "base/component_export.h" +#include "base/functional/callback.h" #include "media/learning/common/labelled_example.h" #include "media/learning/common/target_histogram.h"
diff --git a/media/learning/impl/random_number_generator_unittest.cc b/media/learning/impl/random_number_generator_unittest.cc index 4b69297d..8bc8d81 100644 --- a/media/learning/impl/random_number_generator_unittest.cc +++ b/media/learning/impl/random_number_generator_unittest.cc
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "media/learning/impl/test_random_number_generator.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/media/learning/impl/random_tree_trainer.cc b/media/learning/impl/random_tree_trainer.cc index 558702a4..0d8c7cc5 100644 --- a/media/learning/impl/random_tree_trainer.cc +++ b/media/learning/impl/random_tree_trainer.cc
@@ -6,8 +6,8 @@ #include <math.h> -#include "base/bind.h" #include "base/check_op.h" +#include "base/functional/bind.h" #include "base/task/sequenced_task_runner.h" #include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/media/learning/impl/random_tree_trainer_unittest.cc b/media/learning/impl/random_tree_trainer_unittest.cc index bea7bed8..19ffe8d 100644 --- a/media/learning/impl/random_tree_trainer_unittest.cc +++ b/media/learning/impl/random_tree_trainer_unittest.cc
@@ -4,7 +4,7 @@ #include "media/learning/impl/random_tree_trainer.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/test/task_environment.h" #include "media/learning/impl/test_random_number_generator.h"
diff --git a/media/learning/impl/training_algorithm.h b/media/learning/impl/training_algorithm.h index 33a7b71b..e999c63 100644 --- a/media/learning/impl/training_algorithm.h +++ b/media/learning/impl/training_algorithm.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "media/learning/common/labelled_example.h" #include "media/learning/impl/model.h"
diff --git a/media/learning/mojo/mojo_learning_task_controller_service.cc b/media/learning/mojo/mojo_learning_task_controller_service.cc index 9926c114..5081b4e 100644 --- a/media/learning/mojo/mojo_learning_task_controller_service.cc +++ b/media/learning/mojo/mojo_learning_task_controller_service.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "media/learning/common/learning_task_controller.h" namespace media {
diff --git a/media/learning/mojo/mojo_learning_task_controller_service_unittest.cc b/media/learning/mojo/mojo_learning_task_controller_service_unittest.cc index e020d096..2de9ed6 100644 --- a/media/learning/mojo/mojo_learning_task_controller_service_unittest.cc +++ b/media/learning/mojo/mojo_learning_task_controller_service_unittest.cc
@@ -5,7 +5,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h" #include "base/test/task_environment.h"
diff --git a/media/learning/mojo/public/cpp/mojo_learning_task_controller_unittest.cc b/media/learning/mojo/public/cpp/mojo_learning_task_controller_unittest.cc index be3e5fe..5743750 100644 --- a/media/learning/mojo/public/cpp/mojo_learning_task_controller_unittest.cc +++ b/media/learning/mojo/public/cpp/mojo_learning_task_controller_unittest.cc
@@ -5,8 +5,8 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ptr_util.h" #include "base/test/task_environment.h" #include "base/threading/thread.h"
diff --git a/media/midi/midi_manager.cc b/media/midi/midi_manager.cc index c9a35be..7ca5cbca 100644 --- a/media/midi/midi_manager.cc +++ b/media/midi/midi_manager.cc
@@ -4,7 +4,7 @@ #include "media/midi/midi_manager.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/metrics/histogram_macros.h" #include "base/task/single_thread_task_runner.h"
diff --git a/media/midi/midi_manager_alsa.cc b/media/midi/midi_manager_alsa.cc index a5fc2c9..fce0187f 100644 --- a/media/midi/midi_manager_alsa.cc +++ b/media/midi/midi_manager_alsa.cc
@@ -12,7 +12,7 @@ #include <string> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/json/json_string_value_serializer.h" #include "base/logging.h" #include "base/posix/eintr_wrapper.h"
diff --git a/media/midi/midi_manager_android.cc b/media/midi/midi_manager_android.cc index c1c3ed0c..0639abed 100644 --- a/media/midi/midi_manager_android.cc +++ b/media/midi/midi_manager_android.cc
@@ -4,8 +4,8 @@ #include "media/midi/midi_manager_android.h" -#include "base/bind.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/metrics/field_trial_params.h" #include "base/strings/stringprintf.h" #include "media/midi/midi_device_android.h"
diff --git a/media/midi/midi_manager_mac.cc b/media/midi/midi_manager_mac.cc index 45c7893d..25354f7 100644 --- a/media/midi/midi_manager_mac.cc +++ b/media/midi/midi_manager_mac.cc
@@ -12,7 +12,7 @@ #include <CoreAudio/HostTime.h> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/ranges/algorithm.h" #include "base/strings/string_number_conversions.h" #include "base/strings/sys_string_conversions.h"
diff --git a/media/midi/midi_manager_mac.h b/media/midi/midi_manager_mac.h index e848b5fd..3cda776 100644 --- a/media/midi/midi_manager_mac.h +++ b/media/midi/midi_manager_mac.h
@@ -9,8 +9,8 @@ #include <stdint.h> #include <vector> -#include "base/callback.h" #include "base/compiler_specific.h" +#include "base/functional/callback.h" #include "base/synchronization/lock.h" #include "base/thread_annotations.h" #include "base/threading/thread.h"
diff --git a/media/midi/midi_manager_unittest.cc b/media/midi/midi_manager_unittest.cc index c89afef2..0aaf58b 100644 --- a/media/midi/midi_manager_unittest.cc +++ b/media/midi/midi_manager_unittest.cc
@@ -10,8 +10,8 @@ #include <memory> #include <vector> -#include "base/bind.h" #include "base/check_op.h" +#include "base/functional/bind.h" #include "base/memory/weak_ptr.h" #include "base/run_loop.h" #include "base/system/system_monitor.h"
diff --git a/media/midi/midi_manager_usb.cc b/media/midi/midi_manager_usb.cc index 4060631..fccc6224 100644 --- a/media/midi/midi_manager_usb.cc +++ b/media/midi/midi_manager_usb.cc
@@ -7,8 +7,8 @@ #include <memory> #include <utility> -#include "base/bind.h" #include "base/check_op.h" +#include "base/functional/bind.h" #include "base/strings/stringprintf.h" #include "media/midi/midi_service.h" #include "media/midi/task_service.h"
diff --git a/media/midi/midi_manager_win.cc b/media/midi/midi_manager_win.cc index 774e50f..b11d74c 100644 --- a/media/midi/midi_manager_win.cc +++ b/media/midi/midi_manager_win.cc
@@ -18,10 +18,10 @@ #include <tuple> #include <utility> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/memory/raw_ptr.h" #include "base/ranges/algorithm.h"
diff --git a/media/midi/midi_manager_win.h b/media/midi/midi_manager_win.h index 412341c..64f7efd 100644 --- a/media/midi/midi_manager_win.h +++ b/media/midi/midi_manager_win.h
@@ -8,7 +8,7 @@ #include <memory> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/scoped_refptr.h" #include "base/system/system_monitor.h" #include "media/midi/midi_export.h"
diff --git a/media/midi/midi_manager_winrt.cc b/media/midi/midi_manager_winrt.cc index a9c39587..c819674 100644 --- a/media/midi/midi_manager_winrt.cc +++ b/media/midi/midi_manager_winrt.cc
@@ -27,7 +27,7 @@ #include <unordered_map> #include <unordered_set> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/scoped_generic.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h"
diff --git a/media/midi/task_service.cc b/media/midi/task_service.cc index 104e282..e6d72372 100644 --- a/media/midi/task_service.cc +++ b/media/midi/task_service.cc
@@ -6,7 +6,7 @@ #include <limits> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/message_loop/message_pump_type.h" #include "base/strings/stringprintf.h" #include "base/task/single_thread_task_runner.h"
diff --git a/media/midi/task_service.h b/media/midi/task_service.h index 7752b35..74b4451 100644 --- a/media/midi/task_service.h +++ b/media/midi/task_service.h
@@ -8,7 +8,7 @@ #include <memory> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/scoped_refptr.h" #include "base/sequence_checker.h" #include "base/synchronization/condition_variable.h"
diff --git a/media/midi/task_service_unittest.cc b/media/midi/task_service_unittest.cc index 7ca32dd..cc5eac0 100644 --- a/media/midi/task_service_unittest.cc +++ b/media/midi/task_service_unittest.cc
@@ -6,9 +6,9 @@ #include <memory> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h" #include "base/run_loop.h"
diff --git a/media/midi/usb_midi_device.h b/media/midi/usb_midi_device.h index 6fcc8e9..f40723c4 100644 --- a/media/midi/usb_midi_device.h +++ b/media/midi/usb_midi_device.h
@@ -11,7 +11,7 @@ #include <memory> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/time/time.h" #include "media/midi/usb_midi_export.h"
diff --git a/media/midi/usb_midi_device_android.h b/media/midi/usb_midi_device_android.h index e7d3a47..ec54bad 100644 --- a/media/midi/usb_midi_device_android.h +++ b/media/midi/usb_midi_device_android.h
@@ -12,7 +12,7 @@ #include <vector> #include "base/android/scoped_java_ref.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "media/midi/usb_midi_device.h" #include "media/midi/usb_midi_export.h"
diff --git a/media/midi/usb_midi_device_factory_android.cc b/media/midi/usb_midi_device_factory_android.cc index 8718c91d..9bb7314 100644 --- a/media/midi/usb_midi_device_factory_android.cc +++ b/media/midi/usb_midi_device_factory_android.cc
@@ -7,7 +7,7 @@ #include <stddef.h> #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/synchronization/lock.h" #include "media/midi/midi_jni_headers/UsbMidiDeviceFactoryAndroid_jni.h" #include "media/midi/usb_midi_device_android.h"
diff --git a/media/midi/usb_midi_device_factory_android.h b/media/midi/usb_midi_device_factory_android.h index 9a48479..20b676e2 100644 --- a/media/midi/usb_midi_device_factory_android.h +++ b/media/midi/usb_midi_device_factory_android.h
@@ -8,7 +8,7 @@ #include <jni.h> #include "base/android/scoped_java_ref.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "media/midi/usb_midi_device.h"
diff --git a/media/mojo/clients/mojo_android_overlay_unittest.cc b/media/mojo/clients/mojo_android_overlay_unittest.cc index aa426a8..20eabe2 100644 --- a/media/mojo/clients/mojo_android_overlay_unittest.cc +++ b/media/mojo/clients/mojo_android_overlay_unittest.cc
@@ -5,7 +5,7 @@ #include <memory> #include "base/android/jni_android.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/run_loop.h" #include "base/test/task_environment.h"
diff --git a/media/mojo/clients/mojo_audio_decoder.cc b/media/mojo/clients/mojo_audio_decoder.cc index 118c947..1a0e017 100644 --- a/media/mojo/clients/mojo_audio_decoder.cc +++ b/media/mojo/clients/mojo_audio_decoder.cc
@@ -4,8 +4,8 @@ #include "media/mojo/clients/mojo_audio_decoder.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/logging.h" #include "base/task/sequenced_task_runner.h"
diff --git a/media/mojo/clients/mojo_audio_decoder_unittest.cc b/media/mojo/clients/mojo_audio_decoder_unittest.cc index d91724c..ffcb3c3 100644 --- a/media/mojo/clients/mojo_audio_decoder_unittest.cc +++ b/media/mojo/clients/mojo_audio_decoder_unittest.cc
@@ -4,8 +4,8 @@ #include <memory> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/task/single_thread_task_runner.h"
diff --git a/media/mojo/clients/mojo_audio_encoder.cc b/media/mojo/clients/mojo_audio_encoder.cc index 7324292..ef7d255 100644 --- a/media/mojo/clients/mojo_audio_encoder.cc +++ b/media/mojo/clients/mojo_audio_encoder.cc
@@ -4,8 +4,8 @@ #include "media/mojo/clients/mojo_audio_encoder.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/task/sequenced_task_runner.h" #include "build/build_config.h"
diff --git a/media/mojo/clients/mojo_audio_encoder_unittest.cc b/media/mojo/clients/mojo_audio_encoder_unittest.cc index e83f0bc..bb1b8d7 100644 --- a/media/mojo/clients/mojo_audio_encoder_unittest.cc +++ b/media/mojo/clients/mojo_audio_encoder_unittest.cc
@@ -4,8 +4,8 @@ #include <memory> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/task/sequenced_task_runner.h"
diff --git a/media/mojo/clients/mojo_cdm.cc b/media/mojo/clients/mojo_cdm.cc index 0f0bc75..7084d86a 100644 --- a/media/mojo/clients/mojo_cdm.cc +++ b/media/mojo/clients/mojo_cdm.cc
@@ -8,8 +8,8 @@ #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/metrics/histogram_functions.h" #include "base/metrics/histogram_macros.h"
diff --git a/media/mojo/clients/mojo_cdm_factory.cc b/media/mojo/clients/mojo_cdm_factory.cc index 11ffcfc..60ee6ff 100644 --- a/media/mojo/clients/mojo_cdm_factory.cc +++ b/media/mojo/clients/mojo_cdm_factory.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/memory/scoped_refptr.h" #include "base/task/single_thread_task_runner.h"
diff --git a/media/mojo/clients/mojo_cdm_unittest.cc b/media/mojo/clients/mojo_cdm_unittest.cc index d3c3bf35..5d922db 100644 --- a/media/mojo/clients/mojo_cdm_unittest.cc +++ b/media/mojo/clients/mojo_cdm_unittest.cc
@@ -8,7 +8,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ref_counted.h" #include "base/run_loop.h" #include "base/test/test_message_loop.h"
diff --git a/media/mojo/clients/mojo_decryptor.cc b/media/mojo/clients/mojo_decryptor.cc index 73447f7f..9db1b5fa 100644 --- a/media/mojo/clients/mojo_decryptor.cc +++ b/media/mojo/clients/mojo_decryptor.cc
@@ -9,7 +9,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/numerics/safe_conversions.h" #include "media/base/audio_buffer.h" #include "media/base/decoder_buffer.h"
diff --git a/media/mojo/clients/mojo_decryptor_unittest.cc b/media/mojo/clients/mojo_decryptor_unittest.cc index a223a40..cee2c2c 100644 --- a/media/mojo/clients/mojo_decryptor_unittest.cc +++ b/media/mojo/clients/mojo_decryptor_unittest.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/test/test_message_loop.h" #include "media/base/decryptor.h"
diff --git a/media/mojo/clients/mojo_demuxer_stream_impl.cc b/media/mojo/clients/mojo_demuxer_stream_impl.cc index a0e32a3..04b567e 100644 --- a/media/mojo/clients/mojo_demuxer_stream_impl.cc +++ b/media/mojo/clients/mojo_demuxer_stream_impl.cc
@@ -7,7 +7,7 @@ #include <stdint.h> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/numerics/safe_conversions.h" #include "media/base/audio_decoder_config.h" #include "media/base/decoder_buffer.h"
diff --git a/media/mojo/clients/mojo_demuxer_stream_impl.h b/media/mojo/clients/mojo_demuxer_stream_impl.h index e7e11f13..1011405d 100644 --- a/media/mojo/clients/mojo_demuxer_stream_impl.h +++ b/media/mojo/clients/mojo_demuxer_stream_impl.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "media/base/demuxer_stream.h"
diff --git a/media/mojo/clients/mojo_renderer.cc b/media/mojo/clients/mojo_renderer.cc index a44a39b..2758065 100644 --- a/media/mojo/clients/mojo_renderer.cc +++ b/media/mojo/clients/mojo_renderer.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/task/sequenced_task_runner.h" #include "base/task/single_thread_task_runner.h"
diff --git a/media/mojo/clients/mojo_renderer_unittest.cc b/media/mojo/clients/mojo_renderer_unittest.cc index 381103f..191d91e8 100644 --- a/media/mojo/clients/mojo_renderer_unittest.cc +++ b/media/mojo/clients/mojo_renderer_unittest.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h"
diff --git a/media/mojo/clients/mojo_video_decoder.cc b/media/mojo/clients/mojo_video_decoder.cc index 0f535acd..57962d7 100644 --- a/media/mojo/clients/mojo_video_decoder.cc +++ b/media/mojo/clients/mojo_video_decoder.cc
@@ -4,10 +4,10 @@ #include "media/mojo/clients/mojo_video_decoder.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/logging.h" #include "base/memory/scoped_refptr.h"
diff --git a/media/mojo/clients/mojo_video_encode_accelerator.cc b/media/mojo/clients/mojo_video_encode_accelerator.cc index 00eba20..6fe7a38 100644 --- a/media/mojo/clients/mojo_video_encode_accelerator.cc +++ b/media/mojo/clients/mojo_video_encode_accelerator.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/memory/raw_ptr.h" #include "base/metrics/histogram_macros.h"
diff --git a/media/mojo/clients/win/media_foundation_renderer_client.cc b/media/mojo/clients/win/media_foundation_renderer_client.cc index c2abff2..5a7c00d4 100644 --- a/media/mojo/clients/win/media_foundation_renderer_client.cc +++ b/media/mojo/clients/win/media_foundation_renderer_client.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/task/bind_post_task.h" #include "base/task/sequenced_task_runner.h" #include "media/base/media_log.h"
diff --git a/media/mojo/clients/win/media_foundation_renderer_client.h b/media/mojo/clients/win/media_foundation_renderer_client.h index 1eb8a7d..7aff950 100644 --- a/media/mojo/clients/win/media_foundation_renderer_client.h +++ b/media/mojo/clients/win/media_foundation_renderer_client.h
@@ -5,7 +5,7 @@ #ifndef MEDIA_MOJO_CLIENTS_WIN_MEDIA_FOUNDATION_RENDERER_CLIENT_H_ #define MEDIA_MOJO_CLIENTS_WIN_MEDIA_FOUNDATION_RENDERER_CLIENT_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/task/sequenced_task_runner.h"
diff --git a/media/mojo/clients/win/media_foundation_renderer_client_factory.h b/media/mojo/clients/win/media_foundation_renderer_client_factory.h index d1ba1e6..1110c039 100644 --- a/media/mojo/clients/win/media_foundation_renderer_client_factory.h +++ b/media/mojo/clients/win/media_foundation_renderer_client_factory.h
@@ -5,7 +5,7 @@ #ifndef MEDIA_MOJO_CLIENTS_WIN_MEDIA_FOUNDATION_RENDERER_CLIENT_FACTORY_H_ #define MEDIA_MOJO_CLIENTS_WIN_MEDIA_FOUNDATION_RENDERER_CLIENT_FACTORY_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/task/sequenced_task_runner.h" #include "base/task/single_thread_task_runner.h"
diff --git a/media/mojo/common/mojo_data_pipe_read_write.cc b/media/mojo/common/mojo_data_pipe_read_write.cc index f4e3705..33ffe31f 100644 --- a/media/mojo/common/mojo_data_pipe_read_write.cc +++ b/media/mojo/common/mojo_data_pipe_read_write.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/memory/ptr_util.h" #include "base/task/sequenced_task_runner.h"
diff --git a/media/mojo/common/mojo_decoder_buffer_converter.cc b/media/mojo/common/mojo_decoder_buffer_converter.cc index 0da8239..149e1b53 100644 --- a/media/mojo/common/mojo_decoder_buffer_converter.cc +++ b/media/mojo/common/mojo_decoder_buffer_converter.cc
@@ -7,7 +7,7 @@ #include <memory> #include <tuple> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/memory/ptr_util.h" #include "base/task/sequenced_task_runner.h"
diff --git a/media/mojo/mojom/video_frame_metadata_mojom_traits.cc b/media/mojo/mojom/video_frame_metadata_mojom_traits.cc index 31891a4..c0b3514 100644 --- a/media/mojo/mojom/video_frame_metadata_mojom_traits.cc +++ b/media/mojo/mojom/video_frame_metadata_mojom_traits.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "build/build_config.h" #include "mojo/public/cpp/base/time_mojom_traits.h"
diff --git a/media/mojo/mojom/video_frame_metadata_mojom_traits_unittest.cc b/media/mojo/mojom/video_frame_metadata_mojom_traits_unittest.cc index a19524e5..61859cf 100644 --- a/media/mojo/mojom/video_frame_metadata_mojom_traits_unittest.cc +++ b/media/mojo/mojom/video_frame_metadata_mojom_traits_unittest.cc
@@ -4,7 +4,7 @@ #include "media/mojo/mojom/video_frame_metadata_mojom_traits.h" -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ref_counted.h" #include "base/test/task_environment.h" #include "build/build_config.h"
diff --git a/media/mojo/mojom/video_frame_mojom_traits.cc b/media/mojo/mojom/video_frame_mojom_traits.cc index cdc4498..8587820 100644 --- a/media/mojo/mojom/video_frame_mojom_traits.cc +++ b/media/mojo/mojom/video_frame_mojom_traits.cc
@@ -7,7 +7,7 @@ #include <utility> #include <vector> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/memory/unsafe_shared_memory_region.h" #include "base/time/time.h"
diff --git a/media/mojo/mojom/video_frame_mojom_traits_unittest.cc b/media/mojo/mojom/video_frame_mojom_traits_unittest.cc index 6839dfe..3ec98b2 100644 --- a/media/mojo/mojom/video_frame_mojom_traits_unittest.cc +++ b/media/mojo/mojom/video_frame_mojom_traits_unittest.cc
@@ -4,7 +4,7 @@ #include "media/mojo/mojom/video_frame_mojom_traits.h" -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ref_counted.h" #include "base/test/task_environment.h" #include "build/build_config.h"
diff --git a/media/mojo/services/android_mojo_media_client.cc b/media/mojo/services/android_mojo_media_client.cc index 4870c763..4b46563d 100644 --- a/media/mojo/services/android_mojo_media_client.cc +++ b/media/mojo/services/android_mojo_media_client.cc
@@ -8,7 +8,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/task/single_thread_task_runner.h" #include "media/base/android/android_cdm_factory.h" #include "media/base/audio_decoder.h"
diff --git a/media/mojo/services/cdm_service.cc b/media/mojo/services/cdm_service.cc index 4cc301b..e584cbad 100644 --- a/media/mojo/services/cdm_service.cc +++ b/media/mojo/services/cdm_service.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h"
diff --git a/media/mojo/services/cdm_service_broker_unittest.cc b/media/mojo/services/cdm_service_broker_unittest.cc index 32e8f13..1df3c1ac 100644 --- a/media/mojo/services/cdm_service_broker_unittest.cc +++ b/media/mojo/services/cdm_service_broker_unittest.cc
@@ -6,8 +6,8 @@ #include <memory> -#include "base/bind.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/test/task_environment.h" #include "build/build_config.h"
diff --git a/media/mojo/services/cdm_service_unittest.cc b/media/mojo/services/cdm_service_unittest.cc index c3da53a1..cb8e83c 100644 --- a/media/mojo/services/cdm_service_unittest.cc +++ b/media/mojo/services/cdm_service_unittest.cc
@@ -7,8 +7,8 @@ #include <memory> #include <tuple> -#include "base/bind.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/test/task_environment.h"
diff --git a/media/mojo/services/deferred_destroy_unique_receiver_set.h b/media/mojo/services/deferred_destroy_unique_receiver_set.h index 932eed5f..0b1ad2f 100644 --- a/media/mojo/services/deferred_destroy_unique_receiver_set.h +++ b/media/mojo/services/deferred_destroy_unique_receiver_set.h
@@ -10,7 +10,7 @@ #include <map> #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/memory/ptr_util.h" #include "base/memory/weak_ptr.h"
diff --git a/media/mojo/services/gpu_mojo_media_client.cc b/media/mojo/services/gpu_mojo_media_client.cc index 9638640..b10f1db9 100644 --- a/media/mojo/services/gpu_mojo_media_client.cc +++ b/media/mojo/services/gpu_mojo_media_client.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/metrics/histogram_functions.h" #include "base/task/sequenced_task_runner.h"
diff --git a/media/mojo/services/interface_factory_impl.cc b/media/mojo/services/interface_factory_impl.cc index 749e6cc..c152866d0 100644 --- a/media/mojo/services/interface_factory_impl.cc +++ b/media/mojo/services/interface_factory_impl.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/guid.h" #include "base/logging.h" #include "base/task/single_thread_task_runner.h" @@ -29,7 +29,7 @@ #if BUILDFLAG(ENABLE_MOJO_RENDERER) || BUILDFLAG(ENABLE_CAST_RENDERER) || \ BUILDFLAG(IS_WIN) -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "media/base/renderer.h" #include "media/mojo/services/mojo_renderer_service.h" #endif
diff --git a/media/mojo/services/media_foundation_gpu_info_monitor.h b/media/mojo/services/media_foundation_gpu_info_monitor.h index 4f1d017..4d5cf1a6 100644 --- a/media/mojo/services/media_foundation_gpu_info_monitor.h +++ b/media/mojo/services/media_foundation_gpu_info_monitor.h
@@ -5,8 +5,8 @@ #ifndef MEDIA_MOJO_SERVICES_MEDIA_FOUNDATION_GPU_INFO_MONITOR_H_ #define MEDIA_MOJO_SERVICES_MEDIA_FOUNDATION_GPU_INFO_MONITOR_H_ -#include "base/callback.h" #include "base/callback_list.h" +#include "base/functional/callback.h" #include "base/win/windows_types.h" #include "gpu/config/gpu_info.h" #include "media/mojo/services/media_mojo_export.h"
diff --git a/media/mojo/services/media_foundation_renderer_wrapper.cc b/media/mojo/services/media_foundation_renderer_wrapper.cc index 7e2d15b..8d87012 100644 --- a/media/mojo/services/media_foundation_renderer_wrapper.cc +++ b/media/mojo/services/media_foundation_renderer_wrapper.cc
@@ -4,7 +4,7 @@ #include "media/mojo/services/media_foundation_renderer_wrapper.h" -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/task/sequenced_task_runner.h" #include "media/base/win/mf_helpers.h" #include "media/mojo/mojom/renderer_extensions.mojom.h"
diff --git a/media/mojo/services/media_foundation_renderer_wrapper.h b/media/mojo/services/media_foundation_renderer_wrapper.h index 3e000ed..5eb4232 100644 --- a/media/mojo/services/media_foundation_renderer_wrapper.h +++ b/media/mojo/services/media_foundation_renderer_wrapper.h
@@ -5,8 +5,8 @@ #ifndef MEDIA_MOJO_SERVICES_MEDIA_FOUNDATION_RENDERER_WRAPPER_H_ #define MEDIA_MOJO_SERVICES_MEDIA_FOUNDATION_RENDERER_WRAPPER_H_ -#include "base/callback.h" #include "base/callback_list.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/task/sequenced_task_runner.h"
diff --git a/media/mojo/services/media_foundation_service.cc b/media/mojo/services/media_foundation_service.cc index 26c2c61..8f0caa6 100644 --- a/media/mojo/services/media_foundation_service.cc +++ b/media/mojo/services/media_foundation_service.cc
@@ -7,10 +7,10 @@ #include <map> #include <memory> -#include "base/bind.h" #include "base/check.h" #include "base/feature_list.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_functions.h" #include "base/metrics/histogram_macros.h" #include "base/path_service.h"
diff --git a/media/mojo/services/media_foundation_service.h b/media/mojo/services/media_foundation_service.h index d575629..4917b4fb 100644 --- a/media/mojo/services/media_foundation_service.h +++ b/media/mojo/services/media_foundation_service.h
@@ -5,8 +5,8 @@ #ifndef MEDIA_MOJO_SERVICES_MEDIA_FOUNDATION_SERVICE_H_ #define MEDIA_MOJO_SERVICES_MEDIA_FOUNDATION_SERVICE_H_ -#include "base/callback.h" #include "base/files/file_path.h" +#include "base/functional/callback.h" #include "gpu/config/gpu_info.h" #include "media/mojo/mojom/frame_interface_factory.mojom.h" #include "media/mojo/mojom/interface_factory.mojom.h"
diff --git a/media/mojo/services/media_foundation_service_broker.h b/media/mojo/services/media_foundation_service_broker.h index 4d6c3d5..c7befcf 100644 --- a/media/mojo/services/media_foundation_service_broker.h +++ b/media/mojo/services/media_foundation_service_broker.h
@@ -7,8 +7,8 @@ #include <memory> -#include "base/callback.h" #include "base/files/file_path.h" +#include "base/functional/callback.h" #include "gpu/config/gpu_info.h" #include "gpu/config/gpu_util.h" #include "media/mojo/mojom/media_foundation_service.mojom.h"
diff --git a/media/mojo/services/media_metrics_provider_unittest.cc b/media/mojo/services/media_metrics_provider_unittest.cc index 2c29fa0..9c77c49 100644 --- a/media/mojo/services/media_metrics_provider_unittest.cc +++ b/media/mojo/services/media_metrics_provider_unittest.cc
@@ -5,8 +5,8 @@ #include <stddef.h> #include <memory> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "base/test/metrics/histogram_tester.h" #include "base/test/test_message_loop.h"
diff --git a/media/mojo/services/media_resource_shim.cc b/media/mojo/services/media_resource_shim.cc index 9230e3f0..6a639cb 100644 --- a/media/mojo/services/media_resource_shim.cc +++ b/media/mojo/services/media_resource_shim.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" namespace media {
diff --git a/media/mojo/services/media_resource_shim.h b/media/mojo/services/media_resource_shim.h index 9827611..f7e51526 100644 --- a/media/mojo/services/media_resource_shim.h +++ b/media/mojo/services/media_resource_shim.h
@@ -7,7 +7,7 @@ #include <stddef.h> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "media/base/media_resource.h" #include "media/mojo/services/mojo_demuxer_stream_adapter.h"
diff --git a/media/mojo/services/media_service.cc b/media/mojo/services/media_service.cc index cc3a2d2..f9806d8 100644 --- a/media/mojo/services/media_service.cc +++ b/media/mojo/services/media_service.cc
@@ -4,8 +4,8 @@ #include "media/mojo/services/media_service.h" -#include "base/bind.h" #include "base/check.h" +#include "base/functional/bind.h" #include "media/media_buildflags.h" #include "media/mojo/mojom/interface_factory.mojom.h" #include "media/mojo/services/interface_factory_impl.h"
diff --git a/media/mojo/services/media_service_unittest.cc b/media/mojo/services/media_service_unittest.cc index d2435b5..8e8901a0 100644 --- a/media/mojo/services/media_service_unittest.cc +++ b/media/mojo/services/media_service_unittest.cc
@@ -8,8 +8,8 @@ #include <tuple> #include <utility> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/run_loop.h" #include "base/task/single_thread_task_runner.h" #include "base/test/task_environment.h"
diff --git a/media/mojo/services/mojo_audio_decoder_service.cc b/media/mojo/services/mojo_audio_decoder_service.cc index 2e2335c1..f419dc2 100644 --- a/media/mojo/services/mojo_audio_decoder_service.cc +++ b/media/mojo/services/mojo_audio_decoder_service.cc
@@ -7,8 +7,8 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/types/optional_util.h" #include "media/base/content_decryption_module.h"
diff --git a/media/mojo/services/mojo_audio_encoder_service.cc b/media/mojo/services/mojo_audio_encoder_service.cc index 57f8e79..b51375bc 100644 --- a/media/mojo/services/mojo_audio_encoder_service.cc +++ b/media/mojo/services/mojo_audio_encoder_service.cc
@@ -7,8 +7,8 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "media/mojo/common/media_type_converters.h"
diff --git a/media/mojo/services/mojo_audio_input_stream.cc b/media/mojo/services/mojo_audio_input_stream.cc index 22afa18..a3f03b9 100644 --- a/media/mojo/services/mojo_audio_input_stream.cc +++ b/media/mojo/services/mojo_audio_input_stream.cc
@@ -7,8 +7,8 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/read_only_shared_memory_region.h" #include "base/sync_socket.h" #include "base/task/single_thread_task_runner.h"
diff --git a/media/mojo/services/mojo_audio_input_stream_unittest.cc b/media/mojo/services/mojo_audio_input_stream_unittest.cc index 61ccd1f..b69a292 100644 --- a/media/mojo/services/mojo_audio_input_stream_unittest.cc +++ b/media/mojo/services/mojo_audio_input_stream_unittest.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h" #include "base/memory/read_only_shared_memory_region.h"
diff --git a/media/mojo/services/mojo_cdm_allocator.cc b/media/mojo/services/mojo_cdm_allocator.cc index 1025f856..73493ff 100644 --- a/media/mojo/services/mojo_cdm_allocator.cc +++ b/media/mojo/services/mojo_cdm_allocator.cc
@@ -7,9 +7,9 @@ #include <limits> #include <memory> -#include "base/bind.h" -#include "base/callback.h" #include "base/compiler_specific.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/read_only_shared_memory_region.h" #include "base/memory/shared_memory_mapping.h" #include "base/numerics/safe_conversions.h"
diff --git a/media/mojo/services/mojo_cdm_file_io.cc b/media/mojo/services/mojo_cdm_file_io.cc index a3b2aaa..dc07c11 100644 --- a/media/mojo/services/mojo_cdm_file_io.cc +++ b/media/mojo/services/mojo_cdm_file_io.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/metrics/histogram_macros.h" #include "base/task/single_thread_task_runner.h" #include "base/trace_event/trace_event.h"
diff --git a/media/mojo/services/mojo_cdm_file_io.h b/media/mojo/services/mojo_cdm_file_io.h index 176e440..0d8a32d 100644 --- a/media/mojo/services/mojo_cdm_file_io.h +++ b/media/mojo/services/mojo_cdm_file_io.h
@@ -10,7 +10,7 @@ #include <string> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "media/cdm/api/content_decryption_module.h"
diff --git a/media/mojo/services/mojo_cdm_helper_unittest.cc b/media/mojo/services/mojo_cdm_helper_unittest.cc index b6985c4..ca93d82b2 100644 --- a/media/mojo/services/mojo_cdm_helper_unittest.cc +++ b/media/mojo/services/mojo_cdm_helper_unittest.cc
@@ -4,7 +4,7 @@ #include "media/mojo/services/mojo_cdm_helper.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/test/task_environment.h" #include "build/build_config.h"
diff --git a/media/mojo/services/mojo_cdm_promise.cc b/media/mojo/services/mojo_cdm_promise.cc index 05702fb3..906f4ae 100644 --- a/media/mojo/services/mojo_cdm_promise.cc +++ b/media/mojo/services/mojo_cdm_promise.cc
@@ -8,8 +8,8 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/check.h" +#include "base/functional/bind.h" #include "media/base/content_decryption_module.h" #include "media/base/decryptor.h" #include "media/mojo/mojom/content_decryption_module.mojom.h"
diff --git a/media/mojo/services/mojo_cdm_promise.h b/media/mojo/services/mojo_cdm_promise.h index 19027a0..d09b1dba 100644 --- a/media/mojo/services/mojo_cdm_promise.h +++ b/media/mojo/services/mojo_cdm_promise.h
@@ -7,7 +7,7 @@ #include <stdint.h> -#include "base/callback.h" +#include "base/functional/callback.h" #include "media/base/cdm_promise.h" namespace media {
diff --git a/media/mojo/services/mojo_cdm_service.cc b/media/mojo/services/mojo_cdm_service.cc index d6d1ecb..42df460 100644 --- a/media/mojo/services/mojo_cdm_service.cc +++ b/media/mojo/services/mojo_cdm_service.cc
@@ -8,7 +8,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/synchronization/lock.h" #include "base/types/optional_util.h" #include "build/build_config.h"
diff --git a/media/mojo/services/mojo_cdm_service.h b/media/mojo/services/mojo_cdm_service.h index bff9670c..f5d32f1 100644 --- a/media/mojo/services/mojo_cdm_service.h +++ b/media/mojo/services/mojo_cdm_service.h
@@ -9,8 +9,8 @@ #include <memory> -#include "base/callback.h" #include "base/compiler_specific.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h"
diff --git a/media/mojo/services/mojo_decryptor_service.cc b/media/mojo/services/mojo_decryptor_service.cc index 9d12386..929fe7c4 100644 --- a/media/mojo/services/mojo_decryptor_service.cc +++ b/media/mojo/services/mojo_decryptor_service.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/numerics/safe_conversions.h" #include "media/base/audio_decoder_config.h" #include "media/base/cdm_context.h"
diff --git a/media/mojo/services/mojo_decryptor_service.h b/media/mojo/services/mojo_decryptor_service.h index 5250d7b..4d043d54 100644 --- a/media/mojo/services/mojo_decryptor_service.h +++ b/media/mojo/services/mojo_decryptor_service.h
@@ -8,8 +8,8 @@ #include <stddef.h> #include <stdint.h> -#include "base/callback.h" #include "base/compiler_specific.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h"
diff --git a/media/mojo/services/mojo_demuxer_stream_adapter.cc b/media/mojo/services/mojo_demuxer_stream_adapter.cc index e705e8f9..d5dd403 100644 --- a/media/mojo/services/mojo_demuxer_stream_adapter.cc +++ b/media/mojo/services/mojo_demuxer_stream_adapter.cc
@@ -9,8 +9,8 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/numerics/safe_conversions.h" #include "media/base/decoder_buffer.h" #include "media/mojo/common/media_type_converters.h"
diff --git a/media/mojo/services/mojo_media_drm_storage.cc b/media/mojo/services/mojo_media_drm_storage.cc index 3dcf5c5..d9efabb 100644 --- a/media/mojo/services/mojo_media_drm_storage.cc +++ b/media/mojo/services/mojo_media_drm_storage.cc
@@ -7,8 +7,8 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/unguessable_token.h" #include "media/mojo/mojom/media_drm_storage.mojom.h" #include "mojo/public/cpp/bindings/callback_helpers.h"
diff --git a/media/mojo/services/mojo_media_log.cc b/media/mojo/services/mojo_media_log.cc index b8c54dfc..4eccb505 100644 --- a/media/mojo/services/mojo_media_log.cc +++ b/media/mojo/services/mojo_media_log.cc
@@ -4,7 +4,7 @@ #include "media/mojo/services/mojo_media_log.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/task/sequenced_task_runner.h"
diff --git a/media/mojo/services/mojo_provision_fetcher.cc b/media/mojo/services/mojo_provision_fetcher.cc index e9f6de1..2d38c075 100644 --- a/media/mojo/services/mojo_provision_fetcher.cc +++ b/media/mojo/services/mojo_provision_fetcher.cc
@@ -4,7 +4,7 @@ #include "media/mojo/services/mojo_provision_fetcher.h" -#include "base/bind.h" +#include "base/functional/bind.h" namespace media {
diff --git a/media/mojo/services/mojo_renderer_service.cc b/media/mojo/services/mojo_renderer_service.cc index e3cf1c1..52f1e89 100644 --- a/media/mojo/services/mojo_renderer_service.cc +++ b/media/mojo/services/mojo_renderer_service.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/time/time.h" #include "media/base/cdm_context.h"
diff --git a/media/mojo/services/mojo_renderer_service.h b/media/mojo/services/mojo_renderer_service.h index 320de0f..2db458a0 100644 --- a/media/mojo/services/mojo_renderer_service.h +++ b/media/mojo/services/mojo_renderer_service.h
@@ -8,8 +8,8 @@ #include <stdint.h> #include <memory> -#include "base/callback.h" #include "base/compiler_specific.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/time/time.h"
diff --git a/media/mojo/services/mojo_video_decoder_service.cc b/media/mojo/services/mojo_video_decoder_service.cc index baca7c3a..bc22e0ba 100644 --- a/media/mojo/services/mojo_video_decoder_service.cc +++ b/media/mojo/services/mojo_video_decoder_service.cc
@@ -7,8 +7,8 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/metrics/histogram_functions.h" #include "base/strings/stringprintf.h"
diff --git a/media/mojo/services/mojo_video_encode_accelerator_service_unittest.cc b/media/mojo/services/mojo_video_encode_accelerator_service_unittest.cc index 530a69f8..80f38b3e 100644 --- a/media/mojo/services/mojo_video_encode_accelerator_service_unittest.cc +++ b/media/mojo/services/mojo_video_encode_accelerator_service_unittest.cc
@@ -4,8 +4,8 @@ #include <stddef.h> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ptr_util.h" #include "base/memory/unsafe_shared_memory_region.h" #include "base/run_loop.h"
diff --git a/media/mojo/services/stable_video_decoder_factory_service.h b/media/mojo/services/stable_video_decoder_factory_service.h index c46f2c2..62bdfcc7 100644 --- a/media/mojo/services/stable_video_decoder_factory_service.h +++ b/media/mojo/services/stable_video_decoder_factory_service.h
@@ -5,7 +5,7 @@ #ifndef MEDIA_MOJO_SERVICES_STABLE_VIDEO_DECODER_FACTORY_SERVICE_H_ #define MEDIA_MOJO_SERVICES_STABLE_VIDEO_DECODER_FACTORY_SERVICE_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/sequence_checker.h" #include "media/mojo/mojom/stable/stable_video_decoder.mojom.h" #include "media/mojo/services/media_mojo_export.h"
diff --git a/media/mojo/services/test_mojo_media_client.cc b/media/mojo/services/test_mojo_media_client.cc index 1c019e8..207e650 100644 --- a/media/mojo/services/test_mojo_media_client.cc +++ b/media/mojo/services/test_mojo_media_client.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "base/task/single_thread_task_runner.h" #include "build/build_config.h"
diff --git a/media/mojo/services/video_decode_perf_history.cc b/media/mojo/services/video_decode_perf_history.cc index 945bdd7..b2f5dde 100644 --- a/media/mojo/services/video_decode_perf_history.cc +++ b/media/mojo/services/video_decode_perf_history.cc
@@ -4,9 +4,9 @@ #include "media/mojo/services/video_decode_perf_history.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/format_macros.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/logging.h" #include "base/memory/ptr_util.h" #include "base/metrics/field_trial_params.h"
diff --git a/media/mojo/services/video_decode_perf_history.h b/media/mojo/services/video_decode_perf_history.h index 5dea152..e3de77f 100644 --- a/media/mojo/services/video_decode_perf_history.h +++ b/media/mojo/services/video_decode_perf_history.h
@@ -9,7 +9,7 @@ #include <memory> #include <queue> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/metrics/field_trial_params.h" #include "base/sequence_checker.h" #include "base/supports_user_data.h"
diff --git a/media/mojo/services/video_decode_perf_history_unittest.cc b/media/mojo/services/video_decode_perf_history_unittest.cc index eebcef7..09be127 100644 --- a/media/mojo/services/video_decode_perf_history_unittest.cc +++ b/media/mojo/services/video_decode_perf_history_unittest.cc
@@ -6,7 +6,7 @@ #include <memory> #include <string> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/run_loop.h" #include "base/strings/string_number_conversions.h"
diff --git a/media/mojo/services/video_decode_stats_recorder.cc b/media/mojo/services/video_decode_stats_recorder.cc index 084305f..966a83f 100644 --- a/media/mojo/services/video_decode_stats_recorder.cc +++ b/media/mojo/services/video_decode_stats_recorder.cc
@@ -4,7 +4,7 @@ #include "media/mojo/services/video_decode_stats_recorder.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/ptr_util.h" #include "base/logging.h"
diff --git a/media/mojo/services/video_decode_stats_recorder_unittest.cc b/media/mojo/services/video_decode_stats_recorder_unittest.cc index dc164be..657ce51f 100644 --- a/media/mojo/services/video_decode_stats_recorder_unittest.cc +++ b/media/mojo/services/video_decode_stats_recorder_unittest.cc
@@ -5,7 +5,7 @@ #include <memory> #include <string> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "media/base/video_codecs.h" #include "media/learning/common/value.h"
diff --git a/media/mojo/services/watch_time_recorder.cc b/media/mojo/services/watch_time_recorder.cc index 98f36ba..75f4420e1 100644 --- a/media/mojo/services/watch_time_recorder.cc +++ b/media/mojo/services/watch_time_recorder.cc
@@ -6,9 +6,9 @@ #include <cmath> -#include "base/callback.h" #include "base/containers/contains.h" #include "base/containers/flat_set.h" +#include "base/functional/callback.h" #include "base/hash/hash.h" #include "base/metrics/histogram_functions.h" #include "base/ranges/algorithm.h"
diff --git a/media/mojo/services/watch_time_recorder_unittest.cc b/media/mojo/services/watch_time_recorder_unittest.cc index 56eaaebc1..f6f6dc59 100644 --- a/media/mojo/services/watch_time_recorder_unittest.cc +++ b/media/mojo/services/watch_time_recorder_unittest.cc
@@ -10,9 +10,9 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/hash/hash.h" #include "base/run_loop.h" #include "base/strings/string_number_conversions.h"
diff --git a/media/mojo/services/webrtc_video_perf_history.cc b/media/mojo/services/webrtc_video_perf_history.cc index c1775e3b..78146e13 100644 --- a/media/mojo/services/webrtc_video_perf_history.cc +++ b/media/mojo/services/webrtc_video_perf_history.cc
@@ -6,9 +6,9 @@ #include <math.h> -#include "base/bind.h" -#include "base/callback.h" #include "base/format_macros.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/logging.h" #include "base/memory/ptr_util.h" #include "base/metrics/field_trial_params.h"
diff --git a/media/mojo/services/webrtc_video_perf_history.h b/media/mojo/services/webrtc_video_perf_history.h index ce724ce..5cde43b4 100644 --- a/media/mojo/services/webrtc_video_perf_history.h +++ b/media/mojo/services/webrtc_video_perf_history.h
@@ -9,7 +9,7 @@ #include <memory> #include <queue> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/metrics/field_trial_params.h" #include "base/sequence_checker.h" #include "base/supports_user_data.h"
diff --git a/media/mojo/services/webrtc_video_perf_history_unittest.cc b/media/mojo/services/webrtc_video_perf_history_unittest.cc index 1a9ea56..d5bbe2a 100644 --- a/media/mojo/services/webrtc_video_perf_history_unittest.cc +++ b/media/mojo/services/webrtc_video_perf_history_unittest.cc
@@ -6,7 +6,7 @@ #include <memory> #include <string> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/run_loop.h" #include "base/strings/string_number_conversions.h"
diff --git a/media/mojo/services/webrtc_video_perf_recorder.cc b/media/mojo/services/webrtc_video_perf_recorder.cc index a0cfacab..e1ea761 100644 --- a/media/mojo/services/webrtc_video_perf_recorder.cc +++ b/media/mojo/services/webrtc_video_perf_recorder.cc
@@ -4,7 +4,7 @@ #include "media/mojo/services/webrtc_video_perf_recorder.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/logging.h" #include "base/memory/ptr_util.h" #include "mojo/public/cpp/bindings/self_owned_receiver.h"
diff --git a/media/mojo/services/webrtc_video_perf_recorder_unittest.cc b/media/mojo/services/webrtc_video_perf_recorder_unittest.cc index 8d9a9ab..36e9349 100644 --- a/media/mojo/services/webrtc_video_perf_recorder_unittest.cc +++ b/media/mojo/services/webrtc_video_perf_recorder_unittest.cc
@@ -4,7 +4,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "media/base/video_codecs.h" #include "media/mojo/mojom/media_types.mojom.h" #include "media/mojo/services/webrtc_video_perf_recorder.h"
diff --git a/media/mojo/test/mojo_video_decoder_integration_test.cc b/media/mojo/test/mojo_video_decoder_integration_test.cc index 806635cf6..6e72151 100644 --- a/media/mojo/test/mojo_video_decoder_integration_test.cc +++ b/media/mojo/test/mojo_video_decoder_integration_test.cc
@@ -7,8 +7,8 @@ #include <memory> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/logging.h" #include "base/memory/raw_ptr.h"
diff --git a/media/mojo/test/mojo_video_encode_accelerator_integration_test.cc b/media/mojo/test/mojo_video_encode_accelerator_integration_test.cc index 886731f..cc916ff 100644 --- a/media/mojo/test/mojo_video_encode_accelerator_integration_test.cc +++ b/media/mojo/test/mojo_video_encode_accelerator_integration_test.cc
@@ -5,7 +5,7 @@ #include <stddef.h> #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/memory/read_only_shared_memory_region.h" #include "base/memory/unsafe_shared_memory_region.h"
diff --git a/media/muxers/live_webm_muxer_delegate.h b/media/muxers/live_webm_muxer_delegate.h index 02e3f606..37b605d9 100644 --- a/media/muxers/live_webm_muxer_delegate.h +++ b/media/muxers/live_webm_muxer_delegate.h
@@ -5,7 +5,7 @@ #ifndef MEDIA_MUXERS_LIVE_WEBM_MUXER_DELEGATE_H_ #define MEDIA_MUXERS_LIVE_WEBM_MUXER_DELEGATE_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/strings/string_piece.h" #include "base/thread_annotations.h" #include "media/base/media_export.h"
diff --git a/media/muxers/webm_muxer_fuzzertest.cc b/media/muxers/webm_muxer_fuzzertest.cc index 02322f4..1fa9b3d 100644 --- a/media/muxers/webm_muxer_fuzzertest.cc +++ b/media/muxers/webm_muxer_fuzzertest.cc
@@ -8,7 +8,7 @@ #include <memory> #include <random> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/run_loop.h" #include "base/strings/string_piece.h"
diff --git a/media/muxers/webm_muxer_unittest.cc b/media/muxers/webm_muxer_unittest.cc index f3c2eaf..db4ebc7 100644 --- a/media/muxers/webm_muxer_unittest.cc +++ b/media/muxers/webm_muxer_unittest.cc
@@ -9,7 +9,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/memory/ptr_util.h" #include "base/memory/ref_counted.h"
diff --git a/media/remoting/courier_renderer.cc b/media/remoting/courier_renderer.cc index 8f750dc..eb93e17 100644 --- a/media/remoting/courier_renderer.cc +++ b/media/remoting/courier_renderer.cc
@@ -9,8 +9,8 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ptr_util.h" #include "base/numerics/safe_math.h" #include "base/task/sequenced_task_runner.h"
diff --git a/media/remoting/courier_renderer.h b/media/remoting/courier_renderer.h index b7c2231..4e4e0d4 100644 --- a/media/remoting/courier_renderer.h +++ b/media/remoting/courier_renderer.h
@@ -9,8 +9,8 @@ #include <tuple> #include <utility> -#include "base/callback.h" #include "base/containers/circular_deque.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h"
diff --git a/media/remoting/courier_renderer_unittest.cc b/media/remoting/courier_renderer_unittest.cc index 630abe54..44d88e1f 100644 --- a/media/remoting/courier_renderer_unittest.cc +++ b/media/remoting/courier_renderer_unittest.cc
@@ -8,8 +8,8 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/check.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/task/single_thread_task_runner.h" #include "base/test/simple_test_tick_clock.h"
diff --git a/media/remoting/demuxer_stream_adapter.cc b/media/remoting/demuxer_stream_adapter.cc index 35427a4..d0d0a22 100644 --- a/media/remoting/demuxer_stream_adapter.cc +++ b/media/remoting/demuxer_stream_adapter.cc
@@ -7,8 +7,8 @@ #include <utility> #include "base/base64.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/task/sequenced_task_runner.h" #include "base/task/single_thread_task_runner.h" #include "components/cast_streaming/public/remoting_proto_enum_utils.h"
diff --git a/media/remoting/demuxer_stream_adapter.h b/media/remoting/demuxer_stream_adapter.h index 698bcee..04e4bb9 100644 --- a/media/remoting/demuxer_stream_adapter.h +++ b/media/remoting/demuxer_stream_adapter.h
@@ -10,7 +10,7 @@ #include <memory> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/task/sequenced_task_runner.h"
diff --git a/media/remoting/demuxer_stream_adapter_unittest.cc b/media/remoting/demuxer_stream_adapter_unittest.cc index 7f67a7e..b017019 100644 --- a/media/remoting/demuxer_stream_adapter_unittest.cc +++ b/media/remoting/demuxer_stream_adapter_unittest.cc
@@ -7,8 +7,8 @@ #include <memory> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "base/task/single_thread_task_runner.h" #include "base/test/task_environment.h"
diff --git a/media/remoting/end2end_test_renderer.cc b/media/remoting/end2end_test_renderer.cc index cb9704c..471821c 100644 --- a/media/remoting/end2end_test_renderer.cc +++ b/media/remoting/end2end_test_renderer.cc
@@ -7,10 +7,10 @@ #include <memory> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/check.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/notreached.h" #include "base/task/single_thread_task_runner.h" #include "components/cast_streaming/public/remoting_proto_utils.h"
diff --git a/media/remoting/fake_media_resource.cc b/media/remoting/fake_media_resource.cc index 49a6b9e..f98b145 100644 --- a/media/remoting/fake_media_resource.cc +++ b/media/remoting/fake_media_resource.cc
@@ -6,7 +6,7 @@ #include <vector> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "media/base/decoder_buffer.h" #include "media/base/media_util.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/media/remoting/fake_remoter.cc b/media/remoting/fake_remoter.cc index cce2f9cc..55b5fd48 100644 --- a/media/remoting/fake_remoter.cc +++ b/media/remoting/fake_remoter.cc
@@ -6,9 +6,9 @@ #include <memory> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/task/single_thread_task_runner.h" #include "build/buildflag.h" #include "media/media_buildflags.h"
diff --git a/media/remoting/receiver.cc b/media/remoting/receiver.cc index cf5da36a..f6bc430 100644 --- a/media/remoting/receiver.cc +++ b/media/remoting/receiver.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/notreached.h" #include "base/task/bind_post_task.h" #include "base/task/sequenced_task_runner.h"
diff --git a/media/remoting/receiver.h b/media/remoting/receiver.h index de03679..a11bd95 100644 --- a/media/remoting/receiver.h +++ b/media/remoting/receiver.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h"
diff --git a/media/remoting/renderer_controller.cc b/media/remoting/renderer_controller.cc index b281917..b2310fe 100644 --- a/media/remoting/renderer_controller.cc +++ b/media/remoting/renderer_controller.cc
@@ -4,8 +4,8 @@ #include "media/remoting/renderer_controller.h" -#include "base/bind.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/time/default_tick_clock.h" #include "base/time/tick_clock.h"
diff --git a/media/remoting/renderer_controller.h b/media/remoting/renderer_controller.h index bfef68f..dd365cb 100644 --- a/media/remoting/renderer_controller.h +++ b/media/remoting/renderer_controller.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/threading/thread_checker.h"
diff --git a/media/remoting/renderer_controller_unittest.cc b/media/remoting/renderer_controller_unittest.cc index 533e28f..9fbbee1 100644 --- a/media/remoting/renderer_controller_unittest.cc +++ b/media/remoting/renderer_controller_unittest.cc
@@ -7,7 +7,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/run_loop.h" #include "base/test/simple_test_tick_clock.h" #include "base/test/task_environment.h"
diff --git a/media/remoting/stream_provider.cc b/media/remoting/stream_provider.cc index 7f3dd65..f6e53c2 100644 --- a/media/remoting/stream_provider.cc +++ b/media/remoting/stream_provider.cc
@@ -5,10 +5,10 @@ #include "media/remoting/stream_provider.h" #include <vector> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/containers/circular_deque.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/task/bind_post_task.h" #include "base/task/sequenced_task_runner.h"
diff --git a/media/remoting/stream_provider.h b/media/remoting/stream_provider.h index d655469..8fff1b1 100644 --- a/media/remoting/stream_provider.h +++ b/media/remoting/stream_provider.h
@@ -5,8 +5,8 @@ #ifndef MEDIA_REMOTING_STREAM_PROVIDER_H_ #define MEDIA_REMOTING_STREAM_PROVIDER_H_ -#include "base/callback_forward.h" #include "base/containers/circular_deque.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h"
diff --git a/media/renderers/audio_renderer_impl.cc b/media/renderers/audio_renderer_impl.cc index 301f77f..8515895 100644 --- a/media/renderers/audio_renderer_impl.cc +++ b/media/renderers/audio_renderer_impl.cc
@@ -10,10 +10,10 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/metrics/histogram_macros.h" #include "base/power_monitor/power_monitor.h"
diff --git a/media/renderers/audio_renderer_impl_unittest.cc b/media/renderers/audio_renderer_impl_unittest.cc index d1d50e0..fe996dc81 100644 --- a/media/renderers/audio_renderer_impl_unittest.cc +++ b/media/renderers/audio_renderer_impl_unittest.cc
@@ -8,9 +8,9 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/format_macros.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/scoped_refptr.h" #include "base/run_loop.h" #include "base/strings/stringprintf.h"
diff --git a/media/renderers/decrypting_renderer.cc b/media/renderers/decrypting_renderer.cc index df26ad7..84e0576 100644 --- a/media/renderers/decrypting_renderer.cc +++ b/media/renderers/decrypting_renderer.cc
@@ -4,8 +4,8 @@ #include "media/renderers/decrypting_renderer.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/task/sequenced_task_runner.h" #include "media/base/cdm_context.h" #include "media/base/demuxer_stream.h"
diff --git a/media/renderers/decrypting_renderer.h b/media/renderers/decrypting_renderer.h index 9efa1960..678c70a4 100644 --- a/media/renderers/decrypting_renderer.h +++ b/media/renderers/decrypting_renderer.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h"
diff --git a/media/renderers/decrypting_renderer_factory.h b/media/renderers/decrypting_renderer_factory.h index 4be8a770..49f6358b 100644 --- a/media/renderers/decrypting_renderer_factory.h +++ b/media/renderers/decrypting_renderer_factory.h
@@ -5,7 +5,7 @@ #ifndef MEDIA_RENDERERS_DECRYPTING_RENDERER_FACTORY_H_ #define MEDIA_RENDERERS_DECRYPTING_RENDERER_FACTORY_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/task/sequenced_task_runner.h" #include "media/base/media_export.h"
diff --git a/media/renderers/decrypting_renderer_unittest.cc b/media/renderers/decrypting_renderer_unittest.cc index eb6b83e4..f91c0d84 100644 --- a/media/renderers/decrypting_renderer_unittest.cc +++ b/media/renderers/decrypting_renderer_unittest.cc
@@ -4,8 +4,8 @@ #include "media/renderers/decrypting_renderer.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/task/single_thread_task_runner.h" #include "base/test/gmock_callback_support.h"
diff --git a/media/renderers/paint_canvas_video_renderer.cc b/media/renderers/paint_canvas_video_renderer.cc index a2e471d1..670a61a 100644 --- a/media/renderers/paint_canvas_video_renderer.cc +++ b/media/renderers/paint_canvas_video_renderer.cc
@@ -8,9 +8,9 @@ #include <limits> #include "base/barrier_closure.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/compiler_specific.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h"
diff --git a/media/renderers/paint_canvas_video_renderer_unittest.cc b/media/renderers/paint_canvas_video_renderer_unittest.cc index b046aed..36a8b98 100644 --- a/media/renderers/paint_canvas_video_renderer_unittest.cc +++ b/media/renderers/paint_canvas_video_renderer_unittest.cc
@@ -5,7 +5,7 @@ #include <GLES3/gl3.h> #include <stdint.h> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/memory/aligned_memory.h" #include "base/memory/raw_ptr.h"
diff --git a/media/renderers/renderer_impl.cc b/media/renderers/renderer_impl.cc index 200bcf3..afc8b2e1 100644 --- a/media/renderers/renderer_impl.cc +++ b/media/renderers/renderer_impl.cc
@@ -7,11 +7,11 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/compiler_specific.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/memory/raw_ptr.h" #include "base/strings/string_number_conversions.h"
diff --git a/media/renderers/renderer_impl_factory.cc b/media/renderers/renderer_impl_factory.cc index 3340f3a..e7dd8da 100644 --- a/media/renderers/renderer_impl_factory.cc +++ b/media/renderers/renderer_impl_factory.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/task/sequenced_task_runner.h" #include "build/build_config.h" #include "media/base/audio_buffer.h"
diff --git a/media/renderers/renderer_impl_factory.h b/media/renderers/renderer_impl_factory.h index 77f81a41..c938b43 100644 --- a/media/renderers/renderer_impl_factory.h +++ b/media/renderers/renderer_impl_factory.h
@@ -8,7 +8,7 @@ #include <memory> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/task/sequenced_task_runner.h" #include "build/build_config.h"
diff --git a/media/renderers/renderer_impl_unittest.cc b/media/renderers/renderer_impl_unittest.cc index c383cbf7..88aefbd 100644 --- a/media/renderers/renderer_impl_unittest.cc +++ b/media/renderers/renderer_impl_unittest.cc
@@ -7,8 +7,8 @@ #include <memory> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/task/single_thread_task_runner.h"
diff --git a/media/renderers/shared_image_video_frame_test_utils.h b/media/renderers/shared_image_video_frame_test_utils.h index 9b0ba133..a2837b2 100644 --- a/media/renderers/shared_image_video_frame_test_utils.h +++ b/media/renderers/shared_image_video_frame_test_utils.h
@@ -8,7 +8,7 @@ #include <GLES3/gl3.h> #include <stdint.h> -#include "base/bind.h" +#include "base/functional/bind.h" #include "components/viz/common/gpu/context_provider.h" #include "media/base/video_frame.h"
diff --git a/media/renderers/video_renderer_impl.cc b/media/renderers/video_renderer_impl.cc index 3600ee9..87425a8 100644 --- a/media/renderers/video_renderer_impl.cc +++ b/media/renderers/video_renderer_impl.cc
@@ -8,10 +8,10 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/metrics/histogram_macros.h" #include "base/numerics/safe_conversions.h"
diff --git a/media/renderers/video_renderer_impl_unittest.cc b/media/renderers/video_renderer_impl_unittest.cc index 8698c12..dfcab632 100644 --- a/media/renderers/video_renderer_impl_unittest.cc +++ b/media/renderers/video_renderer_impl_unittest.cc
@@ -7,10 +7,10 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/containers/circular_deque.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h"
diff --git a/media/renderers/video_resource_updater.cc b/media/renderers/video_resource_updater.cc index 3f6a1fb..ac2637af 100644 --- a/media/renderers/video_resource_updater.cc +++ b/media/renderers/video_resource_updater.cc
@@ -10,9 +10,9 @@ #include <string> #include "base/atomic_sequence_num.h" -#include "base/bind.h" #include "base/containers/contains.h" #include "base/containers/cxx20_erase.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/memory/raw_ptr.h" #include "base/memory/shared_memory_mapping.h"
diff --git a/media/renderers/video_resource_updater_unittest.cc b/media/renderers/video_resource_updater_unittest.cc index 9bc1b5d..93dbf94 100644 --- a/media/renderers/video_resource_updater_unittest.cc +++ b/media/renderers/video_resource_updater_unittest.cc
@@ -7,7 +7,7 @@ #include <stddef.h> #include <stdint.h> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/memory/read_only_shared_memory_region.h" #include "base/test/task_environment.h"
diff --git a/media/renderers/win/media_engine_notify_impl.h b/media/renderers/win/media_engine_notify_impl.h index e25d239..877b2c9 100644 --- a/media/renderers/win/media_engine_notify_impl.h +++ b/media/renderers/win/media_engine_notify_impl.h
@@ -8,7 +8,7 @@ #include <mfmediaengine.h> #include <wrl.h> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/synchronization/lock.h" #include "media/base/buffering_state.h" #include "media/base/pipeline_status.h"
diff --git a/media/renderers/win/media_foundation_renderer.cc b/media/renderers/win/media_foundation_renderer.cc index 8c56e067..6d659c6 100644 --- a/media/renderers/win/media_foundation_renderer.cc +++ b/media/renderers/win/media_foundation_renderer.cc
@@ -12,7 +12,7 @@ #include <tuple> #include <utility> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/guid.h" #include "base/metrics/histogram_functions.h" #include "base/numerics/clamped_math.h"
diff --git a/media/renderers/win/media_foundation_renderer.h b/media/renderers/win/media_foundation_renderer.h index 48298a2b..e3e3f544 100644 --- a/media/renderers/win/media_foundation_renderer.h +++ b/media/renderers/win/media_foundation_renderer.h
@@ -12,7 +12,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h"
diff --git a/media/renderers/win/media_foundation_renderer_extension.h b/media/renderers/win/media_foundation_renderer_extension.h index 927abb4..7bc2557 100644 --- a/media/renderers/win/media_foundation_renderer_extension.h +++ b/media/renderers/win/media_foundation_renderer_extension.h
@@ -5,7 +5,7 @@ #ifndef MEDIA_RENDERERS_WIN_MEDIA_FOUNDATION_RENDERER_EXTENSION_H_ #define MEDIA_RENDERERS_WIN_MEDIA_FOUNDATION_RENDERER_EXTENSION_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/win/scoped_handle.h" #include "media/base/media_export.h" #include "media/renderers/win/media_foundation_rendering_mode.h"
diff --git a/media/renderers/win/media_foundation_renderer_unittest.cc b/media/renderers/win/media_foundation_renderer_unittest.cc index dea0868..80f8a5c 100644 --- a/media/renderers/win/media_foundation_renderer_unittest.cc +++ b/media/renderers/win/media_foundation_renderer_unittest.cc
@@ -9,8 +9,8 @@ #include <memory> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/scoped_refptr.h" #include "base/task/single_thread_task_runner.h" #include "base/test/mock_callback.h"
diff --git a/media/renderers/win/media_foundation_stream_wrapper.cc b/media/renderers/win/media_foundation_stream_wrapper.cc index 0410f55..c6c0b30 100644 --- a/media/renderers/win/media_foundation_stream_wrapper.cc +++ b/media/renderers/win/media_foundation_stream_wrapper.cc
@@ -6,7 +6,7 @@ #include <mferror.h> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/task/sequenced_task_runner.h" #include "media/base/video_codecs.h" #include "media/base/win/mf_helpers.h"
diff --git a/media/renderers/win/media_foundation_texture_pool.h b/media/renderers/win/media_foundation_texture_pool.h index 7c427fc..b2ff6955 100644 --- a/media/renderers/win/media_foundation_texture_pool.h +++ b/media/renderers/win/media_foundation_texture_pool.h
@@ -9,8 +9,8 @@ #include <wrl/client.h> #include <map> -#include "base/callback.h" #include "base/containers/flat_map.h" +#include "base/functional/callback.h" #include "base/unguessable_token.h" #include "base/win/scoped_handle.h" #include "media/base/media_export.h"
diff --git a/media/test/fake_encrypted_media.cc b/media/test/fake_encrypted_media.cc index 7b00c22..ce822f2 100644 --- a/media/test/fake_encrypted_media.cc +++ b/media/test/fake_encrypted_media.cc
@@ -4,7 +4,7 @@ #include "media/test/fake_encrypted_media.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "media/base/cdm_key_information.h" #include "media/cdm/aes_decryptor.h"
diff --git a/media/test/pipeline_integration_fuzzertest.cc b/media/test/pipeline_integration_fuzzertest.cc index 71f3aa0..80e8cc6 100644 --- a/media/test/pipeline_integration_fuzzertest.cc +++ b/media/test/pipeline_integration_fuzzertest.cc
@@ -7,9 +7,9 @@ #include <vector> #include "base/at_exit.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/logging.h" #include "base/task/single_thread_task_runner.h"
diff --git a/media/test/pipeline_integration_test.cc b/media/test/pipeline_integration_test.cc index 56406f0..0f01574 100644 --- a/media/test/pipeline_integration_test.cc +++ b/media/test/pipeline_integration_test.cc
@@ -8,9 +8,9 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ref_counted.h" #include "base/run_loop.h" #include "base/strings/string_split.h"
diff --git a/media/test/pipeline_integration_test_base.cc b/media/test/pipeline_integration_test_base.cc index fdba15ac..08d5f299 100644 --- a/media/test/pipeline_integration_test_base.cc +++ b/media/test/pipeline_integration_test_base.cc
@@ -7,9 +7,9 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/ref_counted.h" #include "base/run_loop.h" #include "base/task/single_thread_task_runner.h"
diff --git a/media/test/pipeline_integration_test_base.h b/media/test/pipeline_integration_test_base.h index d2980b1..ca719b4 100644 --- a/media/test/pipeline_integration_test_base.h +++ b/media/test/pipeline_integration_test_base.h
@@ -8,7 +8,7 @@ #include <stdint.h> #include <memory> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/hash/md5.h" #include "base/run_loop.h" #include "base/test/scoped_run_loop_timeout.h"
diff --git a/media/test/run_all_unittests.cc b/media/test/run_all_unittests.cc index 67240f1..13ad0c6 100644 --- a/media/test/run_all_unittests.cc +++ b/media/test/run_all_unittests.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 "base/bind.h" +#include "base/functional/bind.h" #include "base/test/launcher/unit_test_launcher.h" #include "base/test/test_discardable_memory_allocator.h" #include "base/test/test_suite.h"
diff --git a/media/test/test_media_source.cc b/media/test/test_media_source.cc index c510a512..bfa1785 100644 --- a/media/test/test_media_source.cc +++ b/media/test/test_media_source.cc
@@ -4,8 +4,8 @@ #include "media/test/test_media_source.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/task/single_thread_task_runner.h" #include "media/base/stream_parser.h" #include "media/base/test_data_util.h"
diff --git a/media/video/fake_video_encode_accelerator.cc b/media/video/fake_video_encode_accelerator.cc index 845db97..a1c39a6 100644 --- a/media/video/fake_video_encode_accelerator.cc +++ b/media/video/fake_video_encode_accelerator.cc
@@ -4,8 +4,8 @@ #include "media/video/fake_video_encode_accelerator.h" -#include "base/bind.h" #include "base/check.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/logging.h" #include "base/task/sequenced_task_runner.h"
diff --git a/media/video/fake_video_encode_accelerator.h b/media/video/fake_video_encode_accelerator.h index 1e657df..eab1ed5 100644 --- a/media/video/fake_video_encode_accelerator.h +++ b/media/video/fake_video_encode_accelerator.h
@@ -11,8 +11,8 @@ #include <list> #include <vector> -#include "base/callback.h" #include "base/containers/queue.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "media/base/bitrate.h"
diff --git a/media/video/gpu_memory_buffer_video_frame_pool.cc b/media/video/gpu_memory_buffer_video_frame_pool.cc index 92b0aed..40e2d25 100644 --- a/media/video/gpu_memory_buffer_video_frame_pool.cc +++ b/media/video/gpu_memory_buffer_video_frame_pool.cc
@@ -14,12 +14,12 @@ #include <utility> #include "base/barrier_closure.h" -#include "base/bind.h" #include "base/bits.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/containers/circular_deque.h" #include "base/containers/stack_container.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/logging.h" #include "base/memory/raw_ptr.h"
diff --git a/media/video/gpu_memory_buffer_video_frame_pool_unittest.cc b/media/video/gpu_memory_buffer_video_frame_pool_unittest.cc index d6bd66ba..33e8ae2c 100644 --- a/media/video/gpu_memory_buffer_video_frame_pool_unittest.cc +++ b/media/video/gpu_memory_buffer_video_frame_pool_unittest.cc
@@ -5,7 +5,7 @@ #include <stdint.h> #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/task/single_thread_task_runner.h" #include "base/test/simple_test_tick_clock.h"
diff --git a/media/video/mock_gpu_memory_buffer_video_frame_pool.cc b/media/video/mock_gpu_memory_buffer_video_frame_pool.cc index 7783129..ea06bd8 100644 --- a/media/video/mock_gpu_memory_buffer_video_frame_pool.cc +++ b/media/video/mock_gpu_memory_buffer_video_frame_pool.cc
@@ -4,7 +4,7 @@ #include "media/video/mock_gpu_memory_buffer_video_frame_pool.h" -#include "base/bind.h" +#include "base/functional/bind.h" namespace media {
diff --git a/media/video/mock_gpu_memory_buffer_video_frame_pool.h b/media/video/mock_gpu_memory_buffer_video_frame_pool.h index 9c86ed9..d54bcce 100644 --- a/media/video/mock_gpu_memory_buffer_video_frame_pool.h +++ b/media/video/mock_gpu_memory_buffer_video_frame_pool.h
@@ -5,7 +5,7 @@ #ifndef MEDIA_VIDEO_MOCK_GPU_MEMORY_BUFFER_VIDEO_FRAME_POOL_H_ #define MEDIA_VIDEO_MOCK_GPU_MEMORY_BUFFER_VIDEO_FRAME_POOL_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "media/video/gpu_memory_buffer_video_frame_pool.h" #include "testing/gmock/include/gmock/gmock.h"
diff --git a/media/video/offloading_video_encoder_unittest.cc b/media/video/offloading_video_encoder_unittest.cc index 2d0ac3c..e4a67a6 100644 --- a/media/video/offloading_video_encoder_unittest.cc +++ b/media/video/offloading_video_encoder_unittest.cc
@@ -5,8 +5,8 @@ #include <memory> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/task/sequenced_task_runner.h"
diff --git a/media/video/picture.h b/media/video/picture.h index 3e20a7e..4f3bf02 100644 --- a/media/video/picture.h +++ b/media/video/picture.h
@@ -9,7 +9,7 @@ #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/ref_counted.h" #include "gpu/command_buffer/common/mailbox_holder.h" #include "media/base/media_export.h"
diff --git a/media/video/renderable_gpu_memory_buffer_video_frame_pool.cc b/media/video/renderable_gpu_memory_buffer_video_frame_pool.cc index 739f78e3..488a5bd 100644 --- a/media/video/renderable_gpu_memory_buffer_video_frame_pool.cc +++ b/media/video/renderable_gpu_memory_buffer_video_frame_pool.cc
@@ -10,8 +10,8 @@ #include <list> #include <utility> -#include "base/bind.h" #include "base/bits.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/task/bind_post_task.h" #include "base/task/sequenced_task_runner.h"
diff --git a/media/video/renderable_gpu_memory_buffer_video_frame_pool_unittest.cc b/media/video/renderable_gpu_memory_buffer_video_frame_pool_unittest.cc index db2a67f2..c3acd03 100644 --- a/media/video/renderable_gpu_memory_buffer_video_frame_pool_unittest.cc +++ b/media/video/renderable_gpu_memory_buffer_video_frame_pool_unittest.cc
@@ -4,7 +4,7 @@ #include "media/video/renderable_gpu_memory_buffer_video_frame_pool.h" -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/memory/weak_ptr.h" #include "base/task/thread_pool.h" #include "base/test/bind.h"
diff --git a/media/video/software_video_encoder_test.cc b/media/video/software_video_encoder_test.cc index 72b3850..7a6727c 100644 --- a/media/video/software_video_encoder_test.cc +++ b/media/video/software_video_encoder_test.cc
@@ -7,8 +7,8 @@ #include <memory> #include <string> -#include "base/callback_helpers.h" #include "base/feature_list.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/memory/scoped_refptr.h" #include "base/strings/string_number_conversions.h"
diff --git a/media/video/video_encode_accelerator.cc b/media/video/video_encode_accelerator.cc index 27e87db..37d282d 100644 --- a/media/video/video_encode_accelerator.cc +++ b/media/video/video_encode_accelerator.cc
@@ -6,7 +6,7 @@ #include <inttypes.h> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/ranges/algorithm.h" #include "base/strings/stringprintf.h" #include "build/build_config.h"
diff --git a/media/video/video_encode_accelerator.h b/media/video/video_encode_accelerator.h index f37a1d50..638f24e 100644 --- a/media/video/video_encode_accelerator.h +++ b/media/video/video_encode_accelerator.h
@@ -11,7 +11,7 @@ #include <memory> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/scoped_refptr.h" #include "base/time/time.h" #include "media/base/bitrate.h"
diff --git a/media/video/video_encode_accelerator_adapter.cc b/media/video/video_encode_accelerator_adapter.cc index 43f6817..a7fefc5 100644 --- a/media/video/video_encode_accelerator_adapter.cc +++ b/media/video/video_encode_accelerator_adapter.cc
@@ -7,7 +7,7 @@ #include <limits> #include <vector> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/memory/ref_counted.h" #include "base/numerics/checked_math.h"
diff --git a/media/video/video_encode_accelerator_adapter.h b/media/video/video_encode_accelerator_adapter.h index 1f9ca9c..4d389367 100644 --- a/media/video/video_encode_accelerator_adapter.h +++ b/media/video/video_encode_accelerator_adapter.h
@@ -7,9 +7,9 @@ #include <memory> -#include "base/callback_forward.h" #include "base/containers/circular_deque.h" #include "base/containers/queue.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/memory/read_only_shared_memory_region.h" #include "base/memory/scoped_refptr.h"
diff --git a/media/video/video_encode_accelerator_adapter_test.cc b/media/video/video_encode_accelerator_adapter_test.cc index 4921715..41145af 100644 --- a/media/video/video_encode_accelerator_adapter_test.cc +++ b/media/video/video_encode_accelerator_adapter_test.cc
@@ -7,7 +7,7 @@ #include <memory> #include <string> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h"
diff --git a/media/video/video_encoder_fallback_test.cc b/media/video/video_encoder_fallback_test.cc index e2a748c..fd078de2 100644 --- a/media/video/video_encoder_fallback_test.cc +++ b/media/video/video_encoder_fallback_test.cc
@@ -4,7 +4,7 @@ #include "media/video/video_encoder_fallback.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h"
diff --git a/media/webrtc/audio_processor.cc b/media/webrtc/audio_processor.cc index 57ce2682..bfcf7ed 100644 --- a/media/webrtc/audio_processor.cc +++ b/media/webrtc/audio_processor.cc
@@ -13,8 +13,8 @@ #include <memory> #include <utility> -#include "base/callback_helpers.h" #include "base/feature_list.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/strings/stringprintf.h" #include "base/task/thread_pool.h"
diff --git a/media/webrtc/audio_processor.h b/media/webrtc/audio_processor.h index a21ef78..7215fffff 100644 --- a/media/webrtc/audio_processor.h +++ b/media/webrtc/audio_processor.h
@@ -7,9 +7,9 @@ #include <memory> -#include "base/callback.h" #include "base/component_export.h" #include "base/files/file.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" #include "base/sequence_checker.h" #include "base/thread_annotations.h"
diff --git a/mojo/core/channel_fuchsia.cc b/mojo/core/channel_fuchsia.cc index 2ecc2c3..bba4b88 100644 --- a/mojo/core/channel_fuchsia.cc +++ b/mojo/core/channel_fuchsia.cc
@@ -16,10 +16,10 @@ #include <memory> #include <tuple> -#include "base/bind.h" #include "base/containers/circular_deque.h" #include "base/files/scoped_file.h" #include "base/fuchsia/fuchsia_logging.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/memory/ref_counted.h" #include "base/message_loop/message_pump_for_io.h"
diff --git a/mojo/core/channel_fuzzer.cc b/mojo/core/channel_fuzzer.cc index c4c5798..3157aa6 100644 --- a/mojo/core/channel_fuzzer.cc +++ b/mojo/core/channel_fuzzer.cc
@@ -4,7 +4,7 @@ #include <stdint.h> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/message_loop/message_pump_type.h" #include "base/no_destructor.h" #include "base/run_loop.h"
diff --git a/mojo/core/channel_linux.cc b/mojo/core/channel_linux.cc index 71b50ca..eaf9b16 100644 --- a/mojo/core/channel_linux.cc +++ b/mojo/core/channel_linux.cc
@@ -19,10 +19,10 @@ #include <limits> #include <memory> -#include "base/bind.h" #include "base/bits.h" -#include "base/callback.h" #include "base/files/scoped_file.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/location.h" #include "base/logging.h" #include "base/memory/page_size.h"
diff --git a/mojo/core/channel_mac.cc b/mojo/core/channel_mac.cc index 818cba1..1708e0b9 100644 --- a/mojo/core/channel_mac.cc +++ b/mojo/core/channel_mac.cc
@@ -14,10 +14,10 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/containers/buffer_iterator.h" #include "base/containers/circular_deque.h" #include "base/containers/span.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/mac/mach_logging.h" #include "base/mac/scoped_mach_msg_destroy.h"
diff --git a/mojo/core/channel_unittest.cc b/mojo/core/channel_unittest.cc index 260fde56..f855528b 100644 --- a/mojo/core/channel_unittest.cc +++ b/mojo/core/channel_unittest.cc
@@ -6,7 +6,7 @@ #include <atomic> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/page_size.h" #include "base/memory/ptr_util.h" #include "base/message_loop/message_pump_type.h"
diff --git a/mojo/core/channel_win.cc b/mojo/core/channel_win.cc index 0f56608d..b09eb8b 100644 --- a/mojo/core/channel_win.cc +++ b/mojo/core/channel_win.cc
@@ -12,9 +12,9 @@ #include <memory> #include <tuple> -#include "base/bind.h" #include "base/containers/queue.h" #include "base/debug/activity_tracker.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/logging.h" #include "base/memory/raw_ptr.h"
diff --git a/mojo/core/core.cc b/mojo/core/core.cc index 2bc2aea..4e6f0ab4 100644 --- a/mojo/core/core.cc +++ b/mojo/core/core.cc
@@ -10,8 +10,8 @@ #include <memory> #include <utility> -#include "base/bind.h" #include "base/containers/stack_container.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/logging.h" #include "base/memory/ptr_util.h"
diff --git a/mojo/core/core.h b/mojo/core/core.h index 27f41b3..a573af34 100644 --- a/mojo/core/core.h +++ b/mojo/core/core.h
@@ -9,7 +9,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" #include "base/synchronization/lock.h" #include "base/task/single_thread_task_runner.h"
diff --git a/mojo/core/core_unittest.cc b/mojo/core/core_unittest.cc index 706cd63..e90d159 100644 --- a/mojo/core/core_unittest.cc +++ b/mojo/core/core_unittest.cc
@@ -8,7 +8,7 @@ #include <limits> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/threading/platform_thread.h" #include "build/build_config.h" #include "mojo/core/core_test_base.h"
diff --git a/mojo/core/data_pipe_consumer_dispatcher.cc b/mojo/core/data_pipe_consumer_dispatcher.cc index 8e69f31..19ad617 100644 --- a/mojo/core/data_pipe_consumer_dispatcher.cc +++ b/mojo/core/data_pipe_consumer_dispatcher.cc
@@ -11,7 +11,7 @@ #include <limits> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/memory/ref_counted.h" #include "base/numerics/checked_math.h"
diff --git a/mojo/core/data_pipe_producer_dispatcher.cc b/mojo/core/data_pipe_producer_dispatcher.cc index de890a7..e2022d6b 100644 --- a/mojo/core/data_pipe_producer_dispatcher.cc +++ b/mojo/core/data_pipe_producer_dispatcher.cc
@@ -9,7 +9,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/memory/ref_counted.h" #include "base/numerics/checked_math.h"
diff --git a/mojo/core/data_pipe_unittest.cc b/mojo/core/data_pipe_unittest.cc index d2a0902..4cd6078 100644 --- a/mojo/core/data_pipe_unittest.cc +++ b/mojo/core/data_pipe_unittest.cc
@@ -7,8 +7,8 @@ #include <memory> -#include "base/bind.h" #include "base/check_op.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/run_loop.h" #include "base/task/sequenced_task_runner.h"
diff --git a/mojo/core/embedder/process_error_callback.h b/mojo/core/embedder/process_error_callback.h index 5e452cf..0b145021 100644 --- a/mojo/core/embedder/process_error_callback.h +++ b/mojo/core/embedder/process_error_callback.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" namespace mojo { namespace core {
diff --git a/mojo/core/embedder/scoped_ipc_support.cc b/mojo/core/embedder/scoped_ipc_support.cc index 28a501e..31266ed8 100644 --- a/mojo/core/embedder/scoped_ipc_support.cc +++ b/mojo/core/embedder/scoped_ipc_support.cc
@@ -4,8 +4,8 @@ #include "mojo/core/embedder/scoped_ipc_support.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/synchronization/waitable_event.h" #include "base/task/single_thread_task_runner.h" #include "base/threading/thread_restrictions.h"
diff --git a/mojo/core/embedder_unittest.cc b/mojo/core/embedder_unittest.cc index 0317a24..7efc9c4 100644 --- a/mojo/core/embedder_unittest.cc +++ b/mojo/core/embedder_unittest.cc
@@ -11,9 +11,9 @@ #include <utility> #include "base/base_paths.h" -#include "base/bind.h" #include "base/command_line.h" #include "base/files/file.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/memory/read_only_shared_memory_region.h" #include "base/memory/unsafe_shared_memory_region.h"
diff --git a/mojo/core/invitation_unittest.cc b/mojo/core/invitation_unittest.cc index 2aff455cd..0803243 100644 --- a/mojo/core/invitation_unittest.cc +++ b/mojo/core/invitation_unittest.cc
@@ -7,12 +7,12 @@ #include "base/base_paths.h" #include "base/base_switches.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/check_op.h" #include "base/command_line.h" #include "base/feature_list.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/notreached.h" #include "base/path_service.h" #include "base/process/process.h"
diff --git a/mojo/core/ipcz_driver/base_shared_memory_service.cc b/mojo/core/ipcz_driver/base_shared_memory_service.cc index 39f6ae9..a5c5679 100644 --- a/mojo/core/ipcz_driver/base_shared_memory_service.cc +++ b/mojo/core/ipcz_driver/base_shared_memory_service.cc
@@ -7,8 +7,8 @@ #include <tuple> #include <utility> -#include "base/bind.h" #include "base/containers/circular_deque.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/memory/shared_memory_hooks.h" #include "base/memory/shared_memory_mapping.h"
diff --git a/mojo/core/message_pipe_perftest.cc b/mojo/core/message_pipe_perftest.cc index 8d5a856..b3e8a22 100644 --- a/mojo/core/message_pipe_perftest.cc +++ b/mojo/core/message_pipe_perftest.cc
@@ -8,9 +8,9 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/check_op.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/strings/stringprintf.h" #include "base/test/perf_time_logger.h" #include "base/threading/thread.h"
diff --git a/mojo/core/message_unittest.cc b/mojo/core/message_unittest.cc index 3824a27..7aff52f 100644 --- a/mojo/core/message_unittest.cc +++ b/mojo/core/message_unittest.cc
@@ -6,8 +6,8 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/ptr_util.h" #include "base/numerics/safe_math.h" #include "base/rand_util.h"
diff --git a/mojo/core/mojo_core.cc b/mojo/core/mojo_core.cc index b6c26db..2aadd3e6 100644 --- a/mojo/core/mojo_core.cc +++ b/mojo/core/mojo_core.cc
@@ -6,10 +6,10 @@ #include "base/at_exit.h" #include "base/base_switches.h" -#include "base/bind.h" #include "base/command_line.h" #include "base/debug/stack_trace.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/message_loop/message_pump_type.h" #include "base/metrics/field_trial.h"
diff --git a/mojo/core/multiprocess_message_pipe_unittest.cc b/mojo/core/multiprocess_message_pipe_unittest.cc index 36d081c..badcd42 100644 --- a/mojo/core/multiprocess_message_pipe_unittest.cc +++ b/mojo/core/multiprocess_message_pipe_unittest.cc
@@ -12,11 +12,11 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/files/scoped_file.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/run_loop.h" #include "base/strings/string_split.h"
diff --git a/mojo/core/node_channel.cc b/mojo/core/node_channel.cc index 34730504..bdf06bf 100644 --- a/mojo/core/node_channel.cc +++ b/mojo/core/node_channel.cc
@@ -8,7 +8,7 @@ #include <limits> #include <sstream> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/logging.h" #include "base/memory/ptr_util.h"
diff --git a/mojo/core/node_channel.h b/mojo/core/node_channel.h index 9ac5ee7..3977151 100644 --- a/mojo/core/node_channel.h +++ b/mojo/core/node_channel.h
@@ -8,8 +8,8 @@ #include <utility> #include <vector> -#include "base/callback.h" #include "base/containers/queue.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted_delete_on_sequence.h" #include "base/process/process.h"
diff --git a/mojo/core/node_channel_fuzzer.cc b/mojo/core/node_channel_fuzzer.cc index 9a3d160..ba8a8cf 100644 --- a/mojo/core/node_channel_fuzzer.cc +++ b/mojo/core/node_channel_fuzzer.cc
@@ -6,7 +6,7 @@ #include <algorithm> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/message_loop/message_pump_type.h" #include "base/no_destructor.h" #include "base/run_loop.h"
diff --git a/mojo/core/node_channel_unittest.cc b/mojo/core/node_channel_unittest.cc index 1286d2c8..d5be648 100644 --- a/mojo/core/node_channel_unittest.cc +++ b/mojo/core/node_channel_unittest.cc
@@ -4,7 +4,7 @@ #include "mojo/core/node_channel.h" -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/memory/scoped_refptr.h" #include "base/message_loop/message_pump_type.h"
diff --git a/mojo/core/node_controller.cc b/mojo/core/node_controller.cc index 5f32225fd..b4998b0 100644 --- a/mojo/core/node_controller.cc +++ b/mojo/core/node_controller.cc
@@ -7,8 +7,8 @@ #include <limits> #include <vector> -#include "base/bind.h" #include "base/containers/queue.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/logging.h" #include "base/process/process_handle.h"
diff --git a/mojo/core/node_controller.h b/mojo/core/node_controller.h index 1e390741..80651533 100644 --- a/mojo/core/node_controller.h +++ b/mojo/core/node_controller.h
@@ -13,9 +13,9 @@ #include <utility> #include <vector> -#include "base/callback.h" #include "base/containers/queue.h" #include "base/containers/span.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" #include "base/memory/writable_shared_memory_region.h" #include "base/process/process.h"
diff --git a/mojo/core/ports/ports_unittest.cc b/mojo/core/ports/ports_unittest.cc index a2d6c16..042a56693 100644 --- a/mojo/core/ports/ports_unittest.cc +++ b/mojo/core/ports/ports_unittest.cc
@@ -11,9 +11,9 @@ #include <sstream> #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/containers/queue.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/logging.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h"
diff --git a/mojo/core/run_all_core_unittests.cc b/mojo/core/run_all_core_unittests.cc index 2879b319..03ec406a 100644 --- a/mojo/core/run_all_core_unittests.cc +++ b/mojo/core/run_all_core_unittests.cc
@@ -3,10 +3,10 @@ // found in the LICENSE file. #include "base/base_switches.h" -#include "base/bind.h" #include "base/command_line.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/test/launcher/unit_test_launcher.h" #include "base/test/scoped_feature_list.h"
diff --git a/mojo/core/test/mojo_test_base.h b/mojo/core/test/mojo_test_base.h index 40c88f1..5eb22ed 100644 --- a/mojo/core/test/mojo_test_base.h +++ b/mojo/core/test/mojo_test_base.h
@@ -9,8 +9,8 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "build/build_config.h" #include "mojo/core/test/multiprocess_test_helper.h" #include "mojo/public/c/system/trap.h"
diff --git a/mojo/core/test/multiprocess_test_helper.cc b/mojo/core/test/multiprocess_test_helper.cc index 326932e6..8d689db 100644 --- a/mojo/core/test/multiprocess_test_helper.cc +++ b/mojo/core/test/multiprocess_test_helper.cc
@@ -11,11 +11,11 @@ #include "base/base_paths.h" #include "base/base_switches.h" -#include "base/bind.h" #include "base/check.h" #include "base/command_line.h" #include "base/feature_list.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/lazy_instance.h" #include "base/memory/ref_counted.h" #include "base/notreached.h"
diff --git a/mojo/core/test/multiprocess_test_helper.h b/mojo/core/test/multiprocess_test_helper.h index 594cf4f..ecce85b 100644 --- a/mojo/core/test/multiprocess_test_helper.h +++ b/mojo/core/test/multiprocess_test_helper.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/process/process.h" #include "base/test/multiprocess_test.h" #include "base/test/test_timeouts.h"
diff --git a/mojo/core/test/run_all_unittests.cc b/mojo/core/test/run_all_unittests.cc index b1fa3cb..9f9a2c5d 100644 --- a/mojo/core/test/run_all_unittests.cc +++ b/mojo/core/test/run_all_unittests.cc
@@ -4,7 +4,7 @@ #include <signal.h> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/test/launcher/unit_test_launcher.h" #include "build/build_config.h" #include "mojo/core/test/mojo_test_suite_base.h"
diff --git a/mojo/core/trap_unittest.cc b/mojo/core/trap_unittest.cc index 0c5471a..0fd449d 100644 --- a/mojo/core/trap_unittest.cc +++ b/mojo/core/trap_unittest.cc
@@ -8,8 +8,8 @@ #include <memory> #include <set> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/ptr_util.h" #include "base/rand_util.h" #include "base/synchronization/waitable_event.h"
diff --git a/mojo/public/cpp/bindings/associated_group.h b/mojo/public/cpp/bindings/associated_group.h index 5bc4516..f242e4bb 100644 --- a/mojo/public/cpp/bindings/associated_group.h +++ b/mojo/public/cpp/bindings/associated_group.h
@@ -5,8 +5,8 @@ #ifndef MOJO_PUBLIC_CPP_BINDINGS_ASSOCIATED_GROUP_H_ #define MOJO_PUBLIC_CPP_BINDINGS_ASSOCIATED_GROUP_H_ -#include "base/callback.h" #include "base/component_export.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" namespace mojo {
diff --git a/mojo/public/cpp/bindings/associated_remote.h b/mojo/public/cpp/bindings/associated_remote.h index a56cbf1..b8d9939 100644 --- a/mojo/public/cpp/bindings/associated_remote.h +++ b/mojo/public/cpp/bindings/associated_remote.h
@@ -9,8 +9,8 @@ #include <tuple> #include <utility> -#include "base/callback_forward.h" #include "base/check.h" +#include "base/functional/callback_forward.h" #include "base/memory/scoped_refptr.h" #include "base/task/sequenced_task_runner.h" #include "mojo/public/cpp/bindings/associated_interface_ptr_info.h"
diff --git a/mojo/public/cpp/bindings/binder_map.h b/mojo/public/cpp/bindings/binder_map.h index 372f21e5..cae812aa 100644 --- a/mojo/public/cpp/bindings/binder_map.h +++ b/mojo/public/cpp/bindings/binder_map.h
@@ -9,8 +9,8 @@ #include <string> #include <type_traits> -#include "base/callback.h" #include "base/component_export.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" #include "base/task/sequenced_task_runner.h" #include "mojo/public/cpp/bindings/generic_pending_receiver.h"
diff --git a/mojo/public/cpp/bindings/callback_helpers.h b/mojo/public/cpp/bindings/callback_helpers.h index 1d26d9f9..b8572f11a 100644 --- a/mojo/public/cpp/bindings/callback_helpers.h +++ b/mojo/public/cpp/bindings/callback_helpers.h
@@ -8,8 +8,8 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/ptr_util.h" // This is a helper utility to wrap a base::OnceCallback such that if the
diff --git a/mojo/public/cpp/bindings/connection_error_callback.h b/mojo/public/cpp/bindings/connection_error_callback.h index d964c96..0e0cad6 100644 --- a/mojo/public/cpp/bindings/connection_error_callback.h +++ b/mojo/public/cpp/bindings/connection_error_callback.h
@@ -5,7 +5,7 @@ #ifndef MOJO_PUBLIC_CPP_BINDINGS_CONNECTION_ERROR_CALLBACK_H_ #define MOJO_PUBLIC_CPP_BINDINGS_CONNECTION_ERROR_CALLBACK_H_ -#include "base/callback.h" +#include "base/functional/callback.h" namespace mojo {
diff --git a/mojo/public/cpp/bindings/connection_group.cc b/mojo/public/cpp/bindings/connection_group.cc index 3403568..f0993594 100644 --- a/mojo/public/cpp/bindings/connection_group.cc +++ b/mojo/public/cpp/bindings/connection_group.cc
@@ -4,7 +4,7 @@ #include "mojo/public/cpp/bindings/connection_group.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/task/sequenced_task_runner.h" namespace mojo {
diff --git a/mojo/public/cpp/bindings/connection_group.h b/mojo/public/cpp/bindings/connection_group.h index 17d4a302..7040ad7 100644 --- a/mojo/public/cpp/bindings/connection_group.h +++ b/mojo/public/cpp/bindings/connection_group.h
@@ -7,8 +7,8 @@ #include <atomic> -#include "base/callback.h" #include "base/component_export.h" +#include "base/functional/callback.h" #include "base/memory/ref_counted.h" #include "base/task/sequenced_task_runner.h"
diff --git a/mojo/public/cpp/bindings/connector.h b/mojo/public/cpp/bindings/connector.h index e24763c..1a3291a 100644 --- a/mojo/public/cpp/bindings/connector.h +++ b/mojo/public/cpp/bindings/connector.h
@@ -9,9 +9,9 @@ #include <memory> #include <utility> -#include "base/callback.h" #include "base/compiler_specific.h" #include "base/component_export.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr_exclusion.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h"
diff --git a/mojo/public/cpp/bindings/interface_endpoint_client.h b/mojo/public/cpp/bindings/interface_endpoint_client.h index 8b92c3b..052e4107 100644 --- a/mojo/public/cpp/bindings/interface_endpoint_client.h +++ b/mojo/public/cpp/bindings/interface_endpoint_client.h
@@ -11,10 +11,10 @@ #include <memory> #include <utility> -#include "base/callback.h" #include "base/component_export.h" #include "base/containers/span.h" #include "base/dcheck_is_on.h" +#include "base/functional/callback.h" #include "base/location.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h"
diff --git a/mojo/public/cpp/bindings/lib/associated_interface_ptr_state.h b/mojo/public/cpp/bindings/lib/associated_interface_ptr_state.h index 7c47391..dbb4a86 100644 --- a/mojo/public/cpp/bindings/lib/associated_interface_ptr_state.h +++ b/mojo/public/cpp/bindings/lib/associated_interface_ptr_state.h
@@ -12,9 +12,9 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback_forward.h" #include "base/component_export.h" +#include "base/functional/bind.h" +#include "base/functional/callback_forward.h" #include "base/memory/ptr_util.h" #include "base/memory/scoped_refptr.h" #include "base/task/sequenced_task_runner.h"
diff --git a/mojo/public/cpp/bindings/lib/binder_map_internal.h b/mojo/public/cpp/bindings/lib/binder_map_internal.h index e377c429..9892cc6 100644 --- a/mojo/public/cpp/bindings/lib/binder_map_internal.h +++ b/mojo/public/cpp/bindings/lib/binder_map_internal.h
@@ -7,8 +7,8 @@ #include <utility> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/task/sequenced_task_runner.h" #include "mojo/public/cpp/bindings/pending_receiver.h"
diff --git a/mojo/public/cpp/bindings/lib/binding_state.h b/mojo/public/cpp/bindings/lib/binding_state.h index 2bddc55..af9b244a 100644 --- a/mojo/public/cpp/bindings/lib/binding_state.h +++ b/mojo/public/cpp/bindings/lib/binding_state.h
@@ -10,11 +10,11 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/check.h" #include "base/component_export.h" #include "base/containers/span.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/ptr_util.h" #include "base/memory/scoped_refptr.h" #include "base/strings/string_piece.h"
diff --git a/mojo/public/cpp/bindings/lib/connector.cc b/mojo/public/cpp/bindings/lib/connector.cc index 937cd8b..6577393 100644 --- a/mojo/public/cpp/bindings/lib/connector.cc +++ b/mojo/public/cpp/bindings/lib/connector.cc
@@ -8,9 +8,9 @@ #include <memory> -#include "base/bind.h" #include "base/check_op.h" #include "base/compiler_specific.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h"
diff --git a/mojo/public/cpp/bindings/lib/control_message_proxy.cc b/mojo/public/cpp/bindings/lib/control_message_proxy.cc index 1529861..fc2ef91 100644 --- a/mojo/public/cpp/bindings/lib/control_message_proxy.cc +++ b/mojo/public/cpp/bindings/lib/control_message_proxy.cc
@@ -8,8 +8,8 @@ #include <stdint.h> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "base/task/sequenced_task_runner.h" #include "base/time/time.h"
diff --git a/mojo/public/cpp/bindings/lib/control_message_proxy.h b/mojo/public/cpp/bindings/lib/control_message_proxy.h index 1b65e28..07b94138 100644 --- a/mojo/public/cpp/bindings/lib/control_message_proxy.h +++ b/mojo/public/cpp/bindings/lib/control_message_proxy.h
@@ -7,8 +7,8 @@ #include <stdint.h> -#include "base/callback.h" #include "base/component_export.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" namespace base {
diff --git a/mojo/public/cpp/bindings/lib/interface_endpoint_client.cc b/mojo/public/cpp/bindings/lib/interface_endpoint_client.cc index c9f840b..95fac10 100644 --- a/mojo/public/cpp/bindings/lib/interface_endpoint_client.cc +++ b/mojo/public/cpp/bindings/lib/interface_endpoint_client.cc
@@ -8,10 +8,10 @@ #include <tuple> -#include "base/bind.h" #include "base/check.h" #include "base/containers/contains.h" #include "base/containers/cxx20_erase.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/logging.h" #include "base/memory/ptr_util.h"
diff --git a/mojo/public/cpp/bindings/lib/interface_ptr_state.h b/mojo/public/cpp/bindings/lib/interface_ptr_state.h index bee7a8d..b6b88ee 100644 --- a/mojo/public/cpp/bindings/lib/interface_ptr_state.h +++ b/mojo/public/cpp/bindings/lib/interface_ptr_state.h
@@ -12,11 +12,11 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/check.h" #include "base/component_export.h" #include "base/dcheck_is_on.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" #include "base/task/sequenced_task_runner.h" #include "base/time/time.h"
diff --git a/mojo/public/cpp/bindings/lib/message.cc b/mojo/public/cpp/bindings/lib/message.cc index 065dddf..d488f18 100644 --- a/mojo/public/cpp/bindings/lib/message.cc +++ b/mojo/public/cpp/bindings/lib/message.cc
@@ -12,8 +12,8 @@ #include <tuple> #include <utility> -#include "base/bind.h" #include "base/check_op.h" +#include "base/functional/bind.h" #include "base/lazy_instance.h" #include "base/memory/ptr_util.h" #include "base/numerics/safe_math.h"
diff --git a/mojo/public/cpp/bindings/lib/message_dumper.cc b/mojo/public/cpp/bindings/lib/message_dumper.cc index 2fcdf69..09b803e 100644 --- a/mojo/public/cpp/bindings/lib/message_dumper.cc +++ b/mojo/public/cpp/bindings/lib/message_dumper.cc
@@ -4,10 +4,10 @@ #include "mojo/public/cpp/bindings/message_dumper.h" -#include "base/bind.h" #include "base/files/file.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/no_destructor.h" #include "base/process/process.h"
diff --git a/mojo/public/cpp/bindings/lib/message_internal.h b/mojo/public/cpp/bindings/lib/message_internal.h index b2b31713..e38957aa 100644 --- a/mojo/public/cpp/bindings/lib/message_internal.h +++ b/mojo/public/cpp/bindings/lib/message_internal.h
@@ -7,8 +7,8 @@ #include <stdint.h> -#include "base/callback.h" #include "base/component_export.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/strings/string_piece.h" #include "mojo/public/cpp/bindings/lib/bindings_internal.h"
diff --git a/mojo/public/cpp/bindings/lib/multiplex_router.cc b/mojo/public/cpp/bindings/lib/multiplex_router.cc index 1ca2bbd0..ed69861c 100644 --- a/mojo/public/cpp/bindings/lib/multiplex_router.cc +++ b/mojo/public/cpp/bindings/lib/multiplex_router.cc
@@ -8,9 +8,9 @@ #include <utility> -#include "base/bind.h" #include "base/containers/contains.h" #include "base/containers/flat_set.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h"
diff --git a/mojo/public/cpp/bindings/lib/scoped_interface_endpoint_handle.cc b/mojo/public/cpp/bindings/lib/scoped_interface_endpoint_handle.cc index 0a7d65e0..a6838394 100644 --- a/mojo/public/cpp/bindings/lib/scoped_interface_endpoint_handle.cc +++ b/mojo/public/cpp/bindings/lib/scoped_interface_endpoint_handle.cc
@@ -6,8 +6,8 @@ #include <string> -#include "base/bind.h" #include "base/check.h" +#include "base/functional/bind.h" #include "base/synchronization/lock.h" #include "base/task/sequenced_task_runner.h" #include "mojo/public/cpp/bindings/associated_group_controller.h"
diff --git a/mojo/public/cpp/bindings/lib/sequence_local_sync_event_watcher.cc b/mojo/public/cpp/bindings/lib/sequence_local_sync_event_watcher.cc index f41248c6..f367934 100644 --- a/mojo/public/cpp/bindings/lib/sequence_local_sync_event_watcher.cc +++ b/mojo/public/cpp/bindings/lib/sequence_local_sync_event_watcher.cc
@@ -8,8 +8,8 @@ #include <memory> #include <set> -#include "base/bind.h" #include "base/containers/flat_set.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h"
diff --git a/mojo/public/cpp/bindings/lib/test_random_mojo_delays.cc b/mojo/public/cpp/bindings/lib/test_random_mojo_delays.cc index 5b9b525..49ff8e6 100644 --- a/mojo/public/cpp/bindings/lib/test_random_mojo_delays.cc +++ b/mojo/public/cpp/bindings/lib/test_random_mojo_delays.cc
@@ -4,7 +4,7 @@ #include <list> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h" #include "base/no_destructor.h"
diff --git a/mojo/public/cpp/bindings/lib/validation_errors.h b/mojo/public/cpp/bindings/lib/validation_errors.h index 2a3a041..f61c7ff 100644 --- a/mojo/public/cpp/bindings/lib/validation_errors.h +++ b/mojo/public/cpp/bindings/lib/validation_errors.h
@@ -5,8 +5,8 @@ #ifndef MOJO_PUBLIC_CPP_BINDINGS_LIB_VALIDATION_ERRORS_H_ #define MOJO_PUBLIC_CPP_BINDINGS_LIB_VALIDATION_ERRORS_H_ -#include "base/callback.h" #include "base/component_export.h" +#include "base/functional/callback.h" #include "base/logging.h" namespace mojo {
diff --git a/mojo/public/cpp/bindings/message.h b/mojo/public/cpp/bindings/message.h index 28fe63f6..5c1e559 100644 --- a/mojo/public/cpp/bindings/message.h +++ b/mojo/public/cpp/bindings/message.h
@@ -12,10 +12,10 @@ #include <memory> #include <vector> -#include "base/callback.h" #include "base/check_op.h" #include "base/component_export.h" #include "base/containers/span.h" +#include "base/functional/callback.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h" #include "base/strings/string_piece.h"
diff --git a/mojo/public/cpp/bindings/receiver_set.cc b/mojo/public/cpp/bindings/receiver_set.cc index 6c08432..9148d11 100644 --- a/mojo/public/cpp/bindings/receiver_set.cc +++ b/mojo/public/cpp/bindings/receiver_set.cc
@@ -7,9 +7,9 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/check.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr_exclusion.h" #include "base/memory/weak_ptr.h" #include "mojo/public/cpp/bindings/message.h"
diff --git a/mojo/public/cpp/bindings/receiver_set.h b/mojo/public/cpp/bindings/receiver_set.h index 48fbf1ab..138ba38 100644 --- a/mojo/public/cpp/bindings/receiver_set.h +++ b/mojo/public/cpp/bindings/receiver_set.h
@@ -10,10 +10,10 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/component_export.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr_exclusion.h" #include "base/task/sequenced_task_runner.h"
diff --git a/mojo/public/cpp/bindings/remote.h b/mojo/public/cpp/bindings/remote.h index 0ff0a2d..20d2d936 100644 --- a/mojo/public/cpp/bindings/remote.h +++ b/mojo/public/cpp/bindings/remote.h
@@ -9,8 +9,8 @@ #include <tuple> #include <utility> -#include "base/callback_forward.h" #include "base/check.h" +#include "base/functional/callback_forward.h" #include "base/memory/scoped_refptr.h" #include "base/task/sequenced_task_runner.h" #include "base/time/time.h"
diff --git a/mojo/public/cpp/bindings/remote_set.h b/mojo/public/cpp/bindings/remote_set.h index b0d2a70..6d255462 100644 --- a/mojo/public/cpp/bindings/remote_set.h +++ b/mojo/public/cpp/bindings/remote_set.h
@@ -9,9 +9,9 @@ #include <set> #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" #include "base/task/sequenced_task_runner.h" #include "base/types/id_type.h"
diff --git a/mojo/public/cpp/bindings/scoped_interface_endpoint_handle.h b/mojo/public/cpp/bindings/scoped_interface_endpoint_handle.h index a406941..9acfe5275 100644 --- a/mojo/public/cpp/bindings/scoped_interface_endpoint_handle.h +++ b/mojo/public/cpp/bindings/scoped_interface_endpoint_handle.h
@@ -5,8 +5,8 @@ #ifndef MOJO_PUBLIC_CPP_BINDINGS_SCOPED_INTERFACE_ENDPOINT_HANDLE_H_ #define MOJO_PUBLIC_CPP_BINDINGS_SCOPED_INTERFACE_ENDPOINT_HANDLE_H_ -#include "base/callback.h" #include "base/component_export.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" #include "base/strings/string_piece.h" #include "mojo/public/cpp/bindings/disconnect_reason.h"
diff --git a/mojo/public/cpp/bindings/sequence_local_sync_event_watcher.h b/mojo/public/cpp/bindings/sequence_local_sync_event_watcher.h index 3bcf6e0..2d84811c 100644 --- a/mojo/public/cpp/bindings/sequence_local_sync_event_watcher.h +++ b/mojo/public/cpp/bindings/sequence_local_sync_event_watcher.h
@@ -5,8 +5,8 @@ #ifndef MOJO_PUBLIC_CPP_BINDINGS_SEQUENCE_LOCAL_SYNC_EVENT_WATCHER_H_ #define MOJO_PUBLIC_CPP_BINDINGS_SEQUENCE_LOCAL_SYNC_EVENT_WATCHER_H_ -#include "base/callback.h" #include "base/component_export.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" namespace mojo {
diff --git a/mojo/public/cpp/bindings/service_factory.cc b/mojo/public/cpp/bindings/service_factory.cc index bf82ea9e..b8109a3a 100644 --- a/mojo/public/cpp/bindings/service_factory.cc +++ b/mojo/public/cpp/bindings/service_factory.cc
@@ -4,8 +4,8 @@ #include "mojo/public/cpp/bindings/service_factory.h" -#include "base/bind.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" namespace mojo {
diff --git a/mojo/public/cpp/bindings/service_factory.h b/mojo/public/cpp/bindings/service_factory.h index 83256fb..b3d454f 100644 --- a/mojo/public/cpp/bindings/service_factory.h +++ b/mojo/public/cpp/bindings/service_factory.h
@@ -8,11 +8,11 @@ #include <map> #include <memory> -#include "base/bind.h" -#include "base/callback.h" #include "base/component_export.h" #include "base/containers/flat_set.h" #include "base/containers/unique_ptr_adapters.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "mojo/public/cpp/bindings/generic_pending_receiver.h" #include "mojo/public/cpp/system/message_pipe.h"
diff --git a/mojo/public/cpp/bindings/shared_remote.h b/mojo/public/cpp/bindings/shared_remote.h index 7e40a94..7271489 100644 --- a/mojo/public/cpp/bindings/shared_remote.h +++ b/mojo/public/cpp/bindings/shared_remote.h
@@ -8,7 +8,7 @@ #include <memory> #include <tuple> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/memory/ref_counted.h" #include "base/synchronization/waitable_event.h"
diff --git a/mojo/public/cpp/bindings/sync_event_watcher.h b/mojo/public/cpp/bindings/sync_event_watcher.h index 54311dd6..c369a04 100644 --- a/mojo/public/cpp/bindings/sync_event_watcher.h +++ b/mojo/public/cpp/bindings/sync_event_watcher.h
@@ -7,8 +7,8 @@ #include <stddef.h> -#include "base/callback.h" #include "base/component_export.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h" #include "base/sequence_checker.h"
diff --git a/mojo/public/cpp/bindings/sync_handle_registry.h b/mojo/public/cpp/bindings/sync_handle_registry.h index e977361..f7cd0eb5 100644 --- a/mojo/public/cpp/bindings/sync_handle_registry.h +++ b/mojo/public/cpp/bindings/sync_handle_registry.h
@@ -8,10 +8,10 @@ #include <map> #include <memory> -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/callback_list.h" #include "base/component_export.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ref_counted.h" #include "base/sequence_checker.h" #include "base/synchronization/waitable_event.h"
diff --git a/mojo/public/cpp/bindings/tests/associated_interface_unittest.cc b/mojo/public/cpp/bindings/tests/associated_interface_unittest.cc index 9ce05bd..4e57b94 100644 --- a/mojo/public/cpp/bindings/tests/associated_interface_unittest.cc +++ b/mojo/public/cpp/bindings/tests/associated_interface_unittest.cc
@@ -10,9 +10,9 @@ #include <tuple> #include <utility> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h"
diff --git a/mojo/public/cpp/bindings/tests/bind_task_runner_unittest.cc b/mojo/public/cpp/bindings/tests/bind_task_runner_unittest.cc index ae634a0..18dd5ae 100644 --- a/mojo/public/cpp/bindings/tests/bind_task_runner_unittest.cc +++ b/mojo/public/cpp/bindings/tests/bind_task_runner_unittest.cc
@@ -5,9 +5,9 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/containers/queue.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/synchronization/lock.h" #include "base/synchronization/waitable_event.h" #include "base/task/sequenced_task_runner.h"
diff --git a/mojo/public/cpp/bindings/tests/binder_map_unittest.cc b/mojo/public/cpp/bindings/tests/binder_map_unittest.cc index d38cfac..22f48d6 100644 --- a/mojo/public/cpp/bindings/tests/binder_map_unittest.cc +++ b/mojo/public/cpp/bindings/tests/binder_map_unittest.cc
@@ -4,7 +4,7 @@ #include "mojo/public/cpp/bindings/binder_map.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/task/sequenced_task_runner.h" #include "base/task/thread_pool.h"
diff --git a/mojo/public/cpp/bindings/tests/bindings_perftest.cc b/mojo/public/cpp/bindings/tests/bindings_perftest.cc index e3bcc9a..66de30e 100644 --- a/mojo/public/cpp/bindings/tests/bindings_perftest.cc +++ b/mojo/public/cpp/bindings/tests/bindings_perftest.cc
@@ -5,7 +5,7 @@ #include <stddef.h> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/task/single_thread_task_runner.h"
diff --git a/mojo/public/cpp/bindings/tests/callback_helpers_unittest.cc b/mojo/public/cpp/bindings/tests/callback_helpers_unittest.cc index 7880bca..31fcb28a 100644 --- a/mojo/public/cpp/bindings/tests/callback_helpers_unittest.cc +++ b/mojo/public/cpp/bindings/tests/callback_helpers_unittest.cc
@@ -8,9 +8,9 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ptr_util.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/mojo/public/cpp/bindings/tests/connection_group_unittest.cc b/mojo/public/cpp/bindings/tests/connection_group_unittest.cc index b85c61de..d97348f7 100644 --- a/mojo/public/cpp/bindings/tests/connection_group_unittest.cc +++ b/mojo/public/cpp/bindings/tests/connection_group_unittest.cc
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/callback_helpers.h" #include "base/check.h" +#include "base/functional/callback_helpers.h" #include "base/task/sequenced_task_runner.h" #include "base/test/bind.h" #include "base/test/task_environment.h"
diff --git a/mojo/public/cpp/bindings/tests/connector_unittest.cc b/mojo/public/cpp/bindings/tests/connector_unittest.cc index f20ebc0..295e042a 100644 --- a/mojo/public/cpp/bindings/tests/connector_unittest.cc +++ b/mojo/public/cpp/bindings/tests/connector_unittest.cc
@@ -10,8 +10,8 @@ #include <utility> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/task/single_thread_task_runner.h"
diff --git a/mojo/public/cpp/bindings/tests/e2e_perftest.cc b/mojo/public/cpp/bindings/tests/e2e_perftest.cc index b1e6ddb..3f9ecb0 100644 --- a/mojo/public/cpp/bindings/tests/e2e_perftest.cc +++ b/mojo/public/cpp/bindings/tests/e2e_perftest.cc
@@ -5,8 +5,8 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/ptr_util.h" #include "base/run_loop.h" #include "base/strings/stringprintf.h"
diff --git a/mojo/public/cpp/bindings/tests/enum_default_unittest.cc b/mojo/public/cpp/bindings/tests/enum_default_unittest.cc index 141389b..3ace66f 100644 --- a/mojo/public/cpp/bindings/tests/enum_default_unittest.cc +++ b/mojo/public/cpp/bindings/tests/enum_default_unittest.cc
@@ -9,7 +9,7 @@ #include <utility> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/run_loop.h" #include "base/test/bind.h" #include "base/test/task_environment.h"
diff --git a/mojo/public/cpp/bindings/tests/flush_async_unittest.cc b/mojo/public/cpp/bindings/tests/flush_async_unittest.cc index 3f77e67..87f8480 100644 --- a/mojo/public/cpp/bindings/tests/flush_async_unittest.cc +++ b/mojo/public/cpp/bindings/tests/flush_async_unittest.cc
@@ -7,9 +7,9 @@ #include <vector> #include "base/barrier_closure.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/containers/flat_map.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h" #include "base/synchronization/lock.h"
diff --git a/mojo/public/cpp/bindings/tests/handle_passing_unittest.cc b/mojo/public/cpp/bindings/tests/handle_passing_unittest.cc index bdd8f90..343a634 100644 --- a/mojo/public/cpp/bindings/tests/handle_passing_unittest.cc +++ b/mojo/public/cpp/bindings/tests/handle_passing_unittest.cc
@@ -5,7 +5,7 @@ #include <stdint.h> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/run_loop.h" #include "mojo/public/cpp/bindings/receiver.h"
diff --git a/mojo/public/cpp/bindings/tests/idle_tracking_unittest.cc b/mojo/public/cpp/bindings/tests/idle_tracking_unittest.cc index 977bc374..12f7e7d 100644 --- a/mojo/public/cpp/bindings/tests/idle_tracking_unittest.cc +++ b/mojo/public/cpp/bindings/tests/idle_tracking_unittest.cc
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/callback_helpers.h" #include "base/check.h" +#include "base/functional/callback_helpers.h" #include "base/notreached.h" #include "base/run_loop.h" #include "base/test/bind.h"
diff --git a/mojo/public/cpp/bindings/tests/lazy_serialization_unittest.cc b/mojo/public/cpp/bindings/tests/lazy_serialization_unittest.cc index b70b03bb..7e57c19 100644 --- a/mojo/public/cpp/bindings/tests/lazy_serialization_unittest.cc +++ b/mojo/public/cpp/bindings/tests/lazy_serialization_unittest.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 "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/test/bind.h" #include "base/test/task_environment.h"
diff --git a/mojo/public/cpp/bindings/tests/multiplex_router_unittest.cc b/mojo/public/cpp/bindings/tests/multiplex_router_unittest.cc index a3c2f239..9253eeb9 100644 --- a/mojo/public/cpp/bindings/tests/multiplex_router_unittest.cc +++ b/mojo/public/cpp/bindings/tests/multiplex_router_unittest.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/memory/ref_counted.h" #include "base/run_loop.h"
diff --git a/mojo/public/cpp/bindings/tests/native_struct_unittest.cc b/mojo/public/cpp/bindings/tests/native_struct_unittest.cc index b2ce5f5c..c40fc0e 100644 --- a/mojo/public/cpp/bindings/tests/native_struct_unittest.cc +++ b/mojo/public/cpp/bindings/tests/native_struct_unittest.cc
@@ -6,7 +6,7 @@ #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/test/task_environment.h" #include "ipc/ipc_param_traits.h"
diff --git a/mojo/public/cpp/bindings/tests/new_endpoint_types_unittest.cc b/mojo/public/cpp/bindings/tests/new_endpoint_types_unittest.cc index 59ae0c3e..e15179755 100644 --- a/mojo/public/cpp/bindings/tests/new_endpoint_types_unittest.cc +++ b/mojo/public/cpp/bindings/tests/new_endpoint_types_unittest.cc
@@ -7,8 +7,8 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "base/test/task_environment.h" #include "mojo/public/cpp/bindings/associated_receiver.h"
diff --git a/mojo/public/cpp/bindings/tests/pickle_unittest.cc b/mojo/public/cpp/bindings/tests/pickle_unittest.cc index 9a67cf0c..42b91748 100644 --- a/mojo/public/cpp/bindings/tests/pickle_unittest.cc +++ b/mojo/public/cpp/bindings/tests/pickle_unittest.cc
@@ -5,8 +5,8 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/run_loop.h" #include "base/test/task_environment.h" #include "mojo/public/cpp/bindings/pending_receiver.h"
diff --git a/mojo/public/cpp/bindings/tests/receiver_callback_unittest.cc b/mojo/public/cpp/bindings/tests/receiver_callback_unittest.cc index ee282bc0..169b7c6 100644 --- a/mojo/public/cpp/bindings/tests/receiver_callback_unittest.cc +++ b/mojo/public/cpp/bindings/tests/receiver_callback_unittest.cc
@@ -4,9 +4,9 @@ #include <stdint.h> -#include "base/bind.h" -#include "base/callback.h" #include "base/check_op.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/run_loop.h" #include "base/test/bind.h" #include "base/test/gtest_util.h"
diff --git a/mojo/public/cpp/bindings/tests/receiver_set_unittest.cc b/mojo/public/cpp/bindings/tests/receiver_set_unittest.cc index 50b98a5..59233ee 100644 --- a/mojo/public/cpp/bindings/tests/receiver_set_unittest.cc +++ b/mojo/public/cpp/bindings/tests/receiver_set_unittest.cc
@@ -5,8 +5,8 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "base/test/bind.h" #include "mojo/public/cpp/bindings/associated_receiver_set.h"
diff --git a/mojo/public/cpp/bindings/tests/receiver_unittest.cc b/mojo/public/cpp/bindings/tests/receiver_unittest.cc index 37e2c9a4..fa82fc2 100644 --- a/mojo/public/cpp/bindings/tests/receiver_unittest.cc +++ b/mojo/public/cpp/bindings/tests/receiver_unittest.cc
@@ -5,9 +5,9 @@ #include <stdint.h> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/check_op.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h"
diff --git a/mojo/public/cpp/bindings/tests/remote_unittest.cc b/mojo/public/cpp/bindings/tests/remote_unittest.cc index 445381f..3eb2a28f 100644 --- a/mojo/public/cpp/bindings/tests/remote_unittest.cc +++ b/mojo/public/cpp/bindings/tests/remote_unittest.cc
@@ -8,10 +8,10 @@ #include <utility> #include "base/barrier_closure.h" -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/debug/dump_without_crashing.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h"
diff --git a/mojo/public/cpp/bindings/tests/report_bad_message_unittest.cc b/mojo/public/cpp/bindings/tests/report_bad_message_unittest.cc index 8fb0ca07..a479ac6 100644 --- a/mojo/public/cpp/bindings/tests/report_bad_message_unittest.cc +++ b/mojo/public/cpp/bindings/tests/report_bad_message_unittest.cc
@@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "base/test/bind.h" #include "mojo/public/cpp/bindings/message.h"
diff --git a/mojo/public/cpp/bindings/tests/request_response_unittest.cc b/mojo/public/cpp/bindings/tests/request_response_unittest.cc index a22ffdb9..3645739 100644 --- a/mojo/public/cpp/bindings/tests/request_response_unittest.cc +++ b/mojo/public/cpp/bindings/tests/request_response_unittest.cc
@@ -5,7 +5,7 @@ #include <stdint.h> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/test/bind.h" #include "mojo/public/cpp/bindings/receiver.h"
diff --git a/mojo/public/cpp/bindings/tests/router_test_util.h b/mojo/public/cpp/bindings/tests/router_test_util.h index 8939284..0c18364 100644 --- a/mojo/public/cpp/bindings/tests/router_test_util.h +++ b/mojo/public/cpp/bindings/tests/router_test_util.h
@@ -10,7 +10,7 @@ #include <string> #include <utility> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "mojo/public/cpp/bindings/message.h"
diff --git a/mojo/public/cpp/bindings/tests/service_factory_unittest.cc b/mojo/public/cpp/bindings/tests/service_factory_unittest.cc index 3df296754..19393397 100644 --- a/mojo/public/cpp/bindings/tests/service_factory_unittest.cc +++ b/mojo/public/cpp/bindings/tests/service_factory_unittest.cc
@@ -4,8 +4,8 @@ #include "mojo/public/cpp/bindings/service_factory.h" -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "base/test/bind.h" #include "base/test/task_environment.h"
diff --git a/mojo/public/cpp/bindings/tests/struct_traits_unittest.cc b/mojo/public/cpp/bindings/tests/struct_traits_unittest.cc index 005d927..7395550 100644 --- a/mojo/public/cpp/bindings/tests/struct_traits_unittest.cc +++ b/mojo/public/cpp/bindings/tests/struct_traits_unittest.cc
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/ptr_util.h" #include "base/run_loop.h" #include "base/test/task_environment.h"
diff --git a/mojo/public/cpp/bindings/tests/sync_handle_registry_unittest.cc b/mojo/public/cpp/bindings/tests/sync_handle_registry_unittest.cc index d89d965..f2c8c7dd 100644 --- a/mojo/public/cpp/bindings/tests/sync_handle_registry_unittest.cc +++ b/mojo/public/cpp/bindings/tests/sync_handle_registry_unittest.cc
@@ -4,10 +4,10 @@ #include <memory> -#include "mojo/public/cpp/bindings/sync_handle_registry.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ref_counted.h" #include "base/synchronization/waitable_event.h" +#include "mojo/public/cpp/bindings/sync_handle_registry.h" #include "testing/gtest/include/gtest/gtest.h" namespace mojo {
diff --git a/mojo/public/cpp/bindings/tests/sync_method_unittest.cc b/mojo/public/cpp/bindings/tests/sync_method_unittest.cc index 0c434ab9..7bf0450 100644 --- a/mojo/public/cpp/bindings/tests/sync_method_unittest.cc +++ b/mojo/public/cpp/bindings/tests/sync_method_unittest.cc
@@ -6,8 +6,8 @@ #include <utility> #include "base/barrier_closure.h" -#include "base/bind.h" #include "base/check.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/sequence_token.h" #include "base/task/sequenced_task_runner.h"
diff --git a/mojo/public/cpp/bindings/tests/union_unittest.cc b/mojo/public/cpp/bindings/tests/union_unittest.cc index 08a5c4c..24a586e 100644 --- a/mojo/public/cpp/bindings/tests/union_unittest.cc +++ b/mojo/public/cpp/bindings/tests/union_unittest.cc
@@ -7,8 +7,8 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/containers/flat_map.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/test/task_environment.h" #include "mojo/public/cpp/bindings/lib/array_internal.h"
diff --git a/mojo/public/cpp/bindings/tests/wtf_types_unittest.cc b/mojo/public/cpp/bindings/tests/wtf_types_unittest.cc index 02f1098..250e518e 100644 --- a/mojo/public/cpp/bindings/tests/wtf_types_unittest.cc +++ b/mojo/public/cpp/bindings/tests/wtf_types_unittest.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 "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/test/task_environment.h" #include "mojo/public/cpp/bindings/lib/message_fragment.h"
diff --git a/mojo/public/cpp/system/data_pipe_drainer.cc b/mojo/public/cpp/system/data_pipe_drainer.cc index 54a926d..c16a766 100644 --- a/mojo/public/cpp/system/data_pipe_drainer.cc +++ b/mojo/public/cpp/system/data_pipe_drainer.cc
@@ -8,7 +8,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/task/sequenced_task_runner.h" namespace mojo {
diff --git a/mojo/public/cpp/system/data_pipe_producer.cc b/mojo/public/cpp/system/data_pipe_producer.cc index 8902ee16..69cd8b3e 100644 --- a/mojo/public/cpp/system/data_pipe_producer.cc +++ b/mojo/public/cpp/system/data_pipe_producer.cc
@@ -9,8 +9,8 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/location.h" #include "base/memory/ref_counted_delete_on_sequence.h" #include "base/numerics/safe_conversions.h"
diff --git a/mojo/public/cpp/system/data_pipe_producer.h b/mojo/public/cpp/system/data_pipe_producer.h index 232933a..36a13ba 100644 --- a/mojo/public/cpp/system/data_pipe_producer.h +++ b/mojo/public/cpp/system/data_pipe_producer.h
@@ -7,8 +7,8 @@ #include <memory> -#include "base/callback_forward.h" #include "base/containers/span.h" +#include "base/functional/callback_forward.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h" #include "mojo/public/cpp/system/data_pipe.h"
diff --git a/mojo/public/cpp/system/data_pipe_utils.cc b/mojo/public/cpp/system/data_pipe_utils.cc index ee5f101..f72a3581 100644 --- a/mojo/public/cpp/system/data_pipe_utils.cc +++ b/mojo/public/cpp/system/data_pipe_utils.cc
@@ -4,8 +4,8 @@ #include <utility> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "mojo/public/cpp/system/data_pipe_utils.h" #include "mojo/public/cpp/system/wait.h"
diff --git a/mojo/public/cpp/system/functions.cc b/mojo/public/cpp/system/functions.cc index bb10081..7556921 100644 --- a/mojo/public/cpp/system/functions.cc +++ b/mojo/public/cpp/system/functions.cc
@@ -4,7 +4,7 @@ #include "mojo/public/cpp/system/functions.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/no_destructor.h" #include "mojo/public/c/system/invitation.h"
diff --git a/mojo/public/cpp/system/functions.h b/mojo/public/cpp/system/functions.h index e4d3601..1d5532f 100644 --- a/mojo/public/cpp/system/functions.h +++ b/mojo/public/cpp/system/functions.h
@@ -13,7 +13,7 @@ #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "mojo/public/c/system/functions.h" #include "mojo/public/cpp/system/system_export.h"
diff --git a/mojo/public/cpp/system/handle_signal_tracker.cc b/mojo/public/cpp/system/handle_signal_tracker.cc index 41354c7..1b64831 100644 --- a/mojo/public/cpp/system/handle_signal_tracker.cc +++ b/mojo/public/cpp/system/handle_signal_tracker.cc
@@ -4,7 +4,7 @@ #include "mojo/public/cpp/system/handle_signal_tracker.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/synchronization/lock.h" #include "base/task/sequenced_task_runner.h" #include "mojo/public/cpp/system/handle_signals_state.h"
diff --git a/mojo/public/cpp/system/handle_signal_tracker.h b/mojo/public/cpp/system/handle_signal_tracker.h index 201a2580..45e3635f 100644 --- a/mojo/public/cpp/system/handle_signal_tracker.h +++ b/mojo/public/cpp/system/handle_signal_tracker.h
@@ -5,7 +5,7 @@ #ifndef MOJO_PUBLIC_CPP_SYSTEM_HANDLE_SIGNAL_TRACKER_H_ #define MOJO_PUBLIC_CPP_SYSTEM_HANDLE_SIGNAL_TRACKER_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/task/sequenced_task_runner.h" #include "mojo/public/c/system/types.h" #include "mojo/public/cpp/system/handle.h"
diff --git a/mojo/public/cpp/system/invitation.h b/mojo/public/cpp/system/invitation.h index b208a4f..8dbb8591 100644 --- a/mojo/public/cpp/system/invitation.h +++ b/mojo/public/cpp/system/invitation.h
@@ -8,8 +8,8 @@ #include <cstdint> #include <string> -#include "base/callback.h" #include "base/component_export.h" +#include "base/functional/callback.h" #include "base/process/process_handle.h" #include "base/strings/string_piece.h" #include "mojo/public/c/system/invitation.h"
diff --git a/mojo/public/cpp/system/scope_to_message_pipe.h b/mojo/public/cpp/system/scope_to_message_pipe.h index 40a92541..e00e3ee1 100644 --- a/mojo/public/cpp/system/scope_to_message_pipe.h +++ b/mojo/public/cpp/system/scope_to_message_pipe.h
@@ -7,8 +7,8 @@ #include <memory> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "mojo/public/cpp/system/message_pipe.h" #include "mojo/public/cpp/system/simple_watcher.h" #include "mojo/public/cpp/system/system_export.h"
diff --git a/mojo/public/cpp/system/simple_watcher.cc b/mojo/public/cpp/system/simple_watcher.cc index f061eddb..ad2cfb9 100644 --- a/mojo/public/cpp/system/simple_watcher.cc +++ b/mojo/public/cpp/system/simple_watcher.cc
@@ -4,7 +4,7 @@ #include "mojo/public/cpp/system/simple_watcher.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/synchronization/lock.h" #include "base/task/common/task_annotator.h"
diff --git a/mojo/public/cpp/system/simple_watcher.h b/mojo/public/cpp/system/simple_watcher.h index efc0e0b..b061474 100644 --- a/mojo/public/cpp/system/simple_watcher.h +++ b/mojo/public/cpp/system/simple_watcher.h
@@ -5,8 +5,8 @@ #ifndef MOJO_PUBLIC_CPP_SYSTEM_SIMPLE_WATCHER_H_ #define MOJO_PUBLIC_CPP_SYSTEM_SIMPLE_WATCHER_H_ -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/location.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h"
diff --git a/mojo/public/cpp/system/tests/data_pipe_drainer_unittest.cc b/mojo/public/cpp/system/tests/data_pipe_drainer_unittest.cc index 6ba98c3..91cfa2a 100644 --- a/mojo/public/cpp/system/tests/data_pipe_drainer_unittest.cc +++ b/mojo/public/cpp/system/tests/data_pipe_drainer_unittest.cc
@@ -4,8 +4,8 @@ #include "mojo/public/cpp/system/data_pipe_drainer.h" -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/run_loop.h" #include "base/test/task_environment.h" #include "base/values.h"
diff --git a/mojo/public/cpp/system/tests/data_pipe_producer_unittest.cc b/mojo/public/cpp/system/tests/data_pipe_producer_unittest.cc index b9d1b86..49d5a90d 100644 --- a/mojo/public/cpp/system/tests/data_pipe_producer_unittest.cc +++ b/mojo/public/cpp/system/tests/data_pipe_producer_unittest.cc
@@ -7,11 +7,11 @@ #include <memory> #include <string> -#include "base/bind.h" -#include "base/callback.h" #include "base/files/file.h" #include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/strings/stringprintf.h"
diff --git a/mojo/public/cpp/system/tests/handle_signal_tracker_unittest.cc b/mojo/public/cpp/system/tests/handle_signal_tracker_unittest.cc index 77178c9..2006e46 100644 --- a/mojo/public/cpp/system/tests/handle_signal_tracker_unittest.cc +++ b/mojo/public/cpp/system/tests/handle_signal_tracker_unittest.cc
@@ -4,7 +4,7 @@ #include "mojo/public/cpp/system/handle_signal_tracker.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/test/task_environment.h" #include "mojo/core/embedder/embedder.h"
diff --git a/mojo/public/cpp/system/tests/invitation_unittest.cc b/mojo/public/cpp/system/tests/invitation_unittest.cc index af4d14a..5a92c7d 100644 --- a/mojo/public/cpp/system/tests/invitation_unittest.cc +++ b/mojo/public/cpp/system/tests/invitation_unittest.cc
@@ -8,11 +8,11 @@ #include "base/base_paths.h" #include "base/base_switches.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/check_op.h" #include "base/command_line.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/path_service.h" #include "base/run_loop.h" #include "base/strings/string_piece.h"
diff --git a/mojo/public/cpp/system/tests/scope_to_message_pipe_unittest.cc b/mojo/public/cpp/system/tests/scope_to_message_pipe_unittest.cc index ed1ca4f39..360e378 100644 --- a/mojo/public/cpp/system/tests/scope_to_message_pipe_unittest.cc +++ b/mojo/public/cpp/system/tests/scope_to_message_pipe_unittest.cc
@@ -4,8 +4,8 @@ #include "mojo/public/cpp/system/scope_to_message_pipe.h" -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/run_loop.h" #include "base/test/bind.h" #include "base/test/task_environment.h"
diff --git a/mojo/public/cpp/system/tests/simple_watcher_unittest.cc b/mojo/public/cpp/system/tests/simple_watcher_unittest.cc index d2fc06f..e94579d 100644 --- a/mojo/public/cpp/system/tests/simple_watcher_unittest.cc +++ b/mojo/public/cpp/system/tests/simple_watcher_unittest.cc
@@ -6,8 +6,8 @@ #include <memory> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/run_loop.h" #include "base/task/sequenced_task_runner.h" #include "base/task/single_thread_task_runner.h"
diff --git a/mojo/public/cpp/system/tests/string_data_source_unittest.cc b/mojo/public/cpp/system/tests/string_data_source_unittest.cc index fab4c3a..8348ce2 100644 --- a/mojo/public/cpp/system/tests/string_data_source_unittest.cc +++ b/mojo/public/cpp/system/tests/string_data_source_unittest.cc
@@ -7,8 +7,8 @@ #include <memory> #include <string> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/run_loop.h" #include "base/strings/string_piece.h" #include "base/task/sequenced_task_runner.h"
diff --git a/mojo/public/cpp/system/tests/wait_set_unittest.cc b/mojo/public/cpp/system/tests/wait_set_unittest.cc index a7c3870dd..d847f61e 100644 --- a/mojo/public/cpp/system/tests/wait_set_unittest.cc +++ b/mojo/public/cpp/system/tests/wait_set_unittest.cc
@@ -7,8 +7,8 @@ #include <set> #include <vector> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/ptr_util.h" #include "base/synchronization/waitable_event.h" #include "base/threading/platform_thread.h"
diff --git a/mojo/public/cpp/system/tests/wait_unittest.cc b/mojo/public/cpp/system/tests/wait_unittest.cc index 35b5ff4..54210d5 100644 --- a/mojo/public/cpp/system/tests/wait_unittest.cc +++ b/mojo/public/cpp/system/tests/wait_unittest.cc
@@ -7,8 +7,8 @@ #include <string> #include <vector> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/strings/string_piece.h" #include "base/threading/platform_thread.h" #include "base/threading/simple_thread.h"
diff --git a/mojo/public/cpp/test_support/lib/test_utils.cc b/mojo/public/cpp/test_support/lib/test_utils.cc index 3b199333..6344e2e 100644 --- a/mojo/public/cpp/test_support/lib/test_utils.cc +++ b/mojo/public/cpp/test_support/lib/test_utils.cc
@@ -9,8 +9,8 @@ #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/ranges/algorithm.h" #include "mojo/public/cpp/system/functions.h" #include "mojo/public/cpp/system/message_pipe.h"
diff --git a/mojo/public/java/system/base_run_loop.cc b/mojo/public/java/system/base_run_loop.cc index 2406aa4..e90ee9c9 100644 --- a/mojo/public/java/system/base_run_loop.cc +++ b/mojo/public/java/system/base_run_loop.cc
@@ -6,7 +6,7 @@ #include "base/android/jni_android.h" #include "base/android/scoped_java_ref.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/task/single_thread_task_executor.h" #include "base/task/single_thread_task_runner.h"
diff --git a/mojo/public/java/system/javatests/mojo_test_rule.cc b/mojo/public/java/system/javatests/mojo_test_rule.cc index e9fddd3..da925286 100644 --- a/mojo/public/java/system/javatests/mojo_test_rule.cc +++ b/mojo/public/java/system/javatests/mojo_test_rule.cc
@@ -5,7 +5,7 @@ #include "base/android/jni_android.h" #include "base/android/scoped_java_ref.h" #include "base/at_exit.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/run_loop.h" #include "base/task/single_thread_task_executor.h"
diff --git a/mojo/public/java/system/watcher_impl.cc b/mojo/public/java/system/watcher_impl.cc index 67678b8..3fa1835 100644 --- a/mojo/public/java/system/watcher_impl.cc +++ b/mojo/public/java/system/watcher_impl.cc
@@ -7,7 +7,7 @@ #include "base/android/jni_android.h" #include "base/android/scoped_java_ref.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/task/sequenced_task_runner.h" #include "mojo/public/cpp/system/handle.h" #include "mojo/public/cpp/system/simple_watcher.h"
diff --git a/mojo/public/tools/bindings/generators/mojolpm_templates/mojolpm.cc.tmpl b/mojo/public/tools/bindings/generators/mojolpm_templates/mojolpm.cc.tmpl index 5c9cbb2c..e2d32d8 100644 --- a/mojo/public/tools/bindings/generators/mojolpm_templates/mojolpm.cc.tmpl +++ b/mojo/public/tools/bindings/generators/mojolpm_templates/mojolpm.cc.tmpl
@@ -6,7 +6,7 @@ #include <functional> -#include "base/bind.h" +#include "base/functional/bind.h" #include "mojo/public/cpp/bindings/default_construct_traits.h" {% for extra_traits_header in all_extra_traits_headers %}
diff --git a/mojo/public/tools/bindings/mojom.gni b/mojo/public/tools/bindings/mojom.gni index 83f7323..56c7b6c 100644 --- a/mojo/public/tools/bindings/mojom.gni +++ b/mojo/public/tools/bindings/mojom.gni
@@ -1822,7 +1822,13 @@ data_deps += [ "${full_name}_js_data_deps" ] } } + } + # js_library() closure compiler targets, primarily used on ChromeOS. Only + # generate these targets if the mojom target is not C++ only and is not using + # TypeScript. + if ((!defined(invoker.cpp_only) || !invoker.cpp_only) && + !use_typescript_for_target) { js_library_target_name = "${target_name}_js_library" if (sources_list != []) { js_library(js_library_target_name) { @@ -1873,34 +1879,6 @@ } } - js_modules_target_name = "${target_name}_js_modules" - if (sources_list != []) { - js_library(js_modules_target_name) { - extra_public_deps = [ ":$generator_js_target_name" ] - sources = [] - foreach(base_path, output_file_base_paths) { - sources += [ "$root_gen_dir/${base_path}.m.js" ] - } - externs_list = [ - "${externs_path}/mojo_core.js", - "${externs_path}/pending.js", - ] - if (defined(invoker.disallow_native_types) && - invoker.disallow_native_types) { - deps = [] - } else { - deps = [ "//mojo/public/js:bindings_uncompiled" ] - } - foreach(d, all_deps) { - full_name = get_label_info(d, "label_no_toolchain") - deps += [ "${full_name}_js_modules" ] - } - } - } else { - group(js_modules_target_name) { - } - } - if (defined(invoker.webui_module_path)) { webui_js_target_name = "${target_name}_webui_js" if (sources_list != []) {
diff --git a/mojo/public/tools/fuzzers/mojo_fuzzer_message_dump.cc b/mojo/public/tools/fuzzers/mojo_fuzzer_message_dump.cc index e0a7103..c4af210 100644 --- a/mojo/public/tools/fuzzers/mojo_fuzzer_message_dump.cc +++ b/mojo/public/tools/fuzzers/mojo_fuzzer_message_dump.cc
@@ -5,9 +5,9 @@ #include <stddef.h> #include <stdint.h> -#include "base/bind.h" #include "base/containers/flat_map.h" #include "base/files/file.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/strings/string_number_conversions.h" #include "base/task/single_thread_task_executor.h"
diff --git a/mojo/public/tools/fuzzers/mojo_parse_message_fuzzer.cc b/mojo/public/tools/fuzzers/mojo_parse_message_fuzzer.cc index 0628b40..7bbdae6 100644 --- a/mojo/public/tools/fuzzers/mojo_parse_message_fuzzer.cc +++ b/mojo/public/tools/fuzzers/mojo_parse_message_fuzzer.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 "base/bind.h" +#include "base/functional/bind.h" #include "base/message_loop/message_pump_type.h" #include "base/run_loop.h" #include "base/task/single_thread_task_executor.h"
diff --git a/mojo/public/tools/fuzzers/mojo_parse_message_proto_fuzzer.cc b/mojo/public/tools/fuzzers/mojo_parse_message_proto_fuzzer.cc index c74b218..cd9c5c2 100644 --- a/mojo/public/tools/fuzzers/mojo_parse_message_proto_fuzzer.cc +++ b/mojo/public/tools/fuzzers/mojo_parse_message_proto_fuzzer.cc
@@ -5,7 +5,7 @@ // Implementation of a proto version of mojo_parse_message_fuzzer that sends // multiple messages per run. -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/message_loop/message_pump_type.h" #include "base/run_loop.h" #include "base/task/single_thread_task_executor.h"
diff --git a/net/android/http_auth_negotiate_android.cc b/net/android/http_auth_negotiate_android.cc index fb99eb3..ff0d623 100644 --- a/net/android/http_auth_negotiate_android.cc +++ b/net/android/http_auth_negotiate_android.cc
@@ -6,8 +6,8 @@ #include "base/android/jni_string.h" #include "base/android/scoped_java_ref.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/task/single_thread_task_runner.h" #include "net/base/auth.h"
diff --git a/net/android/http_auth_negotiate_android.h b/net/android/http_auth_negotiate_android.h index ef59199..42b7666 100644 --- a/net/android/http_auth_negotiate_android.h +++ b/net/android/http_auth_negotiate_android.h
@@ -11,7 +11,7 @@ #include <string> #include "base/android/jni_android.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h" #include "net/base/completion_once_callback.h"
diff --git a/net/android/network_change_notifier_android.cc b/net/android/network_change_notifier_android.cc index 4408754a..4ba0b89 100644 --- a/net/android/network_change_notifier_android.cc +++ b/net/android/network_change_notifier_android.cc
@@ -63,8 +63,8 @@ #include <unordered_set> #include "base/android/build_info.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/metrics/histogram_macros.h" #include "base/task/sequenced_task_runner.h" #include "base/task/task_traits.h"
diff --git a/net/android/network_change_notifier_android_unittest.cc b/net/android/network_change_notifier_android_unittest.cc index af62fec..d494e0c 100644 --- a/net/android/network_change_notifier_android_unittest.cc +++ b/net/android/network_change_notifier_android_unittest.cc
@@ -8,9 +8,9 @@ #include <memory> -#include "base/bind.h" -#include "base/callback.h" #include "base/compiler_specific.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/run_loop.h" #include "net/android/network_change_notifier_delegate_android.h" #include "net/base/ip_address.h"
diff --git a/net/android/network_library.h b/net/android/network_library.h index c48da3af..7c8a778 100644 --- a/net/android/network_library.h +++ b/net/android/network_library.h
@@ -14,7 +14,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/strings/string_piece.h" #include "net/android/cert_verify_result_android.h" #include "net/base/ip_endpoint.h"
diff --git a/net/base/address_tracker_linux.cc b/net/base/address_tracker_linux.cc index 5d63d77..4976cae 100644 --- a/net/base/address_tracker_linux.cc +++ b/net/base/address_tracker_linux.cc
@@ -10,9 +10,9 @@ #include <sys/ioctl.h> #include <utility> -#include "base/callback_helpers.h" #include "base/check.h" #include "base/files/scoped_file.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/posix/eintr_wrapper.h" #include "base/task/current_thread.h"
diff --git a/net/base/address_tracker_linux.h b/net/base/address_tracker_linux.h index 121eb782..4a8e73c 100644 --- a/net/base/address_tracker_linux.h +++ b/net/base/address_tracker_linux.h
@@ -19,10 +19,10 @@ #include <string> #include <unordered_set> -#include "base/callback.h" #include "base/compiler_specific.h" #include "base/files/file_descriptor_watcher_posix.h" #include "base/files/scoped_file.h" +#include "base/functional/callback.h" #include "base/gtest_prod_util.h" #include "base/memory/raw_ref.h" #include "base/synchronization/condition_variable.h"
diff --git a/net/base/address_tracker_linux_fuzzer.cc b/net/base/address_tracker_linux_fuzzer.cc index 2611905..7a0fd53 100644 --- a/net/base/address_tracker_linux_fuzzer.cc +++ b/net/base/address_tracker_linux_fuzzer.cc
@@ -5,7 +5,7 @@ #include <stddef.h> #include <stdint.h> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "net/base/address_tracker_linux.h" namespace net {
diff --git a/net/base/address_tracker_linux_unittest.cc b/net/base/address_tracker_linux_unittest.cc index 93a2862..00a0bc7 100644 --- a/net/base/address_tracker_linux_unittest.cc +++ b/net/base/address_tracker_linux_unittest.cc
@@ -11,10 +11,10 @@ #include <unordered_set> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/strings/string_number_conversions.h" #include "base/synchronization/waitable_event.h"
diff --git a/net/base/completion_once_callback.h b/net/base/completion_once_callback.h index d41ce7a..732407fb 100644 --- a/net/base/completion_once_callback.h +++ b/net/base/completion_once_callback.h
@@ -7,8 +7,8 @@ #include <stdint.h> -#include "base/callback.h" #include "base/cancelable_callback.h" +#include "base/functional/callback.h" namespace net {
diff --git a/net/base/completion_repeating_callback.h b/net/base/completion_repeating_callback.h index 44c8e6e..984fdf9 100644 --- a/net/base/completion_repeating_callback.h +++ b/net/base/completion_repeating_callback.h
@@ -7,8 +7,8 @@ #include <stdint.h> -#include "base/callback.h" #include "base/cancelable_callback.h" +#include "base/functional/callback.h" namespace net {
diff --git a/net/base/directory_lister.cc b/net/base/directory_lister.cc index a92b28c..9a73bc2 100644 --- a/net/base/directory_lister.cc +++ b/net/base/directory_lister.cc
@@ -7,10 +7,10 @@ #include <algorithm> #include <utility> -#include "base/bind.h" #include "base/check.h" #include "base/files/file_enumerator.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/i18n/file_util_icu.h" #include "base/location.h" #include "base/notreached.h"
diff --git a/net/base/directory_lister_unittest.cc b/net/base/directory_lister_unittest.cc index 0dc0fa0..cdba999 100644 --- a/net/base/directory_lister_unittest.cc +++ b/net/base/directory_lister_unittest.cc
@@ -6,10 +6,10 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" #include "base/i18n/file_util_icu.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h"
diff --git a/net/base/elements_upload_data_stream.cc b/net/base/elements_upload_data_stream.cc index f034db84..b6fcbf7 100644 --- a/net/base/elements_upload_data_stream.cc +++ b/net/base/elements_upload_data_stream.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" #include "base/check_op.h" +#include "base/functional/bind.h" #include "net/base/io_buffer.h" #include "net/base/net_errors.h" #include "net/base/upload_bytes_element_reader.h"
diff --git a/net/base/elements_upload_data_stream_unittest.cc b/net/base/elements_upload_data_stream_unittest.cc index 67df9a9e..e1695d5 100644 --- a/net/base/elements_upload_data_stream_unittest.cc +++ b/net/base/elements_upload_data_stream_unittest.cc
@@ -10,10 +10,10 @@ #include <limits> #include <vector> -#include "base/bind.h" #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/run_loop.h" #include "base/strings/string_piece.h"
diff --git a/net/base/file_stream_context.cc b/net/base/file_stream_context.cc index 4b883ff..5dd95138 100644 --- a/net/base/file_stream_context.cc +++ b/net/base/file_stream_context.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/logging.h" #include "base/task/task_runner.h"
diff --git a/net/base/file_stream_context_posix.cc b/net/base/file_stream_context_posix.cc index 235fc343..0e590b3 100644 --- a/net/base/file_stream_context_posix.cc +++ b/net/base/file_stream_context_posix.cc
@@ -7,11 +7,11 @@ #include <errno.h> #include <utility> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/check.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/posix/eintr_wrapper.h" #include "base/task/task_runner.h"
diff --git a/net/base/file_stream_context_win.cc b/net/base/file_stream_context_win.cc index 930204f..9c8a2a483 100644 --- a/net/base/file_stream_context_win.cc +++ b/net/base/file_stream_context_win.cc
@@ -7,8 +7,8 @@ #include <windows.h> #include <utility> -#include "base/bind.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/logging.h" #include "base/message_loop/message_pump_for_io.h"
diff --git a/net/base/file_stream_unittest.cc b/net/base/file_stream_unittest.cc index 8c9dac3e..474125d 100644 --- a/net/base/file_stream_unittest.cc +++ b/net/base/file_stream_unittest.cc
@@ -7,10 +7,10 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/files/file.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/path_service.h" #include "base/run_loop.h"
diff --git a/net/base/logging_network_change_observer.cc b/net/base/logging_network_change_observer.cc index 46d00954..1fd5ef9 100644 --- a/net/base/logging_network_change_observer.cc +++ b/net/base/logging_network_change_observer.cc
@@ -6,7 +6,7 @@ #include <string> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/strings/string_number_conversions.h" #include "base/values.h"
diff --git a/net/base/mock_file_stream.cc b/net/base/mock_file_stream.cc index d5e9fd5..2cd9158 100644 --- a/net/base/mock_file_stream.cc +++ b/net/base/mock_file_stream.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/task/single_thread_task_runner.h"
diff --git a/net/base/network_activity_monitor_unittest.cc b/net/base/network_activity_monitor_unittest.cc index 0028c75..e1b5648e 100644 --- a/net/base/network_activity_monitor_unittest.cc +++ b/net/base/network_activity_monitor_unittest.cc
@@ -9,7 +9,7 @@ #include <memory> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/string_number_conversions.h" #include "base/threading/thread.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/net/base/network_change_notifier_fuchsia.cc b/net/base/network_change_notifier_fuchsia.cc index fc7a165ef..e03fdab 100644 --- a/net/base/network_change_notifier_fuchsia.cc +++ b/net/base/network_change_notifier_fuchsia.cc
@@ -10,8 +10,8 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/fuchsia/fuchsia_logging.h" +#include "base/functional/bind.h" #include "base/strings/stringprintf.h" #include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/net/base/network_change_notifier_fuchsia.h b/net/base/network_change_notifier_fuchsia.h index db880127..75379c7 100644 --- a/net/base/network_change_notifier_fuchsia.h +++ b/net/base/network_change_notifier_fuchsia.h
@@ -9,8 +9,8 @@ #include <lib/fidl/cpp/binding.h> #include "base/atomicops.h" -#include "base/callback.h" #include "base/containers/flat_map.h" +#include "base/functional/callback.h" #include "base/gtest_prod_util.h" #include "base/strings/string_piece.h" #include "base/threading/thread_checker.h"
diff --git a/net/base/network_change_notifier_fuchsia_unittest.cc b/net/base/network_change_notifier_fuchsia_unittest.cc index e36cb34..23bb3dec 100644 --- a/net/base/network_change_notifier_fuchsia_unittest.cc +++ b/net/base/network_change_notifier_fuchsia_unittest.cc
@@ -11,7 +11,7 @@ #include <vector> #include "base/auto_reset.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/run_loop.h" #include "base/test/task_environment.h"
diff --git a/net/base/network_change_notifier_linux.cc b/net/base/network_change_notifier_linux.cc index 793ed8d..dee80df 100644 --- a/net/base/network_change_notifier_linux.cc +++ b/net/base/network_change_notifier_linux.cc
@@ -6,9 +6,9 @@ #include <string> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/compiler_specific.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/task/sequenced_task_runner.h" #include "base/task/task_traits.h" #include "base/task/thread_pool.h"
diff --git a/net/base/network_change_notifier_mac.mm b/net/base/network_change_notifier_mac.mm index f8ff519..7fd797a 100644 --- a/net/base/network_change_notifier_mac.mm +++ b/net/base/network_change_notifier_mac.mm
@@ -7,7 +7,7 @@ #include <netinet/in.h> #include <resolv.h> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/metrics/histogram_macros.h" #include "base/task/sequenced_task_runner.h"
diff --git a/net/base/network_change_notifier_posix.cc b/net/base/network_change_notifier_posix.cc index c7b5c96..2267ca6ba 100644 --- a/net/base/network_change_notifier_posix.cc +++ b/net/base/network_change_notifier_posix.cc
@@ -5,7 +5,7 @@ #include <string> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/task/task_traits.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h"
diff --git a/net/base/network_change_notifier_win.cc b/net/base/network_change_notifier_win.cc index f900732..2ab1d1f 100644 --- a/net/base/network_change_notifier_win.cc +++ b/net/base/network_change_notifier_win.cc
@@ -9,7 +9,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/logging.h" #include "base/metrics/histogram_macros.h"
diff --git a/net/base/network_change_notifier_win.h b/net/base/network_change_notifier_win.h index 0d88afa..c448665e 100644 --- a/net/base/network_change_notifier_win.h +++ b/net/base/network_change_notifier_win.h
@@ -13,8 +13,8 @@ #include <memory> -#include "base/callback.h" #include "base/compiler_specific.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h" #include "base/sequence_checker.h"
diff --git a/net/base/network_change_notifier_win_unittest.cc b/net/base/network_change_notifier_win_unittest.cc index e016d65..e50202e 100644 --- a/net/base/network_change_notifier_win_unittest.cc +++ b/net/base/network_change_notifier_win_unittest.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/task/sequenced_task_runner.h" #include "base/task/single_thread_task_runner.h"
diff --git a/net/base/network_config_watcher_mac.cc b/net/base/network_config_watcher_mac.cc index 6089963..3e3240b 100644 --- a/net/base/network_config_watcher_mac.cc +++ b/net/base/network_config_watcher_mac.cc
@@ -6,8 +6,8 @@ #include <algorithm> -#include "base/bind.h" #include "base/compiler_specific.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h"
diff --git a/net/base/network_delegate.h b/net/base/network_delegate.h index 16ec434..fa1feb0 100644 --- a/net/base/network_delegate.h +++ b/net/base/network_delegate.h
@@ -10,7 +10,7 @@ #include <set> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/gtest_prod_util.h" #include "base/threading/thread_checker.h" #include "net/base/auth.h"
diff --git a/net/base/prioritized_task_runner.cc b/net/base/prioritized_task_runner.cc index 4ab92139..1a48c42 100644 --- a/net/base/prioritized_task_runner.cc +++ b/net/base/prioritized_task_runner.cc
@@ -6,7 +6,7 @@ #include <algorithm> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/task/task_runner.h" #include "base/task/thread_pool.h"
diff --git a/net/base/prioritized_task_runner.h b/net/base/prioritized_task_runner.h index f11633120..d67690b 100644 --- a/net/base/prioritized_task_runner.h +++ b/net/base/prioritized_task_runner.h
@@ -9,8 +9,8 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/location.h" #include "base/memory/ref_counted.h" #include "base/synchronization/lock.h"
diff --git a/net/base/prioritized_task_runner_unittest.cc b/net/base/prioritized_task_runner_unittest.cc index c33c332..ee61013 100644 --- a/net/base/prioritized_task_runner_unittest.cc +++ b/net/base/prioritized_task_runner_unittest.cc
@@ -9,8 +9,8 @@ #include <string> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/rand_util.h" #include "base/run_loop.h"
diff --git a/net/base/priority_queue.h b/net/base/priority_queue.h index 66e1a00..f69e512 100644 --- a/net/base/priority_queue.h +++ b/net/base/priority_queue.h
@@ -12,9 +12,9 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback.h" #include "base/check_op.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/threading/thread_checker.h" #if !defined(NDEBUG)
diff --git a/net/base/priority_queue_unittest.cc b/net/base/priority_queue_unittest.cc index 738fe844..0ff64646 100644 --- a/net/base/priority_queue_unittest.cc +++ b/net/base/priority_queue_unittest.cc
@@ -6,7 +6,7 @@ #include <cstddef> -#include "base/bind.h" +#include "base/functional/bind.h" #include "testing/gtest/include/gtest/gtest.h" namespace net {
diff --git a/net/base/rand_callback.h b/net/base/rand_callback.h index e9d60c2..3df101c1 100644 --- a/net/base/rand_callback.h +++ b/net/base/rand_callback.h
@@ -5,7 +5,7 @@ #ifndef NET_BASE_RAND_CALLBACK_H_ #define NET_BASE_RAND_CALLBACK_H_ -#include "base/callback.h" +#include "base/functional/callback.h" namespace net {
diff --git a/net/base/test_completion_callback.cc b/net/base/test_completion_callback.cc index abdf6f6..44fde49 100644 --- a/net/base/test_completion_callback.cc +++ b/net/base/test_completion_callback.cc
@@ -4,9 +4,9 @@ #include "net/base/test_completion_callback.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/compiler_specific.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "net/base/io_buffer.h"
diff --git a/net/base/test_completion_callback.h b/net/base/test_completion_callback.h index 3d051c24b..e0c45f6 100644 --- a/net/base/test_completion_callback.h +++ b/net/base/test_completion_callback.h
@@ -10,8 +10,8 @@ #include <memory> #include <utility> -#include "base/callback.h" #include "base/compiler_specific.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "net/base/completion_once_callback.h" #include "net/base/net_errors.h"
diff --git a/net/base/test_completion_callback_unittest.cc b/net/base/test_completion_callback_unittest.cc index fdf6ea70..a3034890 100644 --- a/net/base/test_completion_callback_unittest.cc +++ b/net/base/test_completion_callback_unittest.cc
@@ -6,8 +6,8 @@ #include "net/base/test_completion_callback.h" -#include "base/bind.h" #include "base/check_op.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/memory/raw_ptr.h" #include "base/notreached.h"
diff --git a/net/base/upload_file_element_reader.cc b/net/base/upload_file_element_reader.cc index 8aabd90..69b3fa8 100644 --- a/net/base/upload_file_element_reader.cc +++ b/net/base/upload_file_element_reader.cc
@@ -6,8 +6,8 @@ #include <memory> -#include "base/bind.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/task/task_runner.h" #include "net/base/file_stream.h"
diff --git a/net/cert/caching_cert_verifier.cc b/net/cert/caching_cert_verifier.cc index 2529212..181288d 100644 --- a/net/cert/caching_cert_verifier.cc +++ b/net/cert/caching_cert_verifier.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/time/time.h" #include "net/base/net_errors.h"
diff --git a/net/cert/cert_and_ct_verifier.cc b/net/cert/cert_and_ct_verifier.cc index 1c2136c..8be4131 100644 --- a/net/cert/cert_and_ct_verifier.cc +++ b/net/cert/cert_and_ct_verifier.cc
@@ -4,7 +4,7 @@ #include "net/cert/cert_and_ct_verifier.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "net/cert/ct_verifier.h" namespace net {
diff --git a/net/cert/cert_database_mac.cc b/net/cert/cert_database_mac.cc index 3e26d1b..9055cc3 100644 --- a/net/cert/cert_database_mac.cc +++ b/net/cert/cert_database_mac.cc
@@ -6,8 +6,8 @@ #include <Security/Security.h> -#include "base/bind.h" #include "base/check.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/mac/mac_logging.h" #include "base/memory/raw_ptr.h"
diff --git a/net/cert/cert_verify_proc_builtin_unittest.cc b/net/cert/cert_verify_proc_builtin_unittest.cc index a2219ad..6b06ab7 100644 --- a/net/cert/cert_verify_proc_builtin_unittest.cc +++ b/net/cert/cert_verify_proc_builtin_unittest.cc
@@ -231,8 +231,11 @@ CertVerifier::Config config_; std::unique_ptr<net::URLRequestContext> context_; - raw_ptr<MockSystemTrustStore> mock_system_trust_store_ = nullptr; + + // Must outlive `mock_system_trust_store_`. scoped_refptr<CertVerifyProc> verify_proc_; + + raw_ptr<MockSystemTrustStore> mock_system_trust_store_ = nullptr; scoped_refptr<CertNetFetcherURLRequest> cert_net_fetcher_; };
diff --git a/net/cert/cert_verify_proc_unittest.cc b/net/cert/cert_verify_proc_unittest.cc index cac93a66..59afd75 100644 --- a/net/cert/cert_verify_proc_unittest.cc +++ b/net/cert/cert_verify_proc_unittest.cc
@@ -7,10 +7,10 @@ #include <memory> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/memory/raw_ptr.h" #include "base/message_loop/message_pump_type.h"
diff --git a/net/cert/cert_verify_proc_win.cc b/net/cert/cert_verify_proc_win.cc index 08ded6f..91b1d9ce 100644 --- a/net/cert/cert_verify_proc_win.cc +++ b/net/cert/cert_verify_proc_win.cc
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/free_deleter.h" #include "base/metrics/histogram_macros.h" #include "base/no_destructor.h"
diff --git a/net/cert/coalescing_cert_verifier.cc b/net/cert/coalescing_cert_verifier.cc index 776e694..7e8376d 100644 --- a/net/cert/coalescing_cert_verifier.cc +++ b/net/cert/coalescing_cert_verifier.cc
@@ -4,9 +4,9 @@ #include "net/cert/coalescing_cert_verifier.h" -#include "base/bind.h" #include "base/containers/linked_list.h" #include "base/containers/unique_ptr_adapters.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/metrics/histogram_macros.h"
diff --git a/net/cert/coalescing_cert_verifier_unittest.cc b/net/cert/coalescing_cert_verifier_unittest.cc index ab5f647..cd72ff6 100644 --- a/net/cert/coalescing_cert_verifier_unittest.cc +++ b/net/cert/coalescing_cert_verifier_unittest.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/test/bind.h" #include "base/test/metrics/histogram_tester.h" #include "net/base/net_errors.h"
diff --git a/net/cert/internal/path_builder_trust_store_win_unittest.cc b/net/cert/internal/path_builder_trust_store_win_unittest.cc index 22163b0..9a0a98d6d 100644 --- a/net/cert/internal/path_builder_trust_store_win_unittest.cc +++ b/net/cert/internal/path_builder_trust_store_win_unittest.cc
@@ -7,8 +7,8 @@ #include <algorithm> #include "base/base_paths.h" -#include "base/callback_forward.h" #include "base/files/file_util.h" +#include "base/functional/callback_forward.h" #include "base/path_service.h" #include "base/test/bind.h" #include "build/build_config.h"
diff --git a/net/cert/internal/trust_store_mac.cc b/net/cert/internal/trust_store_mac.cc index cc13ecd..e58e82c7 100644 --- a/net/cert/internal/trust_store_mac.cc +++ b/net/cert/internal/trust_store_mac.cc
@@ -7,10 +7,10 @@ #include <Security/Security.h> #include "base/atomicops.h" -#include "base/bind.h" #include "base/callback_list.h" #include "base/containers/contains.h" #include "base/containers/flat_map.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/mac/foundation_util.h" #include "base/mac/mac_logging.h"
diff --git a/net/cert/mock_cert_verifier.cc b/net/cert/mock_cert_verifier.cc index a894b9f..8bd3a5a 100644 --- a/net/cert/mock_cert_verifier.cc +++ b/net/cert/mock_cert_verifier.cc
@@ -7,8 +7,8 @@ #include <memory> #include <utility> -#include "base/bind.h" #include "base/callback_list.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h"
diff --git a/net/cert/multi_log_ct_verifier.cc b/net/cert/multi_log_ct_verifier.cc index 1391bac4..51484d8 100644 --- a/net/cert/multi_log_ct_verifier.cc +++ b/net/cert/multi_log_ct_verifier.cc
@@ -6,8 +6,8 @@ #include <vector> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/logging.h" #include "base/metrics/histogram_macros.h" #include "base/values.h"
diff --git a/net/cert/multi_log_ct_verifier.h b/net/cert/multi_log_ct_verifier.h index 85f44af6..c73b6ce 100644 --- a/net/cert/multi_log_ct_verifier.h +++ b/net/cert/multi_log_ct_verifier.h
@@ -8,8 +8,8 @@ #include <map> #include <string> -#include "base/callback_forward.h" #include "base/callback_list.h" +#include "base/functional/callback_forward.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h" #include "base/strings/string_piece.h"
diff --git a/net/cert/multi_threaded_cert_verifier.cc b/net/cert/multi_threaded_cert_verifier.cc index 1e61c48..8aa58a6c 100644 --- a/net/cert/multi_threaded_cert_verifier.cc +++ b/net/cert/multi_threaded_cert_verifier.cc
@@ -4,9 +4,9 @@ #include "net/cert/multi_threaded_cert_verifier.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/check_op.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/task/thread_pool.h"
diff --git a/net/cert/multi_threaded_cert_verifier_unittest.cc b/net/cert/multi_threaded_cert_verifier_unittest.cc index bf38709a..3a7351d 100644 --- a/net/cert/multi_threaded_cert_verifier_unittest.cc +++ b/net/cert/multi_threaded_cert_verifier_unittest.cc
@@ -6,10 +6,10 @@ #include <memory> -#include "base/bind.h" #include "base/debug/leak_annotations.h" #include "base/files/file_path.h" #include "base/format_macros.h" +#include "base/functional/bind.h" #include "net/base/net_errors.h" #include "net/base/test_completion_callback.h" #include "net/cert/cert_verify_proc.h"
diff --git a/net/cert/nss_cert_database.cc b/net/cert/nss_cert_database.cc index 45e213b89..fb122062 100644 --- a/net/cert/nss_cert_database.cc +++ b/net/cert/nss_cert_database.cc
@@ -14,8 +14,8 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/logging.h" #include "base/memory/raw_ptr.h" #include "base/observer_list_threadsafe.h"
diff --git a/net/cert/nss_cert_database.h b/net/cert/nss_cert_database.h index 9690881c..4884d9d 100644 --- a/net/cert/nss_cert_database.h +++ b/net/cert/nss_cert_database.h
@@ -11,7 +11,7 @@ #include <string> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h" #include "build/build_config.h"
diff --git a/net/cert/nss_cert_database_chromeos.cc b/net/cert/nss_cert_database_chromeos.cc index 5d7a0490..46e0df2 100644 --- a/net/cert/nss_cert_database_chromeos.cc +++ b/net/cert/nss_cert_database_chromeos.cc
@@ -11,9 +11,9 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/containers/cxx20_erase.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/location.h" #include "base/task/thread_pool.h" #include "base/threading/scoped_blocking_call.h"
diff --git a/net/cert/nss_cert_database_chromeos.h b/net/cert/nss_cert_database_chromeos.h index d060b2db..f4acd4c 100644 --- a/net/cert/nss_cert_database_chromeos.h +++ b/net/cert/nss_cert_database_chromeos.h
@@ -5,7 +5,7 @@ #ifndef NET_CERT_NSS_CERT_DATABASE_CHROMEOS_H_ #define NET_CERT_NSS_CERT_DATABASE_CHROMEOS_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "crypto/scoped_nss_types.h" #include "net/base/net_export.h"
diff --git a/net/cert/nss_cert_database_chromeos_unittest.cc b/net/cert/nss_cert_database_chromeos_unittest.cc index f3b26d1..29a7c65 100644 --- a/net/cert/nss_cert_database_chromeos_unittest.cc +++ b/net/cert/nss_cert_database_chromeos_unittest.cc
@@ -6,8 +6,8 @@ #include <memory> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/run_loop.h" #include "crypto/nss_util_internal.h" #include "crypto/scoped_test_nss_chromeos_user.h"
diff --git a/net/cert/nss_cert_database_unittest.cc b/net/cert/nss_cert_database_unittest.cc index 6808d3b7..dabe0aab 100644 --- a/net/cert/nss_cert_database_unittest.cc +++ b/net/cert/nss_cert_database_unittest.cc
@@ -13,9 +13,9 @@ #include <memory> #include <string> -#include "base/bind.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/lazy_instance.h" #include "base/run_loop.h" #include "base/strings/string_util.h"
diff --git a/net/cert/trial_comparison_cert_verifier.cc b/net/cert/trial_comparison_cert_verifier.cc index 47158ef7..f6853e91 100644 --- a/net/cert/trial_comparison_cert_verifier.cc +++ b/net/cert/trial_comparison_cert_verifier.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/memory/raw_ptr.h" #include "base/metrics/histogram_macros.h"
diff --git a/net/cert/trial_comparison_cert_verifier_unittest.cc b/net/cert/trial_comparison_cert_verifier_unittest.cc index 4560e8a0..a3d1b65 100644 --- a/net/cert/trial_comparison_cert_verifier_unittest.cc +++ b/net/cert/trial_comparison_cert_verifier_unittest.cc
@@ -8,7 +8,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/task/sequenced_task_runner.h" #include "base/test/bind.h"
diff --git a/net/cert_net/cert_net_fetcher_url_request.cc b/net/cert_net/cert_net_fetcher_url_request.cc index 6f3acf6e..4ca53ce 100644 --- a/net/cert_net/cert_net_fetcher_url_request.cc +++ b/net/cert_net/cert_net_fetcher_url_request.cc
@@ -62,9 +62,9 @@ #include <tuple> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/check_op.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h" #include "base/numerics/safe_math.h"
diff --git a/net/cert_net/cert_net_fetcher_url_request_unittest.cc b/net/cert_net/cert_net_fetcher_url_request_unittest.cc index ab38845..08406ecb 100644 --- a/net/cert_net/cert_net_fetcher_url_request_unittest.cc +++ b/net/cert_net/cert_net_fetcher_url_request_unittest.cc
@@ -8,7 +8,7 @@ #include <string> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/message_loop/message_pump_type.h" #include "base/run_loop.h"
diff --git a/net/cookies/cookie_access_delegate.cc b/net/cookies/cookie_access_delegate.cc index 0273e09..9811f94 100644 --- a/net/cookies/cookie_access_delegate.cc +++ b/net/cookies/cookie_access_delegate.cc
@@ -6,7 +6,7 @@ #include <set> -#include "base/callback.h" +#include "base/functional/callback.h" #include "net/base/schemeful_site.h" #include "net/cookies/cookie_partition_key.h" #include "net/first_party_sets/first_party_set_entry.h"
diff --git a/net/cookies/cookie_access_delegate.h b/net/cookies/cookie_access_delegate.h index 8121b55..ee8e3d0 100644 --- a/net/cookies/cookie_access_delegate.h +++ b/net/cookies/cookie_access_delegate.h
@@ -7,9 +7,9 @@ #include <set> -#include "base/callback_forward.h" #include "base/containers/flat_map.h" #include "base/containers/flat_set.h" +#include "base/functional/callback_forward.h" #include "net/base/net_export.h" #include "net/base/schemeful_site.h" #include "net/cookies/canonical_cookie.h"
diff --git a/net/cookies/cookie_change_dispatcher.h b/net/cookies/cookie_change_dispatcher.h index 32b56ad..62cfee9 100644 --- a/net/cookies/cookie_change_dispatcher.h +++ b/net/cookies/cookie_change_dispatcher.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "net/base/net_export.h" #include "net/cookies/canonical_cookie.h" #include "net/cookies/cookie_access_result.h"
diff --git a/net/cookies/cookie_monster.cc b/net/cookies/cookie_monster.cc index bb1018a..44f52e0c 100644 --- a/net/cookies/cookie_monster.cc +++ b/net/cookies/cookie_monster.cc
@@ -49,10 +49,10 @@ #include <set> #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/containers/flat_map.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/location.h" #include "base/logging.h" #include "base/metrics/field_trial.h"
diff --git a/net/cookies/cookie_monster.h b/net/cookies/cookie_monster.h index 77692a8..8a896a8 100644 --- a/net/cookies/cookie_monster.h +++ b/net/cookies/cookie_monster.h
@@ -16,9 +16,9 @@ #include <string> #include <vector> -#include "base/callback_forward.h" #include "base/containers/circular_deque.h" #include "base/containers/flat_map.h" +#include "base/functional/callback_forward.h" #include "base/gtest_prod_util.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h"
diff --git a/net/cookies/cookie_monster_change_dispatcher.cc b/net/cookies/cookie_monster_change_dispatcher.cc index 4a2414d..e1eb9d0f 100644 --- a/net/cookies/cookie_monster_change_dispatcher.cc +++ b/net/cookies/cookie_monster_change_dispatcher.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/string_piece.h" #include "base/task/single_thread_task_runner.h" #include "base/task/task_runner.h"
diff --git a/net/cookies/cookie_monster_change_dispatcher.h b/net/cookies/cookie_monster_change_dispatcher.h index c57a141..dd022ad 100644 --- a/net/cookies/cookie_monster_change_dispatcher.h +++ b/net/cookies/cookie_monster_change_dispatcher.h
@@ -9,9 +9,9 @@ #include <memory> #include <string> -#include "base/callback.h" #include "base/callback_list.h" #include "base/containers/linked_list.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h"
diff --git a/net/cookies/cookie_monster_perftest.cc b/net/cookies/cookie_monster_perftest.cc index 04caef13..0323f3d 100644 --- a/net/cookies/cookie_monster_perftest.cc +++ b/net/cookies/cookie_monster_perftest.cc
@@ -5,7 +5,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ref_counted.h" #include "base/run_loop.h" #include "base/strings/string_util.h"
diff --git a/net/cookies/cookie_monster_store_test.cc b/net/cookies/cookie_monster_store_test.cc index d0944f8..f9894b74 100644 --- a/net/cookies/cookie_monster_store_test.cc +++ b/net/cookies/cookie_monster_store_test.cc
@@ -4,7 +4,7 @@ #include "net/cookies/cookie_monster_store_test.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/strings/stringprintf.h" #include "base/task/single_thread_task_runner.h"
diff --git a/net/cookies/cookie_monster_unittest.cc b/net/cookies/cookie_monster_unittest.cc index e62271f..2ed272a4 100644 --- a/net/cookies/cookie_monster_unittest.cc +++ b/net/cookies/cookie_monster_unittest.cc
@@ -12,10 +12,10 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/containers/queue.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h"
diff --git a/net/cookies/cookie_partition_key_collection.cc b/net/cookies/cookie_partition_key_collection.cc index feebe03..646c30763 100644 --- a/net/cookies/cookie_partition_key_collection.cc +++ b/net/cookies/cookie_partition_key_collection.cc
@@ -6,11 +6,11 @@ #include <vector> -#include "base/bind.h" -#include "base/callback.h" #include "base/containers/contains.h" #include "base/containers/flat_map.h" #include "base/containers/flat_set.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "net/base/schemeful_site.h" #include "net/cookies/cookie_access_delegate.h" #include "net/cookies/cookie_partition_key.h"
diff --git a/net/cookies/cookie_partition_key_collection.h b/net/cookies/cookie_partition_key_collection.h index 1396b8c5..eac9659 100644 --- a/net/cookies/cookie_partition_key_collection.h +++ b/net/cookies/cookie_partition_key_collection.h
@@ -5,8 +5,8 @@ #ifndef NET_COOKIES_COOKIE_PARTITION_KEY_COLLECTION_H_ #define NET_COOKIES_COOKIE_PARTITION_KEY_COLLECTION_H_ -#include "base/callback_forward.h" #include "base/containers/flat_set.h" +#include "base/functional/callback_forward.h" #include "net/base/net_export.h" #include "net/cookies/cookie_partition_key.h"
diff --git a/net/cookies/cookie_store.cc b/net/cookies/cookie_store.cc index 9e87ef6..8b73d3f 100644 --- a/net/cookies/cookie_store.cc +++ b/net/cookies/cookie_store.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" namespace net {
diff --git a/net/cookies/cookie_store.h b/net/cookies/cookie_store.h index f6df78d..61fd008 100644 --- a/net/cookies/cookie_store.h +++ b/net/cookies/cookie_store.h
@@ -13,7 +13,7 @@ #include <string> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "net/base/net_export.h" #include "net/cookies/canonical_cookie.h" #include "net/cookies/cookie_access_delegate.h"
diff --git a/net/cookies/cookie_store_change_unittest.h b/net/cookies/cookie_store_change_unittest.h index 0adbdad5..08b0d064 100644 --- a/net/cookies/cookie_store_change_unittest.h +++ b/net/cookies/cookie_store_change_unittest.h
@@ -5,7 +5,7 @@ #ifndef NET_COOKIES_COOKIE_STORE_CHANGE_UNITTEST_H_ #define NET_COOKIES_COOKIE_STORE_CHANGE_UNITTEST_H_ -#include "base/bind.h" +#include "base/functional/bind.h" #include "net/cookies/canonical_cookie.h" #include "net/cookies/cookie_change_dispatcher_test_helpers.h" #include "net/cookies/cookie_constants.h"
diff --git a/net/cookies/cookie_store_test_callbacks.h b/net/cookies/cookie_store_test_callbacks.h index 3b3b685..eb93baea 100644 --- a/net/cookies/cookie_store_test_callbacks.h +++ b/net/cookies/cookie_store_test_callbacks.h
@@ -7,7 +7,7 @@ #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h" #include "base/run_loop.h"
diff --git a/net/cookies/cookie_store_test_helpers.cc b/net/cookies/cookie_store_test_helpers.cc index 5f67016..3dd89d4 100644 --- a/net/cookies/cookie_store_test_helpers.cc +++ b/net/cookies/cookie_store_test_helpers.cc
@@ -7,7 +7,7 @@ #include <string> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/strings/string_util.h" #include "base/task/single_thread_task_runner.h"
diff --git a/net/cookies/cookie_store_test_helpers.h b/net/cookies/cookie_store_test_helpers.h index 5b0da7f..ea91b1a 100644 --- a/net/cookies/cookie_store_test_helpers.h +++ b/net/cookies/cookie_store_test_helpers.h
@@ -11,7 +11,7 @@ #include <string> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/synchronization/lock.h" #include "net/cookies/cookie_change_dispatcher.h" #include "net/log/net_log_with_source.h"
diff --git a/net/cookies/cookie_store_unittest.h b/net/cookies/cookie_store_unittest.h index 96f8dbe6..8469ca6 100644 --- a/net/cookies/cookie_store_unittest.h +++ b/net/cookies/cookie_store_unittest.h
@@ -13,7 +13,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/string_tokenizer.h" #include "base/task/current_thread.h" #include "base/task/single_thread_task_runner.h"
diff --git a/net/cookies/cookie_util.cc b/net/cookies/cookie_util.cc index 91a8d2d..1d6de05 100644 --- a/net/cookies/cookie_util.cc +++ b/net/cookies/cookie_util.cc
@@ -9,10 +9,10 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/check.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/metrics/histogram_functions.h" #include "base/metrics/histogram_macros.h" #include "base/notreached.h"
diff --git a/net/cookies/cookie_util.h b/net/cookies/cookie_util.h index 30e3c4c..b78cda5 100644 --- a/net/cookies/cookie_util.h +++ b/net/cookies/cookie_util.h
@@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/time/time.h" #include "net/base/net_export.h" #include "net/cookies/canonical_cookie.h"
diff --git a/net/cookies/cookie_util_unittest.cc b/net/cookies/cookie_util_unittest.cc index 0e89f76..564021b 100644 --- a/net/cookies/cookie_util_unittest.cc +++ b/net/cookies/cookie_util_unittest.cc
@@ -8,8 +8,8 @@ #include <utility> #include <vector> -#include "base/callback.h" #include "base/containers/contains.h" +#include "base/functional/callback.h" #include "base/strings/strcat.h" #include "base/strings/string_split.h" #include "base/test/bind.h"
diff --git a/net/cookies/test_cookie_access_delegate.cc b/net/cookies/test_cookie_access_delegate.cc index 9a81021..12556f4 100644 --- a/net/cookies/test_cookie_access_delegate.cc +++ b/net/cookies/test_cookie_access_delegate.cc
@@ -8,10 +8,10 @@ #include <utility> #include <vector> -#include "base/callback.h" #include "base/containers/contains.h" #include "base/containers/flat_map.h" #include "base/containers/flat_set.h" +#include "base/functional/callback.h" #include "base/ranges/algorithm.h" #include "base/task/sequenced_task_runner.h" #include "base/task/thread_pool.h"
diff --git a/net/cookies/test_cookie_access_delegate.h b/net/cookies/test_cookie_access_delegate.h index ba78192e..211d809 100644 --- a/net/cookies/test_cookie_access_delegate.h +++ b/net/cookies/test_cookie_access_delegate.h
@@ -9,9 +9,9 @@ #include <set> #include <string> -#include "base/callback_forward.h" #include "base/containers/flat_map.h" #include "base/containers/flat_set.h" +#include "base/functional/callback_forward.h" #include "net/base/schemeful_site.h" #include "net/cookies/cookie_access_delegate.h" #include "net/cookies/cookie_constants.h"
diff --git a/net/disk_cache/backend_cleanup_tracker.cc b/net/disk_cache/backend_cleanup_tracker.cc index 0a1dfb1..4c4701438 100644 --- a/net/disk_cache/backend_cleanup_tracker.cc +++ b/net/disk_cache/backend_cleanup_tracker.cc
@@ -10,8 +10,8 @@ #include <unordered_map> #include <utility> -#include "base/callback.h" #include "base/files/file_path.h" +#include "base/functional/callback.h" #include "base/lazy_instance.h" #include "base/memory/ref_counted.h" #include "base/synchronization/lock.h"
diff --git a/net/disk_cache/backend_cleanup_tracker.h b/net/disk_cache/backend_cleanup_tracker.h index 8fe6fa1..6db5624 100644 --- a/net/disk_cache/backend_cleanup_tracker.h +++ b/net/disk_cache/backend_cleanup_tracker.h
@@ -8,8 +8,8 @@ #include <utility> #include <vector> -#include "base/callback.h" #include "base/files/file_path.h" +#include "base/functional/callback.h" #include "base/memory/ref_counted.h" #include "base/sequence_checker.h" #include "net/base/net_export.h"
diff --git a/net/disk_cache/backend_cleanup_tracker_unittest.cc b/net/disk_cache/backend_cleanup_tracker_unittest.cc index 7c0191a2..6451ba3 100644 --- a/net/disk_cache/backend_cleanup_tracker_unittest.cc +++ b/net/disk_cache/backend_cleanup_tracker_unittest.cc
@@ -4,9 +4,9 @@ #include "net/disk_cache/backend_cleanup_tracker.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/ref_counted.h" #include "net/test/test_with_task_environment.h" #include "testing/gmock/include/gmock/gmock.h"
diff --git a/net/disk_cache/backend_unittest.cc b/net/disk_cache/backend_unittest.cc index 012f907..1eeb99a 100644 --- a/net/disk_cache/backend_unittest.cc +++ b/net/disk_cache/backend_unittest.cc
@@ -6,11 +6,11 @@ #include <memory> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/files/file.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/memory/memory_pressure_listener.h" #include "base/memory/raw_ptr.h" #include "base/metrics/field_trial.h"
diff --git a/net/disk_cache/blockfile/backend_impl.cc b/net/disk_cache/blockfile/backend_impl.cc index a3b732a7..ca0a83b 100644 --- a/net/disk_cache/blockfile/backend_impl.cc +++ b/net/disk_cache/blockfile/backend_impl.cc
@@ -8,11 +8,11 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/files/file.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/hash/hash.h" #include "base/lazy_instance.h" #include "base/location.h"
diff --git a/net/disk_cache/blockfile/eviction.cc b/net/disk_cache/blockfile/eviction.cc index 82e2051f..f8251c2 100644 --- a/net/disk_cache/blockfile/eviction.cc +++ b/net/disk_cache/blockfile/eviction.cc
@@ -32,9 +32,9 @@ #include <limits> -#include "base/bind.h" #include "base/check_op.h" #include "base/compiler_specific.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/metrics/histogram_macros.h" #include "base/notreached.h"
diff --git a/net/disk_cache/blockfile/file_ios.cc b/net/disk_cache/blockfile/file_ios.cc index 12403b8..e8cd315 100644 --- a/net/disk_cache/blockfile/file_ios.cc +++ b/net/disk_cache/blockfile/file_ios.cc
@@ -10,8 +10,8 @@ #include <limits> #include <utility> -#include "base/bind.h" #include "base/check.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/task/thread_pool.h" #include "net/base/net_errors.h"
diff --git a/net/disk_cache/blockfile/file_posix.cc b/net/disk_cache/blockfile/file_posix.cc index 6c78ca0a..cccb7127 100644 --- a/net/disk_cache/blockfile/file_posix.cc +++ b/net/disk_cache/blockfile/file_posix.cc
@@ -8,8 +8,8 @@ #include <limits> #include <utility> -#include "base/bind.h" #include "base/check.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/run_loop.h" #include "base/task/thread_pool.h"
diff --git a/net/disk_cache/blockfile/in_flight_backend_io.cc b/net/disk_cache/blockfile/in_flight_backend_io.cc index ceebe54..22abcfb0 100644 --- a/net/disk_cache/blockfile/in_flight_backend_io.cc +++ b/net/disk_cache/blockfile/in_flight_backend_io.cc
@@ -6,10 +6,10 @@ #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/check_op.h" #include "base/compiler_specific.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/notreached.h" #include "base/task/single_thread_task_runner.h"
diff --git a/net/disk_cache/blockfile/in_flight_io.cc b/net/disk_cache/blockfile/in_flight_io.cc index 5503af0..9c09f13 100644 --- a/net/disk_cache/blockfile/in_flight_io.cc +++ b/net/disk_cache/blockfile/in_flight_io.cc
@@ -4,7 +4,7 @@ #include "net/disk_cache/blockfile/in_flight_io.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/synchronization/waitable_event.h" #include "base/task/sequenced_task_runner.h"
diff --git a/net/disk_cache/blockfile/sparse_control.cc b/net/disk_cache/blockfile/sparse_control.cc index 3010a74..4031e7db 100644 --- a/net/disk_cache/blockfile/sparse_control.cc +++ b/net/disk_cache/blockfile/sparse_control.cc
@@ -6,8 +6,8 @@ #include <stdint.h> -#include "base/bind.h" #include "base/format_macros.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/logging.h" #include "base/numerics/checked_math.h"
diff --git a/net/disk_cache/cache_util.cc b/net/disk_cache/cache_util.cc index a4bebc13..e9c87fc 100644 --- a/net/disk_cache/cache_util.cc +++ b/net/disk_cache/cache_util.cc
@@ -6,11 +6,11 @@ #include <limits> -#include "base/bind.h" #include "base/files/file_enumerator.h" #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/files/safe_base_name.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/metrics/field_trial_params.h" #include "base/numerics/clamped_math.h"
diff --git a/net/disk_cache/cache_util.h b/net/disk_cache/cache_util.h index 22da274..db71eab 100644 --- a/net/disk_cache/cache_util.h +++ b/net/disk_cache/cache_util.h
@@ -7,8 +7,8 @@ #include <stdint.h> -#include "base/callback_forward.h" #include "base/feature_list.h" +#include "base/functional/callback_forward.h" #include "net/base/net_export.h" #include "net/disk_cache/disk_cache.h"
diff --git a/net/disk_cache/disk_cache.cc b/net/disk_cache/disk_cache.cc index 4dbb184..46136cc0 100644 --- a/net/disk_cache/disk_cache.cc +++ b/net/disk_cache/disk_cache.cc
@@ -5,10 +5,10 @@ #include <utility> #include "base/barrier_closure.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/metrics/field_trial.h" #include "base/task/bind_post_task.h"
diff --git a/net/disk_cache/disk_cache_fuzzer.cc b/net/disk_cache/disk_cache_fuzzer.cc index 2487a37..862780e 100644 --- a/net/disk_cache/disk_cache_fuzzer.cc +++ b/net/disk_cache/disk_cache_fuzzer.cc
@@ -10,11 +10,11 @@ #include <string> #include "base/at_exit.h" -#include "base/callback.h" #include "base/command_line.h" #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/callback.h" #include "base/logging.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_refptr.h"
diff --git a/net/disk_cache/disk_cache_perftest.cc b/net/disk_cache/disk_cache_perftest.cc index be0bec39..eff5e46 100644 --- a/net/disk_cache/disk_cache_perftest.cc +++ b/net/disk_cache/disk_cache_perftest.cc
@@ -7,9 +7,9 @@ #include <string> #include "base/barrier_closure.h" -#include "base/bind.h" #include "base/files/file_enumerator.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/hash/hash.h" #include "base/memory/raw_ptr.h" #include "base/process/process_metrics.h"
diff --git a/net/disk_cache/disk_cache_test_base.cc b/net/disk_cache/disk_cache_test_base.cc index 5b7b7c5..4867ea15 100644 --- a/net/disk_cache/disk_cache_test_base.cc +++ b/net/disk_cache/disk_cache_test_base.cc
@@ -7,8 +7,8 @@ #include <memory> #include <utility> -#include "base/bind.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/path_service.h" #include "base/run_loop.h" #include "base/task/single_thread_task_runner.h"
diff --git a/net/disk_cache/entry_unittest.cc b/net/disk_cache/entry_unittest.cc index 284eacb..edcbc58b 100644 --- a/net/disk_cache/entry_unittest.cc +++ b/net/disk_cache/entry_unittest.cc
@@ -4,10 +4,10 @@ #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/files/file.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/metrics/field_trial.h" #include "base/metrics/field_trial_param_associator.h" #include "base/run_loop.h"
diff --git a/net/disk_cache/memory/mem_backend_impl.cc b/net/disk_cache/memory/mem_backend_impl.cc index 1a73699..4c31ae18 100644 --- a/net/disk_cache/memory/mem_backend_impl.cc +++ b/net/disk_cache/memory/mem_backend_impl.cc
@@ -9,7 +9,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/system/sys_info.h" #include "base/task/sequenced_task_runner.h"
diff --git a/net/disk_cache/memory/mem_backend_impl.h b/net/disk_cache/memory/mem_backend_impl.h index 28db7b99..bfd0762 100644 --- a/net/disk_cache/memory/mem_backend_impl.h +++ b/net/disk_cache/memory/mem_backend_impl.h
@@ -12,9 +12,9 @@ #include <string> #include <unordered_map> -#include "base/callback_forward.h" #include "base/compiler_specific.h" #include "base/containers/linked_list.h" +#include "base/functional/callback_forward.h" #include "base/memory/memory_pressure_listener.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h"
diff --git a/net/disk_cache/memory/mem_entry_impl.cc b/net/disk_cache/memory/mem_entry_impl.cc index 923ffdf..e62ed1b 100644 --- a/net/disk_cache/memory/mem_entry_impl.cc +++ b/net/disk_cache/memory/mem_entry_impl.cc
@@ -8,9 +8,9 @@ #include <memory> #include <utility> -#include "base/bind.h" #include "base/check_op.h" #include "base/format_macros.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_macros.h" #include "base/numerics/safe_math.h" #include "base/strings/stringprintf.h"
diff --git a/net/disk_cache/simple/post_doom_waiter.cc b/net/disk_cache/simple/post_doom_waiter.cc index 8d508c586..aab714fa 100644 --- a/net/disk_cache/simple/post_doom_waiter.cc +++ b/net/disk_cache/simple/post_doom_waiter.cc
@@ -4,9 +4,9 @@ #include "net/disk_cache/simple/post_doom_waiter.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/check_op.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "net/disk_cache/simple/simple_histogram_macros.h" namespace disk_cache {
diff --git a/net/disk_cache/simple/post_doom_waiter.h b/net/disk_cache/simple/post_doom_waiter.h index 9a03932..c15a147 100644 --- a/net/disk_cache/simple/post_doom_waiter.h +++ b/net/disk_cache/simple/post_doom_waiter.h
@@ -10,7 +10,7 @@ #include <unordered_map> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/ref_counted.h" #include "net/base/cache_type.h"
diff --git a/net/disk_cache/simple/simple_backend_impl.cc b/net/disk_cache/simple/simple_backend_impl.cc index ee51e6e..ab3b277 100644 --- a/net/disk_cache/simple/simple_backend_impl.cc +++ b/net/disk_cache/simple/simple_backend_impl.cc
@@ -9,7 +9,7 @@ #include <functional> #include <limits> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/task/sequenced_task_runner.h" #include "base/task/thread_pool.h" #include "build/build_config.h" @@ -18,9 +18,9 @@ #include <sys/resource.h> #endif -#include "base/bind.h" -#include "base/callback.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/lazy_instance.h" #include "base/location.h" #include "base/memory/ptr_util.h"
diff --git a/net/disk_cache/simple/simple_backend_impl.h b/net/disk_cache/simple/simple_backend_impl.h index 6533d70..d07a36c 100644 --- a/net/disk_cache/simple/simple_backend_impl.h +++ b/net/disk_cache/simple/simple_backend_impl.h
@@ -13,9 +13,9 @@ #include <utility> #include <vector> -#include "base/callback_forward.h" #include "base/compiler_specific.h" #include "base/files/file_path.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h"
diff --git a/net/disk_cache/simple/simple_entry_impl.cc b/net/disk_cache/simple/simple_entry_impl.cc index 3f48be8..a390c17 100644 --- a/net/disk_cache/simple/simple_entry_impl.cc +++ b/net/disk_cache/simple/simple_entry_impl.cc
@@ -10,11 +10,11 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/check_op.h" #include "base/cxx17_backports.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/memory/raw_ptr.h" #include "base/notreached.h"
diff --git a/net/disk_cache/simple/simple_index.cc b/net/disk_cache/simple/simple_index.cc index 9a4d400e..28a5677 100644 --- a/net/disk_cache/simple/simple_index.cc +++ b/net/disk_cache/simple/simple_index.cc
@@ -9,9 +9,9 @@ #include <string> #include <utility> -#include "base/bind.h" #include "base/check_op.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/numerics/safe_conversions.h" #include "base/pickle.h" #include "base/strings/string_number_conversions.h"
diff --git a/net/disk_cache/simple/simple_index.h b/net/disk_cache/simple/simple_index.h index d513929..5d50271 100644 --- a/net/disk_cache/simple/simple_index.h +++ b/net/disk_cache/simple/simple_index.h
@@ -13,7 +13,7 @@ #include <unordered_set> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/gtest_prod_util.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h"
diff --git a/net/disk_cache/simple/simple_index_file.cc b/net/disk_cache/simple/simple_index_file.cc index 4dd24d04..0b51f1dc 100644 --- a/net/disk_cache/simple/simple_index_file.cc +++ b/net/disk_cache/simple/simple_index_file.cc
@@ -7,9 +7,9 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/files/file.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/numerics/safe_conversions.h" #include "base/pickle.h"
diff --git a/net/disk_cache/simple/simple_index_file_unittest.cc b/net/disk_cache/simple/simple_index_file_unittest.cc index 8c0c844..aaaa8bc 100644 --- a/net/disk_cache/simple/simple_index_file_unittest.cc +++ b/net/disk_cache/simple/simple_index_file_unittest.cc
@@ -6,11 +6,11 @@ #include <memory> -#include "base/callback.h" #include "base/check.h" #include "base/files/file.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/callback.h" #include "base/hash/hash.h" #include "base/location.h" #include "base/pickle.h"
diff --git a/net/disk_cache/simple/simple_index_unittest.cc b/net/disk_cache/simple/simple_index_unittest.cc index 6fc3e542..03d744c8 100644 --- a/net/disk_cache/simple/simple_index_unittest.cc +++ b/net/disk_cache/simple/simple_index_unittest.cc
@@ -9,8 +9,8 @@ #include <memory> #include <utility> -#include "base/bind.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" #include "base/hash/hash.h" #include "base/memory/raw_ptr.h" #include "base/pickle.h"
diff --git a/net/disk_cache/simple/simple_net_log_parameters.cc b/net/disk_cache/simple/simple_net_log_parameters.cc index e146d13..6e31ac6e 100644 --- a/net/disk_cache/simple/simple_net_log_parameters.cc +++ b/net/disk_cache/simple/simple_net_log_parameters.cc
@@ -6,10 +6,10 @@ #include <utility> -#include "base/bind.h" #include "base/check.h" #include "base/compiler_specific.h" #include "base/format_macros.h" +#include "base/functional/bind.h" #include "base/strings/stringprintf.h" #include "base/values.h" #include "net/base/net_errors.h"
diff --git a/net/disk_cache/simple/simple_test_util.h b/net/disk_cache/simple/simple_test_util.h index c1d7f9b..bbe1264 100644 --- a/net/disk_cache/simple/simple_test_util.h +++ b/net/disk_cache/simple/simple_test_util.h
@@ -9,7 +9,7 @@ #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" namespace base { class FilePath;
diff --git a/net/dns/address_sorter.h b/net/dns/address_sorter.h index cb7872e..209e07e 100644 --- a/net/dns/address_sorter.h +++ b/net/dns/address_sorter.h
@@ -8,7 +8,7 @@ #include <memory> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "net/base/ip_endpoint.h" #include "net/base/net_export.h"
diff --git a/net/dns/address_sorter_posix_unittest.cc b/net/dns/address_sorter_posix_unittest.cc index 9353e39..a4383aef 100644 --- a/net/dns/address_sorter_posix_unittest.cc +++ b/net/dns/address_sorter_posix_unittest.cc
@@ -8,8 +8,8 @@ #include <string> #include <vector> -#include "base/bind.h" #include "base/check_op.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/notreached.h" #include "base/task/single_thread_task_runner.h"
diff --git a/net/dns/address_sorter_unittest.cc b/net/dns/address_sorter_unittest.cc index bacea6f..b9b8edf 100644 --- a/net/dns/address_sorter_unittest.cc +++ b/net/dns/address_sorter_unittest.cc
@@ -13,8 +13,8 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/check.h" +#include "base/functional/bind.h" #include "base/test/task_environment.h" #include "net/base/completion_once_callback.h" #include "net/base/ip_address.h"
diff --git a/net/dns/address_sorter_win.cc b/net/dns/address_sorter_win.cc index a8cfe28..273710b 100644 --- a/net/dns/address_sorter_win.cc +++ b/net/dns/address_sorter_win.cc
@@ -10,7 +10,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/logging.h" #include "base/memory/free_deleter.h"
diff --git a/net/dns/context_host_resolver_unittest.cc b/net/dns/context_host_resolver_unittest.cc index a275841..3ca952a 100644 --- a/net/dns/context_host_resolver_unittest.cc +++ b/net/dns/context_host_resolver_unittest.cc
@@ -7,8 +7,8 @@ #include <memory> #include <utility> -#include "base/bind.h" #include "base/containers/fixed_flat_map.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/test/scoped_feature_list.h"
diff --git a/net/dns/dns_client.cc b/net/dns/dns_client.cc index c5c0b7c..d8e9ca7 100644 --- a/net/dns/dns_client.cc +++ b/net/dns/dns_client.cc
@@ -8,7 +8,7 @@ #include <string> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/metrics/histogram_macros.h" #include "base/rand_util.h"
diff --git a/net/dns/dns_client_unittest.cc b/net/dns/dns_client_unittest.cc index 7665745..6d9dcd3 100644 --- a/net/dns/dns_client_unittest.cc +++ b/net/dns/dns_client_unittest.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/rand_util.h" #include "base/test/task_environment.h" #include "net/base/ip_address.h"
diff --git a/net/dns/dns_config_service.cc b/net/dns/dns_config_service.cc index 02e0a458..86b93656 100644 --- a/net/dns/dns_config_service.cc +++ b/net/dns/dns_config_service.cc
@@ -7,9 +7,9 @@ #include <memory> #include <string> -#include "base/bind.h" #include "base/check_op.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/logging.h" #include "base/notreached.h"
diff --git a/net/dns/dns_config_service_android.cc b/net/dns/dns_config_service_android.cc index 70605d8..1aed074e 100644 --- a/net/dns/dns_config_service_android.cc +++ b/net/dns/dns_config_service_android.cc
@@ -11,8 +11,8 @@ #include <utility> #include "base/android/build_info.h" -#include "base/bind.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/memory/raw_ptr.h" #include "base/sequence_checker.h"
diff --git a/net/dns/dns_config_service_android_unittest.cc b/net/dns/dns_config_service_android_unittest.cc index b079f40..7792a4b6 100644 --- a/net/dns/dns_config_service_android_unittest.cc +++ b/net/dns/dns_config_service_android_unittest.cc
@@ -10,7 +10,7 @@ #include <vector> #include "base/android/build_info.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_refptr.h" #include "base/test/task_environment.h"
diff --git a/net/dns/dns_config_service_linux.cc b/net/dns/dns_config_service_linux.cc index ea74a2d3..5273da51 100644 --- a/net/dns/dns_config_service_linux.cc +++ b/net/dns/dns_config_service_linux.cc
@@ -17,11 +17,11 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback.h" #include "base/check.h" #include "base/files/file_path.h" #include "base/files/file_path_watcher.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/location.h" #include "base/logging.h" #include "base/memory/raw_ptr.h"
diff --git a/net/dns/dns_config_service_linux_unittest.cc b/net/dns/dns_config_service_linux_unittest.cc index 150d22da..1555f2ab 100644 --- a/net/dns/dns_config_service_linux_unittest.cc +++ b/net/dns/dns_config_service_linux_unittest.cc
@@ -11,10 +11,10 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/cancelable_callback.h" #include "base/check.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h" #include "base/run_loop.h"
diff --git a/net/dns/dns_config_service_posix.cc b/net/dns/dns_config_service_posix.cc index a8a223d..a93e7cd 100644 --- a/net/dns/dns_config_service_posix.cc +++ b/net/dns/dns_config_service_posix.cc
@@ -9,10 +9,10 @@ #include <type_traits> #include <utility> -#include "base/bind.h" #include "base/files/file.h" #include "base/files/file_path.h" #include "base/files/file_path_watcher.h" +#include "base/functional/bind.h" #include "base/lazy_instance.h" #include "base/location.h" #include "base/logging.h"
diff --git a/net/dns/dns_config_service_posix_unittest.cc b/net/dns/dns_config_service_posix_unittest.cc index dc37587..1257b73 100644 --- a/net/dns/dns_config_service_posix_unittest.cc +++ b/net/dns/dns_config_service_posix_unittest.cc
@@ -8,9 +8,9 @@ #include <memory> -#include "base/bind.h" #include "base/cancelable_callback.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/sys_byteorder.h" #include "base/task/sequenced_task_runner.h"
diff --git a/net/dns/dns_config_service_unittest.cc b/net/dns/dns_config_service_unittest.cc index 6b926d8..246e7de2 100644 --- a/net/dns/dns_config_service_unittest.cc +++ b/net/dns/dns_config_service_unittest.cc
@@ -8,8 +8,8 @@ #include <string> #include <utility> -#include "base/bind.h" #include "base/cancelable_callback.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h"
diff --git a/net/dns/dns_config_service_win.cc b/net/dns/dns_config_service_win.cc index 1e0ed41..b0736a6 100644 --- a/net/dns/dns_config_service_win.cc +++ b/net/dns/dns_config_service_win.cc
@@ -10,11 +10,11 @@ #include <set> #include <string> -#include "base/bind.h" -#include "base/callback.h" #include "base/compiler_specific.h" #include "base/files/file_path.h" #include "base/files/file_path_watcher.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/location.h" #include "base/logging.h" #include "base/memory/free_deleter.h"
diff --git a/net/dns/dns_config_watcher_mac.h b/net/dns/dns_config_watcher_mac.h index 9d1fbe6..1dd72cc 100644 --- a/net/dns/dns_config_watcher_mac.h +++ b/net/dns/dns_config_watcher_mac.h
@@ -5,7 +5,7 @@ #ifndef NET_DNS_DNS_CONFIG_WATCHER_MAC_H_ #define NET_DNS_DNS_CONFIG_WATCHER_MAC_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "net/dns/notify_watcher_mac.h" namespace net::internal {
diff --git a/net/dns/dns_session.cc b/net/dns/dns_session.cc index 34ab08f..3516858 100644 --- a/net/dns/dns_session.cc +++ b/net/dns/dns_session.cc
@@ -9,7 +9,7 @@ #include <limits> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/rand_util.h" #include "net/dns/dns_config.h" #include "net/log/net_log.h"
diff --git a/net/dns/dns_test_util.cc b/net/dns/dns_test_util.cc index a1ef1d7..91afaf30f 100644 --- a/net/dns/dns_test_util.cc +++ b/net/dns/dns_test_util.cc
@@ -10,8 +10,8 @@ #include <vector> #include "base/big_endian.h" -#include "base/bind.h" #include "base/check.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/numerics/safe_conversions.h" #include "base/ranges/algorithm.h"
diff --git a/net/dns/dns_transaction.cc b/net/dns/dns_transaction.cc index 14efacc..1ba2317 100644 --- a/net/dns/dns_transaction.cc +++ b/net/dns/dns_transaction.cc
@@ -14,10 +14,10 @@ #include "base/base64url.h" #include "base/big_endian.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/containers/circular_deque.h" #include "base/containers/span.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h"
diff --git a/net/dns/dns_transaction.h b/net/dns/dns_transaction.h index c388ff8..470e5cf 100644 --- a/net/dns/dns_transaction.h +++ b/net/dns/dns_transaction.h
@@ -10,7 +10,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "base/strings/string_piece.h" #include "base/time/time.h"
diff --git a/net/dns/dns_transaction_unittest.cc b/net/dns/dns_transaction_unittest.cc index 4c98706..696f6ff 100644 --- a/net/dns/dns_transaction_unittest.cc +++ b/net/dns/dns_transaction_unittest.cc
@@ -12,8 +12,8 @@ #include <vector> #include "base/base64url.h" -#include "base/bind.h" #include "base/containers/circular_deque.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/numerics/safe_math.h" #include "base/rand_util.h"
diff --git a/net/dns/fuzzed_host_resolver_util.cc b/net/dns/fuzzed_host_resolver_util.cc index 22abd6dc..f78cfbc6 100644 --- a/net/dns/fuzzed_host_resolver_util.cc +++ b/net/dns/fuzzed_host_resolver_util.cc
@@ -14,8 +14,8 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/check.h" +#include "base/functional/bind.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "base/notreached.h"
diff --git a/net/dns/host_cache.cc b/net/dns/host_cache.cc index c3aaf7d..82a98cf 100644 --- a/net/dns/host_cache.cc +++ b/net/dns/host_cache.cc
@@ -15,8 +15,8 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/check_op.h" +#include "base/functional/bind.h" #include "base/metrics/field_trial.h" #include "base/metrics/histogram_macros.h" #include "base/numerics/safe_conversions.h"
diff --git a/net/dns/host_cache_unittest.cc b/net/dns/host_cache_unittest.cc index 1b15ed0..a68b326 100644 --- a/net/dns/host_cache_unittest.cc +++ b/net/dns/host_cache_unittest.cc
@@ -11,10 +11,10 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/format_macros.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/json/json_reader.h" #include "base/json/json_writer.h" #include "base/strings/strcat.h"
diff --git a/net/dns/host_resolver.cc b/net/dns/host_resolver.cc index c554a1cf..992810e 100644 --- a/net/dns/host_resolver.cc +++ b/net/dns/host_resolver.cc
@@ -9,8 +9,8 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/check.h" +#include "base/functional/bind.h" #include "base/no_destructor.h" #include "base/notreached.h" #include "base/ranges/algorithm.h"
diff --git a/net/dns/host_resolver_manager.cc b/net/dns/host_resolver_manager.cc index 9f4a1ab..c6bac4a 100644 --- a/net/dns/host_resolver_manager.cc +++ b/net/dns/host_resolver_manager.cc
@@ -17,9 +17,6 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/check_op.h" #include "base/compiler_specific.h" #include "base/containers/circular_deque.h" @@ -29,6 +26,9 @@ #include "base/containers/linked_list.h" #include "base/debug/debugger.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/functional/identity.h" #include "base/logging.h" #include "base/memory/ptr_util.h"
diff --git a/net/dns/host_resolver_manager.h b/net/dns/host_resolver_manager.h index 5f3f238c..1457a742 100644 --- a/net/dns/host_resolver_manager.h +++ b/net/dns/host_resolver_manager.h
@@ -15,8 +15,8 @@ #include <string> #include <vector> -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h"
diff --git a/net/dns/host_resolver_manager_fuzzer.cc b/net/dns/host_resolver_manager_fuzzer.cc index 061d7c707..ca2cb096 100644 --- a/net/dns/host_resolver_manager_fuzzer.cc +++ b/net/dns/host_resolver_manager_fuzzer.cc
@@ -11,8 +11,8 @@ #include <memory> #include <vector> -#include "base/bind.h" #include "base/check_op.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/task/sequenced_task_runner.h" #include "base/test/task_environment.h"
diff --git a/net/dns/host_resolver_manager_unittest.cc b/net/dns/host_resolver_manager_unittest.cc index 5dbe9fd..d6f1a78 100644 --- a/net/dns/host_resolver_manager_unittest.cc +++ b/net/dns/host_resolver_manager_unittest.cc
@@ -12,9 +12,9 @@ #include <vector> #include "base/auto_reset.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h"
diff --git a/net/dns/host_resolver_mdns_task.cc b/net/dns/host_resolver_mdns_task.cc index 58d2b03..9958faa 100644 --- a/net/dns/host_resolver_mdns_task.cc +++ b/net/dns/host_resolver_mdns_task.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" #include "base/check_op.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/memory/raw_ptr.h" #include "base/notreached.h"
diff --git a/net/dns/host_resolver_mdns_task.h b/net/dns/host_resolver_mdns_task.h index a5c5a07..19c208db 100644 --- a/net/dns/host_resolver_mdns_task.h +++ b/net/dns/host_resolver_mdns_task.h
@@ -9,8 +9,8 @@ #include <string> #include <vector> -#include "base/callback_forward.h" #include "base/containers/unique_ptr_adapters.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/sequence_checker.h"
diff --git a/net/dns/host_resolver_nat64_task.cc b/net/dns/host_resolver_nat64_task.cc index 2d957e1f..c87f66b 100644 --- a/net/dns/host_resolver_nat64_task.cc +++ b/net/dns/host_resolver_nat64_task.cc
@@ -7,8 +7,8 @@ #include <algorithm> #include <utility> -#include "base/bind.h" #include "base/check_op.h" +#include "base/functional/bind.h" #include "base/functional/callback.h" #include "base/location.h" #include "base/memory/raw_ptr.h"
diff --git a/net/dns/mdns_cache.h b/net/dns/mdns_cache.h index a8e91bc7..0909c53 100644 --- a/net/dns/mdns_cache.h +++ b/net/dns/mdns_cache.h
@@ -10,7 +10,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/time/time.h" #include "net/base/net_export.h"
diff --git a/net/dns/mdns_cache_unittest.cc b/net/dns/mdns_cache_unittest.cc index 1b23e2b..844d0c18 100644 --- a/net/dns/mdns_cache_unittest.cc +++ b/net/dns/mdns_cache_unittest.cc
@@ -7,7 +7,7 @@ #include <algorithm> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/time/time.h" #include "net/dns/dns_response.h" #include "net/dns/dns_test_util.h"
diff --git a/net/dns/mdns_client.h b/net/dns/mdns_client.h index a41a015..f9f8fb1 100644 --- a/net/dns/mdns_client.h +++ b/net/dns/mdns_client.h
@@ -12,7 +12,7 @@ #include <utility> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/time/time.h" #include "net/base/ip_endpoint.h" #include "net/base/net_export.h"
diff --git a/net/dns/mdns_client_impl.cc b/net/dns/mdns_client_impl.cc index 22f1b66..8088f05 100644 --- a/net/dns/mdns_client_impl.cc +++ b/net/dns/mdns_client_impl.cc
@@ -10,7 +10,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/observer_list.h" #include "base/strings/string_util.h"
diff --git a/net/dns/mdns_client_unittest.cc b/net/dns/mdns_client_unittest.cc index 9a3d884..955d652b 100644 --- a/net/dns/mdns_client_unittest.cc +++ b/net/dns/mdns_client_unittest.cc
@@ -6,7 +6,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h"
diff --git a/net/dns/mock_host_resolver.cc b/net/dns/mock_host_resolver.cc index a0b82ff2..78562f5 100644 --- a/net/dns/mock_host_resolver.cc +++ b/net/dns/mock_host_resolver.cc
@@ -11,9 +11,9 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/check_op.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/logging.h" #include "base/memory/ptr_util.h"
diff --git a/net/dns/mock_mdns_socket_factory.cc b/net/dns/mock_mdns_socket_factory.cc index d21da91..66ea2d69 100644 --- a/net/dns/mock_mdns_socket_factory.cc +++ b/net/dns/mock_mdns_socket_factory.cc
@@ -7,8 +7,8 @@ #include <algorithm> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/task/single_thread_task_runner.h" #include "net/base/net_errors.h"
diff --git a/net/dns/notify_watcher_mac.cc b/net/dns/notify_watcher_mac.cc index 9ff51957..b703403 100644 --- a/net/dns/notify_watcher_mac.cc +++ b/net/dns/notify_watcher_mac.cc
@@ -6,8 +6,8 @@ #include <notify.h> -#include "base/bind.h" #include "base/check_op.h" +#include "base/functional/bind.h" #include "base/mac/mac_util.h" #include "base/posix/eintr_wrapper.h"
diff --git a/net/dns/notify_watcher_mac.h b/net/dns/notify_watcher_mac.h index 04009ae..dc06e426 100644 --- a/net/dns/notify_watcher_mac.h +++ b/net/dns/notify_watcher_mac.h
@@ -7,8 +7,8 @@ #include <memory> -#include "base/callback.h" #include "base/files/file_descriptor_watcher_posix.h" +#include "base/functional/callback.h" namespace net {
diff --git a/net/dns/nsswitch_reader.cc b/net/dns/nsswitch_reader.cc index d31eaec..dfe06799 100644 --- a/net/dns/nsswitch_reader.cc +++ b/net/dns/nsswitch_reader.cc
@@ -8,10 +8,10 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/metrics/histogram_macros.h" #include "base/strings/string_piece.h" #include "base/strings/string_split.h"
diff --git a/net/dns/nsswitch_reader.h b/net/dns/nsswitch_reader.h index 4c71dca8..b234ff3 100644 --- a/net/dns/nsswitch_reader.h +++ b/net/dns/nsswitch_reader.h
@@ -9,7 +9,7 @@ #include <tuple> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "net/base/net_export.h" namespace net {
diff --git a/net/dns/nsswitch_reader_unittest.cc b/net/dns/nsswitch_reader_unittest.cc index 1a502bc..b5f984f6 100644 --- a/net/dns/nsswitch_reader_unittest.cc +++ b/net/dns/nsswitch_reader_unittest.cc
@@ -8,8 +8,8 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/check.h" +#include "base/functional/bind.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/net/dns/public/resolv_reader.cc b/net/dns/public/resolv_reader.cc index 302ad8b..20670f3 100644 --- a/net/dns/public/resolv_reader.cc +++ b/net/dns/public/resolv_reader.cc
@@ -13,8 +13,8 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/check_op.h" +#include "base/functional/bind.h" #include "build/build_config.h" #include "net/base/ip_endpoint.h" #include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/net/dns/public/resolv_reader_unittest.cc b/net/dns/public/resolv_reader_unittest.cc index f91f2b8..603ab251 100644 --- a/net/dns/public/resolv_reader_unittest.cc +++ b/net/dns/public/resolv_reader_unittest.cc
@@ -11,9 +11,9 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/cancelable_callback.h" #include "base/check.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/sys_byteorder.h" #include "base/task/sequenced_task_runner.h"
diff --git a/net/dns/public/win_dns_system_settings.cc b/net/dns/public/win_dns_system_settings.cc index 49d4486..7a2f1a0f 100644 --- a/net/dns/public/win_dns_system_settings.cc +++ b/net/dns/public/win_dns_system_settings.cc
@@ -11,8 +11,8 @@ #include <string> #include <vector> -#include "base/bind.h" #include "base/compiler_specific.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/logging.h" #include "base/memory/free_deleter.h"
diff --git a/net/dns/resolve_context_unittest.cc b/net/dns/resolve_context_unittest.cc index 22c5d9c..3e6840f 100644 --- a/net/dns/resolve_context_unittest.cc +++ b/net/dns/resolve_context_unittest.cc
@@ -9,7 +9,7 @@ #include <string> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ref_counted.h" #include "base/run_loop.h" #include "base/strings/stringprintf.h"
diff --git a/net/dns/serial_worker.cc b/net/dns/serial_worker.cc index e1506c7..0198a30 100644 --- a/net/dns/serial_worker.cc +++ b/net/dns/serial_worker.cc
@@ -7,9 +7,9 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/check_op.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/location.h" #include "base/notreached.h" #include "base/task/thread_pool.h"
diff --git a/net/dns/serial_worker.h b/net/dns/serial_worker.h index c4158ca4..197cc021 100644 --- a/net/dns/serial_worker.h +++ b/net/dns/serial_worker.h
@@ -7,8 +7,8 @@ #include <memory> -#include "base/callback.h" #include "base/compiler_specific.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "base/sequence_checker.h" #include "base/task/task_traits.h"
diff --git a/net/dns/serial_worker_unittest.cc b/net/dns/serial_worker_unittest.cc index 5c80d2d..c2dd5542 100644 --- a/net/dns/serial_worker_unittest.cc +++ b/net/dns/serial_worker_unittest.cc
@@ -7,9 +7,9 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/check.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/location.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h"
diff --git a/net/dns/system_dns_config_change_notifier.cc b/net/dns/system_dns_config_change_notifier.cc index 05bc600..48f62e2 100644 --- a/net/dns/system_dns_config_change_notifier.cc +++ b/net/dns/system_dns_config_change_notifier.cc
@@ -7,8 +7,8 @@ #include <map> #include <utility> -#include "base/bind.h" #include "base/check_op.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h"
diff --git a/net/dns/system_dns_config_change_notifier_unittest.cc b/net/dns/system_dns_config_change_notifier_unittest.cc index d18422dc..bf6f8f75 100644 --- a/net/dns/system_dns_config_change_notifier_unittest.cc +++ b/net/dns/system_dns_config_change_notifier_unittest.cc
@@ -7,7 +7,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/task/sequenced_task_runner.h"
diff --git a/net/dns/test_dns_config_service.h b/net/dns/test_dns_config_service.h index a8da79e..938394e6 100644 --- a/net/dns/test_dns_config_service.h +++ b/net/dns/test_dns_config_service.h
@@ -8,8 +8,8 @@ #include <memory> #include <utility> -#include "base/callback.h" #include "base/check.h" +#include "base/functional/callback.h" #include "net/base/net_export.h" #include "net/dns/dns_config_service.h" #include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/net/extras/sqlite/sqlite_persistent_cookie_store.cc b/net/extras/sqlite/sqlite_persistent_cookie_store.cc index cea0648..fcaf3ebb 100644 --- a/net/extras/sqlite/sqlite_persistent_cookie_store.cc +++ b/net/extras/sqlite/sqlite_persistent_cookie_store.cc
@@ -11,11 +11,11 @@ #include <tuple> #include <unordered_set> -#include "base/bind.h" -#include "base/callback.h" #include "base/feature_list.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/location.h" #include "base/logging.h" #include "base/memory/raw_ptr.h"
diff --git a/net/extras/sqlite/sqlite_persistent_cookie_store.h b/net/extras/sqlite/sqlite_persistent_cookie_store.h index 72bca851..bb026cb9 100644 --- a/net/extras/sqlite/sqlite_persistent_cookie_store.h +++ b/net/extras/sqlite/sqlite_persistent_cookie_store.h
@@ -10,8 +10,8 @@ #include <utility> #include <vector> -#include "base/callback_forward.h" #include "base/component_export.h" +#include "base/functional/callback_forward.h" #include "base/memory/scoped_refptr.h" #include "base/task/task_traits.h" #include "net/cookies/cookie_monster.h"
diff --git a/net/extras/sqlite/sqlite_persistent_cookie_store_perftest.cc b/net/extras/sqlite/sqlite_persistent_cookie_store_perftest.cc index b3bfe2b3..5bd15e5 100644 --- a/net/extras/sqlite/sqlite_persistent_cookie_store_perftest.cc +++ b/net/extras/sqlite/sqlite_persistent_cookie_store_perftest.cc
@@ -6,9 +6,9 @@ #include <vector> -#include "base/bind.h" #include "base/compiler_specific.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" #include "base/rand_util.h" #include "base/strings/stringprintf.h" #include "base/synchronization/waitable_event.h"
diff --git a/net/extras/sqlite/sqlite_persistent_cookie_store_unittest.cc b/net/extras/sqlite/sqlite_persistent_cookie_store_unittest.cc index 446b4f91..f56be25 100644 --- a/net/extras/sqlite/sqlite_persistent_cookie_store_unittest.cc +++ b/net/extras/sqlite/sqlite_persistent_cookie_store_unittest.cc
@@ -11,11 +11,11 @@ #include <set> #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/containers/span.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/location.h" #include "base/memory/ref_counted.h" #include "base/run_loop.h"
diff --git a/net/extras/sqlite/sqlite_persistent_reporting_and_nel_store.cc b/net/extras/sqlite/sqlite_persistent_reporting_and_nel_store.cc index d38c869..acd5130 100644 --- a/net/extras/sqlite/sqlite_persistent_reporting_and_nel_store.cc +++ b/net/extras/sqlite/sqlite_persistent_reporting_and_nel_store.cc
@@ -11,11 +11,11 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/feature_list.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/json/json_reader.h" #include "base/json/json_string_value_serializer.h" #include "base/metrics/histogram_macros.h"
diff --git a/net/extras/sqlite/sqlite_persistent_reporting_and_nel_store_unittest.cc b/net/extras/sqlite/sqlite_persistent_reporting_and_nel_store_unittest.cc index c1b8ffab..2a88dd4a 100644 --- a/net/extras/sqlite/sqlite_persistent_reporting_and_nel_store_unittest.cc +++ b/net/extras/sqlite/sqlite_persistent_reporting_and_nel_store_unittest.cc
@@ -7,9 +7,9 @@ #include <memory> #include <vector> -#include "base/bind.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/synchronization/waitable_event.h" #include "base/task/sequenced_task_runner.h"
diff --git a/net/extras/sqlite/sqlite_persistent_store_backend_base.cc b/net/extras/sqlite/sqlite_persistent_store_backend_base.cc index c270c5a..0397c93 100644 --- a/net/extras/sqlite/sqlite_persistent_store_backend_base.cc +++ b/net/extras/sqlite/sqlite_persistent_store_backend_base.cc
@@ -6,9 +6,9 @@ #include <utility> -#include "base/bind.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/metrics/histogram_functions.h" #include "base/metrics/histogram_macros_local.h"
diff --git a/net/extras/sqlite/sqlite_persistent_store_backend_base.h b/net/extras/sqlite/sqlite_persistent_store_backend_base.h index 092c7bcd1..57c91a5 100644 --- a/net/extras/sqlite/sqlite_persistent_store_backend_base.h +++ b/net/extras/sqlite/sqlite_persistent_store_backend_base.h
@@ -8,10 +8,10 @@ #include <memory> #include <string> -#include "base/callback.h" -#include "base/callback_forward.h" #include "base/component_export.h" #include "base/files/file_path.h" +#include "base/functional/callback.h" +#include "base/functional/callback_forward.h" #include "base/memory/ref_counted.h" #include "base/thread_annotations.h" #include "sql/meta_table.h"
diff --git a/net/filter/brotli_source_stream.cc b/net/filter/brotli_source_stream.cc index 45b2094..72350ad 100644 --- a/net/filter/brotli_source_stream.cc +++ b/net/filter/brotli_source_stream.cc
@@ -4,9 +4,9 @@ #include "net/filter/brotli_source_stream.h" -#include "base/bind.h" #include "base/bit_cast.h" #include "base/check_op.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/metrics/histogram_macros.h" #include "net/base/io_buffer.h"
diff --git a/net/filter/brotli_source_stream_unittest.cc b/net/filter/brotli_source_stream_unittest.cc index 163830090..cbbfb7a 100644 --- a/net/filter/brotli_source_stream_unittest.cc +++ b/net/filter/brotli_source_stream_unittest.cc
@@ -5,9 +5,9 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/path_service.h" #include "base/run_loop.h"
diff --git a/net/filter/filter_source_stream.cc b/net/filter/filter_source_stream.cc index 845f6d883..f40438e0 100644 --- a/net/filter/filter_source_stream.cc +++ b/net/filter/filter_source_stream.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" #include "base/check_op.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_macros.h" #include "base/notreached.h" #include "base/numerics/safe_conversions.h"
diff --git a/net/filter/filter_source_stream_unittest.cc b/net/filter/filter_source_stream_unittest.cc index 543d529d..e238e4c 100644 --- a/net/filter/filter_source_stream_unittest.cc +++ b/net/filter/filter_source_stream_unittest.cc
@@ -5,8 +5,8 @@ #include <algorithm> #include <string> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/numerics/safe_conversions.h" #include "net/base/io_buffer.h" #include "net/base/net_errors.h"
diff --git a/net/filter/fuzzed_source_stream.cc b/net/filter/fuzzed_source_stream.cc index 58d09c5d..2804efe 100644 --- a/net/filter/fuzzed_source_stream.cc +++ b/net/filter/fuzzed_source_stream.cc
@@ -10,7 +10,7 @@ #include <string> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/ranges/algorithm.h" #include "base/task/single_thread_task_runner.h" #include "net/base/io_buffer.h"
diff --git a/net/filter/gzip_source_stream.cc b/net/filter/gzip_source_stream.cc index 129ca79..8bd5c8e 100644 --- a/net/filter/gzip_source_stream.cc +++ b/net/filter/gzip_source_stream.cc
@@ -8,9 +8,9 @@ #include <memory> #include <utility> -#include "base/bind.h" #include "base/bit_cast.h" #include "base/check_op.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/memory/ref_counted.h" #include "base/notreached.h"
diff --git a/net/filter/gzip_source_stream_unittest.cc b/net/filter/gzip_source_stream_unittest.cc index c4a109c..85c3202 100644 --- a/net/filter/gzip_source_stream_unittest.cc +++ b/net/filter/gzip_source_stream_unittest.cc
@@ -5,8 +5,8 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "net/base/io_buffer.h" #include "net/base/test_completion_callback.h"
diff --git a/net/filter/source_stream.h b/net/filter/source_stream.h index 0b865b5b..0a37d66 100644 --- a/net/filter/source_stream.h +++ b/net/filter/source_stream.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "net/base/completion_once_callback.h" #include "net/base/net_errors.h" #include "net/base/net_export.h"
diff --git a/net/http/bidirectional_stream.cc b/net/http/bidirectional_stream.cc index fdff1da..fd1b8da 100644 --- a/net/http/bidirectional_stream.cc +++ b/net/http/bidirectional_stream.cc
@@ -7,7 +7,7 @@ #include <string> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/logging.h" #include "base/metrics/histogram_macros.h"
diff --git a/net/http/broken_alternative_services.cc b/net/http/broken_alternative_services.cc index f2021ec..ad9045c 100644 --- a/net/http/broken_alternative_services.cc +++ b/net/http/broken_alternative_services.cc
@@ -4,8 +4,8 @@ #include "net/http/broken_alternative_services.h" -#include "base/bind.h" #include "base/containers/adapters.h" +#include "base/functional/bind.h" #include "base/memory/singleton.h" #include "base/time/tick_clock.h" #include "base/time/time.h"
diff --git a/net/http/http_auth_controller.cc b/net/http/http_auth_controller.cc index 81f79ca4..597880a5 100644 --- a/net/http/http_auth_controller.cc +++ b/net/http/http_auth_controller.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/metrics/histogram_macros.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h"
diff --git a/net/http/http_auth_gssapi_posix_unittest.cc b/net/http/http_auth_gssapi_posix_unittest.cc index c474a27..90cb4ac 100644 --- a/net/http/http_auth_gssapi_posix_unittest.cc +++ b/net/http/http_auth_gssapi_posix_unittest.cc
@@ -7,8 +7,8 @@ #include <memory> #include "base/base_paths.h" -#include "base/bind.h" #include "base/check.h" +#include "base/functional/bind.h" #include "base/json/json_reader.h" #include "base/native_library.h" #include "base/path_service.h"
diff --git a/net/http/http_auth_handler.cc b/net/http/http_auth_handler.cc index a5bd1d6d..c3a516b 100644 --- a/net/http/http_auth_handler.cc +++ b/net/http/http_auth_handler.cc
@@ -6,9 +6,9 @@ #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/check_op.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "net/base/net_errors.h" #include "net/http/http_auth_challenge_tokenizer.h" #include "net/log/net_log.h"
diff --git a/net/http/http_auth_handler_factory_unittest.cc b/net/http/http_auth_handler_factory_unittest.cc index 9c388b0..2143419 100644 --- a/net/http/http_auth_handler_factory_unittest.cc +++ b/net/http/http_auth_handler_factory_unittest.cc
@@ -6,8 +6,8 @@ #include <memory> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "build/build_config.h" #include "net/base/net_errors.h" #include "net/base/network_isolation_key.h"
diff --git a/net/http/http_auth_handler_mock.cc b/net/http/http_auth_handler_mock.cc index 4e6ceabb..9fb9e7e 100644 --- a/net/http/http_auth_handler_mock.cc +++ b/net/http/http_auth_handler_mock.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/memory/ptr_util.h" #include "base/strings/string_util.h"
diff --git a/net/http/http_auth_handler_negotiate.cc b/net/http/http_auth_handler_negotiate.cc index cc488fa..c79ae8b7d 100644 --- a/net/http/http_auth_handler_negotiate.cc +++ b/net/http/http_auth_handler_negotiate.cc
@@ -6,9 +6,9 @@ #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/check_op.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h"
diff --git a/net/http/http_auth_handler_negotiate_unittest.cc b/net/http/http_auth_handler_negotiate_unittest.cc index f61ca4c..c8c4354 100644 --- a/net/http/http_auth_handler_negotiate_unittest.cc +++ b/net/http/http_auth_handler_negotiate_unittest.cc
@@ -7,7 +7,7 @@ #include <memory> #include <string> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h" #include "base/strings/string_util.h"
diff --git a/net/http/http_auth_mechanism.h b/net/http/http_auth_mechanism.h index 5e3a4db..6919abd 100644 --- a/net/http/http_auth_mechanism.h +++ b/net/http/http_auth_mechanism.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "net/base/completion_once_callback.h" #include "net/base/net_export.h" #include "net/http/http_auth.h"
diff --git a/net/http/http_auth_preferences.h b/net/http/http_auth_preferences.h index 677a3524f..3e87d95 100644 --- a/net/http/http_auth_preferences.h +++ b/net/http/http_auth_preferences.h
@@ -9,7 +9,7 @@ #include <set> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h" #include "net/base/net_export.h"
diff --git a/net/http/http_auth_preferences_unittest.cc b/net/http/http_auth_preferences_unittest.cc index 57557fb..e3f866c 100644 --- a/net/http/http_auth_preferences_unittest.cc +++ b/net/http/http_auth_preferences_unittest.cc
@@ -7,8 +7,8 @@ #include <string> #include <vector> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/run_loop.h" #include "base/task/single_thread_task_runner.h" #include "base/threading/thread.h"
diff --git a/net/http/http_auth_sspi_win_unittest.cc b/net/http/http_auth_sspi_win_unittest.cc index b665b0f5..95ae9f91 100644 --- a/net/http/http_auth_sspi_win_unittest.cc +++ b/net/http/http_auth_sspi_win_unittest.cc
@@ -7,7 +7,7 @@ #include <vector> #include "base/base64.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/json/json_reader.h" #include "net/base/net_errors.h" #include "net/http/http_auth.h"
diff --git a/net/http/http_basic_stream.cc b/net/http/http_basic_stream.cc index 6f9d4a7..429c89e 100644 --- a/net/http/http_basic_stream.cc +++ b/net/http/http_basic_stream.cc
@@ -7,7 +7,7 @@ #include <set> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "net/http/http_network_session.h" #include "net/http/http_raw_request_headers.h" #include "net/http/http_request_info.h"
diff --git a/net/http/http_cache.cc b/net/http/http_cache.cc index 7af00221..e68e3b77 100644 --- a/net/http/http_cache.cc +++ b/net/http/http_cache.cc
@@ -6,13 +6,13 @@ #include <utility> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/compiler_specific.h" #include "base/feature_list.h" #include "base/files/file_util.h" #include "base/format_macros.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h"
diff --git a/net/http/http_cache.h b/net/http/http_cache.h index 2297d581..481ed0d 100644 --- a/net/http/http_cache.h +++ b/net/http/http_cache.h
@@ -21,8 +21,8 @@ #include <unordered_map> #include <unordered_set> -#include "base/callback.h" #include "base/files/file_path.h" +#include "base/functional/callback.h" #include "base/gtest_prod_util.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h"
diff --git a/net/http/http_cache_lookup_manager.cc b/net/http/http_cache_lookup_manager.cc index e20baca0..d1a469a 100644 --- a/net/http/http_cache_lookup_manager.cc +++ b/net/http/http_cache_lookup_manager.cc
@@ -6,8 +6,8 @@ #include <memory> -#include "base/bind.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/values.h" #include "net/base/load_flags.h" #include "net/base/network_anonymization_key.h"
diff --git a/net/http/http_cache_transaction.cc b/net/http/http_cache_transaction.cc index 8701120..f29a570 100644 --- a/net/http/http_cache_transaction.cc +++ b/net/http/http_cache_transaction.cc
@@ -18,12 +18,12 @@ #include <utility> #include "base/auto_reset.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/compiler_specific.h" #include "base/containers/fixed_flat_set.h" #include "base/cxx17_backports.h" #include "base/format_macros.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/metrics/histogram_functions.h" #include "base/metrics/histogram_macros.h"
diff --git a/net/http/http_cache_unittest.cc b/net/http/http_cache_unittest.cc index a88baeb..961ded4 100644 --- a/net/http/http_cache_unittest.cc +++ b/net/http/http_cache_unittest.cc
@@ -12,11 +12,11 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/containers/cxx20_erase.h" #include "base/files/scoped_temp_dir.h" #include "base/format_macros.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h"
diff --git a/net/http/http_cache_writers.cc b/net/http/http_cache_writers.cc index c48bba4..4630b52 100644 --- a/net/http/http_cache_writers.cc +++ b/net/http/http_cache_writers.cc
@@ -8,10 +8,10 @@ #include <utility> #include "base/auto_reset.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/debug/crash_logging.h" #include "base/debug/dump_without_crashing.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/strings/stringprintf.h" #include "base/task/single_thread_task_runner.h"
diff --git a/net/http/http_cache_writers_unittest.cc b/net/http/http_cache_writers_unittest.cc index 4fdc2c9c..4b43e5d 100644 --- a/net/http/http_cache_writers_unittest.cc +++ b/net/http/http_cache_writers_unittest.cc
@@ -10,7 +10,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "crypto/secure_hash.h" #include "net/http/http_cache.h"
diff --git a/net/http/http_network_session.h b/net/http/http_network_session.h index a0a9c183..5f12179f 100644 --- a/net/http/http_network_session.h +++ b/net/http/http_network_session.h
@@ -15,9 +15,9 @@ #include <unordered_set> #include <vector> -#include "base/bind.h" #include "base/containers/flat_set.h" #include "base/containers/unique_ptr_adapters.h" +#include "base/functional/bind.h" #include "base/memory/memory_pressure_monitor.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h"
diff --git a/net/http/http_network_transaction.cc b/net/http/http_network_transaction.cc index 84f5b7e..d8c1a38 100644 --- a/net/http/http_network_transaction.cc +++ b/net/http/http_network_transaction.cc
@@ -9,11 +9,11 @@ #include <vector> #include "base/base64url.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/compiler_specific.h" #include "base/feature_list.h" #include "base/format_macros.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/metrics/field_trial.h" #include "base/metrics/histogram_functions.h" #include "base/metrics/histogram_macros.h"
diff --git a/net/http/http_network_transaction_unittest.cc b/net/http/http_network_transaction_unittest.cc index 8a93826..e4effed 100644 --- a/net/http/http_network_transaction_unittest.cc +++ b/net/http/http_network_transaction_unittest.cc
@@ -15,10 +15,10 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/compiler_specific.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/json/json_writer.h" #include "base/logging.h" #include "base/memory/ptr_util.h"
diff --git a/net/http/http_proxy_client_socket.cc b/net/http/http_proxy_client_socket.cc index 91757dd1..b6bd7f0 100644 --- a/net/http/http_proxy_client_socket.cc +++ b/net/http/http_proxy_client_socket.cc
@@ -7,8 +7,8 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/strings/string_util.h" #include "base/values.h" #include "net/base/auth.h"
diff --git a/net/http/http_proxy_connect_job.cc b/net/http/http_proxy_connect_job.cc index 849d6dd..4a54955 100644 --- a/net/http/http_proxy_connect_job.cc +++ b/net/http/http_proxy_connect_job.cc
@@ -7,9 +7,9 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/cxx17_backports.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/metrics/field_trial.h" #include "base/metrics/field_trial_params.h" #include "base/metrics/histogram_functions.h"
diff --git a/net/http/http_proxy_connect_job.h b/net/http/http_proxy_connect_job.h index 17d26d8..1836158 100644 --- a/net/http/http_proxy_connect_job.h +++ b/net/http/http_proxy_connect_job.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/ref_counted.h" #include "base/time/time.h" #include "net/base/host_port_pair.h"
diff --git a/net/http/http_raw_request_headers.h b/net/http/http_raw_request_headers.h index 4cd2c745..7340a94 100644 --- a/net/http/http_raw_request_headers.h +++ b/net/http/http_raw_request_headers.h
@@ -9,7 +9,7 @@ #include <utility> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/strings/string_piece.h" #include "net/base/net_export.h"
diff --git a/net/http/http_response_body_drainer.cc b/net/http/http_response_body_drainer.cc index b4887a43..76850120 100644 --- a/net/http/http_response_body_drainer.cc +++ b/net/http/http_response_body_drainer.cc
@@ -4,9 +4,9 @@ #include "net/http/http_response_body_drainer.h" -#include "base/bind.h" #include "base/check_op.h" #include "base/compiler_specific.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/notreached.h" #include "net/base/io_buffer.h"
diff --git a/net/http/http_response_body_drainer_unittest.cc b/net/http/http_response_body_drainer_unittest.cc index 1f8bc350..15cec29 100644 --- a/net/http/http_response_body_drainer_unittest.cc +++ b/net/http/http_response_body_drainer_unittest.cc
@@ -10,8 +10,8 @@ #include <set> #include <utility> -#include "base/bind.h" #include "base/compiler_specific.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h"
diff --git a/net/http/http_response_headers.h b/net/http/http_response_headers.h index 7417b51d..8741679c 100644 --- a/net/http/http_response_headers.h +++ b/net/http/http_response_headers.h
@@ -12,7 +12,7 @@ #include <unordered_set> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/ref_counted.h" #include "base/strings/string_piece.h" #include "base/time/time.h"
diff --git a/net/http/http_server_properties.cc b/net/http/http_server_properties.cc index 0eecf6d..deb0d09 100644 --- a/net/http/http_server_properties.cc +++ b/net/http/http_server_properties.cc
@@ -4,11 +4,11 @@ #include "net/http/http_server_properties.h" -#include "base/bind.h" #include "base/check_op.h" #include "base/containers/adapters.h" #include "base/containers/contains.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/metrics/histogram_macros.h" #include "base/strings/string_util.h"
diff --git a/net/http/http_server_properties.h b/net/http/http_server_properties.h index de99080a..5ba2ec0 100644 --- a/net/http/http_server_properties.h +++ b/net/http/http_server_properties.h
@@ -15,8 +15,8 @@ #include <tuple> #include <vector> -#include "base/callback.h" #include "base/containers/lru_cache.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/threading/thread_checker.h"
diff --git a/net/http/http_server_properties_manager.cc b/net/http/http_server_properties_manager.cc index d3de117..478df65 100644 --- a/net/http/http_server_properties_manager.cc +++ b/net/http/http_server_properties_manager.cc
@@ -7,9 +7,9 @@ #include <algorithm> #include <utility> -#include "base/bind.h" #include "base/containers/adapters.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_macros.h" #include "base/strings/string_number_conversions.h" #include "base/time/tick_clock.h"
diff --git a/net/http/http_server_properties_manager.h b/net/http/http_server_properties_manager.h index 5412cab..7db5703e 100644 --- a/net/http/http_server_properties_manager.h +++ b/net/http/http_server_properties_manager.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/gtest_prod_util.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h"
diff --git a/net/http/http_server_properties_manager_unittest.cc b/net/http/http_server_properties_manager_unittest.cc index 4c5c7f2d..4500e6e3 100644 --- a/net/http/http_server_properties_manager_unittest.cc +++ b/net/http/http_server_properties_manager_unittest.cc
@@ -6,9 +6,9 @@ #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/json/json_reader.h" #include "base/json/json_writer.h" #include "base/memory/ptr_util.h"
diff --git a/net/http/http_server_properties_unittest.cc b/net/http/http_server_properties_unittest.cc index 3ee4e28..d229884 100644 --- a/net/http/http_server_properties_unittest.cc +++ b/net/http/http_server_properties_unittest.cc
@@ -8,10 +8,10 @@ #include <string> #include <vector> -#include "base/bind.h" -#include "base/callback.h" #include "base/check.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/json/json_writer.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h"
diff --git a/net/http/http_stream_factory.h b/net/http/http_stream_factory.h index 126dbaeb..8d177a61 100644 --- a/net/http/http_stream_factory.h +++ b/net/http/http_stream_factory.h
@@ -155,11 +155,6 @@ bool enable_alternative_services, const NetLogWithSource& net_log); - // Called when the Job detects that the endpoint indicated by the - // Alternate-Protocol does not work. Lets the factory update - // HttpAlternateProtocols with the failure and resets the SPDY session key. - void OnBrokenAlternateProtocol(const Job*, const HostPortPair& origin); - // Called when the Preconnect completes. Used for testing. virtual void OnPreconnectsCompleteInternal() {}
diff --git a/net/http/http_stream_factory_job.cc b/net/http/http_stream_factory_job.cc index 1762e97..1c50981f 100644 --- a/net/http/http_stream_factory_job.cc +++ b/net/http/http_stream_factory_job.cc
@@ -9,12 +9,12 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/check_op.h" #include "base/containers/contains.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/metrics/histogram_macros.h" #include "base/metrics/sparse_histogram.h"
diff --git a/net/http/http_stream_factory_job_controller.cc b/net/http/http_stream_factory_job_controller.cc index 559bde1..97883ff 100644 --- a/net/http/http_stream_factory_job_controller.cc +++ b/net/http/http_stream_factory_job_controller.cc
@@ -7,8 +7,8 @@ #include <string> #include <utility> -#include "base/bind.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_functions.h" #include "base/metrics/histogram_macros.h" #include "base/strings/string_number_conversions.h"
diff --git a/net/http/http_stream_parser.cc b/net/http/http_stream_parser.cc index 268d4f2..09630b4 100644 --- a/net/http/http_stream_parser.cc +++ b/net/http/http_stream_parser.cc
@@ -8,8 +8,8 @@ #include <memory> #include <utility> -#include "base/bind.h" #include "base/compiler_specific.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/memory/raw_ptr.h" #include "base/metrics/histogram_macros.h"
diff --git a/net/http/http_stream_parser_unittest.cc b/net/http/http_stream_parser_unittest.cc index e620eea..f1fb696 100644 --- a/net/http/http_stream_parser_unittest.cc +++ b/net/http/http_stream_parser_unittest.cc
@@ -12,10 +12,10 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" #include "base/memory/ref_counted.h" #include "base/run_loop.h" #include "base/strings/string_piece.h"
diff --git a/net/http/http_stream_request.cc b/net/http/http_stream_request.cc index 6d7f574..1d83967 100644 --- a/net/http/http_stream_request.cc +++ b/net/http/http_stream_request.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/callback.h" #include "base/check.h" +#include "base/functional/callback.h" #include "net/http/bidirectional_stream_impl.h" #include "net/log/net_log_event_type.h" #include "net/spdy/bidirectional_stream_spdy_impl.h"
diff --git a/net/http/http_transaction_test_util.cc b/net/http/http_transaction_test_util.cc index b3035bb..f8c8460e 100644 --- a/net/http/http_transaction_test_util.cc +++ b/net/http/http_transaction_test_util.cc
@@ -8,8 +8,8 @@ #include <unordered_map> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/run_loop.h" #include "base/strings/stringprintf.h"
diff --git a/net/http/http_transaction_test_util.h b/net/http/http_transaction_test_util.h index aaa3fcd..88e388b0 100644 --- a/net/http/http_transaction_test_util.h +++ b/net/http/http_transaction_test_util.h
@@ -14,8 +14,8 @@ #include <string> #include <vector> -#include "base/callback.h" #include "base/compiler_specific.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h" #include "base/time/time.h"
diff --git a/net/http/mock_http_cache.cc b/net/http/mock_http_cache.cc index eb1f88b..ddaf9b45 100644 --- a/net/http/mock_http_cache.cc +++ b/net/http/mock_http_cache.cc
@@ -9,10 +9,10 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/task/single_thread_task_runner.h" #include "net/base/features.h"
diff --git a/net/http/partial_data.cc b/net/http/partial_data.cc index 1b691a0..7b3bc39a 100644 --- a/net/http/partial_data.cc +++ b/net/http/partial_data.cc
@@ -7,9 +7,9 @@ #include <limits> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/format_macros.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h"
diff --git a/net/http/transport_security_persister.cc b/net/http/transport_security_persister.cc index 35f4d0bc..7e18017 100644 --- a/net/http/transport_security_persister.cc +++ b/net/http/transport_security_persister.cc
@@ -11,11 +11,11 @@ #include <vector> #include "base/base64.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/feature_list.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/json/json_reader.h" #include "base/json/json_writer.h" #include "base/location.h"
diff --git a/net/http/transport_security_state.cc b/net/http/transport_security_state.cc index e9c9e03..5f88b75 100644 --- a/net/http/transport_security_state.cc +++ b/net/http/transport_security_state.cc
@@ -12,11 +12,11 @@ #include <vector> #include "base/base64.h" -#include "base/bind.h" #include "base/build_time.h" #include "base/containers/contains.h" #include "base/containers/span.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/json/json_writer.h" #include "base/logging.h" #include "base/metrics/field_trial.h" @@ -571,8 +571,7 @@ base::Time update_time) { pinsets_ = pinsets; key_pins_list_last_update_time_ = update_time; - host_pins_ = absl::make_optional( - std::map<std::string, std::pair<PinSet const*, bool>>()); + host_pins_.emplace(); std::map<std::string, PinSet const*> pinset_names_map; for (const auto& pinset : pinsets_) { pinset_names_map[pinset.name()] = &pinset; @@ -905,32 +904,61 @@ PreloadResult result; if (host_pins_.has_value()) { - auto iter = host_pins_->find(host); - if (iter != host_pins_->end()) { - pkp_result->domain = host; - pkp_result->last_observed = key_pins_list_last_update_time_; - pkp_result->include_subdomains = iter->second.second; - const PinSet* pinset = iter->second.first; - if (!pinset->report_uri().empty()) { - pkp_result->report_uri = GURL(pinset->report_uri()); - } - for (auto hash : pinset->static_spki_hashes()) { - // If the update is malformed, it's preferable to skip the hash than - // crash. - if (hash.size() == 32) { - AddHash(reinterpret_cast<const char*>(hash.data()), - &pkp_result->spki_hashes); + // Ensure that |host| is a valid hostname before processing. + if (CanonicalizeHost(host).empty()) { + return false; + } + // Normalize any trailing '.' used for DNS suffix searches. + std::string normalized_host = host; + size_t trailing_dot_found = normalized_host.find_last_not_of('.'); + if (trailing_dot_found == std::string::npos) { + // Hostname is either empty or all dots + return false; + } + normalized_host.erase(trailing_dot_found + 1); + normalized_host = base::ToLowerASCII(normalized_host); + + base::StringPiece search_hostname = normalized_host; + while (true) { + auto iter = host_pins_->find(search_hostname); + // Only consider this a match if either include_subdomains is set, or + // this is an exact match of the full hostname. + if (iter != host_pins_->end() && + (iter->second.second || search_hostname == normalized_host)) { + pkp_result->domain = std::string(search_hostname); + pkp_result->last_observed = key_pins_list_last_update_time_; + pkp_result->include_subdomains = iter->second.second; + const PinSet* pinset = iter->second.first; + if (!pinset->report_uri().empty()) { + pkp_result->report_uri = GURL(pinset->report_uri()); } - } - for (auto hash : pinset->bad_static_spki_hashes()) { - // If the update is malformed, it's preferable to skip the hash than - // crash. - if (hash.size() == 32) { - AddHash(reinterpret_cast<const char*>(hash.data()), - &pkp_result->bad_spki_hashes); + for (auto hash : pinset->static_spki_hashes()) { + // If the update is malformed, it's preferable to skip the hash than + // crash. + if (hash.size() == 32) { + AddHash(reinterpret_cast<const char*>(hash.data()), + &pkp_result->spki_hashes); + } } + for (auto hash : pinset->bad_static_spki_hashes()) { + // If the update is malformed, it's preferable to skip the hash than + // crash. + if (hash.size() == 32) { + AddHash(reinterpret_cast<const char*>(hash.data()), + &pkp_result->bad_spki_hashes); + } + } + return true; } - return true; + auto dot_pos = search_hostname.find("."); + if (dot_pos == std::string::npos) { + // If this was not a match, and there are no more dots in the string, + // there are no more domains to try. + return false; + } + // Try again in case this is a subdomain of a pinned domain that includes + // subdomains. + search_hostname = search_hostname.substr(dot_pos + 1); } } else if (DecodeHSTSPreload(host, &result) && result.has_pins) { if (result.pinset_id >= g_hsts_source->pinsets_count)
diff --git a/net/http/transport_security_state.h b/net/http/transport_security_state.h index f34123b..2f8c0b5 100644 --- a/net/http/transport_security_state.h +++ b/net/http/transport_security_state.h
@@ -12,8 +12,8 @@ #include <set> #include <string> -#include "base/callback.h" #include "base/feature_list.h" +#include "base/functional/callback.h" #include "base/gtest_prod_util.h" #include "base/memory/raw_ptr.h" #include "base/strings/string_piece.h" @@ -604,7 +604,8 @@ // The values in host_pins_ maps are references to PinSet objects in the // pinsets_ vector. - absl::optional<std::map<std::string, std::pair<const PinSet*, bool>>> + absl::optional< + std::map<std::string, std::pair<const PinSet*, bool>, std::less<>>> host_pins_; base::Time key_pins_list_last_update_time_; std::vector<PinSet> pinsets_;
diff --git a/net/http/transport_security_state_static.json b/net/http/transport_security_state_static.json index 422c8f5..ad2cce8 100644 --- a/net/http/transport_security_state_static.json +++ b/net/http/transport_security_state_static.json
@@ -953,7 +953,6 @@ // START OF LEGACY 18-WEEK BULK HSTS ENTRIES { "name": "addvocate.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, - { "name": "alexsexton.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "azprep.us", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "beneathvt.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "cloudup.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, @@ -2193,7 +2192,6 @@ { "name": "edelsteincosmetic.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "ellegaard.dk", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "enigmail.net", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, - { "name": "enterdev.co", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "ezimoeko.net", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "eztv.ch", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "festember.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, @@ -2689,7 +2687,6 @@ { "name": "thom4s.info", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "thorgames.nl", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "tpbcdn.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, - { "name": "techvalue.gr", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "vcsjones.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "vanhoutte.be", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "varden.info", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, @@ -2722,7 +2719,6 @@ { "name": "askfit.cz", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "axado.com.br", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "bebesurdoue.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, - { "name": "burnworks.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "canadalife.de", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "chaosdorf.de", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "chrisbrown.id.au", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, @@ -2764,7 +2760,6 @@ { "name": "hardh.at", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "haveeruexaminer.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "helloacm.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, - { "name": "hyper-text.org", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "idndx.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "im-c-shop.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "inbitcoin.it", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, @@ -3204,7 +3199,6 @@ { "name": "robi-net.it", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "rootservice.org", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "sanasport.cz", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, - { "name": "si-benelux.nl", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "simplednscrypt.org", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "smartmessages.net", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "smksi2.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, @@ -4777,7 +4771,6 @@ { "name": "discofitta.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "dragonisles.net", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "eligible.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, - { "name": "englishclub.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "esclear.de", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "firevap.org", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "gintenreiter-photography.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, @@ -5307,7 +5300,6 @@ { "name": "iflare.de", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "igforums.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "igrivi.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, - { "name": "iluvscotland.co.uk", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "immaterium.de", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "informatik.zone", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "infosenior.ch", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, @@ -5619,7 +5611,6 @@ { "name": "rodney.id.au", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "roelf.org", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "rohedaten.de", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, - { "name": "rrke.cc", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "rsf.io", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "rubberfurs.org", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "rubenschulz.nl", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, @@ -6806,7 +6797,6 @@ { "name": "dndtools.net", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "dpd.com.pl", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "drakefortreasurer.sexy", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, - { "name": "dreamtechie.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "dreizwosechs.de", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "drumbe.at", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "dunea.nl", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, @@ -7180,7 +7170,6 @@ { "name": "easyplane.it", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "enecoshop.nl", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "enefan.jp", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, - { "name": "envelope.co.nz", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "etula.ga", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "exeria.de", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "exno.co", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, @@ -7607,7 +7596,6 @@ { "name": "campaign-ad.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "campbellsoftware.co.uk", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "campbrainybunch.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, - { "name": "camperdays.de", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "candicontrols.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "caphane.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "capogna.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, @@ -8029,7 +8017,6 @@ { "name": "fxp.co.il", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "fyn.nl", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "fysiohaenraets.nl", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, - { "name": "g-o.pl", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "gafachi.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "gagniard.org", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "gagor.pl", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, @@ -8803,7 +8790,6 @@ { "name": "preworkout.me", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "prilock.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "princessmargaretlotto.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, - { "name": "prior-it.be", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "privatestatic.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "prjktruby.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "prnt.li", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, @@ -8853,7 +8839,6 @@ { "name": "randomcage.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "rapido.nu", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "ratajczak.fr", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, - { "name": "ratd.net", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "ratuseks.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "ratuseks.net", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "ratuseks.us", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, @@ -9484,7 +9469,6 @@ { "name": "25daysof.io", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "10hz.de", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "9vx.org", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, - { "name": "aaoo.net", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "0xn.de", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "2ulcceria.nl", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "700.az", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, @@ -9536,7 +9520,6 @@ { "name": "ardtrade.ru", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "ashutoshmishra.org", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "ars-design.net", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, - { "name": "arrive.by", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "asciitable.tips", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "athul.xyz", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "astrolpost.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, @@ -10317,7 +10300,6 @@ { "name": "svatba-frantovi.cz", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "tails.com.ar", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "sv-turm-hohenlimburg.de", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, - { "name": "taravancil.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "tangibilizing.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "synabi.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "sysadmin.xyz", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, @@ -10354,7 +10336,6 @@ { "name": "tfl.lu", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "thelaimlife.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "thelinuxspace.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, - { "name": "th-bl.de", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "thewhitehat.club", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "theeyeopener.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "thekingofhate.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, @@ -13538,7 +13519,6 @@ { "name": "mirkofranz.de", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "mikeology.org", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "moddedark.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, - { "name": "morganestes.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "medic-world.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "mail-rotter.de", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "mingram.net", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, @@ -13617,7 +13597,6 @@ { "name": "moulinaparoles.ca", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "nassi.me", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "n-soft.info", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, - { "name": "nettia.fi", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "nivi.ca", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "nerdpol.ch", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "net2o.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, @@ -14283,9 +14262,7 @@ { "name": "007-preisvergleich.de", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "alumni-kusa.jp", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "ablak-nyilaszaro.info", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, - { "name": "99599.net", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "90smthng.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, - { "name": "99599.fi", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "asmui.ga", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "baka.network", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "actualite-videos.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, @@ -14941,7 +14918,6 @@ { "name": "mitsign.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "kondou-butsudan.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "michaeltruskowski.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, - { "name": "homeexx.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "maximilian-graf.de", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "melodrom.de", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "momentumdash.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, @@ -15387,7 +15363,6 @@ { "name": "wingos.net", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "vksportphoto.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "vrijstaandhuis-in-zwartewaterland-kopen.nl", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, - { "name": "wormdisk.net", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "wsdcapital.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "villasenor.online", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "wooviet.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, @@ -16385,7 +16360,6 @@ { "name": "inebula.it", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "ithakama.cz", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "irish.dating", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, - { "name": "edition-sonblom.de", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "jangho.me", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "injertoshorticolas.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "horeizai.net", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, @@ -16428,7 +16402,6 @@ { "name": "jiaidu.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "jinshuju.net", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "joscares.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, - { "name": "jiangzm.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "jakobssystems.net", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "klickstdu.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "jm-bea.net", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, @@ -16831,7 +16804,6 @@ { "name": "outerlimitsdigital.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "notcompletelycorrect.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "paradise-engineering.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, - { "name": "onfarma.it", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "ordernow.at", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "nutikell.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "passthepopcorn.me", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, @@ -17643,7 +17615,6 @@ { "name": "alexs.de", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "androidtamer.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "andarpersassi.it", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, - { "name": "andro4all.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "aqualife.com.gr", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "apcube.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "apartment-natik.fr", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, @@ -17745,7 +17716,6 @@ { "name": "agridir.site", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "asepms.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "bbwteens.org", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, - { "name": "begabungsfoerderung.info", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "betseybuckheit.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "bebeefy.uk", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "biggreenexchange.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, @@ -21034,7 +21004,6 @@ { "name": "arcadiaeng.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "arcaik.net", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "arckr.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, - { "name": "area536.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "argb.de", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "argennon.xyz", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "argot.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, @@ -21127,7 +21096,6 @@ { "name": "benbozsa.ca", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "benchcast.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "beneri.se", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, - { "name": "benjaminjurke.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "benleemd.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "benscobie.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "bertholdsson.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, @@ -22506,7 +22474,6 @@ { "name": "loovto.net", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "loss.no", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "lostkeys.co.uk", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, - { "name": "lou.lt", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "louisvillecarguys.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "loveandloyalty.se", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "lovelive-anime.tk", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, @@ -22699,7 +22666,6 @@ { "name": "mintosherbs.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "minube.co.cr", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "mipymesenlinea.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, - { "name": "missionsgemeinde.de", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "misssex.de", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "missycosmeticos.com.br", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "mister-cooks.fr", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, @@ -25389,7 +25355,6 @@ { "name": "islief.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "ipal.tel", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "intimici.com.br", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, - { "name": "intermax.nl", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "jackyliao123.tk", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "jackingramnissanparts.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "iris-design.info", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, @@ -25591,7 +25556,6 @@ { "name": "labella-umbrella.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "lenyip.works", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "latabledebry.be", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, - { "name": "kiwiplace.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "klaim.us", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "le0.me", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "lejardindesmesanges.fr", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, @@ -26250,7 +26214,6 @@ { "name": "public-g.de", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "reldoc.com.mx", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "public-projects.de", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, - { "name": "ptrujillo.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "remedyrehab.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "rathgeb.org", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "purrfectcams.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, @@ -26588,7 +26551,6 @@ { "name": "stichtingliab.nl", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "swarfarm.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "superguide.com.au", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, - { "name": "spolwind.de", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "stellen.ch", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "substitutealert.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "sturge.co.uk", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, @@ -27535,7 +27497,6 @@ { "name": "currentobserver.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "dermediq.nl", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "dengode.eu", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, - { "name": "deped.blog", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "criadorespet.com.br", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "dcautomacao.com.br", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "daren.com.br", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, @@ -27818,7 +27779,6 @@ { "name": "hampshiretechservices.co.uk", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "healthmatchapp.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "hausundhof.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, - { "name": "hardtime.ru", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "hexr.org", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "dynamics-365.no", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "h2s-design.de", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, @@ -28873,7 +28833,6 @@ { "name": "vosky.fr", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "wastrel.ch", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "weepycat.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, - { "name": "welby.cat", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "varela-electricite.fr", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "vibrashop.com.br", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "viscoelastico.com.br", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, @@ -29295,7 +29254,6 @@ { "name": "great.nagoya", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "halitopuroprodutos.com.br", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "hanys.xyz", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, - { "name": "haogoodair.ca", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "helpstarloja.com.br", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "homesandal.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "hotcandlestick.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, @@ -29540,7 +29498,6 @@ { "name": "beehive.govt.nz", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "ben2.co.il", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "bengalurugifts.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, - { "name": "besthotsales.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "beyondtodaymediagroup.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "bfrailwayclub.cf", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "bilimoe.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, @@ -30052,7 +30009,6 @@ { "name": "dlde.ru", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "dosyauzantisi.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "doyouedc.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, - { "name": "drchristinehatfield.ca", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "durexwinkel.nl", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "dwscdv3.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "eagleindustriesltd.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, @@ -30449,7 +30405,6 @@ { "name": "deephill.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "defman.me", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "defont.nl", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, - { "name": "deinfoto.ch", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "delicioustable.com", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "delogo.nl", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, { "name": "delta.ru", "policy": "bulk-18-weeks", "mode": "force-https", "include_subdomains": true }, @@ -33676,7 +33631,6 @@ { "name": "135vv.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "5chat.it", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "8tech.com.hk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "91dh.cc", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "91lt.info", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "99998522.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "a1798.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -34225,7 +34179,6 @@ { "name": "webanker.sh", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "webdesignplayground.io", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "webmotelli.fi", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "weebsr.us", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "wejumall.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "westhillselectrical.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "westlakevillageelectrical.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -34948,7 +34901,6 @@ { "name": "grayowlworks.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "grinnellplans.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "grootinadvies.nl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "groupe-neurologique-nord.lu", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "guhei.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "guillaume-briand.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "ha6.ru", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -36973,7 +36925,6 @@ { "name": "david-reess.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "davidbuckell.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "davidpescarolo.it", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "dekoh-shouyu.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "delorenzi.dk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "depot-leipzig.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "deukie.nl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -37026,7 +36977,6 @@ { "name": "electricalmalibu.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "electriccitysf.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "elementshop.co.uk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "elenatranslations.nl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "elkoy.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "emanueleanastasio.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "engie-laadpalen.nl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -37360,7 +37310,6 @@ { "name": "realvnc.help", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "recuperodatiraidfastec.it", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "regoul.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "reisenbauer.ee", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "reliant3sixty.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "remedi.tokyo", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "remi-saurel.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -38430,7 +38379,6 @@ { "name": "brainsik.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "brightonzhang.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "brimspark.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "brimspark.systems", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "broodbesteld.nl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "bsd.com.ro", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "buddhismus.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -39022,7 +38970,6 @@ { "name": "10439.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "10453.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "10495.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "10774.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "10840.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "10v2.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "124133.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -39534,7 +39481,6 @@ { "name": "mobiletry.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "monkay.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "montredeal.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "moo.pet", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "mruganiepodspacja.pl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "mtrip.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "mulenvo.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -40241,7 +40187,6 @@ { "name": "threema.ch", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "time.sh", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "tischlerei-klettke.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "tomd.ai", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "tomsdevsn.me", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "topeyelashenhancerserumreviews.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "topworktops.co.uk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -41111,7 +41056,6 @@ { "name": "fahrschule-laux.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "ferrariadvisor.it", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "fhba.com.au", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "flightschoolusa.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "fohome.ca", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "freshislandfish.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "fysiotherapieapeldoornzuid.nl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -41428,7 +41372,6 @@ { "name": "novilidery.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "novodiegomaia.com.br", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "office-discount.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "onionplay.live", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "onyxgen.duckdns.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "orbu.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "oryva.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -41967,7 +41910,6 @@ { "name": "oakesfam.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "objectif-leger.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "odpikedoslike.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "okotoksbeach.ca", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "olgun.eu", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "ollieowlsblog.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "onazikgu.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -42027,7 +41969,6 @@ { "name": "romantica-hotel.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "romar-bos.nl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "rothe.io", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "route-wird-berechnet.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "rritv.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "sacprincesse.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "safestore.io", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -43941,7 +43882,6 @@ { "name": "esw07.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "esw08.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "esw09.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "etfacta.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "etskinner.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "euanbarrett.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "eurocenterobuda.hu", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -45180,7 +45120,6 @@ { "name": "karlin.run", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "katagena.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "kazakov.lt", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "kelp.agency", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "keybored.co", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "kgregorczyk.pl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "kibea.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -45366,7 +45305,6 @@ { "name": "rapidoo.com.br", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "raspii.tech", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "rctalk.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "rebtoor.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "rectecforum.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "redcatrampageforum.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "reher.pro", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -47297,7 +47235,6 @@ { "name": "kersmexico.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "keyhomechecker.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "kiwi.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "kloudboy.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "krazyboi.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "krey.is", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "krishnenduayur.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -47598,7 +47535,6 @@ { "name": "winch-center.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "winwitharval.co.uk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "wischu.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "wordpress-test.site", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "world-lolo.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "wrathofgeek.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "wxdisco.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -48867,7 +48803,6 @@ { "name": "yoast.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "yoppoy.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "you2you.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "yourstake.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "zacco.site", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "zerowastesavvy.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "zionnationalpark.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -49418,7 +49353,6 @@ { "name": "myconnect.cn", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "mycookrecetas.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "myhuthwaite.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "mypizza-bremen.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "mypnu.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "myred.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "myzhili.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -49651,7 +49585,6 @@ { "name": "test-achats.be", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "theatre-schools.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "thepharm.co.nz", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "therapiemi.ch", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "thetotalemaildelivery.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "theverybusyoffice.co.uk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "thewayofthedojo.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -49836,7 +49769,6 @@ { "name": "coinroom.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "complexorganizations.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "comvos.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "cordejong.nl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "corvax.kiev.ua", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "cpe-colleg.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "cplala.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -50282,7 +50214,6 @@ { "name": "dreammakerremodelil.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "dreammakerutah.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "dui805.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "dzivniekubriviba.lv", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "e6ex.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "eastsideroofingcontractor.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "easyeigo.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -50477,7 +50408,6 @@ { "name": "reddyai.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "redsquarelasvegas.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "reinhardtsgermanautorepair.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "remptmotors.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "resourcesmanagementcorp.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "ricksfamilycarpetcleaning.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "rideways.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -50749,7 +50679,6 @@ { "name": "coltellisurvival.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "commeunamour.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "consegnafioridomicilio.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "constitution.website", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "copydz.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "corpuschristisouthriver.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "costcoinsider.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -51779,7 +51708,6 @@ { "name": "bunnydiamond.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "butikpris.se", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "buysuisse.shop", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "bytecrafter.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "bytecrafter.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "c3woc.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "cachedview.nl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -52367,7 +52295,6 @@ { "name": "medecine-esthetique-du-calaisis.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "mediabogen.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "medikalakademi.com.tr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "megamp3.eu", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "meimeistartup.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "meisterlabs.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "meistertask.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -53176,7 +53103,6 @@ { "name": "lambdaof.xyz", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "lammersmarketing.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "laupv.online", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "laurensvanderblom.nl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "letertrefleuri.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "leviathan-studio.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "lewdgamer.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -53278,7 +53204,6 @@ { "name": "savilleassessment.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "sberna-fotofast.cz", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "schmitt-etienne.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "schwano-dent.at", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "seb-net.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "sesrdcem.cz", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "sgrmreproduccionapp.azurewebsites.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -57132,7 +57057,6 @@ { "name": "dobre-programy.xyz", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "dobreprogramy.pro", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "domy-drewniane-kanadyjskie.pl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "doortim.nl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "dp2.com.br", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "drake.partners", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "draycotthotel.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -57255,7 +57179,6 @@ { "name": "noleggioimbarcazioni.it", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "noob-rp.ru", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "norfolkgardencare.co.uk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "noteshare.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "nyconcretelifting.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "obrobka-zdjec.pl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "odeonentertainment.co.uk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -57588,7 +57511,6 @@ { "name": "kaisab.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "kaktuskola.se", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "karrot.world", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "kastgroup.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "keevault.pm", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "kevindavid.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "keywalker.co.jp", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -58830,7 +58752,6 @@ { "name": "blocknodes.live", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "blueplumbinggroup.com.au", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "bluewizardart.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "bogosity.tv", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "bourseauxservices.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "breard.tf", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "brisignshop.com.au", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -58961,7 +58882,6 @@ { "name": "kingtreeexperts.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "kinmunity.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "korup.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "kriptokereso.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "krzyzowki123.pl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "kuaiyaojing.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "lalucepulsata.it", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -59162,7 +59082,6 @@ { "name": "2502.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "2525admin.nl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "27000.best", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "276112.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "276117.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "281116.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "311191.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -59445,7 +59364,6 @@ { "name": "dolph.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "domainspeicher.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "dominctheroofguy.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "domznak.ru", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "dorco.be", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "drawchan.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "dreamcraft.su", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -59479,7 +59397,6 @@ { "name": "emigratieplanner.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "enderle.cloud", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "energy-healings.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "enterclaim.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "enteres.eu", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "erclaim.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "ernal.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -60959,7 +60876,6 @@ { "name": "laudablesites.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "laudwein.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "lay1688.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "lettersblogatory.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "lev103.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "li756.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "lifestylefoto.cz", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -60998,7 +60914,6 @@ { "name": "mikemooresales.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "minmaxgame.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "mm4447761.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "mojt.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "monsecretariat.pro", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "moonboys.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "morvo.mx", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -61561,7 +61476,6 @@ { "name": "hitflow.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "hollowwinds.xyz", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "honigdealer.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "hrbrt.nl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "hsiwen.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "hyper.lol", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "hytzongxuan.top", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -63203,7 +63117,6 @@ { "name": "romancoinsforsale.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "roya-holding.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "royalfitnesschennai.in", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "royveenendaal.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "rpoplus.nl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "rr6729.co", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "rr6957.co", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -63799,7 +63712,6 @@ { "name": "artsmarket.ca", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "artyengine.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "asananutrition.co.uk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "axone-computers.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "azlocalbusiness.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "backmitra.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "backmitra.nl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -64791,7 +64703,6 @@ { "name": "skolni-system.eu", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "smartplace.ro", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "southernlights.cf", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "speedyjanes.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "srb.help", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "srx.sx", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "stuartbell.uk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -67570,7 +67481,6 @@ { "name": "li.gz.cn", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "liberty-city.tk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "librarium.tk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "libruis.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "lifekirov.tk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "liftmastercloud.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "lightcraftmc.tk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -70536,7 +70446,6 @@ { "name": "evntage.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "exechip.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "extinctionrebellion.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "fapflix.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "feltons.me", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "finext.cz", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "fishme.in", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -70657,7 +70566,6 @@ { "name": "otooil.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "ottxz.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "otzyvy2.ru", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "ovodev.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "pagamentosdigitais.pt", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "parsuv.ir", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "payment.ac.cn", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -70708,7 +70616,6 @@ { "name": "smartpheromones.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "smartsitio.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "solyplaya.info", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "someog.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "somosbrujas.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "songdew.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "sormeyli.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -71080,7 +70987,6 @@ { "name": "securewebcomputing.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "sellmyphone.co.uk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "shelfplanner.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "shopmacher.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "simpleshirts.us", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "sjwheel.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "sk33t.cf", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -72386,7 +72292,6 @@ { "name": "onlycrumbsremain.co.uk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "orxideya.az", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "osszekotatermeszettel.hu", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "owner.pw", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "partiono.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "peawo.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "photosgaia.ch", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -73262,7 +73167,6 @@ { "name": "creareup.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "credito360.pt", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "creditorapido.pt", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "crfcap.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "criptoinvest.pt", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "cristianuibar.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "crossword.city", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -73539,7 +73443,6 @@ { "name": "souleymanecamara.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "souzanabellydance.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "sqreemtech.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "stickyricelove.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "storgaarddieu.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "strick-welt.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "studiotres.com.br", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -73945,7 +73848,6 @@ { "name": "g00228.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "galeriakobylarz.pl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "gchc.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "geohoney.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "getbookked.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "getsmarterinsurance.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "goc4wraps.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -74088,7 +73990,6 @@ { "name": "sexyfotosvandep.nl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "shahpurjat.xyz", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "shearin.pro", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "shixuen.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "shotsleeve.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "shulyaka.org.ru", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "sinanaydemir.com.tr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -74452,7 +74353,6 @@ { "name": "js638.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "js6868.cc", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "juliaknightly.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "justimports.com.br", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "jyoba.co.jp", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "kas.ie", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "kelis.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -74830,7 +74730,6 @@ { "name": "divjak.at", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "dmarcian.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "doadaybook.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "doanhnhankhanhhoa.vn", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "doinaruscior.eu", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "drradin.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "dspropertyservicesltd.co.uk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -76224,7 +76123,6 @@ { "name": "bomhard.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "boundaryvets.co.uk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "bracknellvets.co.uk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "brainboxai.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "brindice.com.br", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "broadwayvets.co.uk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "bszoft.hu", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -76588,7 +76486,6 @@ { "name": "rtveen.nl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "rugeley-vets.co.uk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "samcentertech.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "saulsplace.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "saulsplacehealth.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "saulsplacewebdesign.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "saulvanderbijl.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -78232,7 +78129,6 @@ { "name": "casasparaperross.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "cash.me", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "cash.nyc", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "casio.bg", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "castelnuovo.xyz", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "catprincess.com.tw", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "celsoazevedo.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -78945,7 +78841,6 @@ { "name": "communiquons.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "comoviajarcontumascota.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "cpsecureapp.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "cqvradio.ddns.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "cursomente.online", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "d81365.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "d82365.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -79876,7 +79771,6 @@ { "name": "v51365.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "vanstoftotleven.nl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "vedev.io", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "vetar.ro", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "virtualvitrine.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "vitavista.io", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "vivediabetes-sanamente.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -79999,7 +79893,6 @@ { "name": "agproducts.co.uk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "albergolafiorita.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "alfadlmedical.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "allentertainment.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "alpha-shop.gr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "alziamoiltetto.it", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "amarreconbrujeria.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -81854,13 +81747,11 @@ { "name": "laanius.dk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "labelfactory.nl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "lacledeslan.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "lasvegasgfegirls.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "ldts.es", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "lecatal.ca", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "leendebroekertfonds.nl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "legendary-royale.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "lehouerou.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "lemuelbriza.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "lexblog.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "leybelsgarden.cf", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "lifesharing.gr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -82677,7 +82568,6 @@ { "name": "adn-recrutement.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "adnotam.ch", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "adotta.me", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "adpot.xyz", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "adregain.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "adregain.ru", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "adriarae.xyz", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -83660,7 +83550,6 @@ { "name": "tiltedscalescollective.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "tinkererstrunk.co.za", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "tiqets.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "tischlerei-geher.at", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "tjcnb.vip", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "tloschinski.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "tobdesignfirm.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -83763,7 +83652,6 @@ { "name": "xtom.pt", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "yasic.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "yigujin.cn", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "yourwatchdesign.co.uk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "yrcc878.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "ze-com.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "zeilenvoorondernemers.nl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -84258,7 +84146,6 @@ { "name": "klempin.network", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "klen.ua", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "klondike-pool.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "klusservice-utrecht.nl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "knabstrup-autoophug.dk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "knapp.pro", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "kontist.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -84599,7 +84486,6 @@ { "name": "smileswimmers.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "smtouseef.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "smxconventioncenter.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "snp-media.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "socstation.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "solovey.su", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "sominemo.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -84736,7 +84622,6 @@ { "name": "w1nter.xyz", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "wacken666.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "waffleindex.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "walkinweb.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "wasserpflanzen-freunde.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "watgroeitwaar.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "watgroeitwaar.eu", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -86799,7 +86684,6 @@ { "name": "hannde.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "harvilldesigns.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "hebamme-sabine.eu", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "hehome.xyz", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "hemant.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "hf51-domeinen.nl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "hitokoto.cn", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -96146,7 +96030,6 @@ { "name": "theaterfrederik.tk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "theatresuite.tk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "thebarkofhinkle.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "thebearcanread.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "thebestnews.ga", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "thebestshopping.tk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "thebigbigworld.tk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -98274,7 +98157,6 @@ { "name": "hesbenergie.be", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "hgyo.me", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "hibrid-turf.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "highqappliance.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "hillcrestplumber.co.za", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "homeostase.pt", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "honey-tr.xyz", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -98442,7 +98324,6 @@ { "name": "protection-plexi.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "psychologue-grenoble.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "ptcmonitoring.ir", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "punjabdirectory.in", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "punjabitube.xyz", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "pvpheroes.gg", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "q3jlzwq.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -99870,7 +99751,6 @@ { "name": "nesta.ie", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "netim.pl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "nightdreamer.me", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "niunaimilk.cn", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "nobs.no", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "non0.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "nowcomplete.com.br", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -101527,7 +101407,6 @@ { "name": "minapan.ro", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "miraclesformya.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "misterd.ml", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "misterorion.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "mlada-moda.cz", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "mlirb.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "mlpvcdn.top", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -101609,7 +101488,6 @@ { "name": "reiff-schlauchkonfigurator.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "remediohalkiparaladiabetes.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "renaudmuller.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "restaurantbetriebe.schwarz", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "riseofthewildwoman.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "roge.pw", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "routerchart.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -101769,7 +101647,6 @@ { "name": "behtarin10.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "bereelcorporation.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "besox.be", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "bigone.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "blackhealthwealth.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "blightnight.games", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "blightnight.live", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -101965,7 +101842,6 @@ { "name": "kiplelive.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "kojiishikawa.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "koredia.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "kosterenpartners.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "krilotek.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "kswork.life", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "labelledigital.com.br", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -102683,7 +102559,6 @@ { "name": "asesoramientosolay.es", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "ashevillemenshealth.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "asian-rugby-exchange-fest.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "asitanc.cz", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "asm802.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "asm802.es", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "asoziales-netzwerk.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -102696,7 +102571,6 @@ { "name": "bandaumnikov.ru", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "belzlongroup.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "benjaminleupold.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "besiconstruct.be", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "bestsiteporn.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "betalgroup.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "betterbusiness.xyz", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -102776,7 +102650,6 @@ { "name": "dela.com.ar", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "deltav.ml", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "dendi-staging.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "depedtambayan.blog", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "depedtambayan.net.ph", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "deportes.in", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "dienmattroichonthanh.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -102883,7 +102756,6 @@ { "name": "lagloriadehuampani.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "lajas.com.ve", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "laoudit.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "larenas.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "ldbeauty.com.br", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "leo.co.ke", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "letriolet-tignes.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -103032,7 +102904,6 @@ { "name": "sentralshop.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "shakalaka.co.za", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "shincastella.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "shoppingjin.pk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "sieliakus.nl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "sincromyl.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "sitinjau.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -103834,7 +103705,6 @@ { "name": "gabe.watch", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "ganaderosdeceres.com.ar", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "gaytubec.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "genlack.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "gentlent.biz", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "giddyhub.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "gil.re", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -104175,7 +104045,6 @@ { "name": "armycyberchallenge.xyz", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "arquidigital.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "artgranit.tk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "artintend.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "arxcs.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "asanuma-clinic.jp", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "athensvantours.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -104602,7 +104471,6 @@ { "name": "theater-8.ch", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "thedaleyclan.hopto.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "theeliteneet.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "thefireandthefreaks.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "thefooddictator.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "themindpedia.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "theoldnews.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -104954,7 +104822,6 @@ { "name": "kiseimarriage.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "klinto.nl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "kokica.si", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "kokotaru.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "lafyne.eu", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "lagunaklub.tk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "lasvegascasinonews.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -105499,7 +105366,6 @@ { "name": "londoncarpetcleaningltd.co.uk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "longlivehongkong.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "lotustreasurechest.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "maalexi.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "macautocouture.gq", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "makemillion.tk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "malwaredevil.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -105610,7 +105476,6 @@ { "name": "powderedcloud.ga", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "powerpadel.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "previstart.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "prij.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "primalsurvivor.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "privacysvcs.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "proekt.tk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -106196,7 +106061,6 @@ { "name": "sealandair.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "sendai-cc.jp", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "sendai-cooking.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "sensualgoth.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "seocluj.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "sersanto.com.br", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "sfeerhuisbaan.nl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -106898,7 +106762,6 @@ { "name": "coggin.church", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "coldfusion.co.jp", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "colean.cc", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "contemplativelens.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "contenedoresdereciclaje.online", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "contributopia.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "coolink.pub", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -107722,7 +107585,6 @@ { "name": "bergvallsmassage.se", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "bestdietpillss.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "beyondgameplay.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "bintelligence.cl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "bismuthzone.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "bisq.wiki", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "bitcoinkaufen.club", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -109186,7 +109048,6 @@ { "name": "windev.es", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "wisatabagus.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "wisetechglobal.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "wisv.ch", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "witcher.tk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "wolflabs.co.uk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "wonderzeal.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -110218,7 +110079,6 @@ { "name": "hoymedivorcio.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "i2capmark.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "ichtushosting.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "idigovs.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "ihgcontrolbook.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "infopreneur.blog", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "internetpoem.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -110232,7 +110092,6 @@ { "name": "jollytotschildminder.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "joshuakin.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "julian.tech", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "jwbworks.dk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "kapilarya.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "kdcinfo.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "ketopower.club", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -110598,7 +110457,6 @@ { "name": "ertebatatjelve.ir", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "espace.network", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "esporters.today", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "everydaymarts.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "familiaconfort.com.ar", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "familytrees.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "farmocracy.in", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -110731,7 +110589,6 @@ { "name": "noachgilor.co.il", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "novelas.net.br", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "nuggy.io", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "ojk.ee", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "olydemy.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "oneearthsacredarts.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "open-trip.id", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -110879,7 +110736,6 @@ { "name": "atabekkoleji.k12.tr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "atozeventrentalsofpa.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "avbcdn.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "bad.spdns.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "bafwsprod-bafwsprodnew.azurewebsites.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "barratelecom.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "bayareagynecology.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -111141,7 +110997,6 @@ { "name": "perfect-tour.ro", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "perfectsmilesdentistry.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "perfumesweb.com.br", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "peterlmai.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "pickybeast.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "pilsen.fun", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "planetapolska.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -113508,7 +113363,6 @@ { "name": "mfg-fx.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "miacuario.cl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "microbird.club", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "microfinance-crimea.ru", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "mirobuvi.com.ua", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "mlo.no", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "modernhouse.dk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -115210,7 +115064,6 @@ { "name": "mwstrategicservices.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "my-mobile-apps.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "mybookkeeper-perth.com.au", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "mybuddycare.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "mychurchisalive.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "mycutebee.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "myeducationalplatform.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -115516,7 +115369,6 @@ { "name": "thegreatgonzo.uk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "thegreenlivingsolution.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "thehouseofchronic.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "theprimetalks.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "thereadingresidence.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "theseonoob.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "theveggietable.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -116029,7 +115881,6 @@ { "name": "astrologic.cf", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "astrostart.tk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "astucedirecte.tk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "atakac.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "athenainvestmentsystems.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "athenainvsys.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "athenaspark.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -117608,7 +117459,6 @@ { "name": "hot101fm.tk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "hotelfloresta.tk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "hottoys.tk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "house-cleaning-howtos.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "household-appliances.tk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "houstonhomerevival.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "howlinhawk.tk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -117836,7 +117686,6 @@ { "name": "kaiseraerospace.tk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "kaliforniya.tk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "kalinka-shop.tk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "kaltoft.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "kamandula.tk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "kamareddine.tk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "kampffische.tk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -118213,7 +118062,6 @@ { "name": "marina-group.tk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "mariogb.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "marketbasket.tk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "marketerprofesional.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "markhoodphoto.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "markusribs.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "marlenefavela.tk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -119727,7 +119575,6 @@ { "name": "waldenwritingcenter.ml", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "waldo.tk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "waldparkerwoelfe.tk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "walkfordogs2017.nl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "walkingranada.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "wallada.tk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "wallbanksweb.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -120905,7 +120752,6 @@ { "name": "n95.news", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "n95s.tech", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "nadinecays.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "nelsondiazrodriguez.tk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "neonfestival.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "neoreflex.nz", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "nephrogo.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -121944,7 +121790,6 @@ { "name": "bulgakov.ml", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "bulgarianhouse.tk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "buratino.tk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "bureaubraam.nl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "burevestnik.tk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "bursapartner.tk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "busflag.tk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -124365,7 +124210,6 @@ { "name": "hazelkid.tk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "hcg-injections.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "headlineclub.gr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "heapsofheaven.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "heartlandtownandcountry.tk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "heartofthecontinent.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "heidirange.tk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -126371,7 +126215,6 @@ { "name": "nicestudio.co.il", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "nichearticlegalore.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "nicher.tk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "nickhawn.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "nightblue.ml", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "niket.site", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "nimi-group.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -127493,7 +127336,6 @@ { "name": "appointer.ua", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "apropotv.tk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "apssb.in", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "aquaticbyte.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "arabedia.tk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "aradpulse.tk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "ariaman.tk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -127536,7 +127378,6 @@ { "name": "b-designer.tk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "babblefeed.tk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "babehunt.tk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "babuccu.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "back-links.ga", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "baclofen.ga", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "bacus.ga", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -128501,7 +128342,6 @@ { "name": "that.host", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "thefootballbootseducator.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "thenutritionalreset.ca", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "thewiki.kr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "thikkodi.tk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "thomasdbrown.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "thueai.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -129005,7 +128845,6 @@ { "name": "debianizzati.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "deephouse.ovh", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "dehnermd.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "der-elite.blog", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "designpro.tk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "diademuertos.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "dianadeluxe.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -132082,7 +131921,6 @@ { "name": "bergwandercamp.info", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "berkswatertech.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "bestdeal.co.in", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "besthorsebedding.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "bethanymo.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "beton-vloer.nl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "betonvloerpolijsten.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -133707,7 +133545,6 @@ { "name": "cstmo.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "cuban.wiki", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "cuoredesigns.tk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "custplace.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "cuyahogacommunitycollege.tk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "cybertechelectronicstt.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "cyclingverse.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -134180,7 +134017,6 @@ { "name": "scandata.cf", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "schemmel.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "schuurmanopleidingen.nl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "sciencephilanthropyalliance.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "sclub7esp.tk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "scoutnation.tk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "screenstotaalshop.nl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -134354,7 +134190,6 @@ { "name": "workathomeideas.tk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "workathomeopportunities.tk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "wuppertaler-frettchensitterin.tk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "wzutti.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "xenoscopic.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "xmdhs.top", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "xsv.cn", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -134843,7 +134678,6 @@ { "name": "instantphotofilm.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "intakings.tk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "interlapse.tk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "intigriti.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "isc2estoniachapter.ee", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "isofre.ir", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "istanbulbogazicienstitu.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -135005,7 +134839,6 @@ { "name": "pajbot.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "palfut.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "palmarinaestrada.com.br", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "parketsn.ru", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "partofthequeue.cf", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "passer.ga", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "paulopeters.com.br", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -135158,7 +134991,6 @@ { "name": "sumatrabarat.tk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "sumatraselatan.tk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "sumatrautara.tk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "sunset.goip.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "supercontent.tk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "swingstel.tk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "syds.xyz", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -135442,7 +135274,6 @@ { "name": "amitriptylineonline.tk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "amministratoristabilitorino.tk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "anaaldea.tk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "anahtarfikir.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "anakliarmalam.ml", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "anarky.tk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "andoaingo-gaztetxea.tk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -136665,7 +136496,6 @@ { "name": "jabramson.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "jabramson.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "jajce.tk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "jalish.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "jaloozone.ml", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "janbennink.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "janik.cz", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -138108,7 +137938,6 @@ { "name": "weplantinc.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "weple.ga", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "westmidlandsrailway.co.uk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "wetten.eu", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "wewhydrogen.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "whanglaw.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "whatabout.ga", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -138944,7 +138773,6 @@ { "name": "sunbake.co.za", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "svedorszag.tk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "sysstate.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "systemische-praxis-darmstadt.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "szinezdmagad.hu", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "tarus.gq", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "tbatr.tk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -139549,7 +139377,6 @@ { "name": "glacialexperience.is", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "gmavsg.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "golfturkey.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "gorgeouspizza.co.nz", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "govtnaukrinews.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "grapheneos.ca", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "grapheneos.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -140540,7 +140367,6 @@ { "name": "cusgpwoerden.nl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "customizedcelebrations.co.uk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "cybersafellc.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "cyrians.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "d500world.tk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "danceworld.tk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "darlenenbocek.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -140787,7 +140613,6 @@ { "name": "kamer.nl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "kangbo.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "karjuya.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "karlswift.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "kelteks.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "kemet.com.au", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "kermispagina.tk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -141768,7 +141593,6 @@ { "name": "drewfuller.tk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "drink-team.tk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "drinking.tk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "drmartindentistry.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "dropsdesign.tk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "dubcowa.tk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "dubolom.tk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -143713,7 +143537,6 @@ { "name": "charles-migaud.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "chirality.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "chrisogedengbe.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "christian-garo.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "cinco-ind.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "cinicostudio.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "cjaconsultoria.online", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -143923,7 +143746,6 @@ { "name": "lifamily.xyz", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "lightning.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "litterfreeriversandstreams.eu", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "littleson.com.br", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "local-maintenance.co.uk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "location-vacances-campello.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "lojasoulstyle.com.br", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -144175,7 +143997,6 @@ { "name": "ticnom.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "timomontalto.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "tobiasheinze.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "toftered.se", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "tomoarigato.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "toponlinecasino.be", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "toskavista.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -144679,7 +144500,6 @@ { "name": "rzero.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "sadhanaclub.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "salone-mio.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "sayfr.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "sb.ax", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "sbermobile.ru", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "screamingrooster.co.nz", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -145371,7 +145191,6 @@ { "name": "sanitation-planning-tool.herokuapp.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "sansairyu-kuyoukai.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "saskialund.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "saya.gg", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "sber-solutions.kz", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "sbpk.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "scapin.dk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -145894,7 +145713,6 @@ { "name": "reducer.co.uk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "refpa.top", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "reidasofficial.lt", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "reindeere.ca", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "rejuvetclinicpromotion.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "reliablemojo.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "reliantpropertygrpri.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -146285,7 +146103,6 @@ { "name": "igpromo.com.br", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "ilikevaping.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "imksk.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "imoe.fun", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "imranc.ca", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "individualrestaurants.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "inmobanking.com.gt", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -146927,7 +146744,6 @@ { "name": "reduktorntc-k.com.ua", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "reeladventurefishing.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "reroll.tv", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "ridedott.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "roofingroyales.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "royalssl.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "royalssl.uk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -147163,7 +146979,6 @@ { "name": "chainwhy.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "chargeseo.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "chatkr.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "checkstubmaker.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "cienegaspa.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "citytoyota.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "claireeknowles.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -147179,7 +146994,6 @@ { "name": "codandn.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "coderpad.io", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "codowned.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "coeminna.edu.ng", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "cognitivehealthintl.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "coharushika.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "compassivaimoveis.com.br", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -147608,7 +147422,6 @@ { "name": "slowlove.es", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "smartdatafusion.jp", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "smmpropaganda.ru", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "smoothbucks.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "snaayu.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "snitko.pro", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "sofibox.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -148210,7 +148023,6 @@ { "name": "kendall.productions", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "key2perfection.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "khristov.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "kiesjeplek.nl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "kimsesizlereumutol.tk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "kiosque-famille.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "kipi.si", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -148256,7 +148068,6 @@ { "name": "maker.systems", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "makulatura.cf", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "malayalamtalkies.tk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "malekperiodontics.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "malflutningsstofan.is", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "maliweb.ml", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "mandolinexpert.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -149157,7 +148968,6 @@ { "name": "msscholz.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "muasamthongminh.xyz", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "mujoco.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "mundokia.com.co", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "musterihizmet.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "mwskwong.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "my-digital.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -149284,7 +149094,6 @@ { "name": "rufoelgato.com.mx", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "rugdesigngallery.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "rwcomerciorepresentacao.com.br", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "s3call.ddns.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "s3chat.ddns.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "s3file.ddns.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "saabplanet.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -149792,7 +149601,6 @@ { "name": "excelnutritional.com.br", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "exhpo.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "exoweb.ca", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "f-code.tech", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "f88vip120.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "f88vip51.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "f88vip52.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -150092,7 +149900,6 @@ { "name": "opuspremiumfilms.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "orangeturtle.tk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "orientelectronic.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "osteriabellavista.ch", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "otpbd.xyz", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "outloudradio.uk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "overca.sh", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -150336,7 +150143,6 @@ { "name": "ttr3.eu", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "tunbiya.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "turkodon.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "twinlakeestates.in", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "twotravel.world", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "txtsoc.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "tyroola.co.id", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -150634,7 +150440,6 @@ { "name": "inside-m2m.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "instagramdeposu.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "ip-cam-pro-cz.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "iqmarketing.nl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "ircom.com.ar", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "irrational.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "itcloud.ca", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -150744,7 +150549,6 @@ { "name": "pgp.org.au", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "pharmalab.eu", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "pharmalab.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "phigrupopolideportivo.es", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "pipa-shop.nl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "pitou-minou.ca", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "polimur.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -150995,7 +150799,6 @@ { "name": "colombian.cam", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "comswp.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "construccionesyequiposayala.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "contenized.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "cors.one", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "coursdejaponais.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "crawler.ml", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -151077,7 +150880,6 @@ { "name": "fenns.co.za", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "fermateh.com.ua", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "fionafuchs.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "fitint.ro", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "flexurity.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "florianysantiago.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "fmportal.biz", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -151301,7 +151103,6 @@ { "name": "rentptr.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "respawn-group.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "rfodistribution.co.za", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "rightship.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "rioloagolf.tk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "rnmkrs.co", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "rocket.is", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -151683,7 +151484,6 @@ { "name": "alturiak.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "altview.gq", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "always28.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "amadispa.com.br", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "amandamaedesign.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "amanohina.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "amateurprospog.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -152016,7 +151816,6 @@ { "name": "beuty-flowers.tk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "beyer-on-it.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "beyond-destiny.tk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "beyond.com.br", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "beyonds.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "bezdomny.tk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "bfsasia.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -152464,7 +152263,6 @@ { "name": "comprando.tk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "computingessentials.tk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "conall.io", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "concursocultural.com.br", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "condonline.app.br", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "conectada.tk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "conejicos.tk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -152592,7 +152390,6 @@ { "name": "dafuq.xyz", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "dailyfootballpredictions.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "dajaschoonheidsinstituut.nl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "dajaskincare.nl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "daleworley.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "dalilu.it", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "dallastexas.ml", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -152735,7 +152532,6 @@ { "name": "dirtymusic.tk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "disassemble.website", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "discord.me", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "discountisolatie.nl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "discountsales.ae", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "discoverucg.co.uk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "disidencia.tk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -152967,7 +152763,6 @@ { "name": "eol-team.tk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "eoncandles.co.nz", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "epasjans.pl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "epharma.com.br", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "epicentre-amsterdam.tk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "epiclegends.ml", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "epicqater.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -153132,7 +152927,6 @@ { "name": "filtromag.com.br", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "finaktiv.tk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "finalashes.tk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "financialopticshq.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "finchkeeper.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "finqk.nl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "finulo.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -154325,7 +154119,6 @@ { "name": "lifemalayalam.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "lifesoccer.tk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "ligacontrachetos.tk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "ligaro.nl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "light.law", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "lightvpn.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "lightworks.tk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -154543,7 +154336,6 @@ { "name": "masterstation.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "mastertutoriales.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "matchlive.ga", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "mathieu-marteau.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "mati.tk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "matomari.tk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "matomo.eu.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -154786,7 +154578,6 @@ { "name": "myahmed.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "myalarm.com.au", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "myalarm.eu.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "myalpine.shop", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "myandre.tk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "myarticlelibrary.cf", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "myblueprints.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -156170,8 +155961,6 @@ { "name": "trihard.space", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "triperapp.cn", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "triperapp.com.cn", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "triplapalma.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "tripoffice.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "triptravels.tk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "tritonshowers.co.nz", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "triumc.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -156396,7 +156185,6 @@ { "name": "viralcharcha.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "virtasktic.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "virtualpavilion.co", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "virtubroker.com.mx", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "virtueturkey.ga", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "virty.cz", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "virusmousepads.tk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -156828,7 +156616,6 @@ { "name": "2serious.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "2steel.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "2target.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "2tinteractive.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "2value.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "2x2x.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "7sec.com.br", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -157013,7 +156800,6 @@ { "name": "artemiy-plus.com.ua", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "artevos.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "articlesarea.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "artisreit.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "artsandculturessm.ca", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "ascom.vi.it", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "aseaction.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -157726,7 +157512,6 @@ { "name": "engbers.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "engso.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "enocstaging.azurewebsites.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "entireproductions.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "entwicklung.center", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "entzoneplan.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "environcom.co.uk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -157818,7 +157603,6 @@ { "name": "ferrybig.me", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "fertile.fund", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "fetchmonitors.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "ffwd.fm", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "fiekeoffringa.nl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "figl.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "filesoup.io", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -158067,7 +157851,6 @@ { "name": "hghotels.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "hiaus.net.au", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "highproxies.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "hightop.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "hikaru-studio.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "hikawa.top", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "hillhiker.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -158083,7 +157866,6 @@ { "name": "hopeforukraine.org.uk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "hopscotch.cz", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "hornyaf.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "horus.com.br", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "hostingorservers.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "hotel-4-stelle.it", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "hotel-altabadia.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -158505,10 +158287,8 @@ { "name": "leier.ml", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "leilakaleva.fi", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "leiriportti.fi", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "lekitable.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "lengoo.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "les-pros-du-drone.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "les-rastingles.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "lettucegeek.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "leuthardtfamily.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "leviathanj.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -158792,7 +158572,6 @@ { "name": "nadlan.immo", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "nafhomes.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "nalles.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "namastemarketingacademy.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "namoro.com.pt", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "nano.com.au", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "nascentmaker.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -159039,7 +158818,6 @@ { "name": "ourcrowd.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "ourmarket.live", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "ourtribe.space", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "oust.ch", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "outcasts-guild.eu", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "outgrow.co", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "outletapex.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -159952,7 +159730,6 @@ { "name": "thuisverplegingvandermeiren.be", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "tickertoolkit.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "tiejet.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "tiendamacoco.com.ar", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "tiktok-download.io", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "timoviveen.nl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "timtj.ca", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -160301,7 +160078,6 @@ { "name": "zucalgrappe.it", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "zummoricambi.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "zumturm.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "zwhblog.xyz", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "zyno.space", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "zzyzxphile.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "003.mx", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -160390,7 +160166,6 @@ { "name": "9nu.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "aaoth.xyz", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "abgrafstenen.nl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "abinferis.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "aboutlaserremoval.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "acasadoprodutor.com.br", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "accelerator.nyc", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -160659,7 +160434,6 @@ { "name": "domnaslonecznej.pl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "domowezrodlozdrowia.pl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "dongngu.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "doradosystems.es", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "dorfrock.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "drafts.fun", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "drchristaengelbrecht.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -160854,7 +160628,6 @@ { "name": "herasoft.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "hermann-hesse-kolleg.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "hersheyfeis.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "hessen.social", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "highlifegayrimenkul.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "hiiw.cloud", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "hiiw.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -161110,7 +160883,6 @@ { "name": "monsternet.pl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "monti.fi", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "moot-info.co.za", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "mor-charpentier.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "morleygrainger.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "morrharet.se", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "morselife.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -161450,8 +161222,6 @@ { "name": "swanvinylworks.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "sylwiaipiotr.pl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "systemysportowe.pl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "t8.software", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "t8software.com.hk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "taetomeister.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "talentplatform.ca", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "talentplatform.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -161641,7 +161411,6 @@ { "name": "yavelya.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "yep.co.za", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "yilmaznargile.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "yoga-m.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "yourpersonalfoodnesscoach.nl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "z.sh", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "zetflix.pro", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -161986,7 +161755,6 @@ { "name": "lighttp.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "linwenwen.fun", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "litemere.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "littlefool.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "logopedietaalrijk.nl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "lolo17.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "loveitclickitbuyit.com.au", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -162018,7 +161786,6 @@ { "name": "mrplates.co.uk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "mrplates.com.au", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "murahjerr.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "mutuelle-catalane.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "myveronanj.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "nanointeractive.cn", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "naturart.pt", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -162686,7 +162453,6 @@ { "name": "babaka.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "babycaring.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "babycn.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "babynamen.nl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "babyroad.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "babysface.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "bacam.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -164470,7 +164236,6 @@ { "name": "gastgeberin.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "gate4you.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "gbchina.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "gbfoundation.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "gbinfo.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "gbrowse.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "gbsapri.it", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -166651,7 +166416,6 @@ { "name": "palife.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "palmkid.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "palmsky.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "palucamoveis.com.br", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "pamoko.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "pamulang.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "panaceainfosec.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -169297,7 +169061,6 @@ { "name": "asesor.live", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "asuikit.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "atacadoclube.com.br", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "atelierdelacreation.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "atisoft.biz.tr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "atisoft.name.tr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "atisoft.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -169974,7 +169737,6 @@ { "name": "m2icondb.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "m3ntor.tech", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "maatt.ch", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "maatt.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "madamove.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "madebyinternet.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "magaaral.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -170056,7 +169818,6 @@ { "name": "multimalin.ovh", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "mwscouts.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "mybotti.eu", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "mycaviste.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "mycreditjunkie.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "mygermanuniversity.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "mynrg.gr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -170069,7 +169830,6 @@ { "name": "namespacesquatting.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "nannyandhousekeeper.uk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "narrow.one", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "nasecasomira.cz", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "naturelife.bg", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "naumd.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "nbgrp.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -170561,7 +170321,6 @@ { "name": "xn----8sbggtw.xn--p1ai", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "xn--eqr79j.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "xn--iet627k.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "xuexi.moe", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "yachtcrafter.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "yakbett.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "yamatonetwork.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -171232,7 +170991,6 @@ { "name": "pornaizle.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "poseidon-giesing.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "pravac.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "premiovicentejorgesilva.pt", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "prepaidify.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "prestaclip.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "prestigehealthservices.com.au", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -171357,7 +171115,6 @@ { "name": "tipmexico.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "tmobilethuis.nl.eu.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "tmpcdn.xyz", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "tobiichi3227.ddns.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "tokdeccor.com.br", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "tomaempleo.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "tonebuildingsupplies.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -171553,7 +171310,6 @@ { "name": "dantata1.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "data4.nl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "debrunet.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "debrunet.nl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "debrunet.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "demine.freeboxos.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "dgner.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -172279,7 +172035,6 @@ { "name": "seilergeodrones.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "seilermicro.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "senteon.co", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "serenitytvl.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "seypt.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "shiraz-coffee.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "shoppe561.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -172794,7 +172549,6 @@ { "name": "intercomcdn.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "intimmix.ru", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "inventoseinventores.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "investire.biz", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "iorn.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "iqredirect.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "irchat.cn", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -172883,7 +172637,6 @@ { "name": "mailwala.in", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "makefreecallsonline.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "mancaverevolution.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "mangakio.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "manh.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "maniac.msk.ru", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "manif-est.info", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -173019,7 +172772,6 @@ { "name": "passivebook.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "passportunlimited.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "payboy.click", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "paydollar.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "payfit.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "payproglobal.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "pband.ch", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -173301,7 +173053,6 @@ { "name": "wpmet.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "wsodownloads.io", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "wtxl.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "x17.ink", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "xboxplay.games", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "xn----7sbc3abak3afteia.xn--p1ai", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "xn--3btta.xn--fiqs8s", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -173519,7 +173270,6 @@ { "name": "eigp-plc.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "emaygroup.co", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "ember.co", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "emocionestlp.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "encoreglobal.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "energylocals.au", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "englishprovence.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -173530,7 +173280,6 @@ { "name": "eule82.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "evehryday.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "ever4cats.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "evitacion.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "exploretravellife.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "f88vip132.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "f88vip135.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -173656,7 +173405,6 @@ { "name": "mars-infos.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "masepps.pe", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "mastersindatascience.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "mataramasu.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "matchflix.ch", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "mawkebaljalal.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "maxim.live", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -173845,8 +173593,6 @@ { "name": "toplevel.nl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "touchfromtheheartmassagetherapyandreflexology.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "touhidur.studio", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "trastornoevitacion.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "trastornolimite.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "truyendichz.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "trveled.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "tvml.pl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -174065,8 +173811,6 @@ { "name": "alpha-kamera.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "alphabetaflora.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "alrioart.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "altiup.ch", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "altiup.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "alwistra.eu", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "amartours.pt", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "americatracker.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -174377,7 +174121,6 @@ { "name": "easttamakiauto.co.nz", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "eccouncil.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "ecfnj.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "edefrutos2020.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "edu3w.at", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "educard.co.at", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "eduflow.at", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -174402,7 +174145,6 @@ { "name": "envelopegroup.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "erafocus.nl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "erebuildings.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "ergoserv.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "eric.gg", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "eris-bj.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "erreguete.gal", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -175098,7 +174840,6 @@ { "name": "servtepstore.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "setupstreamers.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "sevenrooms.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "sevgitesisat.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "sfmason.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "sgtrains.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "shadrinsk-city.ru", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -175449,7 +175190,6 @@ { "name": "1serial.tv", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "1stinternet.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "1strecipes.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "1stsource.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "1sttix.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "1to4.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "1x-00.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -175772,7 +175512,6 @@ { "name": "accueil-paysan.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "acepi.pt", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "acheter-louer.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "achievers.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "acronis.events", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "acscu.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "acsour.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -175783,7 +175522,6 @@ { "name": "action.nl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "actionviewphotography.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "activationkeys.co", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "activationkeys.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "activeprospect.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "activityshelter.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "actualidad-rt.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -175810,7 +175548,6 @@ { "name": "adgreetz.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "adidasyeezys.us", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "adinaporter.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "adista.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "adit.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "adityaes.eu.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "adjusterpro.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -176848,7 +176585,6 @@ { "name": "blogsunit.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "blogtienao.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "blogville.us", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "blondish.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "bloobasket.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "bloombergtv.mn", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "bloomfire.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -176874,7 +176610,6 @@ { "name": "bnpparibas.es", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "bnpparibas.lu", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "bnpparibas.no", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "bnpparibas.ru", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "bnpparibascardif.com.ar", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "bo-1xbet.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "board-portal.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -177157,7 +176892,6 @@ { "name": "casinohex.se", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "casinologinaustralia.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "casinonederland10.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "casinoonlineca.ca", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "casinoreviews.net.nz", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "casinosanalyzer.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "casinoslotsww.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -177195,7 +176929,6 @@ { "name": "cciofficial.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "ccisystems.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "cck-law.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "ccl776o.tk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "ccmg.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "ccnb.ca", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "ccnbikes.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -177248,7 +176981,6 @@ { "name": "cgtips.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "chaikinanalytics.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "chaminadeonline.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "champagneandcoffeestains.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "champagneandshade.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "champw.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "changview.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -177326,14 +177058,12 @@ { "name": "cialismen.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "cialisrmed.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "cicybell.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "cigniti.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "cigotracker.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "cihr-irsc.gc.ca", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "cilipa.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "cimaroom.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "cinejoia.tv", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "cinfin.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "cinn.ml", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "cinnamon.gifts", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "cinnamon.gq", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "cinnamonspiceandeverythingnice.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -178180,7 +177910,6 @@ { "name": "eggplantsoftware.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "egroupware.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "egrow.io", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "egt.ee", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "eibak.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "eibich.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "eiffage.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -178441,7 +178170,6 @@ { "name": "eyefakes.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "eylea.us", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "eylog.co.uk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "ezalba.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "ezccindia.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "ezchemeu.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "ezeviral.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -178533,8 +178261,6 @@ { "name": "ferrari.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "ferreh.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "festileaks.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "festo.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "festo.online", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "fevo.us", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "ff15.eu", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "ffnm.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -178562,7 +178288,6 @@ { "name": "filmezzunk.hu", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "filmimpact.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "filmyporno.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "fin.ee", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "financemagnates.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "fincabank.kg", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "fincarebank.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -178573,7 +178298,6 @@ { "name": "finet.se", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "finfaq.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "fingerlakesgaming.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "fingerprint.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "fingerprintjs.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "finicity.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "finishmaster.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -178791,7 +178515,6 @@ { "name": "fruitfulenglish.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "fsconline.info", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "fsnb.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "ftxtr.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "fu110.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "fuckimm.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "fuelcycle.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -178886,8 +178609,6 @@ { "name": "geekermag.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "geli.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "geluidsverwachting.nl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "geminicorp.be", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "generali.com.tr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "generators-pro.ru", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "generix.biz", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "genial.ly", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -179030,7 +178751,6 @@ { "name": "governmentresume.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "govvacationrewards.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "gowlingwlg.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "gpltimes.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "gpridezone.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "gpskoordinaten.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "gradientthemes.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -179187,7 +178907,6 @@ { "name": "hdpornpicture.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "hdwetpussy.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "headed2.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "headinsider.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "headstrong.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "headsuphealth.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "healingfoundation.org.au", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -179597,7 +179316,6 @@ { "name": "infokosova.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "infonet.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "inforegister.ee", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "inform-software.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "informacionsexual.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "informationntechnology.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "infostor.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -179629,7 +179347,6 @@ { "name": "insurancehotline.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "insurancevlog.in", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "insurgo.cloud", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "insyde.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "integral-calculator.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "integral-calculator.ru", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "integralrechner.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -179781,7 +179498,6 @@ { "name": "jakeross.me", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "jakhroedits.tech", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "jakzostacmilionerem.biz", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "jala.tech", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "jamboree.online", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "jambox.pl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "jamesandeverett.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -179866,7 +179582,6 @@ { "name": "journals.ru", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "journaltimes.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "journaway.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "joyproject.com.br", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "jpan007.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "jpg.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "jpiamr.eu", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -179977,7 +179692,6 @@ { "name": "khatrimaza99.lol", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "khda.gov.ae", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "khiphach.vn", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "khn.nl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "khwiki.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "kiacatherine.sg", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "kickico.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -180064,7 +179778,6 @@ { "name": "krampus.pl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "kreasim32.co.id", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "kribofilm.site", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "kriis.ee", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "krik.rs", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "kriptokoin.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "kriptovijesti.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -180140,7 +179853,6 @@ { "name": "landgorilla.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "landingtransport.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "landkreis-augsburg.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "landmatrix.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "landverliebt.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "langauto.hu", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "languagecert.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -180525,7 +180237,6 @@ { "name": "manageairlinesbooking.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "mandalayogaspa.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "mandoemedia.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "manga-arts.eu", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "manga-boku-no-hero.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "manga-passion.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "manga-republic.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -180652,7 +180363,6 @@ { "name": "mebelradom.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "mec.gub.uy", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "mecalux.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "mecklenburgische.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "mecloudprinter.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "med-metrix.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "medalerthelp.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -180953,7 +180663,6 @@ { "name": "mrmeomeo.xyz", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "mrpricegroup.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "mru.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "ms-wissenschaft.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "msinc.ru", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "msoutlook.info", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "msuplants.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -181160,7 +180869,6 @@ { "name": "netcorecloud.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "netdnstrace1.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "netdox.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "netfront.com.au", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "netgroup.dk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "netgsm.com.tr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "netherite.gg", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -181273,7 +180981,6 @@ { "name": "nonpareilonline.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "noodlemagazine.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "noodlemagazine.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "norden.social", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "nordformstore.dk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "nordicway.dk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "norgesenergi.no", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -181288,7 +180995,6 @@ { "name": "nossoamigo.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "notebleue.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "noterro.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "notifiarr.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "notipress.mx", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "notube.cc", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "notube.io", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -181608,7 +181314,6 @@ { "name": "pandasilk.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "pandavpnpro.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "pandys.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "pangolin.exchange", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "paniniamerica.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "panmill.xyz", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "panoraven.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -181655,7 +181360,6 @@ { "name": "paripariparitraff.online", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "paripesa.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "paripesa.ng", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "paris.edu", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "parissportifs.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "parkable.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "parkmycloud.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -181735,7 +181439,6 @@ { "name": "pec-email.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "pec.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "peckway.co.uk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "pecs.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "pecsusa.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "peerberry.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "peerjs.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -182034,7 +181737,6 @@ { "name": "printableschedule.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "printersupportfaq.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "printme.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "prisma.io", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "privatelabelsupplements.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "privo.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "prix-carburants-info.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -182062,7 +181764,6 @@ { "name": "programminghomeworkhelp.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "proinfluent.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "projatt.com.mx", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "projecttopics.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "proletaren.se", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "prolikewoah.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "promecin.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -182416,7 +182117,6 @@ { "name": "resumehelp.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "resumehelp.io", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "resumenlatinoamericano.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "retool.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "retrofitness.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "retrohousewifegoesgreen.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "rettar.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -182535,7 +182235,6 @@ { "name": "rubix.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "rublon.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "rude.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "ruhanirabin.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "ruileitao.pt", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "rumahkeadilan.co.id", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "rumbomundo.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -182622,7 +182321,6 @@ { "name": "sapling.ai", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "sapphic.site", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "sapphirebet.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "sarahsoriano.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "sarems.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "sarkarijobcity.in", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "sarkariresultz.in", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -182824,7 +182522,6 @@ { "name": "sfv.se", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "sg-1xbet.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "sgdi.gov.sg", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "sgsautoparts.com.au", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "shadowsocks.au", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "shadowsocks.nz", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "shaeishu.co", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -182861,7 +182558,6 @@ { "name": "shopvcs.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "shoreyit.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "short-jambo.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "shortlinkto.co", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "shortlnkto.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "shortquotesworld.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "showme.co.za", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -182996,7 +182692,6 @@ { "name": "smartpayables.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "smarttins.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "smartwebportal.co.uk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "smatwebdesign.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "smavesto.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "smbc.co.id", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "smdc.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -183051,7 +182746,6 @@ { "name": "solihullheartsupport.org.uk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "solihullobserver.co.uk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "solomoncorp.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "solomotoparts.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "solsea.io", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "soltanastore.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "solunet.com.ar", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -183259,7 +182953,6 @@ { "name": "stratuspayments.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "strawberryplants.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "stream.cz", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "stream.ru", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "streamsoft.pl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "streetartcities.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "stresser.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -183270,7 +182963,6 @@ { "name": "strongblock.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "strongencryption.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "strongtoto.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "strooming.nl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "strophicmusic.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "studentenwerk.sh", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "studentquickpay.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -183291,7 +182983,6 @@ { "name": "stylight.nl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "su-kacagi.istanbul", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "su.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "subsidioalempleo.cl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "successrice.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "sucro.us", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "sudeleycastle.co.uk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -183482,7 +183173,6 @@ { "name": "technologyrest.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "technologysolutions.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "technoweightloss.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "techorganism.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "techround.co.uk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "techsee.me", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "techshout.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -183642,7 +183332,6 @@ { "name": "themediaframe.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "themightykeypad.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "themilfmovies.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "themood.site", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "themortgagereports.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "thenovicechefblog.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "theodoreroosevelt.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -183969,7 +183658,6 @@ { "name": "ubuntu-tutorials.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "uchicagomedicine.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "udaipurescortsservice.in", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "udemyiran.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "ufa88s.info", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "ufaempress.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "ufamagma.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -184019,7 +183707,6 @@ { "name": "unitedhoseinc.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "unitedsiteservices.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "unitedweb.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "unitenetwork.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "unither.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "unitil.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "unityseguros.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -184049,7 +183736,6 @@ { "name": "uprawnienia-motorowodne.pl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "uprawnienia-wodne.pl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "uprep.lol", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "uprep.ml", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "upstatesc.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "upstream.auto", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "uquidcoin.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -184165,7 +183851,6 @@ { "name": "verlocke.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "vermontbiz.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "vermontflannel.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "vern.cc", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "veronicaavluvpornstar.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "veropharm.ru", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "veros.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -184245,7 +183930,6 @@ { "name": "visitmexico.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "visitnewcastle.com.au", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "visitpagosasprings.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "visitpare.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "visitperth.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "visitstegen.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "visitsweden.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -184295,7 +183979,6 @@ { "name": "vort-x.com.my", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "voselectric.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "vouch.fit", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "vousnousils.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "vov.gg", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "voxbras.com.br", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "voxio.nl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -184467,7 +184150,6 @@ { "name": "westlandinsurance.ca", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "westmanga.id", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "westvancouver.ca", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "wesystems.cloud", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "weteachme.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "wetpussyporn.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "wfbabfn.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -184618,7 +184300,6 @@ { "name": "wrm.sr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "wrtv.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "wrytin.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "wscad.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "wshop24.biz", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "wtkr.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "wtmarketing.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -184728,7 +184409,6 @@ { "name": "yorktest.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "youavtube.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "youneedabudget.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, - { "name": "young.scot", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "youngbabes.pro", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "youngtube.one", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "yourbenefitsresources.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, @@ -188751,6 +188431,1953 @@ { "name": "zverovod.info", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "zwz.cz", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, { "name": "zyiaactive.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "090124.xyz", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "1001faire-part.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "101saglik.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "12356.xyz", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "123sportpassion.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "16561155.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "16561166.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "16561177.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "16561188.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "16561199.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "1800-mattress.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "18kit.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "1bps.io", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "1secretaire.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "22emesiecle.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "24go.me", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "2ladd.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "3280821.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "3b-concept.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "4008810.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "404.city", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "443.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "4567989.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "4netguides.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "51senluo.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "5snb.club", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "5starexterior.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "6080.ga", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "6080ga.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "6228800.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "6228811.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "7203.ru", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "777.tf", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "830res.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "88518.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "890789d.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "9060989.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "9070989.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "91pro.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "9304dh5.vip", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "98901111.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "9891100.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "9893111.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "98944448.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "98944449.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "98944555.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "98944666.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "98944777.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "98944888.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "98944999.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "9896699.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "98999555.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "98999666.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "abc-pneupascher.eu", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "abccomputerservices.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "abinmetall.ru", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "abujausedcars.com.ng", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "acchiappasognibedandbreakfast.it", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "accueillons.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "achtenhagen.me", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "actus-banque.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "adamandeveinc.in", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "adhesivosjumilla.es", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "adjustablebeds.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "admanmedia.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "adminconnection.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "admiralcanvas.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "adrian2023.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "advogadavaleria.com.br", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "aesthway.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "aferagetback.eu", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "affordacode.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "afute.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "agence-matrimoniale-paris.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "agencymasala.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "agrobiovet.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "ai.market", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "aibili.pt", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "aiguemarine-spa.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "aila.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "aipee.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "aita.global", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "aixploringprovence.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "ajoke.eu", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "ajto.pro", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "aksnapshots.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "alatienne.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "albumsepeti.com.tr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "aldolafontana.be", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "alector.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "alexandremorelli.com.br", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "alexnedea.ro", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "all-star-autoglass.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "allthingshappen.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "almazara.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "alovesinh.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "alpa.is", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "alpha91.co.za", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "alpis.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "althacare.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "alvaro-smith.link", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "amaisd.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "ambarbyarihant.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "ambtpay.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "ameriside.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "amplifire.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "amroz.xyz", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "amwake.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "andyante.cz", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "angiszi.hu", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "anglopoltransport.pl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "anne-gb.ch", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "annonces-moto.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "annonces-vacances.info", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "anrworldwide.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "anticonceptieportaal.nl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "antts.uk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "any-id.be", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "any-id.eu", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "any-id.online", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "any-id.store", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "anyid.be", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "anyid.uk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "anyid.us", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "anymatch.ai", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "ap.icu", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "apatransport.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "apcmc.pt", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "apexchimneyrepairs.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "api5000.io", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "app-capacitymanager-v1-pro-crd-hd.azurewebsites.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "app-finanzas-services-v1-pro-ol.azurewebsites.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "app-finanzas-services-v2-prd-wh.azurewebsites.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "appen.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "aquarillon.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "arcohol.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "ardenwolfsky.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "arellak.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "arendakemper.by", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "aria-sante.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "arihantabode.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "arihantarden.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "arihantbuildcon.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "arihantone.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "arihantsouthwinds.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "art93.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "artaurium.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "arteventinews.it", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "artfulpalate.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "arthurhoefer.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "artisanat2france.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "artpsd.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "artratio.co.uk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "arvinovoyage.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "as200236.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "as204828.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "ascendedguidance.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "asennestudio.fi", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "ashiba-kagu.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "ashikajewellers.com.au", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "astour.ee", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "asyadiziizle.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "atgweb.es", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "athome-nextcloud.ddns.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "atlantacaraccidentlawyer.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "august.me", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "aussiesnus.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "autista.roma.it", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "autopistadelitata.cl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "autos-motos.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "auzzie.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "avalo.vn", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "avenir-now.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "aviprime.by", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "avocat-bourgogne.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "avocat-droit-du-travail.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "avocat-karsenti.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "avonwithedda.ca", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "azhappytails.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "azimuth-ast.ru", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "aztestsmartviewwebapp.azurewebsites.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "azzorti.co", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "babichsteriliser.com.au", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "bacgp.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "bacgroup.digital", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "bacgroupdigital.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "bacgroupinc.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "bagsbanny.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "baharinclinic.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "bakchich.biz", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "balikturleri.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "ballajuraafc.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "banescointernacional.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "bangaichi.no-ip.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "bans.info", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "barduschinamusic.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "barney-media.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "barricader.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "barricader.network", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "barrierpestservices.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "base48.systems", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "basmp.ml", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "basvurusu.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "batitrakya.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "baxus.co", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "bayburtgazetecilercemiyeti.org.tr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "bdocfurniture.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "bdvasatkova.cz", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "becli.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "beegarage.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "beeliarspirit.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "behealthyeveryday.eu", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "belajarcarabelajar.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "bemergroup.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "benaldirma.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "benchmark-ip.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "benchmarkingcompany.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "bentonvilleppc.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "berighthere.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "bernadettehermsen.nl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "bernius.eu", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "bernius.xyz", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "bestaustraliancasinosites.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "bestcampingnow.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "betasozluk.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "betting-magic.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "bfc-expertcomptable.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "bien-etre-beaute.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "bigbuzzproductions.co.uk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "bigdesiresolutions.co.za", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "bigzoo.com.br", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "bijoux-fantaisies.eu", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "bilgilarus.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "biowavego.co.uk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "biscornu.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "bitkan.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "bizmonthly.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "blacklist.support", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "blacksecurityamg.art", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "blasdelamo.es", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "blog-gpt.pl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "blogpsy.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "blueknights6.eu", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "blueride.se", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "bmac.cloud", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "bnpparibas.com.hk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "boddunan.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "bodlsc.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "bonjourmademoiselle.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "bookingpressplugin.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "boomfinity.xyz", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "boostup.com.tr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "bophacker.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "bottleking.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "boubyranol-biere.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "br-hq.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "braun-russia.ru", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "breathing-underwater.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "brighterservices.co.uk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "brilliancesecuritymagazine.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "brilliant.plumbing", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "brn.is", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "brokenbuild.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "brookskolb.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "brushscene.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "bs7671.tools", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "bslnow.co.uk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "bunnystail.tw", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "buzzage.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "bwinvestments.com.au", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "bytebolt.at", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "c-137.me", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "c.wtf", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "caasz.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "cackl.io", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "cadynce.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "cahborneo.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "caldwell.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "calisthenicroutines.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "camionesdesegundamano.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "camperfaqs.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "cancer-info.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "canningcityfc.org.au", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "capitolavenue62.co.in", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "carbonexpress.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "careshields.sg", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "carlbwade.us", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "carniruiz.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "casacampolima.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "casinocosmopol.se", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "catcaresociety.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "catfish.gq", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "catmonad.xyz", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "cbbio.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "ccpe.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "cdlgoods.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "ce-na.ru", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "ceannard.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "ceatheneum.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "cegpalota.hu", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "celphy.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "cementplas.es", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "certasenergy.co.uk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "cetak.com.my", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "cfar.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "cfsjumilla.es", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "cgdct.moe", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "cgpn.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "cgtsoft.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "chagrindads.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "chainslayer.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "charismaticgemeventsllc.info", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "charlws.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "chasseurdetruites.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "chaudierecogeneration.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "chequeo.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "chichoverboard.online", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "choco-championship.jp", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "chocolatier.co.uk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "choruru.jp", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "christianaknudsen.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "christianplumbingservices.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "christophpaccard.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "chromehack.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "cigarettes-electronik.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "cinecat.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "cinn.mn", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "cirroenergy.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "ciso.social", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "citizenside.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "cityofdenvergolf.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "classyng.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "climbsoill.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "clinpharm.vn", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "cloudatabases.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "clovisdigital.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "cloydnco.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "cloydnco.com.jm", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "cloydncojamaica.com.jm", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "cnxiangxian.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "cobiz.vn", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "cocopipeline-br-development.herokuapp.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "codeit.pro", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "codewithlove.blog", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "cohob.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "collarslab.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "collinssquarecatering.com.au", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "collinswyatt.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "colombia.com.co", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "comiccrusaders.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "commentgagnerdelargentsurlenet.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "communi.biz", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "complang.se", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "compraapartamentomoema.com.br", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "comprajuguete.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "comunitalemargherite.it", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "conceptfontaines.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "condo.do", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "conferencemanager.ch", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "conferencemanager.co.uk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "conferencemanager.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "conferencemanager.dk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "conferencemanager.es", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "conferencemanager.se", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "conferencemanager.uk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "conferencemanager.us", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "conferencemanagerpro.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "confidentielsn.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "confort-bebe.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "conseils-immo.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "consertodeeletrodomesticosembh.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "contango.xyz", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "convecteurs.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "convention-nationale-nantes2023.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "convicted-driver-insurance.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "coolabaroo.com.au", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "coolhvac.pro", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "coolsochi.ru", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "coronavirus-journal.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "cosmick9.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "cothurnes.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "couleur-lavande.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "crackersindia.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "creativevietnam.com.vn", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "creerunblog.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "crestataustin.com.my", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "crianma.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "criticalmetalscorp.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "crm-gestion-relation-client.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "crucial.in", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "cruiselookout.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "cryogeni.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "cryptobot.dk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "cryptodore.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "cryptography.blue", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "cryptomonnaies.io", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "cryptosender.io", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "crystal-blindsnottingham.co.uk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "crystalcleaningservicing.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "csspsverify.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "ctadalafil.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "cubilo.fi", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "cufe.com.au", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "cyclonemetals.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "cyrenianhouse.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "cyrozap.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "czechhunter.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "d1b2k93bahaw3s.cloudfront.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "dailyotovinfast.com.vn", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "dakcess.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "daksatasl.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "danielbeltejar.es", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "danish.events", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "dankburritofranchise.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "danloona.nl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "danske.events", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "dapao.ru", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "darklybasic.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "darkmattertechnology.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "darkmattertechnology.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "dasdanny.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "dasher.co.za", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "datastack.design", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "davidcook.au", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "davidrteixeira.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "dcgprecisionpainters.co.nz", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "dchauriga.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "debateisland.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "deceasedonline.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "decopros.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "decoral.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "decotonic.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "deiaprint.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "delhitourism.gov.in", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "demolitetuto.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "denovo.energy", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "dentonolab.lt", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "desertblockmasonry.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "desguacesalido.es", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "desguacesbarcelonacat.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "desguacesdecamiones.es", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "designdecoration.info", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "detceptam.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "dev-mail.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "devenirconseillerbienetre.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "deviante.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "devksingh.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "devrekarti.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "devries.frl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "dewijkpraktijk.nl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "dfwork.lt", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "dh26a.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "dh75975.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "dhoffmanmd.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "diapuls.ru", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "diariodebalsas.com.br", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "dicavirtual.com.br", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "dicipa.com.mx", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "dieffe.tech", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "dienekis.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "digidaigaku.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "digilabs.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "digitalcrisis.us", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "digitalindiatalent.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "digitaltransactions.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "dimension-pc.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "diretoriodeempresas.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "dirtywork.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "distribucionmayorista.online", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "divergences.eu.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "divinitahome.com.br", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "djjoeri.be", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "dlv-registry.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "dmlive.wiki", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "do-not.click", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "doctoblog.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "documentalista.cat", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "doja-cat.ru", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "donghanh.com.vn", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "donnaomamma.it", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "dornes.eu", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "dotlab.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "dotlab.nl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "dotxyz.lol", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "draftposts.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "dragonbox.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "dragonsunited.be", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "dragonsunited.li", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "dragonsunited.lu", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "drankkoning.nl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "drcliftonthomas.co", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "dreambed.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "dreamlight.cloud", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "drghassanclinic.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "drill-work.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "drnatura.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "dronevlaming.be", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "drplancherexpert.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "duckyubuntu.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "dudushu.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "dulcehome.ch", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "durka.lol", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "dykleif.se", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "dynotraining.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "dzg-ev.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "e-ticaret.site", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "eajca.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "eajglobal.co.uk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "eajglobal.net.uk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "eajglobal.uk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "eajid.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "eajmail.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "earpconsult.co.uk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "eastonpaxtongolf.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "easy4ssl.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "echidnalock.com.au", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "ecopark.tv", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "edocperso.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "edsys.com.au", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "educa.ch", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "eduhub.ml", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "edusektor.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "edvan.com.br", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "eelabs.eu", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "eeymuc.co", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "effecotto.it", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "eforevdenevenakliyat.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "ejabi-infosec.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "ejsc.co.jp", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "ekaviar.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "el-masri.bg", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "elementedigitale.ro", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "elisity.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "ellanurse.co.il", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "elliscoscanner.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "elsenderodelaluna.xyz", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "elternzimmer.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "emmalegalnurse.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "emploi-international.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "employment-solutions.ca", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "empowered-decision.com.au", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "emta.ee", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "endcottagevets.co.uk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "enet.eu", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "engagementlettercpa.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "englesh.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "engsoyouth.eu", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "enkolaysertifika.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "enterprise-hr.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "enterthehollow.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "entreprise-innovante.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "envia.com.gt", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "eoliennedetoit.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "eos-croatia.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "eraterm.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "erkiss10.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "esalinity.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "especials.co.za", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "esportsmonk.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "espressoservicesplus.com.au", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "essentiel-du-mariage.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "estudioaany.com.br", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "etcdigital.es", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "eternalaugust.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "etools.info", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "evakuator.ltd", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "evavangunsteren.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "eventsforyou.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "everlastnetworks.com.au", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "evlenmekisteyen.com.tr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "ex-links.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "exact.realty", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "exactrealty.no", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "exactrealty.us", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "examhq.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "exiletattoo.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "exzibit.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "f4jsl.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "fabricademonstros.com.br", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "fabricandoclientes.com.br", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "fakehub.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "fal.moe", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "fameska.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "fandars.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "fansdefoot.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "fastdronespro.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "fasteatlive.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "fauteuil-bebe.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "fcporto.ws", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "fdx-insurance.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "feecotec.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "femboy.clothing", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "fes.at", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "festivalsquare.com.au", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "festivaltower.au", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "fests.info", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "fewo-groden.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "fftechnology.pt", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "fh-photographie.art", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "fiddlestickstoys.com.au", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "fiedelaks-landbarf.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "fieldeffect.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "filejo.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "filipadamczak.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "fimc-biodiversityportal.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "finalweapon.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "finansified.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "findprivateinvestor.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "first-legion.eu", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "fishercat.io", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "fittherapy.biz", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "fjerhammer.dk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "flagma-no.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "fleeps.co", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "flextrades.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "floppa.com.br", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "floridalegion.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "flosspapers.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "flowersforwedding.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "fmcsa.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "foilhat.tk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "foodandseeds.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "foogle.cf", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "forefront.dental", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "forestersfriendlysociety.co.uk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "formalobjects.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "formation-intergeneration.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "fortunetireusa.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "fotografy-help.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "fragment.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "france-cyber-maritime.eu", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "franchisesports.co.uk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "francosuaga.es", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "frantajaros.cz", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "freckles.bg", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "freedomperception.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "freedomscam.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "freelancing.info", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "freemor.ca", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "freeonlinegames.gq", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "freeportbakery.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "fresco.ph", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "freshfinder.com.au", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "frioelectrica.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "friseure-website.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "frshminds.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "frutaslatraviesa.es", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "ftrfnd.me", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "fuas.cl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "fumerx.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "funart.hr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "furik.me", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "furnu.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "furry.codes", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "furry.re", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "furtodo.at", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "furtodo.cz", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "furtodo.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "furtodo.hu", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "furtodo.pl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "furtodo.sk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "furtodobox.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "furtodobox.cz", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "furtodobox.eu", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "furtodobox.sk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "furtodoit.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "fusions.co.jp", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "futhark24.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "future-telecom.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "futureappin.com.au", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "fyrfalkcontent.se", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "gamedware.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "gamize.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "gamma-travel.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "gammonvillage.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "gasthaustalacher.ch", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "gather-statement.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "gatturkey.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "gdm.cl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "gear4music.ie", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "geekdoit.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "geekofeminin.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "geekplay.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "gefinances.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "geilefrauen.pics", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "gelcocktail.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "geldsparen.in", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "gelisimakademi.com.tr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "genealog.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "generateurdapplis.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "generation-clic.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "generatorreview.pro", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "genomicsinc.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "genomicsplc.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "germantolobis.lt", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "geru.com.br", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "getfitbee.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "gethvac.pro", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "getispinfo.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "getpdf.in", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "getpro.plumbing", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "gevo.gg", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "gialai.gov.vn", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "gigachad.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "gigapc.be", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "gite-le-pascaud.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "glaciercreek.co", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "global66.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "globalhomeautomation.ca", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "globalrocksummit.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "globeprotocol.be", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "globeprotocol.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "globeprotocol.es", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "globeprotocol.eu", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "globeprotocol.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "globeprotocol.io", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "globeprotocol.it", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "globeprotocol.nl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "gnihm.ac.in", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "go-dove.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "gocpa.space", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "gogogirl.vip", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "gohvac.pro", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "goldysoptic.bg", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "golfcabrio.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "gopro-qa.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "gopro-staging.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "gopro.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "gordonbeeming.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "gotomojo.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "graceclinic.com.tw", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "gradintel.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "grandesmaisons.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "grandviewgynecology.ca", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "grannypussy.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "gravix.dk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "greatlakestechdiving.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "greenbeauty.in", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "greencbd.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "greenplanetgrass.com.au", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "gregmckeown.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "groeneoldtimer.nl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "gruenwedels.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "grupolr.es", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "grupovisabeira.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "gruppotac.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "gsch.eu", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "gts-tradgard.se", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "gts-varmepumpar.se", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "guatzessen.at", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "guiasuteis.com.br", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "guiddy.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "guidecbd.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "guidoclub.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "habermatik.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "haenterprise.co", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "haha.moe", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "hair-and-makeup-artist.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "halkbank.mk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "hamptonrhodes.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "hanatan.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "handahomecare.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "hardcorepost.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "harfordpark.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "havendirecthealth.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "havenstudios.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "haverplastics.co.uk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "havuzkapinda.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "hayvanlar.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "hazhistoria.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "healinlife.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "healthwealthtime.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "heartofenglandfirstaidtraining.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "heilpraktiker-maxdorf.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "heinrich1.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "helenlim.pw", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "hempoffset.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "hennepintheatretrust.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "hentaipros.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "herbalifedair.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "herborisia.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "hervegranger.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "hessis.eu", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "hexagonengg.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "hexcel.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "hezzit.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "hgtwa.com.au", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "hinto.com.au", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "hiradiation.rocks", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "hk-shuttle.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "hlm.wtf", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "hochzeitsregion.at", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "hocthuctaichinh.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "hollinsbookstore.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "holyoake.org.au", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "hommecontemporain.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "hoo.lt", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "hooapp.lt", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "hooshop.lt", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "hootv.lt", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "hosifuri.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "hospecoonline.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "hospitaldebarcelona.cat", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "hostarina.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "hostiko.com.ua", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "hostingweb.pe", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "hotellme.eu", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "hotelpalotacity.hu", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "hourspent.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "houseoftutors.co.uk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "houstonaudubon.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "hpccsystems.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "hristov.help", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "hunhold.at", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "hunhold.biz", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "hunhold.ch", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "hunhold.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "hunhold.eu", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "hunhold.it", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "hunhold.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "hunhold.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "hurdafiyatlari.site", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "hwe.nz", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "hydroposev.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "hyex.com.au", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "hygga.info", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "hypogeal.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "hyzy.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "ibmix.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "ibo.in.th", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "ibra.org.uk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "icdisinfection.com.au", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "icedre.am", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "icie.info", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "iconmale.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "ideaklinik.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "ideaklinikbursa.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "idhl.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "idsc.com.tw", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "idsconsulting.co.nz", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "iflscience.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "iiproject.ddns.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "iipython.cf", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "iltis.rocks", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "image.wtf", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "imagex.graphics", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "immobilier-realiste.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "immobilierlibourne.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "imobiliariamoema.com.br", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "impexul.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "indironline.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "industrilokal.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "indyandmeskincare.com.au", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "inews.bg", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "infinity-computer-systems.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "inforcom.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "infrareal.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "infrareal.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "ingatlankaland.hu", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "inhale.it", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "inoxmancha.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "instaeats.in", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "int-elektro.eu", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "integratedphysio.com.au", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "intersectionconsultancy.co.uk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "interterranfed.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "intpb.com.au", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "investment.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "iowaworks.gov", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "iphone6.ro", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "iphonedisplayreparatur.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "iphonemobile.ro", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "irenictherapy.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "irjavan.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "iskconbd.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "iskconperth.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "ismailtoraman.com.tr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "ismekkurs.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "isnot.ai", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "ist-analys.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "ist-analyse.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "italiaeconomy.it", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "itefix.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "itprotect.pl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "iventishirts.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "iwanrj.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "iwate-tabipro-ver4.jp", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "iww.org.au", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "iyadalkassab.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "jaajko.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "janphilip-bernius.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "jasasosmedia.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "jasonwongwr.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "jaypeeaman.in", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "jdstonesbling.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "je-voyage.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "jeannette-py.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "jendymotors.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "jenniferfontaine.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "jesuiszen.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "jfe-et.co.jp", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "jfy.is", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "jfy.me", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "jiaoliuben.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "jikei-reha.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "jinbbq.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "jitsipatapoe.ddns.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "jk-regeltechnik.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "joaopaulopaim.com.br", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "joaosantos.net.br", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "jogoshoje.io", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "johanna-besmier.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "johnlewis.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "join-aomori.jp", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "jpvfinanceira.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "jpvisual.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "jrroofinglancs.co.uk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "juancarloscubeiro.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "juanitofatas.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "juicipattiesfranchising.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "juminec.es", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "junis.nl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "k2.works", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "k2united.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "kabide.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "kacanews.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "kadinhayati.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "kaguramea.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "kalbarritudor.com.au", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "kami-riha.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "kampova.sk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "kantoorartikelen.nl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "kanuking.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "karstenhelmbold.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "kassen-zero.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "kasu.ga", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "kateduggan.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "katesymmans.co.nz", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "kazu-techlab.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "kcnxp.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "kdjsa.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "kdpmgi.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "kduggan.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "kech-immobilier.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "kell3r.ch", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "kemptonparkrubbleremovals.co.za", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "kendigawards.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "kesinidulu.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "keysession.jp", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "keysigma.co.uk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "keystone-europe.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "khalid-kanouf.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "kickitfootball.com.au", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "kiddoscape.eu", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "kingfeatures.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "kippenclub.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "kiztarafi.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "knkv.nl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "koenig-pflueger.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "koko5000.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "kol7sry.news", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "komasan.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "konnan.jp", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "korfbal.nl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "korfballeague.nl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "kosmosol.it", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "kraftfahrtversicherungen24.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "krazykernelsowensound.ca", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "kroonika.ee", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "krugerengelbrecht.co.za", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "krypto-webdesign.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "kt.tc", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "kuberkaitseliit.ee", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "kuchugury.ru", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "kurslar.gen.tr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "kutalin.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "kwl.com.au", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "kylacoin.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "kyoox.io", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "la-bonne-cuisine.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "la-maison-neuve.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "labourmarketinsights.gov.au", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "ladymadd.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "lahalte-buvette.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "lakerfreight.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "lalettrepatriote.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "lansociety.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "laptophub.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "laquestionviterepondue.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "larabouillere.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "larsentoubro.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "lashpilot.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "laspoesias.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "lasthome.co.uk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "latourist.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "laugarvatn.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "lauxarchitekten.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "lawcover.com.au", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "lbofrance.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "lcr94.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "le-reso.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "leauda.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "lebuys.ca", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "lechim-prosto.ru", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "legamedamore.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "lemr.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "lenord.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "leportschools.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "lestravauxduparticulier.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "letras10.co", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "levischuck.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "lianid.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "libapps.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "libauth.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "liberad.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "libermoto.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "libgraphe.me", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "libguides.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "licko-michal.cz", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "lifeintwentys.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "lifestyledoctor.in", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "likesec.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "lilyum.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "limescapes.com.au", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "limitbreak.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "liste.net.tr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "liz-ate.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "lizlew.is", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "lms-mods.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "loanathome.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "location-vacances.biz", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "loge.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "logicgate.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "logicielscrm.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "logipdv.pt", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "loi-pinel-2023.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "lokakitchen.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "lolcats.cat", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "lonasdigital.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "loncat.co.id", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "lordgeorgeanson.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "losderover.be", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "loshogares.mx", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "lostluma.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "lowesprotect.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "lowlab.io", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "luberto.art", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "luis.ee", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "luis.fi", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "lukaszwojcik.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "lupakode.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "lusometeo.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "lyrae.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "m-enterprise.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "m1d1.black", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "ma-ligne.co", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "ma-subvention-electrique.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "maaleht.ee", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "maavaishnowsewatrust.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "mack.im", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "magic-3dprint.nl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "magicpaper.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "magnifact.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "magnoliadates.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "maguy-energies.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "maisonkobe.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "maloneyja.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "maman-geek.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "managed-it.africa", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "manga-life.info", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "mangaarabics.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "manhattanda.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "manitoulinusedequipment.ca", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "map-immo.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "marabook.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "margus.uk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "mariage-reussi.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "marie-psy.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "mariearthur.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "markco.fi", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "marketplacetue.nl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "marredesefairebaladersurlenet.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "mas.bg", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "masadaoffensive.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "masanteadelavenir.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "masdarit.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "masoftware.ddns.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "masoncountysheriff.us", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "masspingtool.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "masterise.tv", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "mastodon-poradnik.pl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "matarbyte.se", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "matchimmo.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "matetineamoi.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "matrix-pm.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "matrixengineered.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "mattresscleaningcampsbay.co.za", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "mattresscleaningcapetown.co.za", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "mattresscleaningdurban.co.za", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "mattresscleaninghoutbay.co.za", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "mattresscleaningseapoint.co.za", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "mattresscleaningwesterncape.co.za", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "mauronovellas.es", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "maurrikone.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "mauto.md", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "maxazine.nl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "mazenitude.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "mb-amenagements.be", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "mb-t.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "mbarbadun.es", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "mc-sin.ch", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "mc2informatique.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "mcfreedom.eu", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "mckenney.xyz", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "mdwellness.ca", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "me-mainz.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "meaningguru.in", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "mecenatfoot.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "meddiehub.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "medellin.tips", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "medicel.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "medicine.lv", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "meds.ru", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "mega.ru", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "meinmed.at", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "meister-stuecke.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "meister-texte.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "melaniegowen.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "melvintemo.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "memez.download", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "mergegroup.com.au", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "meritus.com.au", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "merkatal.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "meshachgt.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "metacrilatomadrid.es", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "metrodequito.gob.ec", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "metroproductiongroup.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "metspoedbeschikbaar.nl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "meublesrosa.be", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "mforum.com.au", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "mgfgroup.ca", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "mgfgroup.us", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "mglobalservices.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "mhvfcu.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "micreacion.es", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "mijnstembureau-hollandskroon.nl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "mijnstembureau-koggenland.nl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "mijnstembureau-leiderdorp.nl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "mijnstembureau-schagen.nl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "mijnstembureau-zwijndrecht.nl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "mikemannart.xyz", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "milfhunter.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "mim-standaard.nl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "minbos.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "mindfulbeautystories.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "mindtherock.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "minkafighter.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "miplanilla.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "miseliayuu.ml", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "mitarrangement.dk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "mittarinvaihto.fi", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "mkpeurope.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "mn.ax", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "mnrtechsolutions.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "mnsaviation.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "mnscredit.in", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "mobilamax.ro", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "mobshop.hu", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "modanloftsortigashills.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "modulo.ee", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "mofos.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "mohinhztoys.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "mojavibe.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "momimi.me", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "momsbangteens.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "mon-assurance-deces.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "mon-trafic.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "monaroindustrial.com.au", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "monbebeautrement.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "mondaynightbrewing.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "monechafaudage.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "monstresdesfetes.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "montres-mh-besancon.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "monvoyagedentaire.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "moonspell.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "moorelife.cn", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "mortgageexpert.io", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "mosselle.ro", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "motoselfservices.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "mountfield.co.nz", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "moviebox.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "mowster.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "mowster.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "mpool.live", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "mrgeek.ru", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "mri.community", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "ms-gesellschaft.at", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "msbdocs.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "msftcnsi.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "mtf.party", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "multymaq.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "mumszab.se", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "muratbekgi.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "murmures.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "muscle-home.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "museo.com.au", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "musexpo.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "mustard.llc", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "mwhcp.org.au", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "mycumortgage.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "myensolofts.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "myggkungen.se", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "mypetitjob.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "mysantanderpension.co.uk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "mysmartloan.ca", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "mytecheg.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "mywifiext.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "nakahama-dental.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "naosproject.eu", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "naprodukcji.xyz", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "natenzia.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "natur-und-kultur.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "naturallychildled.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "naturalmentesinescuela.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "naturaprint.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "naturesupply.eu", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "nautours.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "nazileaks.eu", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "ncjdigital.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "ncrjobs.in", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "needhaminsurance.co.uk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "neesoft.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "neosolution.ca", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "neotechnetworks.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "neozeon.io", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "net-abuse.email", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "netprepare.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "neumaticar.cl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "newnorthfuels.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "newporthomehealth.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "newtech.ro", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "nexposting.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "next-geek.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "nexzus.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "nfpsa.lv", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "ngribok.ru", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "nguyenduythiem.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "ngx.im", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "nhadonghanh.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "nicoleisaacs.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "nictiz.nl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "niftyninjamarketing.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "nikolahristov.tech", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "ninetyninestreet.co.nz", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "nkrupp.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "nnrevolt.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "noblehearinginstitute.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "nocr.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "nogyogyaszat.eu", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "noid.is", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "noithatthienvan.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "nolimgroep.nl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "nomada.gt", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "nordelig.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "norfipc.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "northernmichiganvr.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "norwalkps.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "norwegian.events", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "noticiassonaqui.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "nouragha.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "noy.cat", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "nqwebdesign.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "ntcrmezon.ru", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "nuage-libre.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "nubraza.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "nucciocondorelli.it", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "nullbyte.es", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "numismatix.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "nutripure.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "nyupoco.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "nyuware.pw", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "nyy.jp", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "o-n-s.co.jp", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "oakdale.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "oakgrove-mbc.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "obi-investissements.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "ocabj.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "ocalhukuk.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "ochobeatsmedia.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "octav-avocats.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "oharas.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "ohmygeekettes.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "ohrenbergpasta.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "oi-wiki.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "oirnoir.gay", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "okegugel.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "oktaybozaci.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "olgamalytcheva.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "olihar.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "olivedon.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "olwm.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "ombrenails.co.uk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "omgit.works", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "omxz8.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "oneclickfix.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "onekeycn.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "onemindmedicinals.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "onenetwork.io", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "onlinegeeks.ru", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "onlyjedis.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "open-work.space", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "openaq-staging.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "openexec.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "openexec.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "orchidhousehotels.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "orient.tm", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "oroshikikin.jp", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "otomauto.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "oui-mais-toscope.info", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "outandaboutpv.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "outlookbythebay.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "overdebal.nl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "oxfordkneeinfo.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "oyaphwcdsb.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "oyversus.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "ozdemirgrubu.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "ozgurgokmen.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "pagesviewers.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "pahuudenanatomia.fi", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "pandamoto.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "pandn-bulgaria.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "panglobal.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "panoramahillhotel.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "parebrise-rouen.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "parelectric.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "parfumi-eu.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "partygangsta.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "passion-net.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "passportapproved.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "patmos.tech", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "pauliuspiecius.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "pausesapanca.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "pavernotti.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "paylesstyres.com.au", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "paymore.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "payonline-api.xyz", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "paysera.lt", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "pcgamemc.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "pdf-tool.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "pearloc.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "pecan.ai", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "pecmd.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "pellet.roma.it", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "penair.com.au", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "perguntasnaweb.com.br", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "perthpregnancycentre.com.au", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "peterpauer.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "petit-bebe.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "petr.se", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "petzplus.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "pfctr.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "pfp.com.au", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "pgnd.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "pgnetwork.io", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "pgnetwork.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "philiacare.com.au", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "pholio.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "phoneia.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "photo602.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "phukienjenz.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "physiotherapie-buk.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "picmms.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "piggingcleaning.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "pilot-gps.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "pimentinhasexshop.com.br", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "pimppublishing.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "pincsolutions.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "pink.nl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "pinyonpass.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "piping-clean.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "pista73.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "pisys.co.uk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "pitakashop.hu", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "pixelats.cat", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "pixelmarketing.hu", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "playform.cloud", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "plex.tv", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "plicker.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "pluto5000.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "pm-schilderwerk.nl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "pneumania.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "pocsaismartsystem.hu", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "poeleapellets.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "pogrebeniq-sofia.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "polorize.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "polourize.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "pondacademy.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "pondband.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "pooi.me", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "pornvideos-tube.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "portadam.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "post.lol", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "pot-au-feu.info", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "prefereal.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "prefereal.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "premierpedsny.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "prep.vn", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "presence-group.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "prima-badezimmermoebel.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "primaudialrecords.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "primeinstall.co", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "primisbank.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "printscan.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "prio3.com.br", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "prisminstyle.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "prixmetaux.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "prizcode.ru", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "prizecode.ru", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "proctoloji.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "prod-vigl-www-master.azurewebsites.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "produsedetop.tk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "progettonazionale.it", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "project-icarus.nl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "pronty.it", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "propfirmdiscount.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "proverb.today", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "psiholognatalija.rs", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "psoo.top", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "psq.com.au", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "psychometrist.ir", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "pto.moe", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "publicpickups.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "pubnative.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "puncakpass.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "punkgrossos.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "purits.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "purrpley.me", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "purrrpley.dev", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "purrrpley.io", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "purrrpley.me", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "purrrrpley.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "purrrrpley.io", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "pvawa.com.au", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "pxagency.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "pxnetwork.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "qpi.net.au", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "qraa.qld.gov.au", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "quantum.gdn", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "queenspark.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "querocalcular.com.br", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "quiq-frp.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "qwanturank.news", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "qxq.moe", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "qy.is", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "rachelwatkins.co.nz", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "radarcupon.ro", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "radioombo.xyz", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "radyogemisi.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "ragadoor.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "railalabwork.lt", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "rainative.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "raksa.media", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "ralphandretta.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "ramirro.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "randburgrubbleremovals.co.za", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "randomuuid.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "rankmetrix.xyz", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "raranga.net.nz", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "ratiocontent.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "readytax.com.au", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "realitydudesnetwork.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "rebel.com.br", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "recettes-de-tiramisu.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "rechtsanwaltdrach.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "rechtsanwaltskammer-hamm.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "redactibio.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "redfox-media.eu", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "redfox-media.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "redshank-largeformat.co.uk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "redwood.pw", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "refb.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "reference-emploi.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "reflectionsbarlingsbeach.com.au", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "religiousfreedomunderfire.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "remservices.ky", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "rencontredemerde.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "renovation-abm.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "reparacioneslocativas.com.co", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "repararmac.eu", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "requeteguapas.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "rerubabs.nl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "reseau-image.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "residualpayments.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "ressourceportal.dk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "returnthief.quest", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "reviewspot.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "rex.gdn", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "rice-cook.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "riceonline.ir", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "rigeltarot.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "riggsloves.me", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "righttolife.org.uk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "riseonline.wiki", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "riseproject.ro", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "riserehberi.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "rit.ee", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "ritaescortsdelhi.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "rivercitypaintingsa.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "rk.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "rmdis.au", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "rmit.ee", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "roa.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "robertkorpas.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "rockingreports.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "rocknreports.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "roguelicious.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "rollinsmokebbqfranchise.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "roofboxhub.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "roomie.fi", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "roomieapp.fi", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "roussillon-informatique.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "royalsyouthhockey.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "rsmmail.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "ruaanhgiare.vn", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "rubenarakelyan.uk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "rubysinn.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "ruhrpott-media.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "ruhrpott-media.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "rumreader.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "runningcitadel.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "russiancrimes.in.ua", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "ryansmithphotography.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "s-comp.pl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "s-housing.vn", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "safera.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "sahafekitap.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "sajbersove.rs", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "salefunneltool.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "salesandwants.co.uk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "salesfunnelfirstaid.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "saltedpasta.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "saludsis.mil.co", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "samenvoormedicatieoverdracht.nl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "sanctus.co.uk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "santaluciatirajana.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "sante-informations.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "saoshyantshop.ir", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "sapphirecleaningwa.com.au", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "sarand.ch", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "satistemsilcileri.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "saveonattractions.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "saxifrageleather.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "sayfa.istanbul", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "sbettoken.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "scammer.info", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "scappoosebay-wc.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "schlagzeug-lernen.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "scholi.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "scsprotect.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "seamac.info", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "sean.scot", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "sebgar.ca", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "seccodeid.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "secured.vote", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "securetalks.com.br", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "segurico.cz", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "sehersirin.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "seiulocal300.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "selfbestyou.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "selmon.ru", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "servernerds.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "servispasaoglu.com.tr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "serworkribeirao.com.br", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "sexolviv.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "sezane.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "shabaka.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "sheehans.com.au", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "shit.one", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "shoudanren.jp", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "sierkbornemann.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "sightful.be", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "sightful.eu", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "sightful.nl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "silahtechizat.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "sildenafilix.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "silent.quest", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "silverage.co", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "simoncotsworth.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "simonehair.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "simplio3d.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "simprosuite.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "sina.swiss", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "sinanozpinar.nl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "sindacato.it", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "sinde.ru", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "site-de-paris-en-ligne.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "sitepentruprofesori.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "sites2poker.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "sites2rencontre.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "sjid.co.uk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "skinetic.eu", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "skioakenfull.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "skolskyportalporuba.cz", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "skydronesolutions.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "skymkmk.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "skyone.host", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "skyrocketing.ninja", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "slbm.com.au", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "sleekfellow.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "slicehousefranchise.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "slopeoak.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "sltcapital.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "smartcard.tools", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "smartglassworld.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "smartphonepliable.co", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "smarttint.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "smdmetals.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "smithwealth.com.au", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "snrd-africa.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "softwaresanta.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "solalnathan.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "solarafrica.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "soldbygagan.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "solectrus.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "solutions-it.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "sonyazi.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "sorrentofc.com.au", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "soundcharts.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "soundproofingideas.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "south32hermosa.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "southshorehomecare.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "sowget.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "spankmonster.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "spar-dich-frei.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "spbelect.info", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "specprawnik.pl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "spribe.co", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "spribe.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "spribegaming.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "springspeedshop.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "spriterinc.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "srpworks.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "sserc.ca", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "stahlzart.at", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "stainfilm.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "startandstop.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "stateofwatourism.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "statepoint.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "statistik.at", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "stc-knrm.nl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "steel-pc.lu", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "steelheadmetal.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "stefanoiavarone.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "stillpointmag.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "stinkintechnology.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "stob-architekten.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "stockideas.club", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "stoicnotaries.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "storephotovoltaique.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "studyosepeti.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "suatdautu.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "sunfloweracres.xyz", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "sunmeiren.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "suprintbot.xyz", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "surefire.org.uk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "surpassexam.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "svenska.events", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "svge.ms", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "svnty2.dedyn.io", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "sweetbasilscafe.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "sweetsinner.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "switchbacksystems.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "sylcon.es", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "szerelmes-sms.hu", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "t-moon.hr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "ta-maison.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "tab3kora.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "tabitha.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "tadalafilbtab.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "takeshotclasses.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "taktraneh.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "talentexcellence.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "tara.ru", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "tavex.bg", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "tavex.dk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "tavex.eu", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "tavex.fi", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "tavex.hu", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "tavex.lt", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "tavex.lv", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "tavex.no", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "tavex.pl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "tavex.ro", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "tavex.rs", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "tavex.se", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "tavexbullion.co.uk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "tavid.ee", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "tdse.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "teaching-certification.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "team-building.madrid", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "tece.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "techcareeredu.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "techpressable.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "techwestsolutions.com.au", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "tedcell.com.br", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "tee-suche.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "teefar.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "teknoproje.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "telaviva.com.br", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "telk.kr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "temoinfo.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "temonews.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "tepco2021.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "tfinfo.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "thadeudosanjos.com.br", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "thea-meditation.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "thebarclay.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "thegreendigest.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "thekitchendoor.co.nz", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "thekitsunesden.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "thelicensecompany.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "themovingchoice.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "themprojects.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "theoasis.co.nz", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "theranch.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "theshesuite.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "thesimplehelp.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "thetruthabouthemp.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "thetubecopenhagen.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "theworksboulder.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "thisis.id", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "thost3.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "threadspecification.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "threatcon.email", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "threatcon.live", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "threatcon.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "threatcon.tv", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "threatint.tv", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "threatlabs.eu", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "threatlabs.nl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "threegcreative.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "tiengtrungquoc.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "tilabox.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "timeular.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "tinyhouseturkiye.com.tr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "tiski-shop.ru", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "tmdmotorhomes.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "tokoangga.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "toondahjobs.com.au", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "top-seminaire.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "top5ones.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "total-deco.eu", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "totalfitnessandmassage.com.au", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "touquet-volley.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "townsendsecurity.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "tracxn.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "trade-foods.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "tradeandindustrydev.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "tradeeasy.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "tradgardsmart.eu", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "tradgardsmart.se", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "transangelsnetwork.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "transharder.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "trashpandacigars.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "trashy-gypsy.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "travel4news.at", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "travelist.co.nz", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "tridentdiagnostics.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "triple1.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "trustarts.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "truthre.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "truyendichz.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "tucsonpcrepair.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "tulup.io", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "tum.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "tur17.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "turtleteam.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "tutamon.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "tutoraspire.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "tutoriel-arduino.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "tvos.eu", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "tweetadder.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "twistedoakonline.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "twofestivaltower.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "twofestivaltower.com.au", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "twoguyswithballs.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "txryan.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "typosphere.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "u12buy.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "ucretleri.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "udtonline.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "ugis.info", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "uglychews.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "uisd.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "ukforum.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "ukfreelegaladvice.co.uk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "ukraflora.ua", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "uku.lt", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "ulconnect.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "ulprospector.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "unaape-ud93.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "unblockit.ink", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "unbonavocat.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "undegasesc.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "unf.dk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "ungedient.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "ungovernable.men", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "unikimages.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "unipolrsa.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "uniqleen.com.au", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "unitingwa.org.au", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "unitop.bg", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "unitycardiology.com.au", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "urbancoyoteresearch.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "urbanevielfalt.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "urbarberjerry.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "urbex.link", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "urpost.xyz", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "urt.fm", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "usefuldiy.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "userpizza.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "utusan.com.my", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "uvesco.es", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "vaccinatieplanner.nl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "vacuumsupplystore.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "vague-normande.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "vaildcrack.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "valuoo-legal.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "vaninsure247.co.uk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "veebill.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "veefna.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "veetechnologies.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "vendaapartamentomoema.com.br", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "vente-voiture.org", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "ventes-privees-flash.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "venture2learn.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "venturetechglobal.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "verasoie.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "verhoog.xyz", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "vetclick.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "vethical.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "viafoura.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "viagraam.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "viagrafh.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "viagralmed.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "viajarconmascotas.pro", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "vidracariaembh.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "viedecelibataire.fr", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "viega.ch", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "vietfes.asia", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "vigl.biz", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "vilgain.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "vilgain.it", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "vinehall.ie", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "vinhomes.tv", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "virtuakamp.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "vision-du-net.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "vistria.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "vital7.tech", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "vitalpraxis-lietz.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "vmninja.io", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "vnanet.vn", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "vokabula.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "volkswagensaigon.com.vn", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "voyagesvoyages.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "voyance-direct.info", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "vpc-machinery.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "vps.tg", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "vrh.net.au", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "vue-sur-mer.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "vv066.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "w3basic.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "w3i.eu", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "wackomenace.co.uk", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "waferscriber.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "wapsychiatry.com.au", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "waterpurificationsupplies.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "wavin.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "wbldc.in", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "wbolt.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "web-one.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "webcargonet.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "webexapis.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "webnestify.cloud", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "webstreamworld.ae", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "webstreamworld.sg", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "wedatasolution.com.br", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "wel.com.br", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "weldingandwelder.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "wensenboomaltrecht.nl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "werksalon.at", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "whong.media", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "wiltonsandstonequarry.com.au", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "windjetboats.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "wineandcheeseplace.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "winokey.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "wirelesslogicnordic.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "wirkaufen.it", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "witap.me", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "wjdetailers.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "wmsenibong.com.my", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "wmtools.me", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "wnc-frontend-alb-1765173526.ap-northeast-2.elb.amazonaws.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "wolfskymedia.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "woonaval.eu", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "wooplaces.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "workmaxidenta.lt", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "workmoneyfun.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "worldwideradiosummit.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "wotter.me", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "wpmatik.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "wrdmrk.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "wwilogistics.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "xmnr.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "xn----jtbiihtkil8b4e.xn--p1ai", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "xn--80a5ai3dd.xn--d1at.xn--90a3ac", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "xn--e1afggpjhk3b1e.xn--p1ai", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "xn--locaaomoema-p9a.com.br", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "xn--rdiger-barney-wob.de", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "xn--stubbfrsning-uppsala-hzb.se", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "xor.tools", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "xtom.social", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "xyl.cool", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "yaoyorozu.eu", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "ybr.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "ycnxp.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "ye-connect.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "yifansun.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "yilacoin.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "yogaanswered.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "yoshimura-seimenjo.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "yourfandom.ddns.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "yoursneakers.store", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "ytlarge.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "yugen.com.ua", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "zafago.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "zakreconysloik.com.pl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "zazemleno.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "ze-mag.info", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "zenmassageusa.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "zero-stress.net", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "zeromaxmoving.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "zhousiru.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "zrkhosting.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "zshmvp.com", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "ztable.io", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, + { "name": "zuidplein.nl", "policy": "bulk-1-year", "mode": "force-https", "include_subdomains": true }, // END OF 1-YEAR BULK HSTS ENTRIES // Only eTLD+1 domains can be submitted automatically to hstspreload.org,
diff --git a/net/http/transport_security_state_unittest.cc b/net/http/transport_security_state_unittest.cc index e418213..71ec9a2 100644 --- a/net/http/transport_security_state_unittest.cc +++ b/net/http/transport_security_state_unittest.cc
@@ -13,8 +13,8 @@ #include <vector> #include "base/base64.h" -#include "base/callback_helpers.h" #include "base/files/file_path.h" +#include "base/functional/callback_helpers.h" #include "base/json/json_reader.h" #include "base/memory/raw_ptr.h" #include "base/metrics/field_trial.h" @@ -2345,6 +2345,23 @@ host_port_pair, true, good_hashes, cert1.get(), cert2.get(), TransportSecurityState::ENABLE_PIN_REPORTS, network_anonymization_key, &unused_failure_log)); + + // Hashes should also be rejected if the hostname has a trailing dot. + host_port_pair = HostPortPair("example.test.", kPort); + EXPECT_EQ(TransportSecurityState::PKPStatus::VIOLATED, + state.CheckPublicKeyPins( + host_port_pair, true, good_hashes, cert1.get(), cert2.get(), + TransportSecurityState::ENABLE_PIN_REPORTS, + network_anonymization_key, &unused_failure_log)); + + // Hashes should also be rejected if the hostname has different + // capitalization. + host_port_pair = HostPortPair("ExAmpLe.tEsT", kPort); + EXPECT_EQ(TransportSecurityState::PKPStatus::VIOLATED, + state.CheckPublicKeyPins( + host_port_pair, true, good_hashes, cert1.get(), cert2.get(), + TransportSecurityState::ENABLE_PIN_REPORTS, + network_anonymization_key, &unused_failure_log)); } TEST_F(TransportSecurityStateTest, UpdateKeyPinsEmptyList) { @@ -2391,6 +2408,218 @@ network_anonymization_key, &unused_failure_log)); } +TEST_F(TransportSecurityStateTest, UpdateKeyPinsIncludeSubdomains) { + base::test::ScopedFeatureList scoped_feature_list_; + scoped_feature_list_.InitAndEnableFeature( + net::features::kStaticKeyPinningEnforcement); + HostPortPair host_port_pair("example.sub.test", kPort); + GURL report_uri(kReportUri); + NetworkAnonymizationKey network_anonymization_key = + NetworkAnonymizationKey::CreateTransient(); + // Two dummy certs to use as the server-sent and validated chains. The + // contents don't matter. + scoped_refptr<X509Certificate> cert1 = + ImportCertFromFile(GetTestCertsDirectory(), "ok_cert.pem"); + ASSERT_TRUE(cert1); + scoped_refptr<X509Certificate> cert2 = + ImportCertFromFile(GetTestCertsDirectory(), "expired_cert.pem"); + ASSERT_TRUE(cert2); + + // unpinned_hashes is a set of hashes that (after the update) won't match the + // expected hashes for the tld of this domain. kGoodPath is used here because + // it's a path that is accepted prior to any updates, and this test will + // validate it is rejected afterwards. + HashValueVector unpinned_hashes; + for (size_t i = 0; kGoodPath[i]; i++) { + EXPECT_TRUE(AddHash(kGoodPath[i], &unpinned_hashes)); + } + + TransportSecurityState state; + EnableStaticPins(&state); + std::string unused_failure_log; + + // Prior to updating the list, unpinned_hashes should be accepted + EXPECT_EQ(TransportSecurityState::PKPStatus::OK, + state.CheckPublicKeyPins( + host_port_pair, true, unpinned_hashes, cert1.get(), cert2.get(), + TransportSecurityState::ENABLE_PIN_REPORTS, + network_anonymization_key, &unused_failure_log)); + + // Update the pins list, adding kBadPath to the accepted hashes for this + // host, relying on include_subdomains for enforcement. The contents of the + // hashes don't matter as long as they are different from unpinned_hashes, + // kBadPath is used for convenience. + std::vector<std::vector<uint8_t>> accepted_hashes; + for (size_t i = 0; kBadPath[i]; i++) { + HashValue hash; + ASSERT_TRUE(hash.FromString(kBadPath[i])); + accepted_hashes.emplace_back(hash.data(), hash.data() + hash.size()); + } + TransportSecurityState::PinSet test_pinset( + /*name=*/"test", + /*static_spki_hashes=*/{accepted_hashes}, + /*bad_static_spki_hashes=*/{}, + /*report_uri=*/kReportUri); + // The host used in the test is "example.sub.test", so this pinset will only + // match due to include subdomains. + TransportSecurityState::PinSetInfo test_pinsetinfo( + /*hostname=*/"sub.test", /* pinset_name=*/"test", + /*include_subdomains=*/true); + state.UpdatePinList({test_pinset}, {test_pinsetinfo}, base::Time::Now()); + + // The path that was accepted before updating the pins should now be rejected. + EXPECT_EQ(TransportSecurityState::PKPStatus::VIOLATED, + state.CheckPublicKeyPins( + host_port_pair, true, unpinned_hashes, cert1.get(), cert2.get(), + TransportSecurityState::ENABLE_PIN_REPORTS, + network_anonymization_key, &unused_failure_log)); +} + +TEST_F(TransportSecurityStateTest, UpdateKeyPinsIncludeSubdomainsTLD) { + base::test::ScopedFeatureList scoped_feature_list_; + scoped_feature_list_.InitAndEnableFeature( + net::features::kStaticKeyPinningEnforcement); + HostPortPair host_port_pair(kHost, kPort); + GURL report_uri(kReportUri); + NetworkAnonymizationKey network_anonymization_key = + NetworkAnonymizationKey::CreateTransient(); + // Two dummy certs to use as the server-sent and validated chains. The + // contents don't matter. + scoped_refptr<X509Certificate> cert1 = + ImportCertFromFile(GetTestCertsDirectory(), "ok_cert.pem"); + ASSERT_TRUE(cert1); + scoped_refptr<X509Certificate> cert2 = + ImportCertFromFile(GetTestCertsDirectory(), "expired_cert.pem"); + ASSERT_TRUE(cert2); + + // unpinned_hashes is a set of hashes that (after the update) won't match the + // expected hashes for the tld of this domain. kGoodPath is used here because + // it's a path that is accepted prior to any updates, and this test will + // validate it is rejected afterwards. + HashValueVector unpinned_hashes; + for (size_t i = 0; kGoodPath[i]; i++) { + EXPECT_TRUE(AddHash(kGoodPath[i], &unpinned_hashes)); + } + + TransportSecurityState state; + EnableStaticPins(&state); + std::string unused_failure_log; + + // Prior to updating the list, unpinned_hashes should be accepted + EXPECT_EQ(TransportSecurityState::PKPStatus::OK, + state.CheckPublicKeyPins( + host_port_pair, true, unpinned_hashes, cert1.get(), cert2.get(), + TransportSecurityState::ENABLE_PIN_REPORTS, + network_anonymization_key, &unused_failure_log)); + + // Update the pins list, adding kBadPath to the accepted hashes for this + // host, relying on include_subdomains for enforcement. The contents of the + // hashes don't matter as long as they are different from unpinned_hashes, + // kBadPath is used for convenience. + std::vector<std::vector<uint8_t>> accepted_hashes; + for (size_t i = 0; kBadPath[i]; i++) { + HashValue hash; + ASSERT_TRUE(hash.FromString(kBadPath[i])); + accepted_hashes.emplace_back(hash.data(), hash.data() + hash.size()); + } + TransportSecurityState::PinSet test_pinset( + /*name=*/"test", + /*static_spki_hashes=*/{accepted_hashes}, + /*bad_static_spki_hashes=*/{}, + /*report_uri=*/kReportUri); + // The host used in the test is "example.test", so this pinset will only match + // due to include subdomains. + TransportSecurityState::PinSetInfo test_pinsetinfo( + /*hostname=*/"test", /* pinset_name=*/"test", + /*include_subdomains=*/true); + state.UpdatePinList({test_pinset}, {test_pinsetinfo}, base::Time::Now()); + + // The path that was accepted before updating the pins should now be rejected. + EXPECT_EQ(TransportSecurityState::PKPStatus::VIOLATED, + state.CheckPublicKeyPins( + host_port_pair, true, unpinned_hashes, cert1.get(), cert2.get(), + TransportSecurityState::ENABLE_PIN_REPORTS, + network_anonymization_key, &unused_failure_log)); +} + +TEST_F(TransportSecurityStateTest, UpdateKeyPinsDontIncludeSubdomains) { + base::test::ScopedFeatureList scoped_feature_list_; + scoped_feature_list_.InitAndEnableFeature( + net::features::kStaticKeyPinningEnforcement); + HostPortPair host_port_pair(kHost, kPort); + GURL report_uri(kReportUri); + NetworkAnonymizationKey network_anonymization_key = + NetworkAnonymizationKey::CreateTransient(); + // Two dummy certs to use as the server-sent and validated chains. The + // contents don't matter. + scoped_refptr<X509Certificate> cert1 = + ImportCertFromFile(GetTestCertsDirectory(), "ok_cert.pem"); + ASSERT_TRUE(cert1); + scoped_refptr<X509Certificate> cert2 = + ImportCertFromFile(GetTestCertsDirectory(), "expired_cert.pem"); + ASSERT_TRUE(cert2); + + // unpinned_hashes is a set of hashes that (after the update) won't match the + // expected hashes for the tld of this domain. kGoodPath is used here because + // it's a path that is accepted prior to any updates, and this test will + // validate it is accepted or rejected afterwards depending on whether the + // domain is an exact match. + HashValueVector unpinned_hashes; + for (size_t i = 0; kGoodPath[i]; i++) { + EXPECT_TRUE(AddHash(kGoodPath[i], &unpinned_hashes)); + } + + TransportSecurityState state; + EnableStaticPins(&state); + std::string unused_failure_log; + + // Prior to updating the list, unpinned_hashes should be accepted + EXPECT_EQ(TransportSecurityState::PKPStatus::OK, + state.CheckPublicKeyPins( + host_port_pair, true, unpinned_hashes, cert1.get(), cert2.get(), + TransportSecurityState::ENABLE_PIN_REPORTS, + network_anonymization_key, &unused_failure_log)); + + // Update the pins list, adding kBadPath to the accepted hashes for the + // tld of this host, but without include_subdomains set. The contents of the + // hashes don't matter as long as they are different from unpinned_hashes, + // kBadPath is used for convenience. + std::vector<std::vector<uint8_t>> accepted_hashes; + for (size_t i = 0; kBadPath[i]; i++) { + HashValue hash; + ASSERT_TRUE(hash.FromString(kBadPath[i])); + accepted_hashes.emplace_back(hash.data(), hash.data() + hash.size()); + } + TransportSecurityState::PinSet test_pinset( + /*name=*/"test", + /*static_spki_hashes=*/{accepted_hashes}, + /*bad_static_spki_hashes=*/{}, + /*report_uri=*/kReportUri); + // The host used in the test is "example.test", so this pinset will not match + // due to include subdomains not being set. + TransportSecurityState::PinSetInfo test_pinsetinfo( + /*hostname=*/"test", /* pinset_name=*/"test", + /*include_subdomains=*/false); + state.UpdatePinList({test_pinset}, {test_pinsetinfo}, base::Time::Now()); + + // Hashes that were accepted before the update should still be accepted since + // include subdomains is not set for the pinset, and this is not an exact + // match. + EXPECT_EQ(TransportSecurityState::PKPStatus::OK, + state.CheckPublicKeyPins( + host_port_pair, true, unpinned_hashes, cert1.get(), cert2.get(), + TransportSecurityState::ENABLE_PIN_REPORTS, + network_anonymization_key, &unused_failure_log)); + + // Hashes should be rejected for an exact match of the hostname. + HostPortPair exact_match_host("test", kPort); + EXPECT_EQ(TransportSecurityState::PKPStatus::VIOLATED, + state.CheckPublicKeyPins( + exact_match_host, true, unpinned_hashes, cert1.get(), + cert2.get(), TransportSecurityState::ENABLE_PIN_REPORTS, + network_anonymization_key, &unused_failure_log)); +} + TEST_F(TransportSecurityStateTest, UpdateKeyPinsListTimestamp) { base::test::ScopedFeatureList scoped_feature_list_; scoped_feature_list_.InitAndEnableFeature(
diff --git a/net/log/file_net_log_observer.cc b/net/log/file_net_log_observer.cc index 8b03493..d868ae4 100644 --- a/net/log/file_net_log_observer.cc +++ b/net/log/file_net_log_observer.cc
@@ -9,10 +9,10 @@ #include <string> #include <utility> -#include "base/bind.h" #include "base/containers/queue.h" #include "base/files/file.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/json/json_writer.h" #include "base/logging.h" #include "base/memory/ptr_util.h"
diff --git a/net/log/file_net_log_observer.h b/net/log/file_net_log_observer.h index 7bcdf8fc..b8934ae 100644 --- a/net/log/file_net_log_observer.h +++ b/net/log/file_net_log_observer.h
@@ -8,8 +8,8 @@ #include <limits> #include <memory> -#include "base/callback.h" #include "base/files/file.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" #include "net/base/net_export.h" #include "net/log/net_log.h"
diff --git a/net/log/file_net_log_observer_unittest.cc b/net/log/file_net_log_observer_unittest.cc index 9587525..1868855 100644 --- a/net/log/file_net_log_observer_unittest.cc +++ b/net/log/file_net_log_observer_unittest.cc
@@ -7,13 +7,13 @@ #include <string> #include <vector> -#include "base/bind.h" -#include "base/callback.h" #include "base/files/file.h" #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/files/scoped_file.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/json/json_reader.h" #include "base/json/json_writer.h" #include "base/memory/raw_ptr.h"
diff --git a/net/log/test_net_log.h b/net/log/test_net_log.h index 9cf0819..9bbc697 100644 --- a/net/log/test_net_log.h +++ b/net/log/test_net_log.h
@@ -9,8 +9,8 @@ #include <vector> -#include "base/callback.h" #include "base/compiler_specific.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "net/log/net_log.h" #include "net/log/net_log_event_type.h"
diff --git a/net/log/trace_net_log_observer_unittest.cc b/net/log/trace_net_log_observer_unittest.cc index 80c07107..fd2b7dd 100644 --- a/net/log/trace_net_log_observer_unittest.cc +++ b/net/log/trace_net_log_observer_unittest.cc
@@ -8,8 +8,8 @@ #include <string> #include <vector> -#include "base/bind.h" #include "base/check.h" +#include "base/functional/bind.h" #include "base/json/json_reader.h" #include "base/memory/ptr_util.h" #include "base/memory/ref_counted.h"
diff --git a/net/network_error_logging/mock_persistent_nel_store.h b/net/network_error_logging/mock_persistent_nel_store.h index 6324e96..739c182 100644 --- a/net/network_error_logging/mock_persistent_nel_store.h +++ b/net/network_error_logging/mock_persistent_nel_store.h
@@ -7,7 +7,7 @@ #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "net/network_error_logging/network_error_logging_service.h" #include "url/origin.h"
diff --git a/net/network_error_logging/network_error_logging_service.cc b/net/network_error_logging/network_error_logging_service.cc index 8386057..04bb10f 100644 --- a/net/network_error_logging/network_error_logging_service.cc +++ b/net/network_error_logging/network_error_logging_service.cc
@@ -9,8 +9,8 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/json/json_reader.h" #include "base/logging.h" #include "base/memory/raw_ptr.h"
diff --git a/net/network_error_logging/network_error_logging_service_unittest.cc b/net/network_error_logging/network_error_logging_service_unittest.cc index 5152eba..7296b66b 100644 --- a/net/network_error_logging/network_error_logging_service_unittest.cc +++ b/net/network_error_logging/network_error_logging_service_unittest.cc
@@ -6,8 +6,8 @@ #include <string> #include <vector> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/strings/stringprintf.h" #include "base/test/scoped_feature_list.h" #include "base/test/simple_test_clock.h"
diff --git a/net/network_error_logging/network_error_logging_test_util.h b/net/network_error_logging/network_error_logging_test_util.h index 0a273379..24ef088 100644 --- a/net/network_error_logging/network_error_logging_test_util.h +++ b/net/network_error_logging/network_error_logging_test_util.h
@@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "net/base/address_list.h" #include "net/base/ip_address.h" #include "net/network_error_logging/network_error_logging_service.h"
diff --git a/net/nqe/event_creator.cc b/net/nqe/event_creator.cc index 5007dc0..bb0b981 100644 --- a/net/nqe/event_creator.cc +++ b/net/nqe/event_creator.cc
@@ -8,8 +8,8 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/strings/string_number_conversions.h" #include "base/values.h" #include "net/log/net_log_capture_mode.h"
diff --git a/net/nqe/network_qualities_prefs_manager.cc b/net/nqe/network_qualities_prefs_manager.cc index d01d951..bff2264 100644 --- a/net/nqe/network_qualities_prefs_manager.cc +++ b/net/nqe/network_qualities_prefs_manager.cc
@@ -7,7 +7,7 @@ #include <string> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_macros_local.h" #include "base/rand_util.h" #include "base/task/sequenced_task_runner.h"
diff --git a/net/nqe/network_quality_estimator.cc b/net/nqe/network_quality_estimator.cc index 763d4a2..ba7c9c6 100644 --- a/net/nqe/network_quality_estimator.cc +++ b/net/nqe/network_quality_estimator.cc
@@ -10,9 +10,9 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/check_op.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/metrics/field_trial_params.h" #include "base/metrics/histogram.h"
diff --git a/net/nqe/network_quality_estimator_util.cc b/net/nqe/network_quality_estimator_util.cc index 570707e..41de2d1c 100644 --- a/net/nqe/network_quality_estimator_util.cc +++ b/net/nqe/network_quality_estimator_util.cc
@@ -6,8 +6,8 @@ #include <memory> -#include "base/bind.h" #include "base/check_op.h" +#include "base/functional/bind.h" #include "base/notreached.h" #include "net/base/address_list.h" #include "net/base/host_port_pair.h"
diff --git a/net/nqe/network_quality_store.cc b/net/nqe/network_quality_store.cc index 3f5e88c..2ab17a8 100644 --- a/net/nqe/network_quality_store.cc +++ b/net/nqe/network_quality_store.cc
@@ -4,7 +4,7 @@ #include "net/nqe/network_quality_store.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/observer_list.h" #include "base/task/single_thread_task_runner.h"
diff --git a/net/nqe/socket_watcher.cc b/net/nqe/socket_watcher.cc index 8f782fa..a8ad99a339 100644 --- a/net/nqe/socket_watcher.cc +++ b/net/nqe/socket_watcher.cc
@@ -4,7 +4,7 @@ #include "net/nqe/socket_watcher.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/task/single_thread_task_runner.h" #include "base/time/tick_clock.h"
diff --git a/net/nqe/socket_watcher.h b/net/nqe/socket_watcher.h index b759b36..f31959c 100644 --- a/net/nqe/socket_watcher.h +++ b/net/nqe/socket_watcher.h
@@ -5,7 +5,7 @@ #ifndef NET_NQE_SOCKET_WATCHER_H_ #define NET_NQE_SOCKET_WATCHER_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h"
diff --git a/net/nqe/socket_watcher_factory.h b/net/nqe/socket_watcher_factory.h index ee4313d..7fcd8db6 100644 --- a/net/nqe/socket_watcher_factory.h +++ b/net/nqe/socket_watcher_factory.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h"
diff --git a/net/nqe/socket_watcher_unittest.cc b/net/nqe/socket_watcher_unittest.cc index 3b20bca..cba4790 100644 --- a/net/nqe/socket_watcher_unittest.cc +++ b/net/nqe/socket_watcher_unittest.cc
@@ -4,7 +4,7 @@ #include "net/nqe/socket_watcher.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/task/single_thread_task_runner.h" #include "base/test/simple_test_tick_clock.h"
diff --git a/net/nqe/throughput_analyzer.cc b/net/nqe/throughput_analyzer.cc index abb2336a..7e384b1 100644 --- a/net/nqe/throughput_analyzer.cc +++ b/net/nqe/throughput_analyzer.cc
@@ -6,7 +6,7 @@ #include <cmath> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/metrics/histogram_macros.h" #include "base/task/single_thread_task_runner.h"
diff --git a/net/nqe/throughput_analyzer.h b/net/nqe/throughput_analyzer.h index dd6bc38..c1515fe 100644 --- a/net/nqe/throughput_analyzer.h +++ b/net/nqe/throughput_analyzer.h
@@ -10,7 +10,7 @@ #include <unordered_map> #include <unordered_set> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h" #include "base/sequence_checker.h"
diff --git a/net/nqe/throughput_analyzer_unittest.cc b/net/nqe/throughput_analyzer_unittest.cc index 779ba26..32ea5d19 100644 --- a/net/nqe/throughput_analyzer_unittest.cc +++ b/net/nqe/throughput_analyzer_unittest.cc
@@ -12,9 +12,9 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/containers/circular_deque.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/run_loop.h" #include "base/strings/string_number_conversions.h"
diff --git a/net/proxy_resolution/configured_proxy_resolution_request.cc b/net/proxy_resolution/configured_proxy_resolution_request.cc index 4934465..fb13933e3 100644 --- a/net/proxy_resolution/configured_proxy_resolution_request.cc +++ b/net/proxy_resolution/configured_proxy_resolution_request.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "net/base/net_errors.h" #include "net/log/net_log_event_type.h" #include "net/proxy_resolution/configured_proxy_resolution_service.h"
diff --git a/net/proxy_resolution/configured_proxy_resolution_service.cc b/net/proxy_resolution/configured_proxy_resolution_service.cc index 09f8244..cd91e01c 100644 --- a/net/proxy_resolution/configured_proxy_resolution_service.cc +++ b/net/proxy_resolution/configured_proxy_resolution_service.cc
@@ -9,9 +9,9 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/compiler_specific.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/logging.h" #include "base/memory/raw_ptr.h"
diff --git a/net/proxy_resolution/configured_proxy_resolution_service_unittest.cc b/net/proxy_resolution/configured_proxy_resolution_service_unittest.cc index 1ac9a3b..a0c8c19f 100644 --- a/net/proxy_resolution/configured_proxy_resolution_service_unittest.cc +++ b/net/proxy_resolution/configured_proxy_resolution_service_unittest.cc
@@ -10,9 +10,9 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/check.h" #include "base/format_macros.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h"
diff --git a/net/proxy_resolution/multi_threaded_proxy_resolver.cc b/net/proxy_resolution/multi_threaded_proxy_resolver.cc index fcfa4b8..10b99a34e 100644 --- a/net/proxy_resolution/multi_threaded_proxy_resolver.cc +++ b/net/proxy_resolution/multi_threaded_proxy_resolver.cc
@@ -8,9 +8,9 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/containers/circular_deque.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/memory/raw_ptr.h" #include "base/strings/string_util.h"
diff --git a/net/proxy_resolution/multi_threaded_proxy_resolver_unittest.cc b/net/proxy_resolution/multi_threaded_proxy_resolver_unittest.cc index 52e1dd6..c3d38c8 100644 --- a/net/proxy_resolution/multi_threaded_proxy_resolver_unittest.cc +++ b/net/proxy_resolution/multi_threaded_proxy_resolver_unittest.cc
@@ -8,7 +8,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/strings/string_util.h"
diff --git a/net/proxy_resolution/network_delegate_error_observer.cc b/net/proxy_resolution/network_delegate_error_observer.cc index 448fda64..b63dfec3 100644 --- a/net/proxy_resolution/network_delegate_error_observer.cc +++ b/net/proxy_resolution/network_delegate_error_observer.cc
@@ -4,7 +4,7 @@ #include "net/proxy_resolution/network_delegate_error_observer.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/memory/raw_ptr.h" #include "base/task/single_thread_task_runner.h"
diff --git a/net/proxy_resolution/network_delegate_error_observer_unittest.cc b/net/proxy_resolution/network_delegate_error_observer_unittest.cc index 5789860..f53faca 100644 --- a/net/proxy_resolution/network_delegate_error_observer_unittest.cc +++ b/net/proxy_resolution/network_delegate_error_observer_unittest.cc
@@ -4,8 +4,8 @@ #include "net/proxy_resolution/network_delegate_error_observer.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/run_loop.h" #include "base/task/single_thread_task_runner.h"
diff --git a/net/proxy_resolution/pac_file_decider.cc b/net/proxy_resolution/pac_file_decider.cc index 0189a56..4deba5e 100644 --- a/net/proxy_resolution/pac_file_decider.cc +++ b/net/proxy_resolution/pac_file_decider.cc
@@ -6,11 +6,11 @@ #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/check_op.h" #include "base/compiler_specific.h" #include "base/format_macros.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/metrics/histogram_macros.h" #include "base/notreached.h" #include "base/strings/string_util.h"
diff --git a/net/proxy_resolution/pac_file_decider_unittest.cc b/net/proxy_resolution/pac_file_decider_unittest.cc index 748a2ec7..8f25c2f0 100644 --- a/net/proxy_resolution/pac_file_decider_unittest.cc +++ b/net/proxy_resolution/pac_file_decider_unittest.cc
@@ -5,7 +5,7 @@ #include <memory> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h"
diff --git a/net/proxy_resolution/pac_file_fetcher_impl.cc b/net/proxy_resolution/pac_file_fetcher_impl.cc index b7651062..485dd7a 100644 --- a/net/proxy_resolution/pac_file_fetcher_impl.cc +++ b/net/proxy_resolution/pac_file_fetcher_impl.cc
@@ -4,8 +4,8 @@ #include "net/proxy_resolution/pac_file_fetcher_impl.h" -#include "base/bind.h" #include "base/compiler_specific.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/logging.h" #include "base/memory/ptr_util.h"
diff --git a/net/proxy_resolution/polling_proxy_config_service.cc b/net/proxy_resolution/polling_proxy_config_service.cc index 386d7639..b49dca1 100644 --- a/net/proxy_resolution/polling_proxy_config_service.cc +++ b/net/proxy_resolution/polling_proxy_config_service.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/observer_list.h" #include "base/synchronization/lock.h"
diff --git a/net/proxy_resolution/proxy_config_service_android.cc b/net/proxy_resolution/proxy_config_service_android.cc index 2e614257..ebbad2b 100644 --- a/net/proxy_resolution/proxy_config_service_android.cc +++ b/net/proxy_resolution/proxy_config_service_android.cc
@@ -8,10 +8,10 @@ #include "base/android/jni_array.h" #include "base/android/jni_string.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/check_op.h" #include "base/compiler_specific.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/location.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h"
diff --git a/net/proxy_resolution/proxy_config_service_android.h b/net/proxy_resolution/proxy_config_service_android.h index 869efcc..2664eb2 100644 --- a/net/proxy_resolution/proxy_config_service_android.h +++ b/net/proxy_resolution/proxy_config_service_android.h
@@ -8,8 +8,8 @@ #include <string> #include "base/android/jni_android.h" -#include "base/callback_forward.h" #include "base/compiler_specific.h" +#include "base/functional/callback_forward.h" #include "base/memory/scoped_refptr.h" #include "net/base/net_export.h" #include "net/proxy_resolution/proxy_config_service.h"
diff --git a/net/proxy_resolution/proxy_config_service_android_unittest.cc b/net/proxy_resolution/proxy_config_service_android_unittest.cc index 2cc00ab..f31b10d 100644 --- a/net/proxy_resolution/proxy_config_service_android_unittest.cc +++ b/net/proxy_resolution/proxy_config_service_android_unittest.cc
@@ -8,9 +8,9 @@ #include <memory> #include <string> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/compiler_specific.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "base/task/single_thread_task_runner.h" #include "net/net_test_jni_headers/AndroidProxyConfigServiceTestUtil_jni.h"
diff --git a/net/proxy_resolution/proxy_config_service_linux.cc b/net/proxy_resolution/proxy_config_service_linux.cc index 1f3405b..62ad8e5 100644 --- a/net/proxy_resolution/proxy_config_service_linux.cc +++ b/net/proxy_resolution/proxy_config_service_linux.cc
@@ -13,11 +13,11 @@ #include <memory> #include <utility> -#include "base/bind.h" #include "base/files/file_descriptor_watcher_posix.h" #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/files/scoped_file.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h"
diff --git a/net/proxy_resolution/proxy_config_service_linux_unittest.cc b/net/proxy_resolution/proxy_config_service_linux_unittest.cc index 094ce51e..0769117 100644 --- a/net/proxy_resolution/proxy_config_service_linux_unittest.cc +++ b/net/proxy_resolution/proxy_config_service_linux_unittest.cc
@@ -8,12 +8,12 @@ #include <string> #include <vector> -#include "base/bind.h" #include "base/check.h" #include "base/compiler_specific.h" #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/format_macros.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/memory/raw_ptr.h" #include "base/message_loop/message_pump_type.h"
diff --git a/net/proxy_resolution/proxy_config_service_mac.cc b/net/proxy_resolution/proxy_config_service_mac.cc index e51583a..ef3b46ee 100644 --- a/net/proxy_resolution/proxy_config_service_mac.cc +++ b/net/proxy_resolution/proxy_config_service_mac.cc
@@ -9,7 +9,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/mac/foundation_util.h" #include "base/mac/scoped_cftyperef.h"
diff --git a/net/proxy_resolution/proxy_list.cc b/net/proxy_resolution/proxy_list.cc index 13f77002..80a276d 100644 --- a/net/proxy_resolution/proxy_list.cc +++ b/net/proxy_resolution/proxy_list.cc
@@ -4,8 +4,8 @@ #include "net/proxy_resolution/proxy_list.h" -#include "base/callback.h" #include "base/check.h" +#include "base/functional/callback.h" #include "base/notreached.h" #include "base/strings/string_tokenizer.h" #include "base/time/time.h"
diff --git a/net/proxy_resolution/proxy_resolver.h b/net/proxy_resolution/proxy_resolver.h index 666a7c2b..ae8ec46 100644 --- a/net/proxy_resolution/proxy_resolver.h +++ b/net/proxy_resolution/proxy_resolver.h
@@ -5,7 +5,7 @@ #ifndef NET_PROXY_RESOLUTION_PROXY_RESOLVER_H_ #define NET_PROXY_RESOLUTION_PROXY_RESOLVER_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "net/base/completion_once_callback.h" #include "net/base/load_states.h" #include "net/base/net_export.h"
diff --git a/net/proxy_resolution/win/dhcp_pac_file_adapter_fetcher_win.cc b/net/proxy_resolution/win/dhcp_pac_file_adapter_fetcher_win.cc index 0245b68..2edd449 100644 --- a/net/proxy_resolution/win/dhcp_pac_file_adapter_fetcher_win.cc +++ b/net/proxy_resolution/win/dhcp_pac_file_adapter_fetcher_win.cc
@@ -4,8 +4,8 @@ #include "net/proxy_resolution/win/dhcp_pac_file_adapter_fetcher_win.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/logging.h" #include "base/memory/free_deleter.h"
diff --git a/net/proxy_resolution/win/dhcp_pac_file_fetcher_win.cc b/net/proxy_resolution/win/dhcp_pac_file_fetcher_win.cc index 3db8560..e0453a3 100644 --- a/net/proxy_resolution/win/dhcp_pac_file_fetcher_win.cc +++ b/net/proxy_resolution/win/dhcp_pac_file_fetcher_win.cc
@@ -7,9 +7,9 @@ #include <memory> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/containers/queue.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/free_deleter.h" #include "base/synchronization/lock.h" #include "base/task/task_runner.h"
diff --git a/net/proxy_resolution/win/dhcp_pac_file_fetcher_win_unittest.cc b/net/proxy_resolution/win/dhcp_pac_file_fetcher_win_unittest.cc index d2b0f8d..64b3774 100644 --- a/net/proxy_resolution/win/dhcp_pac_file_fetcher_win_unittest.cc +++ b/net/proxy_resolution/win/dhcp_pac_file_fetcher_win_unittest.cc
@@ -7,8 +7,8 @@ #include <memory> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/rand_util.h" #include "base/run_loop.h" #include "base/test/task_environment.h"
diff --git a/net/proxy_resolution/win/proxy_config_service_win.cc b/net/proxy_resolution/win/proxy_config_service_win.cc index a4071a5..042a938e7d8 100644 --- a/net/proxy_resolution/win/proxy_config_service_win.cc +++ b/net/proxy_resolution/win/proxy_config_service_win.cc
@@ -7,9 +7,9 @@ #include <windows.h> #include <winhttp.h> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/ranges/algorithm.h" #include "base/strings/string_tokenizer.h"
diff --git a/net/quic/bidirectional_stream_quic_impl.cc b/net/quic/bidirectional_stream_quic_impl.cc index dedf1eee..9cf0470 100644 --- a/net/quic/bidirectional_stream_quic_impl.cc +++ b/net/quic/bidirectional_stream_quic_impl.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/logging.h" #include "base/memory/raw_ptr.h"
diff --git a/net/quic/crypto/proof_verifier_chromium.cc b/net/quic/crypto/proof_verifier_chromium.cc index 9f3e9af1..28cf482 100644 --- a/net/quic/crypto/proof_verifier_chromium.cc +++ b/net/quic/crypto/proof_verifier_chromium.cc
@@ -6,9 +6,9 @@ #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/memory/raw_ptr.h" #include "base/metrics/histogram_functions.h"
diff --git a/net/quic/crypto_test_utils_chromium.cc b/net/quic/crypto_test_utils_chromium.cc index 31127511..2ccfc17 100644 --- a/net/quic/crypto_test_utils_chromium.cc +++ b/net/quic/crypto_test_utils_chromium.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/callback_helpers.h" #include "base/check.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ref_counted.h" #include "net/base/net_errors.h" #include "net/base/network_anonymization_key.h"
diff --git a/net/quic/quic_chromium_alarm_factory.cc b/net/quic/quic_chromium_alarm_factory.cc index 4c82eef..0c7ef923 100644 --- a/net/quic/quic_chromium_alarm_factory.cc +++ b/net/quic/quic_chromium_alarm_factory.cc
@@ -4,8 +4,8 @@ #include "net/quic/quic_chromium_alarm_factory.h" -#include "base/bind.h" #include "base/check.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/memory/raw_ptr.h" #include "base/task/sequenced_task_runner.h"
diff --git a/net/quic/quic_chromium_client_session.cc b/net/quic/quic_chromium_client_session.cc index 44eea64..e761d5d6 100644 --- a/net/quic/quic_chromium_client_session.cc +++ b/net/quic/quic_chromium_client_session.cc
@@ -8,9 +8,9 @@ #include <set> #include <utility> -#include "base/bind.h" #include "base/containers/contains.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/memory/ptr_util.h"
diff --git a/net/quic/quic_chromium_client_session_test.cc b/net/quic/quic_chromium_client_session_test.cc index 32b76c61..ddd020f 100644 --- a/net/quic/quic_chromium_client_session_test.cc +++ b/net/quic/quic_chromium_client_session_test.cc
@@ -5,8 +5,8 @@ #include "net/quic/quic_chromium_client_session.h" #include "base/base64.h" -#include "base/bind.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h"
diff --git a/net/quic/quic_chromium_client_stream.cc b/net/quic/quic_chromium_client_stream.cc index 615ec07..9d9c97d 100644 --- a/net/quic/quic_chromium_client_stream.cc +++ b/net/quic/quic_chromium_client_stream.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h"
diff --git a/net/quic/quic_chromium_client_stream.h b/net/quic/quic_chromium_client_stream.h index b89907c..8760b9eb 100644 --- a/net/quic/quic_chromium_client_stream.h +++ b/net/quic/quic_chromium_client_stream.h
@@ -12,8 +12,8 @@ #include <memory> #include <vector> -#include "base/callback_forward.h" #include "base/containers/circular_deque.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/time/time.h" #include "net/base/completion_once_callback.h"
diff --git a/net/quic/quic_chromium_client_stream_test.cc b/net/quic/quic_chromium_client_stream_test.cc index 7a47c25..dd458b83 100644 --- a/net/quic/quic_chromium_client_stream_test.cc +++ b/net/quic/quic_chromium_client_stream_test.cc
@@ -6,8 +6,8 @@ #include <string> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h"
diff --git a/net/quic/quic_chromium_packet_reader.cc b/net/quic/quic_chromium_packet_reader.cc index 63f2903..1a6de07 100644 --- a/net/quic/quic_chromium_packet_reader.cc +++ b/net/quic/quic_chromium_packet_reader.cc
@@ -4,7 +4,7 @@ #include "net/quic/quic_chromium_packet_reader.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/metrics/histogram_macros.h" #include "base/task/single_thread_task_runner.h"
diff --git a/net/quic/quic_chromium_packet_writer.cc b/net/quic/quic_chromium_packet_writer.cc index 7732c9d..77f4868 100644 --- a/net/quic/quic_chromium_packet_writer.cc +++ b/net/quic/quic_chromium_packet_writer.cc
@@ -7,8 +7,8 @@ #include <string> #include <utility> -#include "base/bind.h" #include "base/check_op.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/metrics/histogram_macros.h" #include "base/metrics/sparse_histogram.h"
diff --git a/net/quic/quic_http_stream.cc b/net/quic/quic_http_stream.cc index 3a35564a..0f075242 100644 --- a/net/quic/quic_http_stream.cc +++ b/net/quic/quic_http_stream.cc
@@ -8,7 +8,7 @@ #include <utility> #include "base/auto_reset.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_functions.h" #include "base/strings/string_split.h" #include "base/task/single_thread_task_runner.h"
diff --git a/net/quic/quic_http_stream_test.cc b/net/quic/quic_http_stream_test.cc index 2d9a36e4..57e0289e1 100644 --- a/net/quic/quic_http_stream_test.cc +++ b/net/quic/quic_http_stream_test.cc
@@ -9,7 +9,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h"
diff --git a/net/quic/quic_network_transaction_unittest.cc b/net/quic/quic_network_transaction_unittest.cc index a244f76..d152c77e 100644 --- a/net/quic/quic_network_transaction_unittest.cc +++ b/net/quic/quic_network_transaction_unittest.cc
@@ -8,8 +8,8 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/compiler_specific.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/strings/strcat.h"
diff --git a/net/quic/quic_proxy_client_socket.cc b/net/quic/quic_proxy_client_socket.cc index 3c8e30ff..2056091 100644 --- a/net/quic/quic_proxy_client_socket.cc +++ b/net/quic/quic_proxy_client_socket.cc
@@ -7,8 +7,8 @@ #include <cstdio> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/values.h" #include "net/base/proxy_delegate.h" #include "net/http/http_auth_controller.h"
diff --git a/net/quic/quic_proxy_client_socket_unittest.cc b/net/quic/quic_proxy_client_socket_unittest.cc index 43554df..5d4621a 100644 --- a/net/quic/quic_proxy_client_socket_unittest.cc +++ b/net/quic/quic_proxy_client_socket_unittest.cc
@@ -9,7 +9,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h"
diff --git a/net/quic/quic_stream_factory.cc b/net/quic/quic_stream_factory.cc index f8da5142..c52c7283 100644 --- a/net/quic/quic_stream_factory.cc +++ b/net/quic/quic_stream_factory.cc
@@ -9,9 +9,9 @@ #include <tuple> #include <utility> -#include "base/bind.h" #include "base/containers/contains.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/memory/memory_pressure_monitor.h" #include "base/memory/raw_ptr.h"
diff --git a/net/quic/quic_stream_factory_test.cc b/net/quic/quic_stream_factory_test.cc index 94799dcfc..b9b66be0 100644 --- a/net/quic/quic_stream_factory_test.cc +++ b/net/quic/quic_stream_factory_test.cc
@@ -9,8 +9,8 @@ #include <set> #include <utility> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/strings/strcat.h"
diff --git a/net/quic/test_task_runner.h b/net/quic/test_task_runner.h index 5309a8d..4ba30ed 100644 --- a/net/quic/test_task_runner.h +++ b/net/quic/test_task_runner.h
@@ -9,7 +9,7 @@ #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/task/sequenced_task_runner.h" #include "base/task/task_runner.h"
diff --git a/net/reporting/mock_persistent_reporting_store.h b/net/reporting/mock_persistent_reporting_store.h index 4642a56..cf39a9f 100644 --- a/net/reporting/mock_persistent_reporting_store.h +++ b/net/reporting/mock_persistent_reporting_store.h
@@ -7,7 +7,7 @@ #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "net/base/network_anonymization_key.h" #include "net/reporting/reporting_cache.h" #include "net/reporting/reporting_endpoint.h"
diff --git a/net/reporting/reporting_browsing_data_remover.h b/net/reporting/reporting_browsing_data_remover.h index f1445d9e..bff87f18 100644 --- a/net/reporting/reporting_browsing_data_remover.h +++ b/net/reporting/reporting_browsing_data_remover.h
@@ -5,7 +5,7 @@ #ifndef NET_REPORTING_REPORTING_BROWSING_DATA_REMOVER_H_ #define NET_REPORTING_REPORTING_BROWSING_DATA_REMOVER_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "net/base/net_export.h" #include "url/origin.h"
diff --git a/net/reporting/reporting_browsing_data_remover_unittest.cc b/net/reporting/reporting_browsing_data_remover_unittest.cc index 5d96fb6..73cdda9 100644 --- a/net/reporting/reporting_browsing_data_remover_unittest.cc +++ b/net/reporting/reporting_browsing_data_remover_unittest.cc
@@ -7,7 +7,7 @@ #include <memory> #include <string> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/test/simple_test_tick_clock.h" #include "net/base/network_anonymization_key.h" #include "net/reporting/reporting_cache.h"
diff --git a/net/reporting/reporting_cache.h b/net/reporting/reporting_cache.h index b9e7017..6f8922b 100644 --- a/net/reporting/reporting_cache.h +++ b/net/reporting/reporting_cache.h
@@ -10,9 +10,9 @@ #include <string> #include <vector> -#include "base/callback.h" #include "base/containers/flat_map.h" #include "base/containers/flat_set.h" +#include "base/functional/callback.h" #include "base/time/time.h" #include "base/unguessable_token.h" #include "base/values.h"
diff --git a/net/reporting/reporting_cache_unittest.cc b/net/reporting/reporting_cache_unittest.cc index 3c8cae2..e60e51b 100644 --- a/net/reporting/reporting_cache_unittest.cc +++ b/net/reporting/reporting_cache_unittest.cc
@@ -7,8 +7,8 @@ #include <string> #include <utility> -#include "base/bind.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h" #include "base/test/scoped_feature_list.h"
diff --git a/net/reporting/reporting_context.cc b/net/reporting/reporting_context.cc index 1867ac1..b8ebd028 100644 --- a/net/reporting/reporting_context.cc +++ b/net/reporting/reporting_context.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/observer_list.h" #include "base/rand_util.h" #include "base/time/clock.h"
diff --git a/net/reporting/reporting_delegate.h b/net/reporting/reporting_delegate.h index 665f1c6..ca09c65 100644 --- a/net/reporting/reporting_delegate.h +++ b/net/reporting/reporting_delegate.h
@@ -8,7 +8,7 @@ #include <memory> #include <set> -#include "base/callback.h" +#include "base/functional/callback.h" #include "net/base/net_export.h" class GURL;
diff --git a/net/reporting/reporting_delivery_agent.cc b/net/reporting/reporting_delivery_agent.cc index 529653b..4adb28e 100644 --- a/net/reporting/reporting_delivery_agent.cc +++ b/net/reporting/reporting_delivery_agent.cc
@@ -11,9 +11,9 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/check.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/json/json_writer.h" #include "base/memory/raw_ptr.h" #include "base/metrics/histogram_functions.h"
diff --git a/net/reporting/reporting_garbage_collector.cc b/net/reporting/reporting_garbage_collector.cc index 4db08e0..5690fc3 100644 --- a/net/reporting/reporting_garbage_collector.cc +++ b/net/reporting/reporting_garbage_collector.cc
@@ -7,8 +7,8 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/containers/flat_set.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/time/tick_clock.h" #include "base/time/time.h"
diff --git a/net/reporting/reporting_header_parser.cc b/net/reporting/reporting_header_parser.cc index 9bc7d46..30f9897 100644 --- a/net/reporting/reporting_header_parser.cc +++ b/net/reporting/reporting_header_parser.cc
@@ -9,9 +9,9 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/check.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/json/json_reader.h" #include "base/metrics/histogram_functions.h" #include "base/time/time.h"
diff --git a/net/reporting/reporting_header_parser_unittest.cc b/net/reporting/reporting_header_parser_unittest.cc index 3d617e7..2244757 100644 --- a/net/reporting/reporting_header_parser_unittest.cc +++ b/net/reporting/reporting_header_parser_unittest.cc
@@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/json/json_reader.h" #include "base/strings/strcat.h" #include "base/strings/string_number_conversions.h"
diff --git a/net/reporting/reporting_network_change_observer_unittest.cc b/net/reporting/reporting_network_change_observer_unittest.cc index bb5edcee..70c01bc 100644 --- a/net/reporting/reporting_network_change_observer_unittest.cc +++ b/net/reporting/reporting_network_change_observer_unittest.cc
@@ -4,7 +4,7 @@ #include "net/reporting/reporting_network_change_observer.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/test/simple_test_tick_clock.h" #include "base/unguessable_token.h"
diff --git a/net/reporting/reporting_service.cc b/net/reporting/reporting_service.cc index 4c4fa2c..4849ca1 100644 --- a/net/reporting/reporting_service.cc +++ b/net/reporting/reporting_service.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/json/json_reader.h" #include "base/logging.h" #include "base/memory/weak_ptr.h"
diff --git a/net/reporting/reporting_service.h b/net/reporting/reporting_service.h index 7bdae36..aca4d90 100644 --- a/net/reporting/reporting_service.h +++ b/net/reporting/reporting_service.h
@@ -8,8 +8,8 @@ #include <memory> #include <string> -#include "base/callback.h" #include "base/containers/flat_map.h" +#include "base/functional/callback.h" #include "base/unguessable_token.h" #include "net/base/net_export.h" #include "net/reporting/reporting_cache.h"
diff --git a/net/reporting/reporting_service_unittest.cc b/net/reporting/reporting_service_unittest.cc index 1901b38..292ff92 100644 --- a/net/reporting/reporting_service_unittest.cc +++ b/net/reporting/reporting_service_unittest.cc
@@ -7,7 +7,7 @@ #include <memory> #include <string> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h" #include "base/test/scoped_feature_list.h"
diff --git a/net/reporting/reporting_test_util.cc b/net/reporting/reporting_test_util.cc index bfe5089..b768e21 100644 --- a/net/reporting/reporting_test_util.cc +++ b/net/reporting/reporting_test_util.cc
@@ -8,8 +8,8 @@ #include <string> #include <vector> -#include "base/bind.h" #include "base/check_op.h" +#include "base/functional/bind.h" #include "base/json/json_reader.h" #include "base/memory/ptr_util.h" #include "base/notreached.h"
diff --git a/net/reporting/reporting_uploader.cc b/net/reporting/reporting_uploader.cc index d7df44d..bc630dc 100644 --- a/net/reporting/reporting_uploader.cc +++ b/net/reporting/reporting_uploader.cc
@@ -8,7 +8,7 @@ #include <utility> #include <vector> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/strings/string_split.h" #include "base/strings/string_util.h"
diff --git a/net/reporting/reporting_uploader.h b/net/reporting/reporting_uploader.h index 5466773..26055df 100644 --- a/net/reporting/reporting_uploader.h +++ b/net/reporting/reporting_uploader.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "net/base/net_export.h" class GURL;
diff --git a/net/reporting/reporting_uploader_unittest.cc b/net/reporting/reporting_uploader_unittest.cc index b8b4ed4..366fa42 100644 --- a/net/reporting/reporting_uploader_unittest.cc +++ b/net/reporting/reporting_uploader_unittest.cc
@@ -8,8 +8,8 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/run_loop.h" #include "base/test/scoped_feature_list.h" #include "net/base/features.h"
diff --git a/net/server/http_server.cc b/net/server/http_server.cc index c6c2d9e1..75d6bb41 100644 --- a/net/server/http_server.cc +++ b/net/server/http_server.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" #include "base/compiler_specific.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/logging.h" #include "base/strings/string_number_conversions.h"
diff --git a/net/server/http_server_unittest.cc b/net/server/http_server_unittest.cc index 7c6d1ee..8edeac5e 100644 --- a/net/server/http_server_unittest.cc +++ b/net/server/http_server_unittest.cc
@@ -13,12 +13,12 @@ #include <vector> #include "base/auto_reset.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/check_op.h" #include "base/compiler_specific.h" #include "base/cxx17_backports.h" #include "base/format_macros.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/memory/ptr_util.h" #include "base/memory/ref_counted.h"
diff --git a/net/socket/client_socket_handle.cc b/net/socket/client_socket_handle.cc index e0534344..1b401b4 100644 --- a/net/socket/client_socket_handle.cc +++ b/net/socket/client_socket_handle.cc
@@ -6,10 +6,10 @@ #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/check_op.h" #include "base/compiler_specific.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/notreached.h" #include "base/trace_event/trace_event.h" #include "net/base/net_errors.h"
diff --git a/net/socket/client_socket_handle.h b/net/socket/client_socket_handle.h index b518358..b6b71c2 100644 --- a/net/socket/client_socket_handle.h +++ b/net/socket/client_socket_handle.h
@@ -8,8 +8,8 @@ #include <memory> #include <utility> -#include "base/bind.h" #include "base/check.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h" #include "base/time/time.h"
diff --git a/net/socket/client_socket_pool.cc b/net/socket/client_socket_pool.cc index 8531095..2c0504c 100644 --- a/net/socket/client_socket_pool.cc +++ b/net/socket/client_socket_pool.cc
@@ -7,9 +7,9 @@ #include <memory> #include <utility> -#include "base/bind.h" #include "base/check_op.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "net/base/features.h" #include "net/base/host_port_pair.h" #include "net/base/proxy_server.h"
diff --git a/net/socket/client_socket_pool_base_unittest.cc b/net/socket/client_socket_pool_base_unittest.cc index 32e01e7e8..712e5bda 100644 --- a/net/socket/client_socket_pool_base_unittest.cc +++ b/net/socket/client_socket_pool_base_unittest.cc
@@ -7,10 +7,10 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/check_op.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h"
diff --git a/net/socket/connect_job.h b/net/socket/connect_job.h index 1661bac..2650f15 100644 --- a/net/socket/connect_job.h +++ b/net/socket/connect_job.h
@@ -9,8 +9,8 @@ #include <set> #include <string> -#include "base/callback_forward.h" -#include "base/callback_helpers.h" +#include "base/functional/callback_forward.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h" #include "base/time/time.h"
diff --git a/net/socket/connect_job_unittest.cc b/net/socket/connect_job_unittest.cc index 54cbb9b..cead9b4 100644 --- a/net/socket/connect_job_unittest.cc +++ b/net/socket/connect_job_unittest.cc
@@ -4,8 +4,8 @@ #include "net/socket/connect_job.h" -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/run_loop.h" #include "base/test/task_environment.h" #include "net/base/address_list.h"
diff --git a/net/socket/fuzzed_datagram_client_socket.cc b/net/socket/fuzzed_datagram_client_socket.cc index 7688d50..9241162 100644 --- a/net/socket/fuzzed_datagram_client_socket.cc +++ b/net/socket/fuzzed_datagram_client_socket.cc
@@ -8,8 +8,8 @@ #include <string> -#include "base/bind.h" #include "base/check_op.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/ranges/algorithm.h" #include "base/strings/string_piece.h"
diff --git a/net/socket/fuzzed_server_socket.cc b/net/socket/fuzzed_server_socket.cc index 1932cc3..ca9b19a 100644 --- a/net/socket/fuzzed_server_socket.cc +++ b/net/socket/fuzzed_server_socket.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/task/single_thread_task_runner.h" #include "net/socket/fuzzed_socket.h"
diff --git a/net/socket/fuzzed_socket.cc b/net/socket/fuzzed_socket.cc index 819bc76..775c273 100644 --- a/net/socket/fuzzed_socket.cc +++ b/net/socket/fuzzed_socket.cc
@@ -6,8 +6,8 @@ #include <fuzzer/FuzzedDataProvider.h> -#include "base/bind.h" #include "base/check_op.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/notreached.h" #include "base/ranges/algorithm.h"
diff --git a/net/socket/sequenced_socket_data_unittest.cc b/net/socket/sequenced_socket_data_unittest.cc index caea8e0..bf1e4cd 100644 --- a/net/socket/sequenced_socket_data_unittest.cc +++ b/net/socket/sequenced_socket_data_unittest.cc
@@ -5,7 +5,7 @@ #include <memory> #include <string> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h" #include "base/run_loop.h"
diff --git a/net/socket/socket_bio_adapter.cc b/net/socket/socket_bio_adapter.cc index 02d43ed..8017b59 100644 --- a/net/socket/socket_bio_adapter.cc +++ b/net/socket/socket_bio_adapter.cc
@@ -8,8 +8,8 @@ #include <algorithm> -#include "base/bind.h" #include "base/check_op.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/notreached.h" #include "base/task/single_thread_task_runner.h"
diff --git a/net/socket/socket_net_log_params.cc b/net/socket/socket_net_log_params.cc index fccaa4e6..4c520f9 100644 --- a/net/socket/socket_net_log_params.cc +++ b/net/socket/socket_net_log_params.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/values.h" #include "net/base/host_port_pair.h" #include "net/base/ip_endpoint.h"
diff --git a/net/socket/socket_posix.cc b/net/socket/socket_posix.cc index 3f458f7..0327ba11 100644 --- a/net/socket/socket_posix.cc +++ b/net/socket/socket_posix.cc
@@ -11,9 +11,9 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/posix/eintr_wrapper.h" #include "base/task/current_thread.h"
diff --git a/net/socket/socket_test_util.cc b/net/socket/socket_test_util.cc index 251e69f..a7069421 100644 --- a/net/socket/socket_test_util.cc +++ b/net/socket/socket_test_util.cc
@@ -13,10 +13,10 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/compiler_specific.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/logging.h" #include "base/rand_util.h"
diff --git a/net/socket/socket_test_util.h b/net/socket/socket_test_util.h index 1b45d9a..1d0beb3 100644 --- a/net/socket/socket_test_util.h +++ b/net/socket/socket_test_util.h
@@ -14,10 +14,10 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback.h" #include "base/check_op.h" #include "base/containers/span.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h"
diff --git a/net/socket/socks5_client_socket.cc b/net/socket/socks5_client_socket.cc index a3f842e..1cf2583 100644 --- a/net/socket/socks5_client_socket.cc +++ b/net/socket/socks5_client_socket.cc
@@ -6,10 +6,10 @@ #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/compiler_specific.h" #include "base/format_macros.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/strings/string_util.h" #include "base/sys_byteorder.h" #include "base/trace_event/trace_event.h"
diff --git a/net/socket/socks_client_socket.cc b/net/socket/socks_client_socket.cc index 5c1db1ea..e280e63 100644 --- a/net/socket/socks_client_socket.cc +++ b/net/socket/socks_client_socket.cc
@@ -6,9 +6,9 @@ #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/compiler_specific.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/sys_byteorder.h" #include "net/base/address_list.h" #include "net/base/io_buffer.h"
diff --git a/net/socket/socks_connect_job.cc b/net/socket/socks_connect_job.cc index 7347c72b..92c2a71 100644 --- a/net/socket/socks_connect_job.cc +++ b/net/socket/socks_connect_job.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "net/base/net_errors.h" #include "net/log/net_log_source_type.h" #include "net/log/net_log_with_source.h"
diff --git a/net/socket/socks_connect_job_unittest.cc b/net/socket/socks_connect_job_unittest.cc index e38b66b..5fb0a2d 100644 --- a/net/socket/socks_connect_job_unittest.cc +++ b/net/socket/socks_connect_job_unittest.cc
@@ -4,9 +4,9 @@ #include "net/socket/socks_connect_job.h" -#include "base/callback.h" #include "base/containers/flat_set.h" #include "base/containers/span.h" +#include "base/functional/callback.h" #include "base/run_loop.h" #include "base/test/task_environment.h" #include "base/time/time.h"
diff --git a/net/socket/ssl_client_socket_impl.cc b/net/socket/ssl_client_socket_impl.cc index 56904f01..286bf304a 100644 --- a/net/socket/ssl_client_socket_impl.cc +++ b/net/socket/ssl_client_socket_impl.cc
@@ -13,10 +13,10 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/containers/span.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/lazy_instance.h" #include "base/location.h" #include "base/memory/singleton.h"
diff --git a/net/socket/ssl_client_socket_unittest.cc b/net/socket/ssl_client_socket_unittest.cc index 9e0a8fa..ef870d81 100644 --- a/net/socket/ssl_client_socket_unittest.cc +++ b/net/socket/ssl_client_socket_unittest.cc
@@ -12,9 +12,9 @@ #include <tuple> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h"
diff --git a/net/socket/ssl_connect_job.cc b/net/socket/ssl_connect_job.cc index 027f21c2..12550452e 100644 --- a/net/socket/ssl_connect_job.cc +++ b/net/socket/ssl_connect_job.cc
@@ -8,9 +8,9 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/metrics/histogram_functions.h" #include "base/metrics/histogram_macros.h" #include "base/trace_event/trace_event.h"
diff --git a/net/socket/ssl_connect_job_unittest.cc b/net/socket/ssl_connect_job_unittest.cc index a0ad43f..b8588983 100644 --- a/net/socket/ssl_connect_job_unittest.cc +++ b/net/socket/ssl_connect_job_unittest.cc
@@ -7,8 +7,8 @@ #include <memory> #include <string> -#include "base/callback.h" #include "base/compiler_specific.h" +#include "base/functional/callback.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "base/test/metrics/histogram_tester.h"
diff --git a/net/socket/ssl_server_socket_impl.cc b/net/socket/ssl_server_socket_impl.cc index 5bfd2a8..052638af 100644 --- a/net/socket/ssl_server_socket_impl.cc +++ b/net/socket/ssl_server_socket_impl.cc
@@ -7,8 +7,8 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h"
diff --git a/net/socket/ssl_server_socket_unittest.cc b/net/socket/ssl_server_socket_unittest.cc index 1d36c149..eed11bd 100644 --- a/net/socket/ssl_server_socket_unittest.cc +++ b/net/socket/ssl_server_socket_unittest.cc
@@ -21,13 +21,13 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/check.h" #include "base/compiler_specific.h" #include "base/containers/queue.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h"
diff --git a/net/socket/stream_socket.h b/net/socket/stream_socket.h index d097325..8982977 100644 --- a/net/socket/stream_socket.h +++ b/net/socket/stream_socket.h
@@ -7,7 +7,7 @@ #include <stdint.h> -#include "base/bind.h" +#include "base/functional/bind.h" #include "net/base/net_errors.h" #include "net/base/net_export.h" #include "net/dns/public/resolve_error_info.h"
diff --git a/net/socket/tcp_client_socket.cc b/net/socket/tcp_client_socket.cc index d092f32..a5fc051 100644 --- a/net/socket/tcp_client_socket.cc +++ b/net/socket/tcp_client_socket.cc
@@ -7,9 +7,9 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/check_op.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ptr_util.h" #include "base/metrics/histogram_macros.h" #include "base/notreached.h"
diff --git a/net/socket/tcp_server_socket.cc b/net/socket/tcp_server_socket.cc index 31461540..b69ea2c 100644 --- a/net/socket/tcp_server_socket.cc +++ b/net/socket/tcp_server_socket.cc
@@ -7,9 +7,9 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/check.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/notreached.h" #include "net/base/net_errors.h" #include "net/socket/socket_descriptor.h"
diff --git a/net/socket/tcp_socket_posix.cc b/net/socket/tcp_socket_posix.cc index 4e7a6ed..693197f 100644 --- a/net/socket/tcp_socket_posix.cc +++ b/net/socket/tcp_socket_posix.cc
@@ -12,9 +12,9 @@ #include <memory> #include "base/atomicops.h" -#include "base/bind.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/lazy_instance.h" #include "base/logging.h" #include "base/metrics/histogram_macros.h"
diff --git a/net/socket/tcp_socket_posix.h b/net/socket/tcp_socket_posix.h index 5cd9670..c13274b 100644 --- a/net/socket/tcp_socket_posix.h +++ b/net/socket/tcp_socket_posix.h
@@ -9,7 +9,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "net/base/address_family.h" #include "net/base/completion_once_callback.h" #include "net/base/net_export.h"
diff --git a/net/socket/tcp_socket_unittest.cc b/net/socket/tcp_socket_unittest.cc index 1cb50d2e..e2d04f6 100644 --- a/net/socket/tcp_socket_unittest.cc +++ b/net/socket/tcp_socket_unittest.cc
@@ -11,7 +11,7 @@ #include <string> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ref_counted.h" #include "base/test/bind.h" #include "base/time/time.h"
diff --git a/net/socket/tcp_socket_win.cc b/net/socket/tcp_socket_win.cc index 7293368..168b59e0 100644 --- a/net/socket/tcp_socket_win.cc +++ b/net/socket/tcp_socket_win.cc
@@ -11,10 +11,10 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/check_op.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/memory/raw_ptr.h" #include "net/base/address_list.h"
diff --git a/net/socket/transport_client_socket_pool.cc b/net/socket/transport_client_socket_pool.cc index dac685b2e6..69c599b 100644 --- a/net/socket/transport_client_socket_pool.cc +++ b/net/socket/transport_client_socket_pool.cc
@@ -8,12 +8,12 @@ #include "base/auto_reset.h" #include "base/barrier_closure.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/check_op.h" #include "base/compiler_specific.h" #include "base/containers/contains.h" #include "base/format_macros.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/memory/ptr_util.h" #include "base/metrics/histogram_macros.h"
diff --git a/net/socket/transport_client_socket_pool_test_util.cc b/net/socket/transport_client_socket_pool_test_util.cc index 1777a22..3db3d85 100644 --- a/net/socket/transport_client_socket_pool_test_util.cc +++ b/net/socket/transport_client_socket_pool_test_util.cc
@@ -8,8 +8,8 @@ #include <string> #include <utility> -#include "base/bind.h" #include "base/check_op.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/memory/weak_ptr.h" #include "base/notreached.h"
diff --git a/net/socket/transport_client_socket_pool_test_util.h b/net/socket/transport_client_socket_pool_test_util.h index d208d75..535f525 100644 --- a/net/socket/transport_client_socket_pool_test_util.h +++ b/net/socket/transport_client_socket_pool_test_util.h
@@ -12,10 +12,10 @@ #include <memory> #include <string> -#include "base/callback.h" #include "base/compiler_specific.h" #include "base/containers/queue.h" #include "base/containers/span.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/time/time.h" #include "net/base/address_list.h"
diff --git a/net/socket/transport_client_socket_pool_unittest.cc b/net/socket/transport_client_socket_pool_unittest.cc index 1ef2149..ebb3a9f 100644 --- a/net/socket/transport_client_socket_pool_unittest.cc +++ b/net/socket/transport_client_socket_pool_unittest.cc
@@ -7,9 +7,9 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h" #include "base/run_loop.h"
diff --git a/net/socket/transport_client_socket_unittest.cc b/net/socket/transport_client_socket_unittest.cc index 1a192e2..773cbac93 100644 --- a/net/socket/transport_client_socket_unittest.cc +++ b/net/socket/transport_client_socket_unittest.cc
@@ -6,7 +6,7 @@ #include <string> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h" #include "base/run_loop.h"
diff --git a/net/socket/transport_connect_job.cc b/net/socket/transport_connect_job.cc index 5d3fc52..66e5727c 100644 --- a/net/socket/transport_connect_job.cc +++ b/net/socket/transport_connect_job.cc
@@ -7,9 +7,9 @@ #include <memory> #include <utility> -#include "base/bind.h" #include "base/check_op.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/logging.h" #include "base/metrics/histogram_macros.h"
diff --git a/net/socket/transport_connect_sub_job.cc b/net/socket/transport_connect_sub_job.cc index 674a2e69..e1042c35 100644 --- a/net/socket/transport_connect_sub_job.cc +++ b/net/socket/transport_connect_sub_job.cc
@@ -8,8 +8,8 @@ #include <string> #include <utility> -#include "base/bind.h" #include "base/check_op.h" +#include "base/functional/bind.h" #include "base/notreached.h" #include "net/base/ip_endpoint.h" #include "net/base/net_errors.h"
diff --git a/net/socket/udp_socket_perftest.cc b/net/socket/udp_socket_perftest.cc index 2e3a147a..6069aa0 100644 --- a/net/socket/udp_socket_perftest.cc +++ b/net/socket/udp_socket_perftest.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 "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/weak_ptr.h" #include "base/run_loop.h" #include "base/test/task_environment.h"
diff --git a/net/socket/udp_socket_posix.cc b/net/socket/udp_socket_posix.cc index aad2203..45c4901 100644 --- a/net/socket/udp_socket_posix.cc +++ b/net/socket/udp_socket_posix.cc
@@ -22,12 +22,12 @@ #include <memory> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/debug/alias.h" #include "base/feature_list.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/metrics/histogram_functions.h" #include "base/posix/eintr_wrapper.h"
diff --git a/net/socket/udp_socket_unittest.cc b/net/socket/udp_socket_unittest.cc index 6ab0b39c7..4bf0e62 100644 --- a/net/socket/udp_socket_unittest.cc +++ b/net/socket/udp_socket_unittest.cc
@@ -6,8 +6,8 @@ #include <algorithm> -#include "base/bind.h" #include "base/containers/circular_deque.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h"
diff --git a/net/socket/udp_socket_win.cc b/net/socket/udp_socket_win.cc index f22c1e12..bebf140a 100644 --- a/net/socket/udp_socket_win.cc +++ b/net/socket/udp_socket_win.cc
@@ -9,9 +9,9 @@ #include <memory> -#include "base/bind.h" -#include "base/callback.h" #include "base/check_op.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/lazy_instance.h" #include "base/memory/raw_ptr.h" #include "base/metrics/histogram_functions.h"
diff --git a/net/socket/unix_domain_client_socket_posix_unittest.cc b/net/socket/unix_domain_client_socket_posix_unittest.cc index 61041a3..29dd7e6 100644 --- a/net/socket/unix_domain_client_socket_posix_unittest.cc +++ b/net/socket/unix_domain_client_socket_posix_unittest.cc
@@ -9,9 +9,9 @@ #include <memory> #include <utility> -#include "base/bind.h" #include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" #include "base/posix/eintr_wrapper.h" #include "build/build_config.h" #include "net/base/io_buffer.h"
diff --git a/net/socket/unix_domain_server_socket_posix.cc b/net/socket/unix_domain_server_socket_posix.cc index 60f5894..3d53a92 100644 --- a/net/socket/unix_domain_server_socket_posix.cc +++ b/net/socket/unix_domain_server_socket_posix.cc
@@ -10,7 +10,7 @@ #include <unistd.h> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "build/build_config.h" #include "net/base/net_errors.h"
diff --git a/net/socket/unix_domain_server_socket_posix.h b/net/socket/unix_domain_server_socket_posix.h index 50b0622f..6cfc9dc 100644 --- a/net/socket/unix_domain_server_socket_posix.h +++ b/net/socket/unix_domain_server_socket_posix.h
@@ -11,7 +11,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "build/build_config.h" #include "net/base/completion_once_callback.h"
diff --git a/net/socket/unix_domain_server_socket_posix_unittest.cc b/net/socket/unix_domain_server_socket_posix_unittest.cc index 104a1f9..17d4618 100644 --- a/net/socket/unix_domain_server_socket_posix_unittest.cc +++ b/net/socket/unix_domain_server_socket_posix_unittest.cc
@@ -7,9 +7,9 @@ #include <memory> #include <vector> -#include "base/bind.h" #include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/test/task_environment.h" #include "build/build_config.h"
diff --git a/net/socket/websocket_endpoint_lock_manager.cc b/net/socket/websocket_endpoint_lock_manager.cc index 6f0a5bb..a280207 100644 --- a/net/socket/websocket_endpoint_lock_manager.cc +++ b/net/socket/websocket_endpoint_lock_manager.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/logging.h" #include "base/task/single_thread_task_runner.h"
diff --git a/net/socket/websocket_transport_client_socket_pool.cc b/net/socket/websocket_transport_client_socket_pool.cc index 8d52c9b8..b8f15ee 100644 --- a/net/socket/websocket_transport_client_socket_pool.cc +++ b/net/socket/websocket_transport_client_socket_pool.cc
@@ -6,10 +6,10 @@ #include <algorithm> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/check_op.h" #include "base/compiler_specific.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/notreached.h" #include "base/numerics/safe_conversions.h"
diff --git a/net/socket/websocket_transport_client_socket_pool_unittest.cc b/net/socket/websocket_transport_client_socket_pool_unittest.cc index 42eccd36..44401095 100644 --- a/net/socket/websocket_transport_client_socket_pool_unittest.cc +++ b/net/socket/websocket_transport_client_socket_pool_unittest.cc
@@ -8,10 +8,10 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/cxx17_backports.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/run_loop.h" #include "base/strings/stringprintf.h"
diff --git a/net/spdy/bidirectional_stream_spdy_impl.cc b/net/spdy/bidirectional_stream_spdy_impl.cc index c0f02d7..3fbed23 100644 --- a/net/spdy/bidirectional_stream_spdy_impl.cc +++ b/net/spdy/bidirectional_stream_spdy_impl.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/logging.h" #include "base/task/single_thread_task_runner.h"
diff --git a/net/spdy/spdy_buffer.cc b/net/spdy/spdy_buffer.cc index 110c95a3..bb89988 100644 --- a/net/spdy/spdy_buffer.cc +++ b/net/spdy/spdy_buffer.cc
@@ -7,8 +7,8 @@ #include <cstring> #include <utility> -#include "base/callback.h" #include "base/check_op.h" +#include "base/functional/callback.h" #include "base/trace_event/memory_usage_estimator.h" #include "net/base/io_buffer.h" #include "net/third_party/quiche/src/quiche/spdy/core/spdy_protocol.h"
diff --git a/net/spdy/spdy_buffer.h b/net/spdy/spdy_buffer.h index 85d77be..49edec5 100644 --- a/net/spdy/spdy_buffer.h +++ b/net/spdy/spdy_buffer.h
@@ -9,7 +9,7 @@ #include <memory> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/ref_counted.h" #include "net/base/net_export.h"
diff --git a/net/spdy/spdy_buffer_unittest.cc b/net/spdy/spdy_buffer_unittest.cc index 7f0e00c..eb89650b 100644 --- a/net/spdy/spdy_buffer_unittest.cc +++ b/net/spdy/spdy_buffer_unittest.cc
@@ -9,8 +9,8 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/ref_counted.h" #include "net/base/io_buffer.h" #include "net/third_party/quiche/src/quiche/spdy/core/spdy_protocol.h"
diff --git a/net/spdy/spdy_http_stream.cc b/net/spdy/spdy_http_stream.cc index 67aaff96..7272c9b 100644 --- a/net/spdy/spdy_http_stream.cc +++ b/net/spdy/spdy_http_stream.cc
@@ -10,8 +10,8 @@ #include <string> #include <utility> -#include "base/bind.h" #include "base/check_op.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/metrics/histogram_macros.h" #include "base/task/single_thread_task_runner.h"
diff --git a/net/spdy/spdy_http_stream_unittest.cc b/net/spdy/spdy_http_stream_unittest.cc index bdd4179..fedb398c 100644 --- a/net/spdy/spdy_http_stream_unittest.cc +++ b/net/spdy/spdy_http_stream_unittest.cc
@@ -9,7 +9,7 @@ #include <set> #include <string> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/task/single_thread_task_runner.h"
diff --git a/net/spdy/spdy_network_transaction_unittest.cc b/net/spdy/spdy_network_transaction_unittest.cc index fe2c5b8..31baeac 100644 --- a/net/spdy/spdy_network_transaction_unittest.cc +++ b/net/spdy/spdy_network_transaction_unittest.cc
@@ -6,10 +6,10 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/strings/string_number_conversions.h"
diff --git a/net/spdy/spdy_proxy_client_socket.cc b/net/spdy/spdy_proxy_client_socket.cc index 9b5b47a..0aa3803 100644 --- a/net/spdy/spdy_proxy_client_socket.cc +++ b/net/spdy/spdy_proxy_client_socket.cc
@@ -7,9 +7,9 @@ #include <algorithm> // min #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/check_op.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/notreached.h" #include "base/strings/string_util.h"
diff --git a/net/spdy/spdy_proxy_client_socket_unittest.cc b/net/spdy/spdy_proxy_client_socket_unittest.cc index 335d427..43fdfe1 100644 --- a/net/spdy/spdy_proxy_client_socket_unittest.cc +++ b/net/spdy/spdy_proxy_client_socket_unittest.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/strings/string_piece.h"
diff --git a/net/spdy/spdy_read_queue_unittest.cc b/net/spdy/spdy_read_queue_unittest.cc index e97fbe9..85f85d74 100644 --- a/net/spdy/spdy_read_queue_unittest.cc +++ b/net/spdy/spdy_read_queue_unittest.cc
@@ -10,8 +10,8 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "net/spdy/spdy_buffer.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/net/spdy/spdy_session.cc b/net/spdy/spdy_session.cc index c6e4e71b..f9a56ef 100644 --- a/net/spdy/spdy_session.cc +++ b/net/spdy/spdy_session.cc
@@ -10,8 +10,8 @@ #include <tuple> #include <utility> -#include "base/bind.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/logging.h" #include "base/memory/raw_ptr.h"
diff --git a/net/spdy/spdy_session_pool.cc b/net/spdy/spdy_session_pool.cc index 190c3d19..a3bab31 100644 --- a/net/spdy/spdy_session_pool.cc +++ b/net/spdy/spdy_session_pool.cc
@@ -7,9 +7,9 @@ #include <set> #include <utility> -#include "base/bind.h" #include "base/check_op.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_macros.h" #include "base/ranges/algorithm.h" #include "base/task/single_thread_task_runner.h"
diff --git a/net/spdy/spdy_session_pool_unittest.cc b/net/spdy/spdy_session_pool_unittest.cc index bda4d30..97580bf 100644 --- a/net/spdy/spdy_session_pool_unittest.cc +++ b/net/spdy/spdy_session_pool_unittest.cc
@@ -8,8 +8,8 @@ #include <tuple> #include <utility> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h" #include "base/run_loop.h"
diff --git a/net/spdy/spdy_session_unittest.cc b/net/spdy/spdy_session_unittest.cc index cab3092..95bca028 100644 --- a/net/spdy/spdy_session_unittest.cc +++ b/net/spdy/spdy_session_unittest.cc
@@ -10,8 +10,8 @@ #include <utility> #include "base/base64.h" -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/strings/string_number_conversions.h"
diff --git a/net/spdy/spdy_stream.cc b/net/spdy/spdy_stream.cc index 7f7fb9b..f952cc1 100644 --- a/net/spdy/spdy_stream.cc +++ b/net/spdy/spdy_stream.cc
@@ -8,9 +8,9 @@ #include <limits> #include <utility> -#include "base/bind.h" #include "base/check_op.h" #include "base/compiler_specific.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/metrics/histogram_functions.h" #include "base/metrics/histogram_macros.h"
diff --git a/net/spdy/spdy_stream_unittest.cc b/net/spdy/spdy_stream_unittest.cc index 33c773cf..e641000 100644 --- a/net/spdy/spdy_stream_unittest.cc +++ b/net/spdy/spdy_stream_unittest.cc
@@ -14,7 +14,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ref_counted.h" #include "base/run_loop.h" #include "base/strings/string_piece.h"
diff --git a/net/spdy/spdy_test_util_common.cc b/net/spdy/spdy_test_util_common.cc index c0b359a..573b1b57 100644 --- a/net/spdy/spdy_test_util_common.cc +++ b/net/spdy/spdy_test_util_common.cc
@@ -8,10 +8,10 @@ #include <utility> #include "base/base64.h" -#include "base/bind.h" #include "base/check_op.h" #include "base/compiler_specific.h" #include "base/containers/span.h" +#include "base/functional/bind.h" #include "base/notreached.h" #include "base/strings/abseil_string_conversions.h" #include "base/strings/string_number_conversions.h"
diff --git a/net/spdy/spdy_write_queue_unittest.cc b/net/spdy/spdy_write_queue_unittest.cc index a2626c1..96c7466 100644 --- a/net/spdy/spdy_write_queue_unittest.cc +++ b/net/spdy/spdy_write_queue_unittest.cc
@@ -9,7 +9,7 @@ #include <string> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ref_counted.h" #include "base/notreached.h" #include "base/strings/string_number_conversions.h"
diff --git a/net/ssl/client_cert_identity.cc b/net/ssl/client_cert_identity.cc index e431f84..a3bfbff 100644 --- a/net/ssl/client_cert_identity.cc +++ b/net/ssl/client_cert_identity.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "net/cert/x509_util.h" #include "net/ssl/ssl_private_key.h"
diff --git a/net/ssl/client_cert_identity.h b/net/ssl/client_cert_identity.h index b584809..d45e628 100644 --- a/net/ssl/client_cert_identity.h +++ b/net/ssl/client_cert_identity.h
@@ -5,7 +5,7 @@ #ifndef NET_SSL_CLIENT_CERT_IDENTITY_H_ #define NET_SSL_CLIENT_CERT_IDENTITY_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/time/time.h" #include "net/base/net_export.h" #include "net/cert/x509_certificate.h"
diff --git a/net/ssl/client_cert_store.h b/net/ssl/client_cert_store.h index 3c9d10f6..29b8ed8d 100644 --- a/net/ssl/client_cert_store.h +++ b/net/ssl/client_cert_store.h
@@ -5,7 +5,7 @@ #ifndef NET_SSL_CLIENT_CERT_STORE_H_ #define NET_SSL_CLIENT_CERT_STORE_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "net/base/net_export.h" #include "net/cert/x509_certificate.h" #include "net/ssl/client_cert_identity.h"
diff --git a/net/ssl/client_cert_store_mac.cc b/net/ssl/client_cert_store_mac.cc index e6aef54..548b84cb 100644 --- a/net/ssl/client_cert_store_mac.cc +++ b/net/ssl/client_cert_store_mac.cc
@@ -16,9 +16,9 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/mac/mac_logging.h" #include "base/mac/scoped_cftyperef.h"
diff --git a/net/ssl/client_cert_store_mac.h b/net/ssl/client_cert_store_mac.h index 073b685..09aa585 100644 --- a/net/ssl/client_cert_store_mac.h +++ b/net/ssl/client_cert_store_mac.h
@@ -5,7 +5,7 @@ #ifndef NET_SSL_CLIENT_CERT_STORE_MAC_H_ #define NET_SSL_CLIENT_CERT_STORE_MAC_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "net/base/net_export.h" #include "net/ssl/client_cert_store.h" #include "net/ssl/ssl_cert_request_info.h"
diff --git a/net/ssl/client_cert_store_nss.cc b/net/ssl/client_cert_store_nss.cc index 314c740..56e7ce66 100644 --- a/net/ssl/client_cert_store_nss.cc +++ b/net/ssl/client_cert_store_nss.cc
@@ -12,8 +12,8 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/logging.h" #include "base/strings/string_piece.h"
diff --git a/net/ssl/client_cert_store_nss.h b/net/ssl/client_cert_store_nss.h index 5ab6e12..a333bbd 100644 --- a/net/ssl/client_cert_store_nss.h +++ b/net/ssl/client_cert_store_nss.h
@@ -5,7 +5,7 @@ #ifndef NET_SSL_CLIENT_CERT_STORE_NSS_H_ #define NET_SSL_CLIENT_CERT_STORE_NSS_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "net/base/net_export.h" #include "net/ssl/client_cert_store.h"
diff --git a/net/ssl/client_cert_store_nss_unittest.cc b/net/ssl/client_cert_store_nss_unittest.cc index b70b4d1..4cc895cf 100644 --- a/net/ssl/client_cert_store_nss_unittest.cc +++ b/net/ssl/client_cert_store_nss_unittest.cc
@@ -11,8 +11,8 @@ #include <memory> #include <string> -#include "base/bind.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/memory/ref_counted.h" #include "base/run_loop.h" #include "base/test/task_environment.h"
diff --git a/net/ssl/client_cert_store_win.cc b/net/ssl/client_cert_store_win.cc index 07e5be1..4e332f4 100644 --- a/net/ssl/client_cert_store_win.cc +++ b/net/ssl/client_cert_store_win.cc
@@ -13,9 +13,9 @@ #include <windows.h> #include <security.h> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/numerics/safe_conversions.h" #include "base/scoped_generic.h"
diff --git a/net/ssl/client_cert_store_win.h b/net/ssl/client_cert_store_win.h index a31b1ae..f4c9659 100644 --- a/net/ssl/client_cert_store_win.h +++ b/net/ssl/client_cert_store_win.h
@@ -5,7 +5,7 @@ #ifndef NET_SSL_CLIENT_CERT_STORE_WIN_H_ #define NET_SSL_CLIENT_CERT_STORE_WIN_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/win/wincrypt_shim.h" #include "crypto/scoped_capi_types.h" #include "net/base/net_export.h"
diff --git a/net/ssl/ssl_client_auth_cache_unittest.cc b/net/ssl/ssl_client_auth_cache_unittest.cc index bbdc9ae..367d69a 100644 --- a/net/ssl/ssl_client_auth_cache_unittest.cc +++ b/net/ssl/ssl_client_auth_cache_unittest.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/time/time.h" #include "net/cert/x509_certificate.h" #include "net/ssl/ssl_private_key.h"
diff --git a/net/ssl/ssl_client_session_cache.h b/net/ssl/ssl_client_session_cache.h index ed3fe22b..d3857acd 100644 --- a/net/ssl/ssl_client_session_cache.h +++ b/net/ssl/ssl_client_session_cache.h
@@ -11,8 +11,8 @@ #include <memory> #include <string> -#include "base/bind.h" #include "base/containers/lru_cache.h" +#include "base/functional/bind.h" #include "base/memory/memory_pressure_monitor.h" #include "base/memory/raw_ptr.h" #include "net/base/host_port_pair.h"
diff --git a/net/ssl/ssl_key_logger_impl.cc b/net/ssl/ssl_key_logger_impl.cc index 9f0f1a3..29c450e9 100644 --- a/net/ssl/ssl_key_logger_impl.cc +++ b/net/ssl/ssl_key_logger_impl.cc
@@ -9,9 +9,9 @@ #include <algorithm> #include <utility> -#include "base/bind.h" #include "base/files/file_util.h" #include "base/files/scoped_file.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/logging.h" #include "base/memory/ref_counted.h"
diff --git a/net/ssl/ssl_private_key.h b/net/ssl/ssl_private_key.h index 97ed9eba..7472b3b 100644 --- a/net/ssl/ssl_private_key.h +++ b/net/ssl/ssl_private_key.h
@@ -9,8 +9,8 @@ #include <vector> -#include "base/callback_forward.h" #include "base/containers/span.h" +#include "base/functional/callback_forward.h" #include "base/memory/ref_counted.h" #include "net/base/net_errors.h" #include "net/base/net_export.h"
diff --git a/net/ssl/ssl_private_key_test_util.cc b/net/ssl/ssl_private_key_test_util.cc index 23fd22d..5ce7576c 100644 --- a/net/ssl/ssl_private_key_test_util.cc +++ b/net/ssl/ssl_private_key_test_util.cc
@@ -8,8 +8,8 @@ #include <vector> -#include "base/bind.h" #include "base/containers/span.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/run_loop.h" #include "crypto/openssl_util.h"
diff --git a/net/ssl/ssl_server_config.h b/net/ssl/ssl_server_config.h index bbef49d..1490c55 100644 --- a/net/ssl/ssl_server_config.h +++ b/net/ssl/ssl_server_config.h
@@ -10,8 +10,8 @@ #include <utility> #include <vector> -#include "base/callback.h" #include "base/containers/flat_map.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "net/base/net_export.h" #include "net/socket/next_proto.h"
diff --git a/net/ssl/threaded_ssl_private_key.cc b/net/ssl/threaded_ssl_private_key.cc index 197f803..af814f0 100644 --- a/net/ssl/threaded_ssl_private_key.cc +++ b/net/ssl/threaded_ssl_private_key.cc
@@ -8,7 +8,7 @@ #include <tuple> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/task/single_thread_task_runner.h"
diff --git a/net/test/android/net_test_jni_onload.cc b/net/test/android/net_test_jni_onload.cc index d329119..49d1d3d 100644 --- a/net/test/android/net_test_jni_onload.cc +++ b/net/test/android/net_test_jni_onload.cc
@@ -6,7 +6,7 @@ #include "base/android/base_jni_onload.h" #include "base/android/jni_android.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "net/test/embedded_test_server/android/embedded_test_server_android.h" namespace net::test {
diff --git a/net/test/embedded_test_server/android/embedded_test_server_android.cc b/net/test/embedded_test_server/android/embedded_test_server_android.cc index 08a9c45..2637e1a7 100644 --- a/net/test/embedded_test_server/android/embedded_test_server_android.cc +++ b/net/test/embedded_test_server/android/embedded_test_server_android.cc
@@ -7,8 +7,8 @@ #include "base/android/jni_array.h" #include "base/android/jni_string.h" #include "base/android/scoped_java_ref.h" -#include "base/bind.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/test/test_support_android.h" #include "base/trace_event/trace_event.h" #include "net/net_test_jni_headers/EmbeddedTestServerImpl_jni.h"
diff --git a/net/test/embedded_test_server/controllable_http_response.cc b/net/test/embedded_test_server/controllable_http_response.cc index 5c22125e..146a985 100644 --- a/net/test/embedded_test_server/controllable_http_response.cc +++ b/net/test/embedded_test_server/controllable_http_response.cc
@@ -4,8 +4,8 @@ #include "net/test/embedded_test_server/controllable_http_response.h" -#include "base/bind.h" #include "base/check_op.h" +#include "base/functional/bind.h" #include "base/strings/stringprintf.h" #include "base/task/single_thread_task_runner.h" #include "base/trace_event/typed_macros.h"
diff --git a/net/test/embedded_test_server/default_handlers.cc b/net/test/embedded_test_server/default_handlers.cc index b99a9724..3ea0e52 100644 --- a/net/test/embedded_test_server/default_handlers.cc +++ b/net/test/embedded_test_server/default_handlers.cc
@@ -13,11 +13,11 @@ #include <vector> #include "base/base64.h" -#include "base/bind.h" -#include "base/callback_forward.h" -#include "base/callback_helpers.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback_forward.h" +#include "base/functional/callback_helpers.h" #include "base/hash/md5.h" #include "base/logging.h" #include "base/memory/weak_ptr.h"
diff --git a/net/test/embedded_test_server/embedded_test_server.cc b/net/test/embedded_test_server/embedded_test_server.cc index bd996a67..d112bec7 100644 --- a/net/test/embedded_test_server/embedded_test_server.cc +++ b/net/test/embedded_test_server/embedded_test_server.cc
@@ -9,10 +9,10 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback_forward.h" -#include "base/callback_helpers.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" +#include "base/functional/callback_forward.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/logging.h" #include "base/message_loop/message_pump_type.h"
diff --git a/net/test/embedded_test_server/embedded_test_server.h b/net/test/embedded_test_server/embedded_test_server.h index c81931c..fa5fa3f 100644 --- a/net/test/embedded_test_server/embedded_test_server.h +++ b/net/test/embedded_test_server/embedded_test_server.h
@@ -12,8 +12,8 @@ #include <string> #include <vector> -#include "base/callback.h" #include "base/files/file_path.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h"
diff --git a/net/test/embedded_test_server/embedded_test_server_unittest.cc b/net/test/embedded_test_server/embedded_test_server_unittest.cc index 09fc1b6..087d422 100644 --- a/net/test/embedded_test_server/embedded_test_server_unittest.cc +++ b/net/test/embedded_test_server/embedded_test_server_unittest.cc
@@ -7,8 +7,8 @@ #include <tuple> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/weak_ptr.h" #include "base/message_loop/message_pump_type.h" #include "base/path_service.h"
diff --git a/net/test/embedded_test_server/http1_connection.cc b/net/test/embedded_test_server/http1_connection.cc index ace1573c..c4b23ff 100644 --- a/net/test/embedded_test_server/http1_connection.cc +++ b/net/test/embedded_test_server/http1_connection.cc
@@ -6,9 +6,9 @@ #include <utility> -#include "base/bind.h" -#include "base/callback_forward.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_forward.h" +#include "base/functional/callback_helpers.h" #include "base/strings/stringprintf.h" #include "net/base/completion_once_callback.h" #include "net/base/net_errors.h"
diff --git a/net/test/embedded_test_server/http1_connection.h b/net/test/embedded_test_server/http1_connection.h index b3e82ac..a3d0146 100644 --- a/net/test/embedded_test_server/http1_connection.h +++ b/net/test/embedded_test_server/http1_connection.h
@@ -7,8 +7,8 @@ #include <memory> -#include "base/callback.h" -#include "base/callback_forward.h" +#include "base/functional/callback.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h"
diff --git a/net/test/embedded_test_server/http2_connection.cc b/net/test/embedded_test_server/http2_connection.cc index 90d42ce..9e1c701 100644 --- a/net/test/embedded_test_server/http2_connection.cc +++ b/net/test/embedded_test_server/http2_connection.cc
@@ -6,8 +6,8 @@ #include <memory> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/memory/raw_ref.h" #include "base/strings/abseil_string_conversions.h"
diff --git a/net/test/embedded_test_server/http_connection.h b/net/test/embedded_test_server/http_connection.h index a92e03ff..c324330 100644 --- a/net/test/embedded_test_server/http_connection.h +++ b/net/test/embedded_test_server/http_connection.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/weak_ptr.h" #include "net/base/completion_once_callback.h" #include "net/test/embedded_test_server/embedded_test_server_connection_listener.h"
diff --git a/net/test/embedded_test_server/http_response.cc b/net/test/embedded_test_server/http_response.cc index 8e657c3..1465c45 100644 --- a/net/test/embedded_test_server/http_response.cc +++ b/net/test/embedded_test_server/http_response.cc
@@ -9,11 +9,11 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback_forward.h" #include "base/check.h" #include "base/containers/flat_map.h" #include "base/format_macros.h" +#include "base/functional/bind.h" +#include "base/functional/callback_forward.h" #include "base/logging.h" #include "base/ranges/algorithm.h" #include "base/strings/string_number_conversions.h"
diff --git a/net/test/embedded_test_server/http_response.h b/net/test/embedded_test_server/http_response.h index f9b8112d..faa1af2 100644 --- a/net/test/embedded_test_server/http_response.h +++ b/net/test/embedded_test_server/http_response.h
@@ -7,10 +7,10 @@ #include <string> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/compiler_specific.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/memory/weak_ptr.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_piece.h"
diff --git a/net/test/quic_simple_test_server.cc b/net/test/quic_simple_test_server.cc index 25c79b1..9e147a7 100644 --- a/net/test/quic_simple_test_server.cc +++ b/net/test/quic_simple_test_server.cc
@@ -7,9 +7,9 @@ #include <memory> #include <utility> -#include "base/bind.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/message_loop/message_pump_type.h" #include "base/path_service.h" #include "base/strings/string_number_conversions.h"
diff --git a/net/test/run_all_unittests.cc b/net/test/run_all_unittests.cc index d1c2c98..f738c3ec 100644 --- a/net/test/run_all_unittests.cc +++ b/net/test/run_all_unittests.cc
@@ -4,8 +4,8 @@ #include <iostream> -#include "base/bind.h" #include "base/build_time.h" +#include "base/functional/bind.h" #include "base/test/launcher/unit_test_launcher.h" #include "build/build_config.h" #include "net/socket/transport_client_socket_pool.h"
diff --git a/net/test/scoped_disable_exit_on_dfatal.cc b/net/test/scoped_disable_exit_on_dfatal.cc index b784647..c66ab9a8 100644 --- a/net/test/scoped_disable_exit_on_dfatal.cc +++ b/net/test/scoped_disable_exit_on_dfatal.cc
@@ -4,8 +4,8 @@ #include "net/test/scoped_disable_exit_on_dfatal.h" -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/strings/string_piece.h" namespace net::test {
diff --git a/net/test/spawned_test_server/local_test_server_win.cc b/net/test/spawned_test_server/local_test_server_win.cc index e18e0a2..0621c00d 100644 --- a/net/test/spawned_test_server/local_test_server_win.cc +++ b/net/test/spawned_test_server/local_test_server_win.cc
@@ -7,10 +7,10 @@ #include <windows.h> #include "base/base_paths.h" -#include "base/bind.h" #include "base/command_line.h" #include "base/environment.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/path_service.h" #include "base/process/launch.h"
diff --git a/net/test/spawned_test_server/remote_test_server_spawner_request.cc b/net/test/spawned_test_server/remote_test_server_spawner_request.cc index 26a19d1..808fa2d2 100644 --- a/net/test/spawned_test_server/remote_test_server_spawner_request.cc +++ b/net/test/spawned_test_server/remote_test_server_spawner_request.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/logging.h" #include "base/synchronization/waitable_event.h"
diff --git a/net/test/test_doh_server.cc b/net/test/test_doh_server.cc index b792fd705..97249240 100644 --- a/net/test/test_doh_server.cc +++ b/net/test/test_doh_server.cc
@@ -9,8 +9,8 @@ #include <memory> #include "base/base64url.h" -#include "base/bind.h" #include "base/check.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/memory/scoped_refptr.h" #include "base/strings/string_number_conversions.h"
diff --git a/net/test/url_request/ssl_certificate_error_job.cc b/net/test/url_request/ssl_certificate_error_job.cc index 09a396e..88ab06c 100644 --- a/net/test/url_request/ssl_certificate_error_job.cc +++ b/net/test/url_request/ssl_certificate_error_job.cc
@@ -6,7 +6,7 @@ #include <string> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/stringprintf.h" #include "base/task/single_thread_task_runner.h" #include "net/ssl/ssl_info.h"
diff --git a/net/test/url_request/url_request_failed_job.cc b/net/test/url_request/url_request_failed_job.cc index d30430f4..eb79a2fb 100644 --- a/net/test/url_request/url_request_failed_job.cc +++ b/net/test/url_request/url_request_failed_job.cc
@@ -4,8 +4,8 @@ #include "net/test/url_request/url_request_failed_job.h" -#include "base/bind.h" #include "base/check_op.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/strings/string_number_conversions.h" #include "base/task/single_thread_task_runner.h"
diff --git a/net/test/url_request/url_request_hanging_read_job.cc b/net/test/url_request/url_request_hanging_read_job.cc index 0e8c482..486ed13 100644 --- a/net/test/url_request/url_request_hanging_read_job.cc +++ b/net/test/url_request/url_request_hanging_read_job.cc
@@ -7,7 +7,7 @@ #include <memory> #include <string> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/strings/stringprintf.h" #include "base/task/single_thread_task_runner.h"
diff --git a/net/test/url_request/url_request_mock_data_job.cc b/net/test/url_request/url_request_mock_data_job.cc index ff5cefb43..de5d9a8 100644 --- a/net/test/url_request/url_request_mock_data_job.cc +++ b/net/test/url_request/url_request_mock_data_job.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h"
diff --git a/net/test/url_request/url_request_mock_http_job.cc b/net/test/url_request/url_request_mock_http_job.cc index 449afaa1..37d47d9 100644 --- a/net/test/url_request/url_request_mock_http_job.cc +++ b/net/test/url_request/url_request_mock_http_job.cc
@@ -4,8 +4,8 @@ #include "net/test/url_request/url_request_mock_http_job.h" -#include "base/bind.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h"
diff --git a/net/test/url_request/url_request_test_job_backed_by_file.cc b/net/test/url_request/url_request_test_job_backed_by_file.cc index 182eb77a..e7786fd2 100644 --- a/net/test/url_request/url_request_test_job_backed_by_file.cc +++ b/net/test/url_request/url_request_test_job_backed_by_file.cc
@@ -20,9 +20,9 @@ #include "net/test/url_request/url_request_test_job_backed_by_file.h" -#include "base/bind.h" #include "base/compiler_specific.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/strings/string_util.h" #include "base/synchronization/lock.h" #include "base/task/task_runner.h"
diff --git a/net/tools/cert_verify_tool/cert_verify_comparision_tool.cc b/net/tools/cert_verify_tool/cert_verify_comparision_tool.cc index 746513e..49fb00d 100644 --- a/net/tools/cert_verify_tool/cert_verify_comparision_tool.cc +++ b/net/tools/cert_verify_tool/cert_verify_comparision_tool.cc
@@ -8,10 +8,10 @@ #include <iostream> #include "base/at_exit.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/containers/span.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/message_loop/message_pump_type.h" #include "base/strings/string_number_conversions.h"
diff --git a/net/tools/cert_verify_tool/cert_verify_tool.cc b/net/tools/cert_verify_tool/cert_verify_tool.cc index f1328b89..5f7f67b 100644 --- a/net/tools/cert_verify_tool/cert_verify_tool.cc +++ b/net/tools/cert_verify_tool/cert_verify_tool.cc
@@ -5,9 +5,9 @@ #include <iostream> #include "base/at_exit.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/message_loop/message_pump_type.h" #include "base/strings/string_split.h"
diff --git a/net/tools/disk_cache_memory_test/disk_cache_memory_test.cc b/net/tools/disk_cache_memory_test/disk_cache_memory_test.cc index 1d52d67b..8dedd44 100644 --- a/net/tools/disk_cache_memory_test/disk_cache_memory_test.cc +++ b/net/tools/disk_cache_memory_test/disk_cache_memory_test.cc
@@ -10,10 +10,10 @@ #include <vector> #include "base/at_exit.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/command_line.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/logging.h" #include "base/memory/ptr_util.h" #include "base/message_loop/message_pump_type.h"
diff --git a/net/tools/quic/quic_simple_server.cc b/net/tools/quic/quic_simple_server.cc index 2424ca4..cd70c35 100644 --- a/net/tools/quic/quic_simple_server.cc +++ b/net/tools/quic/quic_simple_server.cc
@@ -8,7 +8,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/run_loop.h" #include "base/task/single_thread_task_runner.h"
diff --git a/net/tools/quic/quic_simple_server_packet_writer.cc b/net/tools/quic/quic_simple_server_packet_writer.cc index 306e01d..bebfe87 100644 --- a/net/tools/quic/quic_simple_server_packet_writer.cc +++ b/net/tools/quic/quic_simple_server_packet_writer.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" #include "base/check_op.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/metrics/histogram_functions.h" #include "net/base/io_buffer.h"
diff --git a/net/tools/quic/quic_simple_server_packet_writer.h b/net/tools/quic/quic_simple_server_packet_writer.h index a026df3..3ca2bfd 100644 --- a/net/tools/quic/quic_simple_server_packet_writer.h +++ b/net/tools/quic/quic_simple_server_packet_writer.h
@@ -7,7 +7,7 @@ #include <stddef.h> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "net/third_party/quiche/src/quiche/quic/core/quic_connection.h" #include "net/third_party/quiche/src/quiche/quic/core/quic_packet_writer.h"
diff --git a/net/tools/quic/synchronous_host_resolver.cc b/net/tools/quic/synchronous_host_resolver.cc index a14d98e..a09c04c 100644 --- a/net/tools/quic/synchronous_host_resolver.cc +++ b/net/tools/quic/synchronous_host_resolver.cc
@@ -8,7 +8,7 @@ #include <utility> #include "base/at_exit.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/memory/weak_ptr.h" #include "base/message_loop/message_pump_type.h"
diff --git a/net/tools/stress_cache/stress_cache.cc b/net/tools/stress_cache/stress_cache.cc index 94e9f255..c6d278e 100644 --- a/net/tools/stress_cache/stress_cache.cc +++ b/net/tools/stress_cache/stress_cache.cc
@@ -18,11 +18,11 @@ #include <vector> #include "base/at_exit.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/debug/debugger.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/logging.h" #include "base/message_loop/message_pump_type.h"
diff --git a/net/url_request/http_with_dns_over_https_unittest.cc b/net/url_request/http_with_dns_over_https_unittest.cc index db1c4b4..8a83d59a8 100644 --- a/net/url_request/http_with_dns_over_https_unittest.cc +++ b/net/url_request/http_with_dns_over_https_unittest.cc
@@ -6,7 +6,7 @@ #include <vector> #include "base/big_endian.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h" #include "base/strings/strcat.h"
diff --git a/net/url_request/report_sender.h b/net/url_request/report_sender.h index f0eb4d6..2119ca92 100644 --- a/net/url_request/report_sender.h +++ b/net/url_request/report_sender.h
@@ -8,7 +8,7 @@ #include <map> #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "net/base/net_export.h" #include "net/http/transport_security_state.h"
diff --git a/net/url_request/report_sender_unittest.cc b/net/url_request/report_sender_unittest.cc index 4d244f3..ea84239 100644 --- a/net/url_request/report_sender_unittest.cc +++ b/net/url_request/report_sender_unittest.cc
@@ -4,8 +4,8 @@ #include "net/url_request/report_sender.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "net/base/load_flags.h" #include "net/base/network_delegate_impl.h"
diff --git a/net/url_request/url_request.cc b/net/url_request/url_request.cc index 5d6c1984..6d15414 100644 --- a/net/url_request/url_request.cc +++ b/net/url_request/url_request.cc
@@ -6,10 +6,10 @@ #include <utility> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/compiler_specific.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/metrics/histogram_macros.h" #include "base/rand_util.h" #include "base/strings/utf_string_conversions.h"
diff --git a/net/url_request/url_request_context_builder.h b/net/url_request/url_request_context_builder.h index 4b7e4674..e726346 100644 --- a/net/url_request/url_request_context_builder.h +++ b/net/url_request/url_request_context_builder.h
@@ -22,8 +22,8 @@ #include <utility> #include <vector> -#include "base/callback.h" #include "base/files/file_path.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h" #include "base/task/task_traits.h"
diff --git a/net/url_request/url_request_context_builder_unittest.cc b/net/url_request/url_request_context_builder_unittest.cc index 2ce47c00..6f5f39d 100644 --- a/net/url_request/url_request_context_builder_unittest.cc +++ b/net/url_request/url_request_context_builder_unittest.cc
@@ -4,7 +4,7 @@ #include "net/url_request/url_request_context_builder.h" -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "base/task/single_thread_task_runner.h" #include "base/task/thread_pool.h"
diff --git a/net/url_request/url_request_error_job.cc b/net/url_request/url_request_error_job.cc index bacf34e2..d22bd5d 100644 --- a/net/url_request/url_request_error_job.cc +++ b/net/url_request/url_request_error_job.cc
@@ -4,8 +4,8 @@ #include "net/url_request/url_request_error_job.h" -#include "base/bind.h" #include "base/compiler_specific.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/task/single_thread_task_runner.h" #include "net/base/net_errors.h"
diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_request_http_job.cc index 2b33cf1c..31b8af5 100644 --- a/net/url_request/url_request_http_job.cc +++ b/net/url_request/url_request_http_job.cc
@@ -11,13 +11,13 @@ #include <vector> #include "base/base_switches.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/check_op.h" #include "base/command_line.h" #include "base/compiler_specific.h" #include "base/containers/adapters.h" #include "base/file_version_info.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/memory/ptr_util.h" #include "base/metrics/field_trial.h"
diff --git a/net/url_request/url_request_job.cc b/net/url_request/url_request_job.cc index 00f9b21..51eb3aec 100644 --- a/net/url_request/url_request_job.cc +++ b/net/url_request/url_request_job.cc
@@ -6,9 +6,9 @@ #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/compiler_specific.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/memory/raw_ptr.h" #include "base/metrics/histogram_macros.h"
diff --git a/net/url_request/url_request_job_factory_unittest.cc b/net/url_request/url_request_job_factory_unittest.cc index aaab1ffa..bb4e531 100644 --- a/net/url_request/url_request_job_factory_unittest.cc +++ b/net/url_request/url_request_job_factory_unittest.cc
@@ -4,7 +4,7 @@ #include "net/url_request/url_request_job_factory.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/memory/weak_ptr.h" #include "base/run_loop.h"
diff --git a/net/url_request/url_request_quic_perftest.cc b/net/url_request/url_request_quic_perftest.cc index e576d80..c36f8fc 100644 --- a/net/url_request/url_request_quic_perftest.cc +++ b/net/url_request/url_request_quic_perftest.cc
@@ -6,9 +6,9 @@ #include <memory> -#include "base/bind.h" -#include "base/callback.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/ref_counted_memory.h" #include "base/run_loop.h" #include "base/strings/stringprintf.h"
diff --git a/net/url_request/url_request_quic_unittest.cc b/net/url_request/url_request_quic_unittest.cc index 31bc247..581d88d4 100644 --- a/net/url_request/url_request_quic_unittest.cc +++ b/net/url_request/url_request_quic_unittest.cc
@@ -4,10 +4,10 @@ #include <memory> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/feature_list.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "base/strings/string_number_conversions.h" #include "base/test/bind.h"
diff --git a/net/url_request/url_request_redirect_job.cc b/net/url_request/url_request_redirect_job.cc index 18242ed0..614fa5f 100644 --- a/net/url_request/url_request_redirect_job.cc +++ b/net/url_request/url_request_redirect_job.cc
@@ -6,9 +6,9 @@ #include <string> -#include "base/bind.h" #include "base/check.h" #include "base/compiler_specific.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/strings/stringprintf.h" #include "base/task/single_thread_task_runner.h"
diff --git a/net/url_request/url_request_test_job.cc b/net/url_request/url_request_test_job.cc index 413625b..4fc0612 100644 --- a/net/url_request/url_request_test_job.cc +++ b/net/url_request/url_request_test_job.cc
@@ -8,9 +8,9 @@ #include <list> #include <memory> -#include "base/bind.h" #include "base/compiler_specific.h" #include "base/containers/cxx20_erase_list.h" +#include "base/functional/bind.h" #include "base/lazy_instance.h" #include "base/location.h" #include "base/strings/string_util.h"
diff --git a/net/url_request/url_request_throttler_entry.cc b/net/url_request/url_request_throttler_entry.cc index 02055a6..fa08ce8 100644 --- a/net/url_request/url_request_throttler_entry.cc +++ b/net/url_request/url_request_throttler_entry.cc
@@ -7,8 +7,8 @@ #include <cmath> #include <utility> -#include "base/bind.h" #include "base/check_op.h" +#include "base/functional/bind.h" #include "base/metrics/field_trial.h" #include "base/metrics/histogram_macros.h" #include "base/rand_util.h"
diff --git a/net/url_request/url_request_unittest.cc b/net/url_request/url_request_unittest.cc index f4e13189..deadb1c 100644 --- a/net/url_request/url_request_unittest.cc +++ b/net/url_request/url_request_unittest.cc
@@ -10,13 +10,13 @@ #include <utility> #include "base/base64url.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/compiler_specific.h" #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" #include "base/format_macros.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/json/json_reader.h" #include "base/location.h" #include "base/memory/ptr_util.h"
diff --git a/net/websockets/websocket_basic_handshake_stream.cc b/net/websockets/websocket_basic_handshake_stream.cc index 5ad9818..13944903 100644 --- a/net/websockets/websocket_basic_handshake_stream.cc +++ b/net/websockets/websocket_basic_handshake_stream.cc
@@ -11,9 +11,9 @@ #include <utility> #include "base/base64.h" -#include "base/bind.h" #include "base/check_op.h" #include "base/compiler_specific.h" +#include "base/functional/bind.h" #include "base/metrics/histogram_functions.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_piece.h"
diff --git a/net/websockets/websocket_basic_stream.cc b/net/websockets/websocket_basic_stream.cc index 89ead44..ef26145 100644 --- a/net/websockets/websocket_basic_stream.cc +++ b/net/websockets/websocket_basic_stream.cc
@@ -11,7 +11,7 @@ #include <limits> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/numerics/safe_conversions.h" #include "build/build_config.h"
diff --git a/net/websockets/websocket_basic_stream_adapters.cc b/net/websockets/websocket_basic_stream_adapters.cc index 2c69e42..1fd9c2e 100644 --- a/net/websockets/websocket_basic_stream_adapters.cc +++ b/net/websockets/websocket_basic_stream_adapters.cc
@@ -8,7 +8,7 @@ #include <cstring> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/task/single_thread_task_runner.h" #include "net/base/io_buffer.h"
diff --git a/net/websockets/websocket_basic_stream_adapters_test.cc b/net/websockets/websocket_basic_stream_adapters_test.cc index 0c2168a..00fd848a 100644 --- a/net/websockets/websocket_basic_stream_adapters_test.cc +++ b/net/websockets/websocket_basic_stream_adapters_test.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h"
diff --git a/net/websockets/websocket_channel.cc b/net/websockets/websocket_channel.cc index a75fc25..b84eca3 100644 --- a/net/websockets/websocket_channel.cc +++ b/net/websockets/websocket_channel.cc
@@ -11,8 +11,8 @@ #include <vector> #include "base/big_endian.h" -#include "base/bind.h" #include "base/containers/circular_deque.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h"
diff --git a/net/websockets/websocket_channel.h b/net/websockets/websocket_channel.h index 954c94b..577af831 100644 --- a/net/websockets/websocket_channel.h +++ b/net/websockets/websocket_channel.h
@@ -11,8 +11,8 @@ #include <string> #include <vector> -#include "base/callback.h" #include "base/containers/queue.h" +#include "base/functional/callback.h" #include "base/i18n/streaming_utf8_validator.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h"
diff --git a/net/websockets/websocket_channel_test.cc b/net/websockets/websocket_channel_test.cc index 26746b9..5137d2a 100644 --- a/net/websockets/websocket_channel_test.cc +++ b/net/websockets/websocket_channel_test.cc
@@ -15,9 +15,9 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h"
diff --git a/net/websockets/websocket_deflate_stream.cc b/net/websockets/websocket_deflate_stream.cc index 00ab620..4837975 100644 --- a/net/websockets/websocket_deflate_stream.cc +++ b/net/websockets/websocket_deflate_stream.cc
@@ -11,7 +11,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/memory/scoped_refptr.h" #include "net/base/io_buffer.h"
diff --git a/net/websockets/websocket_deflate_stream_test.cc b/net/websockets/websocket_deflate_stream_test.cc index 11bfbdf..829f0e5 100644 --- a/net/websockets/websocket_deflate_stream_test.cc +++ b/net/websockets/websocket_deflate_stream_test.cc
@@ -12,9 +12,9 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/containers/circular_deque.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h"
diff --git a/net/websockets/websocket_end_to_end_test.cc b/net/websockets/websocket_end_to_end_test.cc index 3078fc3..a4afca9 100644 --- a/net/websockets/websocket_end_to_end_test.cc +++ b/net/websockets/websocket_end_to_end_test.cc
@@ -14,10 +14,10 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h"
diff --git a/net/websockets/websocket_event_interface.h b/net/websockets/websocket_event_interface.h index 45115239..caf5e4e 100644 --- a/net/websockets/websocket_event_interface.h +++ b/net/websockets/websocket_event_interface.h
@@ -11,8 +11,8 @@ #include <string> #include <vector> -#include "base/callback_forward.h" #include "base/containers/span.h" +#include "base/functional/callback_forward.h" #include "base/memory/scoped_refptr.h" #include "net/base/net_export.h" #include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/net/websockets/websocket_http2_handshake_stream.cc b/net/websockets/websocket_http2_handshake_stream.cc index 0dd56a54..665f92ff 100644 --- a/net/websockets/websocket_http2_handshake_stream.cc +++ b/net/websockets/websocket_http2_handshake_stream.cc
@@ -8,8 +8,8 @@ #include <set> #include <utility> -#include "base/bind.h" #include "base/check_op.h" +#include "base/functional/bind.h" #include "base/notreached.h" #include "base/strings/stringprintf.h" #include "base/time/time.h"
diff --git a/net/websockets/websocket_stream.cc b/net/websockets/websocket_stream.cc index 64ace35..cc96c0e 100644 --- a/net/websockets/websocket_stream.cc +++ b/net/websockets/websocket_stream.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h"
diff --git a/net/websockets/websocket_stream.h b/net/websockets/websocket_stream.h index ed0efde..c4e7f1d 100644 --- a/net/websockets/websocket_stream.h +++ b/net/websockets/websocket_stream.h
@@ -9,7 +9,7 @@ #include <string> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/scoped_refptr.h" #include "base/time/time.h" #include "net/base/completion_once_callback.h"
diff --git a/net/websockets/websocket_stream_cookie_test.cc b/net/websockets/websocket_stream_cookie_test.cc index 72644b87..1e97a2c 100644 --- a/net/websockets/websocket_stream_cookie_test.cc +++ b/net/websockets/websocket_stream_cookie_test.cc
@@ -5,7 +5,7 @@ #include <string> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/weak_ptr.h" #include "base/run_loop.h" #include "base/strings/string_util.h"
diff --git a/net/websockets/websocket_stream_create_test_base.cc b/net/websockets/websocket_stream_create_test_base.cc index 27ea5026..14a8f17 100644 --- a/net/websockets/websocket_stream_create_test_base.cc +++ b/net/websockets/websocket_stream_create_test_base.cc
@@ -7,7 +7,7 @@ #include <utility> -#include "base/callback.h" +#include "base/functional/callback.h" #include "net/base/ip_endpoint.h" #include "net/http/http_request_headers.h" #include "net/http/http_response_headers.h"
diff --git a/pdf/loader/document_loader_impl.cc b/pdf/loader/document_loader_impl.cc index 8b543f2..ab39d45 100644 --- a/pdf/loader/document_loader_impl.cc +++ b/pdf/loader/document_loader_impl.cc
@@ -10,10 +10,10 @@ #include <algorithm> #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/check_op.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/numerics/safe_math.h" #include "base/strings/string_util.h" #include "pdf/loader/result_codes.h"
diff --git a/pdf/loader/document_loader_impl_unittest.cc b/pdf/loader/document_loader_impl_unittest.cc index e6b5821..66fac59 100644 --- a/pdf/loader/document_loader_impl_unittest.cc +++ b/pdf/loader/document_loader_impl_unittest.cc
@@ -10,8 +10,8 @@ #include <utility> #include <vector> -#include "base/callback.h" #include "base/check.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/test/scoped_feature_list.h" #include "pdf/loader/url_loader_wrapper.h"
diff --git a/pdf/loader/url_loader.cc b/pdf/loader/url_loader.cc index bdbd548..e18f0806 100644 --- a/pdf/loader/url_loader.cc +++ b/pdf/loader/url_loader.cc
@@ -11,9 +11,9 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/check_op.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/raw_ref.h" #include "base/memory/weak_ptr.h" #include "base/notreached.h"
diff --git a/pdf/loader/url_loader.h b/pdf/loader/url_loader.h index c950877..55150aa 100644 --- a/pdf/loader/url_loader.h +++ b/pdf/loader/url_loader.h
@@ -11,9 +11,9 @@ #include <memory> #include <string> -#include "base/callback.h" #include "base/containers/circular_deque.h" #include "base/containers/span.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "third_party/blink/public/web/web_associated_url_loader_client.h"
diff --git a/pdf/loader/url_loader_unittest.cc b/pdf/loader/url_loader_unittest.cc index c983e4f1..1d23935 100644 --- a/pdf/loader/url_loader_unittest.cc +++ b/pdf/loader/url_loader_unittest.cc
@@ -11,9 +11,9 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback.h" #include "base/containers/span.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/strings/string_split.h"
diff --git a/pdf/loader/url_loader_wrapper.h b/pdf/loader/url_loader_wrapper.h index 3bdf384..9bd59f6 100644 --- a/pdf/loader/url_loader_wrapper.h +++ b/pdf/loader/url_loader_wrapper.h
@@ -9,7 +9,7 @@ #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" namespace chrome_pdf {
diff --git a/pdf/loader/url_loader_wrapper_impl.cc b/pdf/loader/url_loader_wrapper_impl.cc index 6c1f66f..a033c51 100644 --- a/pdf/loader/url_loader_wrapper_impl.cc +++ b/pdf/loader/url_loader_wrapper_impl.cc
@@ -13,10 +13,10 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/check_op.h" #include "base/containers/span.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/location.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h"
diff --git a/pdf/loader/url_loader_wrapper_impl.h b/pdf/loader/url_loader_wrapper_impl.h index c89a762..b28cb1d27 100644 --- a/pdf/loader/url_loader_wrapper_impl.h +++ b/pdf/loader/url_loader_wrapper_impl.h
@@ -10,7 +10,7 @@ #include <memory> #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/timer/timer.h"
diff --git a/pdf/paint_manager.cc b/pdf/paint_manager.cc index 667b9f9..1c78a81 100644 --- a/pdf/paint_manager.cc +++ b/pdf/paint_manager.cc
@@ -12,9 +12,9 @@ #include <utility> #include "base/auto_reset.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/check.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/location.h" #include "base/notreached.h" #include "base/task/sequenced_task_runner.h"
diff --git a/pdf/pdf_engine.h b/pdf/pdf_engine.h index aaec6c19..a98a14ee 100644 --- a/pdf/pdf_engine.h +++ b/pdf/pdf_engine.h
@@ -11,8 +11,8 @@ #include <string> #include <vector> -#include "base/callback.h" #include "base/containers/span.h" +#include "base/functional/callback.h" #include "base/time/time.h" #include "base/values.h" #include "build/build_config.h"
diff --git a/pdf/pdf_view_web_plugin.cc b/pdf/pdf_view_web_plugin.cc index 8ce806e..9f57186 100644 --- a/pdf/pdf_view_web_plugin.cc +++ b/pdf/pdf_view_web_plugin.cc
@@ -14,12 +14,12 @@ #include <vector> #include "base/auto_reset.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/check_op.h" #include "base/containers/fixed_flat_map.h" #include "base/containers/queue.h" #include "base/debug/crash_logging.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/i18n/char_iterator.h" #include "base/i18n/rtl.h" #include "base/i18n/string_search.h"
diff --git a/pdf/pdf_view_web_plugin.h b/pdf/pdf_view_web_plugin.h index 025fe199..d1d9672f 100644 --- a/pdf/pdf_view_web_plugin.h +++ b/pdf/pdf_view_web_plugin.h
@@ -11,9 +11,9 @@ #include <string> #include <vector> -#include "base/callback_forward.h" #include "base/containers/flat_set.h" #include "base/containers/queue.h" +#include "base/functional/callback_forward.h" #include "base/i18n/rtl.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h"
diff --git a/pdf/pdfium/pdfium_api_string_buffer_adapter.h b/pdf/pdfium/pdfium_api_string_buffer_adapter.h index acd146f..34951266 100644 --- a/pdf/pdfium/pdfium_api_string_buffer_adapter.h +++ b/pdf/pdfium/pdfium_api_string_buffer_adapter.h
@@ -9,7 +9,7 @@ #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/numerics/safe_math.h" #include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/pdf/pdfium/pdfium_engine.cc b/pdf/pdfium/pdfium_engine.cc index ff80660d..748e4e6 100644 --- a/pdf/pdfium/pdfium_engine.cc +++ b/pdf/pdfium/pdfium_engine.cc
@@ -16,12 +16,12 @@ #include <utility> #include "base/auto_reset.h" -#include "base/bind.h" #include "base/check_op.h" #include "base/containers/contains.h" #include "base/containers/flat_map.h" #include "base/debug/alias.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/metrics/histogram_functions.h" #include "base/notreached.h" @@ -254,10 +254,8 @@ v8::V8::SetFlagsFromString(recommended, strlen(recommended)); // The isolate holder is already initialized in the renderer process. - gin::IsolateHolder::Initialize( - gin::IsolateHolder::kNonStrictMode, - static_cast<v8::ArrayBuffer::Allocator*>( - FPDF_GetArrayBufferAllocatorSharedInstance())); + gin::IsolateHolder::Initialize(gin::IsolateHolder::kNonStrictMode, + gin::ArrayBufferAllocator::SharedInstance()); } DCHECK(!g_isolate_holder);
diff --git a/pdf/pdfium/pdfium_engine_exports.cc b/pdf/pdfium/pdfium_engine_exports.cc index 8830270..444b84a 100644 --- a/pdf/pdfium/pdfium_engine_exports.cc +++ b/pdf/pdfium/pdfium_engine_exports.cc
@@ -7,7 +7,7 @@ #include <algorithm> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/no_destructor.h" #include "base/numerics/safe_conversions.h" #include "build/build_config.h"
diff --git a/pdf/pdfium/pdfium_engine_unittest.cc b/pdf/pdfium/pdfium_engine_unittest.cc index ea2dc81..1d278ad6 100644 --- a/pdf/pdfium/pdfium_engine_unittest.cc +++ b/pdf/pdfium/pdfium_engine_unittest.cc
@@ -8,7 +8,7 @@ #include <utility> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/hash/md5.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h"
diff --git a/pdf/pdfium/pdfium_form_filler.cc b/pdf/pdfium/pdfium_form_filler.cc index 3ee2070a..a1a9fe5b 100644 --- a/pdf/pdfium/pdfium_form_filler.cc +++ b/pdf/pdfium/pdfium_form_filler.cc
@@ -10,10 +10,10 @@ #include <utility> #include "base/auto_reset.h" -#include "base/bind.h" #include "base/check_op.h" #include "base/containers/contains.h" #include "base/feature_list.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h"
diff --git a/pdf/pdfium/pdfium_page.cc b/pdf/pdfium/pdfium_page.cc index 1456580..008de139 100644 --- a/pdf/pdfium/pdfium_page.cc +++ b/pdf/pdfium/pdfium_page.cc
@@ -11,10 +11,10 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/check_op.h" #include "base/cxx17_backports.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/metrics/histogram_functions.h" #include "base/numerics/math_constants.h" #include "base/numerics/safe_math.h"
diff --git a/pdf/pdfium/pdfium_page.h b/pdf/pdfium/pdfium_page.h index 3c1674f..66a994f 100644 --- a/pdf/pdfium/pdfium_page.h +++ b/pdf/pdfium/pdfium_page.h
@@ -10,8 +10,8 @@ #include <string> #include <vector> -#include "base/callback.h" -#include "base/callback_forward.h" +#include "base/functional/callback.h" +#include "base/functional/callback_forward.h" #include "base/gtest_prod_util.h" #include "base/memory/raw_ptr.h" #include "pdf/page_orientation.h"
diff --git a/pdf/pdfium/pdfium_page_unittest.cc b/pdf/pdfium/pdfium_page_unittest.cc index a4f4624..53fd3f4 100644 --- a/pdf/pdfium/pdfium_page_unittest.cc +++ b/pdf/pdfium/pdfium_page_unittest.cc
@@ -12,6 +12,7 @@ #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" #include "base/test/scoped_feature_list.h" +#include "base/test/test_discardable_memory_allocator.h" #include "build/build_config.h" #include "pdf/accessibility_structs.h" #include "pdf/pdfium/pdfium_engine.h" @@ -366,17 +367,23 @@ PDFiumPageImageDataTest& operator=(const PDFiumPageImageDataTest&) = delete; ~PDFiumPageImageDataTest() override = default; + void SetUp() override { + PDFiumPageImageTest::SetUp(); + base::DiscardableMemoryAllocator::SetInstance( + &discardable_memory_allocator_); + } + + void TearDown() override { + base::DiscardableMemoryAllocator::SetInstance(nullptr); + PDFiumPageImageTest::TearDown(); + } + private: base::test::ScopedFeatureList enable_pdf_ocr_; + base::TestDiscardableMemoryAllocator discardable_memory_allocator_; }; TEST_P(PDFiumPageImageDataTest, ImageData) { - // TODO(crbug.com/1382257): This test currently crashes when using Skia - // renderer. Fix this issue and re-enable the test. - if (GetParam()) { - GTEST_SKIP() << "Skipping this test for Skia"; - } - TestClient client; std::unique_ptr<PDFiumEngine> engine = InitializeEngine(&client, FILE_PATH_LITERAL("text_with_image.pdf"));
diff --git a/pdf/post_message_receiver.cc b/pdf/post_message_receiver.cc index 6ee6388..9072737d 100644 --- a/pdf/post_message_receiver.cc +++ b/pdf/post_message_receiver.cc
@@ -9,8 +9,8 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/check_op.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h"
diff --git a/pdf/preview_mode_client.cc b/pdf/preview_mode_client.cc index 915dfe3..633e286 100644 --- a/pdf/preview_mode_client.cc +++ b/pdf/preview_mode_client.cc
@@ -10,7 +10,7 @@ #include <string> #include <utility> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/notreached.h" #include "base/time/time.h" #include "pdf/document_layout.h"
diff --git a/pdf/preview_mode_client.h b/pdf/preview_mode_client.h index ae371fe..e853b16 100644 --- a/pdf/preview_mode_client.h +++ b/pdf/preview_mode_client.h
@@ -10,7 +10,7 @@ #include <string> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "pdf/pdf_engine.h"
diff --git a/pdf/test/run_all_unittests.cc b/pdf/test/run_all_unittests.cc index 2d5c53f..6bb2b2a 100644 --- a/pdf/test/run_all_unittests.cc +++ b/pdf/test/run_all_unittests.cc
@@ -5,9 +5,9 @@ #include <memory> #include "base/base_paths.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/path_service.h" #include "base/test/launcher/unit_test_launcher.h" #include "base/test/task_environment.h"
diff --git a/ppapi/host/resource_message_filter.cc b/ppapi/host/resource_message_filter.cc index 4a8ae91..ce4d5fe 100644 --- a/ppapi/host/resource_message_filter.cc +++ b/ppapi/host/resource_message_filter.cc
@@ -4,7 +4,7 @@ #include "ppapi/host/resource_message_filter.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/task/sequenced_task_runner.h" #include "base/task/single_thread_task_runner.h"
diff --git a/ppapi/host/resource_message_filter_unittest.cc b/ppapi/host/resource_message_filter_unittest.cc index 90472fde..ad3e09d6 100644 --- a/ppapi/host/resource_message_filter_unittest.cc +++ b/ppapi/host/resource_message_filter_unittest.cc
@@ -4,8 +4,8 @@ #include <stdint.h> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/run_loop.h" #include "base/synchronization/waitable_event.h"
diff --git a/ppapi/nacl_irt/plugin_startup.cc b/ppapi/nacl_irt/plugin_startup.cc index a0fc2d3..1fd94df 100644 --- a/ppapi/nacl_irt/plugin_startup.cc +++ b/ppapi/nacl_irt/plugin_startup.cc
@@ -4,9 +4,9 @@ #include "ppapi/nacl_irt/plugin_startup.h" -#include "base/bind.h" #include "base/check.h" #include "base/file_descriptor_posix.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/message_loop/message_pump_type.h" #include "base/synchronization/waitable_event.h"
diff --git a/ppapi/proxy/audio_encoder_resource.cc b/ppapi/proxy/audio_encoder_resource.cc index 3c8ba3f..3cc20aa 100644 --- a/ppapi/proxy/audio_encoder_resource.cc +++ b/ppapi/proxy/audio_encoder_resource.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/unsafe_shared_memory_region.h" #include "ppapi/c/pp_array_output.h" #include "ppapi/c/pp_codecs.h"
diff --git a/ppapi/proxy/audio_input_resource.cc b/ppapi/proxy/audio_input_resource.cc index ef30ba7..b879ebc 100644 --- a/ppapi/proxy/audio_input_resource.cc +++ b/ppapi/proxy/audio_input_resource.cc
@@ -7,8 +7,8 @@ #include <memory> #include <string> -#include "base/bind.h" #include "base/check_op.h" +#include "base/functional/bind.h" #include "base/numerics/safe_conversions.h" #include "ipc/ipc_platform_file.h" #include "media/base/audio_bus.h"
diff --git a/ppapi/proxy/audio_output_resource.cc b/ppapi/proxy/audio_output_resource.cc index 798912d..9ab977a 100644 --- a/ppapi/proxy/audio_output_resource.cc +++ b/ppapi/proxy/audio_output_resource.cc
@@ -6,8 +6,8 @@ #include <memory> -#include "base/bind.h" #include "base/check_op.h" +#include "base/functional/bind.h" #include "base/numerics/safe_conversions.h" #include "ipc/ipc_platform_file.h" #include "media/base/audio_bus.h"
diff --git a/ppapi/proxy/camera_device_resource.cc b/ppapi/proxy/camera_device_resource.cc index f49f56e..458becc 100644 --- a/ppapi/proxy/camera_device_resource.cc +++ b/ppapi/proxy/camera_device_resource.cc
@@ -4,7 +4,7 @@ #include "ppapi/proxy/camera_device_resource.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "ppapi/proxy/camera_capabilities_resource.h" #include "ppapi/proxy/plugin_resource_tracker.h" #include "ppapi/proxy/ppapi_messages.h"
diff --git a/ppapi/proxy/device_enumeration_resource_helper.cc b/ppapi/proxy/device_enumeration_resource_helper.cc index 8ca57ee..63a9655 100644 --- a/ppapi/proxy/device_enumeration_resource_helper.cc +++ b/ppapi/proxy/device_enumeration_resource_helper.cc
@@ -8,8 +8,8 @@ #include <memory> -#include "base/bind.h" #include "base/check.h" +#include "base/functional/bind.h" #include "ipc/ipc_message.h" #include "ipc/ipc_message_macros.h" #include "ppapi/c/pp_array_output.h"
diff --git a/ppapi/proxy/dispatch_reply_message.h b/ppapi/proxy/dispatch_reply_message.h index 5cac2e6..dcf7e3df 100644 --- a/ppapi/proxy/dispatch_reply_message.h +++ b/ppapi/proxy/dispatch_reply_message.h
@@ -13,7 +13,7 @@ #include <tuple> #include <utility> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/notreached.h" #include "base/tuple.h" #include "ipc/ipc_message_macros.h"
diff --git a/ppapi/proxy/file_chooser_resource.cc b/ppapi/proxy/file_chooser_resource.cc index f84e851e..8616b9c3 100644 --- a/ppapi/proxy/file_chooser_resource.cc +++ b/ppapi/proxy/file_chooser_resource.cc
@@ -6,7 +6,7 @@ #include <stddef.h> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/string_split.h" #include "ipc/ipc_message.h" #include "ppapi/c/pp_errors.h"
diff --git a/ppapi/proxy/file_io_resource.cc b/ppapi/proxy/file_io_resource.cc index 23bb8b4..2f751517 100644 --- a/ppapi/proxy/file_io_resource.cc +++ b/ppapi/proxy/file_io_resource.cc
@@ -7,7 +7,7 @@ #include <limits> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "ipc/ipc_message.h" #include "ppapi/c/pp_errors.h" #include "ppapi/proxy/ppapi_messages.h"
diff --git a/ppapi/proxy/file_ref_resource.cc b/ppapi/proxy/file_ref_resource.cc index 087866be..f8e86ec 100644 --- a/ppapi/proxy/file_ref_resource.cc +++ b/ppapi/proxy/file_ref_resource.cc
@@ -6,7 +6,7 @@ #include <stddef.h> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/numerics/safe_conversions.h" #include "ppapi/c/pp_directory_entry.h" #include "ppapi/c/pp_instance.h"
diff --git a/ppapi/proxy/file_system_resource.cc b/ppapi/proxy/file_system_resource.cc index 8b8c64c7..541c086 100644 --- a/ppapi/proxy/file_system_resource.cc +++ b/ppapi/proxy/file_system_resource.cc
@@ -5,8 +5,8 @@ #include "ppapi/proxy/file_system_resource.h" #include "base/barrier_closure.h" -#include "base/bind.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "ipc/ipc_message.h" #include "ppapi/c/pp_errors.h" #include "ppapi/proxy/ppapi_messages.h"
diff --git a/ppapi/proxy/file_system_resource_unittest.cc b/ppapi/proxy/file_system_resource_unittest.cc index 5c50fc48..c085931 100644 --- a/ppapi/proxy/file_system_resource_unittest.cc +++ b/ppapi/proxy/file_system_resource_unittest.cc
@@ -4,7 +4,7 @@ #include <stdint.h> -#include "base/bind.h" +#include "base/functional/bind.h" #include "ppapi/c/pp_errors.h" #include "ppapi/c/ppb_file_io.h" #include "ppapi/c/ppb_file_ref.h"
diff --git a/ppapi/proxy/gamepad_resource.cc b/ppapi/proxy/gamepad_resource.cc index e14de71c..a30b9bc 100644 --- a/ppapi/proxy/gamepad_resource.cc +++ b/ppapi/proxy/gamepad_resource.cc
@@ -6,7 +6,7 @@ #include <string.h> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/read_only_shared_memory_region.h" #include "base/threading/platform_thread.h" #include "device/gamepad/public/cpp/gamepads.h"
diff --git a/ppapi/proxy/graphics_2d_resource.cc b/ppapi/proxy/graphics_2d_resource.cc index 511fbefd..6caca91c 100644 --- a/ppapi/proxy/graphics_2d_resource.cc +++ b/ppapi/proxy/graphics_2d_resource.cc
@@ -4,7 +4,7 @@ #include "ppapi/proxy/graphics_2d_resource.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "ppapi/c/pp_bool.h" #include "ppapi/c/pp_point.h" #include "ppapi/c/pp_rect.h"
diff --git a/ppapi/proxy/host_dispatcher.cc b/ppapi/proxy/host_dispatcher.cc index e7d8239..5abd3a2c 100644 --- a/ppapi/proxy/host_dispatcher.cc +++ b/ppapi/proxy/host_dispatcher.cc
@@ -6,8 +6,8 @@ #include <stddef.h> -#include "base/bind.h" #include "base/check.h" +#include "base/functional/bind.h" #include "base/notreached.h" #include "base/observer_list.h" #include "base/task/single_thread_task_runner.h"
diff --git a/ppapi/proxy/host_resolver_resource_base.cc b/ppapi/proxy/host_resolver_resource_base.cc index 5fab982..f6e52c9 100644 --- a/ppapi/proxy/host_resolver_resource_base.cc +++ b/ppapi/proxy/host_resolver_resource_base.cc
@@ -4,7 +4,7 @@ #include "ppapi/proxy/host_resolver_resource_base.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "ppapi/c/pp_errors.h" #include "ppapi/proxy/error_conversion.h" #include "ppapi/proxy/net_address_resource.h"
diff --git a/ppapi/proxy/isolated_file_system_private_resource.cc b/ppapi/proxy/isolated_file_system_private_resource.cc index 4003b112..b44488cf 100644 --- a/ppapi/proxy/isolated_file_system_private_resource.cc +++ b/ppapi/proxy/isolated_file_system_private_resource.cc
@@ -4,7 +4,7 @@ #include "ppapi/proxy/isolated_file_system_private_resource.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "ppapi/c/pp_errors.h" #include "ppapi/c/pp_file_info.h" #include "ppapi/proxy/file_system_resource.h"
diff --git a/ppapi/proxy/media_stream_audio_track_resource.cc b/ppapi/proxy/media_stream_audio_track_resource.cc index d56ff47e..3043c4c 100644 --- a/ppapi/proxy/media_stream_audio_track_resource.cc +++ b/ppapi/proxy/media_stream_audio_track_resource.cc
@@ -4,7 +4,7 @@ #include "ppapi/proxy/media_stream_audio_track_resource.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "ppapi/proxy/audio_buffer_resource.h" #include "ppapi/proxy/ppapi_messages.h" #include "ppapi/shared_impl/media_stream_audio_track_shared.h"
diff --git a/ppapi/proxy/media_stream_video_track_resource.cc b/ppapi/proxy/media_stream_video_track_resource.cc index b4df2161..41e84c8d 100644 --- a/ppapi/proxy/media_stream_video_track_resource.cc +++ b/ppapi/proxy/media_stream_video_track_resource.cc
@@ -4,8 +4,8 @@ #include "ppapi/proxy/media_stream_video_track_resource.h" -#include "base/bind.h" #include "base/check_op.h" +#include "base/functional/bind.h" #include "ppapi/proxy/ppapi_messages.h" #include "ppapi/proxy/video_frame_resource.h" #include "ppapi/shared_impl/media_stream_buffer.h"
diff --git a/ppapi/proxy/message_handler.cc b/ppapi/proxy/message_handler.cc index 0708202..a9e9800f 100644 --- a/ppapi/proxy/message_handler.cc +++ b/ppapi/proxy/message_handler.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/task/single_thread_task_runner.h" #include "ipc/ipc_message.h"
diff --git a/ppapi/proxy/nacl_message_scanner.cc b/ppapi/proxy/nacl_message_scanner.cc index d3b3658..df595cb3 100644 --- a/ppapi/proxy/nacl_message_scanner.cc +++ b/ppapi/proxy/nacl_message_scanner.cc
@@ -11,7 +11,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "build/build_config.h" #include "ipc/ipc_message.h" #include "ipc/ipc_message_macros.h"
diff --git a/ppapi/proxy/network_proxy_resource.cc b/ppapi/proxy/network_proxy_resource.cc index a96840f..a4141606 100644 --- a/ppapi/proxy/network_proxy_resource.cc +++ b/ppapi/proxy/network_proxy_resource.cc
@@ -4,7 +4,7 @@ #include "ppapi/proxy/network_proxy_resource.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "ppapi/proxy/dispatch_reply_message.h" #include "ppapi/proxy/ppapi_messages.h" #include "ppapi/shared_impl/tracked_callback.h"
diff --git a/ppapi/proxy/plugin_message_filter.cc b/ppapi/proxy/plugin_message_filter.cc index 828ab95..5f8fae2a 100644 --- a/ppapi/proxy/plugin_message_filter.cc +++ b/ppapi/proxy/plugin_message_filter.cc
@@ -4,7 +4,7 @@ #include "ppapi/proxy/plugin_message_filter.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/logging.h" #include "base/task/single_thread_task_runner.h"
diff --git a/ppapi/proxy/ppapi_command_buffer_proxy.h b/ppapi/proxy/ppapi_command_buffer_proxy.h index 5fe7d5a..0a8feb3 100644 --- a/ppapi/proxy/ppapi_command_buffer_proxy.h +++ b/ppapi/proxy/ppapi_command_buffer_proxy.h
@@ -10,7 +10,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "gpu/command_buffer/client/gpu_control.h" #include "gpu/command_buffer/common/command_buffer.h" #include "gpu/command_buffer/common/command_buffer_id.h"
diff --git a/ppapi/proxy/ppapi_proxy_test.cc b/ppapi/proxy/ppapi_proxy_test.cc index d291a43..364a02c 100644 --- a/ppapi/proxy/ppapi_proxy_test.cc +++ b/ppapi/proxy/ppapi_proxy_test.cc
@@ -7,8 +7,8 @@ #include <memory> #include <tuple> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/message_loop/message_pump_type.h" #include "base/observer_list.h"
diff --git a/ppapi/proxy/ppb_core_proxy.cc b/ppapi/proxy/ppb_core_proxy.cc index 60f7d07..7e40d46 100644 --- a/ppapi/proxy/ppb_core_proxy.cc +++ b/ppapi/proxy/ppb_core_proxy.cc
@@ -7,8 +7,8 @@ #include <stdint.h> #include <stdlib.h> // For malloc -#include "base/bind.h" #include "base/check.h" +#include "base/functional/bind.h" #include "base/time/time.h" #include "base/trace_event/trace_event.h" #include "build/build_config.h"
diff --git a/ppapi/proxy/ppb_image_data_proxy.cc b/ppapi/proxy/ppb_image_data_proxy.cc index c915993a..0c3c9dd 100644 --- a/ppapi/proxy/ppb_image_data_proxy.cc +++ b/ppapi/proxy/ppb_image_data_proxy.cc
@@ -9,7 +9,7 @@ #include <map> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/memory/shared_memory_mapping.h" #include "base/memory/singleton.h"
diff --git a/ppapi/proxy/ppb_instance_proxy.cc b/ppapi/proxy/ppb_instance_proxy.cc index 7de78e2..1e9d47e 100644 --- a/ppapi/proxy/ppb_instance_proxy.cc +++ b/ppapi/proxy/ppb_instance_proxy.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ref_counted.h" #include "base/numerics/safe_conversions.h" #include "build/build_config.h"
diff --git a/ppapi/proxy/ppb_message_loop_proxy.cc b/ppapi/proxy/ppb_message_loop_proxy.cc index f26045a6..3fe89a6 100644 --- a/ppapi/proxy/ppb_message_loop_proxy.cc +++ b/ppapi/proxy/ppb_message_loop_proxy.cc
@@ -9,10 +9,10 @@ #include <memory> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/check.h" #include "base/compiler_specific.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/task/single_thread_task_runner.h" #include "ppapi/c/pp_errors.h" #include "ppapi/c/ppb_message_loop.h"
diff --git a/ppapi/proxy/ppb_message_loop_proxy.h b/ppapi/proxy/ppb_message_loop_proxy.h index bda71524..9fc4f227 100644 --- a/ppapi/proxy/ppb_message_loop_proxy.h +++ b/ppapi/proxy/ppb_message_loop_proxy.h
@@ -9,7 +9,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/scoped_refptr.h" #include "base/run_loop.h" #include "base/task/single_thread_task_executor.h"
diff --git a/ppapi/proxy/ppb_var_deprecated_proxy.cc b/ppapi/proxy/ppb_var_deprecated_proxy.cc index 2a2cbbd..340c023 100644 --- a/ppapi/proxy/ppb_var_deprecated_proxy.cc +++ b/ppapi/proxy/ppb_var_deprecated_proxy.cc
@@ -6,7 +6,7 @@ #include <stdlib.h> // For malloc -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/notreached.h" #include "ppapi/c/dev/ppb_var_deprecated.h" #include "ppapi/c/pp_var.h"
diff --git a/ppapi/proxy/ppp_instance_private_proxy_unittest.cc b/ppapi/proxy/ppp_instance_private_proxy_unittest.cc index bde01d4..8c84456 100644 --- a/ppapi/proxy/ppp_instance_private_proxy_unittest.cc +++ b/ppapi/proxy/ppp_instance_private_proxy_unittest.cc
@@ -4,7 +4,7 @@ #include <stdint.h> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/test/test_timeouts.h" #include "base/time/time.h" #include "ppapi/c/dev/ppb_var_deprecated.h"
diff --git a/ppapi/proxy/ppp_instance_proxy.cc b/ppapi/proxy/ppp_instance_proxy.cc index 27e8753..f1ce6b13 100644 --- a/ppapi/proxy/ppp_instance_proxy.cc +++ b/ppapi/proxy/ppp_instance_proxy.cc
@@ -9,7 +9,7 @@ #include <algorithm> -#include "base/bind.h" +#include "base/functional/bind.h" #include "build/build_config.h" #include "ppapi/c/pp_var.h" #include "ppapi/c/ppb_core.h"
diff --git a/ppapi/proxy/ppp_messaging_proxy_unittest.cc b/ppapi/proxy/ppp_messaging_proxy_unittest.cc index b589c94..003d2c9 100644 --- a/ppapi/proxy/ppp_messaging_proxy_unittest.cc +++ b/ppapi/proxy/ppp_messaging_proxy_unittest.cc
@@ -4,7 +4,7 @@ #include <cstring> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/synchronization/waitable_event.h" #include "ppapi/c/pp_var.h" #include "ppapi/c/ppb_var.h"
diff --git a/ppapi/proxy/printing_resource.cc b/ppapi/proxy/printing_resource.cc index 00739dd..b9d49379 100644 --- a/ppapi/proxy/printing_resource.cc +++ b/ppapi/proxy/printing_resource.cc
@@ -4,7 +4,7 @@ #include "ppapi/proxy/printing_resource.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "ipc/ipc_message.h" #include "ppapi/c/pp_errors.h" #include "ppapi/proxy/dispatch_reply_message.h"
diff --git a/ppapi/proxy/raw_var_data.h b/ppapi/proxy/raw_var_data.h index 9373f65..667163e 100644 --- a/ppapi/proxy/raw_var_data.h +++ b/ppapi/proxy/raw_var_data.h
@@ -11,7 +11,7 @@ #include <memory> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "ppapi/c/pp_instance.h" #include "ppapi/c/pp_var.h" #include "ppapi/proxy/ppapi_param_traits.h"
diff --git a/ppapi/proxy/raw_var_data_unittest.cc b/ppapi/proxy/raw_var_data_unittest.cc index 3dc38d7..e0b7d01 100644 --- a/ppapi/proxy/raw_var_data_unittest.cc +++ b/ppapi/proxy/raw_var_data_unittest.cc
@@ -9,7 +9,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ref_counted.h" #include "base/test/task_environment.h" #include "base/values.h"
diff --git a/ppapi/proxy/serialized_var.cc b/ppapi/proxy/serialized_var.cc index 953877e..42e323f 100644 --- a/ppapi/proxy/serialized_var.cc +++ b/ppapi/proxy/serialized_var.cc
@@ -4,8 +4,8 @@ #include "ppapi/proxy/serialized_var.h" -#include "base/bind.h" #include "base/check.h" +#include "base/functional/bind.h" #include "base/notreached.h" #include "ipc/ipc_message_utils.h" #include "ppapi/c/pp_instance.h"
diff --git a/ppapi/proxy/tcp_server_socket_private_resource.cc b/ppapi/proxy/tcp_server_socket_private_resource.cc index 0f807837..fa91e698 100644 --- a/ppapi/proxy/tcp_server_socket_private_resource.cc +++ b/ppapi/proxy/tcp_server_socket_private_resource.cc
@@ -4,7 +4,7 @@ #include "ppapi/proxy/tcp_server_socket_private_resource.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "ppapi/proxy/ppapi_messages.h" #include "ppapi/proxy/tcp_socket_private_resource.h"
diff --git a/ppapi/proxy/tcp_socket_resource_base.cc b/ppapi/proxy/tcp_socket_resource_base.cc index f3225a5..c447747 100644 --- a/ppapi/proxy/tcp_socket_resource_base.cc +++ b/ppapi/proxy/tcp_socket_resource_base.cc
@@ -7,8 +7,8 @@ #include <cstring> #include <iterator> -#include "base/bind.h" #include "base/check_op.h" +#include "base/functional/bind.h" #include "base/notreached.h" #include "ppapi/c/pp_bool.h" #include "ppapi/c/pp_errors.h"
diff --git a/ppapi/proxy/tracked_callback_unittest.cc b/ppapi/proxy/tracked_callback_unittest.cc index aba4467..706c18ab 100644 --- a/ppapi/proxy/tracked_callback_unittest.cc +++ b/ppapi/proxy/tracked_callback_unittest.cc
@@ -4,7 +4,7 @@ #include <stdint.h> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/memory/ref_counted.h" #include "base/run_loop.h"
diff --git a/ppapi/proxy/udp_socket_filter.cc b/ppapi/proxy/udp_socket_filter.cc index 07e9b31c..38262b6 100644 --- a/ppapi/proxy/udp_socket_filter.cc +++ b/ppapi/proxy/udp_socket_filter.cc
@@ -9,8 +9,8 @@ #include <memory> #include <utility> -#include "base/bind.h" #include "base/check_op.h" +#include "base/functional/bind.h" #include "base/notreached.h" #include "ppapi/c/pp_errors.h" #include "ppapi/proxy/error_conversion.h"
diff --git a/ppapi/proxy/udp_socket_resource_base.cc b/ppapi/proxy/udp_socket_resource_base.cc index 5e3f1c9..6296f97 100644 --- a/ppapi/proxy/udp_socket_resource_base.cc +++ b/ppapi/proxy/udp_socket_resource_base.cc
@@ -6,8 +6,8 @@ #include <cstring> -#include "base/bind.h" #include "base/check.h" +#include "base/functional/bind.h" #include "base/notreached.h" #include "ppapi/c/pp_bool.h" #include "ppapi/c/pp_errors.h"
diff --git a/ppapi/proxy/uma_private_resource.cc b/ppapi/proxy/uma_private_resource.cc index 1590097..f36feea 100644 --- a/ppapi/proxy/uma_private_resource.cc +++ b/ppapi/proxy/uma_private_resource.cc
@@ -4,7 +4,7 @@ #include "ppapi/proxy/uma_private_resource.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "ppapi/proxy/ppapi_messages.h" #include "ppapi/proxy/resource_message_params.h" #include "ppapi/shared_impl/var.h"
diff --git a/ppapi/proxy/video_capture_resource.cc b/ppapi/proxy/video_capture_resource.cc index 825568a..69062cb 100644 --- a/ppapi/proxy/video_capture_resource.cc +++ b/ppapi/proxy/video_capture_resource.cc
@@ -6,7 +6,7 @@ #include <stddef.h> -#include "base/bind.h" +#include "base/functional/bind.h" #include "ppapi/c/dev/ppp_video_capture_dev.h" #include "ppapi/proxy/dispatch_reply_message.h" #include "ppapi/proxy/plugin_dispatcher.h"
diff --git a/ppapi/proxy/video_decoder_resource.cc b/ppapi/proxy/video_decoder_resource.cc index 98f43fb0..7381760 100644 --- a/ppapi/proxy/video_decoder_resource.cc +++ b/ppapi/proxy/video_decoder_resource.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "gpu/command_buffer/client/gles2_cmd_helper.h" #include "gpu/command_buffer/client/gles2_implementation.h" #include "gpu/command_buffer/common/mailbox.h"
diff --git a/ppapi/proxy/video_encoder_resource.cc b/ppapi/proxy/video_encoder_resource.cc index 877ace6..18a2dcc 100644 --- a/ppapi/proxy/video_encoder_resource.cc +++ b/ppapi/proxy/video_encoder_resource.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/unsafe_shared_memory_region.h" #include "base/numerics/safe_conversions.h" #include "ppapi/c/pp_array_output.h"
diff --git a/ppapi/proxy/vpn_provider_resource.cc b/ppapi/proxy/vpn_provider_resource.cc index 1f79044..b7738bc5 100644 --- a/ppapi/proxy/vpn_provider_resource.cc +++ b/ppapi/proxy/vpn_provider_resource.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/unsafe_shared_memory_region.h" #include "ppapi/c/pp_errors.h" #include "ppapi/proxy/dispatch_reply_message.h"
diff --git a/ppapi/proxy/websocket_resource.cc b/ppapi/proxy/websocket_resource.cc index f3d9fe7..1a2076c 100644 --- a/ppapi/proxy/websocket_resource.cc +++ b/ppapi/proxy/websocket_resource.cc
@@ -11,7 +11,7 @@ #include <string> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/numerics/safe_conversions.h" #include "ppapi/c/pp_errors.h" #include "ppapi/proxy/dispatch_reply_message.h"
diff --git a/ppapi/shared_impl/callback_tracker.cc b/ppapi/shared_impl/callback_tracker.cc index 741bf8b..5864eec 100644 --- a/ppapi/shared_impl/callback_tracker.cc +++ b/ppapi/shared_impl/callback_tracker.cc
@@ -6,9 +6,9 @@ #include <algorithm> -#include "base/bind.h" #include "base/check_op.h" #include "base/compiler_specific.h" +#include "base/functional/bind.h" #include "ppapi/c/pp_completion_callback.h" #include "ppapi/shared_impl/proxy_lock.h" #include "ppapi/shared_impl/tracked_callback.h"
diff --git a/ppapi/shared_impl/media_stream_buffer_manager.cc b/ppapi/shared_impl/media_stream_buffer_manager.cc index 225de5d..ddcacce 100644 --- a/ppapi/shared_impl/media_stream_buffer_manager.cc +++ b/ppapi/shared_impl/media_stream_buffer_manager.cc
@@ -6,6 +6,7 @@ #include <stddef.h> +#include <ostream> #include <utility> #include "base/check_op.h"
diff --git a/ppapi/shared_impl/ppb_audio_shared.cc b/ppapi/shared_impl/ppb_audio_shared.cc index b418961..5e45184 100644 --- a/ppapi/shared_impl/ppb_audio_shared.cc +++ b/ppapi/shared_impl/ppb_audio_shared.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/trace_event/trace_event.h" #include "media/base/audio_parameters.h"
diff --git a/ppapi/shared_impl/ppb_message_loop_shared.h b/ppapi/shared_impl/ppb_message_loop_shared.h index b57453ff..49afc1a 100644 --- a/ppapi/shared_impl/ppb_message_loop_shared.h +++ b/ppapi/shared_impl/ppb_message_loop_shared.h
@@ -7,7 +7,7 @@ #include <stdint.h> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/location.h" #include "ppapi/c/pp_instance.h" #include "ppapi/shared_impl/ppapi_shared_export.h"
diff --git a/ppapi/shared_impl/ppp_instance_combined.h b/ppapi/shared_impl/ppp_instance_combined.h index c141f59f..bc381af 100644 --- a/ppapi/shared_impl/ppp_instance_combined.h +++ b/ppapi/shared_impl/ppp_instance_combined.h
@@ -7,7 +7,7 @@ #include <stdint.h> -#include "base/callback.h" +#include "base/functional/callback.h" #include "ppapi/c/ppp_instance.h" #include "ppapi/shared_impl/ppapi_shared_export.h"
diff --git a/ppapi/shared_impl/proxy_lock.h b/ppapi/shared_impl/proxy_lock.h index ad2b674..cd17330 100644 --- a/ppapi/shared_impl/proxy_lock.h +++ b/ppapi/shared_impl/proxy_lock.h
@@ -8,8 +8,8 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/threading/thread_checker.h" #include "ppapi/shared_impl/ppapi_shared_export.h"
diff --git a/ppapi/shared_impl/proxy_lock_unittest.cc b/ppapi/shared_impl/proxy_lock_unittest.cc index 30d4141..abb8618 100644 --- a/ppapi/shared_impl/proxy_lock_unittest.cc +++ b/ppapi/shared_impl/proxy_lock_unittest.cc
@@ -4,9 +4,9 @@ #include <string> -#include "base/bind.h" -#include "base/callback.h" #include "base/compiler_specific.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/ref_counted.h" #include "base/test/task_environment.h" #include "ppapi/shared_impl/proxy_lock.h"
diff --git a/ppapi/shared_impl/resource_tracker.cc b/ppapi/shared_impl/resource_tracker.cc index c9961c3..2f32c368 100644 --- a/ppapi/shared_impl/resource_tracker.cc +++ b/ppapi/shared_impl/resource_tracker.cc
@@ -6,8 +6,8 @@ #include <memory> -#include "base/bind.h" #include "base/compiler_specific.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/memory/ptr_util.h" #include "ppapi/shared_impl/callback_tracker.h"
diff --git a/ppapi/shared_impl/thread_aware_callback.cc b/ppapi/shared_impl/thread_aware_callback.cc index 01d5dcb..e1a7432 100644 --- a/ppapi/shared_impl/thread_aware_callback.cc +++ b/ppapi/shared_impl/thread_aware_callback.cc
@@ -4,8 +4,8 @@ #include "ppapi/shared_impl/thread_aware_callback.h" -#include "base/callback.h" #include "base/check.h" +#include "base/functional/callback.h" #include "ppapi/shared_impl/ppapi_globals.h" #include "ppapi/shared_impl/ppb_message_loop_shared.h"
diff --git a/ppapi/shared_impl/thread_aware_callback.h b/ppapi/shared_impl/thread_aware_callback.h index c695c9f..8860a593 100644 --- a/ppapi/shared_impl/thread_aware_callback.h +++ b/ppapi/shared_impl/thread_aware_callback.h
@@ -5,7 +5,7 @@ #ifndef PPAPI_SHARED_IMPL_THREAD_AWARE_CALLBACK_H_ #define PPAPI_SHARED_IMPL_THREAD_AWARE_CALLBACK_H_ -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/scoped_refptr.h" #include "ppapi/shared_impl/ppapi_shared_export.h" #include "ppapi/shared_impl/proxy_lock.h"
diff --git a/ppapi/shared_impl/thread_aware_callback_unittest.cc b/ppapi/shared_impl/thread_aware_callback_unittest.cc index 7d2ff44..162cbc9 100644 --- a/ppapi/shared_impl/thread_aware_callback_unittest.cc +++ b/ppapi/shared_impl/thread_aware_callback_unittest.cc
@@ -6,10 +6,10 @@ #include <memory> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/check.h" #include "base/compiler_specific.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/task/single_thread_task_runner.h" #include "ppapi/c/pp_errors.h"
diff --git a/ppapi/shared_impl/tracked_callback.cc b/ppapi/shared_impl/tracked_callback.cc index 7c2f76849..f6c203de 100644 --- a/ppapi/shared_impl/tracked_callback.cc +++ b/ppapi/shared_impl/tracked_callback.cc
@@ -6,9 +6,9 @@ #include <memory> -#include "base/bind.h" #include "base/check.h" #include "base/compiler_specific.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/notreached.h" #include "base/synchronization/lock.h"
diff --git a/ppapi/shared_impl/tracked_callback.h b/ppapi/shared_impl/tracked_callback.h index ff6bb16e..e612cd0 100644 --- a/ppapi/shared_impl/tracked_callback.h +++ b/ppapi/shared_impl/tracked_callback.h
@@ -11,7 +11,7 @@ #include <memory> #include <set> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/ref_counted.h" #include "base/synchronization/condition_variable.h" #include "base/synchronization/lock.h"
diff --git a/ppapi/tests/blink_deprecated_test_plugin.cc b/ppapi/tests/blink_deprecated_test_plugin.cc index 0689b79..b277801 100644 --- a/ppapi/tests/blink_deprecated_test_plugin.cc +++ b/ppapi/tests/blink_deprecated_test_plugin.cc
@@ -69,9 +69,9 @@ #include <unordered_map> #include <utility> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/strings/stringprintf.h" #include "ppapi/cpp/dev/scriptable_object_deprecated.h" #include "ppapi/cpp/input_event.h"
diff --git a/ppapi/thunk/enter.cc b/ppapi/thunk/enter.cc index d982f19f..e98bda0 100644 --- a/ppapi/thunk/enter.cc +++ b/ppapi/thunk/enter.cc
@@ -4,7 +4,7 @@ #include "ppapi/thunk/enter.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/strings/stringprintf.h" #include "base/synchronization/lock.h"
diff --git a/ppapi/thunk/ppb_file_system_api.h b/ppapi/thunk/ppb_file_system_api.h index 8aaaeea7..11b00b8 100644 --- a/ppapi/thunk/ppb_file_system_api.h +++ b/ppapi/thunk/ppb_file_system_api.h
@@ -7,7 +7,7 @@ #include <stdint.h> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/scoped_refptr.h" #include "ppapi/c/ppb_file_system.h"
diff --git a/printing/backend/cups_ipp_helper.cc b/printing/backend/cups_ipp_helper.cc index 964da97..2c664338 100644 --- a/printing/backend/cups_ipp_helper.cc +++ b/printing/backend/cups_ipp_helper.cc
@@ -26,7 +26,7 @@ #include "third_party/abseil-cpp/absl/types/optional.h" #if BUILDFLAG(IS_CHROMEOS) -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/metrics/histogram_functions.h" #include "base/no_destructor.h" #include "printing/backend/ipp_handler_map.h"
diff --git a/printing/backend/ipp_handler_map.h b/printing/backend/ipp_handler_map.h index f3826b5..0b887390 100644 --- a/printing/backend/ipp_handler_map.h +++ b/printing/backend/ipp_handler_map.h
@@ -7,7 +7,7 @@ #include <map> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/strings/string_piece.h" #include "printing/backend/print_backend.h"
diff --git a/printing/backend/tools/code_generator.py b/printing/backend/tools/code_generator.py index 51abe019..c232699 100755 --- a/printing/backend/tools/code_generator.py +++ b/printing/backend/tools/code_generator.py
@@ -41,7 +41,7 @@ #include "printing/backend/ipp_handler_map.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "printing/backend/ipp_handlers.h" namespace printing {
diff --git a/printing/metafile_skia.cc b/printing/metafile_skia.cc index c15fc1a7..a83ec26 100644 --- a/printing/metafile_skia.cc +++ b/printing/metafile_skia.cc
@@ -10,11 +10,11 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/containers/contains.h" #include "base/containers/span.h" #include "base/files/file.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/numerics/safe_conversions.h" #include "base/time/time.h"
diff --git a/printing/printed_document.cc b/printing/printed_document.cc index 5135dc2f..0fc9550 100644 --- a/printing/printed_document.cc +++ b/printing/printed_document.cc
@@ -10,9 +10,9 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/i18n/file_util_icu.h" #include "base/i18n/time_formatting.h" #include "base/json/json_writer.h"
diff --git a/printing/printing_context.h b/printing/printing_context.h index 4209517..7582c73 100644 --- a/printing/printing_context.h +++ b/printing/printing_context.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/values.h" #include "build/build_config.h"
diff --git a/printing/printing_context_win.cc b/printing/printing_context_win.cc index 780acdd..e29b20a 100644 --- a/printing/printing_context_win.cc +++ b/printing/printing_context_win.cc
@@ -10,9 +10,9 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/check.h" #include "base/check_op.h" +#include "base/functional/bind.h" #include "base/memory/free_deleter.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h"
diff --git a/printing/printing_context_win_unittest.cc b/printing/printing_context_win_unittest.cc index bc2fc28..2d5ff2b 100644 --- a/printing/printing_context_win_unittest.cc +++ b/printing/printing_context_win_unittest.cc
@@ -9,7 +9,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/utf_string_conversions.h" #include "base/test/task_environment.h" #include "base/win/scoped_handle.h"
diff --git a/remoting/base/auto_thread.cc b/remoting/base/auto_thread.cc index a801b2a..d34fdb0 100644 --- a/remoting/base/auto_thread.cc +++ b/remoting/base/auto_thread.cc
@@ -6,8 +6,8 @@ #include <memory> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/lazy_instance.h" #include "base/logging.h" #include "base/run_loop.h" @@ -45,7 +45,7 @@ } #endif -} +} // namespace // Used to pass data to ThreadMain. This structure is allocated on the stack // from within StartWithType. @@ -72,14 +72,16 @@ base::MessagePumpType type) { AutoThread* thread = new AutoThread(name, joiner.get()); scoped_refptr<AutoThreadTaskRunner> task_runner = thread->StartWithType(type); - if (!task_runner.get()) + if (!task_runner.get()) { delete thread; + } return task_runner; } // static scoped_refptr<AutoThreadTaskRunner> AutoThread::Create( - const char* name, scoped_refptr<AutoThreadTaskRunner> joiner) { + const char* name, + scoped_refptr<AutoThreadTaskRunner> joiner) { return CreateWithType(name, joiner, base::MessagePumpType::DEFAULT); } @@ -94,8 +96,9 @@ thread->SetComInitType(com_init_type); scoped_refptr<AutoThreadTaskRunner> task_runner = thread->StartWithType(pump_type); - if (!task_runner.get()) + if (!task_runner.get()) { delete thread; + } return task_runner; } #endif @@ -232,4 +235,4 @@ DCHECK(was_quit_properly_); } -} // namespace base +} // namespace remoting
diff --git a/remoting/base/auto_thread.h b/remoting/base/auto_thread.h index 04b85bc5..3e9a772 100644 --- a/remoting/base/auto_thread.h +++ b/remoting/base/auto_thread.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/message_loop/message_pump_type.h" #include "base/threading/platform_thread.h"
diff --git a/remoting/base/auto_thread_task_runner.h b/remoting/base/auto_thread_task_runner.h index ebcdc7bc..4a3da53 100644 --- a/remoting/base/auto_thread_task_runner.h +++ b/remoting/base/auto_thread_task_runner.h
@@ -5,7 +5,7 @@ #ifndef REMOTING_BASE_AUTO_THREAD_TASK_RUNNER_H_ #define REMOTING_BASE_AUTO_THREAD_TASK_RUNNER_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/task/single_thread_task_runner.h" #include "build/buildflag.h"
diff --git a/remoting/base/auto_thread_task_runner_unittest.cc b/remoting/base/auto_thread_task_runner_unittest.cc index 61d456d..dccd8a1c 100644 --- a/remoting/base/auto_thread_task_runner_unittest.cc +++ b/remoting/base/auto_thread_task_runner_unittest.cc
@@ -4,7 +4,7 @@ #include "remoting/base/auto_thread_task_runner.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ref_counted.h" #include "base/run_loop.h" #include "base/task/single_thread_task_runner.h"
diff --git a/remoting/base/auto_thread_unittest.cc b/remoting/base/auto_thread_unittest.cc index bd89956..09fc939f 100644 --- a/remoting/base/auto_thread_unittest.cc +++ b/remoting/base/auto_thread_unittest.cc
@@ -4,8 +4,8 @@ #include "remoting/base/auto_thread.h" -#include "base/bind.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/memory/ref_counted.h" #include "base/message_loop/message_pump_type.h" #include "base/run_loop.h" @@ -27,16 +27,14 @@ *success = true; } -void PostSetFlagTask( - scoped_refptr<base::TaskRunner> task_runner, - bool* success) { +void PostSetFlagTask(scoped_refptr<base::TaskRunner> task_runner, + bool* success) { task_runner->PostTask(FROM_HERE, base::BindOnce(&SetFlagTask, success)); } #if BUILDFLAG(IS_WIN) void CheckComAptTypeTask(APTTYPE* apt_type_out, HRESULT* hresult) { - typedef HRESULT (WINAPI * CoGetApartmentTypeFunc) - (APTTYPE*, APTTYPEQUALIFIER*); + typedef HRESULT(WINAPI * CoGetApartmentTypeFunc)(APTTYPE*, APTTYPEQUALIFIER*); // Dynamic link to the API so the same test binary can run on older systems. base::ScopedNativeLibrary com_library(base::FilePath(L"ole32.dll"));
diff --git a/remoting/base/breakpad.h b/remoting/base/breakpad.h index 62a21cae..aa06169 100644 --- a/remoting/base/breakpad.h +++ b/remoting/base/breakpad.h
@@ -18,6 +18,6 @@ // rare. void InitializeCrashReporting(); -} // remoting +} // namespace remoting #endif // REMOTING_BASE_BREAKPAD_H_
diff --git a/remoting/base/breakpad_win.cc b/remoting/base/breakpad_win.cc index 9d82cb1f..dd1c7a7 100644 --- a/remoting/base/breakpad_win.cc +++ b/remoting/base/breakpad_win.cc
@@ -110,20 +110,19 @@ // Get the alternate dump directory. We use the temp path. // N.B. We don't use base::GetTempDir() here to avoid running more code then // necessary before crashes can be properly reported. - wchar_t temp_directory[MAX_PATH + 1] = { 0 }; + wchar_t temp_directory[MAX_PATH + 1] = {0}; DWORD length = GetTempPath(MAX_PATH, temp_directory); - if (length == 0) + if (length == 0) { return; + } // Minidump with stacks, PEB, TEBs and unloaded module list. MINIDUMP_TYPE dump_type = static_cast<MINIDUMP_TYPE>( - MiniDumpWithProcessThreadData | - MiniDumpWithUnloadedModules); - breakpad_.reset( - new google_breakpad::ExceptionHandler( - temp_directory, &OnExceptionCallback, NULL, NULL, - google_breakpad::ExceptionHandler::HANDLER_ALL, dump_type, - pipe_name_, GetCustomInfo())); + MiniDumpWithProcessThreadData | MiniDumpWithUnloadedModules); + breakpad_.reset(new google_breakpad::ExceptionHandler( + temp_directory, &OnExceptionCallback, NULL, NULL, + google_breakpad::ExceptionHandler::HANDLER_ALL, dump_type, pipe_name_, + GetCustomInfo())); if (breakpad_->IsOutOfProcess()) { // Tells breakpad to handle breakpoint and single step exceptions. @@ -159,14 +158,14 @@ wcscpy_s(version, kBreakpadVersionDefault); } - static google_breakpad::CustomInfoEntry ver_entry( - kBreakpadVersionEntry, version); - static google_breakpad::CustomInfoEntry prod_entry( - kBreakpadProdEntry, kBreakpadProductName); - static google_breakpad::CustomInfoEntry plat_entry( - kBreakpadPlatformEntry, kBreakpadPlatformWin32); - static google_breakpad::CustomInfoEntry entries[] = { - ver_entry, prod_entry, plat_entry }; + static google_breakpad::CustomInfoEntry ver_entry(kBreakpadVersionEntry, + version); + static google_breakpad::CustomInfoEntry prod_entry(kBreakpadProdEntry, + kBreakpadProductName); + static google_breakpad::CustomInfoEntry plat_entry(kBreakpadPlatformEntry, + kBreakpadPlatformWin32); + static google_breakpad::CustomInfoEntry entries[] = {ver_entry, prod_entry, + plat_entry}; static google_breakpad::CustomClientInfo custom_info = {entries, std::size(entries)}; return &custom_info;
diff --git a/remoting/base/breakpad_win_unittest.cc b/remoting/base/breakpad_win_unittest.cc index 8f3554d..32bd7dac 100644 --- a/remoting/base/breakpad_win_unittest.cc +++ b/remoting/base/breakpad_win_unittest.cc
@@ -46,11 +46,9 @@ const std::wstring* file_path); }; -MockCrashServerCallbacks::MockCrashServerCallbacks() { -} +MockCrashServerCallbacks::MockCrashServerCallbacks() {} -MockCrashServerCallbacks::~MockCrashServerCallbacks() { -} +MockCrashServerCallbacks::~MockCrashServerCallbacks() {} // static void MockCrashServerCallbacks::OnClientDumpRequestCallback( @@ -79,11 +77,9 @@ std::wstring pipe_name_; }; -BreakpadWinDeathTest::BreakpadWinDeathTest() { -} +BreakpadWinDeathTest::BreakpadWinDeathTest() {} -BreakpadWinDeathTest::~BreakpadWinDeathTest() { -} +BreakpadWinDeathTest::~BreakpadWinDeathTest() {} void BreakpadWinDeathTest::SetUp() { std::unique_ptr<base::Environment> environment(base::Environment::Create()); @@ -100,40 +96,20 @@ RPC_STATUS status = UuidCreate(&guid); EXPECT_TRUE(status == RPC_S_OK || status == RPC_S_UUID_LOCAL_ONLY); - pipe_name_ = - base::StringPrintf( - L"%ls%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x", - kPipeNamePrefix, - guid.Data1, - guid.Data2, - guid.Data3, - guid.Data4[0], - guid.Data4[1], - guid.Data4[2], - guid.Data4[3], - guid.Data4[4], - guid.Data4[5], - guid.Data4[6], - guid.Data4[7]); - EXPECT_TRUE(environment->SetVar(kPipeVariableName, - base::WideToUTF8(pipe_name_))); + pipe_name_ = base::StringPrintf( + L"%ls%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x", kPipeNamePrefix, + guid.Data1, guid.Data2, guid.Data3, guid.Data4[0], guid.Data4[1], + guid.Data4[2], guid.Data4[3], guid.Data4[4], guid.Data4[5], + guid.Data4[6], guid.Data4[7]); + EXPECT_TRUE( + environment->SetVar(kPipeVariableName, base::WideToUTF8(pipe_name_))); // Setup a dummy crash dump server. callbacks_.reset(new MockCrashServerCallbacks()); - crash_server_.reset( - new google_breakpad::CrashGenerationServer( - pipe_name_, - NULL, - NULL, - NULL, - MockCrashServerCallbacks::OnClientDumpRequestCallback, - callbacks_.get(), - NULL, - NULL, - NULL, - NULL, - false, - NULL)); + crash_server_.reset(new google_breakpad::CrashGenerationServer( + pipe_name_, NULL, NULL, NULL, + MockCrashServerCallbacks::OnClientDumpRequestCallback, callbacks_.get(), + NULL, NULL, NULL, NULL, false, NULL)); ASSERT_TRUE(crash_server_->Start()); } }
diff --git a/remoting/base/buffered_socket_writer.cc b/remoting/base/buffered_socket_writer.cc index 520a1f8..a29a9fa 100644 --- a/remoting/base/buffered_socket_writer.cc +++ b/remoting/base/buffered_socket_writer.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "net/base/io_buffer.h" #include "net/base/net_errors.h" #include "net/socket/socket.h" @@ -73,8 +73,9 @@ DCHECK(data.get()); // Don't write after error. - if (closed_) + if (closed_) { return; + } int data_size = data->size(); queue_.push_back(std::make_unique<PendingPacket>( @@ -106,8 +107,9 @@ } else { closed_ = true; write_callback_.Reset(); - if (!write_failed_callback_.is_null()) + if (!write_failed_callback_.is_null()) { std::move(write_failed_callback_).Run(result); + } } return; } @@ -120,8 +122,9 @@ base::OnceClosure done_task = std::move(queue_.front()->done_task); queue_.pop_front(); - if (!done_task.is_null()) + if (!done_task.is_null()) { std::move(done_task).Run(); + } } } @@ -132,8 +135,9 @@ base::WeakPtr<BufferedSocketWriter> self = weak_factory_.GetWeakPtr(); HandleWriteResult(result); - if (self) + if (self) { DoWrite(); + } } } // namespace remoting
diff --git a/remoting/base/buffered_socket_writer.h b/remoting/base/buffered_socket_writer.h index 2ada676..e6acba5 100644 --- a/remoting/base/buffered_socket_writer.h +++ b/remoting/base/buffered_socket_writer.h
@@ -8,7 +8,7 @@ #include <list> #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "base/synchronization/lock.h" #include "base/threading/thread_checker.h"
diff --git a/remoting/base/buffered_socket_writer_unittest.cc b/remoting/base/buffered_socket_writer_unittest.cc index 23798bd..c81c1aa 100644 --- a/remoting/base/buffered_socket_writer_unittest.cc +++ b/remoting/base/buffered_socket_writer_unittest.cc
@@ -9,8 +9,8 @@ #include <memory> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/run_loop.h" #include "base/test/task_environment.h" #include "net/base/io_buffer.h" @@ -37,7 +37,7 @@ traffic_annotation); } -class SocketDataProvider: public net::SocketDataProvider { +class SocketDataProvider : public net::SocketDataProvider { public: SocketDataProvider() : write_limit_(-1), async_write_(false), next_write_error_(net::OK) {} @@ -54,20 +54,17 @@ r); } int size = data.size(); - if (write_limit_ > 0) + if (write_limit_ > 0) { size = std::min(write_limit_, size); + } written_data_.append(data, 0, size); return net::MockWriteResult(async_write_ ? net::ASYNC : net::SYNCHRONOUS, size); } - bool AllReadDataConsumed() const override { - return true; - } + bool AllReadDataConsumed() const override { return true; } - bool AllWriteDataConsumed() const override { - return true; - } + bool AllWriteDataConsumed() const override { return true; } void Reset() override {} @@ -88,18 +85,14 @@ class BufferedSocketWriterTest : public testing::Test { public: - BufferedSocketWriterTest() - : write_error_(0) { - } + BufferedSocketWriterTest() : write_error_(0) {} void DestroyWriter() { writer_.reset(); socket_.reset(); } - void Unexpected() { - EXPECT_TRUE(false); - } + void Unexpected() { EXPECT_TRUE(false); } protected: void SetUp() override { @@ -125,14 +118,12 @@ base::Unretained(this))); } - void OnWriteFailed(int error) { - write_error_ = error; - } + void OnWriteFailed(int error) { write_error_ = error; } void VerifyWrittenData() { - ASSERT_EQ(static_cast<size_t>(test_buffer_->size() + - test_buffer_2_->size()), - socket_data_provider_.written_data().size()); + ASSERT_EQ( + static_cast<size_t>(test_buffer_->size() + test_buffer_2_->size()), + socket_data_provider_.written_data().size()); EXPECT_EQ(0, memcmp(test_buffer_->data(), socket_data_provider_.written_data().data(), test_buffer_->size()));
diff --git a/remoting/base/capabilities.h b/remoting/base/capabilities.h index 06b9dd6..4340da3a 100644 --- a/remoting/base/capabilities.h +++ b/remoting/base/capabilities.h
@@ -7,7 +7,6 @@ #include <string> - namespace remoting { // Returns true if |capabilities| contain capability |key|.
diff --git a/remoting/base/chromium_url_request.cc b/remoting/base/chromium_url_request.cc index db37c57..cd8b295 100644 --- a/remoting/base/chromium_url_request.cc +++ b/remoting/base/chromium_url_request.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "net/base/load_flags.h" #include "services/network/public/cpp/resource_request.h" #include "services/network/public/cpp/shared_url_loader_factory.h" @@ -61,8 +61,9 @@ url_loader_ = network::SimpleURLLoader::Create(std::move(resource_request_), traffic_annotation_); - if (method == "POST") + if (method == "POST") { url_loader_->AttachStringForUpload(post_data_, post_data_content_type_); + } url_loader_->DownloadToStringOfUnboundedSizeUntilCrashAndDie( url_loader_factory_.get(),
diff --git a/remoting/base/chromium_url_request.h b/remoting/base/chromium_url_request.h index c38c173..a005341 100644 --- a/remoting/base/chromium_url_request.h +++ b/remoting/base/chromium_url_request.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" #include "net/traffic_annotation/network_traffic_annotation.h" #include "remoting/base/url_request.h"
diff --git a/remoting/base/compound_buffer.cc b/remoting/base/compound_buffer.cc index 42189cf..a5f97f5 100644 --- a/remoting/base/compound_buffer.cc +++ b/remoting/base/compound_buffer.cc
@@ -21,10 +21,7 @@ CompoundBuffer::DataChunk::~DataChunk() = default; -CompoundBuffer::CompoundBuffer() - : total_bytes_(0), - locked_(false) { -} +CompoundBuffer::CompoundBuffer() : total_bytes_(0), locked_(false) {} CompoundBuffer::~CompoundBuffer() = default; @@ -163,7 +160,8 @@ } void CompoundBuffer::CopyFrom(const CompoundBuffer& source, - int start, int end) { + int start, + int end) { // Check that 0 <= |start| <= |end| <= |total_bytes_|. DCHECK_LE(0, start); DCHECK_LE(start, end); @@ -179,7 +177,6 @@ int pos = 0; for (DataChunkList::const_iterator it = source.chunks_.begin(); it != source.chunks_.end(); ++it) { - // Add data from the current chunk only if it is in the specified interval. if (pos + it->size > start && pos < end) { int relative_start = std::max(0, start - pos);
diff --git a/remoting/base/compound_buffer.h b/remoting/base/compound_buffer.h index ddb80a2..47e40f7 100644 --- a/remoting/base/compound_buffer.h +++ b/remoting/base/compound_buffer.h
@@ -106,7 +106,7 @@ }; class CompoundBufferInputStream - : public google::protobuf::io::ZeroCopyInputStream { + : public google::protobuf::io::ZeroCopyInputStream { public: // Caller keeps ownership of |buffer|. |buffer| must be locked. explicit CompoundBufferInputStream(const CompoundBuffer* buffer);
diff --git a/remoting/base/compound_buffer_unittest.cc b/remoting/base/compound_buffer_unittest.cc index 5fbbd38..8e0da56 100644 --- a/remoting/base/compound_buffer_unittest.cc +++ b/remoting/base/compound_buffer_unittest.cc
@@ -10,8 +10,8 @@ #include <memory> #include <string> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "net/base/io_buffer.h" #include "testing/gtest/include/gtest/gtest.h" @@ -36,7 +36,6 @@ class CompoundBufferTest : public testing::Test { public: - // Following 5 methods are used with IterateOverPieces(). void Append(int pos, int size) { target_.Append(data_, data_->data() + pos, size); @@ -64,16 +63,16 @@ CompoundBuffer cropped; cropped.CopyFrom(target_, 0, target_.total_bytes()); cropped.CropFront(pos); - EXPECT_TRUE(CompareData(cropped, data_->data() + pos, - target_.total_bytes() - pos)); + EXPECT_TRUE( + CompareData(cropped, data_->data() + pos, target_.total_bytes() - pos)); } void TestCropBack(int pos, int size) { CompoundBuffer cropped; cropped.CopyFrom(target_, 0, target_.total_bytes()); cropped.CropBack(pos); - EXPECT_TRUE(CompareData(cropped, data_->data(), - target_.total_bytes() - pos)); + EXPECT_TRUE( + CompareData(cropped, data_->data(), target_.total_bytes() - pos)); } protected: @@ -96,8 +95,9 @@ while (pos < kDataSize) { int size = std::min(sizes[index], kDataSize - pos); ++index; - if (sizes[index] <= 0) + if (sizes[index] <= 0) { index = 0; + } function.Run(pos, size); @@ -108,11 +108,12 @@ bool CompareData(const CompoundBuffer& buffer, char* data, int size) { scoped_refptr<IOBuffer> buffer_data = buffer.ToIOBufferWithSize(); return buffer.total_bytes() == size && - memcmp(buffer_data->data(), data, size) == 0; + memcmp(buffer_data->data(), data, size) == 0; } static size_t ReadFromInput(CompoundBufferInputStream* input, - void* data, size_t size) { + void* data, + size_t size) { uint8_t* out = reinterpret_cast<uint8_t*>(data); int out_size = size; @@ -161,10 +162,11 @@ int segments = (kTestData.length() / 3) * 2; int remaining_chars = kTestData.length() % 3; if (remaining_chars) { - if (remaining_chars == 1) + if (remaining_chars == 1) { ++segments; - else + } else { segments += 2; + } } CompoundBuffer* result = new CompoundBuffer();
diff --git a/remoting/base/directory_service_client.cc b/remoting/base/directory_service_client.cc index 13f3c2e..ddbbc644 100644 --- a/remoting/base/directory_service_client.cc +++ b/remoting/base/directory_service_client.cc
@@ -4,7 +4,7 @@ #include "remoting/base/directory_service_client.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "remoting/base/protobuf_http_request.h" #include "remoting/base/protobuf_http_request_config.h" #include "remoting/base/service_urls.h"
diff --git a/remoting/base/directory_service_client.h b/remoting/base/directory_service_client.h index 8b03bb0..964178f 100644 --- a/remoting/base/directory_service_client.h +++ b/remoting/base/directory_service_client.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "remoting/base/protobuf_http_client.h" namespace google {
diff --git a/remoting/base/dispatch_win.h b/remoting/base/dispatch_win.h index 47d2efb..63e719d 100644 --- a/remoting/base/dispatch_win.h +++ b/remoting/base/dispatch_win.h
@@ -40,16 +40,12 @@ // a pointer to an array of |VARIANTARG| structures. class ScopedVariantArg : public VARIANTARG { public: - ScopedVariantArg() { - vt = VT_EMPTY; - } + ScopedVariantArg() { vt = VT_EMPTY; } ScopedVariantArg(const ScopedVariantArg&) = delete; ScopedVariantArg& operator=(const ScopedVariantArg&) = delete; - ~ScopedVariantArg() { - VariantClear(this); - } + ~ScopedVariantArg() { VariantClear(this); } // Wrap() routines pack the input parameters into VARIANTARG structures so // that they can be passed to IDispatch::Invoke. @@ -59,7 +55,7 @@ return VariantCopy(this, ¶m); } - HRESULT Wrap(VARIANT* const & param) { + HRESULT Wrap(VARIANT* const& param) { DCHECK(vt == VT_EMPTY); // Make the input value of an [in] [out] parameter visible to @@ -79,7 +75,7 @@ // Do nothing for an [in] parameter. } - void Unwrap(VARIANT* const & param_out) { + void Unwrap(VARIANT* const& param_out) { // Return the output value of an [in] [out] parameter to the caller. Swap(param_out); } @@ -119,27 +115,28 @@ HRESULT Invoke(IDispatch* object, LPCOLESTR const_name, WORD flags, - VARIANT* const & result_out) { + VARIANT* const& result_out) { // Retrieve the ID of the method to be called. DISPID disp_id; LPOLESTR name = const_cast<LPOLESTR>(const_name); - HRESULT hr = object->GetIDsOfNames( - IID_NULL, &name, 1, LOCALE_USER_DEFAULT, &disp_id); - if (FAILED(hr)) + HRESULT hr = + object->GetIDsOfNames(IID_NULL, &name, 1, LOCALE_USER_DEFAULT, &disp_id); + if (FAILED(hr)) { return hr; + } // Request the return value if asked by the caller. internal::ScopedVariantArg result; VARIANT* disp_result = NULL; - if (result_out != NULL) + if (result_out != NULL) { disp_result = &result; - + } // Invoke the method passing the parameters via the DISPPARAMS structure. // DISPATCH_PROPERTYPUT and DISPATCH_PROPERTYPUTREF require the parameter of // the property setter to be named, so |cNamedArgs| and |rgdispidNamedArgs| // structure members should be initialized. - DISPPARAMS disp_params = { NULL, NULL, 0, 0 }; + DISPPARAMS disp_params = {NULL, NULL, 0, 0}; DISPID dispid_named = DISPID_PROPERTYPUT; if (flags == DISPATCH_PROPERTYPUT || flags == DISPATCH_PROPERTYPUTREF) { disp_params.cNamedArgs = 1; @@ -148,9 +145,9 @@ hr = object->Invoke(disp_id, IID_NULL, LOCALE_USER_DEFAULT, flags, &disp_params, disp_result, NULL, NULL); - if (FAILED(hr)) + if (FAILED(hr)) { return hr; - + } // Unwrap the return value. if (result_out != NULL) { @@ -165,32 +162,35 @@ LPCOLESTR const_name, WORD flags, const P1& p1, - VARIANT* const & result_out) { + VARIANT* const& result_out) { // Retrieve the ID of the method to be called. DISPID disp_id; LPOLESTR name = const_cast<LPOLESTR>(const_name); - HRESULT hr = object->GetIDsOfNames( - IID_NULL, &name, 1, LOCALE_USER_DEFAULT, &disp_id); - if (FAILED(hr)) + HRESULT hr = + object->GetIDsOfNames(IID_NULL, &name, 1, LOCALE_USER_DEFAULT, &disp_id); + if (FAILED(hr)) { return hr; + } // Request the return value if asked by the caller. internal::ScopedVariantArg result; VARIANT* disp_result = NULL; - if (result_out != NULL) + if (result_out != NULL) { disp_result = &result; + } // Wrap the parameters into an array of VARIANT structures. internal::ScopedVariantArg disp_args[1]; hr = disp_args[1 - 1].Wrap(p1); - if (FAILED(hr)) + if (FAILED(hr)) { return hr; + } // Invoke the method passing the parameters via the DISPPARAMS structure. // DISPATCH_PROPERTYPUT and DISPATCH_PROPERTYPUTREF require the parameter of // the property setter to be named, so |cNamedArgs| and |rgdispidNamedArgs| // structure members should be initialized. - DISPPARAMS disp_params = { disp_args, NULL, 1, 0 }; + DISPPARAMS disp_params = {disp_args, NULL, 1, 0}; DISPID dispid_named = DISPID_PROPERTYPUT; if (flags == DISPATCH_PROPERTYPUT || flags == DISPATCH_PROPERTYPUTREF) { disp_params.cNamedArgs = 1; @@ -199,8 +199,9 @@ hr = object->Invoke(disp_id, IID_NULL, LOCALE_USER_DEFAULT, flags, &disp_params, disp_result, NULL, NULL); - if (FAILED(hr)) + if (FAILED(hr)) { return hr; + } // Unwrap the parameters. disp_args[1 - 1].Unwrap(p1); @@ -219,35 +220,39 @@ WORD flags, const P1& p1, const P2& p2, - VARIANT* const & result_out) { + VARIANT* const& result_out) { // Retrieve the ID of the method to be called. DISPID disp_id; LPOLESTR name = const_cast<LPOLESTR>(const_name); - HRESULT hr = object->GetIDsOfNames( - IID_NULL, &name, 1, LOCALE_USER_DEFAULT, &disp_id); - if (FAILED(hr)) + HRESULT hr = + object->GetIDsOfNames(IID_NULL, &name, 1, LOCALE_USER_DEFAULT, &disp_id); + if (FAILED(hr)) { return hr; + } // Request the return value if asked by the caller. internal::ScopedVariantArg result; VARIANT* disp_result = NULL; - if (result_out != NULL) + if (result_out != NULL) { disp_result = &result; + } // Wrap the parameters into an array of VARIANT structures. internal::ScopedVariantArg disp_args[2]; hr = disp_args[2 - 1].Wrap(p1); - if (FAILED(hr)) + if (FAILED(hr)) { return hr; + } hr = disp_args[2 - 2].Wrap(p2); - if (FAILED(hr)) + if (FAILED(hr)) { return hr; + } // Invoke the method passing the parameters via the DISPPARAMS structure. // DISPATCH_PROPERTYPUT and DISPATCH_PROPERTYPUTREF require the parameter of // the property setter to be named, so |cNamedArgs| and |rgdispidNamedArgs| // structure members should be initialized. - DISPPARAMS disp_params = { disp_args, NULL, 2, 0 }; + DISPPARAMS disp_params = {disp_args, NULL, 2, 0}; DISPID dispid_named = DISPID_PROPERTYPUT; if (flags == DISPATCH_PROPERTYPUT || flags == DISPATCH_PROPERTYPUTREF) { disp_params.cNamedArgs = 1; @@ -256,8 +261,9 @@ hr = object->Invoke(disp_id, IID_NULL, LOCALE_USER_DEFAULT, flags, &disp_params, disp_result, NULL, NULL); - if (FAILED(hr)) + if (FAILED(hr)) { return hr; + } // Unwrap the parameters. disp_args[2 - 1].Unwrap(p1); @@ -278,38 +284,43 @@ const P1& p1, const P2& p2, const P3& p3, - VARIANT* const & result_out) { + VARIANT* const& result_out) { // Retrieve the ID of the method to be called. DISPID disp_id; LPOLESTR name = const_cast<LPOLESTR>(const_name); - HRESULT hr = object->GetIDsOfNames( - IID_NULL, &name, 1, LOCALE_USER_DEFAULT, &disp_id); - if (FAILED(hr)) + HRESULT hr = + object->GetIDsOfNames(IID_NULL, &name, 1, LOCALE_USER_DEFAULT, &disp_id); + if (FAILED(hr)) { return hr; + } // Request the return value if asked by the caller. internal::ScopedVariantArg result; VARIANT* disp_result = NULL; - if (result_out != NULL) + if (result_out != NULL) { disp_result = &result; + } // Wrap the parameters into an array of VARIANT structures. internal::ScopedVariantArg disp_args[3]; hr = disp_args[3 - 1].Wrap(p1); - if (FAILED(hr)) + if (FAILED(hr)) { return hr; + } hr = disp_args[3 - 2].Wrap(p2); - if (FAILED(hr)) + if (FAILED(hr)) { return hr; + } hr = disp_args[3 - 3].Wrap(p3); - if (FAILED(hr)) + if (FAILED(hr)) { return hr; + } // Invoke the method passing the parameters via the DISPPARAMS structure. // DISPATCH_PROPERTYPUT and DISPATCH_PROPERTYPUTREF require the parameter of // the property setter to be named, so |cNamedArgs| and |rgdispidNamedArgs| // structure members should be initialized. - DISPPARAMS disp_params = { disp_args, NULL, 3, 0 }; + DISPPARAMS disp_params = {disp_args, NULL, 3, 0}; DISPID dispid_named = DISPID_PROPERTYPUT; if (flags == DISPATCH_PROPERTYPUT || flags == DISPATCH_PROPERTYPUTREF) { disp_params.cNamedArgs = 1; @@ -318,8 +329,9 @@ hr = object->Invoke(disp_id, IID_NULL, LOCALE_USER_DEFAULT, flags, &disp_params, disp_result, NULL, NULL); - if (FAILED(hr)) + if (FAILED(hr)) { return hr; + } // Unwrap the parameters. disp_args[3 - 1].Unwrap(p1); @@ -342,41 +354,47 @@ const P2& p2, const P3& p3, const P4& p4, - VARIANT* const & result_out) { + VARIANT* const& result_out) { // Retrieve the ID of the method to be called. DISPID disp_id; LPOLESTR name = const_cast<LPOLESTR>(const_name); - HRESULT hr = object->GetIDsOfNames( - IID_NULL, &name, 1, LOCALE_USER_DEFAULT, &disp_id); - if (FAILED(hr)) + HRESULT hr = + object->GetIDsOfNames(IID_NULL, &name, 1, LOCALE_USER_DEFAULT, &disp_id); + if (FAILED(hr)) { return hr; + } // Request the return value if asked by the caller. internal::ScopedVariantArg result; VARIANT* disp_result = NULL; - if (result_out != NULL) + if (result_out != NULL) { disp_result = &result; + } // Wrap the parameters into an array of VARIANT structures. internal::ScopedVariantArg disp_args[4]; hr = disp_args[4 - 1].Wrap(p1); - if (FAILED(hr)) + if (FAILED(hr)) { return hr; + } hr = disp_args[4 - 2].Wrap(p2); - if (FAILED(hr)) + if (FAILED(hr)) { return hr; + } hr = disp_args[4 - 3].Wrap(p3); - if (FAILED(hr)) + if (FAILED(hr)) { return hr; + } hr = disp_args[4 - 4].Wrap(p4); - if (FAILED(hr)) + if (FAILED(hr)) { return hr; + } // Invoke the method passing the parameters via the DISPPARAMS structure. // DISPATCH_PROPERTYPUT and DISPATCH_PROPERTYPUTREF require the parameter of // the property setter to be named, so |cNamedArgs| and |rgdispidNamedArgs| // structure members should be initialized. - DISPPARAMS disp_params = { disp_args, NULL, 4, 0 }; + DISPPARAMS disp_params = {disp_args, NULL, 4, 0}; DISPID dispid_named = DISPID_PROPERTYPUT; if (flags == DISPATCH_PROPERTYPUT || flags == DISPATCH_PROPERTYPUTREF) { disp_params.cNamedArgs = 1; @@ -385,8 +403,9 @@ hr = object->Invoke(disp_id, IID_NULL, LOCALE_USER_DEFAULT, flags, &disp_params, disp_result, NULL, NULL); - if (FAILED(hr)) + if (FAILED(hr)) { return hr; + } // Unwrap the parameters. disp_args[4 - 1].Unwrap(p1); @@ -411,44 +430,51 @@ const P3& p3, const P4& p4, const P5& p5, - VARIANT* const & result_out) { + VARIANT* const& result_out) { // Retrieve the ID of the method to be called. DISPID disp_id; LPOLESTR name = const_cast<LPOLESTR>(const_name); - HRESULT hr = object->GetIDsOfNames( - IID_NULL, &name, 1, LOCALE_USER_DEFAULT, &disp_id); - if (FAILED(hr)) + HRESULT hr = + object->GetIDsOfNames(IID_NULL, &name, 1, LOCALE_USER_DEFAULT, &disp_id); + if (FAILED(hr)) { return hr; + } // Request the return value if asked by the caller. internal::ScopedVariantArg result; VARIANT* disp_result = NULL; - if (result_out != NULL) + if (result_out != NULL) { disp_result = &result; + } // Wrap the parameters into an array of VARIANT structures. internal::ScopedVariantArg disp_args[5]; hr = disp_args[5 - 1].Wrap(p1); - if (FAILED(hr)) + if (FAILED(hr)) { return hr; + } hr = disp_args[5 - 2].Wrap(p2); - if (FAILED(hr)) + if (FAILED(hr)) { return hr; + } hr = disp_args[5 - 3].Wrap(p3); - if (FAILED(hr)) + if (FAILED(hr)) { return hr; + } hr = disp_args[5 - 4].Wrap(p4); - if (FAILED(hr)) + if (FAILED(hr)) { return hr; + } hr = disp_args[5 - 5].Wrap(p5); - if (FAILED(hr)) + if (FAILED(hr)) { return hr; + } // Invoke the method passing the parameters via the DISPPARAMS structure. // DISPATCH_PROPERTYPUT and DISPATCH_PROPERTYPUTREF require the parameter of // the property setter to be named, so |cNamedArgs| and |rgdispidNamedArgs| // structure members should be initialized. - DISPPARAMS disp_params = { disp_args, NULL, 5, 0 }; + DISPPARAMS disp_params = {disp_args, NULL, 5, 0}; DISPID dispid_named = DISPID_PROPERTYPUT; if (flags == DISPATCH_PROPERTYPUT || flags == DISPATCH_PROPERTYPUTREF) { disp_params.cNamedArgs = 1; @@ -457,8 +483,9 @@ hr = object->Invoke(disp_id, IID_NULL, LOCALE_USER_DEFAULT, flags, &disp_params, disp_result, NULL, NULL); - if (FAILED(hr)) + if (FAILED(hr)) { return hr; + } // Unwrap the parameters. disp_args[5 - 1].Unwrap(p1); @@ -475,8 +502,12 @@ return S_OK; } -template <typename P1, typename P2, typename P3, typename P4, typename P5, - typename P6> +template <typename P1, + typename P2, + typename P3, + typename P4, + typename P5, + typename P6> HRESULT Invoke(IDispatch* object, LPCOLESTR const_name, WORD flags, @@ -486,47 +517,55 @@ const P4& p4, const P5& p5, const P6& p6, - VARIANT* const & result_out) { + VARIANT* const& result_out) { // Retrieve the ID of the method to be called. DISPID disp_id; LPOLESTR name = const_cast<LPOLESTR>(const_name); - HRESULT hr = object->GetIDsOfNames( - IID_NULL, &name, 1, LOCALE_USER_DEFAULT, &disp_id); - if (FAILED(hr)) + HRESULT hr = + object->GetIDsOfNames(IID_NULL, &name, 1, LOCALE_USER_DEFAULT, &disp_id); + if (FAILED(hr)) { return hr; + } // Request the return value if asked by the caller. internal::ScopedVariantArg result; VARIANT* disp_result = NULL; - if (result_out != NULL) + if (result_out != NULL) { disp_result = &result; + } // Wrap the parameters into an array of VARIANT structures. internal::ScopedVariantArg disp_args[6]; hr = disp_args[6 - 1].Wrap(p1); - if (FAILED(hr)) + if (FAILED(hr)) { return hr; + } hr = disp_args[6 - 2].Wrap(p2); - if (FAILED(hr)) + if (FAILED(hr)) { return hr; + } hr = disp_args[6 - 3].Wrap(p3); - if (FAILED(hr)) + if (FAILED(hr)) { return hr; + } hr = disp_args[6 - 4].Wrap(p4); - if (FAILED(hr)) + if (FAILED(hr)) { return hr; + } hr = disp_args[6 - 5].Wrap(p5); - if (FAILED(hr)) + if (FAILED(hr)) { return hr; + } hr = disp_args[6 - 6].Wrap(p6); - if (FAILED(hr)) + if (FAILED(hr)) { return hr; + } // Invoke the method passing the parameters via the DISPPARAMS structure. // DISPATCH_PROPERTYPUT and DISPATCH_PROPERTYPUTREF require the parameter of // the property setter to be named, so |cNamedArgs| and |rgdispidNamedArgs| // structure members should be initialized. - DISPPARAMS disp_params = { disp_args, NULL, 6, 0 }; + DISPPARAMS disp_params = {disp_args, NULL, 6, 0}; DISPID dispid_named = DISPID_PROPERTYPUT; if (flags == DISPATCH_PROPERTYPUT || flags == DISPATCH_PROPERTYPUTREF) { disp_params.cNamedArgs = 1; @@ -535,8 +574,9 @@ hr = object->Invoke(disp_id, IID_NULL, LOCALE_USER_DEFAULT, flags, &disp_params, disp_result, NULL, NULL); - if (FAILED(hr)) + if (FAILED(hr)) { return hr; + } // Unwrap the parameters. disp_args[6 - 1].Unwrap(p1); @@ -554,8 +594,13 @@ return S_OK; } -template <typename P1, typename P2, typename P3, typename P4, typename P5, - typename P6, typename P7> +template <typename P1, + typename P2, + typename P3, + typename P4, + typename P5, + typename P6, + typename P7> HRESULT Invoke(IDispatch* object, LPCOLESTR const_name, WORD flags, @@ -566,50 +611,59 @@ const P5& p5, const P6& p6, const P7& p7, - VARIANT* const & result_out) { + VARIANT* const& result_out) { // Retrieve the ID of the method to be called. DISPID disp_id; LPOLESTR name = const_cast<LPOLESTR>(const_name); - HRESULT hr = object->GetIDsOfNames( - IID_NULL, &name, 1, LOCALE_USER_DEFAULT, &disp_id); - if (FAILED(hr)) + HRESULT hr = + object->GetIDsOfNames(IID_NULL, &name, 1, LOCALE_USER_DEFAULT, &disp_id); + if (FAILED(hr)) { return hr; + } // Request the return value if asked by the caller. internal::ScopedVariantArg result; VARIANT* disp_result = NULL; - if (result_out != NULL) + if (result_out != NULL) { disp_result = &result; + } // Wrap the parameters into an array of VARIANT structures. internal::ScopedVariantArg disp_args[7]; hr = disp_args[7 - 1].Wrap(p1); - if (FAILED(hr)) + if (FAILED(hr)) { return hr; + } hr = disp_args[7 - 2].Wrap(p2); - if (FAILED(hr)) + if (FAILED(hr)) { return hr; + } hr = disp_args[7 - 3].Wrap(p3); - if (FAILED(hr)) + if (FAILED(hr)) { return hr; + } hr = disp_args[7 - 4].Wrap(p4); - if (FAILED(hr)) + if (FAILED(hr)) { return hr; + } hr = disp_args[7 - 5].Wrap(p5); - if (FAILED(hr)) + if (FAILED(hr)) { return hr; + } hr = disp_args[7 - 6].Wrap(p6); - if (FAILED(hr)) + if (FAILED(hr)) { return hr; + } hr = disp_args[7 - 7].Wrap(p7); - if (FAILED(hr)) + if (FAILED(hr)) { return hr; + } // Invoke the method passing the parameters via the DISPPARAMS structure. // DISPATCH_PROPERTYPUT and DISPATCH_PROPERTYPUTREF require the parameter of // the property setter to be named, so |cNamedArgs| and |rgdispidNamedArgs| // structure members should be initialized. - DISPPARAMS disp_params = { disp_args, NULL, 7, 0 }; + DISPPARAMS disp_params = {disp_args, NULL, 7, 0}; DISPID dispid_named = DISPID_PROPERTYPUT; if (flags == DISPATCH_PROPERTYPUT || flags == DISPATCH_PROPERTYPUTREF) { disp_params.cNamedArgs = 1; @@ -618,8 +672,9 @@ hr = object->Invoke(disp_id, IID_NULL, LOCALE_USER_DEFAULT, flags, &disp_params, disp_result, NULL, NULL); - if (FAILED(hr)) + if (FAILED(hr)) { return hr; + } // Unwrap the parameters. disp_args[7 - 1].Unwrap(p1); @@ -638,8 +693,8 @@ return S_OK; } -} // namespace dispatch +} // namespace dispatch -} // namespace remoting +} // namespace remoting #endif // REMOTING_BASE_DISPATCH_WIN_H_
diff --git a/remoting/base/fake_oauth_token_getter.cc b/remoting/base/fake_oauth_token_getter.cc index 7e495b56..ba62afd 100644 --- a/remoting/base/fake_oauth_token_getter.cc +++ b/remoting/base/fake_oauth_token_getter.cc
@@ -4,7 +4,7 @@ #include "remoting/base/fake_oauth_token_getter.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/task/single_thread_task_runner.h"
diff --git a/remoting/base/fake_oauth_token_getter.h b/remoting/base/fake_oauth_token_getter.h index 6651dd0..ef9bda5 100644 --- a/remoting/base/fake_oauth_token_getter.h +++ b/remoting/base/fake_oauth_token_getter.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "remoting/base/oauth_token_getter.h" namespace remoting {
diff --git a/remoting/base/leaky_bucket.cc b/remoting/base/leaky_bucket.cc index 2be21bd..8e0d358 100644 --- a/remoting/base/leaky_bucket.cc +++ b/remoting/base/leaky_bucket.cc
@@ -4,7 +4,6 @@ #include "remoting/base/leaky_bucket.h" - namespace remoting { LeakyBucket::LeakyBucket(int depth, int rate) @@ -19,8 +18,9 @@ UpdateLevel(now); int new_level = current_level_ + drops; - if (depth_ >= 0 && new_level > depth_) + if (depth_ >= 0 && new_level > depth_) { return false; + } current_level_ = new_level; return true; }
diff --git a/remoting/base/name_value_map.h b/remoting/base/name_value_map.h index bf202500..b2cc5d75 100644 --- a/remoting/base/name_value_map.h +++ b/remoting/base/name_value_map.h
@@ -22,8 +22,9 @@ template <typename T, size_t N> const char* ValueToNameUnchecked(const NameMapElement<T> (&map)[N], T value) { for (size_t i = 0; i < N; ++i) { - if (map[i].value == value) + if (map[i].value == value) { return map[i].name; + } } return nullptr; }
diff --git a/remoting/base/oauth_client.h b/remoting/base/oauth_client.h index 05bf085d..46ca52a 100644 --- a/remoting/base/oauth_client.h +++ b/remoting/base/oauth_client.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" namespace gaia { struct OAuthClientInfo;
diff --git a/remoting/base/oauth_token_getter.h b/remoting/base/oauth_token_getter.h index c2db610b..24f6efd 100644 --- a/remoting/base/oauth_token_getter.h +++ b/remoting/base/oauth_token_getter.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" namespace remoting {
diff --git a/remoting/base/oauth_token_getter_impl.cc b/remoting/base/oauth_token_getter_impl.cc index db6155e..4e55293 100644 --- a/remoting/base/oauth_token_getter_impl.cc +++ b/remoting/base/oauth_token_getter_impl.cc
@@ -7,9 +7,9 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/containers/queue.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/strings/string_util.h" #include "google_apis/google_api_keys.h" #include "remoting/base/logging.h"
diff --git a/remoting/base/oauth_token_getter_impl.h b/remoting/base/oauth_token_getter_impl.h index e3cf7d5..62d3314 100644 --- a/remoting/base/oauth_token_getter_impl.h +++ b/remoting/base/oauth_token_getter_impl.h
@@ -5,8 +5,8 @@ #ifndef REMOTING_BASE_OAUTH_TOKEN_GETTER_IMPL_H_ #define REMOTING_BASE_OAUTH_TOKEN_GETTER_IMPL_H_ -#include "base/callback.h" #include "base/containers/queue.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "base/sequence_checker.h" #include "base/time/time.h"
diff --git a/remoting/base/oauth_token_getter_proxy.cc b/remoting/base/oauth_token_getter_proxy.cc index eab28a2..6f57133 100644 --- a/remoting/base/oauth_token_getter_proxy.cc +++ b/remoting/base/oauth_token_getter_proxy.cc
@@ -4,7 +4,7 @@ #include "remoting/base/oauth_token_getter_proxy.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/task/sequenced_task_runner.h" #include "base/task/single_thread_task_runner.h" #include "base/threading/thread_checker.h"
diff --git a/remoting/base/oauth_token_getter_proxy.h b/remoting/base/oauth_token_getter_proxy.h index cb10f43..9053cb8 100644 --- a/remoting/base/oauth_token_getter_proxy.h +++ b/remoting/base/oauth_token_getter_proxy.h
@@ -5,7 +5,7 @@ #ifndef REMOTING_BASE_OAUTH_TOKEN_GETTER_PROXY_H_ #define REMOTING_BASE_OAUTH_TOKEN_GETTER_PROXY_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h" #include "remoting/base/oauth_token_getter.h"
diff --git a/remoting/base/oauth_token_getter_proxy_unittest.cc b/remoting/base/oauth_token_getter_proxy_unittest.cc index 61a88a3..7eb919d2 100644 --- a/remoting/base/oauth_token_getter_proxy_unittest.cc +++ b/remoting/base/oauth_token_getter_proxy_unittest.cc
@@ -4,9 +4,9 @@ #include "remoting/base/oauth_token_getter_proxy.h" -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/memory/weak_ptr.h" #include "base/run_loop.h" #include "base/test/task_environment.h"
diff --git a/remoting/base/passthrough_oauth_token_getter.cc b/remoting/base/passthrough_oauth_token_getter.cc index 8a8ed3e..8369ac6 100644 --- a/remoting/base/passthrough_oauth_token_getter.cc +++ b/remoting/base/passthrough_oauth_token_getter.cc
@@ -4,7 +4,7 @@ #include "remoting/base/passthrough_oauth_token_getter.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/task/sequenced_task_runner.h" namespace remoting {
diff --git a/remoting/base/protobuf_http_client_unittest.cc b/remoting/base/protobuf_http_client_unittest.cc index e1b14ebb..2434974f 100644 --- a/remoting/base/protobuf_http_client_unittest.cc +++ b/remoting/base/protobuf_http_client_unittest.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "base/test/bind.h" #include "base/test/gmock_callback_support.h"
diff --git a/remoting/base/protobuf_http_request.h b/remoting/base/protobuf_http_request.h index 1c7d2e5..ef37da6c 100644 --- a/remoting/base/protobuf_http_request.h +++ b/remoting/base/protobuf_http_request.h
@@ -5,8 +5,8 @@ #ifndef REMOTING_BASE_PROTOBUF_HTTP_REQUEST_H_ #define REMOTING_BASE_PROTOBUF_HTTP_REQUEST_H_ -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "remoting/base/protobuf_http_request_base.h"
diff --git a/remoting/base/protobuf_http_request_base.h b/remoting/base/protobuf_http_request_base.h index 8245ddb..6ad40ec 100644 --- a/remoting/base/protobuf_http_request_base.h +++ b/remoting/base/protobuf_http_request_base.h
@@ -8,8 +8,8 @@ #include <memory> #include <string> -#include "base/callback.h" #include "base/dcheck_is_on.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "base/time/time.h" #include "remoting/base/protobuf_http_status.h"
diff --git a/remoting/base/protobuf_http_stream_parser.h b/remoting/base/protobuf_http_stream_parser.h index 0a5a7349..e1cb2caf2 100644 --- a/remoting/base/protobuf_http_stream_parser.h +++ b/remoting/base/protobuf_http_stream_parser.h
@@ -5,7 +5,7 @@ #ifndef REMOTING_BASE_PROTOBUF_HTTP_STREAM_PARSER_H_ #define REMOTING_BASE_PROTOBUF_HTTP_STREAM_PARSER_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h" #include "base/strings/string_piece_forward.h"
diff --git a/remoting/base/protobuf_http_stream_parser_fuzzer.cc b/remoting/base/protobuf_http_stream_parser_fuzzer.cc index 352fda20..1858aa4 100644 --- a/remoting/base/protobuf_http_stream_parser_fuzzer.cc +++ b/remoting/base/protobuf_http_stream_parser_fuzzer.cc
@@ -42,8 +42,9 @@ /*message_callback=*/base::DoNothing(), /*stream_closed_callback=*/base::BindLambdaForTesting(on_stream_closed)); - while (parser && provider.remaining_bytes() > 0) + while (parser && provider.remaining_bytes() > 0) { parser->Append(provider.ConsumeRandomLengthString()); + } return 0; }
diff --git a/remoting/base/protobuf_http_stream_request.cc b/remoting/base/protobuf_http_stream_request.cc index 352b29a3..b0e9cde 100644 --- a/remoting/base/protobuf_http_stream_request.cc +++ b/remoting/base/protobuf_http_stream_request.cc
@@ -4,7 +4,7 @@ #include "remoting/base/protobuf_http_stream_request.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/time/time.h" #include "remoting/base/protobuf_http_client.h"
diff --git a/remoting/base/protobuf_http_stream_request.h b/remoting/base/protobuf_http_stream_request.h index dc542ed..07697a7 100644 --- a/remoting/base/protobuf_http_stream_request.h +++ b/remoting/base/protobuf_http_stream_request.h
@@ -5,8 +5,8 @@ #ifndef REMOTING_BASE_PROTOBUF_HTTP_STREAM_REQUEST_H_ #define REMOTING_BASE_PROTOBUF_HTTP_STREAM_REQUEST_H_ -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/timer/timer.h" #include "remoting/base/protobuf_http_request_base.h"
diff --git a/remoting/base/queued_task_poster.cc b/remoting/base/queued_task_poster.cc index 21eb354..310175c 100644 --- a/remoting/base/queued_task_poster.cc +++ b/remoting/base/queued_task_poster.cc
@@ -4,8 +4,8 @@ #include "remoting/base/queued_task_poster.h" -#include "base/bind.h" #include "base/check.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/task/single_thread_task_runner.h"
diff --git a/remoting/base/queued_task_poster.h b/remoting/base/queued_task_poster.h index 087bf37..401201d 100644 --- a/remoting/base/queued_task_poster.h +++ b/remoting/base/queued_task_poster.h
@@ -5,8 +5,8 @@ #ifndef REMOTING_BASE_QUEUED_TASK_POSTER_H_ #define REMOTING_BASE_QUEUED_TASK_POSTER_H_ -#include "base/callback.h" #include "base/containers/queue.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h" #include "base/task/single_thread_task_runner.h"
diff --git a/remoting/base/queued_task_poster_unittest.cc b/remoting/base/queued_task_poster_unittest.cc index 9bf2a73e..0ab9eb09 100644 --- a/remoting/base/queued_task_poster_unittest.cc +++ b/remoting/base/queued_task_poster_unittest.cc
@@ -6,8 +6,8 @@ #include <memory> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ref_counted.h" #include "base/run_loop.h" #include "base/task/single_thread_task_runner.h"
diff --git a/remoting/base/rate_counter.cc b/remoting/base/rate_counter.cc index bce2878..cc78db2 100644 --- a/remoting/base/rate_counter.cc +++ b/remoting/base/rate_counter.cc
@@ -39,8 +39,9 @@ base::TimeTicks window_start = now - time_window_; while (!data_points_.empty()) { - if (data_points_.front().first > window_start) + if (data_points_.front().first > window_start) { break; + } sum_ -= data_points_.front().second; data_points_.pop();
diff --git a/remoting/base/rate_counter_unittest.cc b/remoting/base/rate_counter_unittest.cc index 1b70fd5..e7bdb89 100644 --- a/remoting/base/rate_counter_unittest.cc +++ b/remoting/base/rate_counter_unittest.cc
@@ -12,7 +12,7 @@ namespace remoting { -static const int64_t kTestValues[] = { 10, 20, 30, 10, 25, 16, 15 }; +static const int64_t kTestValues[] = {10, 20, 30, 10, 25, 16, 15}; // One second window and one sample per second, so rate equals each sample. TEST(RateCounterTest, OneSecondWindow) { @@ -60,8 +60,9 @@ tick_clock.Advance(base::Seconds(1)); rate_counter.Record(kTestValues[i]); double expected = kTestValues[i]; - if (i > 0) - expected += kTestValues[i-1]; + if (i > 0) { + expected += kTestValues[i - 1]; + } expected /= 2; EXPECT_EQ(expected, rate_counter.Rate()); } @@ -82,8 +83,9 @@ for (size_t i = 0; i < std::size(kTestValues); ++i) { tick_clock.Advance(base::Seconds(1)); rate_counter.Record(kTestValues[i]); - if (i != 0) + if (i != 0) { expected += kTestValues[i]; + } } expected /= kWindowSeconds;
diff --git a/remoting/base/result.h b/remoting/base/result.h index 7871966..80a36d9 100644 --- a/remoting/base/result.h +++ b/remoting/base/result.h
@@ -586,10 +586,10 @@ // state of the result, passing the value of the corresponding state. template < typename Visitor, - typename SuccessReturn = decltype( - std::declval<Visitor>().success(std::declval<const SuccessType&>())), - typename ErrorReturn = decltype( - std::declval<Visitor>().error(std::declval<const ErrorType&>())), + typename SuccessReturn = decltype(std::declval<Visitor>().success( + std::declval<const SuccessType&>())), + typename ErrorReturn = decltype(std::declval<Visitor>().error( + std::declval<const ErrorType&>())), typename std::enable_if<std::is_same<SuccessReturn, ErrorReturn>::value, int>::type = 0> SuccessReturn Visit(Visitor&& visitor) const& { @@ -602,8 +602,8 @@ template < typename Visitor, - typename SuccessReturn = decltype( - std::declval<Visitor>().success(std::declval<SuccessType&>())), + typename SuccessReturn = decltype(std::declval<Visitor>().success( + std::declval<SuccessType&>())), typename ErrorReturn = decltype(std::declval<Visitor>().error(std::declval<ErrorType&>())), typename std::enable_if<std::is_same<SuccessReturn, ErrorReturn>::value, @@ -618,8 +618,8 @@ template < typename Visitor, - typename SuccessReturn = decltype( - std::declval<Visitor>().success(std::declval<SuccessType&&>())), + typename SuccessReturn = decltype(std::declval<Visitor>().success( + std::declval<SuccessType&&>())), typename ErrorReturn = decltype(std::declval<Visitor>().error(std::declval<ErrorType&&>())), typename std::enable_if<std::is_same<SuccessReturn, ErrorReturn>::value,
diff --git a/remoting/base/run_all_unittests.cc b/remoting/base/run_all_unittests.cc index 3e66fa0e..1335f10 100644 --- a/remoting/base/run_all_unittests.cc +++ b/remoting/base/run_all_unittests.cc
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/bind.h" #include "base/compiler_specific.h" +#include "base/functional/bind.h" #include "base/message_loop/message_pump_type.h" #include "base/path_service.h" #include "base/test/launcher/unit_test_launcher.h"
diff --git a/remoting/base/running_samples.cc b/remoting/base/running_samples.cc index 6e66f2d..364aad8 100644 --- a/remoting/base/running_samples.cc +++ b/remoting/base/running_samples.cc
@@ -10,8 +10,7 @@ namespace remoting { -RunningSamples::RunningSamples(int window_size) - : window_size_(window_size) { +RunningSamples::RunningSamples(int window_size) : window_size_(window_size) { DCHECK_GT(window_size, 0); } @@ -34,16 +33,18 @@ double RunningSamples::Average() const { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); - if (data_points_.empty()) + if (data_points_.empty()) { return 0; + } return static_cast<double>(sum_) / data_points_.size(); } int64_t RunningSamples::Max() const { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); - if (data_points_.empty()) + if (data_points_.empty()) { return 0; + } return *std::max_element(data_points_.begin(), data_points_.end()); }
diff --git a/remoting/base/running_samples_unittest.cc b/remoting/base/running_samples_unittest.cc index 3bd4c31..268fe843 100644 --- a/remoting/base/running_samples_unittest.cc +++ b/remoting/base/running_samples_unittest.cc
@@ -13,7 +13,7 @@ typedef void (*TestFunction)(size_t i, RunningSamples& samples); -static const int64_t kTestValues[] = { 10, 20, 30, 10, 25, 16, 15 }; +static const int64_t kTestValues[] = {10, 20, 30, 10, 25, 16, 15}; // Test framework that verifies average() and max() at beginning, iterates // through all elements and meanwhile calls your own test function @@ -39,8 +39,9 @@ TEST(RunningSamplesTest, AverageTwoElementWindow) { TestFramework(2, [](size_t i, RunningSamples& samples) { double expected = kTestValues[i]; - if (i > 0) - expected = (expected + kTestValues[i-1]) / 2; + if (i > 0) { + expected = (expected + kTestValues[i - 1]) / 2; + } EXPECT_EQ(expected, samples.Average()); }); @@ -51,8 +52,9 @@ TestFramework(std::size(kTestValues) + 1, [](size_t i, RunningSamples& samples) { double expected = 0.0; - for (size_t j = 0; j <= i; ++j) + for (size_t j = 0; j <= i; ++j) { expected += kTestValues[j]; + } expected /= i + 1; EXPECT_EQ(expected, samples.Average()); @@ -70,8 +72,9 @@ TEST(RunningSamplesTest, MaxTwoElementWindow) { TestFramework(2, [](size_t i, RunningSamples& samples) { double expected = kTestValues[i]; - if (i > 0) - expected = expected > kTestValues[i-1] ? expected : kTestValues[i-1]; + if (i > 0) { + expected = expected > kTestValues[i - 1] ? expected : kTestValues[i - 1]; + } EXPECT_EQ(expected, samples.Max()); }); @@ -82,8 +85,9 @@ TestFramework( std::size(kTestValues) + 1, [](size_t i, RunningSamples& samples) { int64_t expected = -1; - for (size_t j = 0; j <= i; ++j) + for (size_t j = 0; j <= i; ++j) { expected = expected > kTestValues[j] ? expected : kTestValues[j]; + } EXPECT_EQ(expected, samples.Max()); });
diff --git a/remoting/base/scoped_protobuf_http_request.h b/remoting/base/scoped_protobuf_http_request.h index 10a1e136..2d33cec 100644 --- a/remoting/base/scoped_protobuf_http_request.h +++ b/remoting/base/scoped_protobuf_http_request.h
@@ -5,7 +5,7 @@ #ifndef REMOTING_BASE_SCOPED_PROTOBUF_HTTP_REQUEST_H_ #define REMOTING_BASE_SCOPED_PROTOBUF_HTTP_REQUEST_H_ -#include "base/callback.h" +#include "base/functional/callback.h" namespace remoting {
diff --git a/remoting/base/scoped_sc_handle_win.h b/remoting/base/scoped_sc_handle_win.h index 50f2f12..8832c5e 100644 --- a/remoting/base/scoped_sc_handle_win.h +++ b/remoting/base/scoped_sc_handle_win.h
@@ -25,18 +25,15 @@ } // Returns true if the handle value is valid. - static bool IsHandleValid(SC_HANDLE handle) { - return handle != NULL; - } + static bool IsHandleValid(SC_HANDLE handle) { return handle != NULL; } // Returns NULL handle value. - static SC_HANDLE NullHandle() { - return NULL; - } + static SC_HANDLE NullHandle() { return NULL; } }; -typedef base::win::GenericScopedHandle< - ScHandleTraits, base::win::DummyVerifierTraits> ScopedScHandle; +typedef base::win::GenericScopedHandle<ScHandleTraits, + base::win::DummyVerifierTraits> + ScopedScHandle; } // namespace remoting
diff --git a/remoting/base/session_options.cc b/remoting/base/session_options.cc index f66bd86..b08fed4 100644 --- a/remoting/base/session_options.cc +++ b/remoting/base/session_options.cc
@@ -42,12 +42,11 @@ SessionOptions::~SessionOptions() = default; -SessionOptions& SessionOptions::operator=( - const SessionOptions& other) = default; +SessionOptions& SessionOptions::operator=(const SessionOptions& other) = + default; SessionOptions& SessionOptions::operator=(SessionOptions&& other) = default; -void SessionOptions::Append(const std::string& key, - const std::string& value) { +void SessionOptions::Append(const std::string& key, const std::string& value) { DCHECK(KeyIsValid(key)); DCHECK(ValueIsValid(value)); options_[key] = value; @@ -68,8 +67,7 @@ } const std::string lowercase_value = base::ToLowerASCII(*value); - if (lowercase_value.empty() || - lowercase_value == "true" || + if (lowercase_value.empty() || lowercase_value == "true" || lowercase_value == "1") { return true; } @@ -118,9 +116,7 @@ void SessionOptions::Import(const std::string& parameter) { options_.clear(); std::vector<std::pair<std::string, std::string>> result; - base::SplitStringIntoKeyValuePairs(parameter, - kKeyValueSeparator, - kSeparator, + base::SplitStringIntoKeyValuePairs(parameter, kKeyValueSeparator, kSeparator, &result); for (const auto& pair : result) { if (KeyIsValid(pair.first) && ValueIsValid(pair.second)) {
diff --git a/remoting/base/socket_reader.cc b/remoting/base/socket_reader.cc index 4b941b1..93be3a7b 100644 --- a/remoting/base/socket_reader.cc +++ b/remoting/base/socket_reader.cc
@@ -4,8 +4,8 @@ #include "remoting/base/socket_reader.h" -#include "base/bind.h" #include "base/compiler_specific.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/task/single_thread_task_runner.h" #include "net/base/io_buffer.h" @@ -39,21 +39,24 @@ read_buffer_.get(), kReadBufferSize, base::BindOnce(&SocketReader::OnRead, weak_factory_.GetWeakPtr())); HandleReadResult(result); - if (result <= 0) + if (result <= 0) { break; + } } } void SocketReader::OnRead(int result) { HandleReadResult(result); - if (result > 0) + if (result > 0) { DoRead(); + } } void SocketReader::HandleReadResult(int result) { if (result != net::ERR_IO_PENDING) { - if (result < 0) + if (result < 0) { read_buffer_.reset(); + } base::SingleThreadTaskRunner::GetCurrentDefault()->PostTask( FROM_HERE, base::BindOnce(&SocketReader::CallCallback, weak_factory_.GetWeakPtr(),
diff --git a/remoting/base/socket_reader.h b/remoting/base/socket_reader.h index 40a7005..79d56453 100644 --- a/remoting/base/socket_reader.h +++ b/remoting/base/socket_reader.h
@@ -5,7 +5,7 @@ #ifndef REMOTING_BASE_SOCKET_READER_H_ #define REMOTING_BASE_SOCKET_READER_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h"
diff --git a/remoting/base/task_util.h b/remoting/base/task_util.h index 834f7c5..7bc0532 100644 --- a/remoting/base/task_util.h +++ b/remoting/base/task_util.h
@@ -5,7 +5,7 @@ #ifndef REMOTING_BASE_TASK_UTIL_H_ #define REMOTING_BASE_TASK_UTIL_H_ -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/task/sequenced_task_runner.h" #include "base/threading/sequence_bound.h"
diff --git a/remoting/base/telemetry_log_writer.cc b/remoting/base/telemetry_log_writer.cc index 083d14a..f900ad62 100644 --- a/remoting/base/telemetry_log_writer.cc +++ b/remoting/base/telemetry_log_writer.cc
@@ -6,9 +6,9 @@ #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/containers/adapters.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/json/json_string_value_serializer.h" #include "base/logging.h" #include "net/http/http_status_code.h" @@ -77,7 +77,7 @@ })"); constexpr char kCreateEventPath[] = "/v1/telemetry:createevent"; -} +} // namespace const int kMaxSendAttempts = 5;
diff --git a/remoting/base/telemetry_log_writer.h b/remoting/base/telemetry_log_writer.h index 3df97c7ad..71b1613 100644 --- a/remoting/base/telemetry_log_writer.h +++ b/remoting/base/telemetry_log_writer.h
@@ -7,8 +7,8 @@ #include <string> -#include "base/callback.h" #include "base/containers/circular_deque.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" #include "base/threading/thread_checker.h" #include "base/timer/timer.h"
diff --git a/remoting/base/telemetry_log_writer_unittest.cc b/remoting/base/telemetry_log_writer_unittest.cc index e3a536d2..91aa1c4 100644 --- a/remoting/base/telemetry_log_writer_unittest.cc +++ b/remoting/base/telemetry_log_writer_unittest.cc
@@ -6,9 +6,9 @@ #include <array> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/containers/circular_deque.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/memory/ptr_util.h" #include "base/run_loop.h"
diff --git a/remoting/base/typed_buffer.h b/remoting/base/typed_buffer.h index ef9506e3..6e7d7cbc 100644 --- a/remoting/base/typed_buffer.h +++ b/remoting/base/typed_buffer.h
@@ -25,8 +25,9 @@ // Creates an instance of the object allocating a buffer of the given size. explicit TypedBuffer(uint32_t length) : buffer_(nullptr), length_(length) { - if (length_ > 0) + if (length_ > 0) { buffer_ = reinterpret_cast<T*>(new uint8_t[length_]); + } } TypedBuffer(TypedBuffer&& rvalue) : TypedBuffer() { Swap(rvalue); } @@ -52,7 +53,7 @@ assert(buffer_); return *buffer_; } - T* operator->() const { + T* operator->() const { assert(buffer_); return buffer_; }
diff --git a/remoting/base/url_request.h b/remoting/base/url_request.h index cba1c3e..e79b744 100644 --- a/remoting/base/url_request.h +++ b/remoting/base/url_request.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "net/traffic_annotation/network_traffic_annotation.h" namespace remoting {
diff --git a/remoting/base/util.cc b/remoting/base/util.cc index 66bafa0..9cb96acf 100644 --- a/remoting/base/util.cc +++ b/remoting/base/util.cc
@@ -28,9 +28,8 @@ base::Time t = base::Time::NowFromSystemTime(); base::Time::Exploded tex; t.LocalExplode(&tex); - return base::StringPrintf("%02d%02d/%02d%02d%02d:", - tex.month, tex.day_of_month, - tex.hour, tex.minute, tex.second); + return base::StringPrintf("%02d%02d/%02d%02d%02d:", tex.month, + tex.day_of_month, tex.hour, tex.minute, tex.second); } int RoundToTwosMultiple(int x) { @@ -68,16 +67,14 @@ // Get the address of the starting point. source_buffer += CalculateRGBOffset( dest_rect.left() - source_buffer_rect.left(), - dest_rect.top() - source_buffer_rect.top(), - source_stride); - dest_buffer += CalculateRGBOffset( - dest_rect.left() - dest_buffer_rect.left(), - dest_rect.top() - dest_buffer_rect.top(), - source_stride); + dest_rect.top() - source_buffer_rect.top(), source_stride); + dest_buffer += CalculateRGBOffset(dest_rect.left() - dest_buffer_rect.left(), + dest_rect.top() - dest_buffer_rect.top(), + source_stride); // Copy pixels in the rectangle line by line. const int bytes_per_line = kBytesPerPixelRGB32 * dest_rect.width(); - for (int i = 0 ; i < dest_rect.height(); ++i) { + for (int i = 0; i < dest_rect.height(); ++i) { memcpy(dest_buffer, source_buffer, bytes_per_line); source_buffer += source_stride; dest_buffer += dest_stride;
diff --git a/remoting/base/util_unittest.cc b/remoting/base/util_unittest.cc index 78ccac6d..575d2f3 100644 --- a/remoting/base/util_unittest.cc +++ b/remoting/base/util_unittest.cc
@@ -19,7 +19,7 @@ EXPECT_EQ("\r\nab\r\ncd", ReplaceLfByCrLf("\nab\ncd")); EXPECT_EQ("\r\nab\r\ncd\r\n", ReplaceLfByCrLf("\nab\ncd\n")); EXPECT_EQ("\r\n\r\nab\r\n\r\ncd\r\n\r\n", - ReplaceLfByCrLf("\n\nab\n\ncd\n\n")); + ReplaceLfByCrLf("\n\nab\n\ncd\n\n")); } TEST(ReplaceLfByCrLfTest, Speed) { @@ -53,7 +53,7 @@ EXPECT_EQ("\nab\ncd", ReplaceCrLfByLf("\r\nab\r\ncd")); EXPECT_EQ("\nab\ncd\n", ReplaceCrLfByLf("\r\nab\r\ncd\n")); EXPECT_EQ("\n\nab\n\ncd\n\n", - ReplaceCrLfByLf("\r\n\r\nab\r\n\r\ncd\r\n\r\n")); + ReplaceCrLfByLf("\r\n\r\nab\r\n\r\ncd\r\n\r\n")); EXPECT_EQ("\rab\rcd\r", ReplaceCrLfByLf("\rab\rcd\r")); }
diff --git a/remoting/base/weighted_samples_unittest.cc b/remoting/base/weighted_samples_unittest.cc index 3df8803..653178b38 100644 --- a/remoting/base/weighted_samples_unittest.cc +++ b/remoting/base/weighted_samples_unittest.cc
@@ -11,10 +11,10 @@ TEST(WeightedSamplesTest, CalculateWeightedAverage) { static constexpr double kWeightFactor = 0.9; static constexpr double kExpected[] = { - 1, - 1.5263157894736843, - 2.0701107011070110, - 2.6312881651642916, + 1, + 1.5263157894736843, + 2.0701107011070110, + 2.6312881651642916, }; WeightedSamples samples(kWeightFactor); for (size_t i = 0; i < std::size(kExpected); i++) {
diff --git a/remoting/client/audio/audio_jitter_buffer.h b/remoting/client/audio/audio_jitter_buffer.h index bf6070e..f15c6157 100644 --- a/remoting/client/audio/audio_jitter_buffer.h +++ b/remoting/client/audio/audio_jitter_buffer.h
@@ -8,7 +8,7 @@ #include <list> #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "base/threading/thread_checker.h" #include "base/time/time.h"
diff --git a/remoting/client/audio/audio_jitter_buffer_unittest.cc b/remoting/client/audio/audio_jitter_buffer_unittest.cc index dfc4ff7..5f97937 100644 --- a/remoting/client/audio/audio_jitter_buffer_unittest.cc +++ b/remoting/client/audio/audio_jitter_buffer_unittest.cc
@@ -7,8 +7,8 @@ #include <memory> #include <string> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/time/time.h" #include "remoting/client/audio/audio_jitter_buffer.h"
diff --git a/remoting/client/audio/audio_playback_stream.cc b/remoting/client/audio/audio_playback_stream.cc index 9fe3d4c..e1117de 100644 --- a/remoting/client/audio/audio_playback_stream.cc +++ b/remoting/client/audio/audio_playback_stream.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/task/single_thread_task_runner.h" #include "remoting/client/audio/audio_jitter_buffer.h" #include "remoting/client/audio/audio_playback_sink.h"
diff --git a/remoting/client/audio/audio_player.cc b/remoting/client/audio/audio_player.cc index 1b201c3..7fa9b6e 100644 --- a/remoting/client/audio/audio_player.cc +++ b/remoting/client/audio/audio_player.cc
@@ -8,8 +8,8 @@ #include <string> #include <utility> -#include "base/callback_helpers.h" #include "base/check_op.h" +#include "base/functional/callback_helpers.h" #include "base/time/time.h" // If queue grows bigger than 150ms we start dropping packets.
diff --git a/remoting/client/audio/audio_player_unittest.cc b/remoting/client/audio/audio_player_unittest.cc index bb3053d..213d9c8 100644 --- a/remoting/client/audio/audio_player_unittest.cc +++ b/remoting/client/audio/audio_player_unittest.cc
@@ -7,8 +7,8 @@ #include <cstdint> #include <memory> -#include "base/callback.h" #include "base/compiler_specific.h" +#include "base/functional/callback.h" #include "testing/gtest/include/gtest/gtest.h" namespace {
diff --git a/remoting/client/chromoting_client.h b/remoting/client/chromoting_client.h index cf92f2a2..15776f2b 100644 --- a/remoting/client/chromoting_client.h +++ b/remoting/client/chromoting_client.h
@@ -10,7 +10,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/threading/thread_checker.h"
diff --git a/remoting/client/chromoting_client_runtime.cc b/remoting/client/chromoting_client_runtime.cc index c0e19a0..8b2d8e9 100644 --- a/remoting/client/chromoting_client_runtime.cc +++ b/remoting/client/chromoting_client_runtime.cc
@@ -6,8 +6,8 @@ #include <memory> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/memory/singleton.h" #include "base/message_loop/message_pump_type.h"
diff --git a/remoting/client/chromoting_session.cc b/remoting/client/chromoting_session.cc index 51fb812..87be6431 100644 --- a/remoting/client/chromoting_session.cc +++ b/remoting/client/chromoting_session.cc
@@ -10,10 +10,10 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/format_macros.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/memory/raw_ptr.h" #include "base/task/single_thread_task_runner.h"
diff --git a/remoting/client/client_telemetry_logger.h b/remoting/client/client_telemetry_logger.h index aa8f8008..0f31189 100644 --- a/remoting/client/client_telemetry_logger.h +++ b/remoting/client/client_telemetry_logger.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/threading/thread_checker.h"
diff --git a/remoting/client/cursor_shape_stub_proxy.cc b/remoting/client/cursor_shape_stub_proxy.cc index c060bdcf..799e66d 100644 --- a/remoting/client/cursor_shape_stub_proxy.cc +++ b/remoting/client/cursor_shape_stub_proxy.cc
@@ -4,7 +4,7 @@ #include "remoting/client/cursor_shape_stub_proxy.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/task/single_thread_task_runner.h" #include "remoting/proto/control.pb.h"
diff --git a/remoting/client/display/gl_renderer.cc b/remoting/client/display/gl_renderer.cc index 35df32f..9448f4d 100644 --- a/remoting/client/display/gl_renderer.cc +++ b/remoting/client/display/gl_renderer.cc
@@ -6,8 +6,8 @@ #include <algorithm> -#include "base/bind.h" #include "base/check.h" +#include "base/functional/bind.h" #include "base/task/single_thread_task_runner.h" #include "remoting/client/display/drawable.h" #include "remoting/client/display/gl_canvas.h"
diff --git a/remoting/client/display/gl_renderer.h b/remoting/client/display/gl_renderer.h index 5ce0ae7..334e353 100644 --- a/remoting/client/display/gl_renderer.h +++ b/remoting/client/display/gl_renderer.h
@@ -7,8 +7,8 @@ #include <vector> -#include "base/callback.h" #include "base/containers/queue.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "base/threading/thread_checker.h" #include "remoting/client/display/gl_cursor.h"
diff --git a/remoting/client/display/gl_renderer_unittest.cc b/remoting/client/display/gl_renderer_unittest.cc index 6b90cc612..f1c8e05 100644 --- a/remoting/client/display/gl_renderer_unittest.cc +++ b/remoting/client/display/gl_renderer_unittest.cc
@@ -6,8 +6,8 @@ #include <memory> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "base/test/task_environment.h" #include "remoting/client/display/fake_canvas.h"
diff --git a/remoting/client/display/renderer_proxy.cc b/remoting/client/display/renderer_proxy.cc index 4914ebf..6c1d29f 100644 --- a/remoting/client/display/renderer_proxy.cc +++ b/remoting/client/display/renderer_proxy.cc
@@ -4,8 +4,8 @@ #include "remoting/client/display/renderer_proxy.h" -#include "base/bind.h" #include "base/check_op.h" +#include "base/functional/bind.h" #include "base/task/single_thread_task_runner.h" #include "remoting/base/queued_task_poster.h" #include "remoting/client/display/gl_renderer.h"
diff --git a/remoting/client/dual_buffer_frame_consumer.cc b/remoting/client/dual_buffer_frame_consumer.cc index a66aefa..ab6c5b62 100644 --- a/remoting/client/dual_buffer_frame_consumer.cc +++ b/remoting/client/dual_buffer_frame_consumer.cc
@@ -6,9 +6,9 @@ #include <memory> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/check.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/task/single_thread_task_runner.h"
diff --git a/remoting/client/dual_buffer_frame_consumer.h b/remoting/client/dual_buffer_frame_consumer.h index 02459e4..82ef80a 100644 --- a/remoting/client/dual_buffer_frame_consumer.h +++ b/remoting/client/dual_buffer_frame_consumer.h
@@ -5,7 +5,7 @@ #ifndef REMOTING_CLIENT_DUAL_BUFFER_FRAME_CONSUMER_H_ #define REMOTING_CLIENT_DUAL_BUFFER_FRAME_CONSUMER_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h" #include "base/task/single_thread_task_runner.h"
diff --git a/remoting/client/dual_buffer_frame_consumer_unittest.cc b/remoting/client/dual_buffer_frame_consumer_unittest.cc index 52ebca2d..cefb99b7 100644 --- a/remoting/client/dual_buffer_frame_consumer_unittest.cc +++ b/remoting/client/dual_buffer_frame_consumer_unittest.cc
@@ -6,8 +6,8 @@ #include <memory> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/webrtc/modules/desktop_capture/desktop_frame.h" #include "third_party/webrtc/modules/desktop_capture/shared_desktop_frame.h"
diff --git a/remoting/client/gesture_interpreter.cc b/remoting/client/gesture_interpreter.cc index 9ec06f1..73c452d 100644 --- a/remoting/client/gesture_interpreter.cc +++ b/remoting/client/gesture_interpreter.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/time/time.h" #include "remoting/client/chromoting_session.h" #include "remoting/client/display/renderer_proxy.h"
diff --git a/remoting/client/input/key_event_mapper.h b/remoting/client/input/key_event_mapper.h index 756f547..6ffe0a2f 100644 --- a/remoting/client/input/key_event_mapper.h +++ b/remoting/client/input/key_event_mapper.h
@@ -10,8 +10,8 @@ #include <map> #include <set> -#include "base/callback.h" #include "base/compiler_specific.h" +#include "base/functional/callback.h" #include "remoting/protocol/input_filter.h" namespace remoting {
diff --git a/remoting/client/input/key_event_mapper_unittest.cc b/remoting/client/input/key_event_mapper_unittest.cc index b970543..f9509f18 100644 --- a/remoting/client/input/key_event_mapper_unittest.cc +++ b/remoting/client/input/key_event_mapper_unittest.cc
@@ -6,7 +6,7 @@ #include <stdint.h> -#include "base/bind.h" +#include "base/functional/bind.h" #include "remoting/proto/event.pb.h" #include "remoting/protocol/protocol_mock_objects.h" #include "remoting/protocol/test_event_matchers.h"
diff --git a/remoting/client/jni/jni_directory_service.cc b/remoting/client/jni/jni_directory_service.cc index 609eaf1..27274da 100644 --- a/remoting/client/jni/jni_directory_service.cc +++ b/remoting/client/jni/jni_directory_service.cc
@@ -11,7 +11,7 @@ #include "base/android/jni_android.h" #include "base/android/jni_array.h" #include "base/android/jni_string.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/task/sequenced_task_runner.h" #include "remoting/android/jni_headers/DirectoryService_jni.h" #include "remoting/base/oauth_token_getter.h"
diff --git a/remoting/client/jni/jni_gl_display_handler.cc b/remoting/client/jni/jni_gl_display_handler.cc index 4d970147..cb13bea 100644 --- a/remoting/client/jni/jni_gl_display_handler.cc +++ b/remoting/client/jni/jni_gl_display_handler.cc
@@ -9,8 +9,8 @@ #include <memory> #include "base/android/jni_android.h" -#include "base/bind.h" #include "base/check.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "remoting/android/jni_headers/GlDisplay_jni.h" #include "remoting/client/chromoting_client_runtime.h"
diff --git a/remoting/client/jni/jni_notification_presenter.cc b/remoting/client/jni/jni_notification_presenter.cc index b2b5c84f..87d8381 100644 --- a/remoting/client/jni/jni_notification_presenter.cc +++ b/remoting/client/jni/jni_notification_presenter.cc
@@ -6,7 +6,7 @@ #include "base/android/jni_android.h" #include "base/android/jni_string.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/task/sequenced_task_runner.h" #include "remoting/android/jni_headers/NotificationPresenter_jni.h" #include "remoting/client/chromoting_client_runtime.h"
diff --git a/remoting/client/jni/jni_runtime_delegate.cc b/remoting/client/jni/jni_runtime_delegate.cc index 3714730b..dc499bd1 100644 --- a/remoting/client/jni/jni_runtime_delegate.cc +++ b/remoting/client/jni/jni_runtime_delegate.cc
@@ -9,8 +9,8 @@ #include "base/android/jni_string.h" #include "base/android/library_loader/library_loader_hooks.h" #include "base/android/scoped_java_ref.h" -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/memory/singleton.h" #include "base/synchronization/waitable_event.h"
diff --git a/remoting/client/notification/json_fetcher.h b/remoting/client/notification/json_fetcher.h index bafef02..0475344 100644 --- a/remoting/client/notification/json_fetcher.h +++ b/remoting/client/notification/json_fetcher.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "third_party/abseil-cpp/absl/types/optional.h" namespace base {
diff --git a/remoting/client/notification/notification_client.cc b/remoting/client/notification/notification_client.cc index 9fcb498..48d9bbb 100644 --- a/remoting/client/notification/notification_client.cc +++ b/remoting/client/notification/notification_client.cc
@@ -6,8 +6,8 @@ #include <algorithm> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/hash/hash.h" #include "base/logging.h" #include "base/memory/raw_ptr.h"
diff --git a/remoting/client/notification/notification_client.h b/remoting/client/notification/notification_client.h index c454c3f4..6d334cd 100644 --- a/remoting/client/notification/notification_client.h +++ b/remoting/client/notification/notification_client.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/task/single_thread_task_runner.h" #include "base/values.h" #include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/remoting/client/software_video_renderer.cc b/remoting/client/software_video_renderer.cc index 0e2b540..544ef40 100644 --- a/remoting/client/software_video_renderer.cc +++ b/remoting/client/software_video_renderer.cc
@@ -7,9 +7,9 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/logging.h" #include "base/memory/ptr_util.h"
diff --git a/remoting/client/software_video_renderer_unittest.cc b/remoting/client/software_video_renderer_unittest.cc index 0e45304..f7d850c 100644 --- a/remoting/client/software_video_renderer_unittest.cc +++ b/remoting/client/software_video_renderer_unittest.cc
@@ -10,7 +10,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/test/task_environment.h" #include "base/threading/thread.h"
diff --git a/remoting/client/ui/desktop_viewport.h b/remoting/client/ui/desktop_viewport.h index cc68d34..1db12f1c 100644 --- a/remoting/client/ui/desktop_viewport.h +++ b/remoting/client/ui/desktop_viewport.h
@@ -5,7 +5,7 @@ #ifndef REMOTING_CLIENT_UI_DESKTOP_VIEWPORT_H_ #define REMOTING_CLIENT_UI_DESKTOP_VIEWPORT_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "remoting/client/ui/view_matrix.h" namespace remoting {
diff --git a/remoting/client/ui/desktop_viewport_unittest.cc b/remoting/client/ui/desktop_viewport_unittest.cc index 9baf4c4..f4fa630 100644 --- a/remoting/client/ui/desktop_viewport_unittest.cc +++ b/remoting/client/ui/desktop_viewport_unittest.cc
@@ -4,7 +4,7 @@ #include "remoting/client/ui/desktop_viewport.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/strings/stringprintf.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/remoting/client/ui/fling_animation.h b/remoting/client/ui/fling_animation.h index 2cf6ff7..de5dcc6 100644 --- a/remoting/client/ui/fling_animation.h +++ b/remoting/client/ui/fling_animation.h
@@ -5,7 +5,7 @@ #ifndef REMOTING_CLIENT_UI_FLING_ANIMATION_H_ #define REMOTING_CLIENT_UI_FLING_ANIMATION_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/time/tick_clock.h" #include "base/time/time.h"
diff --git a/remoting/client/ui/fling_animation_unittest.cc b/remoting/client/ui/fling_animation_unittest.cc index 67f7dae..19f8e107 100644 --- a/remoting/client/ui/fling_animation_unittest.cc +++ b/remoting/client/ui/fling_animation_unittest.cc
@@ -6,7 +6,7 @@ #include <cmath> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/test/simple_test_tick_clock.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/remoting/codec/audio_decoder_opus.cc b/remoting/codec/audio_decoder_opus.cc index 3bbe0ed..d9bfc18 100644 --- a/remoting/codec/audio_decoder_opus.cc +++ b/remoting/codec/audio_decoder_opus.cc
@@ -57,11 +57,10 @@ channels_ = packet->channels(); sampling_rate_ = packet->sampling_rate(); - if (channels_ <= 0 || channels_ > 2 || - sampling_rate_ != kSamplingRate) { - LOG(WARNING) << "Unsupported OPUS parameters: " - << channels_ << " channels with " - << sampling_rate_ << " samples per second."; + if (channels_ <= 0 || channels_ > 2 || sampling_rate_ != kSamplingRate) { + LOG(WARNING) << "Unsupported OPUS parameters: " << channels_ + << " channels with " << sampling_rate_ + << " samples per second."; return false; } } @@ -96,10 +95,10 @@ decoded_packet->set_bytes_per_sample(AudioPacket::BYTES_PER_SAMPLE_2); decoded_packet->set_channels(packet->channels()); - int max_frame_samples = kMaxFrameSizeMs * kSamplingRate / - base::Time::kMillisecondsPerSecond; - int max_frame_bytes = max_frame_samples * channels_ * - decoded_packet->bytes_per_sample(); + int max_frame_samples = + kMaxFrameSizeMs * kSamplingRate / base::Time::kMillisecondsPerSecond; + int max_frame_bytes = + max_frame_samples * channels_ * decoded_packet->bytes_per_sample(); std::string* decoded_data = decoded_packet->add_data(); decoded_data->resize(packet->data_size() * max_frame_bytes); @@ -113,16 +112,16 @@ std::string* frame = packet->mutable_data(i); unsigned char* frame_data = reinterpret_cast<unsigned char*>(std::data(*frame)); - int result = opus_decode(decoder_, frame_data, frame->size(), - pcm_buffer, max_frame_samples, 0); + int result = opus_decode(decoder_, frame_data, frame->size(), pcm_buffer, + max_frame_samples, 0); if (result < 0) { LOG(ERROR) << "Failed decoding Opus frame. Error code: " << result; DestroyDecoder(); return nullptr; } - buffer_pos += result * packet->channels() * - decoded_packet->bytes_per_sample(); + buffer_pos += + result * packet->channels() * decoded_packet->bytes_per_sample(); } if (!buffer_pos) {
diff --git a/remoting/codec/audio_encoder_opus.cc b/remoting/codec/audio_encoder_opus.cc index ff33a5c9..14c5b89 100644 --- a/remoting/codec/audio_encoder_opus.cc +++ b/remoting/codec/audio_encoder_opus.cc
@@ -4,7 +4,7 @@ #include "remoting/codec/audio_encoder_opus.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/time/time.h" #include "media/base/audio_bus.h" @@ -46,8 +46,7 @@ frame_size_(0), resampling_data_(nullptr), resampling_data_size_(0), - resampling_data_pos_(0) { -} + resampling_data_pos_(0) {} AudioEncoderOpus::~AudioEncoderOpus() { DestroyEncoder(); @@ -65,8 +64,8 @@ opus_encoder_ctl(encoder_.get(), OPUS_SET_BITRATE(kOutputBitrateBps)); - frame_size_ = sampling_rate_ * kFrameSizeMs / - base::Time::kMillisecondsPerSecond; + frame_size_ = + sampling_rate_ * kFrameSizeMs / base::Time::kMillisecondsPerSecond; if (sampling_rate_ != kOpusSamplingRate) { resample_buffer_.reset( @@ -107,9 +106,9 @@ if (channels_ <= 0 || channels_ > 2 || !IsSupportedSampleRate(sampling_rate_)) { - LOG(WARNING) << "Unsupported OPUS parameters: " - << channels_ << " channels with " - << sampling_rate_ << " samples per second."; + LOG(WARNING) << "Unsupported OPUS parameters: " << channels_ + << " channels with " << sampling_rate_ + << " samples per second."; return false; } @@ -123,7 +122,7 @@ media::AudioBus* audio_bus) { DCHECK(resampling_data_); int samples_left = (resampling_data_size_ - resampling_data_pos_) / - kBytesPerSample / channels_; + kBytesPerSample / channels_; DCHECK_LE(audio_bus->frames(), samples_left); static_assert(kBytesPerSample == 2, "FromInterleaved expects 2 bytes."); audio_bus->FromInterleaved<media::SignedInt16SampleTypeTraits>( @@ -199,8 +198,8 @@ // Encode. unsigned char* buffer = reinterpret_cast<unsigned char*>(std::data(*data)); - int result = opus_encode(encoder_, pcm_buffer, kFrameSamples, - buffer, data->length()); + int result = opus_encode(encoder_, pcm_buffer, kFrameSamples, buffer, + data->length()); if (result < 0) { LOG(ERROR) << "opus_encode() failed with error code: " << result; return nullptr; @@ -226,14 +225,15 @@ // Store the leftover samples. if (samples_in_packet > 0) { DCHECK_LE(leftover_samples_ + samples_in_packet, leftover_buffer_size_); - memmove(leftover_buffer_.get() + leftover_samples_ * channels_, - next_sample, samples_in_packet * kBytesPerSample * channels_); + memmove(leftover_buffer_.get() + leftover_samples_ * channels_, next_sample, + samples_in_packet * kBytesPerSample * channels_); leftover_samples_ += samples_in_packet; } // Return nullptr if there's nothing in the packet. - if (encoded_packet->data_size() == 0) + if (encoded_packet->data_size() == 0) { return nullptr; + } return encoded_packet; }
diff --git a/remoting/codec/audio_encoder_opus_unittest.cc b/remoting/codec/audio_encoder_opus_unittest.cc index 2ed763bb..07f1eafd 100644 --- a/remoting/codec/audio_encoder_opus_unittest.cc +++ b/remoting/codec/audio_encoder_opus_unittest.cc
@@ -96,8 +96,8 @@ int16_t this_sample = received_data[i * kChannels]; int16_t next_sample = received_data[(i + 1) * kChannels]; if (this_sample < 0 && next_sample > 0) { - return - i + static_cast<double>(-this_sample) / (next_sample - this_sample); + return i + + static_cast<double>(-this_sample) / (next_sample - this_sample); } } return 0; @@ -112,10 +112,10 @@ const std::vector<int16_t>& received_data) { double shift = EstimateSignalShift(received_data); double diff_sqare_sum = 0; - for (size_t i = kSkippedFirstSamples; - i < received_data.size() / kChannels; i++) { + for (size_t i = kSkippedFirstSamples; i < received_data.size() / kChannels; + i++) { double d = received_data[i * kChannels] - - GetSampleValue(rate, frequency_hz, i - shift, 0); + GetSampleValue(rate, frequency_hz, i - shift, 0); diff_sqare_sum += d * d; d = received_data[i * kChannels + 1] - GetSampleValue(rate, frequency_hz, i - shift, 1); @@ -128,8 +128,8 @@ } void TestEncodeDecode(int packet_size, - double frequency_hz, - AudioPacket::SamplingRate rate) { + double frequency_hz, + AudioPacket::SamplingRate rate) { const int kTotalTestSamples = 24000; encoder_ = std::make_unique<AudioEncoderOpus>(); @@ -153,7 +153,7 @@ received_data.end(), data, data + decoded->data(i).size() / sizeof(int16_t)); } - } + } } // Verify that at most kMaxLatencyMs worth of samples is buffered inside @@ -161,8 +161,8 @@ EXPECT_GE(static_cast<int>(received_data.size()) / kChannels, pos - rate * kMaxLatencyMs / 1000); - ValidateReceivedData(packet_size, kDefaultSamplingRate, - frequency_hz, received_data); + ValidateReceivedData(packet_size, kDefaultSamplingRate, frequency_hz, + received_data); } protected: @@ -170,8 +170,7 @@ std::unique_ptr<AudioDecoderOpus> decoder_; }; -TEST_F(OpusAudioEncoderTest, CreateAndDestroy) { -} +TEST_F(OpusAudioEncoderTest, CreateAndDestroy) {} TEST_F(OpusAudioEncoderTest, NoResampling) { TestEncodeDecode(2000, 50, AudioPacket::SAMPLING_RATE_48000);
diff --git a/remoting/codec/codec_test.cc b/remoting/codec/codec_test.cc index 99f142e..c0860ce 100644 --- a/remoting/codec/codec_test.cc +++ b/remoting/codec/codec_test.cc
@@ -11,7 +11,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/memory/raw_ptr.h" #include "remoting/base/util.h" @@ -82,21 +82,18 @@ ASSERT_TRUE(decoder_->DecodePacket(*packet, frame_.get())); } - void set_strict(bool strict) { - strict_ = strict; - } + void set_strict(bool strict) { strict_ = strict; } - void set_expected_frame(DesktopFrame* frame) { - expected_frame_ = frame; - } + void set_expected_frame(DesktopFrame* frame) { expected_frame_ = frame; } void AddRegion(const DesktopRegion& region) { expected_region_.AddRegion(region); } void VerifyResults() { - if (!strict_) + if (!strict_) { return; + } ASSERT_TRUE(expected_frame_); @@ -107,8 +104,7 @@ i.Advance()) { const uint8_t* original = expected_frame_->GetFrameDataAtPos(i.rect().top_left()); - const uint8_t* decoded = - frame_->GetFrameDataAtPos(i.rect().top_left()); + const uint8_t* decoded = frame_->GetFrameDataAtPos(i.rect().top_left()); const int row_size = kBytesPerPixel * i.rect().width(); for (int y = 0; y < i.rect().height(); ++y) { EXPECT_EQ(0, memcmp(original, decoded, row_size)) @@ -130,8 +126,7 @@ i.Advance()) { const uint8_t* expected = expected_frame_->GetFrameDataAtPos(i.rect().top_left()); - const uint8_t* actual = - frame_->GetFrameDataAtPos(i.rect().top_left()); + const uint8_t* actual = frame_->GetFrameDataAtPos(i.rect().top_left()); for (int y = 0; y < i.rect().height(); ++y) { for (int x = 0; x < i.rect().width(); ++x) { double error = CalculateError(expected + x * kBytesPerPixel, @@ -154,8 +149,8 @@ double CalculateError(const uint8_t* original, const uint8_t* decoded) { double error_sum_squares = 0.0; for (int i = 0; i < 3; i++) { - double error = static_cast<double>(*original++) - - static_cast<double>(*decoded++); + double error = + static_cast<double>(*original++) - static_cast<double>(*decoded++); error /= 255.0; error_sum_squares += error * error; } @@ -181,9 +176,7 @@ VideoEncoderTester(const VideoEncoderTester&) = delete; VideoEncoderTester& operator=(const VideoEncoderTester&) = delete; - ~VideoEncoderTester() { - EXPECT_GT(data_available_, 0); - } + ~VideoEncoderTester() { EXPECT_GT(data_available_, 0); } void DataAvailable(std::unique_ptr<VideoPacket> packet) { ++data_available_; @@ -243,8 +236,7 @@ } } -void TestVideoEncoderEmptyFrames(VideoEncoder* encoder, - int max_topoff_frames) { +void TestVideoEncoderEmptyFrames(VideoEncoder* encoder, int max_topoff_frames) { const DesktopSize kSize(100, 100); std::unique_ptr<DesktopFrame> frame(PrepareFrame(kSize)); @@ -255,8 +247,9 @@ int topoff_frames = 0; frame->mutable_updated_region()->Clear(); for (int i = 0; i < max_topoff_frames + 1; ++i) { - if (!encoder->Encode(*frame)) + if (!encoder->Encode(*frame)) { break; + } topoff_frames++; } @@ -280,10 +273,11 @@ for (DesktopRegion::Iterator i(region); !i.IsAtEnd(); i.Advance()) { const int row_size = DesktopFrame::kBytesPerPixel * i.rect().width(); uint8_t* memory = frame->data() + frame->stride() * i.rect().top() + - DesktopFrame::kBytesPerPixel * i.rect().left(); + DesktopFrame::kBytesPerPixel * i.rect().left(); for (int y = 0; y < i.rect().height(); ++y) { - for (int x = 0; x < row_size; ++x) + for (int x = 0; x < row_size; ++x) { memory[x] = rand() % 256; + } memory += frame->stride(); } } @@ -319,8 +313,8 @@ for (int i = 0; i < frame->size().width(); ++i) { *p++ = (255.0 * i) / frame->size().width(); *p++ = (164.0 * j) / frame->size().height(); - *p++ = (82.0 * (i + j)) / - (frame->size().width() + frame->size().height()); + *p++ = + (82.0 * (i + j)) / (frame->size().width() + frame->size().height()); *p++ = 0; } }
diff --git a/remoting/codec/codec_test.h b/remoting/codec/codec_test.h index d0ba421..374718cd 100644 --- a/remoting/codec/codec_test.h +++ b/remoting/codec/codec_test.h
@@ -10,7 +10,7 @@ namespace webrtc { class DesktopFrame; class DesktopSize; -} +} // namespace webrtc namespace remoting {
diff --git a/remoting/codec/scoped_vpx_codec.h b/remoting/codec/scoped_vpx_codec.h index 7d20c31..2ca466b 100644 --- a/remoting/codec/scoped_vpx_codec.h +++ b/remoting/codec/scoped_vpx_codec.h
@@ -19,6 +19,6 @@ typedef std::unique_ptr<vpx_codec_ctx_t, VpxCodecDeleter> ScopedVpxCodec; -} // namespace remoting +} // namespace remoting #endif // REMOTING_CODEC_SCOPED_VPX_CODEC_H_
diff --git a/remoting/codec/video_decoder_vpx_unittest.cc b/remoting/codec/video_decoder_vpx_unittest.cc index 4114445..6c5f794 100644 --- a/remoting/codec/video_decoder_vpx_unittest.cc +++ b/remoting/codec/video_decoder_vpx_unittest.cc
@@ -18,16 +18,18 @@ std::unique_ptr<VideoEncoderVpx> encoder_; std::unique_ptr<VideoDecoderVpx> decoder_; - VideoDecoderVpxTest() : encoder_(VideoEncoderVpx::CreateForVP8()), - decoder_(VideoDecoderVpx::CreateForVP8()) { - } + VideoDecoderVpxTest() + : encoder_(VideoEncoderVpx::CreateForVP8()), + decoder_(VideoDecoderVpx::CreateForVP8()) {} - void TestGradient(int screen_width, int screen_height, - double max_error_limit, double mean_error_limit) { + void TestGradient(int screen_width, + int screen_height, + double max_error_limit, + double mean_error_limit) { TestVideoEncoderDecoderGradient( encoder_.get(), decoder_.get(), - webrtc::DesktopSize(screen_width, screen_height), - max_error_limit, mean_error_limit); + webrtc::DesktopSize(screen_width, screen_height), max_error_limit, + mean_error_limit); } };
diff --git a/remoting/codec/video_encoder_active_map.cc b/remoting/codec/video_encoder_active_map.cc index ca3203d..2c78af9 100644 --- a/remoting/codec/video_encoder_active_map.cc +++ b/remoting/codec/video_encoder_active_map.cc
@@ -54,8 +54,9 @@ uint8_t* map = active_map_.get() + top * active_map_size_.width(); for (int y = top; y <= bottom; ++y) { - for (int x = left; x <= right; ++x) + for (int x = left; x <= right; ++x) { map[x] = 1; + } map += active_map_size_.width(); } }
diff --git a/remoting/codec/video_encoder_helper.cc b/remoting/codec/video_encoder_helper.cc index 3fb2d113..3b4e9d0 100644 --- a/remoting/codec/video_encoder_helper.cc +++ b/remoting/codec/video_encoder_helper.cc
@@ -34,8 +34,8 @@ } // Record the list of changed rectangles. - for (webrtc::DesktopRegion::Iterator iter(updated_region); - !iter.IsAtEnd(); iter.Advance()) { + for (webrtc::DesktopRegion::Iterator iter(updated_region); !iter.IsAtEnd(); + iter.Advance()) { const webrtc::DesktopRect& rect = iter.rect(); Rect* dirty_rect = packet->add_dirty_rects(); dirty_rect->set_x(rect.left());
diff --git a/remoting/codec/video_encoder_helper.h b/remoting/codec/video_encoder_helper.h index be3271e5..f07e39f 100644 --- a/remoting/codec/video_encoder_helper.h +++ b/remoting/codec/video_encoder_helper.h
@@ -12,7 +12,7 @@ namespace webrtc { class DesktopFrame; class DesktopRegion; -} +} // namespace webrtc namespace remoting {
diff --git a/remoting/codec/video_encoder_verbatim.cc b/remoting/codec/video_encoder_verbatim.cc index 63a7dea5..c53c9dc 100644 --- a/remoting/codec/video_encoder_verbatim.cc +++ b/remoting/codec/video_encoder_verbatim.cc
@@ -30,8 +30,9 @@ // If nothing has changed in the frame then return NULL to indicate that // we don't need to actually send anything (e.g. nothing to top-off). - if (frame.updated_region().is_empty()) + if (frame.updated_region().is_empty()) { return nullptr; + } // Create a VideoPacket with common fields (e.g. DPI, rects, shape) set. std::unique_ptr<VideoPacket> packet(helper_.CreateVideoPacket(frame)); @@ -42,8 +43,8 @@ for (webrtc::DesktopRegion::Iterator iter(frame.updated_region()); !iter.IsAtEnd(); iter.Advance()) { const webrtc::DesktopRect& rect = iter.rect(); - output_size += rect.width() * rect.height() * - webrtc::DesktopFrame::kBytesPerPixel; + output_size += + rect.width() * rect.height() * webrtc::DesktopFrame::kBytesPerPixel; } uint8_t* out = GetPacketOutputBuffer(packet.get(), output_size);
diff --git a/remoting/codec/video_encoder_vpx.cc b/remoting/codec/video_encoder_vpx.cc index 8bcc394..f96dd4b 100644 --- a/remoting/codec/video_encoder_vpx.cc +++ b/remoting/codec/video_encoder_vpx.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/memory/ptr_util.h" #include "base/system/sys_info.h" @@ -67,7 +67,8 @@ const webrtc::DesktopSize& size) { // Adjust default target bit-rate to account for actual desktop size. config->rc_target_bitrate = size.width() * size.height() * - config->rc_target_bitrate / config->g_w / config->g_h; + config->rc_target_bitrate / config->g_w / + config->g_h; SetCommonCodecParameters(config, size); @@ -123,8 +124,7 @@ DCHECK_EQ(VPX_CODEC_OK, ret) << "Failed to set noise sensitivity"; // Configure the codec to tune it for screen media. - ret = vpx_codec_control( - codec, VP9E_SET_TUNE_CONTENT, VP9E_CONTENT_SCREEN); + ret = vpx_codec_control(codec, VP9E_SET_TUNE_CONTENT, VP9E_CONTENT_SCREEN); DCHECK_EQ(VPX_CODEC_OK, ret) << "Failed to set screen content mode"; // Set cyclic refresh (aka "top-off") for lossy encoding. @@ -188,11 +188,12 @@ // Assuming macroblocks are 16x16, aligning the planes' strides above also // macroblock aligned them. static_assert(kMacroBlockSize == 16, "macroblock_size_not_16"); - const int y_rows = ((image->h - 1) & ~(kMacroBlockSize-1)) + kMacroBlockSize; + const int y_rows = + ((image->h - 1) & ~(kMacroBlockSize - 1)) + kMacroBlockSize; const int uv_rows = y_rows >> image->y_chroma_shift; // Allocate a YUV buffer large enough for the aligned data & padding. - const int buffer_size = y_stride * y_rows + 2*uv_stride * uv_rows; + const int buffer_size = y_stride * y_rows + 2 * uv_stride * uv_rows; std::unique_ptr<uint8_t[]> image_buffer(new uint8_t[buffer_size]); // Reset image value to 128 so we just need to fill in the y plane. @@ -248,13 +249,13 @@ DCHECK_LE(32, frame.size().height()); // If there is nothing to encode, and nothing to top-off, then return nothing. - if (frame.updated_region().is_empty() && !encode_unchanged_frame_) + if (frame.updated_region().is_empty() && !encode_unchanged_frame_) { return nullptr; + } // Create or reconfigure the codec to match the size of |frame|. - if (!codec_ || - (image_ && - !frame.size().equals(webrtc::DesktopSize(image_->w, image_->h)))) { + if (!codec_ || (image_ && !frame.size().equals( + webrtc::DesktopSize(image_->w, image_->h)))) { Configure(frame.size()); } @@ -276,8 +277,8 @@ // Do the actual encoding. int timestamp = (clock_->NowTicks() - timestamp_base_).InMilliseconds(); - vpx_codec_err_t ret = vpx_codec_encode( - codec_.get(), image_.get(), timestamp, 1, 0, VPX_DL_REALTIME); + vpx_codec_err_t ret = vpx_codec_encode(codec_.get(), image_.get(), timestamp, + 1, 0, VPX_DL_REALTIME); DCHECK_EQ(ret, VPX_CODEC_OK) << "Encoding error: " << vpx_codec_err_to_string(ret) << "\n" << "Details: " << vpx_codec_error(codec_.get()) << "\n" @@ -286,8 +287,8 @@ if (use_vp9_) { ret = vpx_codec_control(codec_.get(), VP9E_GET_ACTIVEMAP, &act_map); DCHECK_EQ(ret, VPX_CODEC_OK) - << "Failed to fetch active map: " - << vpx_codec_err_to_string(ret) << "\n"; + << "Failed to fetch active map: " << vpx_codec_err_to_string(ret) + << "\n"; UpdateRegionFromActiveMap(&updated_region); // If the encoder output no changes then there's nothing left to top-off. @@ -307,8 +308,9 @@ while (!got_data) { const vpx_codec_cx_pkt_t* vpx_packet = vpx_codec_get_cx_data(codec_.get(), &iter); - if (!vpx_packet) + if (!vpx_packet) { continue; + } switch (vpx_packet->kind) { case VPX_CODEC_CX_FRAME_PKT: @@ -442,13 +444,12 @@ for (webrtc::DesktopRegion::Iterator r(*updated_region); !r.IsAtEnd(); r.Advance()) { const webrtc::DesktopRect& rect = r.rect(); - int rgb_offset = rgb_stride * rect.top() + - rect.left() * kBytesPerRgbPixel; + int rgb_offset = + rgb_stride * rect.top() + rect.left() * kBytesPerRgbPixel; int yuv_offset = uv_stride * rect.top() + rect.left(); libyuv::ARGBToI444(rgb_data + rgb_offset, rgb_stride, - y_data + yuv_offset, y_stride, - u_data + yuv_offset, uv_stride, - v_data + yuv_offset, uv_stride, + y_data + yuv_offset, y_stride, u_data + yuv_offset, + uv_stride, v_data + yuv_offset, uv_stride, rect.width(), rect.height()); } break; @@ -456,15 +457,14 @@ for (webrtc::DesktopRegion::Iterator r(*updated_region); !r.IsAtEnd(); r.Advance()) { const webrtc::DesktopRect& rect = r.rect(); - int rgb_offset = rgb_stride * rect.top() + - rect.left() * kBytesPerRgbPixel; + int rgb_offset = + rgb_stride * rect.top() + rect.left() * kBytesPerRgbPixel; int y_offset = y_stride * rect.top() + rect.left(); int uv_offset = uv_stride * rect.top() / 2 + rect.left() / 2; - libyuv::ARGBToI420(rgb_data + rgb_offset, rgb_stride, - y_data + y_offset, y_stride, - u_data + uv_offset, uv_stride, - v_data + uv_offset, uv_stride, - rect.width(), rect.height()); + libyuv::ARGBToI420(rgb_data + rgb_offset, rgb_stride, y_data + y_offset, + y_stride, u_data + uv_offset, uv_stride, + v_data + uv_offset, uv_stride, rect.width(), + rect.height()); } break; default: @@ -492,8 +492,9 @@ uint8_t* map = active_map_.get() + top * active_map_size_.width(); for (int y = top; y <= bottom; ++y) { - for (int x = left; x <= right; ++x) + for (int x = left; x <= right; ++x) { map[x] = 1; + } map += active_map_size_.width(); } } @@ -506,8 +507,9 @@ for (int x0 = 0; x0 < active_map_size_.width();) { int x1 = x0; for (; x1 < active_map_size_.width(); ++x1) { - if (map[y * active_map_size_.width() + x1] == 0) + if (map[y * active_map_size_.width() + x1] == 0) { break; + } } if (x1 > x0) { updated_region->AddRect(webrtc::DesktopRect::MakeLTRB(
diff --git a/remoting/codec/video_encoder_vpx.h b/remoting/codec/video_encoder_vpx.h index 37160a80..453a10c 100644 --- a/remoting/codec/video_encoder_vpx.h +++ b/remoting/codec/video_encoder_vpx.h
@@ -7,7 +7,7 @@ #include <stdint.h> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/time/default_tick_clock.h" #include "base/time/time.h"
diff --git a/remoting/codec/webrtc_video_encoder.h b/remoting/codec/webrtc_video_encoder.h index d73ce9c..f202b56 100644 --- a/remoting/codec/webrtc_video_encoder.h +++ b/remoting/codec/webrtc_video_encoder.h
@@ -10,7 +10,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/time/time.h" #include "third_party/webrtc/api/video/encoded_image.h" #include "third_party/webrtc/api/video/video_codec_type.h"
diff --git a/remoting/codec/webrtc_video_encoder_av1.cc b/remoting/codec/webrtc_video_encoder_av1.cc index 80c25d4..2407a002 100644 --- a/remoting/codec/webrtc_video_encoder_av1.cc +++ b/remoting/codec/webrtc_video_encoder_av1.cc
@@ -4,7 +4,7 @@ #include "remoting/codec/webrtc_video_encoder_av1.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/logging.h" #include "base/notreached.h" #include "base/system/sys_info.h" @@ -325,8 +325,9 @@ changed = true; } - if (!changed) + if (!changed) { return; + } // Update encoder context. if (aom_codec_enc_config_set(codec_.get(), &config_)) { @@ -373,11 +374,13 @@ aom_active_map_t act_map; if (use_active_map_) { - if (params.clear_active_map) + if (params.clear_active_map) { active_map_.Clear(); + } - if (params.key_frame) + if (params.key_frame) { updated_region.SetRect(webrtc::DesktopRect::MakeSize(frame_size)); + } active_map_.Update(updated_region); @@ -434,8 +437,9 @@ while (!got_data) { const aom_codec_cx_pkt_t* aom_packet = aom_codec_get_cx_data(codec_.get(), &iter); - if (!aom_packet) + if (!aom_packet) { continue; + } switch (aom_packet->kind) { case AOM_CODEC_CX_FRAME_PKT: {
diff --git a/remoting/codec/webrtc_video_encoder_av1.h b/remoting/codec/webrtc_video_encoder_av1.h index f654426..0054547 100644 --- a/remoting/codec/webrtc_video_encoder_av1.h +++ b/remoting/codec/webrtc_video_encoder_av1.h
@@ -5,7 +5,7 @@ #ifndef REMOTING_CODEC_WEBRTC_VIDEO_ENCODER_AV1_H_ #define REMOTING_CODEC_WEBRTC_VIDEO_ENCODER_AV1_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "remoting/codec/encoder_bitrate_filter.h" #include "remoting/codec/video_encoder_active_map.h" #include "remoting/codec/webrtc_video_encoder.h"
diff --git a/remoting/codec/webrtc_video_encoder_gpu.cc b/remoting/codec/webrtc_video_encoder_gpu.cc index c5ee8093..bed164a 100644 --- a/remoting/codec/webrtc_video_encoder_gpu.cc +++ b/remoting/codec/webrtc_video_encoder_gpu.cc
@@ -8,9 +8,9 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/containers/flat_map.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/memory/ptr_util.h" #include "base/memory/shared_memory_mapping.h" @@ -344,8 +344,8 @@ auto callback_it = callbacks_.find(metadata.timestamp); DCHECK(callback_it != callbacks_.end()) << "Callback not found for timestamp " << metadata.timestamp; - std::move(std::get<1>(*callback_it)).Run( - EncodeResult::SUCCEEDED, std::move(encoded_frame)); + std::move(std::get<1>(*callback_it)) + .Run(EncodeResult::SUCCEEDED, std::move(encoded_frame)); callbacks_.erase(metadata.timestamp); }
diff --git a/remoting/codec/webrtc_video_encoder_vpx.cc b/remoting/codec/webrtc_video_encoder_vpx.cc index 143c028a90..14edcd0f 100644 --- a/remoting/codec/webrtc_video_encoder_vpx.cc +++ b/remoting/codec/webrtc_video_encoder_vpx.cc
@@ -7,9 +7,9 @@ #include <algorithm> #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/cxx17_backports.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/logging.h" #include "base/memory/ptr_util.h" #include "base/system/sys_info.h" @@ -186,8 +186,9 @@ } void WebrtcVideoEncoderVpx::SetLosslessColor(bool want_lossless) { - if (!use_vp9_) + if (!use_vp9_) { return; + } if (want_lossless != lossless_color_) { lossless_color_ = want_lossless; @@ -201,8 +202,9 @@ } void WebrtcVideoEncoderVpx::SetEncoderSpeed(int encoder_speed) { - if (!use_vp9_) + if (!use_vp9_) { return; + } vp9_encoder_speed_ = base::clamp<int>(encoder_speed, kVp9LosslessEncodeSpeed, kVp9MaxEncoderSpeed); @@ -244,11 +246,13 @@ vpx_active_map_t act_map; if (use_active_map_) { - if (params.clear_active_map) + if (params.clear_active_map) { active_map_.Clear(); + } - if (params.key_frame) + if (params.key_frame) { updated_region.SetRect(webrtc::DesktopRect::MakeSize(frame_size)); + } active_map_.Update(updated_region); @@ -308,8 +312,9 @@ while (!got_data) { const vpx_codec_cx_pkt_t* vpx_packet = vpx_codec_get_cx_data(codec_.get(), &iter); - if (!vpx_packet) + if (!vpx_packet) { continue; + } switch (vpx_packet->kind) { case VPX_CODEC_CX_FRAME_PKT: { @@ -404,8 +409,9 @@ void WebrtcVideoEncoderVpx::UpdateConfig(const FrameParams& params) { // Configuration not initialized. - if (config_.g_timebase.den == 0) + if (config_.g_timebase.den == 0) { return; + } bool changed = false; @@ -432,13 +438,14 @@ changed = true; } - if (!changed) + if (!changed) { return; + } // Update encoder context. - if (vpx_codec_enc_config_set(codec_.get(), &config_)) + if (vpx_codec_enc_config_set(codec_.get(), &config_)) { NOTREACHED() << "Unable to set encoder config"; - + } } void WebrtcVideoEncoderVpx::PrepareImage(
diff --git a/remoting/codec/webrtc_video_encoder_vpx.h b/remoting/codec/webrtc_video_encoder_vpx.h index 9c98cc0..a929705 100644 --- a/remoting/codec/webrtc_video_encoder_vpx.h +++ b/remoting/codec/webrtc_video_encoder_vpx.h
@@ -7,7 +7,7 @@ #include <stdint.h> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/time/default_tick_clock.h" #include "base/time/time.h"
diff --git a/remoting/host/action_message_handler.cc b/remoting/host/action_message_handler.cc index 0319a3906..801e71b6 100644 --- a/remoting/host/action_message_handler.cc +++ b/remoting/host/action_message_handler.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "remoting/base/compound_buffer.h" #include "remoting/host/action_executor.h" #include "remoting/proto/action.pb.h"
diff --git a/remoting/host/audio_capturer_linux.cc b/remoting/host/audio_capturer_linux.cc index 0361304..5ddcaf2 100644 --- a/remoting/host/audio_capturer_linux.cc +++ b/remoting/host/audio_capturer_linux.cc
@@ -31,16 +31,15 @@ scoped_refptr<base::SingleThreadTaskRunner> task_runner, const base::FilePath& pipe_name) { scoped_refptr<AudioPipeReader> pipe_reader; - if (!pipe_name.empty()) + if (!pipe_name.empty()) { pipe_reader = AudioPipeReader::Create(task_runner, pipe_name); + } g_pulseaudio_pipe_sink_reader.Get() = pipe_reader; } AudioCapturerLinux::AudioCapturerLinux( scoped_refptr<AudioPipeReader> pipe_reader) - : pipe_reader_(pipe_reader), - silence_detector_(0) { -} + : pipe_reader_(pipe_reader), silence_detector_(0) {} AudioCapturerLinux::~AudioCapturerLinux() { pipe_reader_->RemoveObserver(this); @@ -78,10 +77,10 @@ } std::unique_ptr<AudioCapturer> AudioCapturer::Create() { - scoped_refptr<AudioPipeReader> reader = - g_pulseaudio_pipe_sink_reader.Get(); - if (!reader.get()) + scoped_refptr<AudioPipeReader> reader = g_pulseaudio_pipe_sink_reader.Get(); + if (!reader.get()) { return nullptr; + } return base::WrapUnique(new AudioCapturerLinux(reader)); }
diff --git a/remoting/host/audio_capturer_linux.h b/remoting/host/audio_capturer_linux.h index 0173e0a..82327150 100644 --- a/remoting/host/audio_capturer_linux.h +++ b/remoting/host/audio_capturer_linux.h
@@ -29,8 +29,7 @@ scoped_refptr<base::SingleThreadTaskRunner> task_runner, const base::FilePath& pipe_name); - explicit AudioCapturerLinux( - scoped_refptr<AudioPipeReader> pipe_reader); + explicit AudioCapturerLinux(scoped_refptr<AudioPipeReader> pipe_reader); AudioCapturerLinux(const AudioCapturerLinux&) = delete; AudioCapturerLinux& operator=(const AudioCapturerLinux&) = delete;
diff --git a/remoting/host/audio_capturer_mac.cc b/remoting/host/audio_capturer_mac.cc index 6e158d0..5b26f278 100644 --- a/remoting/host/audio_capturer_mac.cc +++ b/remoting/host/audio_capturer_mac.cc
@@ -6,8 +6,8 @@ #include <memory> -#include "base/bind.h" #include "base/containers/flat_set.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/no_destructor.h" #include "base/strings/sys_string_conversions.h"
diff --git a/remoting/host/audio_capturer_win.cc b/remoting/host/audio_capturer_win.cc index ba8a7de..1c94e96 100644 --- a/remoting/host/audio_capturer_win.cc +++ b/remoting/host/audio_capturer_win.cc
@@ -122,9 +122,7 @@ } // Get an audio client. - hr = mm_device_->Activate(__uuidof(IAudioClient), - CLSCTX_ALL, - nullptr, + hr = mm_device_->Activate(__uuidof(IAudioClient), CLSCTX_ALL, nullptr, &audio_client_); if (FAILED(hr)) { LOG(ERROR) << "Failed to get an IAudioClient. Error " << hr; @@ -171,8 +169,8 @@ return false; } - sampling_rate_ = static_cast<AudioPacket::SamplingRate>( - wave_format_ex_->nSamplesPerSec); + sampling_rate_ = + static_cast<AudioPacket::SamplingRate>(wave_format_ex_->nSamplesPerSec); wave_format_ex_->wBitsPerSample = kBitsPerSample; wave_format_ex_->nBlockAlign = wave_format_ex_->nChannels * kBytesPerSample; @@ -182,7 +180,7 @@ if (wave_format_ex_->wFormatTag == WAVE_FORMAT_EXTENSIBLE) { PWAVEFORMATEXTENSIBLE wave_format_extensible = reinterpret_cast<WAVEFORMATEXTENSIBLE*>( - static_cast<WAVEFORMATEX*>(wave_format_ex_)); + static_cast<WAVEFORMATEX*>(wave_format_ex_)); if (!IsEqualGUID(KSDATAFORMAT_SUBTYPE_IEEE_FLOAT, wave_format_extensible->SubFormat) && !IsEqualGUID(KSDATAFORMAT_SUBTYPE_PCM, @@ -199,13 +197,10 @@ // Initialize the IAudioClient. hr = audio_client_->Initialize( - AUDCLNT_SHAREMODE_SHARED, - AUDCLNT_STREAMFLAGS_LOOPBACK, + AUDCLNT_SHAREMODE_SHARED, AUDCLNT_STREAMFLAGS_LOOPBACK, (kMaxExpectedTimerLag + audio_device_period_.InMilliseconds()) * - k100nsPerMillisecond, - 0, - wave_format_ex_, - nullptr); + k100nsPerMillisecond, + 0, wave_format_ex_, nullptr); if (FAILED(hr)) { LOG(ERROR) << "Failed to initialize IAudioClient. Error " << hr; return false; @@ -252,8 +247,9 @@ while (true) { UINT32 next_packet_size; hr = audio_capture_client_->GetNextPacketSize(&next_packet_size); - if (FAILED(hr)) + if (FAILED(hr)) { break; + } if (next_packet_size <= 0) { return; @@ -264,8 +260,9 @@ DWORD flags; hr = audio_capture_client_->GetBuffer(&data, &frames, &flags, nullptr, nullptr); - if (FAILED(hr)) + if (FAILED(hr)) { break; + } if (volume_filter_.Apply(reinterpret_cast<int16_t*>(data), frames)) { std::unique_ptr<AudioPacket> packet(new AudioPacket()); @@ -278,27 +275,29 @@ // TODO(zijiehe): Convert dwChannelMask to layout and pass it to // AudioPump. So the stream can be downmixed properly with both number and // layouts of speakers. - packet->set_channels(static_cast<AudioPacket::Channels>( - wave_format_ex_->nChannels)); + packet->set_channels( + static_cast<AudioPacket::Channels>(wave_format_ex_->nChannels)); callback_.Run(std::move(packet)); } hr = audio_capture_client_->ReleaseBuffer(frames); - if (FAILED(hr)) + if (FAILED(hr)) { break; + } } // There is nothing to capture if the audio endpoint device has been unplugged // or disabled. - if (hr == AUDCLNT_E_DEVICE_INVALIDATED) + if (hr == AUDCLNT_E_DEVICE_INVALIDATED) { return; + } // Avoid reporting the same error multiple times. if (FAILED(hr) && hr != last_capture_error_) { last_capture_error_ = hr; - LOG(ERROR) << "Failed to capture an audio packet: 0x" - << std::hex << hr << std::dec << "."; + LOG(ERROR) << "Failed to capture an audio packet: 0x" << std::hex << hr + << std::dec << "."; } }
diff --git a/remoting/host/audio_silence_detector.cc b/remoting/host/audio_silence_detector.cc index 180ad3b..aaae9782 100644 --- a/remoting/host/audio_silence_detector.cc +++ b/remoting/host/audio_silence_detector.cc
@@ -38,8 +38,7 @@ channels_ = channels; } -bool AudioSilenceDetector::IsSilence(const int16_t* samples, - size_t frames) { +bool AudioSilenceDetector::IsSilence(const int16_t* samples, size_t frames) { const int samples_count = frames * channels(); bool silent_packet = true; // Potentially this loop can be optimized (e.g. using SSE or adding special
diff --git a/remoting/host/audio_silence_detector.h b/remoting/host/audio_silence_detector.h index 6c2a5ba..443d3ae 100644 --- a/remoting/host/audio_silence_detector.h +++ b/remoting/host/audio_silence_detector.h
@@ -8,7 +8,6 @@ #include <stddef.h> #include <stdint.h> - namespace remoting { // Helper used in audio capturers to detect and drop silent audio packets.
diff --git a/remoting/host/audio_volume_filter_unittest.cc b/remoting/host/audio_volume_filter_unittest.cc index 961d393..d4d97c6 100644 --- a/remoting/host/audio_volume_filter_unittest.cc +++ b/remoting/host/audio_volume_filter_unittest.cc
@@ -28,8 +28,8 @@ } // namespace TEST(AudioVolumeFilterTest, TwoChannels) { - int16_t samples[] = - {1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9, 10, 10}; + int16_t samples[] = {1, 1, 2, 2, 3, 3, 4, 4, 5, 5, + 6, 6, 7, 7, 8, 8, 9, 9, 10, 10}; FakeAudioVolumeFilter filter(0); filter.set_audio_level(0.5f); filter.Initialize(9, 2); @@ -40,8 +40,8 @@ } TEST(AudioVolumeFilterTest, ThreeChannels) { - int16_t samples[] = - {1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9, 10, 10, 11}; + int16_t samples[] = {1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, + 6, 7, 7, 8, 8, 9, 9, 10, 10, 11}; FakeAudioVolumeFilter filter(0); filter.set_audio_level(0.5f); filter.Initialize(6, 3); @@ -49,8 +49,8 @@ } TEST(AudioVolumeFilterTest, SilentSamples) { - int16_t samples[] = - {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}; + int16_t samples[] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}; FakeAudioVolumeFilter filter(0); filter.set_audio_level(0.5f); filter.Initialize(9, 2); @@ -58,8 +58,8 @@ } TEST(AudioVolumeFilterTest, AudioLevel0) { - int16_t samples[] = - {1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9, 10, 10}; + int16_t samples[] = {1, 1, 2, 2, 3, 3, 4, 4, 5, 5, + 6, 6, 7, 7, 8, 8, 9, 9, 10, 10}; FakeAudioVolumeFilter filter(0); filter.set_audio_level(0); filter.Initialize(9, 2); @@ -67,8 +67,8 @@ } TEST(AudioVolumeFilterTest, SilentAfterApplying) { - int16_t samples[] = - {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}; + int16_t samples[] = {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1}; FakeAudioVolumeFilter filter(0); filter.set_audio_level(0.9f); filter.Initialize(9, 2);
diff --git a/remoting/host/backoff_timer.cc b/remoting/host/backoff_timer.cc index e4046e7..f0199ab 100644 --- a/remoting/host/backoff_timer.cc +++ b/remoting/host/backoff_timer.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" namespace remoting {
diff --git a/remoting/host/backoff_timer.h b/remoting/host/backoff_timer.h index 0c8bcad..1621fe9 100644 --- a/remoting/host/backoff_timer.h +++ b/remoting/host/backoff_timer.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/timer/timer.h" #include "net/base/backoff_entry.h"
diff --git a/remoting/host/backoff_timer_unittest.cc b/remoting/host/backoff_timer_unittest.cc index 87457854..c74f749df 100644 --- a/remoting/host/backoff_timer_unittest.cc +++ b/remoting/host/backoff_timer_unittest.cc
@@ -4,7 +4,7 @@ #include "remoting/host/backoff_timer.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/test/task_environment.h" #include "base/time/time.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/remoting/host/basic_desktop_environment.cc b/remoting/host/basic_desktop_environment.cc index 597343d9..3e5b353 100644 --- a/remoting/host/basic_desktop_environment.cc +++ b/remoting/host/basic_desktop_environment.cc
@@ -7,8 +7,8 @@ #include <memory> #include <utility> -#include "base/bind.h" #include "base/check.h" +#include "base/functional/bind.h" #include "base/task/single_thread_task_runner.h" #include "build/build_config.h" #include "remoting/host/action_executor.h" @@ -221,8 +221,9 @@ #if BUILDFLAG(IS_APPLE) // Mac includes the mouse cursor in the captured image in curtain mode. - if (options_.enable_curtaining()) + if (options_.enable_curtaining()) { return desktop_capturer; + } #endif return std::make_unique<DesktopAndCursorConditionalComposer>( std::move(desktop_capturer));
diff --git a/remoting/host/branding.cc b/remoting/host/branding.cc index 94446512..69f7b7ad 100644 --- a/remoting/host/branding.cc +++ b/remoting/host/branding.cc
@@ -20,8 +20,7 @@ const base::FilePath::CharType kConfigDir[] = FILE_PATH_LITERAL("Google\\Chrome Remote Desktop"); #else -const base::FilePath::CharType kConfigDir[] = - FILE_PATH_LITERAL("Chromoting"); +const base::FilePath::CharType kConfigDir[] = FILE_PATH_LITERAL("Chromoting"); #endif #elif BUILDFLAG(IS_APPLE) const base::FilePath::CharType kConfigDir[] = @@ -31,7 +30,7 @@ FILE_PATH_LITERAL(".config/chrome-remote-desktop"); #endif -} // namespace +} // namespace namespace remoting { @@ -53,4 +52,4 @@ return app_data_dir.Append(kConfigDir); } -} // namespace remoting +} // namespace remoting
diff --git a/remoting/host/branding.h b/remoting/host/branding.h index b7bab80..694592a0 100644 --- a/remoting/host/branding.h +++ b/remoting/host/branding.h
@@ -18,6 +18,6 @@ // Returns the location of the host configuration directory. base::FilePath GetConfigDir(); -} // namespace remoting +} // namespace remoting -#endif // REMOTING_HOST_BRANDING_H_ +#endif // REMOTING_HOST_BRANDING_H_
diff --git a/remoting/host/chromeos/ash_proxy.h b/remoting/host/chromeos/ash_proxy.h index 2757363..501488a2 100644 --- a/remoting/host/chromeos/ash_proxy.h +++ b/remoting/host/chromeos/ash_proxy.h
@@ -8,7 +8,7 @@ #include <cstdint> #include <vector> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "mojo/public/cpp/bindings/pending_receiver.h" #include "third_party/abseil-cpp/absl/types/optional.h" #include "ui/display/display.h"
diff --git a/remoting/host/chromeos/aura_desktop_capturer.cc b/remoting/host/chromeos/aura_desktop_capturer.cc index a4f96ef..c522c60f 100644 --- a/remoting/host/chromeos/aura_desktop_capturer.cc +++ b/remoting/host/chromeos/aura_desktop_capturer.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/logging.h" #include "base/metrics/histogram_functions.h" #include "remoting/host/chromeos/ash_proxy.h"
diff --git a/remoting/host/chromeos/clipboard_aura_unittest.cc b/remoting/host/chromeos/clipboard_aura_unittest.cc index 001a53c..ef1b357 100644 --- a/remoting/host/chromeos/clipboard_aura_unittest.cc +++ b/remoting/host/chromeos/clipboard_aura_unittest.cc
@@ -6,8 +6,8 @@ #include <memory> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ptr_util.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h"
diff --git a/remoting/host/chromeos/message_box.h b/remoting/host/chromeos/message_box.h index 79f2516..868bd386 100644 --- a/remoting/host/chromeos/message_box.h +++ b/remoting/host/chromeos/message_box.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/threading/thread_checker.h" #include "ui/base/ui_base_types.h"
diff --git a/remoting/host/chromeos/mouse_cursor_monitor_aura.cc b/remoting/host/chromeos/mouse_cursor_monitor_aura.cc index 2924181a..02c0703f 100644 --- a/remoting/host/chromeos/mouse_cursor_monitor_aura.cc +++ b/remoting/host/chromeos/mouse_cursor_monitor_aura.cc
@@ -7,8 +7,8 @@ #include <utility> #include "ash/shell.h" -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/location.h" #include "remoting/host/chromeos/skia_bitmap_desktop_frame.h" #include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/remoting/host/chromeos/remote_support_host_ash.h b/remoting/host/chromeos/remote_support_host_ash.h index c6f3edb..dde2091 100644 --- a/remoting/host/chromeos/remote_support_host_ash.h +++ b/remoting/host/chromeos/remote_support_host_ash.h
@@ -5,7 +5,7 @@ #ifndef REMOTING_HOST_CHROMEOS_REMOTE_SUPPORT_HOST_ASH_H_ #define REMOTING_HOST_CHROMEOS_REMOTE_SUPPORT_HOST_ASH_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/sequence_checker.h" #include "mojo/public/cpp/bindings/pending_receiver.h" #include "mojo/public/cpp/bindings/receiver_set.h"
diff --git a/remoting/host/chromoting_host.cc b/remoting/host/chromoting_host.cc index 1d7bffa3..8f76694 100644 --- a/remoting/host/chromoting_host.cc +++ b/remoting/host/chromoting_host.cc
@@ -9,9 +9,9 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/ptr_util.h" #include "base/ranges/algorithm.h" #include "base/task/single_thread_task_runner.h" @@ -108,8 +108,9 @@ // Notify observers. if (started_) { - for (auto& observer : status_monitor_->observers()) + for (auto& observer : status_monitor_->observers()) { observer.OnHostShutdown(); + } } } @@ -119,8 +120,9 @@ HOST_LOG << "Starting host"; started_ = true; - for (auto& observer : status_monitor_->observers()) + for (auto& observer : status_monitor_->observers()) { observer.OnHostStarted(host_owner_email); + } session_manager_->AcceptIncoming(base::BindRepeating( &ChromotingHost::OnIncomingSession, base::Unretained(this))); @@ -212,8 +214,9 @@ protocol::OK); // Quit if the host was destroyed. - if (!self) + if (!self) { return; + } } // Disconnects above must have destroyed all other clients. @@ -221,24 +224,27 @@ DCHECK(clients_.front().get() == client); // Notify observers that there is at least one authenticated client. - for (auto& observer : status_monitor_->observers()) + for (auto& observer : status_monitor_->observers()) { observer.OnClientAuthenticated(client->client_jid()); + } } void ChromotingHost::OnSessionChannelsConnected(ClientSession* client) { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); // Notify observers. - for (auto& observer : status_monitor_->observers()) + for (auto& observer : status_monitor_->observers()) { observer.OnClientConnected(client->client_jid()); + } } void ChromotingHost::OnSessionAuthenticationFailed(ClientSession* client) { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); // Notify observers. - for (auto& observer : status_monitor_->observers()) + for (auto& observer : status_monitor_->observers()) { observer.OnClientAccessDenied(client->client_jid()); + } } void ChromotingHost::OnSessionClosed(ClientSession* client) { @@ -253,8 +259,9 @@ clients_.erase(it); if (was_authenticated) { - for (auto& observer : status_monitor_->observers()) + for (auto& observer : status_monitor_->observers()) { observer.OnClientDisconnected(jid); + } } } @@ -263,8 +270,9 @@ const std::string& channel_name, const protocol::TransportRoute& route) { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); - for (auto& observer : status_monitor_->observers()) + for (auto& observer : status_monitor_->observers()) { observer.OnClientRouteChange(session->client_jid(), channel_name, route); + } } void ChromotingHost::BindSessionServices( @@ -329,8 +337,9 @@ // Create a ClientSession object. std::vector<HostExtension*> extension_ptrs; - for (const auto& extension : extensions_) + for (const auto& extension : extensions_) { extension_ptrs.push_back(extension.get()); + } clients_.push_back(std::make_unique<ClientSession>( this, std::move(connection), desktop_environment_factory_, desktop_environment_options_, max_session_duration_, pairing_registry_,
diff --git a/remoting/host/chromoting_host_context.cc b/remoting/host/chromoting_host_context.cc index 7fa088d..64cec5a 100644 --- a/remoting/host/chromoting_host_context.cc +++ b/remoting/host/chromoting_host_context.cc
@@ -4,8 +4,8 @@ #include "remoting/host/chromoting_host_context.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ptr_util.h" #include "base/message_loop/message_pump_type.h" #include "base/task/single_thread_task_runner.h" @@ -48,9 +48,10 @@ url_request_context_getter_(url_request_context_getter) {} ChromotingHostContext::~ChromotingHostContext() { - if (url_loader_factory_owner_) + if (url_loader_factory_owner_) { network_task_runner_->DeleteSoon(FROM_HERE, url_loader_factory_owner_.release()); + } } std::unique_ptr<ChromotingHostContext> ChromotingHostContext::Copy() {
diff --git a/remoting/host/chromoting_host_context_unittest.cc b/remoting/host/chromoting_host_context_unittest.cc index dfc7852d..752ae3e 100644 --- a/remoting/host/chromoting_host_context_unittest.cc +++ b/remoting/host/chromoting_host_context_unittest.cc
@@ -23,8 +23,9 @@ task_environment.GetMainThreadTaskRunner(), run_loop.QuitClosure())); EXPECT_TRUE(context); - if (!context) + if (!context) { return; + } EXPECT_TRUE(context->audio_task_runner().get()); EXPECT_TRUE(context->video_capture_task_runner().get()); EXPECT_TRUE(context->video_encode_task_runner().get());
diff --git a/remoting/host/chromoting_host_services_client.h b/remoting/host/chromoting_host_services_client.h index 9b28e59a..a918613 100644 --- a/remoting/host/chromoting_host_services_client.h +++ b/remoting/host/chromoting_host_services_client.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/sequence_checker.h" #include "base/thread_annotations.h" #include "build/build_config.h"
diff --git a/remoting/host/chromoting_host_services_client_unittest.cc b/remoting/host/chromoting_host_services_client_unittest.cc index 6e7e7b72..93f984b2 100644 --- a/remoting/host/chromoting_host_services_client_unittest.cc +++ b/remoting/host/chromoting_host_services_client_unittest.cc
@@ -7,10 +7,9 @@ #include <memory> #include <vector> -#include "base/bind.h" -#include "base/callback.h" #include "base/environment.h" #include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h"
diff --git a/remoting/host/chromoting_host_unittest.cc b/remoting/host/chromoting_host_unittest.cc index 9f67138d..a02a4055 100644 --- a/remoting/host/chromoting_host_unittest.cc +++ b/remoting/host/chromoting_host_unittest.cc
@@ -7,8 +7,8 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" @@ -159,16 +159,18 @@ if (authenticate) { client_ptr->OnConnectionAuthenticated(); - if (!reject) + if (!reject) { client_ptr->OnConnectionChannelsConnected(); + } } else { client_ptr->OnConnectionClosed(protocol::AUTHENTICATION_FAILED); } } void TearDown() override { - if (host_) + if (host_) { ShutdownHost(); + } task_runner_ = nullptr; base::RunLoop().RunUntilIdle();
diff --git a/remoting/host/client_session.cc b/remoting/host/client_session.cc index 13fe9e3a..3808492 100644 --- a/remoting/host/client_session.cc +++ b/remoting/host/client_session.cc
@@ -8,11 +8,11 @@ #include <memory> #include <utility> -#include "base/bind.h" #include "base/command_line.h" #include "base/containers/contains.h" #include "base/containers/cxx20_erase_map.h" #include "base/cxx17_backports.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/strings/string_number_conversions.h" #include "base/task/single_thread_task_runner.h" @@ -131,8 +131,9 @@ VLOG(1) << "Received ClientResolution (dips_width=" << resolution.dips_width() << ", dips_height=" << resolution.dips_height() << ")"; - if (!screen_controls_) + if (!screen_controls_) { return; + } webrtc::DesktopSize client_size(resolution.dips_width(), resolution.dips_height()); @@ -152,8 +153,9 @@ ScreenResolution screen_resolution( client_size, webrtc::DesktopVector(kDefaultDpi, kDefaultDpi)); absl::optional<webrtc::ScreenId> screen_id; - if (resolution.has_screen_id()) + if (resolution.has_screen_id()) { screen_id = resolution.screen_id(); + } screen_controls_->SetScreenResolution(screen_resolution, screen_id); } @@ -209,8 +211,9 @@ if (audio_control.has_enable()) { VLOG(1) << "Received AudioControl (enable=" << audio_control.enable() << ")"; - if (audio_stream_) + if (audio_stream_) { audio_stream_->Pause(!audio_control.enable()); + } } } @@ -226,8 +229,9 @@ // Compute the set of capabilities supported by both client and host. client_capabilities_ = std::make_unique<std::string>(); - if (capabilities.has_capabilities()) + if (capabilities.has_capabilities()) { *client_capabilities_ = capabilities.capabilities(); + } capabilities_ = IntersectCapabilities(*client_capabilities_, host_capabilities_); extension_manager_->OnNegotiatedCapabilities(connection_->client_stub(), @@ -267,10 +271,12 @@ } std::vector<ActionRequest::Action> supported_actions; - if (HasCapability(capabilities_, protocol::kSendAttentionSequenceAction)) + if (HasCapability(capabilities_, protocol::kSendAttentionSequenceAction)) { supported_actions.push_back(ActionRequest::SEND_ATTENTION_SEQUENCE); - if (HasCapability(capabilities_, protocol::kLockWorkstationAction)) + } + if (HasCapability(capabilities_, protocol::kLockWorkstationAction)) { supported_actions.push_back(ActionRequest::LOCK_WORKSTATION); + } if (supported_actions.size() > 0) { // Register the action message handler. @@ -330,8 +336,9 @@ void ClientSession::DeliverClientMessage( const protocol::ExtensionMessage& message) { if (message.has_type()) { - if (extension_manager_->OnExtensionMessage(message)) + if (extension_manager_->OnExtensionMessage(message)) { return; + } DLOG(INFO) << "Unexpected message received: " << message.type() << ": " << message.data(); @@ -503,11 +510,13 @@ // Collate the set of capabilities to offer the client, if it supports them. host_capabilities_ = desktop_environment_->GetCapabilities(); - if (!host_capabilities_.empty()) + if (!host_capabilities_.empty()) { host_capabilities_.append(" "); + } host_capabilities_.append(extension_manager_->GetCapabilities()); - if (!host_capabilities_.empty()) + if (!host_capabilities_.empty()) { host_capabilities_.append(" "); + } host_capabilities_.append(protocol::kRtcLogTransferCapability); host_capabilities_.append(" "); host_capabilities_.append(protocol::kWebrtcIceSdpRestartAction); @@ -672,8 +681,9 @@ client_session_events_weak_factory_.InvalidateWeakPtrs(); // If the client never authenticated then the session failed. - if (!is_authenticated_) + if (!is_authenticated_) { event_handler_->OnSessionAuthenticationFailed(this); + } // Ensure that any pressed keys or buttons are released. input_tracker_.ReleaseAll(); @@ -756,8 +766,9 @@ void ClientSession::SetDisableInputs(bool disable_inputs) { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); - if (disable_inputs) + if (disable_inputs) { input_tracker_.ReleaseAll(); + } disable_input_filter_.set_enabled(!disable_inputs); host_clipboard_filter_.set_enabled(!disable_inputs); @@ -889,8 +900,9 @@ } void ClientSession::UpdateMouseClampingFilterOffset() { - if (selected_display_index_ == webrtc::kInvalidScreenId) + if (selected_display_index_ == webrtc::kInvalidScreenId) { return; + } webrtc::DesktopVector origin; origin = desktop_display_info_.CalcDisplayOffset(selected_display_index_); @@ -976,10 +988,12 @@ << track.position_y() << " " << track.width() << "x" << track.height() << " [" << track.x_dpi() << "," << track.y_dpi() << "], screen_id=" << track.screen_id(); - if (dpi_x == 0) + if (dpi_x == 0) { dpi_x = track.x_dpi(); - if (dpi_y == 0) + } + if (dpi_y == 0) { dpi_y = track.y_dpi(); + } int x = track.position_x(); int y = track.position_y(); @@ -990,10 +1004,12 @@ } // TODO(garykac): Investigate why these DPI values are 0 for some users. - if (dpi_x == 0) + if (dpi_x == 0) { dpi_x = default_x_dpi_; - if (dpi_y == 0) + } + if (dpi_y == 0) { dpi_y = default_y_dpi_; + } // Calc desktop scaled geometry (in DIPs) // See comment in OnVideoSizeChanged() for details. @@ -1160,8 +1176,9 @@ std::unique_ptr<protocol::MessagePipe> pipe) { std::unique_ptr<ActionExecutor> action_executor = desktop_environment_->CreateActionExecutor(); - if (!action_executor) + if (!action_executor) { return; + } // ActionMessageHandler manages its own lifetime and is tied to the lifetime // of |pipe|. Once |pipe| is closed, this instance will be cleaned up.
diff --git a/remoting/host/client_session.h b/remoting/host/client_session.h index f18b122..826ed05 100644 --- a/remoting/host/client_session.h +++ b/remoting/host/client_session.h
@@ -115,14 +115,13 @@ // |event_handler| and |desktop_environment_factory| must outlive |this|. // All |HostExtension|s in |extensions| must outlive |this|. - ClientSession( - EventHandler* event_handler, - std::unique_ptr<protocol::ConnectionToClient> connection, - DesktopEnvironmentFactory* desktop_environment_factory, - const DesktopEnvironmentOptions& desktop_environment_options, - const base::TimeDelta& max_duration, - scoped_refptr<protocol::PairingRegistry> pairing_registry, - const std::vector<HostExtension*>& extensions); + ClientSession(EventHandler* event_handler, + std::unique_ptr<protocol::ConnectionToClient> connection, + DesktopEnvironmentFactory* desktop_environment_factory, + const DesktopEnvironmentOptions& desktop_environment_options, + const base::TimeDelta& max_duration, + scoped_refptr<protocol::PairingRegistry> pairing_registry, + const std::vector<HostExtension*>& extensions); ClientSession(const ClientSession&) = delete; ClientSession& operator=(const ClientSession&) = delete;
diff --git a/remoting/host/client_session_unittest.cc b/remoting/host/client_session_unittest.cc index c040846..b2dd83fc 100644 --- a/remoting/host/client_session_unittest.cc +++ b/remoting/host/client_session_unittest.cc
@@ -11,8 +11,8 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" @@ -67,8 +67,9 @@ // Matches a |protocol::Capabilities| argument against a list of capabilities // formatted as a space-separated string. MATCHER_P(IncludesCapabilities, expected_capabilities, "") { - if (!arg.has_capabilities()) + if (!arg.has_capabilities()) { return false; + } std::vector<std::string> words_args = base::SplitString(arg.capabilities(), " ", base::KEEP_WHITESPACE, @@ -225,8 +226,9 @@ void ClientSessionTest::TearDown() { if (client_session_) { - if (connection_->is_connected()) + if (connection_->is_connected()) { client_session_->DisconnectSession(protocol::OK); + } client_session_.reset(); desktop_environment_factory_.reset(); } @@ -318,14 +320,18 @@ y_max = disp_y_max; initialized = true; } else { - if (disp.x < x_min) + if (disp.x < x_min) { x_min = disp.x; - if (disp_x_max > x_max) + } + if (disp_x_max > x_max) { x_max = disp_x_max; - if (disp.y < y_min) + } + if (disp.y < y_min) { y_min = disp.y; - if (disp_y_max > y_max) + } + if (disp_y_max > y_max) { y_max = disp_y_max; + } } } int width = x_max - x_min;
diff --git a/remoting/host/clipboard.h b/remoting/host/clipboard.h index c1a8add..e1194ef 100644 --- a/remoting/host/clipboard.h +++ b/remoting/host/clipboard.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" namespace remoting {
diff --git a/remoting/host/clipboard_mac.mm b/remoting/host/clipboard_mac.mm index fa6f25e8..5ee421f7 100644 --- a/remoting/host/clipboard_mac.mm +++ b/remoting/host/clipboard_mac.mm
@@ -25,7 +25,7 @@ // Clipboard polling interval in milliseconds. const int64_t kClipboardPollingIntervalMs = 500; -} // namespace +} // namespace namespace remoting { @@ -72,8 +72,9 @@ void ClipboardMac::InjectClipboardEvent(const protocol::ClipboardEvent& event) { // Currently we only handle UTF-8 text. - if (event.mime_type().compare(kMimeTypeTextUtf8) != 0) + if (event.mime_type().compare(kMimeTypeTextUtf8) != 0) { return; + } if (!base::IsStringUTF8AllowingNoncharacters(event.data())) { LOG(ERROR) << "ClipboardEvent data is not UTF-8 encoded."; return; @@ -98,8 +99,8 @@ } current_change_count_ = change_count; - NSArray* objects = - [pasteboard readObjectsForClasses:@[ [NSString class] ] options:0]; + NSArray* objects = [pasteboard readObjectsForClasses:@[ [NSString class] ] + options:0]; if (![objects count]) { return; }
diff --git a/remoting/host/clipboard_win.cc b/remoting/host/clipboard_win.cc index 5252244..f772892 100644 --- a/remoting/host/clipboard_win.cc +++ b/remoting/host/clipboard_win.cc
@@ -9,7 +9,7 @@ #include <memory> #include <string> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/memory/ptr_util.h" #include "base/strings/string_util.h" @@ -29,8 +29,7 @@ // ui/base/clipboard/clipboard_win.cc. class ScopedClipboard { public: - ScopedClipboard() : opened_(false) { - } + ScopedClipboard() : opened_(false) {} ~ScopedClipboard() { if (opened_) { @@ -113,8 +112,7 @@ void Start( std::unique_ptr<protocol::ClipboardStub> client_clipboard) override; - void InjectClipboardEvent( - const protocol::ClipboardEvent& event) override; + void InjectClipboardEvent(const protocol::ClipboardEvent& event) override; private: void OnClipboardUpdate(); @@ -133,8 +131,9 @@ ClipboardWin::ClipboardWin() {} ClipboardWin::~ClipboardWin() { - if (window_) + if (window_) { ::RemoveClipboardFormatListener(window_->hwnd()); + } } void ClipboardWin::Start( @@ -156,14 +155,15 @@ } } -void ClipboardWin::InjectClipboardEvent( - const protocol::ClipboardEvent& event) { - if (!window_) +void ClipboardWin::InjectClipboardEvent(const protocol::ClipboardEvent& event) { + if (!window_) { return; + } // Currently we only handle UTF-8 text. - if (event.mime_type().compare(kMimeTypeTextUtf8) != 0) + if (event.mime_type().compare(kMimeTypeTextUtf8) != 0) { return; + } if (!base::IsStringUTF8AllowingNoncharacters(event.data())) { LOG(ERROR) << "ClipboardEvent: data is not UTF-8 encoded."; return; @@ -234,8 +234,10 @@ } } -bool ClipboardWin::HandleMessage( - UINT message, WPARAM wparam, LPARAM lparam, LRESULT* result) { +bool ClipboardWin::HandleMessage(UINT message, + WPARAM wparam, + LPARAM lparam, + LRESULT* result) { if (message == WM_CLIPBOARDUPDATE) { OnClipboardUpdate(); *result = 0;
diff --git a/remoting/host/clipboard_x11.cc b/remoting/host/clipboard_x11.cc index a7232d0a..ee56c97 100644 --- a/remoting/host/clipboard_x11.cc +++ b/remoting/host/clipboard_x11.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/memory/raw_ptr.h" #include "remoting/host/linux/x_server_clipboard.h"
diff --git a/remoting/host/config_file_watcher.cc b/remoting/host/config_file_watcher.cc index 143749bd..73abe54 100644 --- a/remoting/host/config_file_watcher.cc +++ b/remoting/host/config_file_watcher.cc
@@ -7,10 +7,10 @@ #include <memory> #include <string> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/files/file_path_watcher.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" @@ -94,8 +94,8 @@ scoped_refptr<base::SingleThreadTaskRunner> io_task_runner, const base::FilePath& config_path) : impl_(new ConfigFileWatcherImpl(main_task_runner, - io_task_runner, config_path)) { -} + io_task_runner, + config_path)) {} ConfigFileWatcher::~ConfigFileWatcher() { impl_->StopWatching(); @@ -182,8 +182,9 @@ // the updated configuration file before it has been completely written. // If the writer moves the new configuration file into place atomically, // this delay may not be necessary. - if (!error && config_path_ == path) + if (!error && config_path_ == path) { config_updated_timer_->Reset(); + } } void ConfigFileWatcherImpl::NotifyError() {
diff --git a/remoting/host/config_file_watcher_unittest.cc b/remoting/host/config_file_watcher_unittest.cc index 0bc623be..4565b55 100644 --- a/remoting/host/config_file_watcher_unittest.cc +++ b/remoting/host/config_file_watcher_unittest.cc
@@ -92,21 +92,22 @@ void ConfigFileWatcherTest::TearDown() { // Delete the test file. - if (!config_file_.empty()) + if (!config_file_.empty()) { base::DeleteFile(config_file_); + } } // Verifies that the initial notification is delivered. TEST_F(ConfigFileWatcherTest, Basic) { std::string data("test"); EXPECT_NE(base::WriteFile(config_file_, data.c_str(), - static_cast<int>(data.size())), -1); + static_cast<int>(data.size())), + -1); EXPECT_CALL(delegate_, OnConfigUpdated(_)) .Times(1) .WillOnce(InvokeWithoutArgs(this, &ConfigFileWatcherTest::StopWatcher)); - EXPECT_CALL(delegate_, OnConfigWatcherError()) - .Times(0); + EXPECT_CALL(delegate_, OnConfigWatcherError()).Times(0); watcher_->Watch(&delegate_); run_loop_.Run(); @@ -121,15 +122,15 @@ EXPECT_CALL(delegate_, OnConfigUpdated(EqualsString("test"))) .Times(1) .WillOnce(InvokeWithoutArgs(this, &ConfigFileWatcherTest::StopWatcher)); - EXPECT_CALL(delegate_, OnConfigWatcherError()) - .Times(0); + EXPECT_CALL(delegate_, OnConfigWatcherError()).Times(0); watcher_->Watch(&delegate_); // Modify the watched file. std::string data("test"); EXPECT_NE(base::WriteFile(config_file_, data.c_str(), - static_cast<int>(data.size())), -1); + static_cast<int>(data.size())), + -1); run_loop_.Run(); }
diff --git a/remoting/host/continue_window.cc b/remoting/host/continue_window.cc index 7cae60e5..36594c03 100644 --- a/remoting/host/continue_window.cc +++ b/remoting/host/continue_window.cc
@@ -38,8 +38,9 @@ disconnect_timer_.Stop(); - if (!client_session_control_) + if (!client_session_control_) { return; + } // Hide the Continue window and resume the session. HideUi(); @@ -53,15 +54,17 @@ DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); disconnect_timer_.Stop(); - if (client_session_control_) + if (client_session_control_) { client_session_control_->DisconnectSession(protocol::MAX_SESSION_LENGTH); + } } void ContinueWindow::OnSessionExpired() { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); - if (!client_session_control_) + if (!client_session_control_) { return; + } // Stop the remote input while the Continue window is shown. client_session_control_->SetDisableInputs(true);
diff --git a/remoting/host/continue_window_chromeos.cc b/remoting/host/continue_window_chromeos.cc index a6b6e7a..6ab18f2 100644 --- a/remoting/host/continue_window_chromeos.cc +++ b/remoting/host/continue_window_chromeos.cc
@@ -6,7 +6,7 @@ #include "remoting/host/continue_window.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "remoting/base/string_resources.h" #include "remoting/host/chromeos/message_box.h" #include "ui/base/l10n/l10n_util.h"
diff --git a/remoting/host/continue_window_linux.cc b/remoting/host/continue_window_linux.cc index 8b1a6015..57c5e6e 100644 --- a/remoting/host/continue_window_linux.cc +++ b/remoting/host/continue_window_linux.cc
@@ -39,9 +39,7 @@ GtkWidget* continue_window_; }; -ContinueWindowGtk::ContinueWindowGtk() - : continue_window_(nullptr) { -} +ContinueWindowGtk::ContinueWindowGtk() : continue_window_(nullptr) {} ContinueWindowGtk::~ContinueWindowGtk() { if (continue_window_) { @@ -73,13 +71,11 @@ DCHECK(!continue_window_); continue_window_ = gtk_dialog_new_with_buttons( - l10n_util::GetStringUTF8(IDS_PRODUCT_NAME).c_str(), - nullptr, + l10n_util::GetStringUTF8(IDS_PRODUCT_NAME).c_str(), nullptr, GTK_DIALOG_MODAL, l10n_util::GetStringUTF8(IDS_STOP_SHARING_BUTTON).c_str(), GTK_RESPONSE_CANCEL, - l10n_util::GetStringUTF8(IDS_CONTINUE_BUTTON).c_str(), - GTK_RESPONSE_OK, + l10n_util::GetStringUTF8(IDS_CONTINUE_BUTTON).c_str(), GTK_RESPONSE_OK, nullptr); gtk_dialog_set_default_response(GTK_DIALOG(continue_window_), @@ -90,8 +86,8 @@ // DisconnectWindow. gtk_window_set_keep_above(GTK_WINDOW(continue_window_), TRUE); - g_signal_connect(continue_window_, "response", - G_CALLBACK(OnResponseThunk), this); + g_signal_connect(continue_window_, "response", G_CALLBACK(OnResponseThunk), + this); GtkWidget* content_area = gtk_dialog_get_content_area(GTK_DIALOG(continue_window_));
diff --git a/remoting/host/continue_window_mac.mm b/remoting/host/continue_window_mac.mm index 214fa60f..fae7e297 100644 --- a/remoting/host/continue_window_mac.mm +++ b/remoting/host/continue_window_mac.mm
@@ -53,8 +53,7 @@ base::scoped_nsobject<ContinueWindowMacController> controller_; }; -ContinueWindowMac::ContinueWindowMac() { -} +ContinueWindowMac::ContinueWindowMac() {} ContinueWindowMac::~ContinueWindowMac() { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); @@ -102,7 +101,7 @@ // Generate window shade NSArray* screens = [NSScreen screens]; _shades.reset([[NSMutableArray alloc] initWithCapacity:[screens count]]); - for (NSScreen *screen in screens) { + for (NSScreen* screen in screens) { NSWindow* shade = [[[NSWindow alloc] initWithContentRect:[screen frame] styleMask:NSWindowStyleMaskBorderless @@ -125,20 +124,18 @@ _continue_alert.reset([[NSAlert alloc] init]); [_continue_alert setMessageText:l10n_util::GetNSString(IDS_CONTINUE_PROMPT)]; - NSButton* continue_button = - [_continue_alert addButtonWithTitle:l10n_util::GetNSString( - IDS_CONTINUE_BUTTON)]; + NSButton* continue_button = [_continue_alert + addButtonWithTitle:l10n_util::GetNSString(IDS_CONTINUE_BUTTON)]; [continue_button setAction:@selector(onContinue:)]; [continue_button setTarget:self]; - NSButton* cancel_button = - [_continue_alert addButtonWithTitle:l10n_util::GetNSString( - IDS_STOP_SHARING_BUTTON)]; + NSButton* cancel_button = [_continue_alert + addButtonWithTitle:l10n_util::GetNSString(IDS_STOP_SHARING_BUTTON)]; [cancel_button setAction:@selector(onCancel:)]; [cancel_button setTarget:self]; - NSBundle *bundle = [NSBundle bundleForClass:[self class]]; - NSString *imagePath = [bundle pathForResource:@"chromoting128" ofType:@"png"]; + NSBundle* bundle = [NSBundle bundleForClass:[self class]]; + NSString* imagePath = [bundle pathForResource:@"chromoting128" ofType:@"png"]; base::scoped_nsobject<NSImage> image( [[NSImage alloc] initByReferencingFile:imagePath]); [_continue_alert setIcon:image];
diff --git a/remoting/host/continue_window_win.cc b/remoting/host/continue_window_win.cc index 1d9f7ef..c843ce6 100644 --- a/remoting/host/continue_window_win.cc +++ b/remoting/host/continue_window_win.cc
@@ -8,9 +8,9 @@ #include <memory> -#include "base/bind.h" -#include "base/callback.h" #include "base/compiler_specific.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/location.h" #include "base/logging.h" #include "base/strings/utf_string_conversions.h" @@ -37,7 +37,9 @@ void HideUi() override; private: - static BOOL CALLBACK DialogProc(HWND hwmd, UINT msg, WPARAM wParam, + static BOOL CALLBACK DialogProc(HWND hwmd, + UINT msg, + WPARAM wParam, LPARAM lParam); BOOL OnDialogMessage(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam); @@ -47,9 +49,7 @@ HWND hwnd_; }; -ContinueWindowWin::ContinueWindowWin() - : hwnd_(nullptr) { -} +ContinueWindowWin::ContinueWindowWin() : hwnd_(nullptr) {} ContinueWindowWin::~ContinueWindowWin() { EndDialog(); @@ -60,7 +60,7 @@ DCHECK(!hwnd_); hwnd_ = CreateDialogParam(CURRENT_MODULE(), MAKEINTRESOURCE(IDD_CONTINUE), - nullptr, (DLGPROC)DialogProc, (LPARAM) this); + nullptr, (DLGPROC)DialogProc, (LPARAM)this); if (!hwnd_) { LOG(ERROR) << "Unable to create Disconnect dialog for remoting."; return; @@ -75,8 +75,10 @@ EndDialog(); } -BOOL CALLBACK ContinueWindowWin::DialogProc(HWND hwnd, UINT msg, - WPARAM wParam, LPARAM lParam) { +BOOL CALLBACK ContinueWindowWin::DialogProc(HWND hwnd, + UINT msg, + WPARAM wParam, + LPARAM lParam) { ContinueWindowWin* win = nullptr; if (msg == WM_INITDIALOG) { win = reinterpret_cast<ContinueWindowWin*>(lParam); @@ -86,13 +88,16 @@ LONG_PTR lp = GetWindowLongPtr(hwnd, DWLP_USER); win = reinterpret_cast<ContinueWindowWin*>(lp); } - if (win == nullptr) + if (win == nullptr) { return FALSE; + } return win->OnDialogMessage(hwnd, msg, wParam, lParam); } -BOOL ContinueWindowWin::OnDialogMessage(HWND hwnd, UINT msg, - WPARAM wParam, LPARAM lParam) { +BOOL ContinueWindowWin::OnDialogMessage(HWND hwnd, + UINT msg, + WPARAM wParam, + LPARAM lParam) { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); switch (msg) {
diff --git a/remoting/host/curtain_mode_mac.cc b/remoting/host/curtain_mode_mac.cc index 360303c9..4437b74 100644 --- a/remoting/host/curtain_mode_mac.cc +++ b/remoting/host/curtain_mode_mac.cc
@@ -9,7 +9,7 @@ #include <Security/Security.h> #include <unistd.h> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/logging.h" #include "base/mac/scoped_cftyperef.h" @@ -74,10 +74,9 @@ // on the UI thread as well. class SessionWatcher : public base::RefCountedThreadSafe<SessionWatcher> { public: - SessionWatcher( - scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner, - scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner, - base::WeakPtr<ClientSessionControl> client_session_control); + SessionWatcher(scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner, + scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner, + base::WeakPtr<ClientSessionControl> client_session_control); SessionWatcher(const SessionWatcher&) = delete; SessionWatcher& operator=(const SessionWatcher&) = delete; @@ -126,8 +125,7 @@ : caller_task_runner_(caller_task_runner), ui_task_runner_(ui_task_runner), client_session_control_(client_session_control), - event_handler_(nullptr) { -} + event_handler_(nullptr) {} void SessionWatcher::Start() { DCHECK(caller_task_runner_->BelongsToCurrentThread()); @@ -177,8 +175,8 @@ << "CGSessionCopyCurrentDictionary() returned NULL. " << "Logging out and back in should resolve this error."; - const void* on_console = CFDictionaryGetValue(session, - kCGSessionOnConsoleKey); + const void* on_console = + CFDictionaryGetValue(session, kCGSessionOnConsoleKey); const void* logged_in = CFDictionaryGetValue(session, kCGSessionLoginDoneKey); if (logged_in == kCFBooleanTrue && on_console == kCFBooleanTrue) { // If IsRunningHeadless() returns true then we know that CGSession will fail @@ -270,15 +268,16 @@ return; } - if (client_session_control_) + if (client_session_control_) { client_session_control_->DisconnectSession(error); + } } OSStatus SessionWatcher::SessionActivateHandler(EventHandlerCallRef handler, EventRef event, void* user_data) { - static_cast<SessionWatcher*>(user_data) - ->DisconnectSession(protocol::ErrorCode::OK); + static_cast<SessionWatcher*>(user_data)->DisconnectSession( + protocol::ErrorCode::OK); return noErr; } @@ -286,10 +285,9 @@ class CurtainModeMac : public CurtainMode { public: - CurtainModeMac( - scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner, - scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner, - base::WeakPtr<ClientSessionControl> client_session_control); + CurtainModeMac(scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner, + scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner, + base::WeakPtr<ClientSessionControl> client_session_control); CurtainModeMac(const CurtainModeMac&) = delete; CurtainModeMac& operator=(const CurtainModeMac&) = delete; @@ -309,8 +307,7 @@ base::WeakPtr<ClientSessionControl> client_session_control) : session_watcher_(new SessionWatcher(caller_task_runner, ui_task_runner, - client_session_control)) { -} + client_session_control)) {} CurtainModeMac::~CurtainModeMac() { session_watcher_->Stop();
diff --git a/remoting/host/curtain_mode_win.cc b/remoting/host/curtain_mode_win.cc index 6ae27b2..f69882e 100644 --- a/remoting/host/curtain_mode_win.cc +++ b/remoting/host/curtain_mode_win.cc
@@ -24,8 +24,7 @@ bool Activate() override; }; -CurtainModeWin::CurtainModeWin() { -} +CurtainModeWin::CurtainModeWin() {} bool CurtainModeWin::Activate() { DWORD session_id;
diff --git a/remoting/host/daemon_process.cc b/remoting/host/daemon_process.cc index af35e46..c71ec51d 100644 --- a/remoting/host/daemon_process.cc +++ b/remoting/host/daemon_process.cc
@@ -9,11 +9,11 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/logging.h" #include "base/task/single_thread_task_runner.h" @@ -157,8 +157,9 @@ // It is OK if the terminal ID wasn't found. There is a race between // the network and daemon processes. Each frees its own recources first and // notifies the other party if there was something to clean up. - if (i == desktop_sessions_.end()) + if (i == desktop_sessions_.end()) { return; + } delete *i; desktop_sessions_.erase(i); @@ -242,8 +243,9 @@ // It is OK if the terminal ID wasn't found. There is a race between // the network and daemon processes. Each frees its own resources first and // notifies the other party if there was something to clean up. - if (i == desktop_sessions_.end()) + if (i == desktop_sessions_.end()) { return; + } (*i)->SetScreenResolution(resolution); } @@ -285,29 +287,33 @@ void DaemonProcess::OnClientAccessDenied(const std::string& signaling_id) { DCHECK(caller_task_runner()->BelongsToCurrentThread()); - for (auto& observer : status_monitor_->observers()) + for (auto& observer : status_monitor_->observers()) { observer.OnClientAccessDenied(signaling_id); + } } void DaemonProcess::OnClientAuthenticated(const std::string& signaling_id) { DCHECK(caller_task_runner()->BelongsToCurrentThread()); - for (auto& observer : status_monitor_->observers()) + for (auto& observer : status_monitor_->observers()) { observer.OnClientAuthenticated(signaling_id); + } } void DaemonProcess::OnClientConnected(const std::string& signaling_id) { DCHECK(caller_task_runner()->BelongsToCurrentThread()); - for (auto& observer : status_monitor_->observers()) + for (auto& observer : status_monitor_->observers()) { observer.OnClientConnected(signaling_id); + } } void DaemonProcess::OnClientDisconnected(const std::string& signaling_id) { DCHECK(caller_task_runner()->BelongsToCurrentThread()); - for (auto& observer : status_monitor_->observers()) + for (auto& observer : status_monitor_->observers()) { observer.OnClientDisconnected(signaling_id); + } } void DaemonProcess::OnClientRouteChange(const std::string& signaling_id, @@ -315,22 +321,25 @@ const protocol::TransportRoute& route) { DCHECK(caller_task_runner()->BelongsToCurrentThread()); - for (auto& observer : status_monitor_->observers()) + for (auto& observer : status_monitor_->observers()) { observer.OnClientRouteChange(signaling_id, channel_name, route); + } } void DaemonProcess::OnHostStarted(const std::string& owner_email) { DCHECK(caller_task_runner()->BelongsToCurrentThread()); - for (auto& observer : status_monitor_->observers()) + for (auto& observer : status_monitor_->observers()) { observer.OnHostStarted(owner_email); + } } void DaemonProcess::OnHostShutdown() { DCHECK(caller_task_runner()->BelongsToCurrentThread()); - for (auto& observer : status_monitor_->observers()) + for (auto& observer : status_monitor_->observers()) { observer.OnHostShutdown(); + } } void DaemonProcess::DeleteAllDesktopSessions() {
diff --git a/remoting/host/daemon_process_unittest.cc b/remoting/host/daemon_process_unittest.cc index c607db0..72c879f 100644 --- a/remoting/host/daemon_process_unittest.cc +++ b/remoting/host/daemon_process_unittest.cc
@@ -8,8 +8,8 @@ #include <memory> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/memory/ptr_util.h" #include "base/memory/ref_counted.h" @@ -78,8 +78,7 @@ }; FakeDesktopSession::FakeDesktopSession(DaemonProcess* daemon_process, int id) - : DesktopSession(daemon_process, id) { -} + : DesktopSession(daemon_process, id) {} FakeDesktopSession::~FakeDesktopSession() = default; @@ -134,8 +133,7 @@ int terminal_id_; }; -DaemonProcessTest::DaemonProcessTest() : terminal_id_(0) { -} +DaemonProcessTest::DaemonProcessTest() : terminal_id_(0) {} DaemonProcessTest::~DaemonProcessTest() = default;
diff --git a/remoting/host/daemon_process_win.cc b/remoting/host/daemon_process_win.cc index 76ef541..7b165834 100644 --- a/remoting/host/daemon_process_win.cc +++ b/remoting/host/daemon_process_win.cc
@@ -11,9 +11,9 @@ #include <vector> #include "base/base_switches.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/logging.h" #include "base/memory/ref_counted.h" @@ -356,8 +356,9 @@ bool DaemonProcessWin::InitializePairingRegistry() { if (!pairing_registry_privileged_key_.Valid()) { - if (!OpenPairingRegistry()) + if (!OpenPairingRegistry()) { return false; + } } // Initialize the pairing registry in the network process. This has to be done @@ -369,11 +370,13 @@ DuplicateRegistryKeyHandle(pairing_registry_privileged_key_); base::win::ScopedHandle unprivileged_key = DuplicateRegistryKeyHandle(pairing_registry_unprivileged_key_); - if (!(privileged_key.IsValid() && unprivileged_key.IsValid())) + if (!(privileged_key.IsValid() && unprivileged_key.IsValid())) { return false; + } - if (!remoting_host_control_) + if (!remoting_host_control_) { return false; + } remoting_host_control_->InitializePairingRegistry( mojo::PlatformHandle(std::move(privileged_key)), @@ -393,9 +396,9 @@ // Open the root of the pairing registry. Create if absent. base::win::RegKey root; DWORD disposition; - LONG result = root.CreateWithDisposition( - HKEY_LOCAL_MACHINE, kPairingRegistryKeyName, &disposition, - KEY_READ | KEY_CREATE_SUB_KEY); + LONG result = + root.CreateWithDisposition(HKEY_LOCAL_MACHINE, kPairingRegistryKeyName, + &disposition, KEY_READ | KEY_CREATE_SUB_KEY); if (result != ERROR_SUCCESS) { ::SetLastError(result); @@ -403,8 +406,9 @@ return false; } - if (disposition == REG_CREATED_NEW_KEY) + if (disposition == REG_CREATED_NEW_KEY) { LOG(WARNING) << "Created pairing registry root key which was absent."; + } // Open the pairing registry clients key. Create if absent. base::win::RegKey unprivileged; @@ -419,13 +423,14 @@ return false; } - if (disposition == REG_CREATED_NEW_KEY) + if (disposition == REG_CREATED_NEW_KEY) { LOG(WARNING) << "Created pairing registry client key which was absent."; + } // Open the pairing registry secret key. base::win::RegKey privileged; - result = privileged.Open( - root.Handle(), kPairingRegistrySecretsKeyName, KEY_READ | KEY_WRITE); + result = privileged.Open(root.Handle(), kPairingRegistrySecretsKeyName, + KEY_READ | KEY_WRITE); if (result == ERROR_FILE_NOT_FOUND) { LOG(WARNING) << "Pairing registry privileged key absent, creating."; @@ -447,9 +452,9 @@ security_attributes.bInheritHandle = FALSE; HKEY key = nullptr; - result = ::RegCreateKeyEx( - root.Handle(), kPairingRegistrySecretsKeyName, 0, nullptr, 0, - KEY_READ | KEY_WRITE, &security_attributes, &key, &disposition); + result = ::RegCreateKeyEx(root.Handle(), kPairingRegistrySecretsKeyName, 0, + nullptr, 0, KEY_READ | KEY_WRITE, + &security_attributes, &key, &disposition); privileged.Set(key); }
diff --git a/remoting/host/desktop_and_cursor_composer.h b/remoting/host/desktop_and_cursor_composer.h index b1d03abe..4f48f34 100644 --- a/remoting/host/desktop_and_cursor_composer.h +++ b/remoting/host/desktop_and_cursor_composer.h
@@ -5,7 +5,7 @@ #ifndef REMOTING_HOST_DESKTOP_AND_CURSOR_COMPOSER_H_ #define REMOTING_HOST_DESKTOP_AND_CURSOR_COMPOSER_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "third_party/webrtc/modules/desktop_capture/desktop_and_cursor_composer.h" namespace remoting {
diff --git a/remoting/host/desktop_and_cursor_conditional_composer.cc b/remoting/host/desktop_and_cursor_conditional_composer.cc index b83aa3bc..d70296b 100644 --- a/remoting/host/desktop_and_cursor_conditional_composer.cc +++ b/remoting/host/desktop_and_cursor_conditional_composer.cc
@@ -4,7 +4,7 @@ #include "remoting/host/desktop_and_cursor_conditional_composer.h" -#include "base/bind.h" +#include "base/functional/bind.h" namespace remoting { @@ -21,12 +21,14 @@ default; void DesktopAndCursorConditionalComposer::SetComposeEnabled(bool enabled) { - if (enabled == compose_enabled_) + if (enabled == compose_enabled_) { return; + } if (enabled) { - if (mouse_cursor_) + if (mouse_cursor_) { capturer_->OnMouseCursor(webrtc::MouseCursor::CopyOf(*mouse_cursor_)); + } } else { webrtc::MouseCursor* empty = new webrtc::MouseCursor( new webrtc::BasicDesktopFrame(webrtc::DesktopSize(0, 0)), @@ -40,14 +42,16 @@ void DesktopAndCursorConditionalComposer::SetMouseCursor( std::unique_ptr<webrtc::MouseCursor> mouse_cursor) { mouse_cursor_ = std::move(mouse_cursor); - if (compose_enabled_) + if (compose_enabled_) { capturer_->OnMouseCursor(webrtc::MouseCursor::CopyOf(*mouse_cursor_)); + } } void DesktopAndCursorConditionalComposer::SetMouseCursorPosition( const webrtc::DesktopVector& position) { - if (compose_enabled_) + if (compose_enabled_) { capturer_->OnMouseCursorPosition(position); + } } void DesktopAndCursorConditionalComposer::Start(
diff --git a/remoting/host/desktop_and_cursor_conditional_composer.h b/remoting/host/desktop_and_cursor_conditional_composer.h index 9c5b96c..bc00af2 100644 --- a/remoting/host/desktop_and_cursor_conditional_composer.h +++ b/remoting/host/desktop_and_cursor_conditional_composer.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "remoting/protocol/desktop_capturer.h" #include "third_party/webrtc/modules/desktop_capture/desktop_and_cursor_composer.h" #include "third_party/webrtc/modules/desktop_capture/desktop_capture_metadata.h"
diff --git a/remoting/host/desktop_capturer_checker.cc b/remoting/host/desktop_capturer_checker.cc index 1073e67..e99daeed 100644 --- a/remoting/host/desktop_capturer_checker.cc +++ b/remoting/host/desktop_capturer_checker.cc
@@ -8,8 +8,8 @@ #include <utility> -#include "base/bind.h" #include "base/check.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/memory/ptr_util.h" #include "base/task/single_thread_task_runner.h"
diff --git a/remoting/host/desktop_capturer_checker.h b/remoting/host/desktop_capturer_checker.h index 80e1ba36..3b351fbd 100644 --- a/remoting/host/desktop_capturer_checker.h +++ b/remoting/host/desktop_capturer_checker.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "third_party/webrtc/modules/desktop_capture/desktop_capturer.h" namespace remoting {
diff --git a/remoting/host/desktop_capturer_proxy.cc b/remoting/host/desktop_capturer_proxy.cc index 43b752d..51f6950f 100644 --- a/remoting/host/desktop_capturer_proxy.cc +++ b/remoting/host/desktop_capturer_proxy.cc
@@ -9,7 +9,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/logging.h" #include "base/memory/ptr_util.h" @@ -112,8 +112,9 @@ #else // !BUILDFLAG(IS_CHROMEOS_ASH) capturer_ = webrtc::DesktopCapturer::CreateScreenCapturer(options); #endif // !BUILDFLAG(IS_CHROMEOS_ASH) - if (!capturer_) + if (!capturer_) { LOG(ERROR) << "Failed to initialize screen capturer."; + } } void DesktopCapturerProxy::Core::Start( @@ -122,8 +123,9 @@ DCHECK(!caller_task_runner_); caller_task_runner_ = caller_task_runner; - if (capturer_) + if (capturer_) { capturer_->Start(this); + } } void DesktopCapturerProxy::Core::SetSharedMemoryFactory(
diff --git a/remoting/host/desktop_capturer_proxy.h b/remoting/host/desktop_capturer_proxy.h index 5f3de7b..e9f3f473 100644 --- a/remoting/host/desktop_capturer_proxy.h +++ b/remoting/host/desktop_capturer_proxy.h
@@ -13,7 +13,7 @@ #include "remoting/protocol/desktop_capturer.h" #if defined(WEBRTC_USE_GIO) -#include "base/callback.h" +#include "base/functional/callback.h" #include "third_party/webrtc/modules/desktop_capture/desktop_capture_metadata.h" #endif
diff --git a/remoting/host/desktop_display_info.cc b/remoting/host/desktop_display_info.cc index f62d2e96..a628cb8c 100644 --- a/remoting/host/desktop_display_info.cc +++ b/remoting/host/desktop_display_info.cc
@@ -50,10 +50,12 @@ int dpi_y) { // Guard against invalid input. // TODO: Replace with a DCHECK, once crbug.com/938648 is fixed. - if (dpi_x == 0) + if (dpi_x == 0) { dpi_x = kDefaultDpi; - if (dpi_y == 0) + } + if (dpi_y == 0) { dpi_y = kDefaultDpi; + } webrtc::DesktopSize size_dips(size.width() * kDefaultDpi / dpi_x, size.height() * kDefaultDpi / dpi_y); @@ -70,8 +72,9 @@ const DisplayGeometry* DesktopDisplayInfo::GetDisplayInfo( unsigned int id) const { - if (id < 0 || id >= displays_.size()) + if (id < 0 || id >= displays_.size()) { return nullptr; + } return &displays_[id]; } @@ -129,10 +132,12 @@ int dx = 0; int dy = 0; for (const auto& display : displays_) { - if (display.x < dx) + if (display.x < dx) { dx = display.x; - if (display.y < dy) + } + if (display.y < dy) { dy = display.y; + } } webrtc::DesktopVector topleft(dx, dy);
diff --git a/remoting/host/desktop_display_info_loader_chromeos.cc b/remoting/host/desktop_display_info_loader_chromeos.cc index c00eaa0..02a34fb 100644 --- a/remoting/host/desktop_display_info_loader_chromeos.cc +++ b/remoting/host/desktop_display_info_loader_chromeos.cc
@@ -56,8 +56,9 @@ const DisplayId primary_display_id = AshProxy::Get().GetPrimaryDisplayId(); auto result = DesktopDisplayInfo(); - for (auto& display : AshProxy::Get().GetActiveDisplays()) + for (auto& display : AshProxy::Get().GetActiveDisplays()) { result.AddDisplay(ToDisplayGeometry(display, primary_display_id)); + } return result; }
diff --git a/remoting/host/desktop_display_info_loader_win.cc b/remoting/host/desktop_display_info_loader_win.cc index 62d7db1f..0e01138 100644 --- a/remoting/host/desktop_display_info_loader_win.cc +++ b/remoting/host/desktop_display_info_loader_win.cc
@@ -28,16 +28,19 @@ enum_result = EnumDisplayDevices(NULL, device_index, &device, 0); // |enum_result| is 0 if we have enumerated all devices. - if (!enum_result) + if (!enum_result) { break; + } // We only care about active displays. - if (!(device.StateFlags & DISPLAY_DEVICE_ACTIVE)) + if (!(device.StateFlags & DISPLAY_DEVICE_ACTIVE)) { continue; + } bool is_default = false; - if (device.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE) + if (device.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE) { is_default = true; + } // Get additional info about device. DEVMODE devmode;
diff --git a/remoting/host/desktop_display_info_loader_x11.cc b/remoting/host/desktop_display_info_loader_x11.cc index 534a240e..9ea0e9fe 100644 --- a/remoting/host/desktop_display_info_loader_x11.cc +++ b/remoting/host/desktop_display_info_loader_x11.cc
@@ -94,8 +94,9 @@ } void DesktopDisplayInfoLoaderX11::LoadMonitors() { - if (xrandr_version_ < kMinRandrVersion) + if (xrandr_version_ < kMinRandrVersion) { return; + } auto reply = randr_->GetMonitors({ui::GetX11RootWindow()}).Sync(); if (reply) {
diff --git a/remoting/host/desktop_display_info_monitor.cc b/remoting/host/desktop_display_info_monitor.cc index 21d6943..f544a39a 100644 --- a/remoting/host/desktop_display_info_monitor.cc +++ b/remoting/host/desktop_display_info_monitor.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/task/sequenced_task_runner.h" #include "base/time/time.h" #include "remoting/base/logging.h"
diff --git a/remoting/host/desktop_display_info_monitor.h b/remoting/host/desktop_display_info_monitor.h index 50d4d54..7981ec5 100644 --- a/remoting/host/desktop_display_info_monitor.h +++ b/remoting/host/desktop_display_info_monitor.h
@@ -7,8 +7,8 @@ #include <memory> -#include "base/callback.h" #include "base/callback_list.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h" #include "base/sequence_checker.h"
diff --git a/remoting/host/desktop_environment.h b/remoting/host/desktop_environment.h index e8cdf64a..64875ed 100644 --- a/remoting/host/desktop_environment.h +++ b/remoting/host/desktop_environment.h
@@ -9,7 +9,7 @@ #include <memory> #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/weak_ptr.h" #include "remoting/host/base/desktop_environment_options.h" #include "remoting/protocol/desktop_capturer.h"
diff --git a/remoting/host/desktop_process.cc b/remoting/host/desktop_process.cc index 813680c..b11cbd5 100644 --- a/remoting/host/desktop_process.cc +++ b/remoting/host/desktop_process.cc
@@ -9,8 +9,8 @@ #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/memory/ref_counted.h" #include "base/message_loop/message_pump_type.h" @@ -192,4 +192,4 @@ ::remoting::CrashProcess(function_name, file_name, line_number); } -} // namespace remoting +} // namespace remoting
diff --git a/remoting/host/desktop_process_main.cc b/remoting/host/desktop_process_main.cc index 3cfb3be..b8fee20 100644 --- a/remoting/host/desktop_process_main.cc +++ b/remoting/host/desktop_process_main.cc
@@ -8,9 +8,9 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/message_loop/message_pump_type.h" #include "base/run_loop.h" #include "base/task/single_thread_task_executor.h" @@ -63,10 +63,12 @@ mojo::PlatformChannelEndpoint endpoint = mojo::PlatformChannel::RecoverPassedEndpointFromCommandLine( *command_line); - if (!endpoint.is_valid()) + if (!endpoint.is_valid()) { endpoint = mojo::NamedPlatformChannel::ConnectToServer(*command_line); - if (!endpoint.is_valid()) + } + if (!endpoint.is_valid()) { return kInvalidCommandLineExitCode; + } auto invitation = mojo::IncomingInvitation::Accept(std::move(endpoint)); mojo::ScopedMessagePipeHandle message_pipe = invitation.ExtractMessagePipe( @@ -93,8 +95,9 @@ ui_task_runner)); #endif // !BUILDFLAG(IS_WIN) - if (!desktop_process.Start(std::move(desktop_environment_factory))) + if (!desktop_process.Start(std::move(desktop_environment_factory))) { return kInitializationFailed; + } // Run the UI message loop. ui_task_runner = nullptr;
diff --git a/remoting/host/desktop_process_unittest.cc b/remoting/host/desktop_process_unittest.cc index 7fa433f3..bc449c84 100644 --- a/remoting/host/desktop_process_unittest.cc +++ b/remoting/host/desktop_process_unittest.cc
@@ -9,8 +9,8 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/memory/ref_counted.h" #include "base/message_loop/message_pump_type.h" @@ -229,10 +229,8 @@ .WillOnce( Return(ByMove(std::make_unique<FakeUrlForwarderConfigurator>()))); EXPECT_CALL(*desktop_environment, CreateFileOperations()).Times(AtMost(1)); - EXPECT_CALL(*desktop_environment, GetCapabilities()) - .Times(AtMost(1)); - EXPECT_CALL(*desktop_environment, SetCapabilities(_)) - .Times(AtMost(1)); + EXPECT_CALL(*desktop_environment, GetCapabilities()).Times(AtMost(1)); + EXPECT_CALL(*desktop_environment, SetCapabilities(_)).Times(AtMost(1)); // Notify the test that the desktop environment has been created. network_listener_.OnDesktopEnvironmentCreated(); @@ -360,8 +358,8 @@ CreateNetworkChannel(std::move(desktop_pipe)); }); EXPECT_CALL(network_listener_, OnChannelConnected(_)) - .WillOnce(InvokeWithoutArgs( - this, &DesktopProcessTest::DisconnectChannels)); + .WillOnce( + InvokeWithoutArgs(this, &DesktopProcessTest::DisconnectChannels)); RunDesktopProcess(); } @@ -382,8 +380,8 @@ } EXPECT_CALL(network_listener_, OnDesktopEnvironmentCreated()) - .WillOnce(InvokeWithoutArgs( - this, &DesktopProcessTest::PostDisconnectChannels)); + .WillOnce( + InvokeWithoutArgs(this, &DesktopProcessTest::PostDisconnectChannels)); RunDesktopProcess(); }
diff --git a/remoting/host/desktop_resizer_mac.cc b/remoting/host/desktop_resizer_mac.cc index 721e98c..969ac77 100644 --- a/remoting/host/desktop_resizer_mac.cc +++ b/remoting/host/desktop_resizer_mac.cc
@@ -86,8 +86,8 @@ for (std::list<ScreenResolution>::const_iterator i = resolutions.begin(); i != resolutions.end(); ++i, ++index) { if (i->Equals(resolution)) { - CGDisplayModeRef mode = const_cast<CGDisplayModeRef>( - static_cast<const CGDisplayMode*>( + CGDisplayModeRef mode = + const_cast<CGDisplayModeRef>(static_cast<const CGDisplayMode*>( CFArrayGetValueAtIndex(modes, index))); int depth = 0; #pragma clang diagnostic push @@ -99,13 +99,13 @@ if (CFStringCompare(encoding, CFSTR(IO32BitDirectPixels), kCFCompareCaseInsensitive) == kCFCompareEqualTo) { depth = 32; - } else if (CFStringCompare( - encoding, CFSTR(IO16BitDirectPixels), - kCFCompareCaseInsensitive) == kCFCompareEqualTo) { + } else if (CFStringCompare(encoding, CFSTR(IO16BitDirectPixels), + kCFCompareCaseInsensitive) == + kCFCompareEqualTo) { depth = 16; - } else if(CFStringCompare( - encoding, CFSTR(IO8BitIndexedPixels), - kCFCompareCaseInsensitive) == kCFCompareEqualTo) { + } else if (CFStringCompare(encoding, CFSTR(IO8BitIndexedPixels), + kCFCompareCaseInsensitive) == + kCFCompareEqualTo) { depth = 8; } if (depth > best_depth) { @@ -116,10 +116,10 @@ } if (best_mode) { HOST_LOG << "Changing mode to " << best_mode << " (" - << resolution.dimensions().width() << "x" - << "x" << resolution.dimensions().height() << "x" - << best_depth << " @ " - << resolution.dpi().x() << "x" << resolution.dpi().y() << " dpi)"; + << resolution.dimensions().width() << "x" + << "x" << resolution.dimensions().height() << "x" << best_depth + << " @ " << resolution.dpi().x() << "x" << resolution.dpi().y() + << " dpi)"; CGDisplaySetDisplayMode(display, best_mode, nullptr); } } @@ -151,8 +151,7 @@ CFIndex count = CFArrayGetCount(*modes); for (CFIndex i = 0; i < count; ++i) { CGDisplayModeRef mode = const_cast<CGDisplayModeRef>( - static_cast<const CGDisplayMode*>( - CFArrayGetValueAtIndex(*modes, i))); + static_cast<const CGDisplayMode*>(CFArrayGetValueAtIndex(*modes, i))); if (CGDisplayModeIsUsableForDesktopGUI(mode)) { // TODO(jamiewalch): Get the correct DPI: http://crbug.com/172405. ScreenResolution resolution(
diff --git a/remoting/host/desktop_resizer_win.cc b/remoting/host/desktop_resizer_win.cc index ef7e19a..eea636d 100644 --- a/remoting/host/desktop_resizer_win.cc +++ b/remoting/host/desktop_resizer_win.cc
@@ -22,14 +22,17 @@ // Provide comparison operation for ScreenResolution so we can use it in // std::map. -static inline bool operator <(const ScreenResolution& a, - const ScreenResolution& b) { - if (a.dimensions().width() != b.dimensions().width()) +static inline bool operator<(const ScreenResolution& a, + const ScreenResolution& b) { + if (a.dimensions().width() != b.dimensions().width()) { return a.dimensions().width() < b.dimensions().width(); - if (a.dimensions().height() != b.dimensions().height()) + } + if (a.dimensions().height() != b.dimensions().height()) { return a.dimensions().height() < b.dimensions().height(); - if (a.dpi().x() != b.dpi().x()) + } + if (a.dpi().x() != b.dpi().x()) { return a.dpi().x() < b.dpi().x(); + } return a.dpi().y() < b.dpi().y(); } @@ -58,8 +61,9 @@ // Calls EnumDisplaySettingsEx() for the primary monitor. // Returns false if |mode_number| does not exist. - static bool GetPrimaryDisplayMode( - DWORD mode_number, DWORD flags, DEVMODE* mode); + static bool GetPrimaryDisplayMode(DWORD mode_number, + DWORD flags, + DEVMODE* mode); // Returns true if the mode has width, height, bits-per-pixel, frequency // and orientation fields. @@ -81,37 +85,40 @@ } } -DesktopResizerWin::~DesktopResizerWin() { -} +DesktopResizerWin::~DesktopResizerWin() {} ScreenResolution DesktopResizerWin::GetCurrentResolution( webrtc::ScreenId screen_id) { DEVMODE current_mode; if (GetPrimaryDisplayMode(ENUM_CURRENT_SETTINGS, 0, ¤t_mode) && - IsModeValid(current_mode)) + IsModeValid(current_mode)) { return GetModeResolution(current_mode); + } return ScreenResolution(); } std::list<ScreenResolution> DesktopResizerWin::GetSupportedResolutions( const ScreenResolution& preferred, webrtc::ScreenId screen_id) { - if (!IsResizeSupported()) + if (!IsResizeSupported()) { return std::list<ScreenResolution>(); + } // Enumerate the resolutions to return, and where there are multiple modes of // the same resolution, store the one most closely matching the current mode // in |best_mode_for_resolution_|. DEVMODE current_mode; if (!GetPrimaryDisplayMode(ENUM_CURRENT_SETTINGS, 0, ¤t_mode) || - !IsModeValid(current_mode)) + !IsModeValid(current_mode)) { return std::list<ScreenResolution>(); + } best_mode_for_resolution_.clear(); - for (DWORD i = 0; ; ++i) { + for (DWORD i = 0;; ++i) { DEVMODE candidate_mode; - if (!GetPrimaryDisplayMode(i, EDS_ROTATEDMODE, &candidate_mode)) + if (!GetPrimaryDisplayMode(i, EDS_ROTATEDMODE, &candidate_mode)) { break; + } UpdateBestModeForResolution(current_mode, candidate_mode); } @@ -124,21 +131,24 @@ void DesktopResizerWin::SetResolution(const ScreenResolution& resolution, webrtc::ScreenId screen_id) { - if (best_mode_for_resolution_.count(resolution) == 0) + if (best_mode_for_resolution_.count(resolution) == 0) { return; + } DEVMODE new_mode = best_mode_for_resolution_[resolution]; DWORD result = ChangeDisplaySettings(&new_mode, CDS_FULLSCREEN); - if (result != DISP_CHANGE_SUCCESSFUL) + if (result != DISP_CHANGE_SUCCESSFUL) { LOG(ERROR) << "SetResolution failed: " << result; + } } void DesktopResizerWin::RestoreResolution(const ScreenResolution& original, webrtc::ScreenId screen_id) { // Restore the display mode based on the registry configuration. DWORD result = ChangeDisplaySettings(nullptr, 0); - if (result != DISP_CHANGE_SUCCESSFUL) + if (result != DISP_CHANGE_SUCCESSFUL) { LOG(ERROR) << "RestoreResolution failed: " << result; + } } void DesktopResizerWin::SetVideoLayout(const protocol::VideoLayout& layout) { @@ -242,20 +252,21 @@ } // static -bool DesktopResizerWin::GetPrimaryDisplayMode( - DWORD mode_number, DWORD flags, DEVMODE* mode) { - memset(mode, 0, sizeof(DEVMODE)); - mode->dmSize = sizeof(DEVMODE); - if (!EnumDisplaySettingsEx(nullptr, mode_number, mode, flags)) - return false; - return true; +bool DesktopResizerWin::GetPrimaryDisplayMode(DWORD mode_number, + DWORD flags, + DEVMODE* mode) { + memset(mode, 0, sizeof(DEVMODE)); + mode->dmSize = sizeof(DEVMODE); + if (!EnumDisplaySettingsEx(nullptr, mode_number, mode, flags)) { + return false; + } + return true; } // static bool DesktopResizerWin::IsModeValid(const DEVMODE& mode) { - const DWORD kRequiredFields = - DM_PELSWIDTH | DM_PELSHEIGHT | DM_BITSPERPEL | - DM_DISPLAYFREQUENCY | DM_DISPLAYORIENTATION; + const DWORD kRequiredFields = DM_PELSWIDTH | DM_PELSHEIGHT | DM_BITSPERPEL | + DM_DISPLAYFREQUENCY | DM_DISPLAYORIENTATION; return (mode.dmFields & kRequiredFields) == kRequiredFields; }
diff --git a/remoting/host/desktop_resizer_x11.cc b/remoting/host/desktop_resizer_x11.cc index 82cc65a5..ef00372f 100644 --- a/remoting/host/desktop_resizer_x11.cc +++ b/remoting/host/desktop_resizer_x11.cc
@@ -96,8 +96,9 @@ bool ScreenResources::Refresh(x11::RandR* randr, x11::Window window) { resources_ = nullptr; - if (auto response = randr->GetScreenResourcesCurrent({window}).Sync()) + if (auto response = randr->GetScreenResourcesCurrent({window}).Sync()) { resources_ = std::move(response.reply); + } return resources_ != nullptr; } @@ -107,8 +108,9 @@ for (const auto& mode_info : resources_->modes) { std::string mode_name(names, mode_info.name_len); names += mode_info.name_len; - if (name == mode_name) + if (name == mode_name) { return static_cast<x11::RandR::Mode>(mode_info.id); + } } return kInvalidMode; } @@ -124,8 +126,9 @@ root_(screen_->root), is_virtual_session_(IsVirtualSession(connection_)) { has_randr_ = randr_->present(); - if (!has_randr_) + if (!has_randr_) { return; + } // Let the server know the client version so it sends us data consistent with // xcbproto's definitions. We don't care about the returned server version, // so no need to sync. @@ -139,8 +142,9 @@ webrtc::ScreenId screen_id) { // Process pending events so that the connection setup data is updated // with the correct display metrics. - if (has_randr_) + if (has_randr_) { connection_->DispatchAll(); + } // RANDR does not allow fetching information on a particular monitor. So // fetch all of them and try to find the requested monitor. @@ -170,8 +174,9 @@ const ScreenResolution& preferred, webrtc::ScreenId screen_id) { std::list<ScreenResolution> result; - if (!has_randr_ || !is_virtual_session_) + if (!has_randr_ || !is_virtual_session_) { return result; + } // Clamp the specified size to something valid for the X server. if (auto response = randr_->GetScreenSizeRange({root_}).Sync()) { @@ -193,15 +198,17 @@ void DesktopResizerX11::SetResolution(const ScreenResolution& resolution, webrtc::ScreenId screen_id) { - if (!has_randr_ || !is_virtual_session_) + if (!has_randr_ || !is_virtual_session_) { return; + } // Grab the X server while we're changing the display resolution. This ensures // that the display configuration doesn't change under our feet. ScopedXGrabServer grabber(connection_); - if (!resources_.Refresh(randr_, root_)) + if (!resources_.Refresh(randr_, root_)) { return; + } // RANDR does not allow fetching information on a particular monitor. So // fetch all of them and try to find the requested monitor. @@ -248,15 +255,17 @@ } void DesktopResizerX11::SetVideoLayout(const protocol::VideoLayout& layout) { - if (!has_randr_ || !is_virtual_session_) + if (!has_randr_ || !is_virtual_session_) { return; + } // Grab the X server while we're changing the display resolution. This ensures // that the display configuration doesn't change under our feet. ScopedXGrabServer grabber(connection_); - if (!resources_.Refresh(randr_, root_)) + if (!resources_.Refresh(randr_, root_)) { return; + } auto reply = randr_->GetMonitors({root_}).Sync(); if (!reply) {
diff --git a/remoting/host/desktop_session.cc b/remoting/host/desktop_session.cc index 0066868..018ae6f 100644 --- a/remoting/host/desktop_session.cc +++ b/remoting/host/desktop_session.cc
@@ -12,8 +12,6 @@ DesktopSession::~DesktopSession() = default; DesktopSession::DesktopSession(DaemonProcess* daemon_process, int id) - : daemon_process_(daemon_process), - id_(id) { -} + : daemon_process_(daemon_process), id_(id) {} } // namespace remoting
diff --git a/remoting/host/desktop_session_agent.cc b/remoting/host/desktop_session_agent.cc index 2be9f7ac..99534c2f 100644 --- a/remoting/host/desktop_session_agent.cc +++ b/remoting/host/desktop_session_agent.cc
@@ -7,8 +7,8 @@ #include <memory> #include <utility> -#include "base/bind.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/logging.h" #include "base/memory/platform_shared_memory_region.h" @@ -85,8 +85,9 @@ BOOL success = ::DuplicateHandle(process, region.UnsafeGetPlatformHandle(), process, &handle, 0, FALSE, DUPLICATE_SAME_ACCESS); - if (!success) + if (!success) { return nullptr; + } base::ReadOnlySharedMemoryRegion read_only_region = base::WritableSharedMemoryRegion::ConvertToReadOnly(std::move(region)); #else @@ -97,8 +98,9 @@ base::WritableSharedMemoryMapping mapping = std::move(region_mapping.mapping); #endif - if (!mapping.IsValid()) + if (!mapping.IsValid()) { return nullptr; + } // The SharedMemoryImpl ctor is private, so std::make_unique can't be // used. return base::WrapUnique( @@ -257,8 +259,9 @@ network_channel_.reset(); // Notify the caller that the channel has been disconnected. - if (delegate_.get()) + if (delegate_.get()) { delegate_->OnNetworkProcessDisconnected(); + } } void DesktopSessionAgent::OnAssociatedInterfaceRequest( @@ -433,8 +436,9 @@ // Begin observing the desktop display(s) for changes. Note that some // desktop environments may not provide a display info monitor. auto* display_info_monitor = desktop_environment_->GetDisplayInfoMonitor(); - if (display_info_monitor) + if (display_info_monitor) { display_info_monitor->Start(); + } // Set up the message handler for file transfers. session_file_operations_handler_.emplace( @@ -491,16 +495,18 @@ desktop_session_event_handler_->OnMouseCursorChanged(*owned_cursor); } - if (video_capturer_) + if (video_capturer_) { video_capturer_->SetMouseCursor(std::move(owned_cursor)); + } } void DesktopSessionAgent::OnMouseCursorPosition( const webrtc::DesktopVector& position) { DCHECK(caller_task_runner_->BelongsToCurrentThread()); - if (video_capturer_) + if (video_capturer_) { video_capturer_->SetMouseCursorPosition(position); + } } void DesktopSessionAgent::OnClipboardEvent( @@ -722,8 +728,9 @@ DCHECK(caller_task_runner_->BelongsToCurrentThread()); CHECK(started_); - if (screen_controls_) + if (screen_controls_) { screen_controls_->SetScreenResolution(resolution, absl::nullopt); + } } void DesktopSessionAgent::StartAudioCapturer() {
diff --git a/remoting/host/desktop_session_agent.h b/remoting/host/desktop_session_agent.h index 0a06e67b..bf71e19 100644 --- a/remoting/host/desktop_session_agent.h +++ b/remoting/host/desktop_session_agent.h
@@ -11,8 +11,8 @@ #include <map> #include <memory> -#include "base/callback.h" #include "base/compiler_specific.h" +#include "base/functional/callback.h" #include "base/memory/read_only_shared_memory_region.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h"
diff --git a/remoting/host/desktop_session_agent_unittest.cc b/remoting/host/desktop_session_agent_unittest.cc index 3dac6d5..0c4b2e3 100644 --- a/remoting/host/desktop_session_agent_unittest.cc +++ b/remoting/host/desktop_session_agent_unittest.cc
@@ -6,9 +6,9 @@ #include <memory> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h"
diff --git a/remoting/host/desktop_session_connector.h b/remoting/host/desktop_session_connector.h index 26a77af..8d1e81a 100644 --- a/remoting/host/desktop_session_connector.h +++ b/remoting/host/desktop_session_connector.h
@@ -31,10 +31,9 @@ // |desktop_session_proxy| with it. |desktop_session_proxy| must be // disconnected from the desktop session (see DisconnectTerminal()) before it // can be deleted. - virtual void ConnectTerminal( - DesktopSessionProxy* desktop_session_proxy, - const ScreenResolution& resolution, - bool virtual_terminal) = 0; + virtual void ConnectTerminal(DesktopSessionProxy* desktop_session_proxy, + const ScreenResolution& resolution, + bool virtual_terminal) = 0; // Requests the daemon process disconnect |desktop_session_proxy| from // the associated desktop session. @@ -42,9 +41,8 @@ DesktopSessionProxy* desktop_session_proxy) = 0; // Changes the screen resolution of the desktop session. - virtual void SetScreenResolution( - DesktopSessionProxy* desktop_session_proxy, - const ScreenResolution& resolution) = 0; + virtual void SetScreenResolution(DesktopSessionProxy* desktop_session_proxy, + const ScreenResolution& resolution) = 0; // Binds a receiver to allow the DesktopSessionConnector instance to receive // events related to changes in the desktop session. Returns True if |handle|
diff --git a/remoting/host/desktop_session_proxy.cc b/remoting/host/desktop_session_proxy.cc index 5c6f000..be54372 100644 --- a/remoting/host/desktop_session_proxy.cc +++ b/remoting/host/desktop_session_proxy.cc
@@ -9,8 +9,8 @@ #include <memory> #include <utility> -#include "base/bind.h" #include "base/compiler_specific.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/logging.h" #include "base/memory/ptr_util.h" @@ -299,8 +299,9 @@ DCHECK(!desktop_channel_); // Ignore the attach event if the client session has already disconnected. - if (!client_session_control_.get()) + if (!client_session_control_.get()) { return false; + } // Connect to the desktop process. desktop_channel_ = IPC::ChannelProxy::Create( @@ -423,8 +424,9 @@ DCHECK(caller_task_runner_->BelongsToCurrentThread()); // Disconnect the client session if it hasn't been disconnected yet. - if (client_session_control_.get()) + if (client_session_control_.get()) { client_session_control_->DisconnectSession(error); + } } void DesktopSessionProxy::InjectClipboardEvent( @@ -498,8 +500,9 @@ // Desktop-size-restore functionality (via an empty resolution param) does not // exist for the Daemon process. Passing an empty resolution object is // treated as a critical error so we want to prevent that here. - if (desktop_session_connector_.get() && !screen_resolution_.IsEmpty()) + if (desktop_session_connector_.get() && !screen_resolution_.IsEmpty()) { desktop_session_connector_->SetScreenResolution(this, screen_resolution_); + } // Passing an empty |screen_resolution_| value to the desktop process // indicates that the original resolution, if one exists, should be restored. @@ -646,8 +649,9 @@ DesktopSessionProxy::~DesktopSessionProxy() { DCHECK(caller_task_runner_->BelongsToCurrentThread()); - if (desktop_session_connector_.get() && is_desktop_session_connected_) + if (desktop_session_connector_.get() && is_desktop_session_connected_) { desktop_session_connector_->DisconnectTerminal(this); + } } scoped_refptr<DesktopSessionProxy::IpcSharedBufferCore>
diff --git a/remoting/host/desktop_session_proxy.h b/remoting/host/desktop_session_proxy.h index bd4a780..a2a3a97 100644 --- a/remoting/host/desktop_session_proxy.h +++ b/remoting/host/desktop_session_proxy.h
@@ -10,8 +10,8 @@ #include <memory> #include <vector> -#include "base/callback.h" #include "base/callback_list.h" +#include "base/functional/callback.h" #include "base/memory/read_only_shared_memory_region.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" @@ -210,7 +210,7 @@ class IpcSharedBufferCore; class IpcSharedBuffer; - typedef std::map<int, scoped_refptr<IpcSharedBufferCore> > SharedBuffers; + typedef std::map<int, scoped_refptr<IpcSharedBufferCore>> SharedBuffers; ~DesktopSessionProxy() override;
diff --git a/remoting/host/desktop_session_win.cc b/remoting/host/desktop_session_win.cc index b11be27..009ed46 100644 --- a/remoting/host/desktop_session_win.cc +++ b/remoting/host/desktop_session_win.cc
@@ -63,7 +63,7 @@ // The command line parameters that should be copied from the service's command // line to the desktop process. -const char* kCopiedSwitchNames[] = { switches::kV, switches::kVModule }; +const char* kCopiedSwitchNames[] = {switches::kV, switches::kVModule}; // The default screen dimensions for an RDP session. const int kDefaultRdpScreenWidth = 1280; @@ -94,7 +94,8 @@ // The values used to establish RDP connections are stored in the registry. const wchar_t kRdpSettingsKeyName[] = L"SYSTEM\\CurrentControlSet\\Control\\Terminal Server"; -const wchar_t kRdpTcpSettingsKeyName[] = L"SYSTEM\\CurrentControlSet\\" +const wchar_t kRdpTcpSettingsKeyName[] = + L"SYSTEM\\CurrentControlSet\\" L"Control\\Terminal Server\\WinStations\\RDP-Tcp"; const wchar_t kRdpPortValueName[] = L"PortNumber"; const wchar_t kDenyTsConnectionsValueName[] = L"fDenyTSConnections"; @@ -114,12 +115,11 @@ class ConsoleSession : public DesktopSessionWin { public: // Same as DesktopSessionWin(). - ConsoleSession( - scoped_refptr<AutoThreadTaskRunner> caller_task_runner, - scoped_refptr<AutoThreadTaskRunner> io_task_runner, - DaemonProcess* daemon_process, - int id, - WtsTerminalMonitor* monitor); + ConsoleSession(scoped_refptr<AutoThreadTaskRunner> caller_task_runner, + scoped_refptr<AutoThreadTaskRunner> io_task_runner, + DaemonProcess* daemon_process, + int id, + WtsTerminalMonitor* monitor); ConsoleSession(const ConsoleSession&) = delete; ConsoleSession& operator=(const ConsoleSession&) = delete; @@ -144,12 +144,11 @@ class RdpSession : public DesktopSessionWin { public: // Same as DesktopSessionWin(). - RdpSession( - scoped_refptr<AutoThreadTaskRunner> caller_task_runner, - scoped_refptr<AutoThreadTaskRunner> io_task_runner, - DaemonProcess* daemon_process, - int id, - WtsTerminalMonitor* monitor); + RdpSession(scoped_refptr<AutoThreadTaskRunner> caller_task_runner, + scoped_refptr<AutoThreadTaskRunner> io_task_runner, + DaemonProcess* daemon_process, + int id, + WtsTerminalMonitor* monitor); RdpSession(const RdpSession&) = delete; RdpSession& operator=(const RdpSession&) = delete; @@ -226,13 +225,15 @@ DaemonProcess* daemon_process, int id, WtsTerminalMonitor* monitor) - : DesktopSessionWin(caller_task_runner, io_task_runner, daemon_process, id, + : DesktopSessionWin(caller_task_runner, + io_task_runner, + daemon_process, + id, monitor) { StartMonitoring(WtsTerminalMonitor::kConsole); } -ConsoleSession::~ConsoleSession() { -} +ConsoleSession::~ConsoleSession() {} void ConsoleSession::SetScreenResolution(const ScreenResolution& resolution) { // Do nothing. The screen resolution of the console session is controlled by @@ -243,10 +244,12 @@ void ConsoleSession::InjectSas() { DCHECK(caller_task_runner()->BelongsToCurrentThread()); - if (!sas_injector_) + if (!sas_injector_) { sas_injector_ = SasInjector::Create(); - if (!sas_injector_->InjectSas()) + } + if (!sas_injector_->InjectSas()) { LOG(ERROR) << "Failed to inject Secure Attention Sequence."; + } } RdpSession::RdpSession(scoped_refptr<AutoThreadTaskRunner> caller_task_runner, @@ -260,8 +263,7 @@ id, monitor) {} -RdpSession::~RdpSession() { -} +RdpSession::~RdpSession() {} bool RdpSession::Initialize(const ScreenResolution& resolution) { DCHECK(caller_task_runner()->BelongsToCurrentThread()); @@ -276,8 +278,8 @@ ::CoCreateInstance(__uuidof(RdpDesktopSession), nullptr, CLSCTX_ALL, IID_PPV_ARGS(&rdp_desktop_session_)); if (FAILED(result)) { - LOG(ERROR) << "Failed to create RdpSession object, 0x" - << std::hex << result << std::dec << "."; + LOG(ERROR) << "Failed to create RdpSession object, 0x" << std::hex << result + << std::dec << "."; return false; } @@ -316,8 +318,8 @@ host_size.width(), host_size.height(), kDefaultRdpDpi, kDefaultRdpDpi, terminal_id.Get(), server_port, event_handler.Get()); if (FAILED(result)) { - LOG(ERROR) << "RdpSession::Create() failed, 0x" - << std::hex << result << std::dec << "."; + LOG(ERROR) << "RdpSession::Create() failed, 0x" << std::hex << result + << std::dec << "."; return false; } @@ -346,7 +348,7 @@ new_size = GetBoundedRdpDesktopSize(new_size.width(), new_size.height()); rdp_desktop_session_->ChangeResolution(new_size.width(), new_size.height(), - kDefaultRdpDpi, kDefaultRdpDpi); + kDefaultRdpDpi, kDefaultRdpDpi); } void RdpSession::InjectSas() { @@ -413,15 +415,14 @@ RdpSession::EventHandler::EventHandler( base::WeakPtr<RdpSession> desktop_session) - : ref_count_(0), - desktop_session_(desktop_session) { -} + : ref_count_(0), desktop_session_(desktop_session) {} RdpSession::EventHandler::~EventHandler() { DCHECK(thread_checker_.CalledOnValidThread()); - if (desktop_session_) + if (desktop_session_) { desktop_session_->OnRdpClosed(); + } } ULONG STDMETHODCALLTYPE RdpSession::EventHandler::AddRef() { @@ -445,8 +446,7 @@ RdpSession::EventHandler::QueryInterface(REFIID riid, void** ppv) { DCHECK(thread_checker_.CalledOnValidThread()); - if (riid == IID_IUnknown || - riid == IID_IRdpDesktopSessionEventHandler) { + if (riid == IID_IUnknown || riid == IID_IRdpDesktopSessionEventHandler) { *ppv = static_cast<IRdpDesktopSessionEventHandler*>(this); AddRef(); return S_OK; @@ -459,8 +459,9 @@ STDMETHODIMP RdpSession::EventHandler::OnRdpConnected() { DCHECK(thread_checker_.CalledOnValidThread()); - if (desktop_session_) + if (desktop_session_) { desktop_session_->OnRdpConnected(); + } return S_OK; } @@ -468,8 +469,9 @@ STDMETHODIMP RdpSession::EventHandler::OnRdpClosed() { DCHECK(thread_checker_.CalledOnValidThread()); - if (!desktop_session_) + if (!desktop_session_) { return S_OK; + } base::WeakPtr<RdpSession> desktop_session = desktop_session_; desktop_session_.reset(); @@ -501,8 +503,9 @@ std::unique_ptr<RdpSession> session( new RdpSession(caller_task_runner, io_task_runner, daemon_process, id, HostService::GetInstance())); - if (!session->Initialize(resolution)) + if (!session->Initialize(resolution)) { return nullptr; + } return std::move(session); } @@ -715,13 +718,9 @@ base::Time::Exploded exploded; now.LocalExplode(&exploded); VLOG(1) << base::StringPrintf("session(%d): %s at %02d:%02d:%02d.%03d%s", - id(), - event.c_str(), - exploded.hour, - exploded.minute, - exploded.second, - exploded.millisecond, - passed.c_str()); + id(), event.c_str(), exploded.hour, + exploded.minute, exploded.second, + exploded.millisecond, passed.c_str()); last_timestamp_ = now; }
diff --git a/remoting/host/desktop_session_win.h b/remoting/host/desktop_session_win.h index 6c37ed3..0679b68 100644 --- a/remoting/host/desktop_session_win.h +++ b/remoting/host/desktop_session_win.h
@@ -67,12 +67,11 @@ // Passes the owning |daemon_process|, a unique identifier of the desktop // session |id| and the interface for monitoring session attach/detach events. // Both |daemon_process| and |monitor| must outlive |this|. - DesktopSessionWin( - scoped_refptr<AutoThreadTaskRunner> caller_task_runner, - scoped_refptr<AutoThreadTaskRunner> io_task_runner, - DaemonProcess* daemon_process, - int id, - WtsTerminalMonitor* monitor); + DesktopSessionWin(scoped_refptr<AutoThreadTaskRunner> caller_task_runner, + scoped_refptr<AutoThreadTaskRunner> io_task_runner, + DaemonProcess* daemon_process, + int id, + WtsTerminalMonitor* monitor); ~DesktopSessionWin() override; const scoped_refptr<AutoThreadTaskRunner>& caller_task_runner() const {
diff --git a/remoting/host/disconnect_window_chromeos.cc b/remoting/host/disconnect_window_chromeos.cc index b29c017..3ce65b3 100644 --- a/remoting/host/disconnect_window_chromeos.cc +++ b/remoting/host/disconnect_window_chromeos.cc
@@ -7,7 +7,7 @@ #include "ash/shell.h" #include "ash/system/tray/system_tray_notifier.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "remoting/host/client_session_control.h" #include "remoting/host/host_window.h"
diff --git a/remoting/host/disconnect_window_linux.cc b/remoting/host/disconnect_window_linux.cc index ff53fde..00eb081 100644 --- a/remoting/host/disconnect_window_linux.cc +++ b/remoting/host/disconnect_window_linux.cc
@@ -74,7 +74,9 @@ // Helper function for creating a rectangular path with rounded corners, as // Cairo doesn't have this facility. |radius| is the arc-radius of each // corner. The bounding rectangle extends from (0, 0) to (width, height). -void AddRoundRectPath(cairo_t* cairo_context, int width, int height, +void AddRoundRectPath(cairo_t* cairo_context, + int width, + int height, int radius) { cairo_new_sub_path(cairo_context); cairo_arc(cairo_context, width - radius, radius, radius, -base::kPiDouble / 2, @@ -142,10 +144,7 @@ } DisconnectWindowGtk::DisconnectWindowGtk() - : disconnect_window_(nullptr), - current_width_(0), - current_height_(0) { -} + : disconnect_window_(nullptr), current_width_(0), current_height_(0) {} DisconnectWindowGtk::~DisconnectWindowGtk() { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); @@ -260,8 +259,9 @@ // GTK4 always uses an RGBA visual for windows. GdkScreen* screen = gtk_widget_get_screen(disconnect_window_); GdkVisual* visual = gdk_screen_get_rgba_visual(screen); - if (visual) + if (visual) { gtk_widget_set_visual(disconnect_window_, visual); + } // GTK4 shows windows by default. gtk_widget_show_all(disconnect_window_); @@ -280,16 +280,17 @@ void DisconnectWindowGtk::OnClicked(GtkButton* button) { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); - if (client_session_control_.get()) + if (client_session_control_.get()) { client_session_control_->DisconnectSession(protocol::OK); + } } -gboolean DisconnectWindowGtk::OnDelete(GtkWidget* window, - GdkEvent* event) { +gboolean DisconnectWindowGtk::OnDelete(GtkWidget* window, GdkEvent* event) { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); - if (client_session_control_.get()) + if (client_session_control_.get()) { client_session_control_->DisconnectSession(protocol::OK); + } return TRUE; } @@ -298,8 +299,9 @@ DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); // Only generate bitmaps if the size has actually changed. - if (event->width == current_width_ && event->height == current_height_) + if (event->width == current_width_ && event->height == current_height_) { return FALSE; + } current_width_ = event->width; current_height_ = event->height; @@ -320,11 +322,8 @@ GdkEventButton* event) { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); - gtk_window_begin_move_drag(GTK_WINDOW(disconnect_window_), - event->button, - event->x_root, - event->y_root, - event->time); + gtk_window_begin_move_drag(GTK_WINDOW(disconnect_window_), event->button, + event->x_root, event->y_root, event->time); return FALSE; }
diff --git a/remoting/host/disconnect_window_mac.h b/remoting/host/disconnect_window_mac.h index e76f17ae..a9e4c05 100644 --- a/remoting/host/disconnect_window_mac.h +++ b/remoting/host/disconnect_window_mac.h
@@ -9,7 +9,7 @@ #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/strings/utf_string_conversions.h" // Controller for the disconnect window which allows the host user to
diff --git a/remoting/host/disconnect_window_mac.mm b/remoting/host/disconnect_window_mac.mm index 3480536..3b3f049 100644 --- a/remoting/host/disconnect_window_mac.mm +++ b/remoting/host/disconnect_window_mac.mm
@@ -8,8 +8,8 @@ #include <memory> -#include "base/bind.h" #include "base/compiler_specific.h" +#include "base/functional/bind.h" #include "base/i18n/rtl.h" #include "base/memory/weak_ptr.h" #include "base/strings/string_util.h" @@ -19,7 +19,7 @@ #include "remoting/host/host_window.h" #include "ui/base/l10n/l10n_util_mac.h" -@interface DisconnectWindowController() +@interface DisconnectWindowController () - (BOOL)isRToL; - (void)Hide; @property(nonatomic, retain) NSTextField* connectedToField; @@ -201,8 +201,8 @@ if ([self isRToL]) { // Handle right to left case CGFloat buttonInset = NSWidth(windowFrame) - NSMaxX(disconnectFrame); - CGFloat buttonTextSpacing - = NSMinX(disconnectFrame) - NSMaxX(connectedToFrame); + CGFloat buttonTextSpacing = + NSMinX(disconnectFrame) - NSMaxX(connectedToFrame); disconnectFrame.origin.x = buttonInset; connectedToFrame.origin.x = NSMaxX(disconnectFrame) + buttonTextSpacing; self.connectedToField.frame = connectedToFrame; @@ -224,8 +224,7 @@ @end - -@interface DisconnectWindow() +@interface DisconnectWindow () - (BOOL)isRToL; @end @@ -260,8 +259,7 @@ @end - -@interface DisconnectView() +@interface DisconnectView () - (BOOL)isRToL; @end @@ -276,7 +274,7 @@ // All magic numbers taken from screen shots provided by UX. NSRect bounds = NSInsetRect([self bounds], 1, 1); - NSBezierPath *path = [NSBezierPath bezierPathWithRoundedRect:bounds + NSBezierPath* path = [NSBezierPath bezierPathWithRoundedRect:bounds xRadius:5 yRadius:5]; NSColor* bgColor; @@ -303,14 +301,13 @@ [frameColor setStroke]; [path stroke]; - // Draw drag handle on proper side const CGFloat kHeight = 21.0; const CGFloat kBaseInset = 12.0; const CGFloat kDragHandleWidth = 5.0; // Turn off aliasing so it's nice and crisp. - NSGraphicsContext *context = [NSGraphicsContext currentContext]; + NSGraphicsContext* context = [NSGraphicsContext currentContext]; BOOL alias = [context shouldAntialias]; [context setShouldAntialias:NO];
diff --git a/remoting/host/disconnect_window_win.cc b/remoting/host/disconnect_window_win.cc index e1f00b1..ed45c60 100644 --- a/remoting/host/disconnect_window_win.cc +++ b/remoting/host/disconnect_window_win.cc
@@ -8,8 +8,8 @@ #include <cstdlib> #include <memory> -#include "base/bind.h" #include "base/compiler_specific.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/logging.h" #include "base/memory/weak_ptr.h" @@ -64,12 +64,13 @@ void EnableAutoHide(std::unique_ptr<LocalInputMonitor> local_input_monitor); // HostWindow overrides. - void Start( - const base::WeakPtr<ClientSessionControl>& client_session_control) + void Start(const base::WeakPtr<ClientSessionControl>& client_session_control) override; private: - static INT_PTR CALLBACK DialogProc(HWND hwnd, UINT message, WPARAM wparam, + static INT_PTR CALLBACK DialogProc(HWND hwnd, + UINT message, + WPARAM wparam, LPARAM lparam); BOOL OnDialogMessage(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam); @@ -141,8 +142,9 @@ // the buffer. WCHAR buffer[256]; int result = GetWindowText(control, buffer, std::size(buffer)); - if (!result) + if (!result) { return false; + } text->assign(buffer); return true; @@ -154,8 +156,9 @@ base::win::ScopedGetDC dc(control); base::win::ScopedSelectObject font( dc, (HFONT)SendMessage(control, WM_GETFONT, 0, 0)); - if (!DrawText(dc, text.c_str(), -1, &rect, DT_CALCRECT | DT_SINGLELINE)) + if (!DrawText(dc, text.c_str(), -1, &rect, DT_CALCRECT | DT_SINGLELINE)) { return false; + } *width = rect.right; return true; @@ -215,8 +218,9 @@ // Store |this| to the window's user data. SetLastError(ERROR_SUCCESS); LONG_PTR result = SetWindowLongPtr(hwnd, DWLP_USER, self); - if (result == 0 && GetLastError() != ERROR_SUCCESS) + if (result == 0 && GetLastError() != ERROR_SUCCESS) { reinterpret_cast<DisconnectWindowWin*>(self)->EndDialog(); + } } else { self = GetWindowLongPtr(hwnd, DWLP_USER); } @@ -260,8 +264,9 @@ // Ensure the dialog stays visible if the work area dimensions change. case WM_SETTINGCHANGE: - if (wparam == SPI_SETWORKAREA) + if (wparam == SPI_SETWORKAREA) { SetDialogPosition(); + } return TRUE; // Ensure the dialog stays visible if the display dimensions change. @@ -307,8 +312,9 @@ hwnd_ = CreateDialogParam(CURRENT_MODULE(), MAKEINTRESOURCE(IDD_DISCONNECT), nullptr, DialogProc, reinterpret_cast<LPARAM>(this)); - if (!hwnd_) + if (!hwnd_) { return false; + } // Set up handler for Ctrl-Alt-Esc shortcut. if (!has_hotkey_ && RegisterHotKey(hwnd_, DISCONNECT_HOTKEY_ID, @@ -316,8 +322,9 @@ has_hotkey_ = true; } - if (!SetStrings()) + if (!SetStrings()) { return false; + } SetDialogPosition(); ShowWindow(hwnd_, SW_SHOW); @@ -340,8 +347,9 @@ // Disable auto-hide events since the window has been destroyed. auto_hide_timer_.Stop(); - if (client_session_control_) + if (client_session_control_) { client_session_control_->DisconnectSession(protocol::OK); + } } void DisconnectWindowWin::ShowDialog() { @@ -352,32 +360,37 @@ base::Unretained(this))); } - if (!was_auto_hidden_) + if (!was_auto_hidden_) { return; + } // Make sure the dialog is fully visible when it is reshown. - if (!local_input_seen_) + if (!local_input_seen_) { SetDialogPosition(); + } if (!AnimateWindow(hwnd_, kAnimationDurationMs, AW_BLEND)) { PLOG(ERROR) << "AnimateWindow() failed to show dialog: "; ShowWindow(hwnd_, SW_SHOW); // If the window still isn't visible, then disconnect the session. - if (!IsWindowVisible(hwnd_)) + if (!IsWindowVisible(hwnd_)) { client_session_control_->DisconnectSession(protocol::OK); + } } was_auto_hidden_ = false; } void DisconnectWindowWin::HideDialog() { - if (was_auto_hidden_ || !local_input_monitor_ || !hwnd_) + if (was_auto_hidden_ || !local_input_monitor_ || !hwnd_) { return; + } - if (!AnimateWindow(hwnd_, kAnimationDurationMs, AW_BLEND | AW_HIDE)) + if (!AnimateWindow(hwnd_, kAnimationDurationMs, AW_BLEND | AW_HIDE)) { PLOG(ERROR) << "AnimateWindow() failed to hide dialog: "; - else + } else { was_auto_hidden_ = true; + } } void DisconnectWindowWin::StopAutoHideBehavior() { @@ -425,13 +438,15 @@ // Returns |control| rectangle in the dialog coordinates. bool DisconnectWindowWin::GetControlRect(HWND control, RECT* rect) { - if (!GetWindowRect(control, rect)) + if (!GetWindowRect(control, rect)) { return false; + } SetLastError(ERROR_SUCCESS); - int result = MapWindowPoints(HWND_DESKTOP, hwnd_, - reinterpret_cast<LPPOINT>(rect), 2); - if (!result && GetLastError() != ERROR_SUCCESS) + int result = + MapWindowPoints(HWND_DESKTOP, hwnd_, reinterpret_cast<LPPOINT>(rect), 2); + if (!result && GetLastError() != ERROR_SUCCESS) { return false; + } return true; } @@ -462,8 +477,9 @@ // Adjust the top value if the window is in auto-hide mode and we have not // seen local input yet. We adjust the position to make the dialog a bit more // obtrusive so that a local user will notice it before it auto-hides. - if (local_input_monitor_ && !local_input_seen_) + if (local_input_monitor_ && !local_input_seen_) { top = top * 0.7; + } SetWindowPos(hwnd_, nullptr, left, top, 0, 0, SWP_NOSIZE | SWP_NOZORDER); } @@ -475,8 +491,9 @@ // labels. HWND hwnd_button = GetDlgItem(hwnd_, IDC_DISCONNECT); HWND hwnd_message = GetDlgItem(hwnd_, IDC_DISCONNECT_SHARINGWITH); - if (!hwnd_button || !hwnd_message) + if (!hwnd_button || !hwnd_message) { return false; + } std::wstring button_text; std::wstring message_text; @@ -488,59 +505,63 @@ // Format and truncate "Your desktop is shared with ..." message. message_text = base::AsWString(base::ReplaceStringPlaceholders( base::AsString16(message_text), base::UTF8ToUTF16(username_), nullptr)); - if (message_text.length() > kMaxSharingWithTextLength) + if (message_text.length() > kMaxSharingWithTextLength) { message_text.erase(kMaxSharingWithTextLength); + } - if (!SetWindowText(hwnd_message, message_text.c_str())) + if (!SetWindowText(hwnd_message, message_text.c_str())) { return false; + } // Calculate the margin between controls in pixels. RECT rect = {0}; rect.right = kWindowTextMargin; - if (!MapDialogRect(hwnd_, &rect)) + if (!MapDialogRect(hwnd_, &rect)) { return false; + } int margin = rect.right; // Resize |hwnd_message| so that the text is not clipped. RECT message_rect; - if (!GetControlRect(hwnd_message, &message_rect)) + if (!GetControlRect(hwnd_message, &message_rect)) { return false; + } LONG control_width; - if (!GetControlTextWidth(hwnd_message, message_text, &control_width)) + if (!GetControlTextWidth(hwnd_message, message_text, &control_width)) { return false; + } message_rect.right = message_rect.left + control_width + margin; - if (!SetWindowPos(hwnd_message, nullptr, - message_rect.left, message_rect.top, + if (!SetWindowPos(hwnd_message, nullptr, message_rect.left, message_rect.top, message_rect.right - message_rect.left, - message_rect.bottom - message_rect.top, - SWP_NOZORDER)) { + message_rect.bottom - message_rect.top, SWP_NOZORDER)) { return false; } // Reposition and resize |hwnd_button| as well. RECT button_rect; - if (!GetControlRect(hwnd_button, &button_rect)) + if (!GetControlRect(hwnd_button, &button_rect)) { return false; + } - if (!GetControlTextWidth(hwnd_button, button_text, &control_width)) + if (!GetControlTextWidth(hwnd_button, button_text, &control_width)) { return false; + } button_rect.left = message_rect.right; button_rect.right = button_rect.left + control_width + margin * 2; - if (!SetWindowPos(hwnd_button, nullptr, - button_rect.left, button_rect.top, + if (!SetWindowPos(hwnd_button, nullptr, button_rect.left, button_rect.top, button_rect.right - button_rect.left, - button_rect.bottom - button_rect.top, - SWP_NOZORDER)) { + button_rect.bottom - button_rect.top, SWP_NOZORDER)) { return false; } // Resize the whole window to fit the resized controls. RECT window_rect; - if (!GetWindowRect(hwnd_, &window_rect)) + if (!GetWindowRect(hwnd_, &window_rect)) { return false; + } int width = button_rect.right + margin; int height = window_rect.bottom - window_rect.top; if (!SetWindowPos(hwnd_, nullptr, 0, 0, width, height, @@ -551,15 +572,17 @@ // Make the corners of the disconnect window rounded. HRGN rgn = CreateRoundRectRgn(0, 0, width, height, kWindowBorderRadius, kWindowBorderRadius); - if (!rgn) + if (!rgn) { return false; - if (!SetWindowRgn(hwnd_, rgn, TRUE)) + } + if (!SetWindowRgn(hwnd_, rgn, TRUE)) { return false; + } return true; } -} // namespace +} // namespace // static std::unique_ptr<HostWindow> HostWindow::CreateDisconnectWindow() {
diff --git a/remoting/host/evaluate_capability.cc b/remoting/host/evaluate_capability.cc index e894d25..c32994dab9e 100644 --- a/remoting/host/evaluate_capability.cc +++ b/remoting/host/evaluate_capability.cc
@@ -85,7 +85,7 @@ return directory.Append(FILE_PATH_LITERAL("remoting_host.exe")); #else - #error "BuildHostBinaryPath is not implemented for current platform." +#error "BuildHostBinaryPath is not implemented for current platform." #endif }
diff --git a/remoting/host/evaluate_capability_unittest.cc b/remoting/host/evaluate_capability_unittest.cc index 62cd1787..7651d49b 100644 --- a/remoting/host/evaluate_capability_unittest.cc +++ b/remoting/host/evaluate_capability_unittest.cc
@@ -35,9 +35,10 @@ TEST(EvaluateCapabilityTest, ShouldReturnExitCodeAndOutput) { std::string output; ASSERT_EQ(EvaluateCapability("test", &output), 234); - ASSERT_EQ("In EvaluateTest(): Line 1\n" - "In EvaluateTest(): Line 2", - NormalizeOutput(output)); + ASSERT_EQ( + "In EvaluateTest(): Line 1\n" + "In EvaluateTest(): Line 2", + NormalizeOutput(output)); } TEST(EvaluateCapabilityTest, ShouldReturnSuccessAndOutput) {
diff --git a/remoting/host/fake_desktop_environment.cc b/remoting/host/fake_desktop_environment.cc index 847afde..602e711 100644 --- a/remoting/host/fake_desktop_environment.cc +++ b/remoting/host/fake_desktop_environment.cc
@@ -30,29 +30,34 @@ std::unique_ptr<protocol::ClipboardStub> client_clipboard) {} void FakeInputInjector::InjectKeyEvent(const protocol::KeyEvent& event) { - if (key_events_) + if (key_events_) { key_events_->push_back(event); + } } void FakeInputInjector::InjectTextEvent(const protocol::TextEvent& event) { - if (text_events_) + if (text_events_) { text_events_->push_back(event); + } } void FakeInputInjector::InjectMouseEvent(const protocol::MouseEvent& event) { - if (mouse_events_) + if (mouse_events_) { mouse_events_->push_back(event); + } } void FakeInputInjector::InjectTouchEvent(const protocol::TouchEvent& event) { - if (touch_events_) + if (touch_events_) { touch_events_->push_back(event); + } } void FakeInputInjector::InjectClipboardEvent( const protocol::ClipboardEvent& event) { - if (clipboard_events_) + if (clipboard_events_) { clipboard_events_->push_back(event); + } } FakeScreenControls::FakeScreenControls() = default; @@ -93,8 +98,9 @@ std::unique_ptr<DesktopCapturer> FakeDesktopEnvironment::CreateVideoCapturer() { auto fake_capturer = std::make_unique<protocol::FakeDesktopCapturer>(); - if (!frame_generator_.is_null()) + if (!frame_generator_.is_null()) { fake_capturer->set_frame_generator(frame_generator_); + } auto result = std::make_unique<DesktopCapturerProxy>(capture_thread_); result->set_capturer(std::move(fake_capturer));
diff --git a/remoting/host/fake_host_extension.cc b/remoting/host/fake_host_extension.cc index 61fc5fce..eaca767 100644 --- a/remoting/host/fake_host_extension.cc +++ b/remoting/host/fake_host_extension.cc
@@ -67,4 +67,4 @@ return std::make_unique<Session>(this, message_type_); } -} // namespace remoting +} // namespace remoting
diff --git a/remoting/host/fake_host_extension.h b/remoting/host/fake_host_extension.h index 3b8c677..eb19134be 100644 --- a/remoting/host/fake_host_extension.h +++ b/remoting/host/fake_host_extension.h
@@ -22,8 +22,7 @@ // reports messages matching a specified type as having been handled. class FakeExtension : public HostExtension { public: - FakeExtension(const std::string& message_type, - const std::string& capability); + FakeExtension(const std::string& message_type, const std::string& capability); FakeExtension(const FakeExtension&) = delete; FakeExtension& operator=(const FakeExtension&) = delete; @@ -57,6 +56,6 @@ bool was_instantiated_ = false; }; -} // namespace remoting +} // namespace remoting #endif // REMOTING_HOST_FAKE_HOST_EXTENSION_H_
diff --git a/remoting/host/file_transfer/buffered_file_writer.cc b/remoting/host/file_transfer/buffered_file_writer.cc index d7ec614..755e544 100644 --- a/remoting/host/file_transfer/buffered_file_writer.cc +++ b/remoting/host/file_transfer/buffered_file_writer.cc
@@ -3,7 +3,7 @@ // found in the LICENSE file. #include "remoting/host/file_transfer/buffered_file_writer.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include <utility>
diff --git a/remoting/host/file_transfer/buffered_file_writer.h b/remoting/host/file_transfer/buffered_file_writer.h index a6cbc55a..57353100 100644 --- a/remoting/host/file_transfer/buffered_file_writer.h +++ b/remoting/host/file_transfer/buffered_file_writer.h
@@ -9,10 +9,10 @@ #include <memory> #include <vector> -#include "base/bind.h" -#include "base/callback_forward.h" #include "base/containers/queue.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" +#include "base/functional/callback_forward.h" #include "remoting/host/file_transfer/file_operations.h" #include "remoting/proto/file_transfer.pb.h"
diff --git a/remoting/host/file_transfer/buffered_file_writer_unittest.cc b/remoting/host/file_transfer/buffered_file_writer_unittest.cc index 20efc246..0a269d1 100644 --- a/remoting/host/file_transfer/buffered_file_writer_unittest.cc +++ b/remoting/host/file_transfer/buffered_file_writer_unittest.cc
@@ -4,7 +4,7 @@ #include "remoting/host/file_transfer/buffered_file_writer.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/test/task_environment.h" #include "remoting/host/file_transfer/fake_file_operations.h" #include "remoting/host/file_transfer/test_byte_vector_utils.h"
diff --git a/remoting/host/file_transfer/fake_file_chooser.cc b/remoting/host/file_transfer/fake_file_chooser.cc index bc8643e..a2902368 100644 --- a/remoting/host/file_transfer/fake_file_chooser.cc +++ b/remoting/host/file_transfer/fake_file_chooser.cc
@@ -4,7 +4,7 @@ #include "remoting/host/file_transfer/fake_file_chooser.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/no_destructor.h" #include "base/task/sequenced_task_runner.h" #include "remoting/protocol/file_transfer_helpers.h"
diff --git a/remoting/host/file_transfer/fake_file_operations.cc b/remoting/host/file_transfer/fake_file_operations.cc index b17cc13c5..cbd2690 100644 --- a/remoting/host/file_transfer/fake_file_operations.cc +++ b/remoting/host/file_transfer/fake_file_operations.cc
@@ -8,7 +8,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/task/sequenced_task_runner.h"
diff --git a/remoting/host/file_transfer/file_chooser.h b/remoting/host/file_transfer/file_chooser.h index 69872f055..86a7109e 100644 --- a/remoting/host/file_transfer/file_chooser.h +++ b/remoting/host/file_transfer/file_chooser.h
@@ -7,8 +7,8 @@ #include <memory> -#include "base/callback.h" #include "base/files/file_path.h" +#include "base/functional/callback.h" #include "base/task/sequenced_task_runner.h" #include "remoting/protocol/file_transfer_helpers.h"
diff --git a/remoting/host/file_transfer/file_chooser_linux.cc b/remoting/host/file_transfer/file_chooser_linux.cc index 6e80e15..881cd5dd 100644 --- a/remoting/host/file_transfer/file_chooser_linux.cc +++ b/remoting/host/file_transfer/file_chooser_linux.cc
@@ -8,7 +8,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/weak_ptr.h" #include "base/task/sequenced_task_runner.h" #include "base/threading/sequence_bound.h"
diff --git a/remoting/host/file_transfer/file_chooser_mac.mm b/remoting/host/file_transfer/file_chooser_mac.mm index c1d1174..8f2f603e 100644 --- a/remoting/host/file_transfer/file_chooser_mac.mm +++ b/remoting/host/file_transfer/file_chooser_mac.mm
@@ -8,7 +8,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/mac/foundation_util.h" #include "base/mac/scoped_nsobject.h" #include "base/memory/weak_ptr.h"
diff --git a/remoting/host/file_transfer/file_chooser_main_win.cc b/remoting/host/file_transfer/file_chooser_main_win.cc index 5a8b0bc7..e3cef0b2 100644 --- a/remoting/host/file_transfer/file_chooser_main_win.cc +++ b/remoting/host/file_transfer/file_chooser_main_win.cc
@@ -9,8 +9,8 @@ #include <cstdio> #include <cstdlib> -#include "base/bind.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/memory/scoped_refptr.h" #include "base/run_loop.h"
diff --git a/remoting/host/file_transfer/file_chooser_win.cc b/remoting/host/file_transfer/file_chooser_win.cc index 6d96097..25c39857 100644 --- a/remoting/host/file_transfer/file_chooser_win.cc +++ b/remoting/host/file_transfer/file_chooser_win.cc
@@ -11,8 +11,8 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/path_service.h" #include "base/process/launch.h"
diff --git a/remoting/host/file_transfer/file_operations.h b/remoting/host/file_transfer/file_operations.h index e1dc755..8eab95b 100644 --- a/remoting/host/file_transfer/file_operations.h +++ b/remoting/host/file_transfer/file_operations.h
@@ -10,7 +10,7 @@ #include <memory> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "remoting/protocol/file_transfer_helpers.h" namespace base {
diff --git a/remoting/host/file_transfer/file_transfer_message_handler.cc b/remoting/host/file_transfer/file_transfer_message_handler.cc index fef09ed..f2f8114 100644 --- a/remoting/host/file_transfer/file_transfer_message_handler.cc +++ b/remoting/host/file_transfer/file_transfer_message_handler.cc
@@ -7,8 +7,8 @@ #include <cstddef> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/path_service.h" #include "net/base/filename_util.h"
diff --git a/remoting/host/file_transfer/file_transfer_message_handler_unittest.cc b/remoting/host/file_transfer/file_transfer_message_handler_unittest.cc index be50720f..67582d5 100644 --- a/remoting/host/file_transfer/file_transfer_message_handler_unittest.cc +++ b/remoting/host/file_transfer/file_transfer_message_handler_unittest.cc
@@ -9,8 +9,8 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/containers/queue.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/test/task_environment.h" #include "net/base/io_buffer.h"
diff --git a/remoting/host/file_transfer/ipc_file_operations.cc b/remoting/host/file_transfer/ipc_file_operations.cc index ff25fa8c..78f36ad 100644 --- a/remoting/host/file_transfer/ipc_file_operations.cc +++ b/remoting/host/file_transfer/ipc_file_operations.cc
@@ -8,8 +8,8 @@ #include <memory> #include <utility> -#include "base/bind.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/memory/weak_ptr.h" #include "base/sequence_checker.h"
diff --git a/remoting/host/file_transfer/ipc_file_operations.h b/remoting/host/file_transfer/ipc_file_operations.h index 5f4f70b..60afb46 100644 --- a/remoting/host/file_transfer/ipc_file_operations.h +++ b/remoting/host/file_transfer/ipc_file_operations.h
@@ -7,8 +7,8 @@ #include <memory> -#include "base/callback.h" #include "base/files/file_path.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "remoting/host/file_transfer/file_operations.h" #include "remoting/host/mojom/desktop_session.mojom.h"
diff --git a/remoting/host/file_transfer/ipc_file_operations_unittest.cc b/remoting/host/file_transfer/ipc_file_operations_unittest.cc index 15d0ced..9bbe2d5 100644 --- a/remoting/host/file_transfer/ipc_file_operations_unittest.cc +++ b/remoting/host/file_transfer/ipc_file_operations_unittest.cc
@@ -10,10 +10,10 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/callback_list.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/path_service.h" #include "base/task/sequenced_task_runner.h" #include "base/test/bind.h"
diff --git a/remoting/host/file_transfer/local_file_operations.cc b/remoting/host/file_transfer/local_file_operations.cc index f54167f3..699674d 100644 --- a/remoting/host/file_transfer/local_file_operations.cc +++ b/remoting/host/file_transfer/local_file_operations.cc
@@ -6,9 +6,9 @@ #include <cstdint> -#include "base/bind.h" #include "base/files/file_proxy.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/memory/ptr_util.h" #include "base/path_service.h"
diff --git a/remoting/host/file_transfer/local_file_operations_unittest.cc b/remoting/host/file_transfer/local_file_operations_unittest.cc index 69b0d25..466ff0d 100644 --- a/remoting/host/file_transfer/local_file_operations_unittest.cc +++ b/remoting/host/file_transfer/local_file_operations_unittest.cc
@@ -4,10 +4,10 @@ #include "remoting/host/file_transfer/local_file_operations.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/containers/queue.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/path_service.h" #include "base/test/scoped_path_override.h" #include "base/test/task_environment.h"
diff --git a/remoting/host/file_transfer/rtc_log_file_operations.cc b/remoting/host/file_transfer/rtc_log_file_operations.cc index d517424de..ad8c47c 100644 --- a/remoting/host/file_transfer/rtc_log_file_operations.cc +++ b/remoting/host/file_transfer/rtc_log_file_operations.cc
@@ -6,8 +6,8 @@ #include <algorithm> -#include "base/bind.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/notreached.h"
diff --git a/remoting/host/file_transfer/session_file_operations_handler.cc b/remoting/host/file_transfer/session_file_operations_handler.cc index d587846..1bc7b8a 100644 --- a/remoting/host/file_transfer/session_file_operations_handler.cc +++ b/remoting/host/file_transfer/session_file_operations_handler.cc
@@ -6,8 +6,8 @@ #include <memory> -#include "base/bind.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/memory/weak_ptr.h" #include "remoting/host/mojom/desktop_session.mojom.h" #include "remoting/protocol/file_transfer_helpers.h"
diff --git a/remoting/host/ftl_echo_message_listener_unittest.cc b/remoting/host/ftl_echo_message_listener_unittest.cc index 20b39b8..56c9c79 100644 --- a/remoting/host/ftl_echo_message_listener_unittest.cc +++ b/remoting/host/ftl_echo_message_listener_unittest.cc
@@ -4,7 +4,7 @@ #include "remoting/host/ftl_echo_message_listener.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/test/task_environment.h" #include "remoting/proto/ftl/v1/chromoting_message.pb.h"
diff --git a/remoting/host/ftl_host_change_notification_listener.cc b/remoting/host/ftl_host_change_notification_listener.cc index f1c700c..d4b88bf1 100644 --- a/remoting/host/ftl_host_change_notification_listener.cc +++ b/remoting/host/ftl_host_change_notification_listener.cc
@@ -4,7 +4,7 @@ #include "remoting/host/ftl_host_change_notification_listener.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/logging.h" #include "base/task/sequenced_task_runner.h"
diff --git a/remoting/host/ftl_host_change_notification_listener_unittest.cc b/remoting/host/ftl_host_change_notification_listener_unittest.cc index 9540626..ddf76963 100644 --- a/remoting/host/ftl_host_change_notification_listener_unittest.cc +++ b/remoting/host/ftl_host_change_notification_listener_unittest.cc
@@ -6,7 +6,7 @@ #include <set> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/task/sequenced_task_runner.h" #include "base/test/task_environment.h"
diff --git a/remoting/host/ftl_signaling_connector.cc b/remoting/host/ftl_signaling_connector.cc index 91fb25b..1a9e74f 100644 --- a/remoting/host/ftl_signaling_connector.cc +++ b/remoting/host/ftl_signaling_connector.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/strings/string_util.h" #include "google_apis/google_api_keys.h" #include "net/url_request/url_request_context_getter.h"
diff --git a/remoting/host/heartbeat_sender.cc b/remoting/host/heartbeat_sender.cc index 20e61cc..16a30e0 100644 --- a/remoting/host/heartbeat_sender.cc +++ b/remoting/host/heartbeat_sender.cc
@@ -9,7 +9,7 @@ #include <cstdint> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/rand_util.h" #include "base/strings/string_number_conversions.h" #include "base/strings/stringize_macros.h"
diff --git a/remoting/host/heartbeat_sender.h b/remoting/host/heartbeat_sender.h index 2a55428..3755179 100644 --- a/remoting/host/heartbeat_sender.h +++ b/remoting/host/heartbeat_sender.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/gtest_prod_util.h" #include "base/memory/raw_ptr.h" #include "base/sequence_checker.h"
diff --git a/remoting/host/host_attributes.cc b/remoting/host/host_attributes.cc index 5eb91c4..3cf9ffc 100644 --- a/remoting/host/host_attributes.cc +++ b/remoting/host/host_attributes.cc
@@ -30,7 +30,7 @@ struct Attribute { const char* name; - bool(* get_value_func)(); + bool (*get_value_func)(); }; inline constexpr bool IsDebug() { @@ -47,7 +47,7 @@ #elif BUILDFLAG(CHROMIUM_BRANDING) return false; #else - #error Only Chrome and Chromium brands are supported. +#error Only Chrome and Chromium brands are supported. #endif } @@ -78,11 +78,11 @@ // So we need IsDebug() function, and "Debug-Build" Attribute. static constexpr Attribute kAttributes[] = { - { "Debug-Build", &IsDebug }, - { "ChromeBrand", &IsChromeBranded }, - { "ChromiumBrand", &IsChromiumBranded }, - { "OfficialBuild", &IsOfficialBuild }, - { "NonOfficialBuild", &IsNonOfficialBuild }, + {"Debug-Build", &IsDebug}, + {"ChromeBrand", &IsChromeBranded}, + {"ChromiumBrand", &IsChromiumBranded}, + {"OfficialBuild", &IsOfficialBuild}, + {"NonOfficialBuild", &IsNonOfficialBuild}, }; } // namespace
diff --git a/remoting/host/host_attributes_unittest.cc b/remoting/host/host_attributes_unittest.cc index 8060ad1..afc271ab 100644 --- a/remoting/host/host_attributes_unittest.cc +++ b/remoting/host/host_attributes_unittest.cc
@@ -24,10 +24,8 @@ } TEST(HostAttributesTest, NoDuplicateKeys) { - std::vector<std::string> results = base::SplitString(GetHostAttributes(), - ",", - base::KEEP_WHITESPACE, - base::SPLIT_WANT_ALL); + std::vector<std::string> results = base::SplitString( + GetHostAttributes(), ",", base::KEEP_WHITESPACE, base::SPLIT_WANT_ALL); for (auto it = results.begin(); it != results.end(); it++) { ASSERT_EQ(std::find(it + 1, results.end(), *it), results.end()); }
diff --git a/remoting/host/host_config_unittest.cc b/remoting/host/host_config_unittest.cc index 8d72c5f..347cbe50 100644 --- a/remoting/host/host_config_unittest.cc +++ b/remoting/host/host_config_unittest.cc
@@ -16,13 +16,13 @@ namespace { const char* kTestConfig = -"{\n" -" \"xmpp_login\" : \"test@gmail.com\",\n" -" \"oauth_refresh_token\" : \"TEST_REFRESH_TOKEN\",\n" -" \"host_id\" : \"TEST_HOST_ID\",\n" -" \"host_name\" : \"TEST_MACHINE_NAME\",\n" -" \"private_key\" : \"TEST_PRIVATE_KEY\"\n" -"}\n"; + "{\n" + " \"xmpp_login\" : \"test@gmail.com\",\n" + " \"oauth_refresh_token\" : \"TEST_REFRESH_TOKEN\",\n" + " \"host_id\" : \"TEST_HOST_ID\",\n" + " \"host_name\" : \"TEST_MACHINE_NAME\",\n" + " \"private_key\" : \"TEST_PRIVATE_KEY\"\n" + "}\n"; } // namespace
diff --git a/remoting/host/host_event_logger.h b/remoting/host/host_event_logger.h index 1684a8d..aa894fc 100644 --- a/remoting/host/host_event_logger.h +++ b/remoting/host/host_event_logger.h
@@ -32,6 +32,6 @@ HostEventLogger() {} }; -} +} // namespace remoting #endif // REMOTING_HOST_HOST_EVENT_LOGGER_H_
diff --git a/remoting/host/host_event_logger_posix.cc b/remoting/host/host_event_logger_posix.cc index af89649..48c283a 100644 --- a/remoting/host/host_event_logger_posix.cc +++ b/remoting/host/host_event_logger_posix.cc
@@ -54,7 +54,7 @@ std::string application_name_; }; -} //namespace +} // namespace HostEventLoggerPosix::HostEventLoggerPosix( scoped_refptr<HostStatusMonitor> monitor,
diff --git a/remoting/host/host_experiment_session_plugin_unittest.cc b/remoting/host/host_experiment_session_plugin_unittest.cc index 715995d..9286f95 100644 --- a/remoting/host/host_experiment_session_plugin_unittest.cc +++ b/remoting/host/host_experiment_session_plugin_unittest.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "remoting/base/constants.h" #include "remoting/host/host_attributes.h" #include "testing/gtest/include/gtest/gtest.h"
diff --git a/remoting/host/host_extension_session_manager.h b/remoting/host/host_extension_session_manager.h index 15d9164..c23e3e7 100644 --- a/remoting/host/host_extension_session_manager.h +++ b/remoting/host/host_extension_session_manager.h
@@ -20,7 +20,7 @@ namespace protocol { class ClientStub; class ExtensionMessage; -} +} // namespace protocol // Helper class used to create and manage a set of HostExtensionSession // instances depending upon the set of registered HostExtensions, and the
diff --git a/remoting/host/host_extension_session_manager_unittest.cc b/remoting/host/host_extension_session_manager_unittest.cc index 750f310..8830073 100644 --- a/remoting/host/host_extension_session_manager_unittest.cc +++ b/remoting/host/host_extension_session_manager_unittest.cc
@@ -2,11 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "remoting/host/host_extension_session_manager.h" + #include "base/strings/string_split.h" #include "base/strings/string_util.h" #include "remoting/host/client_session_details.h" #include "remoting/host/fake_host_extension.h" -#include "remoting/host/host_extension_session_manager.h" #include "remoting/host/host_mock_objects.h" #include "remoting/proto/control.pb.h" #include "remoting/protocol/protocol_mock_objects.h" @@ -83,9 +84,9 @@ HostExtensionSessionManager extension_manager(extensions_, &client_session_details_); - std::vector<std::string> reported_caps = base::SplitString( - extension_manager.GetCapabilities(), " ", base::KEEP_WHITESPACE, - base::SPLIT_WANT_NONEMPTY); + std::vector<std::string> reported_caps = + base::SplitString(extension_manager.GetCapabilities(), " ", + base::KEEP_WHITESPACE, base::SPLIT_WANT_NONEMPTY); std::sort(reported_caps.begin(), reported_caps.end()); ASSERT_EQ(2U, reported_caps.size());
diff --git a/remoting/host/host_main.cc b/remoting/host/host_main.cc index 7c94cab..fdb886e4 100644 --- a/remoting/host/host_main.cc +++ b/remoting/host/host_main.cc
@@ -102,8 +102,9 @@ base::CommandLine command_line(base::CommandLine::NO_PROGRAM); for (base::CommandLine::SwitchMap::const_iterator i = switches.begin(); i != switches.end(); ++i) { - if (i->first != kElevateSwitchName) + if (i->first != kElevateSwitchName) { command_line.AppendSwitchNative(i->first, i->second); + } } for (base::CommandLine::StringVector::const_iterator i = args.begin(); i != args.end(); ++i) {
diff --git a/remoting/host/host_main.h b/remoting/host/host_main.h index 66bd7455..36de0b8 100644 --- a/remoting/host/host_main.h +++ b/remoting/host/host_main.h
@@ -14,6 +14,6 @@ // needs to run. HOST_EXPORT int HostMain(int argc, char** argv); -} // namespace remoting +} // namespace remoting #endif // REMOTING_HOST_HOST_MAIN_H_
diff --git a/remoting/host/host_status_logger.cc b/remoting/host/host_status_logger.cc index 06bddd1..7ef81e0 100644 --- a/remoting/host/host_status_logger.cc +++ b/remoting/host/host_status_logger.cc
@@ -4,7 +4,7 @@ #include "remoting/host/host_status_logger.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "remoting/base/constants.h" #include "remoting/host/host_status_monitor.h" #include "remoting/host/server_log_entry_host.h" @@ -35,8 +35,9 @@ AddHostFieldsToLogEntry(entry.get()); entry->AddModeField(log_to_server_->mode()); - if (connected && connection_route_type_.count(jid) > 0) + if (connected && connection_route_type_.count(jid) > 0) { AddConnectionTypeToLogEntry(entry.get(), connection_route_type_[jid]); + } log_to_server_->Log(*entry.get()); }
diff --git a/remoting/host/host_status_logger_unittest.cc b/remoting/host/host_status_logger_unittest.cc index e5d18622..fd78047b 100644 --- a/remoting/host/host_status_logger_unittest.cc +++ b/remoting/host/host_status_logger_unittest.cc
@@ -105,7 +105,7 @@ return false; } jingle_xmpp::XmlElement* log_stanza = arg->FirstChild()->AsElement(); - if (log_stanza->Name() !=QName(kChromotingNamespace, "log")) { + if (log_stanza->Name() != QName(kChromotingNamespace, "log")) { return false; } if (log_stanza->NextChild()) { @@ -208,8 +208,8 @@ EXPECT_CALL(signal_strategy_, AddListener(_)); EXPECT_CALL(signal_strategy_, GetNextId()); EXPECT_CALL(signal_strategy_, - SendStanzaPtr(IsTwoClientsConnected("direct", "stun"))) - .WillOnce(DoAll(DeleteArg<0>(), Return(true))); + SendStanzaPtr(IsTwoClientsConnected("direct", "stun"))) + .WillOnce(DoAll(DeleteArg<0>(), Return(true))); EXPECT_CALL(signal_strategy_, RemoveListener(_)) .WillOnce(QuitRunLoop(&run_loop)) .RetiresOnSaturation();
diff --git a/remoting/host/host_window_proxy.cc b/remoting/host/host_window_proxy.cc index 645ebf5b..4e841ecf 100644 --- a/remoting/host/host_window_proxy.cc +++ b/remoting/host/host_window_proxy.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" #include "base/check_op.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/notreached.h" #include "base/task/single_thread_task_runner.h" @@ -19,9 +19,8 @@ namespace remoting { // Runs an instance of |HostWindow| on the |ui_task_runner_| thread. -class HostWindowProxy::Core - : public base::RefCountedThreadSafe<Core>, - public ClientSessionControl { +class HostWindowProxy::Core : public base::RefCountedThreadSafe<Core>, + public ClientSessionControl { public: Core(scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner, scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner, @@ -159,8 +158,9 @@ return; } - if (client_session_control_.get()) + if (client_session_control_.get()) { client_session_control_->DisconnectSession(error); + } } void HostWindowProxy::Core::OnLocalKeyPressed(uint32_t usb_keycode) { @@ -170,8 +170,9 @@ return; } - if (client_session_control_.get()) + if (client_session_control_.get()) { client_session_control_->OnLocalKeyPressed(usb_keycode); + } } void HostWindowProxy::Core::OnLocalPointerMoved( @@ -184,8 +185,9 @@ return; } - if (client_session_control_.get()) + if (client_session_control_.get()) { client_session_control_->OnLocalPointerMoved(position, type); + } } void HostWindowProxy::Core::SetDisableInputs(bool disable_inputs) { @@ -196,8 +198,9 @@ return; } - if (client_session_control_.get()) + if (client_session_control_.get()) { client_session_control_->SetDisableInputs(disable_inputs); + } } void HostWindowProxy::Core::OnDesktopDisplayChanged(
diff --git a/remoting/host/input_injector_chromeos.cc b/remoting/host/input_injector_chromeos.cc index fafbce4..5b1bfee 100644 --- a/remoting/host/input_injector_chromeos.cc +++ b/remoting/host/input_injector_chromeos.cc
@@ -11,8 +11,8 @@ #include "ash/display/window_tree_host_manager.h" #include "ash/shell.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/i18n/icu_string_conversions.h" #include "base/location.h" #include "base/strings/utf_string_conversions.h"
diff --git a/remoting/host/input_injector_mac.cc b/remoting/host/input_injector_mac.cc index 83de2f99..6480b6f 100644 --- a/remoting/host/input_injector_mac.cc +++ b/remoting/host/input_injector_mac.cc
@@ -12,8 +12,8 @@ #include <algorithm> #include <utility> -#include "base/bind.h" #include "base/compiler_specific.h" +#include "base/functional/bind.h" #include "base/i18n/break_iterator.h" #include "base/location.h" #include "base/logging.h" @@ -35,7 +35,7 @@ namespace { -void SetOrClearBit(uint64_t &value, uint64_t bit, bool set_bit) { +void SetOrClearBit(uint64_t& value, uint64_t bit, bool set_bit) { value = set_bit ? (value | bit) : (value & ~bit); } @@ -48,10 +48,11 @@ CGEventCreateKeyboardEvent(nullptr, keycode, pressed)); if (eventRef) { CGEventSetFlags(eventRef, static_cast<CGEventFlags>(flags)); - if (!unicode.empty()) + if (!unicode.empty()) { CGEventKeyboardSetUnicodeString( eventRef, unicode.size(), reinterpret_cast<const UniChar*>(unicode.data())); + } CGEventPost(kCGSessionEventTap, eventRef); } } @@ -77,8 +78,9 @@ CGError error = CGPostMouseEvent(position, true, 3, left_down, right_down, middle_down); #pragma clang diagnostic pop - if (error != kCGErrorSuccess) + if (error != kCGErrorSuccess) { LOG(WARNING) << "CGPostMouseEvent error " << error; + } } // Must be called on UI thread. @@ -101,8 +103,8 @@ using protocol::ClipboardEvent; using protocol::KeyEvent; -using protocol::TextEvent; using protocol::MouseEvent; +using protocol::TextEvent; using protocol::TouchEvent; // A class to generate events on Mac. @@ -244,8 +246,9 @@ void InputInjectorMac::Core::InjectKeyEvent(const KeyEvent& event) { // HostEventDispatcher should filter events missing the pressed field. - if (!event.has_pressed() || !event.has_usb_keycode()) + if (!event.has_pressed() || !event.has_usb_keycode()) { return; + } WakeUpDisplay(); @@ -256,8 +259,9 @@ << " to keycode: " << keycode << std::dec; // If we couldn't determine the Mac virtual key code then ignore the event. - if (keycode == ui::KeycodeConverter::InvalidNativeKeycode()) + if (keycode == ui::KeycodeConverter::InvalidNativeKeycode()) { return; + } // If this is a modifier key, remember its new state so that it can be // correctly applied to subsequent events. @@ -350,10 +354,11 @@ VLOG(2) << "Button " << event.button() << (event.button_down() ? " down" : " up"); int button_change = 1 << (event.button() - 1); - if (event.button_down()) + if (event.button_down()) { mouse_button_state_ |= button_change; - else + } else { mouse_button_state_ &= ~button_change; + } } else { VLOG(1) << "Unknown mouse button: " << event.button(); } @@ -418,10 +423,8 @@ // re-awaken at the moment the assertion is created. IOPMAssertionID power_assertion_id = kIOPMNullAssertionID; IOReturn result = IOPMAssertionCreateWithName( - CFSTR("UserIsActive"), - kIOPMAssertionLevelOn, - CFSTR("Chrome Remote Desktop connection active"), - &power_assertion_id); + CFSTR("UserIsActive"), kIOPMAssertionLevelOn, + CFSTR("Chrome Remote Desktop connection active"), &power_assertion_id); if (result == kIOReturnSuccess) { IOPMAssertionRelease(power_assertion_id); }
diff --git a/remoting/host/input_injector_win.cc b/remoting/host/input_injector_win.cc index fc8e9dab..18efb29 100644 --- a/remoting/host/input_injector_win.cc +++ b/remoting/host/input_injector_win.cc
@@ -11,9 +11,9 @@ #include <utility> #include <vector> -#include "base/bind.h" #include "base/compiler_specific.h" #include "base/cxx17_backports.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/logging.h" #include "base/memory/ptr_util.h" @@ -33,8 +33,8 @@ using protocol::ClipboardEvent; using protocol::KeyEvent; -using protocol::TextEvent; using protocol::MouseEvent; +using protocol::TextEvent; using protocol::TouchEvent; // Helper used to call SendInput() API. @@ -57,12 +57,14 @@ // usually distinguishes keys with the same meaning, e.g. left & right // shift. input.ki.wScan &= 0xFF; - if ((scancode & 0xFF00) != 0x0000) + if ((scancode & 0xFF00) != 0x0000) { input.ki.dwFlags |= KEYEVENTF_EXTENDEDKEY; + } } - if (SendInput(1, &input, sizeof(INPUT)) == 0) + if (SendInput(1, &input, sizeof(INPUT)) == 0) { PLOG(ERROR) << "Failed to inject a key event"; + } } // Parse move related operations from the input MouseEvent, and insert the @@ -388,8 +390,9 @@ << " to scancode: " << scancode << std::dec; // Ignore events which can't be mapped. - if (scancode == ui::KeycodeConverter::InvalidNativeKeycode()) + if (scancode == ui::KeycodeConverter::InvalidNativeKeycode()) { return; + } if (event.pressed() && !IsLockKey(scancode)) { absl::optional<bool> caps_lock; @@ -447,8 +450,10 @@ ParseMouseWheelEvent(event, &inputs); if (!inputs.empty()) { - if (SendInput(inputs.size(), inputs.data(), sizeof(INPUT)) != inputs.size()) + if (SendInput(inputs.size(), inputs.data(), sizeof(INPUT)) != + inputs.size()) { PLOG(ERROR) << "Failed to inject a mouse event"; + } } }
diff --git a/remoting/host/input_injector_x11.cc b/remoting/host/input_injector_x11.cc index 88938e9..145f6e4a 100644 --- a/remoting/host/input_injector_x11.cc +++ b/remoting/host/input_injector_x11.cc
@@ -8,8 +8,8 @@ #include <set> #include <utility> -#include "base/bind.h" #include "base/compiler_specific.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/memory/raw_ptr.h" #include "base/strings/utf_string_conversion_utils.h" @@ -137,8 +137,9 @@ void InputInjectorX11::Core::InjectKeyEvent(const KeyEvent& event) { // HostEventDispatcher should filter events missing the pressed field. - if (!event.has_pressed() || !event.has_usb_keycode()) + if (!event.has_pressed() || !event.has_usb_keycode()) { return; + } if (!task_runner_->BelongsToCurrentThread()) { task_runner_->PostTask(FROM_HERE, @@ -157,14 +158,16 @@ << " to keycode: " << keycode << std::dec; // Ignore events which can't be mapped. - if (keycode == ui::KeycodeConverter::InvalidNativeKeycode()) + if (keycode == ui::KeycodeConverter::InvalidNativeKeycode()) { return; + } if (event.pressed()) { if (pressed_keys_.find(keycode) != pressed_keys_.end()) { // Ignore repeats for modifier keys. - if (IsDomModifierKey(static_cast<ui::DomCode>(event.usb_keycode()))) + if (IsDomModifierKey(static_cast<ui::DomCode>(event.usb_keycode()))) { return; + } // Key is already held down, so lift the key up to ensure this repeated // press takes effect. connection_->xtest().FakeInput( @@ -223,9 +226,10 @@ // Release all keys before injecting text event. This is necessary to avoid // any interference with the currently pressed keys. E.g. if Shift is pressed // when TextEvent is received. - for (int key : pressed_keys_) + for (int key : pressed_keys_) { connection_->xtest().FakeInput( {x11::KeyEvent::Release, static_cast<uint8_t>(key)}); + } pressed_keys_.clear(); const std::string text = event.text(); @@ -249,8 +253,9 @@ } bool InputInjectorX11::Core::IsAutoRepeatEnabled() { - if (auto reply = connection_->GetKeyboardControl().Sync()) + if (auto reply = connection_->GetKeyboardControl().Sync()) { return reply->global_auto_repeat == x11::AutoRepeatMode::On; + } LOG(ERROR) << "Failed to get keyboard auto-repeat status, assuming ON."; return true; } @@ -264,15 +269,17 @@ bool InputInjectorX11::Core::IsLockKey(x11::KeyCode keycode) { auto state = connection_->xkb().GetState().Sync(); - if (!state) + if (!state) { return false; + } auto mods = state->baseMods | state->latchedMods | state->lockedMods; auto keysym = connection_->KeycodeToKeysym(keycode, static_cast<unsigned>(mods)); - if (state && keysym) + if (state && keysym) { return keysym == XK_Caps_Lock || keysym == XK_Num_Lock; - else + } else { return false; + } } void InputInjectorX11::Core::SetLockStates(absl::optional<bool> caps_lock, @@ -362,8 +369,9 @@ new_mouse_position.set(screen_location.x(), screen_location.y()); #endif if (event.has_button() && event.has_button_down() && !event.button_down()) { - if (new_mouse_position.equals(latest_mouse_position_)) + if (new_mouse_position.equals(latest_mouse_position_)) { inject_motion = false; + } } if (inject_motion) { @@ -477,18 +485,22 @@ // Note that if a user has a global mapping that completely disables a button // (by assigning 0 to it), we won't be able to inject it. std::vector<uint8_t> pointer_mapping; - if (auto reply = connection_->GetPointerMapping().Sync()) + if (auto reply = connection_->GetPointerMapping().Sync()) { pointer_mapping = std::move(reply->map); - for (int& i : pointer_button_map_) + } + for (int& i : pointer_button_map_) { i = -1; + } for (size_t i = 0; i < pointer_mapping.size(); i++) { // Reverse the mapping. - if (pointer_mapping[i] > 0 && pointer_mapping[i] <= kNumPointerButtons) + if (pointer_mapping[i] > 0 && pointer_mapping[i] <= kNumPointerButtons) { pointer_button_map_[pointer_mapping[i] - 1] = i + 1; + } } for (int i = 0; i < kNumPointerButtons; i++) { - if (pointer_button_map_[i] == -1) + if (pointer_button_map_[i] == -1) { LOG(ERROR) << "Global pointer mapping does not support button " << i + 1; + } } if (!connection_->QueryExtension("XInputExtension").Sync()) { @@ -533,8 +545,9 @@ connection_->xinput().GetDeviceButtonMapping({device_id}).Sync()) { size_t num_device_buttons = mapping->map.size(); std::vector<uint8_t> new_mapping; - for (size_t i = 0; i < num_device_buttons; i++) + for (size_t i = 0; i < num_device_buttons; i++) { new_mapping.push_back(i + 1); + } if (!connection_->xinput() .SetDeviceButtonMapping({device_id, new_mapping}) .Sync()) { @@ -596,8 +609,9 @@ // done for the duration of the session because some window managers do // not handle changes to this setting efficiently. saved_auto_repeat_enabled_ = IsAutoRepeatEnabled(); - if (saved_auto_repeat_enabled_) + if (saved_auto_repeat_enabled_) { SetAutoRepeatEnabled(false); + } } void InputInjectorX11::Core::Stop() { @@ -609,8 +623,9 @@ clipboard_.reset(); character_injector_.reset(); // Re-enable auto-repeat, if necessary, on disconnect. - if (saved_auto_repeat_enabled_) + if (saved_auto_repeat_enabled_) { SetAutoRepeatEnabled(true); + } } // static
diff --git a/remoting/host/input_injector_x11.h b/remoting/host/input_injector_x11.h index 6985bd7..4d90e3b 100644 --- a/remoting/host/input_injector_x11.h +++ b/remoting/host/input_injector_x11.h
@@ -11,8 +11,8 @@ #include <set> #include <utility> -#include "base/bind.h" #include "base/compiler_specific.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/memory/raw_ptr.h" #include "base/task/single_thread_task_runner.h"
diff --git a/remoting/host/input_monitor/local_hotkey_input_monitor.h b/remoting/host/input_monitor/local_hotkey_input_monitor.h index 76a49465..432561e0 100644 --- a/remoting/host/input_monitor/local_hotkey_input_monitor.h +++ b/remoting/host/input_monitor/local_hotkey_input_monitor.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h"
diff --git a/remoting/host/input_monitor/local_hotkey_input_monitor_chromeos.cc b/remoting/host/input_monitor/local_hotkey_input_monitor_chromeos.cc index 24af6256d..2284c02 100644 --- a/remoting/host/input_monitor/local_hotkey_input_monitor_chromeos.cc +++ b/remoting/host/input_monitor/local_hotkey_input_monitor_chromeos.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/location.h" #include "base/task/single_thread_task_runner.h" #include "ui/events/event.h"
diff --git a/remoting/host/input_monitor/local_hotkey_input_monitor_mac.mm b/remoting/host/input_monitor/local_hotkey_input_monitor_mac.mm index d0aefaff..48317f9 100644 --- a/remoting/host/input_monitor/local_hotkey_input_monitor_mac.mm +++ b/remoting/host/input_monitor/local_hotkey_input_monitor_mac.mm
@@ -12,9 +12,9 @@ #include <cstdint> #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/compiler_specific.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/location.h" #include "base/logging.h" #include "base/mac/scoped_cftyperef.h"
diff --git a/remoting/host/input_monitor/local_hotkey_input_monitor_win.cc b/remoting/host/input_monitor/local_hotkey_input_monitor_win.cc index dc449e8..82662c4 100644 --- a/remoting/host/input_monitor/local_hotkey_input_monitor_win.cc +++ b/remoting/host/input_monitor/local_hotkey_input_monitor_win.cc
@@ -4,7 +4,7 @@ #include "remoting/host/input_monitor/local_hotkey_input_monitor.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/task/single_thread_task_runner.h" namespace remoting {
diff --git a/remoting/host/input_monitor/local_hotkey_input_monitor_x11.cc b/remoting/host/input_monitor/local_hotkey_input_monitor_x11.cc index 49fffda..74ec6fc 100644 --- a/remoting/host/input_monitor/local_hotkey_input_monitor_x11.cc +++ b/remoting/host/input_monitor/local_hotkey_input_monitor_x11.cc
@@ -9,9 +9,9 @@ #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/compiler_specific.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/location.h" #include "base/logging.h" #include "remoting/host/input_monitor/local_input_monitor_x11_common.h"
diff --git a/remoting/host/input_monitor/local_input_monitor.cc b/remoting/host/input_monitor/local_input_monitor.cc index 6b5cb53..ff2f696a 100644 --- a/remoting/host/input_monitor/local_input_monitor.cc +++ b/remoting/host/input_monitor/local_input_monitor.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/ref_counted.h" #include "base/task/single_thread_task_runner.h" #include "remoting/host/client_session_control.h"
diff --git a/remoting/host/input_monitor/local_input_monitor.h b/remoting/host/input_monitor/local_input_monitor.h index c1eda1b..ad1b955 100644 --- a/remoting/host/input_monitor/local_input_monitor.h +++ b/remoting/host/input_monitor/local_input_monitor.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h" #include "ui/events/event.h"
diff --git a/remoting/host/input_monitor/local_input_monitor_unittest.cc b/remoting/host/input_monitor/local_input_monitor_unittest.cc index 3d00c89..1ed9ace 100644 --- a/remoting/host/input_monitor/local_input_monitor_unittest.cc +++ b/remoting/host/input_monitor/local_input_monitor_unittest.cc
@@ -6,8 +6,8 @@ #include <memory> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "base/task/single_thread_task_runner.h" #include "base/test/task_environment.h"
diff --git a/remoting/host/input_monitor/local_input_monitor_win.cc b/remoting/host/input_monitor/local_input_monitor_win.cc index b90cae7..8ac169c 100644 --- a/remoting/host/input_monitor/local_input_monitor_win.cc +++ b/remoting/host/input_monitor/local_input_monitor_win.cc
@@ -8,8 +8,8 @@ #include <memory> #include <utility> -#include "base/bind.h" #include "base/compiler_specific.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/logging.h" #include "base/sequence_checker.h"
diff --git a/remoting/host/input_monitor/local_input_monitor_win.h b/remoting/host/input_monitor/local_input_monitor_win.h index 7dcb88cc4..3cccab2b 100644 --- a/remoting/host/input_monitor/local_input_monitor_win.h +++ b/remoting/host/input_monitor/local_input_monitor_win.h
@@ -9,7 +9,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h"
diff --git a/remoting/host/input_monitor/local_keyboard_input_monitor.h b/remoting/host/input_monitor/local_keyboard_input_monitor.h index fffcf5db..6bb27c1 100644 --- a/remoting/host/input_monitor/local_keyboard_input_monitor.h +++ b/remoting/host/input_monitor/local_keyboard_input_monitor.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h" #include "remoting/host/input_monitor/local_input_monitor.h"
diff --git a/remoting/host/input_monitor/local_keyboard_input_monitor_chromeos.cc b/remoting/host/input_monitor/local_keyboard_input_monitor_chromeos.cc index 69ad08669..96b6106 100644 --- a/remoting/host/input_monitor/local_keyboard_input_monitor_chromeos.cc +++ b/remoting/host/input_monitor/local_keyboard_input_monitor_chromeos.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/location.h" #include "base/task/single_thread_task_runner.h" #include "remoting/host/chromeos/point_transformer.h"
diff --git a/remoting/host/input_monitor/local_keyboard_input_monitor_mac.mm b/remoting/host/input_monitor/local_keyboard_input_monitor_mac.mm index 38ad971..be37d37 100644 --- a/remoting/host/input_monitor/local_keyboard_input_monitor_mac.mm +++ b/remoting/host/input_monitor/local_keyboard_input_monitor_mac.mm
@@ -6,7 +6,7 @@ #include <utility> -#include "base/callback.h" +#include "base/functional/callback.h" #import "base/task/single_thread_task_runner.h" #include "base/task/single_thread_task_runner.h"
diff --git a/remoting/host/input_monitor/local_keyboard_input_monitor_win.cc b/remoting/host/input_monitor/local_keyboard_input_monitor_win.cc index 5b1b3ed..23c3d4b 100644 --- a/remoting/host/input_monitor/local_keyboard_input_monitor_win.cc +++ b/remoting/host/input_monitor/local_keyboard_input_monitor_win.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/location.h" #include "base/logging.h" #include "base/task/single_thread_task_runner.h"
diff --git a/remoting/host/input_monitor/local_keyboard_input_monitor_x11.cc b/remoting/host/input_monitor/local_keyboard_input_monitor_x11.cc index 0beed499..0955acda 100644 --- a/remoting/host/input_monitor/local_keyboard_input_monitor_x11.cc +++ b/remoting/host/input_monitor/local_keyboard_input_monitor_x11.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/task/single_thread_task_runner.h" namespace remoting {
diff --git a/remoting/host/input_monitor/local_mouse_input_monitor_mac.mm b/remoting/host/input_monitor/local_mouse_input_monitor_mac.mm index 91d8255..fa88acc 100644 --- a/remoting/host/input_monitor/local_mouse_input_monitor_mac.mm +++ b/remoting/host/input_monitor/local_mouse_input_monitor_mac.mm
@@ -9,8 +9,8 @@ #include <utility> -#include "base/bind.h" #include "base/compiler_specific.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/logging.h" #include "base/mac/scoped_cftyperef.h"
diff --git a/remoting/host/input_monitor/local_mouse_input_monitor_win.cc b/remoting/host/input_monitor/local_mouse_input_monitor_win.cc index 82f71f65..62e47a5 100644 --- a/remoting/host/input_monitor/local_mouse_input_monitor_win.cc +++ b/remoting/host/input_monitor/local_mouse_input_monitor_win.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/location.h" #include "base/logging.h" #include "base/task/single_thread_task_runner.h"
diff --git a/remoting/host/input_monitor/local_mouse_input_monitor_x11.cc b/remoting/host/input_monitor/local_mouse_input_monitor_x11.cc index 408171d3..d9c7899 100644 --- a/remoting/host/input_monitor/local_mouse_input_monitor_x11.cc +++ b/remoting/host/input_monitor/local_mouse_input_monitor_x11.cc
@@ -9,9 +9,9 @@ #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/compiler_specific.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/location.h" #include "base/logging.h" #include "base/memory/raw_ptr.h"
diff --git a/remoting/host/input_monitor/local_pointer_input_monitor.h b/remoting/host/input_monitor/local_pointer_input_monitor.h index 1265b96..414bb5e 100644 --- a/remoting/host/input_monitor/local_pointer_input_monitor.h +++ b/remoting/host/input_monitor/local_pointer_input_monitor.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h" #include "remoting/host/input_monitor/local_input_monitor.h"
diff --git a/remoting/host/input_monitor/local_pointer_input_monitor_chromeos.cc b/remoting/host/input_monitor/local_pointer_input_monitor_chromeos.cc index 3fa288a..1d322045 100644 --- a/remoting/host/input_monitor/local_pointer_input_monitor_chromeos.cc +++ b/remoting/host/input_monitor/local_pointer_input_monitor_chromeos.cc
@@ -8,8 +8,8 @@ #include <utility> #include "ash/shell.h" -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/location.h" #include "base/task/single_thread_task_runner.h" #include "remoting/host/chromeos/point_transformer.h"
diff --git a/remoting/host/ipc_desktop_environment.cc b/remoting/host/ipc_desktop_environment.cc index ff572f56..4f74883 100644 --- a/remoting/host/ipc_desktop_environment.cc +++ b/remoting/host/ipc_desktop_environment.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" #include "base/compiler_specific.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/process/process_handle.h" #include "base/task/single_thread_task_runner.h" @@ -151,8 +151,9 @@ DCHECK(caller_task_runner_->BelongsToCurrentThread()); int id = next_id_++; - bool inserted = active_connections_.insert( - std::make_pair(id, desktop_session_proxy)).second; + bool inserted = + active_connections_.insert(std::make_pair(id, desktop_session_proxy)) + .second; CHECK(inserted); VLOG(1) << "Network: registered desktop environment " << id; @@ -167,8 +168,9 @@ ActiveConnectionsList::iterator i; for (i = active_connections_.begin(); i != active_connections_.end(); ++i) { - if (i->second == desktop_session_proxy) + if (i->second == desktop_session_proxy) { break; + } } if (i != active_connections_.end()) { @@ -187,8 +189,9 @@ ActiveConnectionsList::iterator i; for (i = active_connections_.begin(); i != active_connections_.end(); ++i) { - if (i->second == desktop_session_proxy) + if (i->second == desktop_session_proxy) { break; + } } if (i != active_connections_.end()) {
diff --git a/remoting/host/ipc_desktop_environment.h b/remoting/host/ipc_desktop_environment.h index 1068969..01d93f2 100644 --- a/remoting/host/ipc_desktop_environment.h +++ b/remoting/host/ipc_desktop_environment.h
@@ -10,7 +10,7 @@ #include <memory> #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h" #include "mojo/public/cpp/bindings/associated_receiver.h" @@ -81,9 +81,8 @@ // Used to create IpcDesktopEnvironment objects integrating with the desktop via // a helper process and talking to that process via IPC. -class IpcDesktopEnvironmentFactory - : public DesktopEnvironmentFactory, - public DesktopSessionConnector { +class IpcDesktopEnvironmentFactory : public DesktopEnvironmentFactory, + public DesktopSessionConnector { public: // Passes a reference to the IPC channel connected to the daemon process and // relevant task runners. |daemon_channel| must outlive this object.
diff --git a/remoting/host/ipc_desktop_environment_unittest.cc b/remoting/host/ipc_desktop_environment_unittest.cc index 9eb0953..ccb33de0a 100644 --- a/remoting/host/ipc_desktop_environment_unittest.cc +++ b/remoting/host/ipc_desktop_environment_unittest.cc
@@ -9,9 +9,9 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" @@ -303,8 +303,7 @@ clipboard_stub_(nullptr), remote_input_injector_(nullptr), terminal_id_(-1), - client_session_control_factory_(&client_session_control_) { -} + client_session_control_factory_(&client_session_control_) {} IpcDesktopEnvironmentTest::~IpcDesktopEnvironmentTest() = default; @@ -321,8 +320,7 @@ // Set expectation that the DaemonProcess will send DesktopAttached message // once it is ready. - EXPECT_CALL(desktop_listener_, OnChannelConnected(_)) - .Times(AnyNumber()); + EXPECT_CALL(desktop_listener_, OnChannelConnected(_)).Times(AnyNumber()); EXPECT_CALL(desktop_listener_, ConnectDesktopChannel(_)) .Times(AnyNumber()) .WillRepeatedly([&](mojo::ScopedMessagePipeHandle desktop_pipe) { @@ -351,8 +349,7 @@ .WillRepeatedly(InvokeWithoutArgs( this, &IpcDesktopEnvironmentTest::DeleteDesktopEnvironment)); EXPECT_CALL(client_session_control_, OnLocalPointerMoved(_, _)).Times(0); - EXPECT_CALL(client_session_control_, SetDisableInputs(_)) - .Times(0); + EXPECT_CALL(client_session_control_, SetDisableInputs(_)).Times(0); // Most tests will only call this once but reattach will call multiple times. EXPECT_CALL(client_session_events_, OnDesktopAttached(_)) @@ -428,10 +425,8 @@ EXPECT_CALL(*desktop_environment, CreateKeyboardLayoutMonitor(_)) .Times(AtMost(1)) .WillOnce(Return(ByMove(std::make_unique<FakeKeyboardLayoutMonitor>()))); - EXPECT_CALL(*desktop_environment, GetCapabilities()) - .Times(AtMost(1)); - EXPECT_CALL(*desktop_environment, SetCapabilities(_)) - .Times(AtMost(1)); + EXPECT_CALL(*desktop_environment, GetCapabilities()).Times(AtMost(1)); + EXPECT_CALL(*desktop_environment, SetCapabilities(_)).Times(AtMost(1)); DCHECK(owned_remote_url_forwarder_configurator_); EXPECT_CALL(*desktop_environment, CreateUrlForwarderConfigurator()) .Times(AtMost(1)) @@ -541,8 +536,7 @@ TEST_F(IpcDesktopEnvironmentTest, Basic) { std::unique_ptr<protocol::MockClipboardStub> clipboard_stub( new protocol::MockClipboardStub()); - EXPECT_CALL(*clipboard_stub, InjectClipboardEvent(_)) - .Times(0); + EXPECT_CALL(*clipboard_stub, InjectClipboardEvent(_)).Times(0); // Start the input injector and screen capturer. input_injector_->Start(std::move(clipboard_stub)); @@ -564,12 +558,12 @@ std::unique_ptr<protocol::MockClipboardStub> clipboard_stub( new protocol::MockClipboardStub()); - EXPECT_CALL(*clipboard_stub, InjectClipboardEvent(_)) - .Times(0); + EXPECT_CALL(*clipboard_stub, InjectClipboardEvent(_)).Times(0); std::string expected_capabilities = "rateLimitResizeRequests"; - if (InputInjector::SupportsTouchEvents()) + if (InputInjector::SupportsTouchEvents()) { expected_capabilities += " touchEvents"; + } EXPECT_EQ(expected_capabilities, desktop_environment_->GetCapabilities()); @@ -587,8 +581,7 @@ TEST_F(IpcDesktopEnvironmentTest, CaptureFrame) { std::unique_ptr<protocol::MockClipboardStub> clipboard_stub( new protocol::MockClipboardStub()); - EXPECT_CALL(*clipboard_stub, InjectClipboardEvent(_)) - .Times(0); + EXPECT_CALL(*clipboard_stub, InjectClipboardEvent(_)).Times(0); // Start the input injector and screen capturer. input_injector_->Start(std::move(clipboard_stub)); @@ -610,8 +603,7 @@ TEST_F(IpcDesktopEnvironmentTest, Reattach) { std::unique_ptr<protocol::MockClipboardStub> clipboard_stub( new protocol::MockClipboardStub()); - EXPECT_CALL(*clipboard_stub, InjectClipboardEvent(_)) - .Times(0); + EXPECT_CALL(*clipboard_stub, InjectClipboardEvent(_)).Times(0); // Start the input injector and screen capturer. input_injector_->Start(std::move(clipboard_stub)); @@ -653,8 +645,8 @@ // Expect a single clipboard event. EXPECT_CALL(*remote_input_injector_, InjectClipboardEvent(_)) .Times(1) - .WillOnce(Invoke(this, - &IpcDesktopEnvironmentTest::ReflectClipboardEvent)); + .WillOnce( + Invoke(this, &IpcDesktopEnvironmentTest::ReflectClipboardEvent)); // Send a clipboard event. protocol::ClipboardEvent event; @@ -667,8 +659,7 @@ TEST_F(IpcDesktopEnvironmentTest, InjectKeyEvent) { std::unique_ptr<protocol::MockClipboardStub> clipboard_stub( new protocol::MockClipboardStub()); - EXPECT_CALL(*clipboard_stub, InjectClipboardEvent(_)) - .Times(0); + EXPECT_CALL(*clipboard_stub, InjectClipboardEvent(_)).Times(0); // Start the input injector and screen capturer. input_injector_->Start(std::move(clipboard_stub)); @@ -694,8 +685,7 @@ TEST_F(IpcDesktopEnvironmentTest, InjectTextEvent) { std::unique_ptr<protocol::MockClipboardStub> clipboard_stub( new protocol::MockClipboardStub()); - EXPECT_CALL(*clipboard_stub, InjectClipboardEvent(_)) - .Times(0); + EXPECT_CALL(*clipboard_stub, InjectClipboardEvent(_)).Times(0); // Start the input injector and screen capturer. input_injector_->Start(std::move(clipboard_stub)); @@ -720,8 +710,7 @@ TEST_F(IpcDesktopEnvironmentTest, InjectMouseEvent) { std::unique_ptr<protocol::MockClipboardStub> clipboard_stub( new protocol::MockClipboardStub()); - EXPECT_CALL(*clipboard_stub, InjectClipboardEvent(_)) - .Times(0); + EXPECT_CALL(*clipboard_stub, InjectClipboardEvent(_)).Times(0); // Start the input injector and screen capturer. input_injector_->Start(std::move(clipboard_stub)); @@ -747,8 +736,7 @@ TEST_F(IpcDesktopEnvironmentTest, InjectTouchEvent) { std::unique_ptr<protocol::MockClipboardStub> clipboard_stub( new protocol::MockClipboardStub()); - EXPECT_CALL(*clipboard_stub, InjectClipboardEvent(_)) - .Times(0); + EXPECT_CALL(*clipboard_stub, InjectClipboardEvent(_)).Times(0); // Start the input injector and screen capturer. input_injector_->Start(std::move(clipboard_stub)); @@ -789,8 +777,7 @@ TEST_F(IpcDesktopEnvironmentTest, SetScreenResolution) { std::unique_ptr<protocol::MockClipboardStub> clipboard_stub( new protocol::MockClipboardStub()); - EXPECT_CALL(*clipboard_stub, InjectClipboardEvent(_)) - .Times(0); + EXPECT_CALL(*clipboard_stub, InjectClipboardEvent(_)).Times(0); // Start the input injector and screen capturer. input_injector_->Start(std::move(clipboard_stub));
diff --git a/remoting/host/ipc_host_event_logger.h b/remoting/host/ipc_host_event_logger.h index 15d02cc..4672290a 100644 --- a/remoting/host/ipc_host_event_logger.h +++ b/remoting/host/ipc_host_event_logger.h
@@ -50,6 +50,6 @@ SEQUENCE_CHECKER(sequence_checker_); }; -} +} // namespace remoting #endif // REMOTING_HOST_IPC_HOST_EVENT_LOGGER_H_
diff --git a/remoting/host/ipc_input_injector.cc b/remoting/host/ipc_input_injector.cc index bc374ba2..201d3ca3 100644 --- a/remoting/host/ipc_input_injector.cc +++ b/remoting/host/ipc_input_injector.cc
@@ -12,8 +12,7 @@ IpcInputInjector::IpcInputInjector( scoped_refptr<DesktopSessionProxy> desktop_session_proxy) - : desktop_session_proxy_(desktop_session_proxy) { -} + : desktop_session_proxy_(desktop_session_proxy) {} IpcInputInjector::~IpcInputInjector() = default;
diff --git a/remoting/host/ipc_keyboard_layout_monitor.h b/remoting/host/ipc_keyboard_layout_monitor.h index 2103390..f4caffb 100644 --- a/remoting/host/ipc_keyboard_layout_monitor.h +++ b/remoting/host/ipc_keyboard_layout_monitor.h
@@ -5,7 +5,7 @@ #ifndef REMOTING_HOST_IPC_KEYBOARD_LAYOUT_MONITOR_H_ #define REMOTING_HOST_IPC_KEYBOARD_LAYOUT_MONITOR_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h" #include "remoting/host/keyboard_layout_monitor.h"
diff --git a/remoting/host/ipc_mouse_cursor_monitor.cc b/remoting/host/ipc_mouse_cursor_monitor.cc index 628ffd40..a82541a6 100644 --- a/remoting/host/ipc_mouse_cursor_monitor.cc +++ b/remoting/host/ipc_mouse_cursor_monitor.cc
@@ -35,4 +35,3 @@ } } // namespace remoting -
diff --git a/remoting/host/ipc_screen_controls.cc b/remoting/host/ipc_screen_controls.cc index 0f09c1d..6a43236f 100644 --- a/remoting/host/ipc_screen_controls.cc +++ b/remoting/host/ipc_screen_controls.cc
@@ -11,8 +11,7 @@ IpcScreenControls::IpcScreenControls( scoped_refptr<DesktopSessionProxy> desktop_session_proxy) - : desktop_session_proxy_(desktop_session_proxy) { -} + : desktop_session_proxy_(desktop_session_proxy) {} IpcScreenControls::~IpcScreenControls() = default;
diff --git a/remoting/host/ipc_url_forwarder_configurator.h b/remoting/host/ipc_url_forwarder_configurator.h index 1cb4b06..d6795c9 100644 --- a/remoting/host/ipc_url_forwarder_configurator.h +++ b/remoting/host/ipc_url_forwarder_configurator.h
@@ -7,7 +7,7 @@ #include "remoting/host/remote_open_url/url_forwarder_configurator.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" namespace remoting {
diff --git a/remoting/host/it2me/it2me_confirmation_dialog.h b/remoting/host/it2me/it2me_confirmation_dialog.h index e439d5b..c78ca27 100644 --- a/remoting/host/it2me/it2me_confirmation_dialog.h +++ b/remoting/host/it2me/it2me_confirmation_dialog.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" namespace remoting {
diff --git a/remoting/host/it2me/it2me_confirmation_dialog_chromeos.cc b/remoting/host/it2me/it2me_confirmation_dialog_chromeos.cc index ce397ea9..471ca27 100644 --- a/remoting/host/it2me/it2me_confirmation_dialog_chromeos.cc +++ b/remoting/host/it2me/it2me_confirmation_dialog_chromeos.cc
@@ -8,8 +8,8 @@ #include "ash/constants/notifier_catalogs.h" #include "ash/public/cpp/notification_utils.h" -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/i18n/message_formatter.h" #include "base/strings/utf_string_conversions.h" #include "chromeos/ui/vector_icons/vector_icons.h"
diff --git a/remoting/host/it2me/it2me_confirmation_dialog_linux.cc b/remoting/host/it2me/it2me_confirmation_dialog_linux.cc index 9ee7bcdb..8a7eadc 100644 --- a/remoting/host/it2me/it2me_confirmation_dialog_linux.cc +++ b/remoting/host/it2me/it2me_confirmation_dialog_linux.cc
@@ -8,8 +8,8 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/i18n/message_formatter.h" #include "base/location.h" #include "base/logging.h"
diff --git a/remoting/host/it2me/it2me_confirmation_dialog_mac.mm b/remoting/host/it2me/it2me_confirmation_dialog_mac.mm index 00abd9f..27170d9 100644 --- a/remoting/host/it2me/it2me_confirmation_dialog_mac.mm +++ b/remoting/host/it2me/it2me_confirmation_dialog_mac.mm
@@ -10,8 +10,8 @@ #include <utility> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/i18n/message_formatter.h" #include "base/location.h" #include "base/mac/scoped_nsobject.h"
diff --git a/remoting/host/it2me/it2me_confirmation_dialog_proxy.cc b/remoting/host/it2me/it2me_confirmation_dialog_proxy.cc index 2a6896175..35e5c0d 100644 --- a/remoting/host/it2me/it2me_confirmation_dialog_proxy.cc +++ b/remoting/host/it2me/it2me_confirmation_dialog_proxy.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/task/single_thread_task_runner.h"
diff --git a/remoting/host/it2me/it2me_confirmation_dialog_proxy.h b/remoting/host/it2me/it2me_confirmation_dialog_proxy.h index f4e9113..36c9554 100644 --- a/remoting/host/it2me/it2me_confirmation_dialog_proxy.h +++ b/remoting/host/it2me/it2me_confirmation_dialog_proxy.h
@@ -5,7 +5,7 @@ #ifndef REMOTING_HOST_IT2ME_IT2ME_CONFIRMATION_DIALOG_PROXY_H_ #define REMOTING_HOST_IT2ME_IT2ME_CONFIRMATION_DIALOG_PROXY_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h" #include "base/task/single_thread_task_runner.h"
diff --git a/remoting/host/it2me/it2me_confirmation_dialog_proxy_unittest.cc b/remoting/host/it2me/it2me_confirmation_dialog_proxy_unittest.cc index 45792b11..013a5093 100644 --- a/remoting/host/it2me/it2me_confirmation_dialog_proxy_unittest.cc +++ b/remoting/host/it2me/it2me_confirmation_dialog_proxy_unittest.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h" #include "base/run_loop.h"
diff --git a/remoting/host/it2me/it2me_confirmation_dialog_win.cc b/remoting/host/it2me/it2me_confirmation_dialog_win.cc index c5e052e..94b3526 100644 --- a/remoting/host/it2me/it2me_confirmation_dialog_win.cc +++ b/remoting/host/it2me/it2me_confirmation_dialog_win.cc
@@ -9,9 +9,9 @@ #include <memory> #include <string> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/i18n/message_formatter.h" #include "base/logging.h" #include "base/strings/string_util.h"
diff --git a/remoting/host/it2me/it2me_host.cc b/remoting/host/it2me/it2me_host.cc index 23fba86..5c4716f 100644 --- a/remoting/host/it2me/it2me_host.cc +++ b/remoting/host/it2me/it2me_host.cc
@@ -9,8 +9,8 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/strings/string_util.h" #include "base/task/single_thread_task_runner.h" #include "base/time/time.h"
diff --git a/remoting/host/it2me/it2me_host_unittest.cc b/remoting/host/it2me/it2me_host_unittest.cc index c702baa..27dc6b0 100644 --- a/remoting/host/it2me/it2me_host_unittest.cc +++ b/remoting/host/it2me/it2me_host_unittest.cc
@@ -8,8 +8,8 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/location.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h"
diff --git a/remoting/host/it2me/it2me_native_messaging_host.cc b/remoting/host/it2me/it2me_native_messaging_host.cc index 031bf32..bc5788e 100644 --- a/remoting/host/it2me/it2me_native_messaging_host.cc +++ b/remoting/host/it2me/it2me_native_messaging_host.cc
@@ -8,8 +8,8 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/json/json_writer.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h"
diff --git a/remoting/host/it2me/it2me_native_messaging_host_ash.cc b/remoting/host/it2me/it2me_native_messaging_host_ash.cc index 31554a0b..b734169 100644 --- a/remoting/host/it2me/it2me_native_messaging_host_ash.cc +++ b/remoting/host/it2me/it2me_native_messaging_host_ash.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/callback.h" #include "base/feature_list.h" +#include "base/functional/callback.h" #include "base/json/json_writer.h" #include "base/time/time.h" #include "base/values.h"
diff --git a/remoting/host/it2me/it2me_native_messaging_host_lacros.cc b/remoting/host/it2me/it2me_native_messaging_host_lacros.cc index 9900746..dd262fe 100644 --- a/remoting/host/it2me/it2me_native_messaging_host_lacros.cc +++ b/remoting/host/it2me/it2me_native_messaging_host_lacros.cc
@@ -11,7 +11,7 @@ #include <string> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/json/json_reader.h" #include "base/json/json_writer.h" #include "base/memory/raw_ptr.h"
diff --git a/remoting/host/it2me/it2me_native_messaging_host_unittest.cc b/remoting/host/it2me/it2me_native_messaging_host_unittest.cc index 7b741953..a5b27e3 100644 --- a/remoting/host/it2me/it2me_native_messaging_host_unittest.cc +++ b/remoting/host/it2me/it2me_native_messaging_host_unittest.cc
@@ -9,8 +9,8 @@ #include <string> #include <utility> -#include "base/bind.h" #include "base/compiler_specific.h" +#include "base/functional/bind.h" #include "base/json/json_reader.h" #include "base/json/json_writer.h" #include "base/location.h"
diff --git a/remoting/host/keyboard_layout_monitor.h b/remoting/host/keyboard_layout_monitor.h index 3c230c9c..65160a5 100644 --- a/remoting/host/keyboard_layout_monitor.h +++ b/remoting/host/keyboard_layout_monitor.h
@@ -7,8 +7,8 @@ #include <memory> -#include "base/callback_forward.h" #include "base/containers/span.h" +#include "base/functional/callback_forward.h" #include "base/memory/scoped_refptr.h" #include "ui/events/keycodes/dom/dom_code.h"
diff --git a/remoting/host/keyboard_layout_monitor_chromeos.cc b/remoting/host/keyboard_layout_monitor_chromeos.cc index 6f54081..c20accb6 100644 --- a/remoting/host/keyboard_layout_monitor_chromeos.cc +++ b/remoting/host/keyboard_layout_monitor_chromeos.cc
@@ -4,8 +4,8 @@ #include "remoting/host/keyboard_layout_monitor.h" -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/location.h" #include "base/memory/weak_ptr.h" #include "base/strings/utf_string_conversion_utils.h"
diff --git a/remoting/host/keyboard_layout_monitor_linux.cc b/remoting/host/keyboard_layout_monitor_linux.cc index 81f3d05..6db1f4b 100644 --- a/remoting/host/keyboard_layout_monitor_linux.cc +++ b/remoting/host/keyboard_layout_monitor_linux.cc
@@ -6,9 +6,9 @@ #include <gdk/gdk.h> -#include "base/bind.h" -#include "base/callback.h" #include "base/files/file_descriptor_watcher_posix.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/logging.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" @@ -174,8 +174,9 @@ } else if (auto* notify = event.As<x11::Xkb::StateNotifyEvent>()) { int new_group = notify->baseGroup + notify->latchedGroup + static_cast<int16_t>(notify->lockedGroup); - if (new_group != current_group_) + if (new_group != current_group_) { QueryLayout(); + } } } @@ -190,8 +191,9 @@ auto req = connection_->xkb().GetState( {static_cast<x11::Xkb::DeviceSpec>(x11::Xkb::Id::UseCoreKbd)}); - if (auto reply = req.Sync()) + if (auto reply = req.Sync()) { current_group_ = static_cast<int>(reply->group); + } for (ui::DomCode key : KeyboardLayoutMonitorLinux::kSupportedKeys) { // Skip single-layout IME keys for now, as they are always present in the
diff --git a/remoting/host/keyboard_layout_monitor_mac.cc b/remoting/host/keyboard_layout_monitor_mac.cc index 7027ea5c..a6b2873 100644 --- a/remoting/host/keyboard_layout_monitor_mac.cc +++ b/remoting/host/keyboard_layout_monitor_mac.cc
@@ -11,8 +11,8 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/logging.h" #include "base/mac/scoped_cftyperef.h" #include "base/memory/weak_ptr.h"
diff --git a/remoting/host/keyboard_layout_monitor_win.cc b/remoting/host/keyboard_layout_monitor_win.cc index 4fb4def..636c1cee 100644 --- a/remoting/host/keyboard_layout_monitor_win.cc +++ b/remoting/host/keyboard_layout_monitor_win.cc
@@ -11,9 +11,9 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback.h" #include "base/compiler_specific.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/ptr_util.h" #include "base/memory/weak_ptr.h" #include "base/strings/utf_string_conversions.h"
diff --git a/remoting/host/linux/audio_pipe_reader.cc b/remoting/host/linux/audio_pipe_reader.cc index 15dcc7a..8f3481eb 100644 --- a/remoting/host/linux/audio_pipe_reader.cc +++ b/remoting/host/linux/audio_pipe_reader.cc
@@ -12,7 +12,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/posix/eintr_wrapper.h" #include "base/task/single_thread_task_runner.h"
diff --git a/remoting/host/linux/certificate_watcher.cc b/remoting/host/linux/certificate_watcher.cc index 66de0d1..36c7f492 100644 --- a/remoting/host/linux/certificate_watcher.cc +++ b/remoting/host/linux/certificate_watcher.cc
@@ -4,9 +4,9 @@ #include "remoting/host/linux/certificate_watcher.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/hash/hash.h" #include "base/location.h" #include "base/logging.h"
diff --git a/remoting/host/linux/certificate_watcher_unittest.cc b/remoting/host/linux/certificate_watcher_unittest.cc index dd4c4d4..14b1b99e 100644 --- a/remoting/host/linux/certificate_watcher_unittest.cc +++ b/remoting/host/linux/certificate_watcher_unittest.cc
@@ -8,9 +8,9 @@ #include <memory> #include <string> -#include "base/bind.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/task/single_thread_task_runner.h" #include "base/test/task_environment.h"
diff --git a/remoting/host/linux/clipboard_portal_injector.h b/remoting/host/linux/clipboard_portal_injector.h index 7e0566b..4a6e166 100644 --- a/remoting/host/linux/clipboard_portal_injector.h +++ b/remoting/host/linux/clipboard_portal_injector.h
@@ -9,7 +9,7 @@ #include <unordered_set> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/sequence_checker.h" #include "third_party/webrtc/modules/desktop_capture/linux/wayland/xdg_session_details.h"
diff --git a/remoting/host/linux/curtain_mode_wayland.cc b/remoting/host/linux/curtain_mode_wayland.cc index 4f22525..d2332e8 100644 --- a/remoting/host/linux/curtain_mode_wayland.cc +++ b/remoting/host/linux/curtain_mode_wayland.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/notreached.h" #include "base/task/single_thread_task_runner.h"
diff --git a/remoting/host/linux/input_injector_wayland.cc b/remoting/host/linux/input_injector_wayland.cc index e72f76b3..b3ddbae7 100644 --- a/remoting/host/linux/input_injector_wayland.cc +++ b/remoting/host/linux/input_injector_wayland.cc
@@ -11,10 +11,10 @@ #include <set> #include <utility> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_forward.h" #include "base/containers/queue.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_forward.h" #include "base/numerics/safe_conversions.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversion_utils.h"
diff --git a/remoting/host/linux/input_injector_wayland.h b/remoting/host/linux/input_injector_wayland.h index a78ae3f..abdb52e 100644 --- a/remoting/host/linux/input_injector_wayland.h +++ b/remoting/host/linux/input_injector_wayland.h
@@ -13,10 +13,10 @@ #include <set> #include <utility> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_forward.h" #include "base/containers/queue.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_forward.h" #include "base/numerics/safe_conversions.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversion_utils.h"
diff --git a/remoting/host/linux/keyboard_layout_monitor_wayland.cc b/remoting/host/linux/keyboard_layout_monitor_wayland.cc index 5fd2daf..0bed907 100644 --- a/remoting/host/linux/keyboard_layout_monitor_wayland.cc +++ b/remoting/host/linux/keyboard_layout_monitor_wayland.cc
@@ -8,7 +8,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h" #include "base/notreached.h"
diff --git a/remoting/host/linux/keyboard_layout_monitor_wayland.h b/remoting/host/linux/keyboard_layout_monitor_wayland.h index 2c8cc9a..0143681 100644 --- a/remoting/host/linux/keyboard_layout_monitor_wayland.h +++ b/remoting/host/linux/keyboard_layout_monitor_wayland.h
@@ -7,7 +7,7 @@ #include <xkbcommon/xkbcommon.h> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h" #include "base/notreached.h"
diff --git a/remoting/host/linux/wayland_connection.h b/remoting/host/linux/wayland_connection.h index a00aee1..bfbe509 100644 --- a/remoting/host/linux/wayland_connection.h +++ b/remoting/host/linux/wayland_connection.h
@@ -9,7 +9,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/sequence_checker.h" #include "base/timer/timer.h"
diff --git a/remoting/host/linux/wayland_manager.h b/remoting/host/linux/wayland_manager.h index e926e57e..6cef3c9 100644 --- a/remoting/host/linux/wayland_manager.h +++ b/remoting/host/linux/wayland_manager.h
@@ -9,8 +9,8 @@ #include <xkbcommon/xkbcommon.h> -#include "base/callback.h" #include "base/callback_list.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" #include "base/task/single_thread_task_runner.h" #include "remoting/host/base/screen_resolution.h"
diff --git a/remoting/host/linux/wayland_seat.h b/remoting/host/linux/wayland_seat.h index 39f7abe..2938f84 100644 --- a/remoting/host/linux/wayland_seat.h +++ b/remoting/host/linux/wayland_seat.h
@@ -7,7 +7,7 @@ #include <wayland-client.h> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/sequence_checker.h" #include "remoting/host/linux/wayland_keyboard.h"
diff --git a/remoting/host/linux/x11_character_injector.cc b/remoting/host/linux/x11_character_injector.cc index f718888..b3561edb 100644 --- a/remoting/host/linux/x11_character_injector.cc +++ b/remoting/host/linux/x11_character_injector.cc
@@ -4,7 +4,7 @@ #include "remoting/host/linux/x11_character_injector.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/ranges/algorithm.h" #include "base/time/time.h" #include "remoting/host/linux/x11_keyboard.h"
diff --git a/remoting/host/linux/x11_util.cc b/remoting/host/linux/x11_util.cc index 391fe7c..93ff17e 100644 --- a/remoting/host/linux/x11_util.cc +++ b/remoting/host/linux/x11_util.cc
@@ -4,7 +4,7 @@ #include "remoting/host/linux/x11_util.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/strings/string_util.h" #include "base/types/cxx23_to_underlying.h" #include "remoting/base/logging.h"
diff --git a/remoting/host/linux/x_server_clipboard.cc b/remoting/host/linux/x_server_clipboard.cc index 9101ae4..c65f3af 100644 --- a/remoting/host/linux/x_server_clipboard.cc +++ b/remoting/host/linux/x_server_clipboard.cc
@@ -6,7 +6,7 @@ #include <limits> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/ref_counted_memory.h" #include "base/memory/scoped_refptr.h" #include "base/strings/string_util.h"
diff --git a/remoting/host/linux/x_server_clipboard.h b/remoting/host/linux/x_server_clipboard.h index 6255343..f584114 100644 --- a/remoting/host/linux/x_server_clipboard.h +++ b/remoting/host/linux/x_server_clipboard.h
@@ -10,7 +10,7 @@ #include <set> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/time/time.h" #include "ui/gfx/x/event.h"
diff --git a/remoting/host/linux/x_server_clipboard_unittest.cc b/remoting/host/linux/x_server_clipboard_unittest.cc index 1e1ee159..fa566c11 100644 --- a/remoting/host/linux/x_server_clipboard_unittest.cc +++ b/remoting/host/linux/x_server_clipboard_unittest.cc
@@ -5,7 +5,7 @@ #include <memory> #include <string> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "remoting/base/constants.h" #include "remoting/host/linux/x_server_clipboard.h"
diff --git a/remoting/host/mac/host_service_main.cc b/remoting/host/mac/host_service_main.cc index f65b0605..4090e35d 100644 --- a/remoting/host/mac/host_service_main.cc +++ b/remoting/host/mac/host_service_main.cc
@@ -9,10 +9,10 @@ #include <string> #include "base/at_exit.h" -#include "base/bind.h" #include "base/command_line.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/mac/mac_util.h" #include "base/path_service.h"
diff --git a/remoting/host/mac/permission_checker.cc b/remoting/host/mac/permission_checker.cc index e8d8239b..111e89d 100644 --- a/remoting/host/mac/permission_checker.cc +++ b/remoting/host/mac/permission_checker.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/task/single_thread_task_runner.h" #include "remoting/host/mac/permission_process_utils.h" #include "remoting/host/version.h"
diff --git a/remoting/host/mac/permission_utils.h b/remoting/host/mac/permission_utils.h index 3ec8924..7647831f 100644 --- a/remoting/host/mac/permission_utils.h +++ b/remoting/host/mac/permission_utils.h
@@ -5,7 +5,7 @@ #ifndef REMOTING_HOST_MAC_PERMISSION_UTILS_H_ #define REMOTING_HOST_MAC_PERMISSION_UTILS_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" namespace base {
diff --git a/remoting/host/mac/permission_utils.mm b/remoting/host/mac/permission_utils.mm index a39235c..37bf7617 100644 --- a/remoting/host/mac/permission_utils.mm +++ b/remoting/host/mac/permission_utils.mm
@@ -7,7 +7,7 @@ #import <AVFoundation/AVFoundation.h> #import <Cocoa/Cocoa.h> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/logging.h" #include "base/mac/foundation_util.h"
diff --git a/remoting/host/mac/permission_wizard.h b/remoting/host/mac/permission_wizard.h index a4503ed3..26f56e9 100644 --- a/remoting/host/mac/permission_wizard.h +++ b/remoting/host/mac/permission_wizard.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" namespace base {
diff --git a/remoting/host/mac/permission_wizard.mm b/remoting/host/mac/permission_wizard.mm index b08b51f3..d72246b8 100644 --- a/remoting/host/mac/permission_wizard.mm +++ b/remoting/host/mac/permission_wizard.mm
@@ -9,8 +9,8 @@ #import <Cocoa/Cocoa.h> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/mac/mac_util.h" #include "base/memory/weak_ptr.h" #include "base/strings/sys_string_conversions.h"
diff --git a/remoting/host/me2me_desktop_environment.cc b/remoting/host/me2me_desktop_environment.cc index 383fb2b..b08eb1c 100644 --- a/remoting/host/me2me_desktop_environment.cc +++ b/remoting/host/me2me_desktop_environment.cc
@@ -181,8 +181,8 @@ // Detach the session from the local console if the caller requested. if (desktop_environment_options().enable_curtaining()) { - curtain_ = CurtainMode::Create( - caller_task_runner(), ui_task_runner(), client_session_control); + curtain_ = CurtainMode::Create(caller_task_runner(), ui_task_runner(), + client_session_control); if (!curtain_->Activate()) { LOG(ERROR) << "Failed to activate the curtain mode."; curtain_ = nullptr; @@ -242,8 +242,7 @@ input_task_runner, ui_task_runner) {} -Me2MeDesktopEnvironmentFactory::~Me2MeDesktopEnvironmentFactory() { -} +Me2MeDesktopEnvironmentFactory::~Me2MeDesktopEnvironmentFactory() = default; std::unique_ptr<DesktopEnvironment> Me2MeDesktopEnvironmentFactory::Create( base::WeakPtr<ClientSessionControl> client_session_control,
diff --git a/remoting/host/mouse_cursor_monitor_proxy.cc b/remoting/host/mouse_cursor_monitor_proxy.cc index 0c769fe..4c6e32d3 100644 --- a/remoting/host/mouse_cursor_monitor_proxy.cc +++ b/remoting/host/mouse_cursor_monitor_proxy.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/logging.h" #include "base/task/single_thread_task_runner.h" @@ -75,23 +75,26 @@ mouse_cursor_monitor_.reset(webrtc::MouseCursorMonitor::CreateForScreen( options, webrtc::kFullDesktopScreenId)); #endif // BUILDFLAG(IS_CHROMEOS_ASH) - if (!mouse_cursor_monitor_) + if (!mouse_cursor_monitor_) { LOG(ERROR) << "Failed to initialize MouseCursorMonitor."; + } } void MouseCursorMonitorProxy::Core::Init( webrtc::MouseCursorMonitor::Mode mode) { DCHECK(thread_checker_.CalledOnValidThread()); - if (mouse_cursor_monitor_) + if (mouse_cursor_monitor_) { mouse_cursor_monitor_->Init(this, mode); + } } void MouseCursorMonitorProxy::Core::Capture() { DCHECK(thread_checker_.CalledOnValidThread()); - if (mouse_cursor_monitor_) + if (mouse_cursor_monitor_) { mouse_cursor_monitor_->Capture(); + } } void MouseCursorMonitorProxy::Core::SetMouseCursorMonitorForTests(
diff --git a/remoting/host/mouse_cursor_monitor_proxy_unittest.cc b/remoting/host/mouse_cursor_monitor_proxy_unittest.cc index fce6aee5..a9d1d02 100644 --- a/remoting/host/mouse_cursor_monitor_proxy_unittest.cc +++ b/remoting/host/mouse_cursor_monitor_proxy_unittest.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/task/single_thread_task_runner.h" @@ -36,12 +36,11 @@ static const int kHotspotX = 11; static const int kHotspotY = 12; -class ThreadCheckMouseCursorMonitor : public webrtc::MouseCursorMonitor { +class ThreadCheckMouseCursorMonitor : public webrtc::MouseCursorMonitor { public: ThreadCheckMouseCursorMonitor( scoped_refptr<base::SingleThreadTaskRunner> task_runner) - : task_runner_(task_runner), callback_(nullptr) { - } + : task_runner_(task_runner), callback_(nullptr) {} ThreadCheckMouseCursorMonitor(const ThreadCheckMouseCursorMonitor&) = delete; ThreadCheckMouseCursorMonitor& operator=(
diff --git a/remoting/host/mouse_shape_pump.cc b/remoting/host/mouse_shape_pump.cc index 648a6ec..8badcc04 100644 --- a/remoting/host/mouse_shape_pump.cc +++ b/remoting/host/mouse_shape_pump.cc
@@ -8,7 +8,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/timer/timer.h" #include "remoting/proto/control.pb.h" #include "remoting/protocol/cursor_shape_stub.h" @@ -64,22 +64,23 @@ uint8_t* current_row = cursor->image()->data(); for (int y = 0; y < cursor->image()->size().height(); ++y) { cursor_proto->mutable_data()->append( - current_row, - current_row + cursor->image()->size().width() * - webrtc::DesktopFrame::kBytesPerPixel); + current_row, current_row + cursor->image()->size().width() * + webrtc::DesktopFrame::kBytesPerPixel); current_row += cursor->image()->stride(); } cursor_shape_stub_->SetCursorShape(*cursor_proto); - if (callback_) + if (callback_) { callback_->OnMouseCursor(owned_cursor.release()); + } } void MouseShapePump::OnMouseCursorPosition( const webrtc::DesktopVector& position) { - if (callback_) + if (callback_) { callback_->OnMouseCursorPosition(position); + } } } // namespace remoting
diff --git a/remoting/host/mouse_shape_pump.h b/remoting/host/mouse_shape_pump.h index cbb2f1b..e9d4fd7c 100644 --- a/remoting/host/mouse_shape_pump.h +++ b/remoting/host/mouse_shape_pump.h
@@ -16,7 +16,7 @@ namespace protocol { class CursorShapeStub; -} // namespace +} // namespace protocol // MouseShapePump is responsible for capturing mouse shape using // MouseCursorMonitor and sending it to a CursorShapeStub.
diff --git a/remoting/host/mouse_shape_pump_unittest.cc b/remoting/host/mouse_shape_pump_unittest.cc index 63e6bc99..f9a0a7b 100644 --- a/remoting/host/mouse_shape_pump_unittest.cc +++ b/remoting/host/mouse_shape_pump_unittest.cc
@@ -33,7 +33,7 @@ static const int kHotspotX = 11; static const int kHotspotY = 12; -class TestMouseCursorMonitor : public webrtc::MouseCursorMonitor { +class TestMouseCursorMonitor : public webrtc::MouseCursorMonitor { public: TestMouseCursorMonitor() : callback_(nullptr) {} @@ -96,9 +96,8 @@ TEST_F(MouseShapePumpTest, FirstCursor) { // Stop the |run_loop_| once it has captured the cursor. EXPECT_CALL(client_stub_, SetCursorShape(_)) - .WillOnce(DoAll( - Invoke(this, &MouseShapePumpTest::SetCursorShape), - InvokeWithoutArgs(&run_loop_, &base::RunLoop::Quit))) + .WillOnce(DoAll(Invoke(this, &MouseShapePumpTest::SetCursorShape), + InvokeWithoutArgs(&run_loop_, &base::RunLoop::Quit))) .RetiresOnSaturation(); // Start the pump.
diff --git a/remoting/host/native_messaging/log_message_handler.cc b/remoting/host/native_messaging/log_message_handler.cc index 35de5f1d..624aa78f 100644 --- a/remoting/host/native_messaging/log_message_handler.cc +++ b/remoting/host/native_messaging/log_message_handler.cc
@@ -4,7 +4,7 @@ #include "remoting/host/native_messaging/log_message_handler.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/lazy_instance.h" #include "base/logging.h" #include "base/strings/string_util.h"
diff --git a/remoting/host/native_messaging/log_message_handler.h b/remoting/host/native_messaging/log_message_handler.h index 2328c4d..8e77721 100644 --- a/remoting/host/native_messaging/log_message_handler.h +++ b/remoting/host/native_messaging/log_message_handler.h
@@ -9,7 +9,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/logging.h" #include "base/memory/weak_ptr.h" #include "base/values.h"
diff --git a/remoting/host/native_messaging/native_messaging_pipe.cc b/remoting/host/native_messaging/native_messaging_pipe.cc index 1ccb7253..62681934 100644 --- a/remoting/host/native_messaging/native_messaging_pipe.cc +++ b/remoting/host/native_messaging/native_messaging_pipe.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/json/json_reader.h" #include "base/json/json_writer.h" #include "base/values.h"
diff --git a/remoting/host/native_messaging/native_messaging_reader.cc b/remoting/host/native_messaging/native_messaging_reader.cc index c77c90a..8edac5e 100644 --- a/remoting/host/native_messaging/native_messaging_reader.cc +++ b/remoting/host/native_messaging/native_messaging_reader.cc
@@ -9,8 +9,8 @@ #include <string> #include <utility> -#include "base/bind.h" #include "base/files/file.h" +#include "base/functional/bind.h" #include "base/json/json_reader.h" #include "base/location.h" #include "base/logging.h"
diff --git a/remoting/host/native_messaging/native_messaging_reader.h b/remoting/host/native_messaging/native_messaging_reader.h index 3896127..f945af9 100644 --- a/remoting/host/native_messaging/native_messaging_reader.h +++ b/remoting/host/native_messaging/native_messaging_reader.h
@@ -7,8 +7,8 @@ #include <memory> -#include "base/callback.h" #include "base/files/file.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "base/threading/thread.h"
diff --git a/remoting/host/native_messaging/native_messaging_reader_unittest.cc b/remoting/host/native_messaging/native_messaging_reader_unittest.cc index 340b6f0..f7b1f68 100644 --- a/remoting/host/native_messaging/native_messaging_reader_unittest.cc +++ b/remoting/host/native_messaging/native_messaging_reader_unittest.cc
@@ -8,7 +8,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/test/task_environment.h" #include "base/values.h"
diff --git a/remoting/host/native_messaging/pipe_messaging_channel.cc b/remoting/host/native_messaging/pipe_messaging_channel.cc index 33a9827..789d518 100644 --- a/remoting/host/native_messaging/pipe_messaging_channel.cc +++ b/remoting/host/native_messaging/pipe_messaging_channel.cc
@@ -6,10 +6,10 @@ #include <utility> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/files/file.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/process/process_info.h" #include "base/values.h"
diff --git a/remoting/host/native_messaging/pipe_messaging_channel.h b/remoting/host/native_messaging/pipe_messaging_channel.h index 59fafb8..e6da7e12 100644 --- a/remoting/host/native_messaging/pipe_messaging_channel.h +++ b/remoting/host/native_messaging/pipe_messaging_channel.h
@@ -7,8 +7,8 @@ #include <memory> -#include "base/callback.h" #include "base/files/file.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/sequence_checker.h"
diff --git a/remoting/host/pairing_registry_delegate_linux.cc b/remoting/host/pairing_registry_delegate_linux.cc index a9f490b..d9f83670 100644 --- a/remoting/host/pairing_registry_delegate_linux.cc +++ b/remoting/host/pairing_registry_delegate_linux.cc
@@ -7,10 +7,10 @@ #include <memory> #include <utility> -#include "base/bind.h" #include "base/files/file_enumerator.h" #include "base/files/file_util.h" #include "base/files/important_file_writer.h" +#include "base/functional/bind.h" #include "base/json/json_file_value_serializer.h" #include "base/json/json_string_value_serializer.h" #include "base/location.h"
diff --git a/remoting/host/pairing_registry_delegate_win.cc b/remoting/host/pairing_registry_delegate_win.cc index d356ad1..ad3f7986 100644 --- a/remoting/host/pairing_registry_delegate_win.cc +++ b/remoting/host/pairing_registry_delegate_win.cc
@@ -101,11 +101,9 @@ using protocol::PairingRegistry; -PairingRegistryDelegateWin::PairingRegistryDelegateWin() { -} +PairingRegistryDelegateWin::PairingRegistryDelegateWin() {} -PairingRegistryDelegateWin::~PairingRegistryDelegateWin() { -} +PairingRegistryDelegateWin::~PairingRegistryDelegateWin() {} bool PairingRegistryDelegateWin::SetRootKeys(HKEY privileged, HKEY unprivileged) { @@ -113,12 +111,14 @@ DCHECK(!unprivileged_.Valid()); DCHECK(unprivileged); - if (!DuplicateKeyHandle(unprivileged, &unprivileged_)) + if (!DuplicateKeyHandle(unprivileged, &unprivileged_)) { return false; + } if (privileged) { - if (!DuplicateKeyHandle(privileged, &privileged_)) + if (!DuplicateKeyHandle(privileged, &privileged_)) { return false; + } } return true; @@ -162,8 +162,9 @@ // presubmit: allow wstring std::wstring value_name; LONG result = unprivileged_.GetValueNameAt(0, &value_name); - if (result == ERROR_SUCCESS) + if (result == ERROR_SUCCESS) { result = unprivileged_.DeleteValue(value_name.c_str()); + } success = success && (result == ERROR_SUCCESS); count = unprivileged_.GetValueCount(); @@ -174,8 +175,9 @@ // presubmit: allow wstring std::wstring value_name; LONG result = privileged_.GetValueNameAt(0, &value_name); - if (result == ERROR_SUCCESS) + if (result == ERROR_SUCCESS) { result = privileged_.DeleteValue(value_name.c_str()); + } success = success && (result == ERROR_SUCCESS); count = privileged_.GetValueCount(); @@ -192,15 +194,17 @@ // Read unprivileged fields first. absl::optional<base::Value::Dict> pairing = ReadValue(unprivileged_, value_name.c_str()); - if (!pairing) + if (!pairing) { return PairingRegistry::Pairing(); + } // Read the shared secret. if (privileged_.Valid()) { absl::optional<base::Value::Dict> secret = ReadValue(privileged_, value_name.c_str()); - if (!secret) + if (!secret) { return PairingRegistry::Pairing(); + } // Merge the two dictionaries. pairing->Merge(std::move(*secret)); @@ -212,7 +216,7 @@ bool PairingRegistryDelegateWin::Save(const PairingRegistry::Pairing& pairing) { if (!privileged_.Valid()) { LOG(ERROR) << "Cannot save pairing entry '" << pairing.client_id() - << "': the pairing registry privileged key is invalid."; + << "': the pairing registry privileged key is invalid."; return false; } @@ -241,15 +245,14 @@ bool PairingRegistryDelegateWin::Delete(const std::string& client_id) { if (!privileged_.Valid()) { LOG(ERROR) << "Cannot delete pairing entry '" << client_id - << "': the delegate is read-only."; + << "': the delegate is read-only."; return false; } // presubmit: allow wstring std::wstring value_name = base::UTF8ToWide(client_id); LONG result = privileged_.DeleteValue(value_name.c_str()); - if (result != ERROR_SUCCESS && - result != ERROR_FILE_NOT_FOUND && + if (result != ERROR_SUCCESS && result != ERROR_FILE_NOT_FOUND && result != ERROR_PATH_NOT_FOUND) { SetLastError(result); PLOG(ERROR) << "Cannot delete pairing entry '" << client_id << "'"; @@ -257,8 +260,7 @@ } result = unprivileged_.DeleteValue(value_name.c_str()); - if (result != ERROR_SUCCESS && - result != ERROR_FILE_NOT_FOUND && + if (result != ERROR_SUCCESS && result != ERROR_FILE_NOT_FOUND && result != ERROR_PATH_NOT_FOUND) { SetLastError(result); PLOG(ERROR) << "Cannot delete pairing entry '" << client_id << "'";
diff --git a/remoting/host/pairing_registry_delegate_win.h b/remoting/host/pairing_registry_delegate_win.h index f087ffcd..055a0b7 100644 --- a/remoting/host/pairing_registry_delegate_win.h +++ b/remoting/host/pairing_registry_delegate_win.h
@@ -34,8 +34,7 @@ // Creator of this object is responsible for passing the registry key handles // with appropriate access. |privileged| may be nullptr if read-only access is // sufficient. Shared secrets will not be returned in such a case. -class PairingRegistryDelegateWin - : public protocol::PairingRegistry::Delegate { +class PairingRegistryDelegateWin : public protocol::PairingRegistry::Delegate { public: PairingRegistryDelegateWin();
diff --git a/remoting/host/pairing_registry_delegate_win_unittest.cc b/remoting/host/pairing_registry_delegate_win_unittest.cc index 5347489e..787fc72 100644 --- a/remoting/host/pairing_registry_delegate_win_unittest.cc +++ b/remoting/host/pairing_registry_delegate_win_unittest.cc
@@ -38,8 +38,8 @@ privileged_.Close(); unprivileged_.Close(); EXPECT_TRUE( - SHDeleteKey(HKEY_CURRENT_USER, - base::UTF8ToWide(key_name_).c_str()) == ERROR_SUCCESS); + SHDeleteKey(HKEY_CURRENT_USER, base::UTF8ToWide(key_name_).c_str()) == + ERROR_SUCCESS); } protected:
diff --git a/remoting/host/pam_authorization_factory_posix.cc b/remoting/host/pam_authorization_factory_posix.cc index 8b8b48f..9dd7f4fa 100644 --- a/remoting/host/pam_authorization_factory_posix.cc +++ b/remoting/host/pam_authorization_factory_posix.cc
@@ -8,9 +8,9 @@ #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/environment.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "remoting/base/logging.h" #include "remoting/host/base/username.h" #include "remoting/protocol/channel_authenticator.h" @@ -69,8 +69,8 @@ return underlying_->started(); } -protocol::Authenticator::RejectionReason -PamAuthorizer::rejection_reason() const { +protocol::Authenticator::RejectionReason PamAuthorizer::rejection_reason() + const { if (local_login_status_ == DISALLOWED) { return RejectionReason::INVALID_CREDENTIALS; } else { @@ -93,7 +93,8 @@ } std::unique_ptr<jingle_xmpp::XmlElement> PamAuthorizer::GetNextMessage() { - std::unique_ptr<jingle_xmpp::XmlElement> result(underlying_->GetNextMessage()); + std::unique_ptr<jingle_xmpp::XmlElement> result( + underlying_->GetNextMessage()); MaybeCheckLocalLogin(); return result; } @@ -118,17 +119,17 @@ if (username.empty()) { return false; } - struct pam_conv conv = { PamConversation, nullptr }; + struct pam_conv conv = {PamConversation, nullptr}; pam_handle_t* handle = nullptr; - int result = pam_start("chrome-remote-desktop", username.c_str(), - &conv, &handle); + int result = + pam_start("chrome-remote-desktop", username.c_str(), &conv, &handle); if (result == PAM_SUCCESS) { result = pam_acct_mgmt(handle, 0); } pam_end(handle, result); HOST_LOG << "Local login check for " << username - << (result == PAM_SUCCESS ? " succeeded." : " failed."); + << (result == PAM_SUCCESS ? " succeeded." : " failed."); return result == PAM_SUCCESS; }
diff --git a/remoting/host/pam_authorization_factory_posix.h b/remoting/host/pam_authorization_factory_posix.h index c0a10c1..d6df4b3 100644 --- a/remoting/host/pam_authorization_factory_posix.h +++ b/remoting/host/pam_authorization_factory_posix.h
@@ -9,7 +9,6 @@ #include "remoting/protocol/authenticator.h" - // PamAuthorizationFactory abuses the AuthenticatorFactory interface to apply // PAM-based authorization on top of some underlying authentication scheme.
diff --git a/remoting/host/pin_hash.cc b/remoting/host/pin_hash.cc index f8fe18c1..40fb543 100644 --- a/remoting/host/pin_hash.cc +++ b/remoting/host/pin_hash.cc
@@ -15,11 +15,13 @@ const std::string& host_id, std::string* pin_hash_out) { size_t separator = value.find(':'); - if (separator == std::string::npos) + if (separator == std::string::npos) { return false; + } - if (!base::Base64Decode(value.substr(separator + 1), pin_hash_out)) + if (!base::Base64Decode(value.substr(separator + 1), pin_hash_out)) { return false; + } std::string function_name = value.substr(0, separator); if (function_name == "plain") {
diff --git a/remoting/host/pin_hash_unittest.cc b/remoting/host/pin_hash_unittest.cc index 2d6d9dc..4ae6dbe5 100644 --- a/remoting/host/pin_hash_unittest.cc +++ b/remoting/host/pin_hash_unittest.cc
@@ -10,8 +10,7 @@ namespace remoting { -class PinHashTest : public testing::Test { -}; +class PinHashTest : public testing::Test {}; TEST_F(PinHashTest, KnownHashValue) { std::string hash = MakeHostPinHash("Host ID", "1234"); @@ -23,15 +22,12 @@ std::string host_id2("Host ID 2"); std::string pin1("1234"); std::string pin2("4321"); - ASSERT_TRUE(VerifyHostPinHash(MakeHostPinHash(host_id1, pin1), - host_id1, - pin1)); - ASSERT_FALSE(VerifyHostPinHash(MakeHostPinHash(host_id1, pin1), - host_id2, - pin1)); - ASSERT_FALSE(VerifyHostPinHash(MakeHostPinHash(host_id1, pin1), - host_id1, - pin2)); + ASSERT_TRUE( + VerifyHostPinHash(MakeHostPinHash(host_id1, pin1), host_id1, pin1)); + ASSERT_FALSE( + VerifyHostPinHash(MakeHostPinHash(host_id1, pin1), host_id2, pin1)); + ASSERT_FALSE( + VerifyHostPinHash(MakeHostPinHash(host_id1, pin1), host_id1, pin2)); } } // namespace remoting
diff --git a/remoting/host/policy_watcher.cc b/remoting/host/policy_watcher.cc index 9d631bb1..3875a636 100644 --- a/remoting/host/policy_watcher.cc +++ b/remoting/host/policy_watcher.cc
@@ -10,9 +10,9 @@ #include <memory> #include <utility> -#include "base/bind.h" #include "base/compiler_specific.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/logging.h" #include "base/memory/ptr_util.h" @@ -467,9 +467,9 @@ policy::PolicyServiceImpl::Providers providers; std::unique_ptr<policy::PolicyService> owned_policy_service( new policy::PolicyServiceImpl(providers)); - return base::WrapUnique(new PolicyWatcher( - owned_policy_service.get(), std::move(owned_policy_service), nullptr, - CreateSchemaRegistry())); + return base::WrapUnique(new PolicyWatcher(owned_policy_service.get(), + std::move(owned_policy_service), + nullptr, CreateSchemaRegistry())); #elif BUILDFLAG(IS_CHROMEOS_ASH) NOTREACHED() << "CreateWithPolicyService() should be used on ChromeOS."; return nullptr;
diff --git a/remoting/host/policy_watcher.h b/remoting/host/policy_watcher.h index 71aa59c..4e4754e 100644 --- a/remoting/host/policy_watcher.h +++ b/remoting/host/policy_watcher.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h" #include "base/sequence_checker.h"
diff --git a/remoting/host/policy_watcher_unittest.cc b/remoting/host/policy_watcher_unittest.cc index b88a10d..59c8279 100644 --- a/remoting/host/policy_watcher_unittest.cc +++ b/remoting/host/policy_watcher_unittest.cc
@@ -4,7 +4,7 @@ #include "remoting/host/policy_watcher.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/json/json_writer.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h"
diff --git a/remoting/host/posix/signal_handler.cc b/remoting/host/posix/signal_handler.cc index 648a978..409b223 100644 --- a/remoting/host/posix/signal_handler.cc +++ b/remoting/host/posix/signal_handler.cc
@@ -14,9 +14,9 @@ #include <tuple> #include <utility> -#include "base/bind.h" #include "base/compiler_specific.h" #include "base/files/file_descriptor_watcher_posix.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/posix/eintr_wrapper.h" #include "base/threading/platform_thread.h"
diff --git a/remoting/host/posix/signal_handler.h b/remoting/host/posix/signal_handler.h index bc21363..ce3ebbc 100644 --- a/remoting/host/posix/signal_handler.h +++ b/remoting/host/posix/signal_handler.h
@@ -9,7 +9,7 @@ #ifndef REMOTING_HOST_POSIX_SIGNAL_HANDLER_H_ #define REMOTING_HOST_POSIX_SIGNAL_HANDLER_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" namespace remoting {
diff --git a/remoting/host/register_support_host_request.h b/remoting/host/register_support_host_request.h index 885f5b8f..b21344f 100644 --- a/remoting/host/register_support_host_request.h +++ b/remoting/host/register_support_host_request.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/scoped_refptr.h" #include "base/time/time.h" #include "remoting/base/rsa_key_pair.h"
diff --git a/remoting/host/remote_input_filter.cc b/remoting/host/remote_input_filter.cc index e0248a2..2daee0a 100644 --- a/remoting/host/remote_input_filter.cc +++ b/remoting/host/remote_input_filter.cc
@@ -27,14 +27,12 @@ // is received. const int64_t kRemoteBlockTimeoutMillis = 2000; -} // namespace +} // namespace namespace remoting { RemoteInputFilter::RemoteInputFilter(protocol::InputEventTracker* event_tracker) - : event_tracker_(event_tracker), - expect_local_echo_(true) { -} + : event_tracker_(event_tracker), expect_local_echo_(true) {} RemoteInputFilter::~RemoteInputFilter() = default; @@ -91,13 +89,15 @@ void RemoteInputFilter::SetExpectLocalEcho(bool expect_local_echo) { expect_local_echo_ = expect_local_echo; - if (!expect_local_echo_) + if (!expect_local_echo_) { injected_mouse_positions_.clear(); + } } void RemoteInputFilter::InjectKeyEvent(const protocol::KeyEvent& event) { - if (ShouldIgnoreInput()) + if (ShouldIgnoreInput()) { return; + } if (expect_local_echo_ && event.pressed() && event.has_usb_keycode()) { injected_key_presses_.push_back(event.usb_keycode()); if (injected_key_presses_.size() > kNumRemoteKeyPresses) { @@ -109,14 +109,16 @@ } void RemoteInputFilter::InjectTextEvent(const protocol::TextEvent& event) { - if (ShouldIgnoreInput()) + if (ShouldIgnoreInput()) { return; + } event_tracker_->InjectTextEvent(event); } void RemoteInputFilter::InjectMouseEvent(const protocol::MouseEvent& event) { - if (ShouldIgnoreInput()) + if (ShouldIgnoreInput()) { return; + } if (expect_local_echo_ && event.has_x() && event.has_y()) { injected_mouse_positions_.push_back( webrtc::DesktopVector(event.x(), event.y())); @@ -129,8 +131,9 @@ } void RemoteInputFilter::InjectTouchEvent(const protocol::TouchEvent& event) { - if (ShouldIgnoreInput()) + if (ShouldIgnoreInput()) { return; + } event_tracker_->InjectTouchEvent(event); } @@ -138,8 +141,9 @@ // Ignore remote events if the local mouse moved recently. int64_t millis = (base::TimeTicks::Now() - latest_local_input_time_).InMilliseconds(); - if (millis < kRemoteBlockTimeoutMillis) + if (millis < kRemoteBlockTimeoutMillis) { return true; + } return false; }
diff --git a/remoting/host/remote_input_filter_unittest.cc b/remoting/host/remote_input_filter_unittest.cc index b723f6e57..ae71790 100644 --- a/remoting/host/remote_input_filter_unittest.cc +++ b/remoting/host/remote_input_filter_unittest.cc
@@ -66,8 +66,9 @@ EXPECT_CALL(mock_stub, InjectMouseEvent(_)).Times(10); - for (int i = 0; i < 10; ++i) + for (int i = 0; i < 10; ++i) { input_filter.InjectMouseEvent(MouseMoveEvent(0, 0)); + } } // Verify that events get through until there is local activity. @@ -80,9 +81,10 @@ for (int i = 0; i < 10; ++i) { input_filter.InjectMouseEvent(MouseMoveEvent(0, 0)); - if (i == 4) + if (i == 4) { input_filter.LocalPointerMoved(webrtc::DesktopVector(1, 1), ui::ET_MOUSE_MOVED); + } } } @@ -127,9 +129,10 @@ input_filter.InjectMouseEvent(MouseMoveEvent(0, 0)); input_filter.LocalPointerMoved(webrtc::DesktopVector(0, 0), ui::ET_MOUSE_MOVED); - if (i == 4) + if (i == 4) { input_filter.LocalPointerMoved(webrtc::DesktopVector(1, 1), ui::ET_MOUSE_MOVED); + } } } @@ -212,9 +215,10 @@ input_filter.InjectMouseEvent(MouseMoveEvent(0, 0)); input_filter.LocalPointerMoved(webrtc::DesktopVector(0, 0), ui::ET_MOUSE_MOVED); - if (i == 4) + if (i == 4) { input_filter.LocalPointerMoved(webrtc::DesktopVector(1, 1), ui::ET_MOUSE_MOVED); + } } }
diff --git a/remoting/host/remote_open_url/remote_open_url_client.cc b/remoting/host/remote_open_url/remote_open_url_client.cc index f044ed95..c8b584f 100644 --- a/remoting/host/remote_open_url/remote_open_url_client.cc +++ b/remoting/host/remote_open_url/remote_open_url_client.cc
@@ -4,8 +4,8 @@ #include "remoting/host/remote_open_url/remote_open_url_client.h" -#include "base/bind.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/notreached.h" #include "base/strings/utf_string_conversions.h"
diff --git a/remoting/host/remote_open_url/remote_open_url_client.h b/remoting/host/remote_open_url/remote_open_url_client.h index 3ec28201..3382f3f 100644 --- a/remoting/host/remote_open_url/remote_open_url_client.h +++ b/remoting/host/remote_open_url/remote_open_url_client.h
@@ -7,8 +7,8 @@ #include <memory> -#include "base/callback.h" #include "base/command_line.h" +#include "base/functional/callback.h" #include "base/time/time.h" #include "base/timer/timer.h" #include "mojo/public/cpp/bindings/remote.h"
diff --git a/remoting/host/remote_open_url/remote_open_url_client_unittest.cc b/remoting/host/remote_open_url/remote_open_url_client_unittest.cc index d8e9de2..3878792 100644 --- a/remoting/host/remote_open_url/remote_open_url_client_unittest.cc +++ b/remoting/host/remote_open_url/remote_open_url_client_unittest.cc
@@ -6,8 +6,8 @@ #include <memory> -#include "base/callback_forward.h" #include "base/command_line.h" +#include "base/functional/callback_forward.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h"
diff --git a/remoting/host/remote_open_url/remote_open_url_message_handler.cc b/remoting/host/remote_open_url/remote_open_url_message_handler.cc index 75d71c67..ef4797a 100644 --- a/remoting/host/remote_open_url/remote_open_url_message_handler.cc +++ b/remoting/host/remote_open_url/remote_open_url_message_handler.cc
@@ -4,8 +4,8 @@ #include "remoting/host/remote_open_url/remote_open_url_message_handler.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "remoting/base/compound_buffer.h" #include "remoting/protocol/message_serialization.h"
diff --git a/remoting/host/remote_open_url/remote_open_url_message_handler_unittest.cc b/remoting/host/remote_open_url/remote_open_url_message_handler_unittest.cc index c066771..e21eb78 100644 --- a/remoting/host/remote_open_url/remote_open_url_message_handler_unittest.cc +++ b/remoting/host/remote_open_url/remote_open_url_message_handler_unittest.cc
@@ -7,8 +7,8 @@ #include <cstdint> #include <memory> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h" #include "base/run_loop.h"
diff --git a/remoting/host/remote_open_url/url_forwarder_configurator.h b/remoting/host/remote_open_url/url_forwarder_configurator.h index 6bcfe99..38fe226 100644 --- a/remoting/host/remote_open_url/url_forwarder_configurator.h +++ b/remoting/host/remote_open_url/url_forwarder_configurator.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "remoting/proto/url_forwarder_control.pb.h" namespace remoting {
diff --git a/remoting/host/remote_open_url/url_forwarder_configurator_linux.cc b/remoting/host/remote_open_url/url_forwarder_configurator_linux.cc index 2251d27..5e12642 100644 --- a/remoting/host/remote_open_url/url_forwarder_configurator_linux.cc +++ b/remoting/host/remote_open_url/url_forwarder_configurator_linux.cc
@@ -7,8 +7,8 @@ #include <memory> #include "base/base_paths.h" -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/path_service.h" #include "base/process/launch.h"
diff --git a/remoting/host/remote_open_url/url_forwarder_configurator_main_win.cc b/remoting/host/remote_open_url/url_forwarder_configurator_main_win.cc index b28ce8c..fcc0376 100644 --- a/remoting/host/remote_open_url/url_forwarder_configurator_main_win.cc +++ b/remoting/host/remote_open_url/url_forwarder_configurator_main_win.cc
@@ -11,9 +11,9 @@ #include <memory> #include <string> -#include "base/bind.h" -#include "base/callback_forward.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback_forward.h" #include "base/logging.h" #include "base/message_loop/message_pump_type.h" #include "base/notreached.h"
diff --git a/remoting/host/remote_open_url/url_forwarder_configurator_win.cc b/remoting/host/remote_open_url/url_forwarder_configurator_win.cc index 148e0aa..905c0e27 100644 --- a/remoting/host/remote_open_url/url_forwarder_configurator_win.cc +++ b/remoting/host/remote_open_url/url_forwarder_configurator_win.cc
@@ -10,9 +10,9 @@ #include <string> #include "base/base_paths.h" -#include "base/bind.h" #include "base/command_line.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/logging.h" #include "base/notreached.h"
diff --git a/remoting/host/remote_open_url/url_forwarder_control_message_handler.cc b/remoting/host/remote_open_url/url_forwarder_control_message_handler.cc index dca6b132..472e717 100644 --- a/remoting/host/remote_open_url/url_forwarder_control_message_handler.cc +++ b/remoting/host/remote_open_url/url_forwarder_control_message_handler.cc
@@ -4,8 +4,8 @@ #include "remoting/host/remote_open_url/url_forwarder_control_message_handler.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "remoting/base/logging.h" #include "remoting/host/remote_open_url/url_forwarder_configurator.h"
diff --git a/remoting/host/remoting_me2me_host.cc b/remoting/host/remoting_me2me_host.cc index 53a2882..2b8ed3bf 100644 --- a/remoting/host/remoting_me2me_host.cc +++ b/remoting/host/remoting_me2me_host.cc
@@ -12,11 +12,11 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback.h" #include "base/command_line.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/message_loop/message_pump_type.h" #include "base/notreached.h" @@ -159,8 +159,8 @@ #include "remoting/host/linux/wayland_manager.h" #endif // defined(REMOTING_USE_WAYLAND) -using remoting::protocol::PairingRegistry; using remoting::protocol::NetworkSettings; +using remoting::protocol::PairingRegistry; #if BUILDFLAG(IS_APPLE) @@ -168,7 +168,7 @@ // inject input in the login screen. Just the name of the section is important, // not its contents. __attribute__((used)) -__attribute__((section ("__CGPreLoginApp,__cgpreloginapp"))) +__attribute__((section("__CGPreLoginApp,__cgpreloginapp"))) static const char magic_section[] = ""; #endif // BUILDFLAG(IS_APPLE) @@ -490,8 +490,8 @@ mojo::AssociatedReceiver<mojom::RemotingHostControl> remoting_host_control_{ this}; - mojo::AssociatedReceiver<mojom::WorkerProcessControl> - worker_process_control_{this}; + mojo::AssociatedReceiver<mojom::WorkerProcessControl> worker_process_control_{ + this}; #if BUILDFLAG(IS_APPLE) // When using the command line option to check the Accessibility or Screen @@ -582,7 +582,8 @@ auto endpoint = mojo::PlatformChannel::RecoverPassedEndpointFromCommandLine(*cmd_line); if (!endpoint.is_valid()) { - LOG(ERROR) << "IPC channel endpoint provided via command line param was missing or invalid"; + LOG(ERROR) << "IPC channel endpoint provided via command line param was " + "missing or invalid"; return false; } auto invitation = mojo::IncomingInvitation::Accept(std::move(endpoint)); @@ -595,7 +596,7 @@ IPC::Channel::MODE_CLIENT, this, context_->network_task_runner(), base::SingleThreadTaskRunner::GetCurrentDefault()); -#else // !defined(REMOTING_MULTI_PROCESS) +#else // !defined(REMOTING_MULTI_PROCESS) if (cmd_line->HasSwitch(kHostConfigSwitchName)) { host_config_path_ = cmd_line->GetSwitchValuePath(kHostConfigSwitchName); @@ -658,8 +659,9 @@ } // Filter out duplicates. - if (config_ == config) + if (config_ == config) { return; + } HOST_LOG << "Applying new host configuration."; @@ -784,8 +786,9 @@ void HostProcess::CreateAuthenticatorFactory() { DCHECK(context_->network_task_runner()->BelongsToCurrentThread()); - if (state_ != HOST_STARTED) + if (state_ != HOST_STARTED) { return; + } std::string local_certificate = key_pair_->GenerateCertificate(); if (local_certificate.empty()) { @@ -806,9 +809,10 @@ std::unique_ptr<PairingRegistry::Delegate> delegate = CreatePairingRegistryDelegate(); - if (delegate) + if (delegate) { pairing_registry_ = new PairingRegistry(context_->file_task_runner(), std::move(delegate)); + } } #endif // BUILDFLAG(IS_WIN) @@ -952,8 +956,9 @@ #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) // If an audio pipe is specific on the command-line then initialize // AudioCapturerLinux to capture from it. - base::FilePath audio_pipe_name = base::CommandLine::ForCurrentProcess()-> - GetSwitchValuePath(kAudioPipeSwitchName); + base::FilePath audio_pipe_name = + base::CommandLine::ForCurrentProcess()->GetSwitchValuePath( + kAudioPipeSwitchName); if (!audio_pipe_name.empty()) { remoting::AudioCapturerLinux::InitializePipeReader( context_->audio_task_runner(), audio_pipe_name); @@ -989,7 +994,7 @@ context_->audio_task_runner(), context_->network_task_runner(), context_->network_task_runner(), std::move(remote)); desktop_session_connector_ = desktop_environment_factory; -#else // !defined(REMOTING_MULTI_PROCESS) +#else // !defined(REMOTING_MULTI_PROCESS) BasicDesktopEnvironmentFactory* desktop_environment_factory; desktop_environment_factory = new Me2MeDesktopEnvironmentFactory( context_->network_task_runner(), context_->video_capture_task_runner(), @@ -1091,8 +1096,8 @@ delegate->SetRootKeys(static_cast<HKEY>(privileged_handle.ReleaseHandle()), static_cast<HKEY>(unprivileged_handle.ReleaseHandle())); - pairing_registry_ = new PairingRegistry(context_->file_task_runner(), - std::move(delegate)); + pairing_registry_ = + new PairingRegistry(context_->file_task_runner(), std::move(delegate)); // (Re)Create the authenticator factory now that |pairing_registry_| has been // initialized. @@ -1207,8 +1212,9 @@ if (state_ == HOST_STARTING) { StartHostIfReady(); } else if (state_ == HOST_STARTED) { - if (restart_required) + if (restart_required) { RestartHost(kHostOfflineReasonPolicyChangeRequiresRestart); + } } } @@ -1240,8 +1246,9 @@ } void HostProcess::ApplyHostDomainListPolicy() { - if (state_ != HOST_STARTED) + if (state_ != HOST_STARTED) { return; + } HOST_LOG << "Policy sets host domains: " << base::JoinString(host_domain_list_, ", "); @@ -1262,8 +1269,9 @@ } void HostProcess::ApplyAllowRemoteAccessConnections() { - if (state_ != HOST_STARTED) + if (state_ != HOST_STARTED) { return; + } HOST_LOG << "Policy allows remote access connections: " << allow_remote_access_connections_; @@ -1312,17 +1320,17 @@ } void HostProcess::ApplyUsernamePolicy() { - if (state_ != HOST_STARTED) + if (state_ != HOST_STARTED) { return; + } if (host_username_match_required_) { HOST_LOG << "Policy requires host username match."; std::string username = GetUsername(); - bool shutdown = - username.empty() || - !base::StartsWith(host_owner_, username + std::string("@"), - base::CompareCase::INSENSITIVE_ASCII); + bool shutdown = username.empty() || + !base::StartsWith(host_owner_, username + std::string("@"), + base::CompareCase::INSENSITIVE_ASCII); #if BUILDFLAG(IS_APPLE) // On Mac, we run as root at the login screen, so the username won't match. @@ -1337,8 +1345,9 @@ // for each connection, removing the need for an explicit user-name matching // check. #if BUILDFLAG(IS_WIN) && defined(REMOTING_RDP_SESSION) - if (desktop_environment_options_.enable_curtaining()) + if (desktop_environment_options_.enable_curtaining()) { return; + } #endif // BUILDFLAG(IS_WIN) && defined(REMOTING_RDP_SESSION) // Shutdown the host if the username does not match. @@ -1358,8 +1367,9 @@ #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) absl::optional<bool> host_username_match_required = policies.FindBool(policy::key::kRemoteAccessHostMatchUsername); - if (!host_username_match_required.has_value()) + if (!host_username_match_required.has_value()) { return false; + } host_username_match_required_ = host_username_match_required.value(); ApplyUsernamePolicy(); @@ -1373,8 +1383,9 @@ absl::optional<bool> allow_nat_traversal = policies.FindBool(policy::key::kRemoteAccessHostFirewallTraversal); - if (!allow_nat_traversal.has_value()) + if (!allow_nat_traversal.has_value()) { return false; + } allow_nat_traversal_ = allow_nat_traversal.value(); if (allow_nat_traversal_) { @@ -1391,8 +1402,9 @@ absl::optional<bool> allow_relay = policies.FindBool(policy::key::kRemoteAccessHostAllowRelayedConnection); - if (!allow_relay.has_value()) + if (!allow_relay.has_value()) { return false; + } allow_relay_ = allow_relay.value(); if (allow_relay_) { @@ -1427,8 +1439,9 @@ absl::optional<bool> curtain_required = policies.FindBool(policy::key::kRemoteAccessHostRequireCurtain); - if (!curtain_required.has_value()) + if (!curtain_required.has_value()) { return false; + } desktop_environment_options_.set_enable_curtaining(curtain_required.value()); @@ -1485,8 +1498,9 @@ absl::optional<bool> allow_pairing = policies.Find(policy::key::kRemoteAccessHostAllowClientPairing); - if (!allow_pairing.has_value()) + if (!allow_pairing.has_value()) { return false; + } allow_pairing_ = allow_pairing.value(); if (allow_pairing_) { @@ -1502,8 +1516,9 @@ absl::optional<bool> security_key_auth_policy_enabled = policies.Find(policy::key::kRemoteAccessHostAllowGnubbyAuth); - if (!security_key_auth_policy_enabled.has_value()) + if (!security_key_auth_policy_enabled.has_value()) { return false; + } security_key_auth_policy_enabled_ = security_key_auth_policy_enabled.value(); if (security_key_auth_policy_enabled_) { @@ -1521,8 +1536,9 @@ absl::optional<bool> file_transfer_enabled = policies.Find(policy::key::kRemoteAccessHostAllowFileTransfer); - if (!file_transfer_enabled.has_value()) + if (!file_transfer_enabled.has_value()) { return false; + } desktop_environment_options_.set_enable_file_transfer( file_transfer_enabled.value()); @@ -1543,8 +1559,9 @@ absl::optional<bool> enable_user_interface = policies.Find(policy::key::kRemoteAccessHostEnableUserInterface); - if (!enable_user_interface) + if (!enable_user_interface) { return false; + } // Save the value until we have parsed the host config since we only want the // policy to be applied to machines owned by a Googler. @@ -1565,8 +1582,9 @@ absl::optional<int> value = policies.FindInt( policy::key::kRemoteAccessHostMaximumSessionDurationMinutes); - if (!value) + if (!value) { return false; + } max_session_duration_minutes_ = *value; @@ -1587,8 +1605,9 @@ absl::optional<int> max_clipboard_size = policies.FindInt(policy::key::kRemoteAccessHostClipboardSizeBytes); - if (!max_clipboard_size) + if (!max_clipboard_size) { return false; + } if (*max_clipboard_size >= 0) { max_clipboard_size_ = *max_clipboard_size; @@ -1610,8 +1629,9 @@ absl::optional<bool> allow_remote_access_connections = policies.FindBool( policy::key::kRemoteAccessHostAllowRemoteAccessConnections); - if (!allow_remote_access_connections.has_value()) + if (!allow_remote_access_connections.has_value()) { return false; + } // Update the value if the policy was set and retrieval was successful. allow_remote_access_connections_ = allow_remote_access_connections.value(); @@ -1634,8 +1654,7 @@ // Unretained is sound because we own the OAuthTokenGetterImpl, and the // callback will never be invoked once it is destroyed. oauth_token_getter_ = std::make_unique<OAuthTokenGetterImpl>( - std::move(oauth_credentials), - context_->url_loader_factory(), false); + std::move(oauth_credentials), context_->url_loader_factory(), false); log_to_server_ = std::make_unique<RemotingLogToServer>( ServerLogEntry::ME2ME, @@ -1696,8 +1715,9 @@ if (allow_nat_traversal_) { network_flags = NetworkSettings::NAT_TRAVERSAL_STUN | NetworkSettings::NAT_TRAVERSAL_OUTGOING; - if (allow_relay_) + if (allow_relay_) { network_flags |= NetworkSettings::NAT_TRAVERSAL_RELAY; + } } NetworkSettings network_settings(network_flags); @@ -1723,8 +1743,9 @@ std::unique_ptr<protocol::CandidateSessionConfig> protocol_config = protocol::CandidateSessionConfig::CreateDefault(); - if (!desktop_environment_factory_->SupportsAudioCapture()) + if (!desktop_environment_factory_->SupportsAudioCapture()) { protocol_config->DisableAudioChannel(); + } protocol_config->set_webrtc_supported(true); session_manager->set_protocol_config(std::move(protocol_config)); @@ -1776,9 +1797,10 @@ #if BUILDFLAG(IS_LINUX) const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess(); - if (cmd_line->HasSwitch(kEnableUtempter)) + if (cmd_line->HasSwitch(kEnableUtempter)) { host_utmp_logger_ = std::make_unique<HostUTMPLogger>(host_->status_monitor()); + } #endif power_save_blocker_ = std::make_unique<HostPowerSaveBlocker>( @@ -1884,8 +1906,9 @@ OnHostOfflineReasonAck(true); return; } else if (!config_.empty()) { - if (!signal_strategy_) + if (!signal_strategy_) { InitializeSignaling(); + } HOST_LOG << "SendHostOfflineReason: sending " << host_offline_reason << "."; heartbeat_sender_->SetHostOfflineReason( @@ -1984,8 +2007,9 @@ std::unique_ptr<ChromotingHostContext> context = ChromotingHostContext::Create(base::MakeRefCounted<AutoThreadTaskRunner>( main_task_executor.task_runner(), run_loop.QuitClosure())); - if (!context) + if (!context) { return kInitializationFailed; + } // NetworkChangeNotifier must be initialized after SingleThreadTaskExecutor. std::unique_ptr<net::NetworkChangeNotifier> network_change_notifier(
diff --git a/remoting/host/remoting_register_support_host_request.h b/remoting/host/remoting_register_support_host_request.h index 2e8767b..02972f3 100644 --- a/remoting/host/remoting_register_support_host_request.h +++ b/remoting/host/remoting_register_support_host_request.h
@@ -5,7 +5,7 @@ #ifndef REMOTING_HOST_REMOTING_REGISTER_SUPPORT_HOST_REQUEST_H_ #define REMOTING_HOST_REMOTING_REGISTER_SUPPORT_HOST_REQUEST_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h" #include "remoting/host/register_support_host_request.h"
diff --git a/remoting/host/resizing_host_observer.cc b/remoting/host/resizing_host_observer.cc index 8ae3e89..507e1efb 100644 --- a/remoting/host/resizing_host_observer.cc +++ b/remoting/host/resizing_host_observer.cc
@@ -10,9 +10,9 @@ #include <list> #include <utility> -#include "base/bind.h" #include "base/check.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" #include "base/time/default_tick_clock.h" #include "base/time/tick_clock.h" #include "remoting/base/logging.h" @@ -112,7 +112,7 @@ // 640x640), just pick the widest, since desktop UIs are typically designed // for landscape aspect ratios. return resolution().dimensions().width() > - other.resolution().dimensions().width(); + other.resolution().dimensions().width(); } private: @@ -131,8 +131,9 @@ clock_(base::DefaultTickClock::GetInstance()) {} ResizingHostObserver::~ResizingHostObserver() { - if (restore_) + if (restore_) { RestoreAllScreenResolutions(); + } } void ResizingHostObserver::RegisterForDisplayChanges(
diff --git a/remoting/host/resizing_host_observer.h b/remoting/host/resizing_host_observer.h index 22f43217..33066bc 100644 --- a/remoting/host/resizing_host_observer.h +++ b/remoting/host/resizing_host_observer.h
@@ -36,9 +36,8 @@ // the original desktop size if restore is true. class ResizingHostObserver : public ScreenControls { public: - explicit ResizingHostObserver( - std::unique_ptr<DesktopResizer> desktop_resizer, - bool restore); + explicit ResizingHostObserver(std::unique_ptr<DesktopResizer> desktop_resizer, + bool restore); ResizingHostObserver(const ResizingHostObserver&) = delete; ResizingHostObserver& operator=(const ResizingHostObserver&) = delete;
diff --git a/remoting/host/resizing_host_observer_unittest.cc b/remoting/host/resizing_host_observer_unittest.cc index aaa55fc..922cd506 100644 --- a/remoting/host/resizing_host_observer_unittest.cc +++ b/remoting/host/resizing_host_observer_unittest.cc
@@ -27,8 +27,8 @@ std::ostream& operator<<(std::ostream& os, const ScreenResolution& resolution) { return os << resolution.dimensions().width() << "x" - << resolution.dimensions().height() << " @ " - << resolution.dpi().x() << "x" << resolution.dpi().y(); + << resolution.dimensions().height() << " @ " << resolution.dpi().x() + << "x" << resolution.dpi().y(); } bool operator==(const ScreenResolution& a, const ScreenResolution& b) { @@ -158,15 +158,17 @@ void SetScreenResolution(const ScreenResolution& client_size) { resizing_host_observer_->SetScreenResolution(client_size, absl::nullopt); - if (auto_advance_clock_) + if (auto_advance_clock_) { clock_.Advance(base::Seconds(1)); + } } void SetScreenResolution(const ScreenResolution& client_size, webrtc::ScreenId id) { resizing_host_observer_->SetScreenResolution(client_size, id); - if (auto_advance_clock_) + if (auto_advance_clock_) { clock_.Advance(base::Seconds(1)); + } } // Should be used only for single-monitor tests. @@ -269,11 +271,10 @@ InitDesktopResizer({{123, MakeResolution(640, 480)}}, true, std::vector<ScreenResolution>(), true); NotifyDisplayInfo(); - std::vector<ScreenResolution> client_sizes = {MakeResolution(200, 100), - MakeResolution(100, 200), - MakeResolution(640, 480), - MakeResolution(480, 640), - MakeResolution(1280, 1024)}; + std::vector<ScreenResolution> client_sizes = { + MakeResolution(200, 100), MakeResolution(100, 200), + MakeResolution(640, 480), MakeResolution(480, 640), + MakeResolution(1280, 1024)}; VerifySizes(client_sizes, client_sizes); resizing_host_observer_.reset(); EXPECT_EQ(1, call_counts_.restore_resolution); @@ -287,13 +288,9 @@ InitDesktopResizer({{123, MakeResolution(640, 480)}}, false, supported_sizes, true); NotifyDisplayInfo(); - VerifySizes({MakeResolution(639, 479), - MakeResolution(640, 480), - MakeResolution(641, 481), - MakeResolution(999, 999)}, - {supported_sizes[0], - supported_sizes[1], - supported_sizes[1], + VerifySizes({MakeResolution(639, 479), MakeResolution(640, 480), + MakeResolution(641, 481), MakeResolution(999, 999)}, + {supported_sizes[0], supported_sizes[1], supported_sizes[1], supported_sizes[1]}); } @@ -305,12 +302,9 @@ InitDesktopResizer({{123, MakeResolution(200, 100)}}, false, supported_sizes, true); NotifyDisplayInfo(); - VerifySizes({MakeResolution(1, 1), - MakeResolution(99, 99), - MakeResolution(199, 99)}, - {supported_sizes[0], - supported_sizes[0], - supported_sizes[1]}); + VerifySizes( + {MakeResolution(1, 1), MakeResolution(99, 99), MakeResolution(199, 99)}, + {supported_sizes[0], supported_sizes[0], supported_sizes[1]}); } // Check that if the implementation supports two sizes that have the same @@ -321,16 +315,11 @@ InitDesktopResizer({{123, MakeResolution(480, 640)}}, false, supported_sizes, true); NotifyDisplayInfo(); - VerifySizes({MakeResolution(100, 100), - MakeResolution(480, 480), - MakeResolution(500, 500), - MakeResolution(640, 640), + VerifySizes({MakeResolution(100, 100), MakeResolution(480, 480), + MakeResolution(500, 500), MakeResolution(640, 640), MakeResolution(1000, 1000)}, - {supported_sizes[0], - supported_sizes[0], - supported_sizes[0], - supported_sizes[0], - supported_sizes[0]}); + {supported_sizes[0], supported_sizes[0], supported_sizes[0], + supported_sizes[0], supported_sizes[0]}); } // Check that if the best match for the client size doesn't change, then we @@ -341,12 +330,9 @@ InitDesktopResizer({{123, MakeResolution(480, 640)}}, false, supported_sizes, true); NotifyDisplayInfo(); - VerifySizes({MakeResolution(640, 640), - MakeResolution(1024, 768), + VerifySizes({MakeResolution(640, 640), MakeResolution(1024, 768), MakeResolution(640, 480)}, - {supported_sizes[0], - supported_sizes[0], - supported_sizes[0]}); + {supported_sizes[0], supported_sizes[0], supported_sizes[0]}); EXPECT_EQ(1, call_counts_.set_resolution); }
diff --git a/remoting/host/resources_mac.cc b/remoting/host/resources_mac.cc index 49ff48d3..b7dd3ac 100644 --- a/remoting/host/resources_mac.cc +++ b/remoting/host/resources_mac.cc
@@ -29,8 +29,9 @@ base::mac::SetOverrideFrameworkBundlePath(path); // Override the locale with the value from Cocoa. - if (pref_locale.empty()) + if (pref_locale.empty()) { l10n_util::OverrideLocaleWithCocoaLocale(); + } ui::ResourceBundle::InitSharedInstanceWithLocale( pref_locale, NULL, ui::ResourceBundle::DO_NOT_LOAD_COMMON_RESOURCES);
diff --git a/remoting/host/resources_win.cc b/remoting/host/resources_win.cc index f155ef4..b54fe1c 100644 --- a/remoting/host/resources_win.cc +++ b/remoting/host/resources_win.cc
@@ -11,7 +11,6 @@ return false; } -void UnloadResources() { -} +void UnloadResources() {} } // namespace remoting
diff --git a/remoting/host/sas_injector_win.cc b/remoting/host/sas_injector_win.cc index 2d2b41a6..0d0dbc6f 100644 --- a/remoting/host/sas_injector_win.cc +++ b/remoting/host/sas_injector_win.cc
@@ -63,10 +63,9 @@ bool ScopedSoftwareSasPolicy::Apply() { // Query the currently set SoftwareSASGeneration policy. - LONG result = system_policy_.Open(HKEY_LOCAL_MACHINE, - kSystemPolicyKeyName, - KEY_QUERY_VALUE | KEY_SET_VALUE | - KEY_WOW64_64KEY); + LONG result = + system_policy_.Open(HKEY_LOCAL_MACHINE, kSystemPolicyKeyName, + KEY_QUERY_VALUE | KEY_SET_VALUE | KEY_WOW64_64KEY); if (result != ERROR_SUCCESS) { SetLastError(result); PLOG(ERROR) << "Failed to open 'HKLM\\" << kSystemPolicyKeyName << "'"; @@ -91,7 +90,7 @@ return true; } -} // namespace +} // namespace // Sends Secure Attention Sequence. Checks the current policy before sending. class SasInjectorWin : public SasInjector { @@ -142,4 +141,4 @@ return std::make_unique<SasInjectorWin>(); } -} // namespace remoting +} // namespace remoting
diff --git a/remoting/host/security_key/fake_security_key_ipc_client.cc b/remoting/host/security_key/fake_security_key_ipc_client.cc index ace6e10..ed88cc91 100644 --- a/remoting/host/security_key/fake_security_key_ipc_client.cc +++ b/remoting/host/security_key/fake_security_key_ipc_client.cc
@@ -6,8 +6,8 @@ #include <memory> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "base/run_loop.h" #include "base/task/single_thread_task_runner.h"
diff --git a/remoting/host/security_key/fake_security_key_ipc_client.h b/remoting/host/security_key/fake_security_key_ipc_client.h index 8df58cc..615588c 100644 --- a/remoting/host/security_key/fake_security_key_ipc_client.h +++ b/remoting/host/security_key/fake_security_key_ipc_client.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/weak_ptr.h" #include "mojo/public/cpp/bindings/associated_remote.h" #include "mojo/public/cpp/platform/named_platform_channel.h"
diff --git a/remoting/host/security_key/fake_security_key_ipc_server.cc b/remoting/host/security_key/fake_security_key_ipc_server.cc index 43d625a7..bdda332 100644 --- a/remoting/host/security_key/fake_security_key_ipc_server.cc +++ b/remoting/host/security_key/fake_security_key_ipc_server.cc
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/task/single_thread_task_runner.h" #include "build/build_config.h" #include "ipc/ipc_channel.h"
diff --git a/remoting/host/security_key/fake_security_key_ipc_server.h b/remoting/host/security_key/fake_security_key_ipc_server.h index eb99ea1..e7f5c585 100644 --- a/remoting/host/security_key/fake_security_key_ipc_server.h +++ b/remoting/host/security_key/fake_security_key_ipc_server.h
@@ -12,7 +12,7 @@ #include <memory> #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/weak_ptr.h" #include "ipc/ipc_listener.h" #include "mojo/public/cpp/bindings/associated_receiver.h"
diff --git a/remoting/host/security_key/fake_security_key_message_reader.cc b/remoting/host/security_key/fake_security_key_message_reader.cc index 172b35d9..ac2abce4 100644 --- a/remoting/host/security_key/fake_security_key_message_reader.cc +++ b/remoting/host/security_key/fake_security_key_message_reader.cc
@@ -4,7 +4,7 @@ #include "remoting/host/security_key/fake_security_key_message_reader.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "remoting/host/security_key/security_key_message.h"
diff --git a/remoting/host/security_key/fake_security_key_message_reader.h b/remoting/host/security_key/fake_security_key_message_reader.h index 81d58a5..b78dba2 100644 --- a/remoting/host/security_key/fake_security_key_message_reader.h +++ b/remoting/host/security_key/fake_security_key_message_reader.h
@@ -5,7 +5,7 @@ #ifndef REMOTING_HOST_SECURITY_KEY_FAKE_SECURITY_KEY_MESSAGE_READER_H_ #define REMOTING_HOST_SECURITY_KEY_FAKE_SECURITY_KEY_MESSAGE_READER_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "remoting/host/security_key/security_key_message.h" #include "remoting/host/security_key/security_key_message_reader.h"
diff --git a/remoting/host/security_key/fake_security_key_message_writer.cc b/remoting/host/security_key/fake_security_key_message_writer.cc index 5fd2afa4..3bedd0f 100644 --- a/remoting/host/security_key/fake_security_key_message_writer.cc +++ b/remoting/host/security_key/fake_security_key_message_writer.cc
@@ -7,7 +7,7 @@ #include <string> #include <utility> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/location.h" #include "base/memory/weak_ptr.h" #include "base/task/single_thread_task_runner.h"
diff --git a/remoting/host/security_key/fake_security_key_message_writer.h b/remoting/host/security_key/fake_security_key_message_writer.h index ec1bbe7e..22e668c 100644 --- a/remoting/host/security_key/fake_security_key_message_writer.h +++ b/remoting/host/security_key/fake_security_key_message_writer.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "remoting/host/security_key/security_key_message.h" #include "remoting/host/security_key/security_key_message_writer.h"
diff --git a/remoting/host/security_key/security_key_auth_handler.h b/remoting/host/security_key/security_key_auth_handler.h index 5d86691..0ca2ee09 100644 --- a/remoting/host/security_key/security_key_auth_handler.h +++ b/remoting/host/security_key/security_key_auth_handler.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" #include "base/time/time.h" #include "build/build_config.h"
diff --git a/remoting/host/security_key/security_key_auth_handler_posix.cc b/remoting/host/security_key/security_key_auth_handler_posix.cc index d7c22e9..6d6c13e 100644 --- a/remoting/host/security_key/security_key_auth_handler_posix.cc +++ b/remoting/host/security_key/security_key_auth_handler_posix.cc
@@ -12,10 +12,10 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/lazy_instance.h" #include "base/location.h" #include "base/logging.h"
diff --git a/remoting/host/security_key/security_key_auth_handler_posix_unittest.cc b/remoting/host/security_key/security_key_auth_handler_posix_unittest.cc index 02f5828..e34c319 100644 --- a/remoting/host/security_key/security_key_auth_handler_posix_unittest.cc +++ b/remoting/host/security_key/security_key_auth_handler_posix_unittest.cc
@@ -9,9 +9,9 @@ #include <memory> #include <string> -#include "base/bind.h" #include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/test/task_environment.h" #include "base/threading/thread.h"
diff --git a/remoting/host/security_key/security_key_auth_handler_win.cc b/remoting/host/security_key/security_key_auth_handler_win.cc index 9322dba..1b86c89 100644 --- a/remoting/host/security_key/security_key_auth_handler_win.cc +++ b/remoting/host/security_key/security_key_auth_handler_win.cc
@@ -9,7 +9,7 @@ #include <memory> #include <string> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/logging.h" #include "base/memory/raw_ptr.h"
diff --git a/remoting/host/security_key/security_key_auth_handler_win_unittest.cc b/remoting/host/security_key/security_key_auth_handler_win_unittest.cc index 47d976f..8aae0b13 100644 --- a/remoting/host/security_key/security_key_auth_handler_win_unittest.cc +++ b/remoting/host/security_key/security_key_auth_handler_win_unittest.cc
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/weak_ptr.h" #include "base/run_loop.h" #include "base/test/task_environment.h"
diff --git a/remoting/host/security_key/security_key_extension_session.cc b/remoting/host/security_key/security_key_extension_session.cc index 70b37aa..54af09b 100644 --- a/remoting/host/security_key/security_key_extension_session.cc +++ b/remoting/host/security_key/security_key_extension_session.cc
@@ -7,7 +7,7 @@ #include <string> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/json/json_reader.h" #include "base/json/json_writer.h" #include "base/logging.h"
diff --git a/remoting/host/security_key/security_key_extension_session.h b/remoting/host/security_key/security_key_extension_session.h index a2aa40c..a09c787 100644 --- a/remoting/host/security_key/security_key_extension_session.h +++ b/remoting/host/security_key/security_key_extension_session.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h" #include "base/threading/thread_checker.h"
diff --git a/remoting/host/security_key/security_key_ipc_client.cc b/remoting/host/security_key/security_key_ipc_client.cc index 5364225..5eeef0d 100644 --- a/remoting/host/security_key/security_key_ipc_client.cc +++ b/remoting/host/security_key/security_key_ipc_client.cc
@@ -7,8 +7,8 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/logging.h" #include "base/task/single_thread_task_runner.h" #include "build/build_config.h"
diff --git a/remoting/host/security_key/security_key_ipc_client.h b/remoting/host/security_key/security_key_ipc_client.h index 06a61ed..959b994 100644 --- a/remoting/host/security_key/security_key_ipc_client.h +++ b/remoting/host/security_key/security_key_ipc_client.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "base/threading/thread_checker.h" #include "ipc/ipc_listener.h"
diff --git a/remoting/host/security_key/security_key_ipc_client_unittest.cc b/remoting/host/security_key/security_key_ipc_client_unittest.cc index 4654bcc..87f4f75 100644 --- a/remoting/host/security_key/security_key_ipc_client_unittest.cc +++ b/remoting/host/security_key/security_key_ipc_client_unittest.cc
@@ -7,7 +7,7 @@ #include <memory> #include <string> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/test/task_environment.h" #include "build/build_config.h"
diff --git a/remoting/host/security_key/security_key_ipc_server.cc b/remoting/host/security_key/security_key_ipc_server.cc index 4ab0e3ce..79ca17cb 100644 --- a/remoting/host/security_key/security_key_ipc_server.cc +++ b/remoting/host/security_key/security_key_ipc_server.cc
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/ptr_util.h" #include "base/threading/thread_checker.h" #include "base/timer/timer.h"
diff --git a/remoting/host/security_key/security_key_ipc_server.h b/remoting/host/security_key/security_key_ipc_server.h index 119637cc..fce7be98 100644 --- a/remoting/host/security_key/security_key_ipc_server.h +++ b/remoting/host/security_key/security_key_ipc_server.h
@@ -9,7 +9,7 @@ #include <memory> #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/time/time.h" #include "mojo/public/cpp/platform/named_platform_channel.h" #include "remoting/host/security_key/security_key_auth_handler.h"
diff --git a/remoting/host/security_key/security_key_ipc_server_impl.cc b/remoting/host/security_key/security_key_ipc_server_impl.cc index de8cf65..568a9e9a 100644 --- a/remoting/host/security_key/security_key_ipc_server_impl.cc +++ b/remoting/host/security_key/security_key_ipc_server_impl.cc
@@ -9,8 +9,8 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/location.h" #include "base/strings/utf_string_conversions.h" #include "base/task/single_thread_task_runner.h"
diff --git a/remoting/host/security_key/security_key_ipc_server_impl.h b/remoting/host/security_key/security_key_ipc_server_impl.h index 1a0a45a..ffd5ee7b 100644 --- a/remoting/host/security_key/security_key_ipc_server_impl.h +++ b/remoting/host/security_key/security_key_ipc_server_impl.h
@@ -12,7 +12,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "base/threading/thread_checker.h" #include "base/time/time.h"
diff --git a/remoting/host/security_key/security_key_ipc_server_unittest.cc b/remoting/host/security_key/security_key_ipc_server_unittest.cc index 2079a73..50d49f9 100644 --- a/remoting/host/security_key/security_key_ipc_server_unittest.cc +++ b/remoting/host/security_key/security_key_ipc_server_unittest.cc
@@ -7,10 +7,10 @@ #include <memory> #include <string> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" #include "base/feature_list.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "base/test/task_environment.h" #include "build/build_config.h"
diff --git a/remoting/host/security_key/security_key_message.cc b/remoting/host/security_key/security_key_message.cc index 6ce9205..31d0259 100644 --- a/remoting/host/security_key/security_key_message.cc +++ b/remoting/host/security_key/security_key_message.cc
@@ -9,7 +9,7 @@ #include <string> #include <utility> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/logging.h" namespace {
diff --git a/remoting/host/security_key/security_key_message.h b/remoting/host/security_key/security_key_message.h index 5eb58c3..29bb204 100644 --- a/remoting/host/security_key/security_key_message.h +++ b/remoting/host/security_key/security_key_message.h
@@ -9,7 +9,7 @@ #include <memory> #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" namespace remoting {
diff --git a/remoting/host/security_key/security_key_message_handler.cc b/remoting/host/security_key/security_key_message_handler.cc index d6fb4e4..bf5d830 100644 --- a/remoting/host/security_key/security_key_message_handler.cc +++ b/remoting/host/security_key/security_key_message_handler.cc
@@ -9,8 +9,8 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/logging.h" #include "remoting/host/security_key/security_key_ipc_client.h" #include "remoting/host/security_key/security_key_ipc_constants.h"
diff --git a/remoting/host/security_key/security_key_message_handler.h b/remoting/host/security_key/security_key_message_handler.h index 91ceb2d..fccf9a05 100644 --- a/remoting/host/security_key/security_key_message_handler.h +++ b/remoting/host/security_key/security_key_message_handler.h
@@ -8,8 +8,8 @@ #include <memory> #include <string> -#include "base/callback.h" #include "base/files/file.h" +#include "base/functional/callback.h" #include "base/threading/thread_checker.h" #include "remoting/host/security_key/security_key_message.h"
diff --git a/remoting/host/security_key/security_key_message_handler_unittest.cc b/remoting/host/security_key/security_key_message_handler_unittest.cc index 21483e0..acb061e 100644 --- a/remoting/host/security_key/security_key_message_handler_unittest.cc +++ b/remoting/host/security_key/security_key_message_handler_unittest.cc
@@ -8,7 +8,7 @@ #include <string> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/weak_ptr.h" #include "base/run_loop.h" #include "base/test/task_environment.h"
diff --git a/remoting/host/security_key/security_key_message_reader.h b/remoting/host/security_key/security_key_message_reader.h index 3ed6373..4b2349b 100644 --- a/remoting/host/security_key/security_key_message_reader.h +++ b/remoting/host/security_key/security_key_message_reader.h
@@ -5,7 +5,7 @@ #ifndef REMOTING_HOST_SECURITY_KEY_SECURITY_KEY_MESSAGE_READER_H_ #define REMOTING_HOST_SECURITY_KEY_SECURITY_KEY_MESSAGE_READER_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "remoting/host/security_key/security_key_message.h" namespace remoting {
diff --git a/remoting/host/security_key/security_key_message_reader_impl.cc b/remoting/host/security_key/security_key_message_reader_impl.cc index 2975771c..cc545376 100644 --- a/remoting/host/security_key/security_key_message_reader_impl.cc +++ b/remoting/host/security_key/security_key_message_reader_impl.cc
@@ -8,8 +8,8 @@ #include <string> #include <utility> -#include "base/bind.h" #include "base/files/file.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/message_loop/message_pump_type.h" #include "base/task/single_thread_task_runner.h"
diff --git a/remoting/host/security_key/security_key_message_reader_impl.h b/remoting/host/security_key/security_key_message_reader_impl.h index 407e56a4..094a62c 100644 --- a/remoting/host/security_key/security_key_message_reader_impl.h +++ b/remoting/host/security_key/security_key_message_reader_impl.h
@@ -7,8 +7,8 @@ #include <memory> -#include "base/callback.h" #include "base/files/file.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "base/threading/thread.h" #include "remoting/host/security_key/security_key_message.h"
diff --git a/remoting/host/security_key/security_key_message_reader_impl_unittest.cc b/remoting/host/security_key/security_key_message_reader_impl_unittest.cc index 4f1b596..461a4221 100644 --- a/remoting/host/security_key/security_key_message_reader_impl_unittest.cc +++ b/remoting/host/security_key/security_key_message_reader_impl_unittest.cc
@@ -9,7 +9,7 @@ #include <string> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/test/task_environment.h" #include "remoting/host/security_key/security_key_message.h"
diff --git a/remoting/host/security_key/security_key_message_writer_impl_unittest.cc b/remoting/host/security_key/security_key_message_writer_impl_unittest.cc index 2ccd7f7..e1ed4bd 100644 --- a/remoting/host/security_key/security_key_message_writer_impl_unittest.cc +++ b/remoting/host/security_key/security_key_message_writer_impl_unittest.cc
@@ -8,7 +8,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/test/task_environment.h" #include "base/threading/thread.h"
diff --git a/remoting/host/security_key/security_key_socket.cc b/remoting/host/security_key/security_key_socket.cc index c1512e41..a8d9f3df 100644 --- a/remoting/host/security_key/security_key_socket.cc +++ b/remoting/host/security_key/security_key_socket.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/timer/timer.h" #include "net/base/io_buffer.h" #include "net/base/net_errors.h"
diff --git a/remoting/host/security_key/security_key_socket.h b/remoting/host/security_key/security_key_socket.h index 0d4287da..7b9e60d 100644 --- a/remoting/host/security_key/security_key_socket.h +++ b/remoting/host/security_key/security_key_socket.h
@@ -11,7 +11,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" #include "base/threading/thread_checker.h"
diff --git a/remoting/host/server_log_entry_host.cc b/remoting/host/server_log_entry_host.cc index 84a5b04e..8e9fc3ad 100644 --- a/remoting/host/server_log_entry_host.cc +++ b/remoting/host/server_log_entry_host.cc
@@ -51,7 +51,7 @@ } void AddConnectionTypeToLogEntry(ServerLogEntry* entry, - protocol::TransportRoute::RouteType type) { + protocol::TransportRoute::RouteType type) { entry->Set(kKeyConnectionType, protocol::TransportRoute::GetTypeString(type)); }
diff --git a/remoting/host/server_log_entry_host_unittest.cc b/remoting/host/server_log_entry_host_unittest.cc index c8f256c..8c50425 100644 --- a/remoting/host/server_log_entry_host_unittest.cc +++ b/remoting/host/server_log_entry_host_unittest.cc
@@ -59,14 +59,14 @@ keys.insert("os-version"); #endif - // The check below will compile but fail if VERSION isn't defined (STRINGIZE - // silently converts undefined values). - #ifndef VERSION - #error VERSION must be defined - #endif +// The check below will compile but fail if VERSION isn't defined (STRINGIZE +// silently converts undefined values). +#ifndef VERSION +#error VERSION must be defined +#endif key_value_pairs["host-version"] = STRINGIZE(VERSION); - ASSERT_TRUE(VerifyStanza(key_value_pairs, keys, stanza.get(), &error)) << - error; + ASSERT_TRUE(VerifyStanza(key_value_pairs, keys, stanza.get(), &error)) + << error; } TEST(ServerLogEntryHostTest, AddModeField1) { @@ -81,8 +81,8 @@ key_value_pairs["session-state"] = "connected"; key_value_pairs["mode"] = "it2me"; std::set<std::string> keys; - ASSERT_TRUE(VerifyStanza(key_value_pairs, keys, stanza.get(), &error)) << - error; + ASSERT_TRUE(VerifyStanza(key_value_pairs, keys, stanza.get(), &error)) + << error; } TEST(ServerLogEntryHostTest, AddModeField2) { @@ -97,8 +97,8 @@ key_value_pairs["session-state"] = "connected"; key_value_pairs["mode"] = "me2me"; std::set<std::string> keys; - ASSERT_TRUE(VerifyStanza(key_value_pairs, keys, stanza.get(), &error)) << - error; + ASSERT_TRUE(VerifyStanza(key_value_pairs, keys, stanza.get(), &error)) + << error; } } // namespace remoting
diff --git a/remoting/host/setup/daemon_controller.cc b/remoting/host/setup/daemon_controller.cc index 618641b..109f686 100644 --- a/remoting/host/setup/daemon_controller.cc +++ b/remoting/host/setup/daemon_controller.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/message_loop/message_pump_type.h" #include "base/task/single_thread_task_runner.h"
diff --git a/remoting/host/setup/daemon_controller.h b/remoting/host/setup/daemon_controller.h index 6891fc6..727d6d7 100644 --- a/remoting/host/setup/daemon_controller.h +++ b/remoting/host/setup/daemon_controller.h
@@ -8,8 +8,8 @@ #include <memory> #include <string> -#include "base/callback.h" #include "base/containers/queue.h" +#include "base/functional/callback.h" #include "base/memory/ref_counted.h" #include "base/values.h" #include "third_party/abseil-cpp/absl/types/optional.h"
diff --git a/remoting/host/setup/daemon_controller_delegate_linux.cc b/remoting/host/setup/daemon_controller_delegate_linux.cc index a36311c..e1a5d0b2 100644 --- a/remoting/host/setup/daemon_controller_delegate_linux.cc +++ b/remoting/host/setup/daemon_controller_delegate_linux.cc
@@ -7,12 +7,12 @@ #include <unistd.h> #include <utility> -#include "base/bind.h" #include "base/command_line.h" #include "base/compiler_specific.h" #include "base/environment.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/json/json_writer.h" #include "base/logging.h" #include "base/memory/ptr_util.h"
diff --git a/remoting/host/setup/daemon_controller_delegate_mac.mm b/remoting/host/setup/daemon_controller_delegate_mac.mm index c64fc08..a280fc2 100644 --- a/remoting/host/setup/daemon_controller_delegate_mac.mm +++ b/remoting/host/setup/daemon_controller_delegate_mac.mm
@@ -8,10 +8,10 @@ #include <sys/types.h> #include <utility> -#include "base/bind.h" #include "base/command_line.h" #include "base/files/file_util.h" #include "base/files/scoped_file.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/mac/authorization_util.h" #include "base/mac/foundation_util.h"
diff --git a/remoting/host/setup/host_starter.cc b/remoting/host/setup/host_starter.cc index fc992d31..c236711 100644 --- a/remoting/host/setup/host_starter.cc +++ b/remoting/host/setup/host_starter.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/guid.h" #include "base/location.h" #include "base/memory/ptr_util.h"
diff --git a/remoting/host/setup/host_starter.h b/remoting/host/setup/host_starter.h index 4dc1f08..4819fcf 100644 --- a/remoting/host/setup/host_starter.h +++ b/remoting/host/setup/host_starter.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h" #include "base/task/single_thread_task_runner.h"
diff --git a/remoting/host/setup/host_stopper.h b/remoting/host/setup/host_stopper.h index f5d6363..dc54107 100644 --- a/remoting/host/setup/host_stopper.h +++ b/remoting/host/setup/host_stopper.h
@@ -5,7 +5,7 @@ #ifndef REMOTING_HOST_SETUP_HOST_STOPPER_H_ #define REMOTING_HOST_SETUP_HOST_STOPPER_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "base/values.h" #include "remoting/host/setup/daemon_controller.h"
diff --git a/remoting/host/setup/me2me_native_messaging_host.cc b/remoting/host/setup/me2me_native_messaging_host.cc index acba0d2..f4eb6d1 100644 --- a/remoting/host/setup/me2me_native_messaging_host.cc +++ b/remoting/host/setup/me2me_native_messaging_host.cc
@@ -9,9 +9,9 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/json/json_reader.h" #include "base/json/json_writer.h" #include "base/logging.h"
diff --git a/remoting/host/setup/me2me_native_messaging_host_unittest.cc b/remoting/host/setup/me2me_native_messaging_host_unittest.cc index 579c8bd..15e5c289 100644 --- a/remoting/host/setup/me2me_native_messaging_host_unittest.cc +++ b/remoting/host/setup/me2me_native_messaging_host_unittest.cc
@@ -11,8 +11,8 @@ #include <string> #include <utility> -#include "base/bind.h" #include "base/compiler_specific.h" +#include "base/functional/bind.h" #include "base/json/json_reader.h" #include "base/json/json_writer.h" #include "base/memory/ptr_util.h"
diff --git a/remoting/host/setup/service_client.cc b/remoting/host/setup/service_client.cc index 29351a15..946f5bc2 100644 --- a/remoting/host/setup/service_client.cc +++ b/remoting/host/setup/service_client.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "remoting/base/directory_service_client.h" #include "remoting/base/passthrough_oauth_token_getter.h"
diff --git a/remoting/host/setup/start_host_main.cc b/remoting/host/setup/start_host_main.cc index c5583b6..f8e9278a 100644 --- a/remoting/host/setup/start_host_main.cc +++ b/remoting/host/setup/start_host_main.cc
@@ -8,8 +8,8 @@ #include <stdio.h> #include "base/at_exit.h" -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/message_loop/message_pump_type.h" #include "base/run_loop.h" #include "base/task/single_thread_task_executor.h"
diff --git a/remoting/host/shutdown_watchdog.cc b/remoting/host/shutdown_watchdog.cc index 962b3b8..9de2007 100644 --- a/remoting/host/shutdown_watchdog.cc +++ b/remoting/host/shutdown_watchdog.cc
@@ -16,8 +16,7 @@ namespace remoting { ShutdownWatchdog::ShutdownWatchdog(const base::TimeDelta& duration) - : base::Watchdog(duration, "Shutdown watchdog", true) { -} + : base::Watchdog(duration, "Shutdown watchdog", true) {} void ShutdownWatchdog::SetExitCode(int exit_code) { base::AutoLock lock(lock_);
diff --git a/remoting/host/token_validator_base.cc b/remoting/host/token_validator_base.cc index 7181923f..a01a6ff 100644 --- a/remoting/host/token_validator_base.cc +++ b/remoting/host/token_validator_base.cc
@@ -7,8 +7,8 @@ #include <stddef.h> #include "base/base64.h" -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/json/json_reader.h" #include "base/logging.h" #include "base/memory/weak_ptr.h" @@ -57,14 +57,17 @@ // choose the first one. This function should not be used for validation, only // for logging or determining which certificate to select for validation. std::string GetPreferredIssuerFieldValue(const net::X509Certificate* cert) { - if (!cert->issuer().common_name.empty()) + if (!cert->issuer().common_name.empty()) { return cert->issuer().common_name; + } if (!cert->issuer().organization_names.empty() && - !cert->issuer().organization_names[0].empty()) + !cert->issuer().organization_names[0].empty()) { return cert->issuer().organization_names[0]; + } if (!cert->issuer().organization_unit_names.empty() && - !cert->issuer().organization_unit_names[0].empty()) + !cert->issuer().organization_unit_names[0].empty()) { return cert->issuer().organization_unit_names[0]; + } return std::string(); } @@ -94,14 +97,17 @@ const base::Time& now, const net::X509Certificate* c1, const net::X509Certificate* c2) { - if (!IsCertificateValid(issuer, now, c2)) + if (!IsCertificateValid(issuer, now, c2)) { return false; + } - if (!IsCertificateValid(issuer, now, c1)) + if (!IsCertificateValid(issuer, now, c1)) { return true; + } - if (c1->valid_start() != c2->valid_start()) + if (c1->valid_start() != c2->valid_start()) { return c1->valid_start() < c2->valid_start(); + } return c1->valid_expiry() < c2->valid_expiry(); } @@ -163,8 +169,9 @@ } int bytes_read = request_->Read(buffer_.get(), kBufferSize); - if (bytes_read != net::ERR_IO_PENDING) + if (bytes_read != net::ERR_IO_PENDING) { OnReadCompleted(request_.get(), bytes_read); + } } void TokenValidatorBase::OnReadCompleted(net::URLRequest* source, @@ -177,8 +184,9 @@ net_result = request_->Read(buffer_.get(), kBufferSize); } - if (net_result == net::ERR_IO_PENDING) + if (net_result == net::ERR_IO_PENDING) { return; + } retrying_request_ = false; auto validation_result = ProcessResponse(net_result);
diff --git a/remoting/host/token_validator_base.h b/remoting/host/token_validator_base.h index b5058c5c..207019e 100644 --- a/remoting/host/token_validator_base.h +++ b/remoting/host/token_validator_base.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "net/ssl/client_cert_identity.h" #include "net/url_request/url_request.h" @@ -22,9 +22,8 @@ namespace remoting { -class TokenValidatorBase - : public net::URLRequest::Delegate, - public protocol::TokenValidator { +class TokenValidatorBase : public net::URLRequest::Delegate, + public protocol::TokenValidator { public: TokenValidatorBase( const ThirdPartyAuthConfig& third_party_auth_config,
diff --git a/remoting/host/token_validator_base_unittest.cc b/remoting/host/token_validator_base_unittest.cc index 2d89c5e..7a53fafc 100644 --- a/remoting/host/token_validator_base_unittest.cc +++ b/remoting/host/token_validator_base_unittest.cc
@@ -36,13 +36,15 @@ scoped_refptr<net::X509Certificate> cert = net::X509Certificate::CreateFromBytes( base::as_bytes(base::make_span(cert_der))); - if (!cert) + if (!cert) { return nullptr; + } scoped_refptr<net::SSLPrivateKey> ssl_private_key = net::WrapRSAPrivateKey(rsa_private_key.get()); - if (!ssl_private_key) + if (!ssl_private_key) { return nullptr; + } return std::make_unique<net::FakeClientCertIdentity>(cert, ssl_private_key); } @@ -73,9 +75,8 @@ raw_ptr<net::SSLPrivateKey> expected_private_key_ = nullptr; }; -TestTokenValidator::TestTokenValidator(const ThirdPartyAuthConfig& config) : - TokenValidatorBase(config, "", nullptr) { -} +TestTokenValidator::TestTokenValidator(const ThirdPartyAuthConfig& config) + : TokenValidatorBase(config, "", nullptr) {} TestTokenValidator::~TestTokenValidator() = default; @@ -105,6 +106,7 @@ class TokenValidatorBaseTest : public testing::Test { public: void SetUp() override; + protected: std::unique_ptr<TestTokenValidator> token_validator_; };
diff --git a/remoting/host/token_validator_factory_impl.cc b/remoting/host/token_validator_factory_impl.cc index c31bb1b3..80448db 100644 --- a/remoting/host/token_validator_factory_impl.cc +++ b/remoting/host/token_validator_factory_impl.cc
@@ -10,9 +10,9 @@ #include <utility> #include "base/base64.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/check.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/json/json_reader.h" #include "base/strings/escape.h" #include "base/strings/string_util.h" @@ -40,7 +40,6 @@ namespace remoting { - class TokenValidatorImpl : public TokenValidatorBase { public: TokenValidatorImpl( @@ -99,13 +98,13 @@ #error VERSION is not set. #endif // Set a user-agent for logging/auditing purposes. - request_->SetExtraRequestHeaderByName(net::HttpRequestHeaders::kUserAgent, - app_name + " " + STRINGIZE(VERSION), - true); - request_->SetExtraRequestHeaderByName( - net::HttpRequestHeaders::kContentType, - "application/x-www-form-urlencoded", true); + net::HttpRequestHeaders::kUserAgent, + app_name + " " + STRINGIZE(VERSION), true); + + request_->SetExtraRequestHeaderByName(net::HttpRequestHeaders::kContentType, + "application/x-www-form-urlencoded", + true); request_->set_method("POST"); std::unique_ptr<net::UploadElementReader> reader( new net::UploadBytesElementReader(post_body_.data(), post_body_.size())); @@ -114,9 +113,8 @@ request_->Start(); } -std::string TokenValidatorImpl::CreateScope( - const std::string& local_jid, - const std::string& remote_jid) { +std::string TokenValidatorImpl::CreateScope(const std::string& local_jid, + const std::string& remote_jid) { std::string nonce_bytes; crypto::RandBytes(base::WriteInto(&nonce_bytes, kNonceLength + 1), kNonceLength); @@ -138,8 +136,7 @@ scoped_refptr<net::URLRequestContextGetter> request_context_getter) : third_party_auth_config_(third_party_auth_config), key_pair_(key_pair), - request_context_getter_(request_context_getter) { -} + request_context_getter_(request_context_getter) {} TokenValidatorFactoryImpl::~TokenValidatorFactoryImpl() = default;
diff --git a/remoting/host/token_validator_factory_impl_unittest.cc b/remoting/host/token_validator_factory_impl_unittest.cc index 6736d4f9..c35de62 100644 --- a/remoting/host/token_validator_factory_impl_unittest.cc +++ b/remoting/host/token_validator_factory_impl_unittest.cc
@@ -9,7 +9,7 @@ #include <memory> #include <string> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/json/json_writer.h" #include "base/run_loop.h" #include "base/test/task_environment.h"
diff --git a/remoting/host/touch_injector_win.cc b/remoting/host/touch_injector_win.cc index 9a00ebf..e0db8d0 100644 --- a/remoting/host/touch_injector_win.cc +++ b/remoting/host/touch_injector_win.cc
@@ -42,9 +42,8 @@ } } -void ConvertToPointerTouchInfoImpl( - const TouchEventPoint& touch_point, - POINTER_TOUCH_INFO* pointer_touch_info) { +void ConvertToPointerTouchInfoImpl(const TouchEventPoint& touch_point, + POINTER_TOUCH_INFO* pointer_touch_info) { pointer_touch_info->touchMask = TOUCH_MASK_CONTACTAREA | TOUCH_MASK_ORIENTATION; pointer_touch_info->touchFlags = TOUCH_FLAG_NONE; @@ -54,8 +53,7 @@ // MSDN mentions that if the digitizer does not detect the size of the touch // point, rcContact should be set to 0 by 0 rectangle centered at the // coordinate. - pointer_touch_info->rcContact.left = - touch_point.x() - touch_point.radius_x(); + pointer_touch_info->rcContact.left = touch_point.x() - touch_point.radius_x(); pointer_touch_info->rcContact.top = touch_point.y() - touch_point.radius_y(); pointer_touch_info->rcContact.right = touch_point.x() + touch_point.radius_x(); @@ -68,9 +66,8 @@ pointer_touch_info->touchMask |= TOUCH_MASK_PRESSURE; const float kMinimumPressure = 0.0; const float kMaximumPressure = 1.0; - const float clamped_touch_point_pressure = - std::max(kMinimumPressure, - std::min(kMaximumPressure, touch_point.pressure())); + const float clamped_touch_point_pressure = std::max( + kMinimumPressure, std::min(kMaximumPressure, touch_point.pressure())); const int kWindowsMaxTouchPressure = 1024; // Defined in MSDN. const int pressure = @@ -86,13 +83,13 @@ // The caller should set memset(0) the struct and set // pointer_touch_info->pointerInfo.pointerFlags. -void ConvertToPointerTouchInfo( - const TouchEventPoint& touch_point, - POINTER_TOUCH_INFO* pointer_touch_info) { +void ConvertToPointerTouchInfo(const TouchEventPoint& touch_point, + POINTER_TOUCH_INFO* pointer_touch_info) { // TODO(zijiehe): Use GetFullscreenTopLeft() once // https://chromium-review.googlesource.com/c/581951/ is submitted. - webrtc::DesktopVector top_left = webrtc::GetScreenRect( - webrtc::kFullDesktopScreenId, std::wstring()).top_left(); + webrtc::DesktopVector top_left = + webrtc::GetScreenRect(webrtc::kFullDesktopScreenId, std::wstring()) + .top_left(); if (top_left.is_zero()) { ConvertToPointerTouchInfoImpl(touch_point, pointer_touch_info); return; @@ -164,16 +161,18 @@ // so that a mock delegate can be injected in tests and set expectations on the // mock and return value of this method. bool TouchInjectorWin::Init() { - if (!delegate_) + if (!delegate_) { delegate_ = TouchInjectorWinDelegate::Create(); + } // If initializing the delegate failed above, then the platform likely doesn't // support touch (or the libraries failed to load for some reason). - if (!delegate_) + if (!delegate_) { return false; + } - if (!delegate_->InitializeTouchInjection( - kMaxSimultaneousTouchCount, TOUCH_FEEDBACK_DEFAULT)) { + if (!delegate_->InitializeTouchInjection(kMaxSimultaneousTouchCount, + TOUCH_FEEDBACK_DEFAULT)) { // delagate_ is reset here so that the function that need the delegate // can check if it is null. delegate_.reset();
diff --git a/remoting/host/touch_injector_win.h b/remoting/host/touch_injector_win.h index fadb4a4..d5ea6992 100644 --- a/remoting/host/touch_injector_win.h +++ b/remoting/host/touch_injector_win.h
@@ -6,7 +6,9 @@ #define REMOTING_HOST_TOUCH_INJECTOR_WIN_H_ #include <windows.h> + #include <stdint.h> + #include <map> #include <memory> #include <vector>
diff --git a/remoting/host/touch_injector_win_unittest.cc b/remoting/host/touch_injector_win_unittest.cc index 6ab7597..9441d4a 100644 --- a/remoting/host/touch_injector_win_unittest.cc +++ b/remoting/host/touch_injector_win_unittest.cc
@@ -17,8 +17,8 @@ using ::testing::_; using ::testing::AtLeast; -using ::testing::InSequence; using ::testing::ExpectationSet; +using ::testing::InSequence; using ::testing::Return; namespace remoting { @@ -63,11 +63,14 @@ for (size_t i = 0; i < id_to_flag_map.size(); ++i) { const POINTER_TOUCH_INFO* touch_info = arg + i; const uint32_t id = touch_info->pointerInfo.pointerId; - if (!base::Contains(id_to_flag_map, id)) + if (!base::Contains(id_to_flag_map, id)) { return false; + } - if (id_to_flag_map.find(id)->second != touch_info->pointerInfo.pointerFlags) + if (id_to_flag_map.find(id)->second != + touch_info->pointerInfo.pointerFlags) { return false; + } } return true; } @@ -239,25 +242,24 @@ InSequence s; EXPECT_CALL(*delegate_mock_before_deinitialize, - InitializeTouchInjection(_, _)).WillOnce(Return(1)); + InitializeTouchInjection(_, _)) + .WillOnce(Return(1)); IdFlagMap id_to_flags; id_to_flags[0u] = kStartFlag; - EXPECT_CALL( - *delegate_mock_before_deinitialize, - InjectTouchInput(1, EqualsPointerTouchInfoFlag(id_to_flags))) + EXPECT_CALL(*delegate_mock_before_deinitialize, + InjectTouchInput(1, EqualsPointerTouchInfoFlag(id_to_flags))) .WillOnce(Return(1)); - EXPECT_CALL(*delegate_mock_after_deinitialize, - InitializeTouchInjection(_, _)).WillOnce(Return(1)); + EXPECT_CALL(*delegate_mock_after_deinitialize, InitializeTouchInjection(_, _)) + .WillOnce(Return(1)); // After deinitializing and then initializing, previous touch points should be // gone. id_to_flags.clear(); id_to_flags[1u] = kStartFlag; - EXPECT_CALL( - *delegate_mock_after_deinitialize, - InjectTouchInput(1, EqualsPointerTouchInfoFlag(id_to_flags))) + EXPECT_CALL(*delegate_mock_after_deinitialize, + InjectTouchInput(1, EqualsPointerTouchInfoFlag(id_to_flags))) .WillOnce(Return(1)); TouchInjectorWin injector; @@ -290,9 +292,8 @@ IdFlagMap id_to_flags; id_to_flags[0u] = kStartFlag; - EXPECT_CALL( - *delegate_mock, - InjectTouchInput(1, EqualsPointerTouchInfoFlag(id_to_flags))) + EXPECT_CALL(*delegate_mock, + InjectTouchInput(1, EqualsPointerTouchInfoFlag(id_to_flags))) .WillOnce(Return(1)); TouchInjectorWin injector; @@ -311,22 +312,19 @@ TouchEventPoint* point = event.add_touch_points(); point->set_id(0u); - InSequence s; EXPECT_CALL(*delegate_mock, InitializeTouchInjection(_, _)) .WillOnce(Return(1)); IdFlagMap id_to_flags; id_to_flags[0u] = kStartFlag; - EXPECT_CALL( - *delegate_mock, - InjectTouchInput(1, EqualsPointerTouchInfoFlag(id_to_flags))) + EXPECT_CALL(*delegate_mock, + InjectTouchInput(1, EqualsPointerTouchInfoFlag(id_to_flags))) .WillOnce(Return(1)); id_to_flags[0u] = kMoveFlag; - EXPECT_CALL( - *delegate_mock, - InjectTouchInput(1, EqualsPointerTouchInfoFlag(id_to_flags))) + EXPECT_CALL(*delegate_mock, + InjectTouchInput(1, EqualsPointerTouchInfoFlag(id_to_flags))) .WillOnce(Return(1)); TouchInjectorWin injector; @@ -353,15 +351,13 @@ IdFlagMap id_to_flags; id_to_flags[0u] = kStartFlag; - EXPECT_CALL( - *delegate_mock, - InjectTouchInput(1, EqualsPointerTouchInfoFlag(id_to_flags))) + EXPECT_CALL(*delegate_mock, + InjectTouchInput(1, EqualsPointerTouchInfoFlag(id_to_flags))) .WillOnce(Return(1)); id_to_flags[0u] = kEndFlag; - EXPECT_CALL( - *delegate_mock, - InjectTouchInput(1, EqualsPointerTouchInfoFlag(id_to_flags))) + EXPECT_CALL(*delegate_mock, + InjectTouchInput(1, EqualsPointerTouchInfoFlag(id_to_flags))) .WillOnce(Return(1)); TouchInjectorWin injector; @@ -388,15 +384,13 @@ IdFlagMap id_to_flags; id_to_flags[0u] = kStartFlag; - EXPECT_CALL( - *delegate_mock, - InjectTouchInput(1, EqualsPointerTouchInfoFlag(id_to_flags))) + EXPECT_CALL(*delegate_mock, + InjectTouchInput(1, EqualsPointerTouchInfoFlag(id_to_flags))) .WillOnce(Return(1)); id_to_flags[0u] = kCancelFlag; - EXPECT_CALL( - *delegate_mock, - InjectTouchInput(1, EqualsPointerTouchInfoFlag(id_to_flags))) + EXPECT_CALL(*delegate_mock, + InjectTouchInput(1, EqualsPointerTouchInfoFlag(id_to_flags))) .WillOnce(Return(1)); TouchInjectorWin injector; @@ -425,47 +419,41 @@ IdFlagMap id_to_flags; id_to_flags[0u] = kStartFlag; - EXPECT_CALL( - *delegate_mock, - InjectTouchInput(1, EqualsPointerTouchInfoFlag(id_to_flags))) + EXPECT_CALL(*delegate_mock, + InjectTouchInput(1, EqualsPointerTouchInfoFlag(id_to_flags))) .WillOnce(Return(1)); id_to_flags[0u] = kMoveFlag; id_to_flags[1u] = kStartFlag; - EXPECT_CALL( - *delegate_mock, - InjectTouchInput(2, EqualsPointerTouchInfoFlag(id_to_flags))) + EXPECT_CALL(*delegate_mock, + InjectTouchInput(2, EqualsPointerTouchInfoFlag(id_to_flags))) .WillOnce(Return(1)); id_to_flags[0u] = kMoveFlag; id_to_flags[1u] = kMoveFlag; - EXPECT_CALL( - *delegate_mock, - InjectTouchInput(2, EqualsPointerTouchInfoFlag(id_to_flags))) + EXPECT_CALL(*delegate_mock, + InjectTouchInput(2, EqualsPointerTouchInfoFlag(id_to_flags))) .WillOnce(Return(1)); id_to_flags[0u] = kMoveFlag; id_to_flags[1u] = kMoveFlag; id_to_flags[2u] = kStartFlag; - EXPECT_CALL( - *delegate_mock, - InjectTouchInput(3, EqualsPointerTouchInfoFlag(id_to_flags))) + EXPECT_CALL(*delegate_mock, + InjectTouchInput(3, EqualsPointerTouchInfoFlag(id_to_flags))) .WillOnce(Return(1)); id_to_flags[0u] = kMoveFlag; id_to_flags[1u] = kEndFlag; id_to_flags[2u] = kMoveFlag; - EXPECT_CALL( - *delegate_mock, - InjectTouchInput(3, EqualsPointerTouchInfoFlag(id_to_flags))) + EXPECT_CALL(*delegate_mock, + InjectTouchInput(3, EqualsPointerTouchInfoFlag(id_to_flags))) .WillOnce(Return(1)); id_to_flags.erase(1u); id_to_flags[0u] = kCancelFlag; id_to_flags[2u] = kCancelFlag; - EXPECT_CALL( - *delegate_mock, - InjectTouchInput(2, EqualsPointerTouchInfoFlag(id_to_flags))) + EXPECT_CALL(*delegate_mock, + InjectTouchInput(2, EqualsPointerTouchInfoFlag(id_to_flags))) .WillOnce(Return(1)); TouchInjectorWin injector;
diff --git a/remoting/host/usage_stats_consent.h b/remoting/host/usage_stats_consent.h index 98ee59a..36251ca 100644 --- a/remoting/host/usage_stats_consent.h +++ b/remoting/host/usage_stats_consent.h
@@ -21,6 +21,6 @@ // statistics. bool SetUsageStatsConsent(bool allowed); -} // remoting +} // namespace remoting #endif // REMOTING_HOST_USAGE_STATS_CONSENT_H_
diff --git a/remoting/host/usage_stats_consent_win.cc b/remoting/host/usage_stats_consent_win.cc index 96676a1..26514a2 100644 --- a/remoting/host/usage_stats_consent_win.cc +++ b/remoting/host/usage_stats_consent_win.cc
@@ -25,9 +25,8 @@ LONG ReadUsageStatsValue(const wchar_t* state_key, DWORD* usagestats_out) { // presubmit: allow wstring - std::wstring client_state = base::StringPrintf(kOmahaClientStateKeyFormat, - state_key, - remoting::kHostOmahaAppid); + std::wstring client_state = base::StringPrintf( + kOmahaClientStateKeyFormat, state_key, remoting::kHostOmahaAppid); base::win::RegKey key; LONG result = key.Open(HKEY_LOCAL_MACHINE, client_state.c_str(), KEY_READ); if (result != ERROR_SUCCESS) { @@ -73,12 +72,11 @@ bool SetUsageStatsConsent(bool allowed) { DWORD value = allowed; // presubmit: allow wstring - std::wstring client_state = base::StringPrintf(kOmahaClientStateKeyFormat, - kOmahaClientStateMedium, - kHostOmahaAppid); + std::wstring client_state = base::StringPrintf( + kOmahaClientStateKeyFormat, kOmahaClientStateMedium, kHostOmahaAppid); base::win::RegKey key; - LONG result = key.Create(HKEY_LOCAL_MACHINE, client_state.c_str(), - KEY_SET_VALUE); + LONG result = + key.Create(HKEY_LOCAL_MACHINE, client_state.c_str(), KEY_SET_VALUE); if (result == ERROR_SUCCESS) { result = key.WriteValue(kOmahaUsagestatsValue, value); if (result == ERROR_SUCCESS) {
diff --git a/remoting/host/webauthn/remote_webauthn_delegated_state_change_notifier.h b/remoting/host/webauthn/remote_webauthn_delegated_state_change_notifier.h index fdc1058a..3ed3ad577 100644 --- a/remoting/host/webauthn/remote_webauthn_delegated_state_change_notifier.h +++ b/remoting/host/webauthn/remote_webauthn_delegated_state_change_notifier.h
@@ -5,7 +5,7 @@ #ifndef REMOTING_HOST_WEBAUTHN_REMOTE_WEBAUTHN_DELEGATED_STATE_CHANGE_NOTIFIER_H_ #define REMOTING_HOST_WEBAUTHN_REMOTE_WEBAUTHN_DELEGATED_STATE_CHANGE_NOTIFIER_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "remoting/host/webauthn/remote_webauthn_state_change_notifier.h" namespace remoting {
diff --git a/remoting/host/webauthn/remote_webauthn_extension_notifier.cc b/remoting/host/webauthn/remote_webauthn_extension_notifier.cc index 294bf18c..01ac443 100644 --- a/remoting/host/webauthn/remote_webauthn_extension_notifier.cc +++ b/remoting/host/webauthn/remote_webauthn_extension_notifier.cc
@@ -7,10 +7,10 @@ #include <vector> #include "base/base_paths.h" -#include "base/bind.h" #include "base/files/file.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/logging.h" #include "base/memory/scoped_refptr.h"
diff --git a/remoting/host/webauthn/remote_webauthn_extension_notifier_unittest.cc b/remoting/host/webauthn/remote_webauthn_extension_notifier_unittest.cc index 62134ef1..2e318c0 100644 --- a/remoting/host/webauthn/remote_webauthn_extension_notifier_unittest.cc +++ b/remoting/host/webauthn/remote_webauthn_extension_notifier_unittest.cc
@@ -6,10 +6,10 @@ #include <memory> -#include "base/callback_helpers.h" #include "base/files/file_path.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ptr_util.h" #include "base/memory/scoped_refptr.h" #include "base/run_loop.h"
diff --git a/remoting/host/webauthn/remote_webauthn_message_handler.cc b/remoting/host/webauthn/remote_webauthn_message_handler.cc index 8de369de..abfbf50 100644 --- a/remoting/host/webauthn/remote_webauthn_message_handler.cc +++ b/remoting/host/webauthn/remote_webauthn_message_handler.cc
@@ -8,9 +8,9 @@ #include <limits> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/notreached.h" #include "remoting/host/mojom/webauthn_proxy.mojom.h"
diff --git a/remoting/host/webauthn/remote_webauthn_native_messaging_host.cc b/remoting/host/webauthn/remote_webauthn_native_messaging_host.cc index 1f2e453..838735f 100644 --- a/remoting/host/webauthn/remote_webauthn_native_messaging_host.cc +++ b/remoting/host/webauthn/remote_webauthn_native_messaging_host.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/json/json_writer.h" #include "base/logging.h" #include "base/ranges/algorithm.h"
diff --git a/remoting/host/webauthn/remote_webauthn_native_messaging_host.h b/remoting/host/webauthn/remote_webauthn_native_messaging_host.h index 9dd86126..a0a3ca406 100644 --- a/remoting/host/webauthn/remote_webauthn_native_messaging_host.h +++ b/remoting/host/webauthn/remote_webauthn_native_messaging_host.h
@@ -7,9 +7,9 @@ #include <memory> -#include "base/callback_forward.h" #include "base/containers/flat_map.h" #include "base/containers/queue.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/task/single_thread_task_runner.h" #include "base/values.h"
diff --git a/remoting/host/webauthn/remote_webauthn_native_messaging_host_unittest.cc b/remoting/host/webauthn/remote_webauthn_native_messaging_host_unittest.cc index 9007fd8a..4544d38 100644 --- a/remoting/host/webauthn/remote_webauthn_native_messaging_host_unittest.cc +++ b/remoting/host/webauthn/remote_webauthn_native_messaging_host_unittest.cc
@@ -4,7 +4,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/json/json_reader.h" #include "base/json/json_writer.h" #include "base/memory/ptr_util.h"
diff --git a/remoting/host/win/elevated_native_messaging_host.cc b/remoting/host/win/elevated_native_messaging_host.cc index 29325210..27fe95c 100644 --- a/remoting/host/win/elevated_native_messaging_host.cc +++ b/remoting/host/win/elevated_native_messaging_host.cc
@@ -8,9 +8,9 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/check.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/json/json_writer.h" #include "base/values.h" #include "base/win/scoped_handle.h"
diff --git a/remoting/host/win/host_service.cc b/remoting/host/win/host_service.cc index cd5492d3..4226848 100644 --- a/remoting/host/win/host_service.cc +++ b/remoting/host/win/host_service.cc
@@ -13,9 +13,9 @@ #include "base/base_paths.h" #include "base/base_switches.h" -#include "base/bind.h" #include "base/command_line.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/message_loop/message_pump_type.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h"
diff --git a/remoting/host/win/rdp_client.cc b/remoting/host/win/rdp_client.cc index 491b464..5c332974 100644 --- a/remoting/host/win/rdp_client.cc +++ b/remoting/host/win/rdp_client.cc
@@ -9,9 +9,9 @@ #include <cstdint> #include <memory> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/check_op.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/numerics/safe_conversions.h" #include "base/task/current_thread.h"
diff --git a/remoting/host/win/rdp_client_unittest.cc b/remoting/host/win/rdp_client_unittest.cc index db93a59..3c5eb805d 100644 --- a/remoting/host/win/rdp_client_unittest.cc +++ b/remoting/host/win/rdp_client_unittest.cc
@@ -8,8 +8,8 @@ #include <memory> #include <string> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/guid.h" #include "base/run_loop.h" #include "base/task/single_thread_task_runner.h"
diff --git a/remoting/host/win/rdp_client_window.cc b/remoting/host/win/rdp_client_window.cc index cf4857d..4f12d90 100644 --- a/remoting/host/win/rdp_client_window.cc +++ b/remoting/host/win/rdp_client_window.cc
@@ -9,7 +9,7 @@ #include <list> #include <string> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/lazy_instance.h" #include "base/location.h" #include "base/logging.h"
diff --git a/remoting/host/win/session_action_executor.cc b/remoting/host/win/session_action_executor.cc index a676321..c3bb0c14 100644 --- a/remoting/host/win/session_action_executor.cc +++ b/remoting/host/win/session_action_executor.cc
@@ -4,8 +4,8 @@ #include "remoting/host/win/session_action_executor.h" -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/location.h" #include "base/task/single_thread_task_runner.h" #include "remoting/proto/action.pb.h"
diff --git a/remoting/host/win/session_action_executor.h b/remoting/host/win/session_action_executor.h index de2ec706..050d801 100644 --- a/remoting/host/win/session_action_executor.h +++ b/remoting/host/win/session_action_executor.h
@@ -5,7 +5,7 @@ #ifndef REMOTING_HOST_WIN_SESSION_ACTION_EXECUTOR_H_ #define REMOTING_HOST_WIN_SESSION_ACTION_EXECUTOR_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" #include "remoting/host/action_executor.h"
diff --git a/remoting/host/win/session_desktop_environment.h b/remoting/host/win/session_desktop_environment.h index 490e8de..febbc46 100644 --- a/remoting/host/win/session_desktop_environment.h +++ b/remoting/host/win/session_desktop_environment.h
@@ -5,8 +5,8 @@ #ifndef REMOTING_HOST_WIN_SESSION_DESKTOP_ENVIRONMENT_H_ #define REMOTING_HOST_WIN_SESSION_DESKTOP_ENVIRONMENT_H_ -#include "base/callback.h" #include "base/compiler_specific.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" #include "base/task/single_thread_task_runner.h" #include "remoting/host/me2me_desktop_environment.h"
diff --git a/remoting/host/win/session_input_injector.cc b/remoting/host/win/session_input_injector.cc index e392605..a06b19b 100644 --- a/remoting/host/win/session_input_injector.cc +++ b/remoting/host/win/session_input_injector.cc
@@ -10,9 +10,9 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/compiler_specific.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/location.h" #include "base/logging.h" #include "base/task/single_thread_task_runner.h"
diff --git a/remoting/host/win/session_input_injector.h b/remoting/host/win/session_input_injector.h index 857ef52..6020158 100644 --- a/remoting/host/win/session_input_injector.h +++ b/remoting/host/win/session_input_injector.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/scoped_refptr.h" #include "remoting/host/input_injector.h"
diff --git a/remoting/host/win/worker_process_launcher.h b/remoting/host/win/worker_process_launcher.h index 2475431..904be1a 100644 --- a/remoting/host/win/worker_process_launcher.h +++ b/remoting/host/win/worker_process_launcher.h
@@ -9,8 +9,8 @@ #include <memory> -#include "base/callback.h" #include "base/compiler_specific.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/sequence_checker.h" #include "base/timer/timer.h"
diff --git a/remoting/host/win/worker_process_launcher_unittest.cc b/remoting/host/win/worker_process_launcher_unittest.cc index 1f4b296d..de78c34 100644 --- a/remoting/host/win/worker_process_launcher_unittest.cc +++ b/remoting/host/win/worker_process_launcher_unittest.cc
@@ -9,7 +9,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h" #include "base/run_loop.h"
diff --git a/remoting/host/win/wts_session_change_observer.cc b/remoting/host/win/wts_session_change_observer.cc index e0ada78a..39c4bc2 100644 --- a/remoting/host/win/wts_session_change_observer.cc +++ b/remoting/host/win/wts_session_change_observer.cc
@@ -8,7 +8,7 @@ #include <winuser.h> #include <wtsapi32.h> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/sequence_checker.h"
diff --git a/remoting/host/win/wts_session_change_observer.h b/remoting/host/win/wts_session_change_observer.h index 3f80e90..5941fbf5 100644 --- a/remoting/host/win/wts_session_change_observer.h +++ b/remoting/host/win/wts_session_change_observer.h
@@ -7,7 +7,7 @@ #include <stdint.h> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/sequence_checker.h" #include "base/thread_annotations.h" #include "base/win/message_window.h"
diff --git a/remoting/host/win/wts_session_process_delegate.cc b/remoting/host/win/wts_session_process_delegate.cc index 5c89616..8a19a850 100644 --- a/remoting/host/win/wts_session_process_delegate.cc +++ b/remoting/host/win/wts_session_process_delegate.cc
@@ -10,9 +10,9 @@ #include <memory> #include <utility> -#include "base/bind.h" #include "base/command_line.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/memory/raw_ptr.h" #include "base/notreached.h"
diff --git a/remoting/host/x11_crtc_resizer.cc b/remoting/host/x11_crtc_resizer.cc index 9b694eb..1a9ab9b 100644 --- a/remoting/host/x11_crtc_resizer.cc +++ b/remoting/host/x11_crtc_resizer.cc
@@ -82,10 +82,12 @@ x11::Time config_timestamp = resources_->config_timestamp; for (const auto& crtc : resources_->crtcs) { auto response = randr_->GetCrtcInfo({crtc, config_timestamp}).Sync(); - if (!response) + if (!response) { continue; - if (response->outputs.empty()) + } + if (response->outputs.empty()) { continue; + } AddCrtcFromReply(crtc, *response.reply); } @@ -319,8 +321,9 @@ } bool X11CrtcResizer::LayoutIsVertical() const { - if (active_crtcs_.size() <= 1) + if (active_crtcs_.size() <= 1) { return false; + } // For simplicity, just pick 2 CRTCs arbitrarily. auto iter1 = active_crtcs_.begin();
diff --git a/remoting/host/xmpp_register_support_host_request.cc b/remoting/host/xmpp_register_support_host_request.cc index 6809deb1f..7cbcb23 100644 --- a/remoting/host/xmpp_register_support_host_request.cc +++ b/remoting/host/xmpp_register_support_host_request.cc
@@ -9,7 +9,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/strings/string_number_conversions.h" #include "base/strings/stringize_macros.h" @@ -57,8 +57,9 @@ : directory_bot_jid_(directory_bot_jid) {} XmppRegisterSupportHostRequest::~XmppRegisterSupportHostRequest() { - if (signal_strategy_) + if (signal_strategy_) { signal_strategy_->RemoveListener(this); + } } void XmppRegisterSupportHostRequest::StartRequest(
diff --git a/remoting/host/xmpp_register_support_host_request.h b/remoting/host/xmpp_register_support_host_request.h index 1be2a901..8b8076d 100644 --- a/remoting/host/xmpp_register_support_host_request.h +++ b/remoting/host/xmpp_register_support_host_request.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h" #include "remoting/base/rsa_key_pair.h"
diff --git a/remoting/host/xmpp_register_support_host_request_unittest.cc b/remoting/host/xmpp_register_support_host_request_unittest.cc index 55e83e9..d31a3fe 100644 --- a/remoting/host/xmpp_register_support_host_request_unittest.cc +++ b/remoting/host/xmpp_register_support_host_request_unittest.cc
@@ -6,7 +6,7 @@ #include <stdint.h> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ref_counted.h" #include "base/observer_list.h" #include "base/strings/string_number_conversions.h" @@ -188,8 +188,9 @@ int consumed = 0; for (auto& listener : signal_strategy_listeners_) { - if (listener.OnSignalStrategyIncomingStanza(response.get())) + if (listener.OnSignalStrategyIncomingStanza(response.get())) { consumed++; + } } EXPECT_EQ(1, consumed);
diff --git a/remoting/host/xsession_chooser_linux.cc b/remoting/host/xsession_chooser_linux.cc index cd2cde8c..78b1455 100644 --- a/remoting/host/xsession_chooser_linux.cc +++ b/remoting/host/xsession_chooser_linux.cc
@@ -20,12 +20,12 @@ #include <string> #include <vector> -#include "base/bind.h" -#include "base/callback.h" #include "base/environment.h" #include "base/files/file_enumerator.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/i18n/icu_util.h" #include "base/logging.h" #include "base/message_loop/message_pump_type.h" @@ -81,11 +81,10 @@ GtkTreeIter iter; gtk_list_store_append(session_store, &iter); // gtk_list_store_set makes its own internal copy of the strings. - gtk_list_store_set(session_store, &iter, - INDEX_COLUMN, static_cast<guint>(i), - NAME_COLUMN, choices_[i].name.c_str(), - COMMENT_COLUMN, choices_[i].comment.c_str(), - -1); + gtk_list_store_set(session_store, &iter, INDEX_COLUMN, + static_cast<guint>(i), NAME_COLUMN, + choices_[i].name.c_str(), COMMENT_COLUMN, + choices_[i].comment.c_str(), -1); } g_signal_connect(gtk_builder_get_object(ui_, "session_list"),
diff --git a/remoting/host/zombie_host_detector.h b/remoting/host/zombie_host_detector.h index 3d28896..ccaccb4 100644 --- a/remoting/host/zombie_host_detector.h +++ b/remoting/host/zombie_host_detector.h
@@ -5,7 +5,7 @@ #ifndef REMOTING_HOST_ZOMBIE_HOST_DETECTOR_H_ #define REMOTING_HOST_ZOMBIE_HOST_DETECTOR_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/time/time.h" #include "base/timer/timer.h" #include "remoting/host/heartbeat_sender.h"
diff --git a/remoting/host/zombie_host_detector_unittest.cc b/remoting/host/zombie_host_detector_unittest.cc index 80ca913..5c03b78a 100644 --- a/remoting/host/zombie_host_detector_unittest.cc +++ b/remoting/host/zombie_host_detector_unittest.cc
@@ -4,7 +4,7 @@ #include "remoting/host/zombie_host_detector.h" -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/test/bind.h" #include "base/test/mock_callback.h" #include "base/test/task_environment.h"
diff --git a/remoting/ios/app/notification_presenter.mm b/remoting/ios/app/notification_presenter.mm index b57e9b30..62fc8b2 100644 --- a/remoting/ios/app/notification_presenter.mm +++ b/remoting/ios/app/notification_presenter.mm
@@ -6,8 +6,8 @@ #import <MaterialComponents/MaterialDialogs.h> -#include "base/bind.h" #include "base/check_op.h" +#include "base/functional/bind.h" #include "base/no_destructor.h" #include "base/strings/sys_string_conversions.h" #include "remoting/base/string_resources.h"
diff --git a/remoting/ios/app/remoting_view_controller.mm b/remoting/ios/app/remoting_view_controller.mm index 202fceb..98979f80 100644 --- a/remoting/ios/app/remoting_view_controller.mm +++ b/remoting/ios/app/remoting_view_controller.mm
@@ -14,7 +14,7 @@ #import <MaterialComponents/MaterialShadowLayer.h> #import <MaterialComponents/MaterialSnackbar.h> -#import "base/bind.h" +#import "base/functional/bind.h" #include "base/mac/scoped_cftyperef.h" #include "base/strings/sys_string_conversions.h" #include "remoting/base/oauth_token_getter.h"
diff --git a/remoting/ios/audio/audio_playback_sink_ios.cc b/remoting/ios/audio/audio_playback_sink_ios.cc index 8398788..8235db0c 100644 --- a/remoting/ios/audio/audio_playback_sink_ios.cc +++ b/remoting/ios/audio/audio_playback_sink_ios.cc
@@ -4,7 +4,7 @@ #include "remoting/ios/audio/audio_playback_sink_ios.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/task/single_thread_task_runner.h" #include "base/time/time.h"
diff --git a/remoting/ios/audio/audio_playback_sink_ios_unittest.cc b/remoting/ios/audio/audio_playback_sink_ios_unittest.cc index dfb928b43..4497b8e0 100644 --- a/remoting/ios/audio/audio_playback_sink_ios_unittest.cc +++ b/remoting/ios/audio/audio_playback_sink_ios_unittest.cc
@@ -4,7 +4,7 @@ #include "remoting/ios/audio/audio_playback_sink_ios.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/test/bind.h" #include "base/threading/platform_thread.h" #include "base/threading/thread.h"
diff --git a/remoting/ios/display/eagl_view.mm b/remoting/ios/display/eagl_view.mm index cad01fad..7b42e9b3 100644 --- a/remoting/ios/display/eagl_view.mm +++ b/remoting/ios/display/eagl_view.mm
@@ -12,9 +12,9 @@ #import <OpenGLES/ES2/gl.h> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/check_op.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #import "base/task/single_thread_task_runner.h" #include "base/threading/thread_checker.h"
diff --git a/remoting/ios/display/gl_display_handler.mm b/remoting/ios/display/gl_display_handler.mm index 44afd65..ac82c6b6 100644 --- a/remoting/ios/display/gl_display_handler.mm +++ b/remoting/ios/display/gl_display_handler.mm
@@ -11,12 +11,12 @@ #import "remoting/ios/display/gl_display_handler.h" -#import "base/bind.h" +#import "base/functional/bind.h" #import "remoting/client/display/sys_opengl.h" #import "remoting/ios/display/eagl_view.h" #import "remoting/ios/display/gl_demo_screen.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/memory/weak_ptr.h" #include "remoting/client/chromoting_client_runtime.h"
diff --git a/remoting/ios/facade/host_list_service.mm b/remoting/ios/facade/host_list_service.mm index 05b39c5..f6920d6 100644 --- a/remoting/ios/facade/host_list_service.mm +++ b/remoting/ios/facade/host_list_service.mm
@@ -16,7 +16,7 @@ #import "remoting/ios/facade/remoting_authentication.h" #import "remoting/ios/facade/remoting_service.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/no_destructor.h" #include "remoting/base/directory_service_client.h"
diff --git a/remoting/ios/facade/host_list_service_unittest.mm b/remoting/ios/facade/host_list_service_unittest.mm index dd62745..542c826c 100644 --- a/remoting/ios/facade/host_list_service_unittest.mm +++ b/remoting/ios/facade/host_list_service_unittest.mm
@@ -14,7 +14,7 @@ #import "remoting/ios/facade/remoting_service.h" #import "third_party/ocmock/OCMock/OCMock.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/test/task_environment.h" #include "net/http/http_status_code.h"
diff --git a/remoting/ios/facade/ios_client_runtime_delegate.mm b/remoting/ios/facade/ios_client_runtime_delegate.mm index 58e13d76..a6a81d6 100644 --- a/remoting/ios/facade/ios_client_runtime_delegate.mm +++ b/remoting/ios/facade/ios_client_runtime_delegate.mm
@@ -11,8 +11,8 @@ #import "remoting/ios/facade/remoting_authentication.h" #import "remoting/ios/facade/remoting_service.h" -#include "base/bind.h" #include "base/check.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/memory/weak_ptr.h" #include "base/strings/sys_string_conversions.h"
diff --git a/remoting/ios/facade/remoting_oauth_authentication.mm b/remoting/ios/facade/remoting_oauth_authentication.mm index 2ea52474..36b40e6a 100644 --- a/remoting/ios/facade/remoting_oauth_authentication.mm +++ b/remoting/ios/facade/remoting_oauth_authentication.mm
@@ -9,16 +9,16 @@ #import <MaterialComponents/MaterialSnackbar.h> -#import "base/bind.h" -#import "remoting/ios/facade/ios_client_runtime_delegate.h" -#import "remoting/ios/facade/remoting_service.h" -#import "remoting/ios/persistence/remoting_keychain.h" -#import "remoting/ios/persistence/remoting_preferences.h" +#import "base/functional/bind.h" #include "base/logging.h" #include "base/strings/sys_string_conversions.h" #include "net/url_request/url_request_context_getter.h" #include "remoting/base/oauth_token_getter.h" #include "remoting/base/oauth_token_getter_impl.h" +#import "remoting/ios/facade/ios_client_runtime_delegate.h" +#import "remoting/ios/facade/remoting_service.h" +#import "remoting/ios/persistence/remoting_keychain.h" +#import "remoting/ios/persistence/remoting_preferences.h" #include "services/network/public/cpp/shared_url_loader_factory.h" #if !defined(__has_feature) || !__has_feature(objc_arc)
diff --git a/remoting/ios/session/remoting_client.mm b/remoting/ios/session/remoting_client.mm index 3d21e936d..93726f44 100644 --- a/remoting/ios/session/remoting_client.mm +++ b/remoting/ios/session/remoting_client.mm
@@ -8,7 +8,7 @@ #import <MaterialComponents/MaterialSnackbar.h> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/strings/sys_string_conversions.h" #include "remoting/client/audio/audio_playback_stream.h"
diff --git a/remoting/protocol/audio_decode_scheduler.cc b/remoting/protocol/audio_decode_scheduler.cc index 270fa4b..ff6e979 100644 --- a/remoting/protocol/audio_decode_scheduler.cc +++ b/remoting/protocol/audio_decode_scheduler.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/task/single_thread_task_runner.h" #include "remoting/codec/audio_decoder.h"
diff --git a/remoting/protocol/audio_decode_scheduler_unittest.cc b/remoting/protocol/audio_decode_scheduler_unittest.cc index c23ed8f..d17d745 100644 --- a/remoting/protocol/audio_decode_scheduler_unittest.cc +++ b/remoting/protocol/audio_decode_scheduler_unittest.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "base/test/task_environment.h" #include "base/threading/thread.h" @@ -33,15 +33,16 @@ ~FakeAudioConsumer() override = default; - base::WeakPtr<FakeAudioConsumer> GetWeakPtr(){ + base::WeakPtr<FakeAudioConsumer> GetWeakPtr() { return weak_factory_.GetWeakPtr(); } // AudioStub implementation. void ProcessAudioPacket(std::unique_ptr<AudioPacket> packet, base::OnceClosure done) override { - if (!done.is_null()) + if (!done.is_null()) { std::move(done).Run(); + } } private:
diff --git a/remoting/protocol/audio_pump.cc b/remoting/protocol/audio_pump.cc index 8f320b9..be4fa89 100644 --- a/remoting/protocol/audio_pump.cc +++ b/remoting/protocol/audio_pump.cc
@@ -7,8 +7,8 @@ #include <memory> #include <utility> -#include "base/bind.h" #include "base/check_op.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/notreached.h" #include "base/task/single_thread_task_runner.h" @@ -42,8 +42,8 @@ const media::AudioBus& packet) { std::unique_ptr<remoting::AudioPacket> result = std::make_unique<remoting::AudioPacket>(); - result->add_data()->resize( - packet.channels() * packet.frames() * sizeof(int16_t)); + result->add_data()->resize(packet.channels() * packet.frames() * + sizeof(int16_t)); packet.ToInterleaved<media::SignedInt16SampleTypeTraits>( packet.frames(), reinterpret_cast<int16_t*>(&(result->mutable_data(0)->at(0))));
diff --git a/remoting/protocol/audio_reader.cc b/remoting/protocol/audio_reader.cc index 57ee2ed..e6df2ec 100644 --- a/remoting/protocol/audio_reader.cc +++ b/remoting/protocol/audio_reader.cc
@@ -4,8 +4,8 @@ #include "remoting/protocol/audio_reader.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "net/socket/stream_socket.h" #include "remoting/base/compound_buffer.h" #include "remoting/base/constants.h"
diff --git a/remoting/protocol/audio_source.h b/remoting/protocol/audio_source.h index d5ba9848..a0aecd40 100644 --- a/remoting/protocol/audio_source.h +++ b/remoting/protocol/audio_source.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" namespace remoting {
diff --git a/remoting/protocol/audio_stub.h b/remoting/protocol/audio_stub.h index 20736d9..a8ec566 100644 --- a/remoting/protocol/audio_stub.h +++ b/remoting/protocol/audio_stub.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" namespace remoting { @@ -20,13 +20,13 @@ AudioStub(const AudioStub&) = delete; AudioStub& operator=(const AudioStub&) = delete; - virtual ~AudioStub() { } + virtual ~AudioStub() {} virtual void ProcessAudioPacket(std::unique_ptr<AudioPacket> audio_packet, base::OnceClosure done) = 0; protected: - AudioStub() { } + AudioStub() {} }; } // namespace protocol
diff --git a/remoting/protocol/audio_writer.cc b/remoting/protocol/audio_writer.cc index b5274251..b882379 100644 --- a/remoting/protocol/audio_writer.cc +++ b/remoting/protocol/audio_writer.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "net/socket/stream_socket.h" #include "remoting/base/compound_buffer.h" @@ -28,8 +28,9 @@ // static std::unique_ptr<AudioWriter> AudioWriter::Create(const SessionConfig& config) { - if (!config.is_audio_enabled()) + if (!config.is_audio_enabled()) { return nullptr; + } return base::WrapUnique(new AudioWriter()); }
diff --git a/remoting/protocol/audio_writer.h b/remoting/protocol/audio_writer.h index 863fe57..512e15f8 100644 --- a/remoting/protocol/audio_writer.h +++ b/remoting/protocol/audio_writer.h
@@ -8,8 +8,8 @@ #include <memory> #include <string> -#include "base/callback.h" #include "base/compiler_specific.h" +#include "base/functional/callback.h" #include "remoting/protocol/audio_stub.h" #include "remoting/protocol/channel_dispatcher_base.h" @@ -17,8 +17,7 @@ class SessionConfig; -class AudioWriter : public ChannelDispatcherBase, - public AudioStub { +class AudioWriter : public ChannelDispatcherBase, public AudioStub { public: // Once AudioWriter is created, the Init() method of ChannelDispatcherBase // should be used to initialize it for the session.
diff --git a/remoting/protocol/auth_util.cc b/remoting/protocol/auth_util.cc index d7e5198..b7bedab 100644 --- a/remoting/protocol/auth_util.cc +++ b/remoting/protocol/auth_util.cc
@@ -16,8 +16,7 @@ const char kClientAuthSslExporterLabel[] = "EXPORTER-remoting-channel-auth-client"; -const char kHostAuthSslExporterLabel[] = - "EXPORTER-remoting-channel-auth-host"; +const char kHostAuthSslExporterLabel[] = "EXPORTER-remoting-channel-auth-host"; const char kSslFakeHostName[] = "chromoting";
diff --git a/remoting/protocol/authenticator.cc b/remoting/protocol/authenticator.cc index 165947f..1109271 100644 --- a/remoting/protocol/authenticator.cc +++ b/remoting/protocol/authenticator.cc
@@ -10,12 +10,13 @@ namespace remoting::protocol { namespace { -const jingle_xmpp::StaticQName kAuthenticationQName = { kChromotingXmlNamespace, - "authentication" }; +const jingle_xmpp::StaticQName kAuthenticationQName = {kChromotingXmlNamespace, + "authentication"}; } // namespace // static -bool Authenticator::IsAuthenticatorMessage(const jingle_xmpp::XmlElement* message) { +bool Authenticator::IsAuthenticatorMessage( + const jingle_xmpp::XmlElement* message) { return message->Name() == kAuthenticationQName; }
diff --git a/remoting/protocol/authenticator.h b/remoting/protocol/authenticator.h index 018e9114..d283424 100644 --- a/remoting/protocol/authenticator.h +++ b/remoting/protocol/authenticator.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" namespace jingle_xmpp { class XmlElement; @@ -103,7 +103,8 @@ static bool IsAuthenticatorMessage(const jingle_xmpp::XmlElement* message); // Creates an empty Authenticator message, owned by the caller. - static std::unique_ptr<jingle_xmpp::XmlElement> CreateEmptyAuthenticatorMessage(); + static std::unique_ptr<jingle_xmpp::XmlElement> + CreateEmptyAuthenticatorMessage(); // Finds Authenticator message among child elements of |message|, or // returns nullptr otherwise.
diff --git a/remoting/protocol/authenticator_test_base.cc b/remoting/protocol/authenticator_test_base.cc index a4a3285a..1f44e7c 100644 --- a/remoting/protocol/authenticator_test_base.cc +++ b/remoting/protocol/authenticator_test_base.cc
@@ -8,9 +8,9 @@ #include <utility> #include "base/base64.h" -#include "base/bind.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/test/test_timeouts.h" #include "base/timer/timer.h" @@ -34,8 +34,9 @@ ACTION_P(QuitThreadOnCounter, counter) { --(*counter); EXPECT_GE(*counter, 0); - if (*counter == 0) + if (*counter == 0) { base::RunLoop::QuitCurrentWhenIdleDeprecated(); + } } } // namespace @@ -67,16 +68,12 @@ } void AuthenticatorTestBase::RunAuthExchange() { - ContinueAuthExchangeWith(client_.get(), - host_.get(), - client_->started(), + ContinueAuthExchangeWith(client_.get(), host_.get(), client_->started(), host_->started()); } void AuthenticatorTestBase::RunHostInitiatedAuthExchange() { - ContinueAuthExchangeWith(host_.get(), - client_.get(), - host_->started(), + ContinueAuthExchangeWith(host_.get(), client_.get(), host_->started(), client_->started()); } @@ -141,7 +138,7 @@ .WillOnce(QuitThreadOnCounter(&callback_counter)); if (expected_fail) { EXPECT_CALL(host_callback_, OnDone(net::ERR_FAILED)) - .WillOnce(QuitThreadOnCounter(&callback_counter)); + .WillOnce(QuitThreadOnCounter(&callback_counter)); } else { EXPECT_CALL(host_callback_, OnDone(net::OK)) .WillOnce(QuitThreadOnCounter(&callback_counter));
diff --git a/remoting/protocol/capture_scheduler.cc b/remoting/protocol/capture_scheduler.cc index c1b90d73..864a2fb 100644 --- a/remoting/protocol/capture_scheduler.cc +++ b/remoting/protocol/capture_scheduler.cc
@@ -7,8 +7,8 @@ #include <algorithm> #include <utility> -#include "base/bind.h" #include "base/check_op.h" +#include "base/functional/bind.h" #include "base/system/sys_info.h" #include "base/time/default_tick_clock.h" #include "base/time/time.h"
diff --git a/remoting/protocol/capture_scheduler.h b/remoting/protocol/capture_scheduler.h index a8765f0..f0d32bb 100644 --- a/remoting/protocol/capture_scheduler.h +++ b/remoting/protocol/capture_scheduler.h
@@ -7,7 +7,7 @@ #include <stdint.h> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/threading/thread_checker.h" #include "base/time/tick_clock.h"
diff --git a/remoting/protocol/capture_scheduler_unittest.cc b/remoting/protocol/capture_scheduler_unittest.cc index ef259421..e095f6a 100644 --- a/remoting/protocol/capture_scheduler_unittest.cc +++ b/remoting/protocol/capture_scheduler_unittest.cc
@@ -9,7 +9,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h" #include "base/test/simple_test_tick_clock.h" @@ -20,7 +20,7 @@ namespace remoting::protocol { -static const int kTestInputs[] = { 100, 50, 30, 20, 10, 30, 60, 80 }; +static const int kTestInputs[] = {100, 50, 30, 20, 10, 30, 60, 80}; static const int kMinumumFrameIntervalMs = 50; class CaptureSchedulerTest : public testing::Test { @@ -38,9 +38,7 @@ scheduler_->Start(); } - void DoCapture() { - capture_called_ = true; - } + void DoCapture() { capture_called_ = true; } void CheckCaptureCalled() { EXPECT_TRUE(capture_called_);
diff --git a/remoting/protocol/channel_authenticator.h b/remoting/protocol/channel_authenticator.h index c9fcafe5..121ec16a 100644 --- a/remoting/protocol/channel_authenticator.h +++ b/remoting/protocol/channel_authenticator.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" namespace remoting::protocol {
diff --git a/remoting/protocol/channel_dispatcher_base.cc b/remoting/protocol/channel_dispatcher_base.cc index 6f4f7585..4b6ebc329 100644 --- a/remoting/protocol/channel_dispatcher_base.cc +++ b/remoting/protocol/channel_dispatcher_base.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "remoting/base/compound_buffer.h" #include "remoting/protocol/message_channel_factory.h" #include "remoting/protocol/message_pipe.h" @@ -17,8 +17,9 @@ : channel_name_(channel_name) {} ChannelDispatcherBase::~ChannelDispatcherBase() { - if (channel_factory_) + if (channel_factory_) { channel_factory_->CancelChannelCreation(channel_name_); + } } void ChannelDispatcherBase::Init(MessageChannelFactory* channel_factory,
diff --git a/remoting/protocol/channel_dispatcher_base.h b/remoting/protocol/channel_dispatcher_base.h index 95dd6de1..1b21fd32f 100644 --- a/remoting/protocol/channel_dispatcher_base.h +++ b/remoting/protocol/channel_dispatcher_base.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "remoting/protocol/errors.h" #include "remoting/protocol/message_pipe.h"
diff --git a/remoting/protocol/channel_multiplexer.cc b/remoting/protocol/channel_multiplexer.cc index 8dedc5a..a678e9bf 100644 --- a/remoting/protocol/channel_multiplexer.cc +++ b/remoting/protocol/channel_multiplexer.cc
@@ -9,9 +9,9 @@ #include <utility> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/memory/raw_ptr.h" #include "base/sequence_checker.h" @@ -63,7 +63,8 @@ class ChannelMultiplexer::MuxChannel { public: - MuxChannel(ChannelMultiplexer* multiplexer, const std::string& name, + MuxChannel(ChannelMultiplexer* multiplexer, + const std::string& name, int send_id); MuxChannel(const MuxChannel&) = delete; @@ -175,8 +176,9 @@ } void ChannelMultiplexer::MuxChannel::OnBaseChannelError(int error) { - if (socket_) + if (socket_) { socket_->OnBaseChannelError(error); + } } void ChannelMultiplexer::MuxChannel::OnSocketDestroyed() { @@ -203,13 +205,14 @@ int pos = 0; while (buffer_len > 0 && !pending_packets_.empty()) { DCHECK(!pending_packets_.front()->is_empty()); - int result = pending_packets_.front()->Read( - buffer->data() + pos, buffer_len); + int result = + pending_packets_.front()->Read(buffer->data() + pos, buffer_len); DCHECK_LE(result, buffer_len); pos += result; buffer_len -= pos; - if (pending_packets_.front()->is_empty()) + if (pending_packets_.front()->is_empty()) { pending_packets_.pop_front(); + } } return pos; } @@ -231,8 +234,9 @@ DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); DCHECK(read_callback_.is_null()); - if (base_channel_error_ != net::OK) + if (base_channel_error_ != net::OK) { return base_channel_error_; + } int result = channel_->DoRead(buffer, buffer_len); if (result == 0) { @@ -252,8 +256,9 @@ DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); DCHECK(write_callback_.is_null()); - if (base_channel_error_ != net::OK) + if (base_channel_error_ != net::OK) { return base_channel_error_; + } std::unique_ptr<MultiplexPacket> packet(new MultiplexPacket()); size_t size = std::min(kMaxPacketSize, buffer_len); @@ -279,8 +284,9 @@ void ChannelMultiplexer::MuxSocket::OnWriteComplete() { write_pending_ = false; - if (!write_callback_.is_null()) + if (!write_callback_.is_null()) { std::move(write_callback_).Run(write_result_); + } } void ChannelMultiplexer::MuxSocket::OnBaseChannelError(int error) { @@ -298,8 +304,9 @@ return; } - if (!write_callback_.is_null()) + if (!write_callback_.is_null()) { std::move(write_callback_).Run(error); + } } void ChannelMultiplexer::MuxSocket::OnPacketReceived() { @@ -322,8 +329,9 @@ DCHECK(pending_channels_.empty()); // Cancel creation of the base channel if it hasn't finished. - if (base_channel_factory_) + if (base_channel_factory_) { base_channel_factory_->CancelChannelCreation(base_channel_name_); + } } void ChannelMultiplexer::CreateChannel(const std::string& name, @@ -382,8 +390,9 @@ } void ChannelMultiplexer::DoCreatePendingChannels() { - if (pending_channels_.empty()) + if (pending_channels_.empty()) { return; + } // Every time this function is called it connects a single channel and posts a // separate task to connect other channels. This is necessary because the @@ -396,8 +405,9 @@ PendingChannel c = std::move(pending_channels_.front()); pending_channels_.erase(pending_channels_.begin()); std::unique_ptr<P2PStreamSocket> socket; - if (base_channel_.get()) + if (base_channel_.get()) { socket = GetOrCreateChannel(c.name)->CreateSocket(); + } std::move(c.callback).Run(std::move(socket)); } @@ -413,7 +423,6 @@ return channel.get(); } - void ChannelMultiplexer::OnBaseChannelError(int error) { for (auto it = channels_.begin(); it != channels_.end(); ++it) { base::SingleThreadTaskRunner::GetCurrentDefault()->PostTask( @@ -426,16 +435,18 @@ void ChannelMultiplexer::NotifyBaseChannelError(const std::string& name, int error) { auto it = channels_.find(name); - if (it != channels_.end()) + if (it != channels_.end()) { it->second->OnBaseChannelError(error); + } } void ChannelMultiplexer::OnIncomingPacket( std::unique_ptr<CompoundBuffer> buffer) { std::unique_ptr<MultiplexPacket> packet = ParseMessage<MultiplexPacket>(buffer.get()); - if (!packet) + if (!packet) { return; + } DCHECK(packet->has_channel_id()); if (!packet->has_channel_id()) { @@ -452,7 +463,7 @@ // This is a new |channel_id| we haven't seen before. Look it up by name. if (!packet->has_channel_name()) { LOG(ERROR) << "Received packet with unknown channel_id and " - "without channel_name."; + "without channel_name."; return; } channel = GetOrCreateChannel(packet->channel_name());
diff --git a/remoting/protocol/channel_multiplexer_unittest.cc b/remoting/protocol/channel_multiplexer_unittest.cc index 3a1a7c4..d087e791 100644 --- a/remoting/protocol/channel_multiplexer_unittest.cc +++ b/remoting/protocol/channel_multiplexer_unittest.cc
@@ -8,7 +8,7 @@ #include <utility> #include "base/barrier_closure.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/run_loop.h" #include "base/task/single_thread_task_runner.h" @@ -40,7 +40,6 @@ const char kTestChannelName[] = "test"; const char kTestChannelName2[] = "test2"; - void QuitCurrentThread() { base::SingleThreadTaskRunner::GetCurrentDefault()->PostTask( FROM_HERE, base::RunLoop::QuitCurrentWhenIdleClosureDeprecated()); @@ -109,14 +108,15 @@ *storage = std::move(socket); --(*counter); EXPECT_GE(*counter, 0); - if (*counter == 0) + if (*counter == 0) { QuitCurrentThread(); + } } scoped_refptr<net::IOBufferWithSize> CreateTestBuffer(int size) { scoped_refptr<net::IOBufferWithSize> result = base::MakeRefCounted<net::IOBufferWithSize>(size); - for (int i = 0; i< size; ++i) { + for (int i = 0; i < size; ++i) { result->data()[i] = rand() % 256; } return result; @@ -139,7 +139,6 @@ std::unique_ptr<P2PStreamSocket> client_socket2_; }; - TEST_F(ChannelMultiplexerTest, OneChannel) { std::unique_ptr<P2PStreamSocket> host_socket; std::unique_ptr<P2PStreamSocket> client_socket; @@ -166,7 +165,7 @@ CreateChannel(kTestChannelName2, &host_socket2_, &client_socket2_)); StreamConnectionTester tester1(host_socket1_.get(), client_socket1_.get(), - kMessageSize, kMessages); + kMessageSize, kMessages); StreamConnectionTester tester2(host_socket2_.get(), client_socket2_.get(), kMessageSize, kMessages); base::RunLoop run_loop; @@ -197,11 +196,10 @@ std::unique_ptr<P2PStreamSocket> host_socket4; std::unique_ptr<P2PStreamSocket> client_socket4; - ASSERT_NO_FATAL_FAILURE( - CreateChannel("ch4", &host_socket4, &client_socket4)); + ASSERT_NO_FATAL_FAILURE(CreateChannel("ch4", &host_socket4, &client_socket4)); StreamConnectionTester tester1(host_socket1_.get(), client_socket1_.get(), - kMessageSize, kMessages); + kMessageSize, kMessages); StreamConnectionTester tester2(host_socket2_.get(), client_socket2_.get(), kMessageSize, kMessages); StreamConnectionTester tester3(client_socket3.get(), host_socket3.get(), @@ -333,8 +331,7 @@ .Times(AtMost(1)) .WillOnce(InvokeWithoutArgs( this, &ChannelMultiplexerTest::DeleteAfterSessionFail)); - EXPECT_CALL(cb2, OnConnectedPtr(_)) - .Times(0); + EXPECT_CALL(cb2, OnConnectedPtr(_)).Times(0); base::RunLoop().RunUntilIdle(); }
diff --git a/remoting/protocol/channel_socket_adapter.cc b/remoting/protocol/channel_socket_adapter.cc index cf1ee4295..921b002d 100644 --- a/remoting/protocol/channel_socket_adapter.cc +++ b/remoting/protocol/channel_socket_adapter.cc
@@ -6,7 +6,7 @@ #include <limits> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/logging.h" #include "net/base/io_buffer.h" #include "net/base/net_errors.h" @@ -28,8 +28,9 @@ TransportChannelSocketAdapter::~TransportChannelSocketAdapter() { DCHECK_CALLED_ON_VALID_THREAD(thread_checker_); - if (destruction_callback_) + if (destruction_callback_) { std::move(destruction_callback_).Run(); + } } void TransportChannelSocketAdapter::SetOnDestroyedCallback( @@ -82,8 +83,9 @@ // If the underlying socket returns IO pending where it shouldn't we // pretend the packet is dropped and return as succeeded because no // writeable callback will happen. - if (result == net::ERR_IO_PENDING) + if (result == net::ERR_IO_PENDING) { result = net::OK; + } } } else { // Channel is not writable yet. @@ -99,8 +101,9 @@ void TransportChannelSocketAdapter::Close(int error_code) { DCHECK_CALLED_ON_VALID_THREAD(thread_checker_); - if (!channel_) // Already closed. + if (!channel_) { // Already closed. return; + } DCHECK(error_code != net::OK); closed_error_code_ = error_code; @@ -159,11 +162,11 @@ // Try to send the packet if there is a pending write. if (!write_callback_.is_null()) { rtc::PacketOptions options; - int result = channel_->SendPacket(write_buffer_->data(), - write_buffer_size_, + int result = channel_->SendPacket(write_buffer_->data(), write_buffer_size_, options); - if (result < 0) + if (result < 0) { result = net::MapSystemError(channel_->GetError()); + } if (result != net::ERR_IO_PENDING) { net::CompletionRepeatingCallback callback = write_callback_;
diff --git a/remoting/protocol/channel_socket_adapter.h b/remoting/protocol/channel_socket_adapter.h index 617f125..d43d5914 100644 --- a/remoting/protocol/channel_socket_adapter.h +++ b/remoting/protocol/channel_socket_adapter.h
@@ -7,8 +7,8 @@ #include <stddef.h> -#include "base/callback_forward.h" #include "base/compiler_specific.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/threading/thread_checker.h" #include "net/base/net_errors.h"
diff --git a/remoting/protocol/channel_socket_adapter_unittest.cc b/remoting/protocol/channel_socket_adapter_unittest.cc index 5e46016..6be3ed69 100644 --- a/remoting/protocol/channel_socket_adapter_unittest.cc +++ b/remoting/protocol/channel_socket_adapter_unittest.cc
@@ -9,7 +9,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ref_counted.h" #include "base/test/task_environment.h" #include "net/base/io_buffer.h" @@ -46,9 +46,7 @@ target_ = std::make_unique<TransportChannelSocketAdapter>(&channel_); } - void Callback(int result) { - callback_result_ = result; - } + void Callback(int result) { callback_result_ = result; } cricket::MockIceTransport channel_; std::unique_ptr<TransportChannelSocketAdapter> target_; @@ -106,8 +104,7 @@ .Times(1) .WillOnce(Return(SOCKET_ERROR)); - EXPECT_CALL(channel_, GetError()) - .WillOnce(Return(EWOULDBLOCK)); + EXPECT_CALL(channel_, GetError()).WillOnce(Return(EWOULDBLOCK)); int result = target_->Send(buffer.get(), kTestDataSize, callback_); ASSERT_EQ(net::OK, result);
diff --git a/remoting/protocol/chromium_port_allocator_factory.h b/remoting/protocol/chromium_port_allocator_factory.h index b093573c..9faf1068 100644 --- a/remoting/protocol/chromium_port_allocator_factory.h +++ b/remoting/protocol/chromium_port_allocator_factory.h
@@ -23,7 +23,7 @@ ~ChromiumPortAllocatorFactory() override; - // PortAllocatorFactory interface. + // PortAllocatorFactory interface. std::unique_ptr<cricket::PortAllocator> CreatePortAllocator( scoped_refptr<TransportContext> transport_context, base::WeakPtr<SessionOptionsProvider> session_options_provider) override;
diff --git a/remoting/protocol/chromium_socket_factory.cc b/remoting/protocol/chromium_socket_factory.cc index 01c94de..bcdbe40 100644 --- a/remoting/protocol/chromium_socket_factory.cc +++ b/remoting/protocol/chromium_socket_factory.cc
@@ -10,7 +10,7 @@ #include <memory> #include <string> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/rand_util.h" #include "base/time/time.h" @@ -141,8 +141,7 @@ : state_(STATE_CLOSED), error_(0), send_pending_(false), - send_queue_size_(0) { -} + send_queue_size_(0) {} UdpPacketSocket::~UdpPacketSocket() { Close(); @@ -205,14 +204,16 @@ return rtc::SocketAddress(); } -int UdpPacketSocket::Send(const void* data, size_t data_size, +int UdpPacketSocket::Send(const void* data, + size_t data_size, const rtc::PacketOptions& options) { // UDP sockets are not connected - this method should never be called. NOTREACHED(); return EWOULDBLOCK; } -int UdpPacketSocket::SendTo(const void* data, size_t data_size, +int UdpPacketSocket::SendTo(const void* data, + size_t data_size, const rtc::SocketAddress& address, const rtc::PacketOptions& options) { if (state_ != STATE_BOUND) { @@ -309,8 +310,9 @@ } void UdpPacketSocket::DoSend() { - if (send_pending_ || send_queue_.empty()) + if (send_pending_ || send_queue_.empty()) { return; + } PendingPacket& packet = send_queue_.front(); cricket::ApplyPacketOptions( @@ -420,8 +422,9 @@ return nullptr; } std::unique_ptr<UdpPacketSocket> result(new UdpPacketSocket()); - if (!result->Init(local_address, min_port, max_port)) + if (!result->Init(local_address, min_port, max_port)) { return nullptr; + } return result.release(); }
diff --git a/remoting/protocol/chromium_socket_factory_unittest.cc b/remoting/protocol/chromium_socket_factory_unittest.cc index de1b444..10ac51b 100644 --- a/remoting/protocol/chromium_socket_factory_unittest.cc +++ b/remoting/protocol/chromium_socket_factory_unittest.cc
@@ -48,8 +48,8 @@ rtc::SocketAddress("127.0.0.1", 0), 0, 0)); ASSERT_TRUE(socket_.get() != nullptr); EXPECT_EQ(socket_->GetState(), rtc::AsyncPacketSocket::STATE_BOUND); - socket_->SignalReadPacket.connect( - this, &ChromiumSocketFactoryTest::OnPacket); + socket_->SignalReadPacket.connect(this, + &ChromiumSocketFactoryTest::OnPacket); } void OnPacket(rtc::AsyncPacketSocket* socket, @@ -110,8 +110,7 @@ socket_factory_->CreateUdpSocket(rtc::SocketAddress("127.0.0.1", 0), 0, 0)); ASSERT_TRUE(sending_socket.get() != nullptr); - EXPECT_EQ(sending_socket->GetState(), - rtc::AsyncPacketSocket::STATE_BOUND); + EXPECT_EQ(sending_socket->GetState(), rtc::AsyncPacketSocket::STATE_BOUND); VerifyCanSendAndReceive(sending_socket.get()); } @@ -170,8 +169,7 @@ // IPv4 address. This send is expected to fail, but the socket should still be // functional. sending_socket->SendTo(test_packet.data(), test_packet.size(), - rtc::SocketAddress("::1", 0), - rtc::PacketOptions()); + rtc::SocketAddress("::1", 0), rtc::PacketOptions()); // Verify that socket is still usable. VerifyCanSendAndReceive(sending_socket.get());
diff --git a/remoting/protocol/client_authentication_config.h b/remoting/protocol/client_authentication_config.h index 3f316bc..190e90aa 100644 --- a/remoting/protocol/client_authentication_config.h +++ b/remoting/protocol/client_authentication_config.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "remoting/protocol/token_validator.h" namespace remoting::protocol {
diff --git a/remoting/protocol/client_control_dispatcher.cc b/remoting/protocol/client_control_dispatcher.cc index 223213c..d2387bf 100644 --- a/remoting/protocol/client_control_dispatcher.cc +++ b/remoting/protocol/client_control_dispatcher.cc
@@ -6,8 +6,8 @@ #include <stdint.h> -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "net/socket/stream_socket.h" #include "remoting/base/compound_buffer.h" #include "remoting/base/constants.h" @@ -25,10 +25,8 @@ const int kBytesPerPixel = 4; bool CursorShapeIsValid(const CursorShapeInfo& cursor_shape) { - if (!cursor_shape.has_data() || - !cursor_shape.has_width() || - !cursor_shape.has_height() || - !cursor_shape.has_hotspot_x() || + if (!cursor_shape.has_data() || !cursor_shape.has_width() || + !cursor_shape.has_height() || !cursor_shape.has_hotspot_x() || !cursor_shape.has_hotspot_y()) { LOG(ERROR) << "Cursor shape is missing required fields."; return false; @@ -39,17 +37,17 @@ // Verify that |width| and |height| are within sane limits. Otherwise integer // overflow can occur while calculating |cursor_total_bytes| below. - if (width < 0 || width > (SHRT_MAX / 2) || - height < 0 || height > (SHRT_MAX / 2)) { - LOG(ERROR) << "Cursor dimensions are out of bounds for SetCursor: " - << width << "x" << height; + if (width < 0 || width > (SHRT_MAX / 2) || height < 0 || + height > (SHRT_MAX / 2)) { + LOG(ERROR) << "Cursor dimensions are out of bounds for SetCursor: " << width + << "x" << height; return false; } uint32_t cursor_total_bytes = width * height * kBytesPerPixel; if (cursor_shape.data().size() < cursor_total_bytes) { - LOG(ERROR) << "Expected " << cursor_total_bytes << " bytes for a " - << width << "x" << height << " cursor. Only received " + LOG(ERROR) << "Expected " << cursor_total_bytes << " bytes for a " << width + << "x" << height << " cursor. Only received " << cursor_shape.data().size() << " bytes"; return false; } @@ -137,16 +135,18 @@ std::unique_ptr<ControlMessage> message = ParseMessage<ControlMessage>(buffer.get()); - if (!message) + if (!message) { return; + } if (message->has_clipboard_event()) { clipboard_stub_->InjectClipboardEvent(message->clipboard_event()); } else if (message->has_capabilities()) { client_stub_->SetCapabilities(message->capabilities()); } else if (message->has_cursor_shape()) { - if (CursorShapeIsValid(message->cursor_shape())) + if (CursorShapeIsValid(message->cursor_shape())) { client_stub_->SetCursorShape(message->cursor_shape()); + } } else if (message->has_pairing_response()) { client_stub_->SetPairingResponse(message->pairing_response()); } else if (message->has_extension_message()) {
diff --git a/remoting/protocol/client_video_dispatcher.cc b/remoting/protocol/client_video_dispatcher.cc index 750d4c0..d81c9e9 100644 --- a/remoting/protocol/client_video_dispatcher.cc +++ b/remoting/protocol/client_video_dispatcher.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "net/socket/stream_socket.h" #include "remoting/base/compound_buffer.h" #include "remoting/base/constants.h" @@ -21,9 +21,7 @@ namespace remoting::protocol { struct ClientVideoDispatcher::PendingFrame { - PendingFrame(int frame_id) - : frame_id(frame_id), - done(false) {} + PendingFrame(int frame_id) : frame_id(frame_id), done(false) {} int frame_id; bool done; }; @@ -40,8 +38,9 @@ std::unique_ptr<CompoundBuffer> message) { std::unique_ptr<VideoPacket> video_packet = ParseMessage<VideoPacket>(message.get()); - if (!video_packet) + if (!video_packet) { return; + } int frame_id = video_packet->frame_id();
diff --git a/remoting/protocol/client_video_dispatcher_unittest.cc b/remoting/protocol/client_video_dispatcher_unittest.cc index 9d145951..9230122 100644 --- a/remoting/protocol/client_video_dispatcher_unittest.cc +++ b/remoting/protocol/client_video_dispatcher_unittest.cc
@@ -8,7 +8,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/test/task_environment.h" #include "net/traffic_annotation/network_traffic_annotation_test_helper.h"
diff --git a/remoting/protocol/client_video_stats_dispatcher.cc b/remoting/protocol/client_video_stats_dispatcher.cc index 3ed53a7a..6bc9d39 100644 --- a/remoting/protocol/client_video_stats_dispatcher.cc +++ b/remoting/protocol/client_video_stats_dispatcher.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "net/socket/stream_socket.h" #include "remoting/base/compound_buffer.h" #include "remoting/proto/video_stats.pb.h" @@ -30,8 +30,9 @@ std::unique_ptr<CompoundBuffer> message) { std::unique_ptr<FrameStatsMessage> stats_proto = ParseMessage<FrameStatsMessage>(message.get()); - if (!stats_proto) + if (!stats_proto) { return; + } if (!stats_proto->has_frame_id()) { LOG(ERROR) << "Received invalid FrameStatsMessage.";
diff --git a/remoting/protocol/clipboard_echo_filter.cc b/remoting/protocol/clipboard_echo_filter.cc index 1b7094f..74f90da 100644 --- a/remoting/protocol/clipboard_echo_filter.cc +++ b/remoting/protocol/clipboard_echo_filter.cc
@@ -9,11 +9,10 @@ namespace remoting::protocol { ClipboardEchoFilter::ClipboardEchoFilter() - : host_stub_(nullptr), - client_stub_(nullptr), - client_filter_(this), - host_filter_(this) { -} + : host_stub_(nullptr), + client_stub_(nullptr), + client_filter_(this), + host_filter_(this) {} ClipboardEchoFilter::~ClipboardEchoFilter() = default; @@ -54,18 +53,16 @@ } } -ClipboardEchoFilter::ClientFilter::ClientFilter( - ClipboardEchoFilter* filter) : filter_(filter) { -} +ClipboardEchoFilter::ClientFilter::ClientFilter(ClipboardEchoFilter* filter) + : filter_(filter) {} void ClipboardEchoFilter::ClientFilter::InjectClipboardEvent( const ClipboardEvent& event) { filter_->InjectClipboardEventToClient(event); } -ClipboardEchoFilter::HostFilter::HostFilter( - ClipboardEchoFilter* filter) : filter_(filter) { -} +ClipboardEchoFilter::HostFilter::HostFilter(ClipboardEchoFilter* filter) + : filter_(filter) {} void ClipboardEchoFilter::HostFilter::InjectClipboardEvent( const ClipboardEvent& event) {
diff --git a/remoting/protocol/clipboard_echo_filter_unittest.cc b/remoting/protocol/clipboard_echo_filter_unittest.cc index 2a9db553..8e6320fb 100644 --- a/remoting/protocol/clipboard_echo_filter_unittest.cc +++ b/remoting/protocol/clipboard_echo_filter_unittest.cc
@@ -49,20 +49,14 @@ filter.set_client_stub(&client_stub); filter.set_host_stub(&host_stub); - filter.host_filter()->InjectClipboardEvent( - MakeClipboardEvent("text", "a")); + filter.host_filter()->InjectClipboardEvent(MakeClipboardEvent("text", "a")); // The client has sent ("text", "a") to the host, so make sure the filter // will stop the host echoing that item back to the client. - filter.client_filter()->InjectClipboardEvent( - MakeClipboardEvent("text", "a")); - filter.host_filter()->InjectClipboardEvent( - MakeClipboardEvent("text", "b")); - filter.client_filter()->InjectClipboardEvent( - MakeClipboardEvent("text", "a")); - filter.host_filter()->InjectClipboardEvent( - MakeClipboardEvent("image", "a")); - filter.client_filter()->InjectClipboardEvent( - MakeClipboardEvent("text", "a")); + filter.client_filter()->InjectClipboardEvent(MakeClipboardEvent("text", "a")); + filter.host_filter()->InjectClipboardEvent(MakeClipboardEvent("text", "b")); + filter.client_filter()->InjectClipboardEvent(MakeClipboardEvent("text", "a")); + filter.host_filter()->InjectClipboardEvent(MakeClipboardEvent("image", "a")); + filter.client_filter()->InjectClipboardEvent(MakeClipboardEvent("text", "a")); } // Check that the filter will drop events sent to the host, if there is no host
diff --git a/remoting/protocol/clipboard_filter_unittest.cc b/remoting/protocol/clipboard_filter_unittest.cc index 68466f1..b0f80900 100644 --- a/remoting/protocol/clipboard_filter_unittest.cc +++ b/remoting/protocol/clipboard_filter_unittest.cc
@@ -30,9 +30,9 @@ ClipboardFilter clipboard_filter(&clipboard_stub); EXPECT_CALL(clipboard_stub, - InjectClipboardEvent(EqualsClipboardEvent("text", "foo"))); + InjectClipboardEvent(EqualsClipboardEvent("text", "foo"))); - clipboard_filter.InjectClipboardEvent(MakeClipboardEvent("text","foo")); + clipboard_filter.InjectClipboardEvent(MakeClipboardEvent("text", "foo")); } // Verify that the filter truncates payload if larger than |max_size|. @@ -91,14 +91,14 @@ EXPECT_CALL(clipboard_stub, InjectClipboardEvent(_)).Times(0); - clipboard_filter.InjectClipboardEvent(MakeClipboardEvent("text","foo")); + clipboard_filter.InjectClipboardEvent(MakeClipboardEvent("text", "foo")); } // Verify that the filter ignores events if not configured. TEST(ClipboardFilterTest, IgnoreEventsIfNotConfigured) { ClipboardFilter clipboard_filter; - clipboard_filter.InjectClipboardEvent(MakeClipboardEvent("text","foo")); + clipboard_filter.InjectClipboardEvent(MakeClipboardEvent("text", "foo")); } } // namespace remoting::protocol
diff --git a/remoting/protocol/clipboard_thread_proxy.cc b/remoting/protocol/clipboard_thread_proxy.cc index 8288c2bd8..0845a43 100644 --- a/remoting/protocol/clipboard_thread_proxy.cc +++ b/remoting/protocol/clipboard_thread_proxy.cc
@@ -4,7 +4,7 @@ #include "remoting/protocol/clipboard_thread_proxy.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "remoting/proto/event.pb.h" namespace remoting::protocol { @@ -15,8 +15,7 @@ const base::WeakPtr<ClipboardStub>& clipboard_stub, scoped_refptr<base::TaskRunner> clipboard_stub_task_runner) : clipboard_stub_(clipboard_stub), - clipboard_stub_task_runner_(clipboard_stub_task_runner) { -} + clipboard_stub_task_runner_(clipboard_stub_task_runner) {} void ClipboardThreadProxy::InjectClipboardEvent(const ClipboardEvent& event) { clipboard_stub_task_runner_->PostTask(
diff --git a/remoting/protocol/connection_tester.cc b/remoting/protocol/connection_tester.cc index caacdc7e..222b6ab 100644 --- a/remoting/protocol/connection_tester.cc +++ b/remoting/protocol/connection_tester.cc
@@ -5,7 +5,7 @@ #include "remoting/protocol/connection_tester.h" #include "base/memory/raw_ptr.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "net/base/io_buffer.h" #include "net/base/net_errors.h" #include "net/traffic_annotation/network_traffic_annotation_test_helper.h" @@ -47,8 +47,8 @@ output_buffer_->SetOffset(0); ASSERT_EQ(test_data_size_, output_buffer_->size()); - EXPECT_EQ(0, memcmp(output_buffer_->data(), - input_buffer_->StartOfBuffer(), test_data_size_)); + EXPECT_EQ(0, memcmp(output_buffer_->data(), input_buffer_->StartOfBuffer(), + test_data_size_)); } void StreamConnectionTester::Done() { @@ -68,11 +68,12 @@ void StreamConnectionTester::DoWrite() { int result = 1; while (result > 0) { - if (output_buffer_->BytesRemaining() == 0) + if (output_buffer_->BytesRemaining() == 0) { break; + } - int bytes_to_write = std::min(output_buffer_->BytesRemaining(), - message_size_); + int bytes_to_write = + std::min(output_buffer_->BytesRemaining(), message_size_); result = client_socket_->Write(output_buffer_.get(), bytes_to_write, base::BindOnce(&StreamConnectionTester::OnWritten, @@ -110,8 +111,9 @@ void StreamConnectionTester::OnRead(int result) { HandleReadResult(result); - if (!on_done_.is_null()) + if (!on_done_.is_null()) { DoRead(); // Don't try to read again when we are done reading. + } } void StreamConnectionTester::HandleReadResult(int result) { @@ -122,8 +124,9 @@ } else if (result > 0) { // Allocate memory for the next read. input_buffer_->set_offset(input_buffer_->offset() + result); - if (input_buffer_->offset() == test_data_size_) + if (input_buffer_->offset() == test_data_size_) { Done(); + } } }
diff --git a/remoting/protocol/connection_tester.h b/remoting/protocol/connection_tester.h index 14c962ed..bb1e49a 100644 --- a/remoting/protocol/connection_tester.h +++ b/remoting/protocol/connection_tester.h
@@ -8,7 +8,7 @@ #include <memory> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h" #include "base/run_loop.h"
diff --git a/remoting/protocol/connection_unittest.cc b/remoting/protocol/connection_unittest.cc index bac040b..51ba44d 100644 --- a/remoting/protocol/connection_unittest.cc +++ b/remoting/protocol/connection_unittest.cc
@@ -5,7 +5,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h" #include "base/numerics/math_constants.h" @@ -77,9 +77,7 @@ ~TestScreenCapturer() override = default; // webrtc::DesktopCapturer interface. - void Start(Callback* callback) override { - callback_ = callback; - } + void Start(Callback* callback) override { callback_ = callback; } void CaptureFrame() override { if (capture_request_index_to_fail_ >= 0) { @@ -104,13 +102,9 @@ std::move(frame)); } - bool GetSourceList(SourceList* sources) override { - return true; - } + bool GetSourceList(SourceList* sources) override { return true; } - bool SelectSource(SourceId id) override { - return true; - } + bool SelectSource(SourceId id) override { return true; } void FailNthFrame(int n) { capture_request_index_to_fail_ = n; } @@ -198,11 +192,13 @@ data_.insert(data_.end(), packet->data(0).begin(), packet->data(0).end()); - if (run_loop_ && data_.size() >= samples_expected_ * 4) + if (run_loop_ && data_.size() >= samples_expected_ * 4) { run_loop_->Quit(); + } - if (!done.is_null()) + if (!done.is_null()) { std::move(done).Run(); + } } void WaitForSamples(size_t samples_expected) { @@ -342,8 +338,8 @@ OnConnectionState(ConnectionToHost::AUTHENTICATED, OK)); EXPECT_CALL(client_event_handler_, OnConnectionState(ConnectionToHost::CONNECTED, OK)) - .WillOnce(InvokeWithoutArgs( - this, &ConnectionTest::OnClientConnected)); + .WillOnce( + InvokeWithoutArgs(this, &ConnectionTest::OnClientConnected)); } EXPECT_CALL(client_event_handler_, OnRouteChanged(_, _)) .Times(testing::AnyNumber()); @@ -369,14 +365,16 @@ void OnHostConnected() { host_connected_ = true; - if (client_connected_ && run_loop_) + if (client_connected_ && run_loop_) { run_loop_->Quit(); + } } void OnClientConnected() { client_connected_ = true; - if (host_connected_ && run_loop_) + if (host_connected_ && run_loop_) { run_loop_->Quit(); + } } void WaitNextVideoFrame() { @@ -617,8 +615,9 @@ // Currently this test only works for WebRTC because ICE connections stats are // reported by SoftwareVideoRenderer which is not used in this test. // TODO(sergeyu): Fix this. - if (!is_using_webrtc()) + if (!is_using_webrtc()) { return; + } Connect();
diff --git a/remoting/protocol/content_description.cc b/remoting/protocol/content_description.cc index 20dec828..16b5bef 100644 --- a/remoting/protocol/content_description.cc +++ b/remoting/protocol/content_description.cc
@@ -62,8 +62,7 @@ // <video transport="stream" version="1" codec="vp8" /> XmlElement* FormatChannelConfig(const ChannelConfig& config, const std::string& tag_name) { - XmlElement* result = new XmlElement( - QName(kChromotingXmlNamespace, tag_name)); + XmlElement* result = new XmlElement(QName(kChromotingXmlNamespace, tag_name)); result->AddAttr(QName(kDefaultNs, kTransportAttr), ValueToName(kTransports, config.transport)); @@ -82,11 +81,12 @@ } // Returns false if the element is invalid. -bool ParseChannelConfig(const XmlElement* element, bool codec_required, +bool ParseChannelConfig(const XmlElement* element, + bool codec_required, ChannelConfig* config) { - if (!NameToValue( - kTransports, element->Attr(QName(kDefaultNs, kTransportAttr)), - &config->transport)) { + if (!NameToValue(kTransports, + element->Attr(QName(kDefaultNs, kTransportAttr)), + &config->transport)) { return false; } @@ -138,12 +138,12 @@ // </description> // XmlElement* ContentDescription::ToXml() const { - XmlElement* root = new XmlElement( - QName(kChromotingXmlNamespace, kDescriptionTag), true); + XmlElement* root = + new XmlElement(QName(kChromotingXmlNamespace, kDescriptionTag), true); if (config()->ice_supported()) { - root->AddElement( - new jingle_xmpp::XmlElement(QName(kChromotingXmlNamespace, kStandardIceTag))); + root->AddElement(new jingle_xmpp::XmlElement( + QName(kChromotingXmlNamespace, kStandardIceTag))); for (const auto& channel_config : config()->control_configs()) { root->AddElement(FormatChannelConfig(channel_config, kControlTag)); @@ -189,8 +189,8 @@ child = child->NextNamed(tag); } if (optional && configs->empty()) { - // If there's no mention of the tag, implicitly assume disabled channel. - configs->push_back(ChannelConfig::None()); + // If there's no mention of the tag, implicitly assume disabled channel. + configs->push_back(ChannelConfig::None()); } return true; } @@ -225,8 +225,9 @@ std::unique_ptr<XmlElement> authenticator_message; const XmlElement* child = Authenticator::FindAuthenticatorMessage(element); - if (child) + if (child) { authenticator_message = std::make_unique<XmlElement>(*child); + } return base::WrapUnique(new ContentDescription( std::move(config), std::move(authenticator_message)));
diff --git a/remoting/protocol/content_description.h b/remoting/protocol/content_description.h index 2c8b2c1..a633df8 100644 --- a/remoting/protocol/content_description.h +++ b/remoting/protocol/content_description.h
@@ -25,8 +25,9 @@ public: static const char kChromotingContentName[]; - ContentDescription(std::unique_ptr<CandidateSessionConfig> config, - std::unique_ptr<jingle_xmpp::XmlElement> authenticator_message); + ContentDescription( + std::unique_ptr<CandidateSessionConfig> config, + std::unique_ptr<jingle_xmpp::XmlElement> authenticator_message); ~ContentDescription(); const CandidateSessionConfig* config() const {
diff --git a/remoting/protocol/data_channel_manager.h b/remoting/protocol/data_channel_manager.h index 9f92b23d..5ed6248 100644 --- a/remoting/protocol/data_channel_manager.h +++ b/remoting/protocol/data_channel_manager.h
@@ -9,7 +9,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" namespace remoting::protocol {
diff --git a/remoting/protocol/data_channel_manager_unittest.cc b/remoting/protocol/data_channel_manager_unittest.cc index a208649..a6e0c5d 100644 --- a/remoting/protocol/data_channel_manager_unittest.cc +++ b/remoting/protocol/data_channel_manager_unittest.cc
@@ -7,7 +7,7 @@ #include <map> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/test/task_environment.h" #include "remoting/base/compound_buffer.h" @@ -24,8 +24,8 @@ class FakeNamedMessagePipeHandler final : public NamedMessagePipeHandler { public: FakeNamedMessagePipeHandler(const std::string& name, - std::unique_ptr<MessagePipe> pipe, - const std::string& expected_data) + std::unique_ptr<MessagePipe> pipe, + const std::string& expected_data) : NamedMessagePipeHandler(name, std::move(pipe)), expected_data_(expected_data) { handlers_[name] = this; @@ -95,7 +95,7 @@ // static std::map<std::string, FakeNamedMessagePipeHandler*> -FakeNamedMessagePipeHandler::handlers_; + FakeNamedMessagePipeHandler::handlers_; void TestDataChannelManagerFullMatch(bool asynchronous) { base::test::SingleThreadTaskEnvironment task_environment;
diff --git a/remoting/protocol/datagram_channel_factory.h b/remoting/protocol/datagram_channel_factory.h index 4c5bb17b..cc2f3ac 100644 --- a/remoting/protocol/datagram_channel_factory.h +++ b/remoting/protocol/datagram_channel_factory.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" namespace remoting::protocol {
diff --git a/remoting/protocol/desktop_capturer.h b/remoting/protocol/desktop_capturer.h index c55a6967..328d25b 100644 --- a/remoting/protocol/desktop_capturer.h +++ b/remoting/protocol/desktop_capturer.h
@@ -5,7 +5,7 @@ #ifndef REMOTING_PROTOCOL_DESKTOP_CAPTURER_H_ #define REMOTING_PROTOCOL_DESKTOP_CAPTURER_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "third_party/webrtc/modules/desktop_capture/desktop_capture_metadata.h" #include "third_party/webrtc/modules/desktop_capture/desktop_capturer.h" #include "third_party/webrtc/modules/desktop_capture/mouse_cursor.h"
diff --git a/remoting/protocol/fake_audio_source.h b/remoting/protocol/fake_audio_source.h index ed5c5424..32f04591 100644 --- a/remoting/protocol/fake_audio_source.h +++ b/remoting/protocol/fake_audio_source.h
@@ -5,7 +5,7 @@ #ifndef REMOTING_PROTOCOL_FAKE_AUDIO_SOURCE_H_ #define REMOTING_PROTOCOL_FAKE_AUDIO_SOURCE_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "remoting/protocol/audio_source.h" namespace remoting::protocol {
diff --git a/remoting/protocol/fake_authenticator.cc b/remoting/protocol/fake_authenticator.cc index abcc09c..bdae83e 100644 --- a/remoting/protocol/fake_authenticator.cc +++ b/remoting/protocol/fake_authenticator.cc
@@ -8,7 +8,7 @@ #include <utility> #include "base/base64.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/rand_util.h" #include "base/strings/string_number_conversions.h" #include "net/base/io_buffer.h" @@ -60,8 +60,9 @@ socket_->Read(read_buf.get(), 1, base::BindOnce(&FakeChannelAuthenticator::OnAuthBytesRead, weak_factory_.GetWeakPtr())); - if (result != net::ERR_IO_PENDING) + if (result != net::ERR_IO_PENDING) { OnAuthBytesRead(result); + } } else { CallDoneCallback(); } @@ -71,21 +72,24 @@ EXPECT_EQ(1, result); EXPECT_FALSE(did_write_bytes_); did_write_bytes_ = true; - if (did_read_bytes_) + if (did_read_bytes_) { CallDoneCallback(); + } } void FakeChannelAuthenticator::OnAuthBytesRead(int result) { EXPECT_EQ(1, result); EXPECT_FALSE(did_read_bytes_); did_read_bytes_ = true; - if (did_write_bytes_) + if (did_write_bytes_) { CallDoneCallback(); + } } void FakeChannelAuthenticator::CallDoneCallback() { - if (result_ != net::OK) + if (result_ != net::OK) { socket_.reset(); + } std::move(done_callback_).Run(result_, std::move(socket_)); } @@ -122,8 +126,9 @@ Authenticator::State FakeAuthenticator::state() const { EXPECT_LE(messages_, config_.round_trips * 2); - if (messages_ == pause_message_index_ && !resume_closure_.is_null()) + if (messages_ == pause_message_index_ && !resume_closure_.is_null()) { return PROCESSING_MESSAGE; + } if (messages_ >= config_.round_trips * 2) { if (config_.action == REJECT) { @@ -203,7 +208,7 @@ // Add authentication key in the last message sent from host to client. if (type_ == HOST && messages_ == config_.round_trips * 2 - 1) { - auth_key_ = base::RandBytesAsString(16); + auth_key_ = base::RandBytesAsString(16); jingle_xmpp::XmlElement* key = new jingle_xmpp::XmlElement( jingle_xmpp::QName(kChromotingXmlNamespace, "key")); std::string key_base64;
diff --git a/remoting/protocol/fake_authenticator.h b/remoting/protocol/fake_authenticator.h index d4277a8..66ef3ec4 100644 --- a/remoting/protocol/fake_authenticator.h +++ b/remoting/protocol/fake_authenticator.h
@@ -5,7 +5,7 @@ #ifndef REMOTING_PROTOCOL_FAKE_AUTHENTICATOR_H_ #define REMOTING_PROTOCOL_FAKE_AUTHENTICATOR_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "remoting/protocol/authenticator.h" #include "remoting/protocol/channel_authenticator.h" @@ -50,11 +50,7 @@ CLIENT, }; - enum Action { - ACCEPT, - REJECT, - REJECT_CHANNEL - }; + enum Action { ACCEPT, REJECT, REJECT_CHANNEL }; struct Config { Config();
diff --git a/remoting/protocol/fake_connection_to_client.cc b/remoting/protocol/fake_connection_to_client.cc index 4336c51..31c6da9e 100644 --- a/remoting/protocol/fake_connection_to_client.cc +++ b/remoting/protocol/fake_connection_to_client.cc
@@ -91,8 +91,9 @@ is_connected_ = false; disconnect_error_ = disconnect_error; - if (event_handler_) + if (event_handler_) { event_handler_->OnConnectionClosed(disconnect_error_); + } } Session* FakeConnectionToClient::session() {
diff --git a/remoting/protocol/fake_connection_to_client.h b/remoting/protocol/fake_connection_to_client.h index 6056d6b..f903b91 100644 --- a/remoting/protocol/fake_connection_to_client.h +++ b/remoting/protocol/fake_connection_to_client.h
@@ -7,7 +7,7 @@ #include <stdint.h> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h"
diff --git a/remoting/protocol/fake_datagram_socket.cc b/remoting/protocol/fake_datagram_socket.cc index c830c663..50da799 100644 --- a/remoting/protocol/fake_datagram_socket.cc +++ b/remoting/protocol/fake_datagram_socket.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/task/single_thread_task_runner.h" #include "net/base/address_list.h" @@ -116,8 +116,8 @@ int FakeDatagramSocket::CopyReadData(const scoped_refptr<net::IOBuffer>& buf, int buf_len) { - int size = std::min( - buf_len, static_cast<int>(input_packets_[input_pos_].size())); + int size = + std::min(buf_len, static_cast<int>(input_packets_[input_pos_].size())); memcpy(buf->data(), &(*input_packets_[input_pos_].begin()), size); ++input_pos_; return size; @@ -155,12 +155,14 @@ if (peer_factory_) { FakeDatagramSocket* peer_socket = peer_factory_->GetFakeChannel(name); - if (peer_socket) + if (peer_socket) { channel->PairWith(peer_socket); + } } - if (fail_create_) + if (fail_create_) { channel.reset(); + } if (asynchronous_create_) { task_runner_->PostTask( @@ -177,8 +179,9 @@ std::unique_ptr<FakeDatagramSocket> owned_socket, const std::string& name, ChannelCreatedCallback callback) { - if (channels_.find(name) != channels_.end()) + if (channels_.find(name) != channels_.end()) { std::move(callback).Run(std::move(owned_socket)); + } } void FakeDatagramChannelFactory::CancelChannelCreation(
diff --git a/remoting/protocol/fake_datagram_socket.h b/remoting/protocol/fake_datagram_socket.h index ef954298..a5c78d8 100644 --- a/remoting/protocol/fake_datagram_socket.h +++ b/remoting/protocol/fake_datagram_socket.h
@@ -129,7 +129,7 @@ void CancelChannelCreation(const std::string& name) override; private: - typedef std::map<std::string, base::WeakPtr<FakeDatagramSocket> > ChannelsMap; + typedef std::map<std::string, base::WeakPtr<FakeDatagramSocket>> ChannelsMap; void NotifyChannelCreated(std::unique_ptr<FakeDatagramSocket> owned_socket, const std::string& name,
diff --git a/remoting/protocol/fake_desktop_capturer.cc b/remoting/protocol/fake_desktop_capturer.cc index fb230631..60c96268 100644 --- a/remoting/protocol/fake_desktop_capturer.cc +++ b/remoting/protocol/fake_desktop_capturer.cc
@@ -8,8 +8,8 @@ #include <memory> -#include "base/bind.h" #include "base/check.h" +#include "base/functional/bind.h" #include "base/notreached.h" #include "base/task/single_thread_task_runner.h" #include "base/time/time.h" @@ -28,7 +28,7 @@ static_assert(kBoxWidth < kWidth && kBoxHeight < kHeight, "bad box size"); static_assert((kBoxWidth % kSpeed == 0) && (kWidth % kSpeed == 0) && - (kBoxHeight % kSpeed == 0) && (kHeight % kSpeed == 0), + (kBoxHeight % kSpeed == 0) && (kHeight % kSpeed == 0), "sizes must be multiple of kSpeed"); namespace { @@ -78,13 +78,15 @@ // Move the box. bool old_box_pos_x = box_pos_x_; box_pos_x_ += box_speed_x_; - if (box_pos_x_ + kBoxWidth >= kWidth || box_pos_x_ == 0) + if (box_pos_x_ + kBoxWidth >= kWidth || box_pos_x_ == 0) { box_speed_x_ = -box_speed_x_; + } bool old_box_pos_y = box_pos_y_; box_pos_y_ += box_speed_y_; - if (box_pos_y_ + kBoxHeight >= kHeight || box_pos_y_ == 0) + if (box_pos_y_ + kBoxHeight >= kHeight || box_pos_y_ == 0) { box_speed_y_ = -box_speed_y_; + } memset(frame->data(), 0xff, kHeight * frame->stride()); @@ -123,8 +125,7 @@ } // namespace -FakeDesktopCapturer::FakeDesktopCapturer() - : callback_(nullptr) { +FakeDesktopCapturer::FakeDesktopCapturer() : callback_(nullptr) { frame_generator_ = base::BindRepeating(&DefaultFrameGenerator::GenerateFrame, base::MakeRefCounted<DefaultFrameGenerator>());
diff --git a/remoting/protocol/fake_desktop_capturer.h b/remoting/protocol/fake_desktop_capturer.h index dea6394..1ecb0fa 100644 --- a/remoting/protocol/fake_desktop_capturer.h +++ b/remoting/protocol/fake_desktop_capturer.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "remoting/protocol/desktop_capturer.h" #include "third_party/webrtc/modules/desktop_capture/desktop_frame.h"
diff --git a/remoting/protocol/fake_message_pipe.cc b/remoting/protocol/fake_message_pipe.cc index 01828f17..e6658f8d 100644 --- a/remoting/protocol/fake_message_pipe.cc +++ b/remoting/protocol/fake_message_pipe.cc
@@ -7,7 +7,7 @@ #include <algorithm> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/task/single_thread_task_runner.h" #include "remoting/base/compound_buffer.h"
diff --git a/remoting/protocol/fake_message_pipe_wrapper.cc b/remoting/protocol/fake_message_pipe_wrapper.cc index aa879d6..645957d 100644 --- a/remoting/protocol/fake_message_pipe_wrapper.cc +++ b/remoting/protocol/fake_message_pipe_wrapper.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/callback.h" #include "base/check.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "remoting/base/compound_buffer.h" #include "remoting/protocol/fake_message_pipe.h"
diff --git a/remoting/protocol/fake_session.cc b/remoting/protocol/fake_session.cc index 5f2b4be8..1cc3c9f 100644 --- a/remoting/protocol/fake_session.cc +++ b/remoting/protocol/fake_session.cc
@@ -6,8 +6,8 @@ #include <memory> -#include "base/bind.h" #include "base/check.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/task/single_thread_task_runner.h" #include "remoting/protocol/fake_authenticator.h" @@ -96,8 +96,9 @@ void FakeSession::SendTransportInfo( std::unique_ptr<jingle_xmpp::XmlElement> transport_info) { - if (!peer_) + if (!peer_) { return; + } if (signaling_delay_.is_zero()) { peer_->ProcessTransportInfo(std::move(transport_info)); @@ -127,8 +128,9 @@ } } -void FakeSession::SetAttachment(size_t round, - std::unique_ptr<jingle_xmpp::XmlElement> attachment) { +void FakeSession::SetAttachment( + size_t round, + std::unique_ptr<jingle_xmpp::XmlElement> attachment) { while (attachments_.size() <= round) { attachments_.emplace_back(); }
diff --git a/remoting/protocol/fake_session.h b/remoting/protocol/fake_session.h index f894ba2c..a63aacc2 100644 --- a/remoting/protocol/fake_session.h +++ b/remoting/protocol/fake_session.h
@@ -60,10 +60,12 @@ private: // Callback provided to the |transport_|. - void SendTransportInfo(std::unique_ptr<jingle_xmpp::XmlElement> transport_info); + void SendTransportInfo( + std::unique_ptr<jingle_xmpp::XmlElement> transport_info); // Called by the |peer_| to deliver incoming |transport_info|. - void ProcessTransportInfo(std::unique_ptr<jingle_xmpp::XmlElement> transport_info); + void ProcessTransportInfo( + std::unique_ptr<jingle_xmpp::XmlElement> transport_info); raw_ptr<EventHandler> event_handler_ = nullptr; std::unique_ptr<SessionConfig> config_;
diff --git a/remoting/protocol/fake_stream_socket.cc b/remoting/protocol/fake_stream_socket.cc index 04a945b..23a91a1 100644 --- a/remoting/protocol/fake_stream_socket.cc +++ b/remoting/protocol/fake_stream_socket.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/task/single_thread_task_runner.h" #include "net/base/address_list.h" @@ -38,8 +38,7 @@ int result = std::min(read_buffer_size_, static_cast<int>(input_data_.size() - input_pos_)); EXPECT_GT(result, 0); - memcpy(read_buffer_->data(), - &(*input_data_.begin()) + input_pos_, result); + memcpy(read_buffer_->data(), &(*input_data_.begin()) + input_pos_, result); input_pos_ += result; read_buffer_ = nullptr; @@ -73,8 +72,8 @@ EXPECT_TRUE(task_runner_->BelongsToCurrentThread()); if (input_pos_ < static_cast<int>(input_data_.size())) { - int result = std::min(buf_len, - static_cast<int>(input_data_.size()) - input_pos_); + int result = + std::min(buf_len, static_cast<int>(input_data_.size()) - input_pos_); memcpy(buf->data(), &(*input_data_.begin()) + input_pos_, result); input_pos_ += result; return result; @@ -98,8 +97,9 @@ EXPECT_TRUE(task_runner_->BelongsToCurrentThread()); EXPECT_FALSE(write_pending_); - if (write_limit_ > 0) + if (write_limit_ > 0) { buf_len = std::min(write_limit_, buf_len); + } if (async_write_) { task_runner_->PostTask( @@ -139,8 +139,7 @@ void FakeStreamSocket::DoWrite(const scoped_refptr<net::IOBuffer>& buf, int buf_len) { - written_data_.insert(written_data_.end(), - buf->data(), buf->data() + buf_len); + written_data_.insert(written_data_.end(), buf->data(), buf->data() + buf_len); if (peer_socket_) { task_runner_->PostTask( @@ -174,12 +173,14 @@ if (peer_factory_) { FakeStreamSocket* peer_channel = peer_factory_->GetFakeChannel(name); - if (peer_channel) + if (peer_channel) { channel->PairWith(peer_channel); + } } - if (fail_create_) + if (fail_create_) { channel.reset(); + } if (asynchronous_create_) { task_runner_->PostTask( @@ -196,8 +197,9 @@ std::unique_ptr<FakeStreamSocket> owned_channel, const std::string& name, ChannelCreatedCallback callback) { - if (channels_.find(name) != channels_.end()) + if (channels_.find(name) != channels_.end()) { std::move(callback).Run(std::move(owned_channel)); + } } void FakeStreamChannelFactory::CancelChannelCreation(const std::string& name) {
diff --git a/remoting/protocol/fake_video_renderer.cc b/remoting/protocol/fake_video_renderer.cc index 8b4b4f49..dff8612 100644 --- a/remoting/protocol/fake_video_renderer.cc +++ b/remoting/protocol/fake_video_renderer.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/callback.h" #include "base/check.h" +#include "base/functional/callback.h" #include "remoting/proto/video.pb.h" #include "third_party/webrtc/modules/desktop_capture/desktop_frame.h" @@ -27,10 +27,12 @@ base::OnceClosure done) { DCHECK_CALLED_ON_VALID_THREAD(thread_checker_); received_packets_.push_back(std::move(video_packet)); - if (!done.is_null()) + if (!done.is_null()) { std::move(done).Run(); - if (!on_frame_callback_.is_null()) + } + if (!on_frame_callback_.is_null()) { on_frame_callback_.Run(); + } } FakeFrameConsumer::FakeFrameConsumer() = default; @@ -52,10 +54,12 @@ base::OnceClosure done) { DCHECK_CALLED_ON_VALID_THREAD(thread_checker_); received_frames_.push_back(std::move(frame)); - if (done) + if (done) { std::move(done).Run(); - if (on_frame_callback_) + } + if (on_frame_callback_) { on_frame_callback_.Run(); + } } FrameConsumer::PixelFormat FakeFrameConsumer::GetPixelFormat() { @@ -74,8 +78,9 @@ void FakeFrameStatsConsumer::OnVideoFrameStats(const FrameStats& stats) { DCHECK_CALLED_ON_VALID_THREAD(thread_checker_); received_stats_.push_back(stats); - if (!on_stats_callback_.is_null()) + if (!on_stats_callback_.is_null()) { on_stats_callback_.Run(); + } } FakeVideoRenderer::FakeVideoRenderer() = default;
diff --git a/remoting/protocol/fake_video_renderer.h b/remoting/protocol/fake_video_renderer.h index 04ad3e07..14a4a05 100644 --- a/remoting/protocol/fake_video_renderer.h +++ b/remoting/protocol/fake_video_renderer.h
@@ -8,7 +8,7 @@ #include <list> #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/threading/thread_checker.h" #include "remoting/protocol/frame_consumer.h" #include "remoting/protocol/frame_stats.h"
diff --git a/remoting/protocol/frame_consumer.h b/remoting/protocol/frame_consumer.h index b807232..8248044 100644 --- a/remoting/protocol/frame_consumer.h +++ b/remoting/protocol/frame_consumer.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" namespace webrtc { class DesktopFrame;
diff --git a/remoting/protocol/frame_stats.h b/remoting/protocol/frame_stats.h index 6786a07..289cbe2 100644 --- a/remoting/protocol/frame_stats.h +++ b/remoting/protocol/frame_stats.h
@@ -30,7 +30,7 @@ void ToFrameStatsMessage(FrameStatsMessage* message_out) const; // Frame Size. - int frame_size {}; + int frame_size{}; // Set to null for frames that were not sent after a fresh input event. base::TimeTicks latest_event_timestamp; @@ -77,6 +77,7 @@ class FrameStatsConsumer { public: virtual void OnVideoFrameStats(const FrameStats& stats) = 0; + protected: virtual ~FrameStatsConsumer() {} };
diff --git a/remoting/protocol/host_control_dispatcher.cc b/remoting/protocol/host_control_dispatcher.cc index 0a78d47..c0b2d4b 100644 --- a/remoting/protocol/host_control_dispatcher.cc +++ b/remoting/protocol/host_control_dispatcher.cc
@@ -4,7 +4,7 @@ #include "remoting/protocol/host_control_dispatcher.h" -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "net/socket/stream_socket.h" #include "remoting/base/compound_buffer.h" #include "remoting/base/constants.h" @@ -21,8 +21,7 @@ : ChannelDispatcherBase(kControlChannelName) {} HostControlDispatcher::~HostControlDispatcher() = default; -void HostControlDispatcher::SetCapabilities( - const Capabilities& capabilities) { +void HostControlDispatcher::SetCapabilities(const Capabilities& capabilities) { ControlMessage message; message.mutable_capabilities()->CopyFrom(capabilities); message_pipe()->Send(&message, {}); @@ -97,8 +96,9 @@ std::unique_ptr<ControlMessage> message = ParseMessage<ControlMessage>(buffer.get()); - if (!message) + if (!message) { return; + } // TODO(sergeyu): Move message validation from the message handlers here. if (message->has_clipboard_event()) {
diff --git a/remoting/protocol/host_control_dispatcher.h b/remoting/protocol/host_control_dispatcher.h index 7c42f131..9bc01bf5 100644 --- a/remoting/protocol/host_control_dispatcher.h +++ b/remoting/protocol/host_control_dispatcher.h
@@ -22,8 +22,7 @@ // HostControlDispatcher dispatches incoming messages on the control channel to // HostStub or ClipboardStub, and also implements ClientStub and CursorShapeStub // for outgoing messages. -class HostControlDispatcher : public ChannelDispatcherBase, - public ClientStub { +class HostControlDispatcher : public ChannelDispatcherBase, public ClientStub { public: HostControlDispatcher();
diff --git a/remoting/protocol/host_event_dispatcher.cc b/remoting/protocol/host_event_dispatcher.cc index 0d04952..85259a8a 100644 --- a/remoting/protocol/host_event_dispatcher.cc +++ b/remoting/protocol/host_event_dispatcher.cc
@@ -27,8 +27,9 @@ std::unique_ptr<EventMessage> message = ParseMessage<EventMessage>(buffer.get()); - if (!message) + if (!message) { return; + } event_timestamps_source_->OnEventReceived(InputEventTimestamps{ base::TimeTicks::FromInternalValue(message->timestamp()),
diff --git a/remoting/protocol/host_video_dispatcher.cc b/remoting/protocol/host_video_dispatcher.cc index 098e6c4..92673ba 100644 --- a/remoting/protocol/host_video_dispatcher.cc +++ b/remoting/protocol/host_video_dispatcher.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "net/socket/stream_socket.h" #include "remoting/base/compound_buffer.h" #include "remoting/base/constants.h" @@ -30,10 +30,12 @@ void HostVideoDispatcher::OnIncomingMessage( std::unique_ptr<CompoundBuffer> message) { std::unique_ptr<VideoAck> ack = ParseMessage<VideoAck>(message.get()); - if (!ack) + if (!ack) { return; - if (video_feedback_stub_) + } + if (video_feedback_stub_) { video_feedback_stub_->ProcessVideoAck(std::move(ack)); + } } } // namespace remoting::protocol
diff --git a/remoting/protocol/host_video_stats_dispatcher.cc b/remoting/protocol/host_video_stats_dispatcher.cc index e08a8715..55bffa5 100644 --- a/remoting/protocol/host_video_stats_dispatcher.cc +++ b/remoting/protocol/host_video_stats_dispatcher.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "net/socket/stream_socket.h" #include "remoting/base/compound_buffer.h" #include "remoting/base/constants.h"
diff --git a/remoting/protocol/ice_config.cc b/remoting/protocol/ice_config.cc index eaba9af4..4547059 100644 --- a/remoting/protocol/ice_config.cc +++ b/remoting/protocol/ice_config.cc
@@ -55,32 +55,39 @@ } size_t colon_pos = url.find(':'); - if (colon_pos == std::string::npos) + if (colon_pos == std::string::npos) { return false; + } std::string protocol = url.substr(0, colon_pos); std::string host; int port; - if (!net::ParseHostAndPort(url.substr(colon_pos + 1), &host, &port)) + if (!net::ParseHostAndPort(url.substr(colon_pos + 1), &host, &port)) { return false; + } if (protocol == "stun") { - if (port == -1) + if (port == -1) { port = kDefaultStunTurnPort; + } config->stun_servers.push_back(rtc::SocketAddress(host, port)); } else if (protocol == "turn") { - if (port == -1) + if (port == -1) { port = kDefaultStunTurnPort; - if (turn_transport_type == cricket::PROTO_LAST) + } + if (turn_transport_type == cricket::PROTO_LAST) { turn_transport_type = cricket::PROTO_UDP; + } config->turn_servers.push_back(cricket::RelayServerConfig( host, port, username, password, turn_transport_type, false)); } else if (protocol == "turns") { - if (port == -1) + if (port == -1) { port = kDefaultTurnsPort; - if (turn_transport_type == cricket::PROTO_LAST) + } + if (turn_transport_type == cricket::PROTO_LAST) { turn_transport_type = cricket::PROTO_TCP; + } config->turn_servers.push_back(cricket::RelayServerConfig( host, port, username, password, turn_transport_type, true)); } else { @@ -151,13 +158,15 @@ std::string username; const std::string* maybe_username = server_dict->FindString("username"); - if (maybe_username) + if (maybe_username) { username = *maybe_username; + } std::string password; const std::string* maybe_password = server_dict->FindString("credential"); - if (maybe_password) + if (maybe_password) { password = *maybe_password; + } // Compute the lowest specified bitrate of all the ICE servers. // Ideally the bitrate would be stored per ICE server, but it is not @@ -218,8 +227,9 @@ // 'iceServers': {...} }}. if (!dictionary->Find("iceServers")) { base::Value::Dict* data_dictionary = dictionary->FindDict("data"); - if (data_dictionary) + if (data_dictionary) { return Parse(*data_dictionary); + } } return Parse(*dictionary);
diff --git a/remoting/protocol/ice_config_request.h b/remoting/protocol/ice_config_request.h index 1cc046e..66e4663 100644 --- a/remoting/protocol/ice_config_request.h +++ b/remoting/protocol/ice_config_request.h
@@ -5,7 +5,7 @@ #ifndef REMOTING_PROTOCOL_ICE_CONFIG_REQUEST_H_ #define REMOTING_PROTOCOL_ICE_CONFIG_REQUEST_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" namespace remoting::protocol {
diff --git a/remoting/protocol/ice_connection_to_client.cc b/remoting/protocol/ice_connection_to_client.cc index 3d15299c..8861a215 100644 --- a/remoting/protocol/ice_connection_to_client.cc +++ b/remoting/protocol/ice_connection_to_client.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/memory/ptr_util.h" #include "base/task/single_thread_task_runner.h" @@ -113,8 +113,9 @@ DCHECK_CALLED_ON_VALID_THREAD(thread_checker_); // Audio channel is disabled. - if (!audio_writer_) + if (!audio_writer_) { return nullptr; + } std::unique_ptr<AudioEncoder> audio_encoder = CreateAudioEncoder(session_->config()); @@ -176,8 +177,9 @@ video_dispatcher_->Init(transport_.GetChannelFactory(), this); audio_writer_ = AudioWriter::Create(session_->config()); - if (audio_writer_) + if (audio_writer_) { audio_writer_->Init(transport_.GetMultiplexedChannelFactory(), this); + } // Notify the handler after initializing the channels, so that // ClientSession can get a client clipboard stub. @@ -193,7 +195,6 @@ } } - void IceConnectionToClient::OnIceTransportRouteChange( const std::string& channel_name, const TransportRoute& route) { @@ -221,12 +222,15 @@ void IceConnectionToClient::NotifyIfChannelsReady() { DCHECK_CALLED_ON_VALID_THREAD(thread_checker_); - if (!control_dispatcher_ || !control_dispatcher_->is_connected()) + if (!control_dispatcher_ || !control_dispatcher_->is_connected()) { return; - if (!event_dispatcher_ || !event_dispatcher_->is_connected()) + } + if (!event_dispatcher_ || !event_dispatcher_->is_connected()) { return; - if (!video_dispatcher_ || !video_dispatcher_->is_connected()) + } + if (!video_dispatcher_ || !video_dispatcher_->is_connected()) { return; + } if ((!audio_writer_ || !audio_writer_->is_connected()) && session_->config().is_audio_enabled()) { return;
diff --git a/remoting/protocol/ice_connection_to_host.cc b/remoting/protocol/ice_connection_to_host.cc index e04084d..fc335d6 100644 --- a/remoting/protocol/ice_connection_to_host.cc +++ b/remoting/protocol/ice_connection_to_host.cc
@@ -7,8 +7,8 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/location.h" #include "base/task/single_thread_task_runner.h" #include "remoting/base/constants.h" @@ -195,18 +195,22 @@ } void IceConnectionToHost::NotifyIfChannelsReady() { - if (!control_dispatcher_.get() || !control_dispatcher_->is_connected()) + if (!control_dispatcher_.get() || !control_dispatcher_->is_connected()) { return; - if (!event_dispatcher_.get() || !event_dispatcher_->is_connected()) + } + if (!event_dispatcher_.get() || !event_dispatcher_->is_connected()) { return; - if (!video_dispatcher_.get() || !video_dispatcher_->is_connected()) + } + if (!video_dispatcher_.get() || !video_dispatcher_->is_connected()) { return; + } if ((!audio_reader_.get() || !audio_reader_->is_connected()) && session_->config().is_audio_enabled()) { return; } - if (state_ != AUTHENTICATED) + if (state_ != AUTHENTICATED) { return; + } // Start forwarding clipboard and input events. clipboard_forwarder_.set_clipboard_stub(control_dispatcher_.get());
diff --git a/remoting/protocol/ice_connection_to_host.h b/remoting/protocol/ice_connection_to_host.h index 72f3e01..f4e2fc88 100644 --- a/remoting/protocol/ice_connection_to_host.h +++ b/remoting/protocol/ice_connection_to_host.h
@@ -9,7 +9,7 @@ #include <set> #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h" #include "base/sequence_checker.h" @@ -68,7 +68,7 @@ // IceTransport::EventHandler interface. void OnIceTransportRouteChange(const std::string& channel_name, - const TransportRoute& route) override; + const TransportRoute& route) override; void OnIceTransportError(ErrorCode error) override; // ChannelDispatcherBase::EventHandler interface.
diff --git a/remoting/protocol/ice_transport.cc b/remoting/protocol/ice_transport.cc index 2c029b9..da03ff7a 100644 --- a/remoting/protocol/ice_transport.cc +++ b/remoting/protocol/ice_transport.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "remoting/protocol/channel_authenticator.h" #include "remoting/protocol/channel_multiplexer.h" #include "remoting/protocol/pseudotcp_channel_factory.h" @@ -55,8 +55,9 @@ bool IceTransport::ProcessTransportInfo( jingle_xmpp::XmlElement* transport_info_xml) { IceTransportInfo transport_info; - if (!transport_info.ParseXml(transport_info_xml)) + if (!transport_info.ParseXml(transport_info_xml)) { return false; + } for (auto it = transport_info.ice_credentials.begin(); it != transport_info.ice_credentials.end(); ++it) { @@ -160,8 +161,9 @@ void IceTransport::OnChannelRouteChange(IceTransportChannel* channel, const TransportRoute& route) { - if (event_handler_) + if (event_handler_) { event_handler_->OnIceTransportRouteChange(channel->name(), route); + } } void IceTransport::OnChannelFailed(IceTransportChannel* channel) {
diff --git a/remoting/protocol/ice_transport_channel.cc b/remoting/protocol/ice_transport_channel.cc index 4856cae..cb91858ff 100644 --- a/remoting/protocol/ice_transport_channel.cc +++ b/remoting/protocol/ice_transport_channel.cc
@@ -8,8 +8,8 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/task/single_thread_task_runner.h" #include "components/webrtc/net_address_utils.h" #include "net/base/net_errors.h" @@ -61,10 +61,12 @@ delegate_->OnChannelDeleted(this); auto task_runner = base::SingleThreadTaskRunner::GetCurrentDefault(); - if (channel_) + if (channel_) { task_runner->DeleteSoon(FROM_HERE, channel_.release()); - if (port_allocator_) + } + if (port_allocator_) { task_runner->DeleteSoon(FROM_HERE, port_allocator_.release()); + } } void IceTransportChannel::Connect(const std::string& name, @@ -98,10 +100,10 @@ channel_->SetIceCredentials(ice_username_fragment_, ice_password); channel_->SignalCandidateGathered.connect( this, &IceTransportChannel::OnCandidateGathered); - channel_->SignalRouteChange.connect( - this, &IceTransportChannel::OnRouteChange); - channel_->SignalWritableState.connect( - this, &IceTransportChannel::OnWritableState); + channel_->SignalRouteChange.connect(this, + &IceTransportChannel::OnRouteChange); + channel_->SignalWritableState.connect(this, + &IceTransportChannel::OnWritableState); channel_->set_incoming_only(!(transport_context_->network_settings().flags & NetworkSettings::NAT_TRAVERSAL_OUTGOING)); @@ -147,8 +149,9 @@ remote_ice_username_fragment_ = ufrag; remote_ice_password_ = password; - if (channel_) + if (channel_) { channel_->SetRemoteIceCredentials(ufrag, password); + } } void IceTransportChannel::AddRemoteCandidate( @@ -159,8 +162,9 @@ // candidates. It's also necessary to discard remote relay candidates. bool relay_allowed = (transport_context_->network_settings().flags & NetworkSettings::NAT_TRAVERSAL_RELAY) != 0; - if (!relay_allowed && candidate.type() == cricket::RELAY_PORT_TYPE) + if (!relay_allowed && candidate.type() == cricket::RELAY_PORT_TYPE) { return; + } if (channel_) { channel_->AddRemoteCandidate(candidate); @@ -190,8 +194,9 @@ cricket::IceTransportInternal* ice_transport, const cricket::Candidate& candidate) { // Ignore notifications if the channel is not writable. - if (channel_->writable()) + if (channel_->writable()) { NotifyRouteChanged(); + } } void IceTransportChannel::OnWritableState( @@ -231,7 +236,7 @@ // candidate is "local". In this case, we still want to report a RELAY route // type. static_assert(TransportRoute::DIRECT < TransportRoute::STUN && - TransportRoute::STUN < TransportRoute::RELAY, + TransportRoute::STUN < TransportRoute::RELAY, "Route type enum values are ordered by 'indirectness'"); route.type = std::max( CandidateTypeToTransportRouteType(connection->local_candidate().type()),
diff --git a/remoting/protocol/ice_transport_channel.h b/remoting/protocol/ice_transport_channel.h index 017c6aa..eba6f7f 100644 --- a/remoting/protocol/ice_transport_channel.h +++ b/remoting/protocol/ice_transport_channel.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/threading/thread_checker.h" #include "base/timer/timer.h" @@ -43,19 +43,19 @@ // Called to pass ICE credentials to the session. Used only for STANDARD // version of ICE, see SetIceVersion(). virtual void OnChannelIceCredentials(IceTransportChannel* transport, - const std::string& ufrag, - const std::string& password) = 0; + const std::string& ufrag, + const std::string& password) = 0; // Called when the transport generates a new candidate that needs // to be passed to the AddRemoteCandidate() method on the remote // end of the connection. virtual void OnChannelCandidate(IceTransportChannel* transport, - const cricket::Candidate& candidate) = 0; + const cricket::Candidate& candidate) = 0; // Called when transport route changes. Can be called even before // the transport is connected. virtual void OnChannelRouteChange(IceTransportChannel* transport, - const TransportRoute& route) = 0; + const TransportRoute& route) = 0; // Called when when the channel has failed to connect or reconnect. virtual void OnChannelFailed(IceTransportChannel* transport) = 0;
diff --git a/remoting/protocol/ice_transport_unittest.cc b/remoting/protocol/ice_transport_unittest.cc index edded2a0..d722ec32 100644 --- a/remoting/protocol/ice_transport_unittest.cc +++ b/remoting/protocol/ice_transport_unittest.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/logging.h" #include "base/run_loop.h" @@ -44,8 +44,9 @@ ACTION_P2(QuitRunLoopOnCounter, run_loop, counter) { --(*counter); EXPECT_GE(*counter, 0); - if (*counter == 0) + if (*counter == 0) { run_loop->Quit(); + } } class MockChannelCreatedCallback { @@ -71,7 +72,7 @@ // IceTransport::EventHandler interface. void OnIceTransportRouteChange(const std::string& channel_name, - const TransportRoute& route) override {} + const TransportRoute& route) override {} void OnIceTransportError(ErrorCode error) override { error_callback_.Run(error); } @@ -98,8 +99,9 @@ base::RunLoop().RunUntilIdle(); } - void ProcessTransportInfo(std::unique_ptr<IceTransport>* target_transport, - std::unique_ptr<jingle_xmpp::XmlElement> transport_info) { + void ProcessTransportInfo( + std::unique_ptr<IceTransport>* target_transport, + std::unique_ptr<jingle_xmpp::XmlElement> transport_info) { base::SingleThreadTaskRunner::GetCurrentDefault()->PostDelayedTask( FROM_HERE, base::BindOnce(&IceTransportTest::DeliverTransportInfo, @@ -108,8 +110,9 @@ transport_info_delay_); } - void DeliverTransportInfo(std::unique_ptr<IceTransport>* target_transport, - std::unique_ptr<jingle_xmpp::XmlElement> transport_info) { + void DeliverTransportInfo( + std::unique_ptr<IceTransport>* target_transport, + std::unique_ptr<jingle_xmpp::XmlElement> transport_info) { ASSERT_TRUE(target_transport); EXPECT_TRUE( (*target_transport)->ProcessTransportInfo(transport_info.get())); @@ -291,8 +294,7 @@ EXPECT_FALSE(host_message_pipe_); EXPECT_EQ(CHANNEL_CONNECTION_ERROR, error_); - client_transport_->GetChannelFactory()->CancelChannelCreation( - kChannelName); + client_transport_->GetChannelFactory()->CancelChannelCreation(kChannelName); } // Verify that channels are never marked connected if connection cannot be @@ -323,10 +325,8 @@ EXPECT_FALSE(host_message_pipe_); EXPECT_EQ(CHANNEL_CONNECTION_ERROR, error_); - client_transport_->GetChannelFactory()->CancelChannelCreation( - kChannelName); - host_transport_->GetChannelFactory()->CancelChannelCreation( - kChannelName); + client_transport_->GetChannelFactory()->CancelChannelCreation(kChannelName); + host_transport_->GetChannelFactory()->CancelChannelCreation(kChannelName); } TEST_F(IceTransportTest, TestCancelChannelCreation) { @@ -335,8 +335,7 @@ client_transport_->GetChannelFactory()->CreateChannel( kChannelName, base::BindOnce(&IceTransportTest::OnClientChannelCreated, base::Unretained(this))); - client_transport_->GetChannelFactory()->CancelChannelCreation( - kChannelName); + client_transport_->GetChannelFactory()->CancelChannelCreation(kChannelName); EXPECT_TRUE(!client_message_pipe_.get()); }
diff --git a/remoting/protocol/input_event_tracker.cc b/remoting/protocol/input_event_tracker.cc index 7b3cdba..3855029f 100644 --- a/remoting/protocol/input_event_tracker.cc +++ b/remoting/protocol/input_event_tracker.cc
@@ -12,8 +12,7 @@ InputEventTracker::InputEventTracker() = default; InputEventTracker::InputEventTracker(InputStub* input_stub) - : input_stub_(input_stub) { -} + : input_stub_(input_stub) {} InputEventTracker::~InputEventTracker() = default; @@ -38,8 +37,8 @@ pressed_keys_.clear(); // Release all mouse buttons. - for (int i = MouseEvent::BUTTON_UNDEFINED + 1; - i < MouseEvent::BUTTON_MAX; ++i) { + for (int i = MouseEvent::BUTTON_UNDEFINED + 1; i < MouseEvent::BUTTON_MAX; + ++i) { if (mouse_button_state_ & (1 << (i - 1))) { MouseEvent mouse;
diff --git a/remoting/protocol/input_event_tracker.h b/remoting/protocol/input_event_tracker.h index 661532d..d486991 100644 --- a/remoting/protocol/input_event_tracker.h +++ b/remoting/protocol/input_event_tracker.h
@@ -30,9 +30,7 @@ ~InputEventTracker() override; - void set_input_stub(InputStub* input_stub) { - input_stub_ = input_stub; - } + void set_input_stub(InputStub* input_stub) { input_stub_ = input_stub; } // Returns true if the key with the specified USB code is currently pressed. bool IsKeyPressed(ui::DomCode usb_keycode) const; @@ -47,8 +45,10 @@ // Similar to ReleaseAll, but conditional on a modifier key tracked by this // class being pressed without the corresponding parameter indicating that it // should be. - void ReleaseAllIfModifiersStuck(bool alt_expected, bool ctrl_expected, - bool os_expected, bool shift_expected); + void ReleaseAllIfModifiersStuck(bool alt_expected, + bool ctrl_expected, + bool os_expected, + bool shift_expected); // InputStub interface. void InjectKeyEvent(const KeyEvent& event) override;
diff --git a/remoting/protocol/input_event_tracker_unittest.cc b/remoting/protocol/input_event_tracker_unittest.cc index 44e056a3..9ec16a2 100644 --- a/remoting/protocol/input_event_tracker_unittest.cc +++ b/remoting/protocol/input_event_tracker_unittest.cc
@@ -19,8 +19,8 @@ namespace remoting::protocol { using test::EqualsKeyEventWithCapsLock; -using test::EqualsMouseEvent; using test::EqualsKeyEventWithoutLockStates; +using test::EqualsMouseEvent; namespace { @@ -28,8 +28,9 @@ static const MouseEvent::MouseButton BUTTON_RIGHT = MouseEvent::BUTTON_RIGHT; MATCHER_P2(TouchPointIdsAndTypeEqual, ids, type, "") { - if (arg.event_type() != type) + if (arg.event_type() != type) { return false; + } std::set<uint32_t> touch_ids; for (const TouchEventPoint& point : arg.touch_points()) { @@ -130,10 +131,12 @@ } // The key should be released but |lock_states| should not be set. - EXPECT_CALL(mock_stub, InjectKeyEvent(EqualsKeyEventWithoutLockStates( - 3, false))).After(injects); - EXPECT_CALL(mock_stub, InjectMouseEvent(EqualsMouseEvent( - 1, 1, BUTTON_RIGHT, false))).After(injects); + EXPECT_CALL(mock_stub, + InjectKeyEvent(EqualsKeyEventWithoutLockStates(3, false))) + .After(injects); + EXPECT_CALL(mock_stub, + InjectMouseEvent(EqualsMouseEvent(1, 1, BUTTON_RIGHT, false))) + .After(injects); input_tracker.InjectKeyEvent(NewUsbEvent(3, true)); PressAndReleaseUsb(&input_tracker, 1);
diff --git a/remoting/protocol/input_filter.cc b/remoting/protocol/input_filter.cc index d0627eb..c2fe3bb 100644 --- a/remoting/protocol/input_filter.cc +++ b/remoting/protocol/input_filter.cc
@@ -6,33 +6,35 @@ namespace remoting::protocol { -InputFilter::InputFilter() : input_stub_(nullptr), enabled_(true) { -} +InputFilter::InputFilter() : input_stub_(nullptr), enabled_(true) {} InputFilter::InputFilter(InputStub* input_stub) - : input_stub_(input_stub), enabled_(true) { -} + : input_stub_(input_stub), enabled_(true) {} InputFilter::~InputFilter() = default; void InputFilter::InjectKeyEvent(const KeyEvent& event) { - if (enabled_ && input_stub_ != nullptr) + if (enabled_ && input_stub_ != nullptr) { input_stub_->InjectKeyEvent(event); + } } void InputFilter::InjectTextEvent(const TextEvent& event) { - if (enabled_ && input_stub_ != nullptr) + if (enabled_ && input_stub_ != nullptr) { input_stub_->InjectTextEvent(event); + } } void InputFilter::InjectMouseEvent(const MouseEvent& event) { - if (enabled_ && input_stub_ != nullptr) + if (enabled_ && input_stub_ != nullptr) { input_stub_->InjectMouseEvent(event); + } } void InputFilter::InjectTouchEvent(const TouchEvent& event) { - if (enabled_ && input_stub_ != nullptr) + if (enabled_ && input_stub_ != nullptr) { input_stub_->InjectTouchEvent(event); + } } } // namespace remoting::protocol
diff --git a/remoting/protocol/input_filter.h b/remoting/protocol/input_filter.h index 6f3dcbe..8a60477 100644 --- a/remoting/protocol/input_filter.h +++ b/remoting/protocol/input_filter.h
@@ -25,17 +25,11 @@ ~InputFilter() override; // Set the InputStub that events will be forwarded to. - void set_input_stub(InputStub* input_stub) { - input_stub_ = input_stub; - } + void set_input_stub(InputStub* input_stub) { input_stub_ = input_stub; } // Enable/disable routing of events to the InputStub. - void set_enabled(bool enabled) { - enabled_ = enabled; - } - bool enabled() const { - return enabled_; - } + void set_enabled(bool enabled) { enabled_ = enabled; } + bool enabled() const { return enabled_; } // InputStub interface. void InjectKeyEvent(const KeyEvent& event) override; @@ -50,4 +44,4 @@ } // namespace remoting::protocol -#endif // REMOTING_PROTOCOL_INPUT_FILTER_H_ +#endif // REMOTING_PROTOCOL_INPUT_FILTER_H_
diff --git a/remoting/protocol/jingle_messages.cc b/remoting/protocol/jingle_messages.cc index 7bb1f03..b867726 100644 --- a/remoting/protocol/jingle_messages.cc +++ b/remoting/protocol/jingle_messages.cc
@@ -37,21 +37,21 @@ const int kPortMax = 65535; const NameMapElement<JingleMessage::ActionType> kActionTypes[] = { - { JingleMessage::SESSION_INITIATE, "session-initiate" }, - { JingleMessage::SESSION_ACCEPT, "session-accept" }, - { JingleMessage::SESSION_TERMINATE, "session-terminate" }, - { JingleMessage::SESSION_INFO, "session-info" }, - { JingleMessage::TRANSPORT_INFO, "transport-info" }, + {JingleMessage::SESSION_INITIATE, "session-initiate"}, + {JingleMessage::SESSION_ACCEPT, "session-accept"}, + {JingleMessage::SESSION_TERMINATE, "session-terminate"}, + {JingleMessage::SESSION_INFO, "session-info"}, + {JingleMessage::TRANSPORT_INFO, "transport-info"}, }; const NameMapElement<JingleMessage::Reason> kReasons[] = { - { JingleMessage::SUCCESS, "success" }, - { JingleMessage::DECLINE, "decline" }, - { JingleMessage::CANCEL, "cancel" }, - { JingleMessage::EXPIRED, "expired" }, - { JingleMessage::GENERAL_ERROR, "general-error" }, - { JingleMessage::FAILED_APPLICATION, "failed-application" }, - { JingleMessage::INCOMPATIBLE_PARAMETERS, "incompatible-parameters" }, + {JingleMessage::SUCCESS, "success"}, + {JingleMessage::DECLINE, "decline"}, + {JingleMessage::CANCEL, "cancel"}, + {JingleMessage::EXPIRED, "expired"}, + {JingleMessage::GENERAL_ERROR, "general-error"}, + {JingleMessage::FAILED_APPLICATION, "failed-application"}, + {JingleMessage::INCOMPATIBLE_PARAMETERS, "incompatible-parameters"}, }; bool ParseIceCredentials(const jingle_xmpp::XmlElement* element, @@ -59,8 +59,7 @@ DCHECK(element->Name() == QName(kIceTransportNamespace, "credentials")); const std::string& channel = element->Attr(QName(kEmptyNamespace, "channel")); - const std::string& ufrag = - element->Attr(QName(kEmptyNamespace, "ufrag")); + const std::string& ufrag = element->Attr(QName(kEmptyNamespace, "ufrag")); const std::string& password = element->Attr(QName(kEmptyNamespace, "password")); @@ -269,8 +268,8 @@ return false; } - const XmlElement* webrtc_transport_tag = content_tag->FirstNamed( - QName(kWebrtcTransportNamespace, "transport")); + const XmlElement* webrtc_transport_tag = + content_tag->FirstNamed(QName(kWebrtcTransportNamespace, "transport")); if (webrtc_transport_tag) { transport_info = std::make_unique<jingle_xmpp::XmlElement>(*webrtc_transport_tag); @@ -278,8 +277,8 @@ description.reset(); if (action == SESSION_INITIATE || action == SESSION_ACCEPT) { - const XmlElement* description_tag = content_tag->FirstNamed( - QName(kChromotingXmlNamespace, "description")); + const XmlElement* description_tag = + content_tag->FirstNamed(QName(kChromotingXmlNamespace, "description")); if (!description_tag) { *error = "Missing chromoting content description"; return false; @@ -294,8 +293,8 @@ } if (!webrtc_transport_tag) { - const XmlElement* ice_transport_tag = content_tag->FirstNamed( - QName(kIceTransportNamespace, "transport")); + const XmlElement* ice_transport_tag = + content_tag->FirstNamed(QName(kIceTransportNamespace, "transport")); if (ice_transport_tag) { transport_info = std::make_unique<jingle_xmpp::XmlElement>(*ice_transport_tag); @@ -318,8 +317,9 @@ jingle_tag->AddAttr(QName(kEmptyNamespace, "sid"), sid); to.SetInMessage(root.get(), SignalingAddress::TO); - if (!from.empty()) + if (!from.empty()) { from.SetInMessage(root.get(), SignalingAddress::FROM); + } const char* action_attr = ValueToName(kActionTypes, action); if (!action_attr) { @@ -345,8 +345,8 @@ if (reason != UNKNOWN_REASON) { XmlElement* reason_tag = new XmlElement(QName(kJingleNamespace, "reason")); jingle_tag->AddElement(reason_tag); - reason_tag->AddElement(new XmlElement( - QName(kJingleNamespace, ValueToName(kReasons, reason)))); + reason_tag->AddElement( + new XmlElement(QName(kJingleNamespace, ValueToName(kReasons, reason)))); if (error_code != UNKNOWN_ERROR) { XmlElement* error_code_tag = @@ -390,21 +390,14 @@ } JingleMessageReply::JingleMessageReply() - : type(REPLY_RESULT), - error_type(NONE) { -} + : type(REPLY_RESULT), error_type(NONE) {} JingleMessageReply::JingleMessageReply(ErrorType error) - : type(error != NONE ? REPLY_ERROR : REPLY_RESULT), - error_type(error) { -} + : type(error != NONE ? REPLY_ERROR : REPLY_RESULT), error_type(error) {} JingleMessageReply::JingleMessageReply(ErrorType error, const std::string& text_value) - : type(REPLY_ERROR), - error_type(error), - text(text_value) { -} + : type(REPLY_ERROR), error_type(error), text(text_value) {} JingleMessageReply::~JingleMessageReply() = default; @@ -483,8 +476,8 @@ // If the error name is not in the standard namespace, we have // to first add some error from that namespace. if (name.Namespace() != kJabberNamespace) { - error->AddElement( - new jingle_xmpp::XmlElement(QName(kJabberNamespace, "undefined-condition"))); + error->AddElement(new jingle_xmpp::XmlElement( + QName(kJabberNamespace, "undefined-condition"))); } error->AddElement(new jingle_xmpp::XmlElement(name)); @@ -492,7 +485,7 @@ // It's okay to always use English here. This text is for // debugging purposes only. jingle_xmpp::XmlElement* text_elem = - new jingle_xmpp::XmlElement(QName(kJabberNamespace, "text")); + new jingle_xmpp::XmlElement(QName(kJabberNamespace, "text")); text_elem->SetAttr(QName(kXmlNamespace, "lang"), "en"); text_elem->SetBodyText(error_text); error->AddElement(text_elem); @@ -514,8 +507,7 @@ IceTransportInfo::IceTransportInfo() = default; IceTransportInfo::~IceTransportInfo() = default; -bool IceTransportInfo::ParseXml( - const jingle_xmpp::XmlElement* element) { +bool IceTransportInfo::ParseXml(const jingle_xmpp::XmlElement* element) { if (element->Name() != QName(kIceTransportNamespace, "transport")) { return false; }
diff --git a/remoting/protocol/jingle_messages.h b/remoting/protocol/jingle_messages.h index b1b403c..92051527 100644 --- a/remoting/protocol/jingle_messages.h +++ b/remoting/protocol/jingle_messages.h
@@ -39,7 +39,6 @@ INCOMPATIBLE_PARAMETERS, }; - JingleMessage(); JingleMessage(const SignalingAddress& to, ActionType action_value,
diff --git a/remoting/protocol/jingle_session.cc b/remoting/protocol/jingle_session.cc index 8d0813ef..dc3e26f 100644 --- a/remoting/protocol/jingle_session.cc +++ b/remoting/protocol/jingle_session.cc
@@ -10,8 +10,8 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/logging.h" #include "base/ranges/algorithm.h" #include "base/strings/string_split.h" @@ -177,8 +177,9 @@ void JingleSession::OrderedMessageQueue::SetInitialId(const std::string& id) { int current = GetSequentialId(id); - if (current != kInvalid) + if (current != kInvalid) { next_incoming_ = current + 1; + } } JingleSession::PendingMessage::PendingMessage() = default; @@ -302,8 +303,9 @@ peer_address_, JingleMessage::SESSION_ACCEPT, session_id_)); std::unique_ptr<jingle_xmpp::XmlElement> auth_message; - if (authenticator_->state() == Authenticator::MESSAGE_READY) + if (authenticator_->state() == Authenticator::MESSAGE_READY) { auth_message = authenticator_->GetNextMessage(); + } message->description = std::make_unique<ContentDescription>( CandidateSessionConfig::CreateFrom(*config_), std::move(auth_message)); @@ -451,10 +453,9 @@ } } -void JingleSession::OnMessageResponse( - JingleMessage::ActionType request_type, - IqRequest* request, - const jingle_xmpp::XmlElement* response) { +void JingleSession::OnMessageResponse(JingleMessage::ActionType request_type, + IqRequest* request, + const jingle_xmpp::XmlElement* response) { DCHECK_CALLED_ON_VALID_THREAD(thread_checker_); // Delete the request from the list of pending requests. @@ -462,8 +463,9 @@ &std::unique_ptr<IqRequest>::get)); // Ignore all responses after session was closed. - if (state_ == CLOSED || state_ == FAILED) + if (state_ == CLOSED || state_ == FAILED) { return; + } std::string type_str = JingleMessage::GetActionName(request_type); @@ -487,8 +489,9 @@ } } -void JingleSession::OnTransportInfoResponse(IqRequest* request, - const jingle_xmpp::XmlElement* response) { +void JingleSession::OnTransportInfoResponse( + IqRequest* request, + const jingle_xmpp::XmlElement* response) { DCHECK_CALLED_ON_VALID_THREAD(thread_checker_); DCHECK(!transport_info_requests_.empty()); @@ -506,7 +509,8 @@ return; } - const std::string& type = response->Attr(jingle_xmpp::QName(std::string(), "type")); + const std::string& type = + response->Attr(jingle_xmpp::QName(std::string(), "type")); if (type != "result") { LOG(ERROR) << "Received error in response to transport-info message: \"" << response->Str() << "\". Terminating the session."; @@ -524,8 +528,9 @@ for (auto& pending_message : ordered) { ProcessIncomingMessage(std::move(pending_message.message), std::move(pending_message.reply_callback)); - if (!self) + if (!self) { return; + } } } @@ -735,15 +740,15 @@ if (authenticator_->started()) { base::WeakPtr<JingleSession> self = weak_factory_.GetWeakPtr(); SetState(AUTHENTICATING); - if (!self) + if (!self) { return; + } } if (authenticator_->state() == Authenticator::ACCEPTED) { OnAuthenticated(); } else if (authenticator_->state() == Authenticator::REJECTED) { - Close(AuthRejectionReasonToErrorCode( - authenticator_->rejection_reason())); + Close(AuthRejectionReasonToErrorCode(authenticator_->rejection_reason())); } } @@ -761,8 +766,9 @@ message.message->transport_info.get()) ? JingleMessageReply::NONE : JingleMessageReply::BAD_REQUEST); - if (!self) + if (!self) { return; + } } SetState(AUTHENTICATED); @@ -776,18 +782,18 @@ DCHECK_NE(state_, FAILED); state_ = new_state; - if (event_handler_) + if (event_handler_) { event_handler_->OnSessionStateChange(new_state); + } } } bool JingleSession::is_session_active() { return state_ == CONNECTING || state_ == ACCEPTING || state_ == ACCEPTED || - state_ == AUTHENTICATING || state_ == AUTHENTICATED; + state_ == AUTHENTICATING || state_ == AUTHENTICATED; } -void JingleSession::ProcessIncomingPluginMessage( - const JingleMessage& message) { +void JingleSession::ProcessIncomingPluginMessage(const JingleMessage& message) { if (!message.attachments) { return; }
diff --git a/remoting/protocol/jingle_session.h b/remoting/protocol/jingle_session.h index efbab96..422727a 100644 --- a/remoting/protocol/jingle_session.h +++ b/remoting/protocol/jingle_session.h
@@ -64,7 +64,8 @@ void AcceptIncomingConnection(const JingleMessage& initiate_message); // Callback for Transport interface to send transport-info messages. - void SendTransportInfo(std::unique_ptr<jingle_xmpp::XmlElement> transport_info); + void SendTransportInfo( + std::unique_ptr<jingle_xmpp::XmlElement> transport_info); // Sends |message| to the peer. The session is closed if the send fails or no // response is received within a reasonable time. All other responses are
diff --git a/remoting/protocol/jingle_session_manager.cc b/remoting/protocol/jingle_session_manager.cc index 349a239..66fafdb 100644 --- a/remoting/protocol/jingle_session_manager.cc +++ b/remoting/protocol/jingle_session_manager.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "remoting/protocol/authenticator.h" #include "remoting/protocol/content_description.h" #include "remoting/protocol/jingle_messages.h" @@ -64,10 +64,12 @@ bool JingleSessionManager::OnSignalStrategyIncomingStanza( const jingle_xmpp::XmlElement* stanza) { - if (!JingleMessage::IsJingleMessage(stanza)) + if (!JingleMessage::IsJingleMessage(stanza)) { return false; + } - std::unique_ptr<jingle_xmpp::XmlElement> stanza_copy(new jingle_xmpp::XmlElement(*stanza)); + std::unique_ptr<jingle_xmpp::XmlElement> stanza_copy( + new jingle_xmpp::XmlElement(*stanza)); std::unique_ptr<JingleMessage> message(new JingleMessage()); std::string error_msg; if (!message->ParseXml(stanza, &error_msg)) { @@ -98,8 +100,9 @@ } IncomingSessionResponse response = SessionManager::DECLINE; - if (!incoming_session_callback_.is_null()) + if (!incoming_session_callback_.is_null()) { incoming_session_callback_.Run(session, &response); + } if (response == SessionManager::ACCEPT) { session->AcceptIncomingConnection(*message);
diff --git a/remoting/protocol/jingle_session_manager.h b/remoting/protocol/jingle_session_manager.h index fc40381..bbb3ecd 100644 --- a/remoting/protocol/jingle_session_manager.h +++ b/remoting/protocol/jingle_session_manager.h
@@ -56,7 +56,8 @@ // SignalStrategy::Listener interface. void OnSignalStrategyStateChange(SignalStrategy::State state) override; - bool OnSignalStrategyIncomingStanza(const jingle_xmpp::XmlElement* stanza) override; + bool OnSignalStrategyIncomingStanza( + const jingle_xmpp::XmlElement* stanza) override; typedef std::map<std::string, JingleSession*> SessionsMap;
diff --git a/remoting/protocol/jingle_session_unittest.cc b/remoting/protocol/jingle_session_unittest.cc index 8503952..3c38ffa0 100644 --- a/remoting/protocol/jingle_session_unittest.cc +++ b/remoting/protocol/jingle_session_unittest.cc
@@ -8,7 +8,7 @@ #include <utility> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/run_loop.h" #include "base/strings/string_number_conversions.h" @@ -61,15 +61,15 @@ class MockSessionManagerListener { public: MOCK_METHOD2(OnIncomingSession, - void(Session*, - SessionManager::IncomingSessionResponse*)); + void(Session*, SessionManager::IncomingSessionResponse*)); }; class MockSessionEventHandler : public Session::EventHandler { public: MOCK_METHOD1(OnSessionStateChange, void(Session::State)); - MOCK_METHOD2(OnSessionRouteChange, void(const std::string& channel_name, - const TransportRoute& route)); + MOCK_METHOD2(OnSessionRouteChange, + void(const std::string& channel_name, + const TransportRoute& route)); }; class FakeTransport : public Transport { @@ -78,7 +78,8 @@ return send_transport_info_callback_; } - const std::vector<std::unique_ptr<jingle_xmpp::XmlElement>>& received_messages() { + const std::vector<std::unique_ptr<jingle_xmpp::XmlElement>>& + received_messages() { return received_messages_; } @@ -96,8 +97,9 @@ bool ProcessTransportInfo(jingle_xmpp::XmlElement* transport_info) override { received_messages_.push_back( std::make_unique<jingle_xmpp::XmlElement>(*transport_info)); - if (on_message_callback_) + if (on_message_callback_) { on_message_callback_.Run(); + } return true; } @@ -109,19 +111,19 @@ class FakePlugin : public SessionPlugin { public: - std::unique_ptr<jingle_xmpp::XmlElement> GetNextMessage() override { - std::string tag_name = "test-tag-"; - tag_name += base::NumberToString(outgoing_messages_.size()); - std::unique_ptr<jingle_xmpp::XmlElement> new_message(new jingle_xmpp::XmlElement( - jingle_xmpp::QName("test-namespace", tag_name))); - outgoing_messages_.push_back(*new_message); - return new_message; + std::unique_ptr<jingle_xmpp::XmlElement> GetNextMessage() override { + std::string tag_name = "test-tag-"; + tag_name += base::NumberToString(outgoing_messages_.size()); + std::unique_ptr<jingle_xmpp::XmlElement> new_message( + new jingle_xmpp::XmlElement( + jingle_xmpp::QName("test-namespace", tag_name))); + outgoing_messages_.push_back(*new_message); + return new_message; } void OnIncomingMessage(const jingle_xmpp::XmlElement& attachments) override { for (const jingle_xmpp::XmlElement* it = attachments.FirstElement(); - it != nullptr; - it = it->NextElement()) { + it != nullptr; it = it->NextElement()) { incoming_messages_.push_back(*it); } } @@ -144,9 +146,11 @@ std::vector<jingle_xmpp::XmlElement> incoming_messages_; }; -std::unique_ptr<jingle_xmpp::XmlElement> CreateTransportInfo(const std::string& id) { +std::unique_ptr<jingle_xmpp::XmlElement> CreateTransportInfo( + const std::string& id) { std::unique_ptr<jingle_xmpp::XmlElement> result( - jingle_xmpp::XmlElement::ForStr("<transport xmlns='google:remoting:ice'/>")); + jingle_xmpp::XmlElement::ForStr( + "<transport xmlns='google:remoting:ice'/>")); result->AddAttr(kQNameId, id); return result; } @@ -345,7 +349,6 @@ FakePlugin client_plugin_; }; - // Verify that we can create and destroy session managers without a // connection. TEST_F(JingleSessionTest, CreateAndDestoy) { @@ -383,11 +386,12 @@ ASSERT_GT(host_signal_strategy_->received_messages().size(), 0U); const jingle_xmpp::XmlElement* initiate_xml = host_signal_strategy_->received_messages().front().get(); - const jingle_xmpp::XmlElement* jingle_element = - initiate_xml->FirstNamed(jingle_xmpp::QName("urn:xmpp:jingle:1", "jingle")); + const jingle_xmpp::XmlElement* jingle_element = initiate_xml->FirstNamed( + jingle_xmpp::QName("urn:xmpp:jingle:1", "jingle")); ASSERT_TRUE(jingle_element); - ASSERT_EQ(client_signal_strategy_->GetLocalAddress().id(), - jingle_element->Attr(jingle_xmpp::QName(std::string(), "initiator"))); + ASSERT_EQ( + client_signal_strategy_->GetLocalAddress().id(), + jingle_element->Attr(jingle_xmpp::QName(std::string(), "initiator"))); } // Verify that we can connect two endpoints with multi-step authentication. @@ -504,7 +508,7 @@ SetArgPointee<1>(protocol::SessionManager::ACCEPT))); EXPECT_CALL(host_session_event_handler_, - OnSessionStateChange(Session::ACCEPTED)) + OnSessionStateChange(Session::ACCEPTED)) .Times(AtMost(1)); EXPECT_CALL(host_session_event_handler_, @@ -531,7 +535,7 @@ SetArgPointee<1>(protocol::SessionManager::ACCEPT))); EXPECT_CALL(host_session_event_handler_, - OnSessionStateChange(Session::ACCEPTED)) + OnSessionStateChange(Session::ACCEPTED)) .Times(AtMost(1)); EXPECT_CALL(host_session_event_handler_,
diff --git a/remoting/protocol/message_channel_factory.h b/remoting/protocol/message_channel_factory.h index 282a015..7f7e1d3a 100644 --- a/remoting/protocol/message_channel_factory.h +++ b/remoting/protocol/message_channel_factory.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" namespace remoting::protocol {
diff --git a/remoting/protocol/message_decoder.cc b/remoting/protocol/message_decoder.cc index 28741e4..75574c12 100644 --- a/remoting/protocol/message_decoder.cc +++ b/remoting/protocol/message_decoder.cc
@@ -18,8 +18,7 @@ MessageDecoder::~MessageDecoder() = default; -void MessageDecoder::AddData(scoped_refptr<net::IOBuffer> data, - int data_size) { +void MessageDecoder::AddData(scoped_refptr<net::IOBuffer> data, int data_size) { buffer_.Append(std::move(data), data_size); } @@ -36,8 +35,9 @@ // If the next payload size is still not known or we don't have enough // data for parsing then exit. - if (!next_payload_known_ || buffer_.total_bytes() < next_payload_) + if (!next_payload_known_ || buffer_.total_bytes() < next_payload_) { return nullptr; + } CompoundBuffer* message_buffer = new CompoundBuffer(); message_buffer->CopyFrom(buffer_, 0, next_payload_); @@ -52,8 +52,9 @@ // The header has a size of 4 bytes. const int kHeaderSize = sizeof(int32_t); - if (buffer_.total_bytes() < kHeaderSize) + if (buffer_.total_bytes() < kHeaderSize) { return false; + } CompoundBuffer header_buffer; char header[kHeaderSize];
diff --git a/remoting/protocol/message_decoder_unittest.cc b/remoting/protocol/message_decoder_unittest.cc index 2f9c64b..5924094 100644 --- a/remoting/protocol/message_decoder_unittest.cc +++ b/remoting/protocol/message_decoder_unittest.cc
@@ -20,8 +20,7 @@ static const unsigned int kTestKey = 142; -static void AppendMessage(const EventMessage& msg, - std::string* buffer) { +static void AppendMessage(const EventMessage& msg, std::string* buffer) { // Contains one encoded message. scoped_refptr<net::IOBufferWithSize> encoded_msg; encoded_msg = SerializeAndFrameMessage(msg); @@ -76,8 +75,9 @@ decoder.AddData(buffer, read); while (true) { std::unique_ptr<CompoundBuffer> message(decoder.GetNextMessage()); - if (!message.get()) + if (!message.get()) { break; + } std::unique_ptr<EventMessage> event = std::make_unique<EventMessage>(); CompoundBufferInputStream stream(message.get());
diff --git a/remoting/protocol/message_pipe.h b/remoting/protocol/message_pipe.h index fb980600..65e8ecde 100644 --- a/remoting/protocol/message_pipe.h +++ b/remoting/protocol/message_pipe.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" namespace google { namespace protobuf {
diff --git a/remoting/protocol/message_reader.cc b/remoting/protocol/message_reader.cc index 75382585..c1ce0a8 100644 --- a/remoting/protocol/message_reader.cc +++ b/remoting/protocol/message_reader.cc
@@ -6,9 +6,9 @@ #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/compiler_specific.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/location.h" #include "base/memory/ptr_util.h" #include "base/task/single_thread_task_runner.h" @@ -53,8 +53,9 @@ read_buffer_.get(), kReadBufferSize, base::BindOnce(&MessageReader::OnRead, weak_factory_.GetWeakPtr())); - if (!HandleReadResult(result)) + if (!HandleReadResult(result)) { break; + } } } @@ -99,8 +100,9 @@ // for all of them. while (true) { CompoundBuffer* buffer = message_decoder_.GetNextMessage(); - if (!buffer) + if (!buffer) { break; + } base::SingleThreadTaskRunner::GetCurrentDefault()->PostTask( FROM_HERE, base::BindOnce(&MessageReader::RunCallback, weak_factory_.GetWeakPtr(),
diff --git a/remoting/protocol/message_reader.h b/remoting/protocol/message_reader.h index 094105c5..a080515 100644 --- a/remoting/protocol/message_reader.h +++ b/remoting/protocol/message_reader.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/sequence_checker.h"
diff --git a/remoting/protocol/message_reader_unittest.cc b/remoting/protocol/message_reader_unittest.cc index 93d76d1..1118179c 100644 --- a/remoting/protocol/message_reader_unittest.cc +++ b/remoting/protocol/message_reader_unittest.cc
@@ -5,9 +5,9 @@ #include <memory> #include <string> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "base/synchronization/waitable_event.h" #include "base/test/task_environment.h" @@ -122,8 +122,7 @@ TEST_F(MessageReaderTest, TwoMessages_Separately) { AddMessage(kTestMessage1); - EXPECT_CALL(callback_, OnMessage()) - .Times(1); + EXPECT_CALL(callback_, OnMessage()).Times(1); InitReader(); base::RunLoop().RunUntilIdle(); @@ -136,8 +135,7 @@ EXPECT_TRUE(socket_.read_pending()); // Write another message and verify that we receive it. - EXPECT_CALL(callback_, OnMessage()) - .Times(1); + EXPECT_CALL(callback_, OnMessage()).Times(1); AddMessage(kTestMessage2); base::RunLoop().RunUntilIdle();
diff --git a/remoting/protocol/monitored_video_stub.cc b/remoting/protocol/monitored_video_stub.cc index 0e238f3..2c9aac48 100644 --- a/remoting/protocol/monitored_video_stub.cc +++ b/remoting/protocol/monitored_video_stub.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" #include "base/check.h" +#include "base/functional/bind.h" #include "remoting/proto/video.pb.h" namespace remoting::protocol { @@ -22,8 +22,7 @@ FROM_HERE, connectivity_check_delay, this, - &MonitoredVideoStub::OnConnectivityCheckTimeout) { -} + &MonitoredVideoStub::OnConnectivityCheckTimeout) {} MonitoredVideoStub::~MonitoredVideoStub() { DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
diff --git a/remoting/protocol/monitored_video_stub.h b/remoting/protocol/monitored_video_stub.h index d980857e..46e09dd0 100644 --- a/remoting/protocol/monitored_video_stub.h +++ b/remoting/protocol/monitored_video_stub.h
@@ -5,7 +5,7 @@ #ifndef REMOTING_PROTOCOL_MONITORED_VIDEO_STUB_H_ #define REMOTING_PROTOCOL_MONITORED_VIDEO_STUB_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/threading/thread_checker.h" #include "base/timer/timer.h" @@ -29,10 +29,9 @@ static const int kConnectivityCheckDelaySeconds = 2; - MonitoredVideoStub( - VideoStub* video_stub, - base::TimeDelta connectivity_check_delay, - const ChannelStateCallback& callback); + MonitoredVideoStub(VideoStub* video_stub, + base::TimeDelta connectivity_check_delay, + const ChannelStateCallback& callback); MonitoredVideoStub(const MonitoredVideoStub&) = delete; MonitoredVideoStub& operator=(const MonitoredVideoStub&) = delete;
diff --git a/remoting/protocol/monitored_video_stub_unittest.cc b/remoting/protocol/monitored_video_stub_unittest.cc index 3722cd1a..ce4f8f57 100644 --- a/remoting/protocol/monitored_video_stub_unittest.cc +++ b/remoting/protocol/monitored_video_stub_unittest.cc
@@ -9,7 +9,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/task/single_thread_task_runner.h" #include "base/test/task_environment.h"
diff --git a/remoting/protocol/mouse_input_filter_unittest.cc b/remoting/protocol/mouse_input_filter_unittest.cc index e7404679..687e362a 100644 --- a/remoting/protocol/mouse_input_filter_unittest.cc +++ b/remoting/protocol/mouse_input_filter_unittest.cc
@@ -53,8 +53,9 @@ void InjectMouse(const Point& point, bool swap = false) { mouse_filter_.InjectMouseEvent(MouseMoveEvent(point.x, point.y)); - if (swap) + if (swap) { mouse_filter_.InjectMouseEvent(MouseMoveEvent(point.y, point.x)); + } } void ExpectNoMouse() { @@ -78,12 +79,14 @@ bool swap = false) { { InSequence s; - for (unsigned int i = 0; i < len; ++i) + for (unsigned int i = 0; i < len; ++i) { ExpectMouse(expected[i], swap); + } } - for (unsigned int i = 0; i < len; ++i) + for (unsigned int i = 0; i < len; ++i) { InjectMouse(injected[i], swap); + } } protected:
diff --git a/remoting/protocol/named_message_pipe_handler.cc b/remoting/protocol/named_message_pipe_handler.cc index 2e7d21e..d27c622 100644 --- a/remoting/protocol/named_message_pipe_handler.cc +++ b/remoting/protocol/named_message_pipe_handler.cc
@@ -15,8 +15,7 @@ NamedMessagePipeHandler::NamedMessagePipeHandler( const std::string& name, std::unique_ptr<MessagePipe> pipe) - : name_(name), - pipe_(std::move(pipe)) { + : name_(name), pipe_(std::move(pipe)) { DCHECK(pipe_); pipe_->Start(this); }
diff --git a/remoting/protocol/named_message_pipe_handler.h b/remoting/protocol/named_message_pipe_handler.h index 071ceab..02a2883 100644 --- a/remoting/protocol/named_message_pipe_handler.h +++ b/remoting/protocol/named_message_pipe_handler.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/task/sequenced_task_runner_helpers.h" #include "base/threading/thread_checker.h" #include "remoting/protocol/message_pipe.h"
diff --git a/remoting/protocol/negotiating_authenticator_base.cc b/remoting/protocol/negotiating_authenticator_base.cc index b00e1bfd..74626427 100644 --- a/remoting/protocol/negotiating_authenticator_base.cc +++ b/remoting/protocol/negotiating_authenticator_base.cc
@@ -8,9 +8,9 @@ #include <sstream> #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/check_op.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/strings/string_split.h" #include "remoting/base/constants.h" #include "remoting/base/name_value_map.h" @@ -45,8 +45,8 @@ } // namespace -const jingle_xmpp::StaticQName NegotiatingAuthenticatorBase::kMethodAttributeQName = { - "", "method"}; +const jingle_xmpp::StaticQName + NegotiatingAuthenticatorBase::kMethodAttributeQName = {"", "method"}; const jingle_xmpp::StaticQName NegotiatingAuthenticatorBase::kSupportedMethodsAttributeQName = { "", "supported-methods"}; @@ -54,8 +54,8 @@ const jingle_xmpp::StaticQName NegotiatingAuthenticatorBase::kPairingInfoTag = { kChromotingXmlNamespace, "pairing-info"}; -const jingle_xmpp::StaticQName NegotiatingAuthenticatorBase::kClientIdAttribute = { - "", "client-id"}; +const jingle_xmpp::StaticQName + NegotiatingAuthenticatorBase::kClientIdAttribute = {"", "client-id"}; NegotiatingAuthenticatorBase::NegotiatingAuthenticatorBase( Authenticator::State initial_state) @@ -74,8 +74,8 @@ return current_authenticator_->started(); } -Authenticator::RejectionReason -NegotiatingAuthenticatorBase::rejection_reason() const { +Authenticator::RejectionReason NegotiatingAuthenticatorBase::rejection_reason() + const { return rejection_reason_; } @@ -83,8 +83,9 @@ NegotiatingAuthenticatorBase::Method NegotiatingAuthenticatorBase::ParseMethodString(const std::string& value) { Method result; - if (!NameToValue(kAuthenticationMethodStrings, value, &result)) + if (!NameToValue(kAuthenticationMethodStrings, value, &result)) { return Method::INVALID; + } return result; } @@ -125,8 +126,9 @@ DCHECK(state_ == MESSAGE_READY || state_ == ACCEPTED || state_ == REJECTED) << "State: " << state_; - if (state_ == REJECTED) + if (state_ == REJECTED) { rejection_reason_ = current_authenticator_->rejection_reason(); + } std::move(resume_callback).Run(); }
diff --git a/remoting/protocol/negotiating_authenticator_unittest.cc b/remoting/protocol/negotiating_authenticator_unittest.cc index 5a6cd689..7d9c2ab 100644 --- a/remoting/protocol/negotiating_authenticator_unittest.cc +++ b/remoting/protocol/negotiating_authenticator_unittest.cc
@@ -4,7 +4,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/raw_ptr.h" #include "base/ranges/algorithm.h" #include "base/run_loop.h" @@ -105,8 +105,8 @@ pairing_registry_ = new SynchronousPairingRegistry( std::make_unique<MockPairingRegistryDelegate>()); if (with_paired_client) { - PairingRegistry::Pairing pairing( - base::Time(), kTestClientName, kTestClientId, kTestPairedSecret); + PairingRegistry::Pairing pairing(base::Time(), kTestClientName, + kTestClientId, kTestPairedSecret); pairing_registry_->AddPairing(pairing); } } @@ -177,39 +177,39 @@ class NegotiatingPairingAuthenticatorTest : public NegotiatingAuthenticatorTest, public testing::WithParamInterface<PairingTestParameters> { -public: - void InitAuthenticators(const std::string& client_id, - const std::string& client_paired_secret, - const std::string& client_interactive_pin, - const std::string& host_secret) override { - NegotiatingAuthenticatorTest::InitAuthenticators( - client_id, client_paired_secret, client_interactive_pin, host_secret); - if (!GetParam().p224_on_client) { - DisableMethodOnClient( - NegotiatingAuthenticatorBase::Method::PAIRED_SPAKE2_P224); - } - if (!GetParam().curve25519_on_client) { - DisableMethodOnClient( - NegotiatingAuthenticatorBase::Method::PAIRED_SPAKE2_CURVE25519); - } - if (!GetParam().p224_on_host) { - DisableMethodOnHost( - NegotiatingAuthenticatorBase::Method::PAIRED_SPAKE2_P224); - } - if (!GetParam().curve25519_on_host) { - DisableMethodOnHost( - NegotiatingAuthenticatorBase::Method::PAIRED_SPAKE2_CURVE25519); - } - } + public: + void InitAuthenticators(const std::string& client_id, + const std::string& client_paired_secret, + const std::string& client_interactive_pin, + const std::string& host_secret) override { + NegotiatingAuthenticatorTest::InitAuthenticators( + client_id, client_paired_secret, client_interactive_pin, host_secret); + if (!GetParam().p224_on_client) { + DisableMethodOnClient( + NegotiatingAuthenticatorBase::Method::PAIRED_SPAKE2_P224); + } + if (!GetParam().curve25519_on_client) { + DisableMethodOnClient( + NegotiatingAuthenticatorBase::Method::PAIRED_SPAKE2_CURVE25519); + } + if (!GetParam().p224_on_host) { + DisableMethodOnHost( + NegotiatingAuthenticatorBase::Method::PAIRED_SPAKE2_P224); + } + if (!GetParam().curve25519_on_host) { + DisableMethodOnHost( + NegotiatingAuthenticatorBase::Method::PAIRED_SPAKE2_CURVE25519); + } + } - void VerifyAccepted() override { - NegotiatingAuthenticatorTest::VerifyAccepted(); - EXPECT_TRUE( - current_method() == - NegotiatingAuthenticatorBase::Method::PAIRED_SPAKE2_P224 || - current_method() == - NegotiatingAuthenticatorBase::Method::PAIRED_SPAKE2_CURVE25519); - } + void VerifyAccepted() override { + NegotiatingAuthenticatorTest::VerifyAccepted(); + EXPECT_TRUE( + current_method() == + NegotiatingAuthenticatorBase::Method::PAIRED_SPAKE2_P224 || + current_method() == + NegotiatingAuthenticatorBase::Method::PAIRED_SPAKE2_CURVE25519); + } }; INSTANTIATE_TEST_SUITE_P( @@ -232,8 +232,8 @@ PairingTestParameters{true, true, true, false})); TEST_F(NegotiatingAuthenticatorTest, SuccessfulAuthSharedSecret) { - ASSERT_NO_FATAL_FAILURE(InitAuthenticators(kNoClientId, kNoPairedSecret, - kTestPin, kTestPin)); + ASSERT_NO_FATAL_FAILURE( + InitAuthenticators(kNoClientId, kNoPairedSecret, kTestPin, kTestPin)); VerifyAccepted(); EXPECT_EQ( NegotiatingAuthenticatorBase::Method::SHARED_SECRET_SPAKE2_CURVE25519, @@ -241,8 +241,8 @@ } TEST_F(NegotiatingAuthenticatorTest, InvalidSharedSecret) { - ASSERT_NO_FATAL_FAILURE(InitAuthenticators(kNoClientId, kNoPairedSecret, - kTestPinBad, kTestPin)); + ASSERT_NO_FATAL_FAILURE( + InitAuthenticators(kNoClientId, kNoPairedSecret, kTestPinBad, kTestPin)); ASSERT_NO_FATAL_FAILURE(RunAuthExchange()); VerifyRejected(Authenticator::RejectionReason::INVALID_CREDENTIALS);
diff --git a/remoting/protocol/negotiating_client_authenticator.cc b/remoting/protocol/negotiating_client_authenticator.cc index 2344575..a96780a 100644 --- a/remoting/protocol/negotiating_client_authenticator.cc +++ b/remoting/protocol/negotiating_client_authenticator.cc
@@ -8,10 +8,10 @@ #include <sstream> #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/check_op.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/ptr_util.h" #include "base/notreached.h" #include "base/strings/string_split.h" @@ -104,7 +104,8 @@ if (is_paired()) { // If the client is paired with the host then attach pairing client_id to // the message. - jingle_xmpp::XmlElement* pairing_tag = new jingle_xmpp::XmlElement(kPairingInfoTag); + jingle_xmpp::XmlElement* pairing_tag = + new jingle_xmpp::XmlElement(kPairingInfoTag); result->AddElement(pairing_tag); pairing_tag->AddAttr(kClientIdAttribute, config_.pairing_client_id); } @@ -112,8 +113,9 @@ // Include a list of supported methods. std::string supported_methods; for (Method method : methods_) { - if (!supported_methods.empty()) + if (!supported_methods.empty()) { supported_methods += kSupportedMethodsSeparator; + } supported_methods += MethodToString(method); } result->AddAttr(kSupportedMethodsAttributeQName, supported_methods);
diff --git a/remoting/protocol/negotiating_host_authenticator.cc b/remoting/protocol/negotiating_host_authenticator.cc index 78b78a8..3b6c5410 100644 --- a/remoting/protocol/negotiating_host_authenticator.cc +++ b/remoting/protocol/negotiating_host_authenticator.cc
@@ -8,10 +8,10 @@ #include <sstream> #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/check_op.h" #include "base/containers/contains.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/notreached.h" #include "base/strings/string_split.h" #include "remoting/base/rsa_key_pair.h" @@ -84,7 +84,8 @@ DCHECK_EQ(state(), WAITING_MESSAGE); state_ = PROCESSING_MESSAGE; - const jingle_xmpp::XmlElement* pairing_tag = message->FirstNamed(kPairingInfoTag); + const jingle_xmpp::XmlElement* pairing_tag = + message->FirstNamed(kPairingInfoTag); if (pairing_tag) { client_id_ = pairing_tag->Attr(kClientIdAttribute); } @@ -118,10 +119,9 @@ // Find the first mutually-supported method in the client's list of // supported-methods. - for (const std::string& method_str : - base::SplitString(supported_methods_attr, - std::string(1, kSupportedMethodsSeparator), - base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL)) { + for (const std::string& method_str : base::SplitString( + supported_methods_attr, std::string(1, kSupportedMethodsSeparator), + base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL)) { Method list_value = ParseMethodString(method_str); if (list_value != Method::INVALID && base::Contains(methods_, list_value)) { @@ -176,7 +176,7 @@ base::OnceClosure resume_callback) { DCHECK(current_method_ != Method::INVALID); - switch(current_method_) { + switch (current_method_) { case Method::INVALID: NOTREACHED(); break;
diff --git a/remoting/protocol/network_settings.h b/remoting/protocol/network_settings.h index ceba591..9379d89 100644 --- a/remoting/protocol/network_settings.h +++ b/remoting/protocol/network_settings.h
@@ -13,7 +13,6 @@ namespace remoting::protocol { struct NetworkSettings { - // When hosts are configured with NAT traversal disabled they will // typically also limit their P2P ports to this range, so that // sessions may be blocked or un-blocked via firewall rules. @@ -37,8 +36,8 @@ NAT_TRAVERSAL_RELAY = 0x4, // Active NAT traversal using STUN and relay servers. - NAT_TRAVERSAL_FULL = NAT_TRAVERSAL_STUN | NAT_TRAVERSAL_RELAY | - NAT_TRAVERSAL_OUTGOING + NAT_TRAVERSAL_FULL = + NAT_TRAVERSAL_STUN | NAT_TRAVERSAL_RELAY | NAT_TRAVERSAL_OUTGOING }; NetworkSettings() {}
diff --git a/remoting/protocol/observing_input_filter.h b/remoting/protocol/observing_input_filter.h index dc58e990..e74f9492 100644 --- a/remoting/protocol/observing_input_filter.h +++ b/remoting/protocol/observing_input_filter.h
@@ -7,7 +7,7 @@ #include <functional> -#include "base/callback.h" +#include "base/functional/callback.h" #include "remoting/proto/event.pb.h" #include "remoting/protocol/input_filter.h" #include "third_party/abseil-cpp/absl/types/variant.h"
diff --git a/remoting/protocol/pairing_authenticator_base.cc b/remoting/protocol/pairing_authenticator_base.cc index ca079e89..9f7fd75 100644 --- a/remoting/protocol/pairing_authenticator_base.cc +++ b/remoting/protocol/pairing_authenticator_base.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/logging.h" #include "remoting/base/constants.h" #include "remoting/protocol/channel_authenticator.h" @@ -15,9 +15,9 @@ namespace remoting::protocol { namespace { -const jingle_xmpp::StaticQName kPairingFailedTag = - { kChromotingXmlNamespace, "pairing-failed" }; -const jingle_xmpp::StaticQName kPairingErrorAttribute = { "", "error" }; +const jingle_xmpp::StaticQName kPairingFailedTag = {kChromotingXmlNamespace, + "pairing-failed"}; +const jingle_xmpp::StaticQName kPairingErrorAttribute = {"", "error"}; } // namespace PairingAuthenticatorBase::PairingAuthenticatorBase() {} @@ -35,8 +35,8 @@ return spake2_authenticator_->started(); } -Authenticator::RejectionReason -PairingAuthenticatorBase::rejection_reason() const { +Authenticator::RejectionReason PairingAuthenticatorBase::rejection_reason() + const { if (!spake2_authenticator_) { return RejectionReason::PROTOCOL_ERROR; }
diff --git a/remoting/protocol/pairing_client_authenticator.cc b/remoting/protocol/pairing_client_authenticator.cc index 7193120a..d07160fa 100644 --- a/remoting/protocol/pairing_client_authenticator.cc +++ b/remoting/protocol/pairing_client_authenticator.cc
@@ -4,8 +4,8 @@ #include "remoting/protocol/pairing_client_authenticator.h" -#include "base/bind.h" #include "base/check.h" +#include "base/functional/bind.h" #include "remoting/base/constants.h" #include "remoting/protocol/auth_util.h" #include "remoting/protocol/channel_authenticator.h" @@ -46,8 +46,9 @@ } Authenticator::State PairingClientAuthenticator::state() const { - if (waiting_for_pin_) + if (waiting_for_pin_) { return PROCESSING_MESSAGE; + } return PairingAuthenticatorBase::state(); }
diff --git a/remoting/protocol/pairing_host_authenticator.cc b/remoting/protocol/pairing_host_authenticator.cc index 3e369b9..0b6682a 100644 --- a/remoting/protocol/pairing_host_authenticator.cc +++ b/remoting/protocol/pairing_host_authenticator.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "remoting/base/constants.h" #include "remoting/protocol/channel_authenticator.h" @@ -57,8 +57,8 @@ return PairingAuthenticatorBase::state(); } -Authenticator::RejectionReason -PairingHostAuthenticator::rejection_reason() const { +Authenticator::RejectionReason PairingHostAuthenticator::rejection_reason() + const { if (protocol_error_) { return RejectionReason::PROTOCOL_ERROR; }
diff --git a/remoting/protocol/pairing_registry.cc b/remoting/protocol/pairing_registry.cc index fe2487e..40b65f9 100644 --- a/remoting/protocol/pairing_registry.cc +++ b/remoting/protocol/pairing_registry.cc
@@ -9,7 +9,7 @@ #include <utility> #include "base/base64.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/guid.h" #include "base/json/json_string_value_serializer.h" #include "base/location.h" @@ -38,8 +38,7 @@ : created_time_(created_time), client_name_(client_name), client_id_(client_id), - shared_secret_(shared_secret) { -} + shared_secret_(shared_secret) {} PairingRegistry::Pairing::Pairing(const Pairing& other) = default; @@ -80,15 +79,15 @@ pairing.Set(kCreatedTimeKey, static_cast<double>(created_time().ToJsTime())); pairing.Set(kClientNameKey, client_name()); pairing.Set(kClientIdKey, client_id()); - if (!shared_secret().empty()) + if (!shared_secret().empty()) { pairing.Set(kSharedSecretKey, shared_secret()); + } return pairing; } bool PairingRegistry::Pairing::operator==(const Pairing& other) const { return created_time_ == other.created_time_ && - client_id_ == other.client_id_ && - client_name_ == other.client_name_ && + client_id_ == other.client_id_ && client_name_ == other.client_name_ && shared_secret_ == other.shared_secret_; } @@ -222,8 +221,9 @@ void PairingRegistry::InvokeDoneCallbackAndScheduleNext(DoneCallback callback, bool success) { // CreatePairing doesn't have a callback, so the callback can be null. - if (callback) + if (callback) { std::move(callback).Run(success); + } pending_requests_.pop(); ServiceNextRequest(); @@ -264,11 +264,8 @@ } // Clear the shared secrect and append the pairing data to the list. - Pairing sanitized_pairing( - pairing.created_time(), - pairing.client_name(), - pairing.client_id(), - ""); + Pairing sanitized_pairing(pairing.created_time(), pairing.client_name(), + pairing.client_id(), ""); sanitized_pairings.Append(sanitized_pairing.ToValue()); } @@ -284,8 +281,9 @@ } void PairingRegistry::ServiceNextRequest() { - if (pending_requests_.empty()) + if (pending_requests_.empty()) { return; + } PostTask(delegate_task_runner_, FROM_HERE, std::move(pending_requests_.front()));
diff --git a/remoting/protocol/pairing_registry.h b/remoting/protocol/pairing_registry.h index e367f1a1..ae67252 100644 --- a/remoting/protocol/pairing_registry.h +++ b/remoting/protocol/pairing_registry.h
@@ -10,8 +10,8 @@ #include <string> #include <vector> -#include "base/callback.h" #include "base/containers/queue.h" +#include "base/functional/callback.h" #include "base/gtest_prod_util.h" #include "base/memory/ref_counted.h" #include "base/time/time.h"
diff --git a/remoting/protocol/pairing_registry_unittest.cc b/remoting/protocol/pairing_registry_unittest.cc index a53c6ec..94a63f1f 100644 --- a/remoting/protocol/pairing_registry_unittest.cc +++ b/remoting/protocol/pairing_registry_unittest.cc
@@ -9,8 +9,8 @@ #include <algorithm> #include <utility> -#include "base/bind.h" #include "base/compiler_specific.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/task/single_thread_task_runner.h" #include "base/test/task_environment.h" @@ -196,14 +196,12 @@ .InSequence(s); EXPECT_CALL(callbacks, GetPairingCallback(EqualsClientName("client2"))) .InSequence(s); - EXPECT_CALL(callbacks, DoneCallback(true)) - .InSequence(s); + EXPECT_CALL(callbacks, DoneCallback(true)).InSequence(s); EXPECT_CALL(callbacks, GetPairingCallback(EqualsClientName("client1"))) .InSequence(s); EXPECT_CALL(callbacks, GetPairingCallback(EqualsClientName(""))) .InSequence(s); - EXPECT_CALL(callbacks, DoneCallback(true)) - .InSequence(s); + EXPECT_CALL(callbacks, DoneCallback(true)).InSequence(s); EXPECT_CALL(callbacks, GetAllPairingsCallback(NoPairings())).InSequence(s); EXPECT_CALL(callbacks, GetPairingCallback(EqualsClientName("client3"))) .InSequence(s)
diff --git a/remoting/protocol/performance_tracker.cc b/remoting/protocol/performance_tracker.cc index bf37a35..4b2eb59 100644 --- a/remoting/protocol/performance_tracker.cc +++ b/remoting/protocol/performance_tracker.cc
@@ -4,7 +4,7 @@ #include "remoting/protocol/performance_tracker.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/time/time.h" #include "remoting/protocol/frame_stats.h" @@ -37,8 +37,9 @@ video_packet_rate_.Record(1); // Use only non-empty frames to estimate frame rate. - if (stats.host_stats.frame_size) + if (stats.host_stats.frame_size) { video_frame_rate_.Record(1); + } video_bandwidth_.Record(stats.host_stats.frame_size); @@ -67,8 +68,9 @@ // |latest_event_timestamp| is set only for the first frame after an input // event. - if (stats.host_stats.latest_event_timestamp.is_null()) + if (stats.host_stats.latest_event_timestamp.is_null()) { return; + } // For empty frames use time_received as time_rendered. base::TimeTicks time_rendered = (stats.host_stats.frame_size > 0)
diff --git a/remoting/protocol/port_allocator.cc b/remoting/protocol/port_allocator.cc index 409e7ab3..1e737692 100644 --- a/remoting/protocol/port_allocator.cc +++ b/remoting/protocol/port_allocator.cc
@@ -7,8 +7,8 @@ #include <algorithm> #include <map> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "remoting/protocol/network_settings.h" #include "remoting/protocol/transport_context.h" #include "third_party/abseil-cpp/absl/strings/string_view.h" @@ -37,11 +37,13 @@ NetworkSettings network_settings = transport_context_->network_settings(); - if (!(network_settings.flags & NetworkSettings::NAT_TRAVERSAL_STUN)) + if (!(network_settings.flags & NetworkSettings::NAT_TRAVERSAL_STUN)) { flags |= cricket::PORTALLOCATOR_DISABLE_STUN; + } - if (!(network_settings.flags & NetworkSettings::NAT_TRAVERSAL_RELAY)) + if (!(network_settings.flags & NetworkSettings::NAT_TRAVERSAL_RELAY)) { flags |= cricket::PORTALLOCATOR_DISABLE_RELAY; + } set_flags(flags); SetPortRange(network_settings.port_range.min_port,
diff --git a/remoting/protocol/port_range.cc b/remoting/protocol/port_range.cc index 360c308..0c63b264 100644 --- a/remoting/protocol/port_range.cc +++ b/remoting/protocol/port_range.cc
@@ -23,8 +23,9 @@ } size_t separator_index = port_range.find('-'); - if (separator_index == std::string::npos) + if (separator_index == std::string::npos) { return false; + } std::string min_port_string, max_port_string; base::TrimWhitespaceASCII(port_range.substr(0, separator_index), @@ -38,8 +39,9 @@ return false; } - if (min_port == 0 || min_port > max_port || max_port > USHRT_MAX) + if (min_port == 0 || min_port > max_port || max_port > USHRT_MAX) { return false; + } result->min_port = static_cast<uint16_t>(min_port); result->max_port = static_cast<uint16_t>(max_port);
diff --git a/remoting/protocol/port_range.h b/remoting/protocol/port_range.h index 0f7a57d..94bb9c7 100644 --- a/remoting/protocol/port_range.h +++ b/remoting/protocol/port_range.h
@@ -10,7 +10,6 @@ #include <ostream> #include <string> - namespace remoting { // Wrapper for a value of UdpPortRange policy.
diff --git a/remoting/protocol/pseudotcp_adapter.cc b/remoting/protocol/pseudotcp_adapter.cc index 497dcc06..2439a1a8 100644 --- a/remoting/protocol/pseudotcp_adapter.cc +++ b/remoting/protocol/pseudotcp_adapter.cc
@@ -8,8 +8,8 @@ #include <utility> -#include "base/bind.h" #include "base/compiler_specific.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/time/time.h" #include "base/timer/timer.h" @@ -181,8 +181,9 @@ return result; } - if (result < 0) + if (result < 0) { return result; + } // Need to wait until the data is sent to the peer when // send-confirmation mode is enabled. @@ -208,8 +209,9 @@ // Start the connection attempt. int result = pseudo_tcp_.Connect(); - if (result < 0) + if (result < 0) { return callback; + } AdjustClock(); @@ -222,8 +224,9 @@ void PseudoTcpAdapter::Core::OnTcpOpen(PseudoTcp* tcp) { DCHECK(tcp == &pseudo_tcp_); - if (connect_callback_) + if (connect_callback_) { std::move(connect_callback_).Run(net::OK); + } OnTcpReadable(tcp); OnTcpWriteable(tcp); @@ -231,15 +234,17 @@ void PseudoTcpAdapter::Core::OnTcpReadable(PseudoTcp* tcp) { DCHECK_EQ(tcp, &pseudo_tcp_); - if (read_callback_.is_null()) + if (read_callback_.is_null()) { return; + } int result = pseudo_tcp_.Recv(read_buffer_->data(), read_buffer_size_); if (result < 0) { result = net::MapSystemError(pseudo_tcp_.GetError()); DCHECK(result < 0); - if (result == net::ERR_IO_PENDING) + if (result == net::ERR_IO_PENDING) { return; + } } AdjustClock(); @@ -250,8 +255,9 @@ void PseudoTcpAdapter::Core::OnTcpWriteable(PseudoTcp* tcp) { DCHECK_EQ(tcp, &pseudo_tcp_); - if (write_callback_.is_null()) + if (write_callback_.is_null()) { return; + } if (waiting_write_position_) { CheckWriteComplete(); @@ -262,8 +268,9 @@ if (result < 0) { result = net::MapSystemError(pseudo_tcp_.GetError()); DCHECK(result < 0); - if (result == net::ERR_IO_PENDING) + if (result == net::ERR_IO_PENDING) { return; + } } AdjustClock(); @@ -335,8 +342,9 @@ // If we already have a write pending, we behave like a congested network, // returning success for the write, but dropping the packet. PseudoTcp will // back-off and retransmit, adjusting for the perceived congestion. - if (socket_write_pending_) + if (socket_write_pending_) { return IPseudoTcpNotify::WR_SUCCESS; + } scoped_refptr<net::IOBuffer> write_buffer = base::MakeRefCounted<net::IOBuffer>(len); @@ -366,16 +374,18 @@ } void PseudoTcpAdapter::Core::DoReadFromSocket() { - if (!socket_read_buffer_.get()) + if (!socket_read_buffer_.get()) { socket_read_buffer_ = base::MakeRefCounted<net::IOBuffer>(kReadBufferSize); + } int result = 1; while (socket_ && result > 0) { result = socket_->Recv(socket_read_buffer_.get(), kReadBufferSize, base::BindRepeating(&PseudoTcpAdapter::Core::OnRead, base::Unretained(this))); - if (result != net::ERR_IO_PENDING) + if (result != net::ERR_IO_PENDING) { HandleReadResults(result); + } } } @@ -397,8 +407,9 @@ scoped_refptr<Core> core(this); HandleReadResults(result); - if (result >= 0) + if (result >= 0) { DoReadFromSocket(); + } } void PseudoTcpAdapter::Core::OnWritten(int result) {
diff --git a/remoting/protocol/pseudotcp_adapter_unittest.cc b/remoting/protocol/pseudotcp_adapter_unittest.cc index 4a30268..5b5bc1cb 100644 --- a/remoting/protocol/pseudotcp_adapter_unittest.cc +++ b/remoting/protocol/pseudotcp_adapter_unittest.cc
@@ -8,10 +8,10 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/compiler_specific.h" #include "base/containers/circular_deque.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h" @@ -52,8 +52,7 @@ : volume_(volume), rate_(rate), level_(0.0), - last_update_(base::TimeTicks::Now()) { - } + last_update_(base::TimeTicks::Now()) {} ~LeakyBucket() override = default; @@ -84,8 +83,9 @@ ~FakeSocket() override = default; void AppendInputPacket(const std::vector<char>& data) { - if (rate_limiter_ && rate_limiter_->DropNextPacket()) + if (rate_limiter_ && rate_limiter_->DropNextPacket()) { return; // Lose the packet. + } if (!read_callback_.is_null()) { int size = std::min(read_buffer_size_, static_cast<int>(data.size())); @@ -99,9 +99,7 @@ } } - void Connect(FakeSocket* peer_socket) { - peer_socket_ = peer_socket; - } + void Connect(FakeSocket* peer_socket) { peer_socket_ = peer_socket; } void set_rate_limiter(RateLimiter* rate_limiter) { rate_limiter_ = rate_limiter; @@ -118,8 +116,8 @@ if (incoming_packets_.size() > 0) { scoped_refptr<net::IOBuffer> buffer(buf); - int size = std::min( - static_cast<int>(incoming_packets_.front().size()), buf_len); + int size = + std::min(static_cast<int>(incoming_packets_.front().size()), buf_len); memcpy(buffer->data(), &*incoming_packets_.front().begin(), size); incoming_packets_.pop_front(); return size; @@ -185,8 +183,8 @@ output_buffer_->SetOffset(0); ASSERT_EQ(kTestDataSize, output_buffer_->size()); - EXPECT_EQ(0, memcmp(output_buffer_->data(), - input_buffer_->StartOfBuffer(), kTestDataSize)); + EXPECT_EQ(0, memcmp(output_buffer_->data(), input_buffer_->StartOfBuffer(), + kTestDataSize)); } protected: @@ -217,11 +215,12 @@ void DoWrite() { int result = 1; while (result > 0) { - if (output_buffer_->BytesRemaining() == 0) + if (output_buffer_->BytesRemaining() == 0) { break; + } - int bytes_to_write = std::min(output_buffer_->BytesRemaining(), - kMessageSize); + int bytes_to_write = + std::min(output_buffer_->BytesRemaining(), kMessageSize); result = client_socket_->Write( output_buffer_.get(), bytes_to_write, base::BindOnce(&TCPChannelTester::OnWritten, base::Unretained(this)), @@ -272,8 +271,9 @@ } else if (result > 0) { // Allocate memory for the next read. input_buffer_->SetCapacity(input_buffer_->capacity() + result); - if (input_buffer_->capacity() == kTestDataSize + kMessageSize) + if (input_buffer_->capacity() == kTestDataSize + kMessageSize) { Done(); + } } }
diff --git a/remoting/protocol/pseudotcp_channel_factory.cc b/remoting/protocol/pseudotcp_channel_factory.cc index 2cf4e4a..10c9428 100644 --- a/remoting/protocol/pseudotcp_channel_factory.cc +++ b/remoting/protocol/pseudotcp_channel_factory.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "net/base/net_errors.h" #include "remoting/base/constants.h" #include "remoting/protocol/datagram_channel_factory.h" @@ -30,8 +30,7 @@ PseudoTcpChannelFactory::PseudoTcpChannelFactory( DatagramChannelFactory* datagram_channel_factory) - : datagram_channel_factory_(datagram_channel_factory) { -} + : datagram_channel_factory_(datagram_channel_factory) {} PseudoTcpChannelFactory::~PseudoTcpChannelFactory() { // CancelChannelCreation() is expected to be called before destruction. @@ -69,14 +68,16 @@ // TODO(sergeyu): This is a hack to improve latency of the video channel. // Consider removing it once we have better flow control implemented. - if (name == kVideoChannelName) + if (name == kVideoChannelName) { adapter->SetWriteWaitsForSend(true); + } net::CompletionOnceCallback returned_callback = adapter->Connect( base::BindOnce(&PseudoTcpChannelFactory::OnPseudoTcpConnected, base::Unretained(this), name, std::move(callback))); - if (returned_callback) + if (returned_callback) { std::move(returned_callback).Run(net::ERR_FAILED); + } } void PseudoTcpChannelFactory::OnPseudoTcpConnected( @@ -88,8 +89,9 @@ std::unique_ptr<P2PStreamSocket> socket(it->second); pending_sockets_.erase(it); - if (result != net::OK) + if (result != net::OK) { socket.reset(); + } std::move(callback).Run(std::move(socket)); }
diff --git a/remoting/protocol/rejecting_authenticator.cc b/remoting/protocol/rejecting_authenticator.cc index f940c588..c39123c7a 100644 --- a/remoting/protocol/rejecting_authenticator.cc +++ b/remoting/protocol/rejecting_authenticator.cc
@@ -4,8 +4,8 @@ #include "remoting/protocol/rejecting_authenticator.h" -#include "base/callback.h" #include "base/check_op.h" +#include "base/functional/callback.h" #include "base/notreached.h" #include "remoting/protocol/channel_authenticator.h" #include "third_party/libjingle_xmpp/xmllite/xmlelement.h" @@ -13,8 +13,7 @@ namespace remoting::protocol { RejectingAuthenticator::RejectingAuthenticator(RejectionReason rejection_reason) - : rejection_reason_(rejection_reason) { -} + : rejection_reason_(rejection_reason) {} RejectingAuthenticator::~RejectingAuthenticator() = default; @@ -25,8 +24,8 @@ return true; } -Authenticator::RejectionReason -RejectingAuthenticator::rejection_reason() const { +Authenticator::RejectionReason RejectingAuthenticator::rejection_reason() + const { DCHECK_EQ(state_, REJECTED); return rejection_reason_; } @@ -39,7 +38,8 @@ std::move(resume_callback).Run(); } -std::unique_ptr<jingle_xmpp::XmlElement> RejectingAuthenticator::GetNextMessage() { +std::unique_ptr<jingle_xmpp::XmlElement> +RejectingAuthenticator::GetNextMessage() { NOTREACHED(); return nullptr; }
diff --git a/remoting/protocol/remoting_ice_config_request.cc b/remoting/protocol/remoting_ice_config_request.cc index aea2773..9ed5e18b 100644 --- a/remoting/protocol/remoting_ice_config_request.cc +++ b/remoting/protocol/remoting_ice_config_request.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "build/build_config.h" #include "build/chromeos_buildflags.h" #include "google_apis/google_api_keys.h"
diff --git a/remoting/protocol/remoting_ice_config_request.h b/remoting/protocol/remoting_ice_config_request.h index 1de6b873..b86e4de 100644 --- a/remoting/protocol/remoting_ice_config_request.h +++ b/remoting/protocol/remoting_ice_config_request.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "remoting/base/protobuf_http_client.h" #include "remoting/protocol/ice_config_request.h"
diff --git a/remoting/protocol/remoting_ice_config_request_unittest.cc b/remoting/protocol/remoting_ice_config_request_unittest.cc index ae2b1b4..0ad1418 100644 --- a/remoting/protocol/remoting_ice_config_request_unittest.cc +++ b/remoting/protocol/remoting_ice_config_request_unittest.cc
@@ -4,7 +4,7 @@ #include "remoting/protocol/remoting_ice_config_request.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/test/mock_callback.h" #include "base/test/task_environment.h" #include "remoting/base/protobuf_http_status.h"
diff --git a/remoting/protocol/sdp_message.cc b/remoting/protocol/sdp_message.cc index f0a13dd..c600d37 100644 --- a/remoting/protocol/sdp_message.cc +++ b/remoting/protocol/sdp_message.cc
@@ -15,13 +15,15 @@ namespace remoting::protocol { SdpMessage::SdpMessage(const std::string& sdp) { - sdp_lines_ = base::SplitString( - sdp, "\n", base::TRIM_WHITESPACE, base::SPLIT_WANT_NONEMPTY); + sdp_lines_ = base::SplitString(sdp, "\n", base::TRIM_WHITESPACE, + base::SPLIT_WANT_NONEMPTY); for (const auto& line : sdp_lines_) { - if (base::StartsWith(line, "m=audio", base::CompareCase::SENSITIVE)) + if (base::StartsWith(line, "m=audio", base::CompareCase::SENSITIVE)) { has_audio_ = true; - if (base::StartsWith(line, "m=video", base::CompareCase::SENSITIVE)) + } + if (base::StartsWith(line, "m=video", base::CompareCase::SENSITIVE)) { has_video_ = true; + } } } @@ -60,8 +62,7 @@ } for (size_t i = 0; i < sdp_lines_.size(); i++) { - if (!base::StartsWith(sdp_lines_[i], - "m=video", + if (!base::StartsWith(sdp_lines_[i], "m=video", base::CompareCase::SENSITIVE)) { continue; } @@ -79,8 +80,7 @@ const auto first_codec_pos = fields.begin() + kSkipFields; for (const auto& payload : payload_types) { - auto pos = std::find(first_codec_pos, - fields.end(), + auto pos = std::find(first_codec_pos, fields.end(), base::StringPiece(payload.second)); // The codec has not been found in codec list. if (pos == fields.end()) {
diff --git a/remoting/protocol/secure_channel_factory.cc b/remoting/protocol/secure_channel_factory.cc index b26793da..d53de73 100644 --- a/remoting/protocol/secure_channel_factory.cc +++ b/remoting/protocol/secure_channel_factory.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "remoting/protocol/authenticator.h" #include "remoting/protocol/channel_authenticator.h" #include "remoting/protocol/p2p_stream_socket.h" @@ -16,8 +16,7 @@ SecureChannelFactory::SecureChannelFactory( StreamChannelFactory* channel_factory, Authenticator* authenticator) - : channel_factory_(channel_factory), - authenticator_(authenticator) { + : channel_factory_(channel_factory), authenticator_(authenticator) { DCHECK_EQ(authenticator_->state(), Authenticator::ACCEPTED); } @@ -34,8 +33,7 @@ base::Unretained(this), name, std::move(callback))); } -void SecureChannelFactory::CancelChannelCreation( - const std::string& name) { +void SecureChannelFactory::CancelChannelCreation(const std::string& name) { auto it = channel_authenticators_.find(name); if (it == channel_authenticators_.end()) { channel_factory_->CancelChannelCreation(name);
diff --git a/remoting/protocol/session_config.cc b/remoting/protocol/session_config.cc index fc2364e0..c4ab8d7 100644 --- a/remoting/protocol/session_config.cc +++ b/remoting/protocol/session_config.cc
@@ -54,15 +54,13 @@ } ChannelConfig::ChannelConfig(TransportType transport, int version, Codec codec) - : transport(transport), - version(version), - codec(codec) { -} + : transport(transport), version(version), codec(codec) {} bool ChannelConfig::operator==(const ChannelConfig& b) const { // If the transport field is set to NONE then all other fields are irrelevant. - if (transport == ChannelConfig::TRANSPORT_NONE) + if (transport == ChannelConfig::TRANSPORT_NONE) { return transport == b.transport; + } return transport == b.transport && version == b.version && codec == b.codec; } @@ -71,12 +69,14 @@ const CandidateSessionConfig* client_config, const CandidateSessionConfig* host_config) { // Use WebRTC if both host and client support it. - if (client_config->webrtc_supported() && host_config->webrtc_supported()) + if (client_config->webrtc_supported() && host_config->webrtc_supported()) { return base::WrapUnique(new SessionConfig(Protocol::WEBRTC)); + } // Reject connection if ICE is not supported by either of the peers. - if (!host_config->ice_supported() || !client_config->ice_supported()) + if (!host_config->ice_supported() || !client_config->ice_supported()) { return nullptr; + } std::unique_ptr<SessionConfig> result(new SessionConfig(Protocol::ICE)); @@ -117,8 +117,9 @@ return base::WrapUnique(new SessionConfig(Protocol::WEBRTC)); } - if (!candidate_config->ice_supported()) + if (!candidate_config->ice_supported()) { return nullptr; + } if (candidate_config->control_configs().size() != 1 || candidate_config->event_configs().size() != 1 || @@ -156,17 +157,17 @@ std::unique_ptr<SessionConfig> SessionConfig::ForTestWithAudio() { std::unique_ptr<SessionConfig> result(ForTest()); - result->audio_config_ = ChannelConfig(ChannelConfig::TRANSPORT_STREAM, - kDefaultStreamVersion, - ChannelConfig::CODEC_OPUS); + result->audio_config_ = + ChannelConfig(ChannelConfig::TRANSPORT_STREAM, kDefaultStreamVersion, + ChannelConfig::CODEC_OPUS); return result; } std::unique_ptr<SessionConfig> SessionConfig::ForTestWithVerbatimVideo() { std::unique_ptr<SessionConfig> result = ForTest(); - result->video_config_ = ChannelConfig(ChannelConfig::TRANSPORT_STREAM, - kDefaultStreamVersion, - ChannelConfig::CODEC_VERBATIM); + result->video_config_ = + ChannelConfig(ChannelConfig::TRANSPORT_STREAM, kDefaultStreamVersion, + ChannelConfig::CODEC_VERBATIM); return result; } @@ -257,30 +258,25 @@ // Control channel. result->mutable_control_configs()->push_back( - ChannelConfig(ChannelConfig::TRANSPORT_MUX_STREAM, - kControlStreamVersion, + ChannelConfig(ChannelConfig::TRANSPORT_MUX_STREAM, kControlStreamVersion, ChannelConfig::CODEC_UNDEFINED)); // Event channel. result->mutable_event_configs()->push_back( - ChannelConfig(ChannelConfig::TRANSPORT_MUX_STREAM, - kDefaultStreamVersion, + ChannelConfig(ChannelConfig::TRANSPORT_MUX_STREAM, kDefaultStreamVersion, ChannelConfig::CODEC_UNDEFINED)); // Video channel. result->mutable_video_configs()->push_back( - ChannelConfig(ChannelConfig::TRANSPORT_STREAM, - kDefaultStreamVersion, + ChannelConfig(ChannelConfig::TRANSPORT_STREAM, kDefaultStreamVersion, ChannelConfig::CODEC_VP9)); result->mutable_video_configs()->push_back( - ChannelConfig(ChannelConfig::TRANSPORT_STREAM, - kDefaultStreamVersion, + ChannelConfig(ChannelConfig::TRANSPORT_STREAM, kDefaultStreamVersion, ChannelConfig::CODEC_VP8)); // Audio channel. result->mutable_audio_configs()->push_back( - ChannelConfig(ChannelConfig::TRANSPORT_MUX_STREAM, - kDefaultStreamVersion, + ChannelConfig(ChannelConfig::TRANSPORT_MUX_STREAM, kDefaultStreamVersion, ChannelConfig::CODEC_OPUS)); result->mutable_audio_configs()->push_back(ChannelConfig::None());
diff --git a/remoting/protocol/session_config.h b/remoting/protocol/session_config.h index e0056c6..67ce5012 100644 --- a/remoting/protocol/session_config.h +++ b/remoting/protocol/session_config.h
@@ -148,25 +148,19 @@ return event_configs_; } - std::list<ChannelConfig>* mutable_event_configs() { - return &event_configs_; - } + std::list<ChannelConfig>* mutable_event_configs() { return &event_configs_; } const std::list<ChannelConfig>& video_configs() const { return video_configs_; } - std::list<ChannelConfig>* mutable_video_configs() { - return &video_configs_; - } + std::list<ChannelConfig>* mutable_video_configs() { return &video_configs_; } const std::list<ChannelConfig>& audio_configs() const { return audio_configs_; } - std::list<ChannelConfig>* mutable_audio_configs() { - return &audio_configs_; - } + std::list<ChannelConfig>* mutable_audio_configs() { return &audio_configs_; } // Returns true if |config| is supported. bool IsSupported(const SessionConfig& config) const;
diff --git a/remoting/protocol/session_manager.h b/remoting/protocol/session_manager.h index 2be5f00..753535d 100644 --- a/remoting/protocol/session_manager.h +++ b/remoting/protocol/session_manager.h
@@ -55,7 +55,7 @@ #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "remoting/protocol/session.h" namespace remoting {
diff --git a/remoting/protocol/session_plugin.h b/remoting/protocol/session_plugin.h index 95ec9632..87da3f2 100644 --- a/remoting/protocol/session_plugin.h +++ b/remoting/protocol/session_plugin.h
@@ -26,7 +26,8 @@ virtual std::unique_ptr<jingle_xmpp::XmlElement> GetNextMessage() = 0; // Handles messages in |attachments|. - virtual void OnIncomingMessage(const jingle_xmpp::XmlElement& attachments) = 0; + virtual void OnIncomingMessage( + const jingle_xmpp::XmlElement& attachments) = 0; }; } // namespace remoting::protocol
diff --git a/remoting/protocol/socket_util.cc b/remoting/protocol/socket_util.cc index a6709f3..89a05f3 100644 --- a/remoting/protocol/socket_util.cc +++ b/remoting/protocol/socket_util.cc
@@ -38,5 +38,4 @@ } } - } // namespace remoting
diff --git a/remoting/protocol/spake2_authenticator.cc b/remoting/protocol/spake2_authenticator.cc index 269feb8d..f96a5d0d 100644 --- a/remoting/protocol/spake2_authenticator.cc +++ b/remoting/protocol/spake2_authenticator.cc
@@ -34,11 +34,11 @@ // where auth_key is the key produced by SPAKE2. const jingle_xmpp::StaticQName kSpakeMessageTag = {kChromotingXmlNamespace, - "spake-message"}; + "spake-message"}; const jingle_xmpp::StaticQName kVerificationHashTag = {kChromotingXmlNamespace, - "verification-hash"}; + "verification-hash"}; const jingle_xmpp::StaticQName kCertificateTag = {kChromotingXmlNamespace, - "certificate"}; + "certificate"}; std::unique_ptr<jingle_xmpp::XmlElement> EncodeBinaryValueToXml( const jingle_xmpp::StaticQName& qname, @@ -46,23 +46,25 @@ std::string content_base64; base::Base64Encode(content, &content_base64); - std::unique_ptr<jingle_xmpp::XmlElement> result(new jingle_xmpp::XmlElement(qname)); + std::unique_ptr<jingle_xmpp::XmlElement> result( + new jingle_xmpp::XmlElement(qname)); result->SetBodyText(content_base64); return result; } // Finds tag named |qname| in base_message and decodes it from base64 and stores // in |data|. If the element is not present then found is set to false otherwise -// it's set to true. If the element is there and it's content couldn't be decoded -// then false is returned. +// it's set to true. If the element is there and it's content couldn't be +// decoded then false is returned. bool DecodeBinaryValueFromXml(const jingle_xmpp::XmlElement* message, const jingle_xmpp::QName& qname, bool* found, std::string* data) { const jingle_xmpp::XmlElement* element = message->FirstNamed(qname); *found = element != nullptr; - if (!*found) + if (!*found) { return true; + } if (!base::Base64Decode(element->BodyText(), data)) { LOG(WARNING) << "Failed to parse " << qname.LocalPart(); @@ -135,8 +137,9 @@ } Authenticator::State Spake2Authenticator::state() const { - if (state_ == ACCEPTED && !outgoing_verification_hash_.empty()) + if (state_ == ACCEPTED && !outgoing_verification_hash_.empty()) { return MESSAGE_READY; + } return state_; } @@ -250,7 +253,8 @@ std::unique_ptr<jingle_xmpp::XmlElement> Spake2Authenticator::GetNextMessage() { DCHECK_EQ(state(), MESSAGE_READY); - std::unique_ptr<jingle_xmpp::XmlElement> message = CreateEmptyAuthenticatorMessage(); + std::unique_ptr<jingle_xmpp::XmlElement> message = + CreateEmptyAuthenticatorMessage(); if (!spake_message_sent_) { if (!local_cert_.empty()) {
diff --git a/remoting/protocol/spake2_authenticator_unittest.cc b/remoting/protocol/spake2_authenticator_unittest.cc index 082c82ac..ec87d84 100644 --- a/remoting/protocol/spake2_authenticator_unittest.cc +++ b/remoting/protocol/spake2_authenticator_unittest.cc
@@ -4,8 +4,8 @@ #include "remoting/protocol/spake2_authenticator.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "remoting/base/rsa_key_pair.h" #include "remoting/protocol/authenticator_test_base.h"
diff --git a/remoting/protocol/ssl_hmac_channel_authenticator.cc b/remoting/protocol/ssl_hmac_channel_authenticator.cc index f6877fa..43ea4b76 100644 --- a/remoting/protocol/ssl_hmac_channel_authenticator.cc +++ b/remoting/protocol/ssl_hmac_channel_authenticator.cc
@@ -8,8 +8,8 @@ #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "build/build_config.h" #include "crypto/secure_util.h" @@ -226,8 +226,7 @@ SslHmacChannelAuthenticator::SslHmacChannelAuthenticator( const std::string& auth_key) - : auth_key_(auth_key) { -} + : auth_key_(auth_key) {} SslHmacChannelAuthenticator::~SslHmacChannelAuthenticator() { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); @@ -303,8 +302,9 @@ &SslHmacChannelAuthenticator::OnConnected, base::Unretained(this))); } - if (result == net::ERR_IO_PENDING) + if (result == net::ERR_IO_PENDING) { return; + } OnConnected(result); } @@ -323,8 +323,9 @@ // Generate authentication digest to write to the socket. std::string auth_bytes = GetAuthBytes( - socket_.get(), is_ssl_server() ? - kHostAuthSslExporterLabel : kClientAuthSslExporterLabel, auth_key_); + socket_.get(), + is_ssl_server() ? kHostAuthSslExporterLabel : kClientAuthSslExporterLabel, + auth_key_); if (auth_bytes.empty()) { NotifyError(net::ERR_FAILED); return; @@ -343,8 +344,9 @@ // be destroyed at that point. bool callback_called = false; WriteAuthenticationBytes(&callback_called); - if (!callback_called) + if (!callback_called) { ReadAuthenticationBytes(); + } } void SslHmacChannelAuthenticator::WriteAuthenticationBytes( @@ -355,33 +357,39 @@ base::BindOnce(&SslHmacChannelAuthenticator::OnAuthBytesWritten, base::Unretained(this)), kTrafficAnnotation); - if (result == net::ERR_IO_PENDING) + if (result == net::ERR_IO_PENDING) { break; - if (!HandleAuthBytesWritten(result, callback_called)) + } + if (!HandleAuthBytesWritten(result, callback_called)) { break; + } } } void SslHmacChannelAuthenticator::OnAuthBytesWritten(int result) { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); - if (HandleAuthBytesWritten(result, nullptr)) + if (HandleAuthBytesWritten(result, nullptr)) { WriteAuthenticationBytes(nullptr); + } } bool SslHmacChannelAuthenticator::HandleAuthBytesWritten( - int result, bool* callback_called) { + int result, + bool* callback_called) { if (result <= 0) { LOG(ERROR) << "Error writing authentication: " << result; - if (callback_called) + if (callback_called) { *callback_called = false; + } NotifyError(result); return false; } auth_write_buf_->DidConsume(result); - if (auth_write_buf_->BytesRemaining() > 0) + if (auth_write_buf_->BytesRemaining() > 0) { return true; + } auth_write_buf_ = nullptr; CheckDone(callback_called); @@ -394,18 +402,21 @@ auth_read_buf_.get(), auth_read_buf_->RemainingCapacity(), base::BindOnce(&SslHmacChannelAuthenticator::OnAuthBytesRead, base::Unretained(this))); - if (result == net::ERR_IO_PENDING) + if (result == net::ERR_IO_PENDING) { break; - if (!HandleAuthBytesRead(result)) + } + if (!HandleAuthBytesRead(result)) { break; + } } } void SslHmacChannelAuthenticator::OnAuthBytesRead(int result) { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); - if (HandleAuthBytesRead(result)) + if (HandleAuthBytesRead(result)) { ReadAuthenticationBytes(); + } } bool SslHmacChannelAuthenticator::HandleAuthBytesRead(int read_result) { @@ -415,12 +426,13 @@ } auth_read_buf_->set_offset(auth_read_buf_->offset() + read_result); - if (auth_read_buf_->RemainingCapacity() > 0) + if (auth_read_buf_->RemainingCapacity() > 0) { return true; + } - if (!VerifyAuthBytes(std::string( - auth_read_buf_->StartOfBuffer(), - auth_read_buf_->StartOfBuffer() + kAuthDigestLength))) { + if (!VerifyAuthBytes( + std::string(auth_read_buf_->StartOfBuffer(), + auth_read_buf_->StartOfBuffer() + kAuthDigestLength))) { LOG(WARNING) << "Mismatched authentication"; NotifyError(net::ERR_FAILED); return false; @@ -437,20 +449,23 @@ // Compute expected auth bytes. std::string auth_bytes = GetAuthBytes( - socket_.get(), is_ssl_server() ? - kClientAuthSslExporterLabel : kHostAuthSslExporterLabel, auth_key_); - if (auth_bytes.empty()) + socket_.get(), + is_ssl_server() ? kClientAuthSslExporterLabel : kHostAuthSslExporterLabel, + auth_key_); + if (auth_bytes.empty()) { return false; + } - return crypto::SecureMemEqual(received_auth_bytes.data(), - &(auth_bytes[0]), kAuthDigestLength); + return crypto::SecureMemEqual(received_auth_bytes.data(), &(auth_bytes[0]), + kAuthDigestLength); } void SslHmacChannelAuthenticator::CheckDone(bool* callback_called) { if (auth_write_buf_.get() == nullptr && auth_read_buf_.get() == nullptr) { DCHECK(socket_.get() != nullptr); - if (callback_called) + if (callback_called) { *callback_called = true; + } std::move(done_callback_) .Run(net::OK, std::make_unique<P2PStreamSocketAdapter>(
diff --git a/remoting/protocol/ssl_hmac_channel_authenticator.h b/remoting/protocol/ssl_hmac_channel_authenticator.h index fd3322f9..bf393b0 100644 --- a/remoting/protocol/ssl_hmac_channel_authenticator.h +++ b/remoting/protocol/ssl_hmac_channel_authenticator.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" #include "base/sequence_checker.h" #include "remoting/protocol/channel_authenticator.h"
diff --git a/remoting/protocol/ssl_hmac_channel_authenticator_unittest.cc b/remoting/protocol/ssl_hmac_channel_authenticator_unittest.cc index 20e5388..97e490a 100644 --- a/remoting/protocol/ssl_hmac_channel_authenticator_unittest.cc +++ b/remoting/protocol/ssl_hmac_channel_authenticator_unittest.cc
@@ -8,9 +8,9 @@ #include <utility> #include "base/base64.h" -#include "base/bind.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/test/task_environment.h" #include "base/test/test_timeouts.h" @@ -47,8 +47,9 @@ ACTION_P(QuitThreadOnCounter, counter) { --(*counter); EXPECT_GE(*counter, 0); - if (*counter == 0) + if (*counter == 0) { base::RunLoop::QuitCurrentWhenIdleDeprecated(); + } } } // namespace @@ -160,16 +161,16 @@ TEST_F(SslHmacChannelAuthenticatorTest, SuccessfulAuth) { client_auth_ = SslHmacChannelAuthenticator::CreateForClient( host_cert_, kTestSharedSecret); - host_auth_ = SslHmacChannelAuthenticator::CreateForHost( - host_cert_, key_pair_, kTestSharedSecret); + host_auth_ = SslHmacChannelAuthenticator::CreateForHost(host_cert_, key_pair_, + kTestSharedSecret); RunChannelAuth(net::OK, net::OK); ASSERT_TRUE(client_socket_.get() != nullptr); ASSERT_TRUE(host_socket_.get() != nullptr); - StreamConnectionTester tester(host_socket_.get(), client_socket_.get(), - 100, 2); + StreamConnectionTester tester(host_socket_.get(), client_socket_.get(), 100, + 2); base::RunLoop run_loop; tester.Start(run_loop.QuitClosure()); @@ -181,8 +182,8 @@ TEST_F(SslHmacChannelAuthenticatorTest, InvalidChannelSecret) { client_auth_ = SslHmacChannelAuthenticator::CreateForClient( host_cert_, kTestSharedSecretBad); - host_auth_ = SslHmacChannelAuthenticator::CreateForHost( - host_cert_, key_pair_, kTestSharedSecret); + host_auth_ = SslHmacChannelAuthenticator::CreateForHost(host_cert_, key_pair_, + kTestSharedSecret); RunChannelAuth(net::ERR_FAILED, net::ERR_FAILED); @@ -199,8 +200,8 @@ std::string( net::x509_util::CryptoBufferAsStringPiece(host_cert2->cert_buffer())), kTestSharedSecret); - host_auth_ = SslHmacChannelAuthenticator::CreateForHost( - host_cert_, key_pair_, kTestSharedSecret); + host_auth_ = SslHmacChannelAuthenticator::CreateForHost(host_cert_, key_pair_, + kTestSharedSecret); // TODO(https://crbug.com/912383): The server sees // ERR_BAD_SSL_CLIENT_AUTH_CERT because its peer (the client) alerts it with
diff --git a/remoting/protocol/stream_channel_factory.h b/remoting/protocol/stream_channel_factory.h index c09fecd2..3c832e6 100644 --- a/remoting/protocol/stream_channel_factory.h +++ b/remoting/protocol/stream_channel_factory.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/sequence_checker.h" namespace remoting::protocol {
diff --git a/remoting/protocol/stream_message_pipe_adapter.cc b/remoting/protocol/stream_message_pipe_adapter.cc index eb0ccea..1c2c01f 100644 --- a/remoting/protocol/stream_message_pipe_adapter.cc +++ b/remoting/protocol/stream_message_pipe_adapter.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "net/base/net_errors.h" #include "net/traffic_annotation/network_traffic_annotation.h" #include "remoting/base/buffered_socket_writer.h" @@ -75,9 +75,10 @@ "the request to all domains. Please refer to help desk for other " "approaches to manage this feature." })"); - if (writer_) + if (writer_) { writer_->Write(SerializeAndFrameMessage(*message), std::move(done), traffic_annotation); + } } void StreamMessagePipeAdapter::CloseOnError(int error) {
diff --git a/remoting/protocol/stream_message_pipe_adapter.h b/remoting/protocol/stream_message_pipe_adapter.h index 675c8423..3d03627 100644 --- a/remoting/protocol/stream_message_pipe_adapter.h +++ b/remoting/protocol/stream_message_pipe_adapter.h
@@ -5,7 +5,7 @@ #ifndef REMOTING_PROTOCOL_STREAM_MESSAGE_PIPE_ADAPTER_H_ #define REMOTING_PROTOCOL_STREAM_MESSAGE_PIPE_ADAPTER_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "remoting/protocol/message_channel_factory.h" #include "remoting/protocol/message_pipe.h"
diff --git a/remoting/protocol/stream_packet_socket.cc b/remoting/protocol/stream_packet_socket.cc index f653fe07..d8641baa 100644 --- a/remoting/protocol/stream_packet_socket.cc +++ b/remoting/protocol/stream_packet_socket.cc
@@ -4,7 +4,7 @@ #include "remoting/protocol/stream_packet_socket.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "components/webrtc/net_address_utils.h" #include "net/base/address_list.h" #include "net/base/io_buffer.h"
diff --git a/remoting/protocol/stun_tcp_packet_processor.cc b/remoting/protocol/stun_tcp_packet_processor.cc index 3c53c3c..8a026226 100644 --- a/remoting/protocol/stun_tcp_packet_processor.cc +++ b/remoting/protocol/stun_tcp_packet_processor.cc
@@ -40,8 +40,9 @@ } else { packet_size += kTurnChannelDataHeaderSize; // Calculate any padding if present. - if (packet_size % 4) + if (packet_size % 4) { *pad_bytes = 4 - packet_size % 4; + } } return packet_size; } @@ -96,14 +97,16 @@ size_t data_size, size_t* bytes_consumed) const { *bytes_consumed = 0; - if (data_size < kPacketHeaderSize + kPacketLengthOffset) + if (data_size < kPacketHeaderSize + kPacketLengthOffset) { return nullptr; + } size_t pad_bytes; size_t packet_size = GetExpectedStunPacketSize(data, data_size, &pad_bytes); - if (data_size < packet_size + pad_bytes) + if (data_size < packet_size + pad_bytes) { return nullptr; + } // We have a complete packet. const uint8_t* cur = data;
diff --git a/remoting/protocol/test_event_matchers.h b/remoting/protocol/test_event_matchers.h index b2508fc80..7296446 100644 --- a/remoting/protocol/test_event_matchers.h +++ b/remoting/protocol/test_event_matchers.h
@@ -59,11 +59,13 @@ } MATCHER_P(EqualsTouchEvent, expected_event, "") { - if (arg.event_type() != expected_event.event_type()) + if (arg.event_type() != expected_event.event_type()) { return false; + } - if (arg.touch_points().size() != expected_event.touch_points().size()) + if (arg.touch_points().size() != expected_event.touch_points().size()) { return false; + } for (int i = 0; i < expected_event.touch_points().size(); ++i) { const TouchEventPoint& expected_point = expected_event.touch_points(i); @@ -76,8 +78,9 @@ expected_point.radius_y() == actual_point.radius_y() && expected_point.angle() == actual_point.angle() && expected_point.pressure() == actual_point.pressure(); - if (!equal) + if (!equal) { return false; + } } return true; @@ -88,24 +91,30 @@ const float kTestTouchErrorEpsilon = 1.0f; MATCHER_P(EqualsTouchPointCoordinates, expected_event, "") { - if (arg.touch_points().size() != expected_event.touch_points().size()) + if (arg.touch_points().size() != expected_event.touch_points().size()) { return false; + } for (int i = 0; i < expected_event.touch_points().size(); ++i) { const TouchEventPoint& arg_point = arg.touch_points(i); const TouchEventPoint& expected_point = expected_event.touch_points(i); - if (std::abs(expected_point.x() - arg_point.x()) >= kTestTouchErrorEpsilon) + if (std::abs(expected_point.x() - arg_point.x()) >= + kTestTouchErrorEpsilon) { return false; + } - if (std::abs(expected_point.y() - arg_point.y()) >= kTestTouchErrorEpsilon) + if (std::abs(expected_point.y() - arg_point.y()) >= + kTestTouchErrorEpsilon) { return false; + } } return true; } MATCHER_P(EqualsTouchPointRadii, expected_event, "") { - if (arg.touch_points().size() != expected_event.touch_points().size()) + if (arg.touch_points().size() != expected_event.touch_points().size()) { return false; + } for (int i = 0; i < expected_event.touch_points().size(); ++i) { const TouchEventPoint& arg_point = arg.touch_points(i); @@ -124,11 +133,13 @@ } MATCHER_P2(EqualsTouchEventTypeAndId, type, id, "") { - if (arg.event_type() != type) + if (arg.event_type() != type) { return false; + } - if (arg.touch_points().size() != 1) + if (arg.touch_points().size() != 1) { return false; + } return arg.touch_points(0).id() == id; }
diff --git a/remoting/protocol/third_party_authenticator_base.cc b/remoting/protocol/third_party_authenticator_base.cc index bd86cbd..afdb461 100644 --- a/remoting/protocol/third_party_authenticator_base.cc +++ b/remoting/protocol/third_party_authenticator_base.cc
@@ -5,9 +5,9 @@ #include "remoting/protocol/third_party_authenticator_base.h" #include "base/base64.h" -#include "base/bind.h" -#include "base/callback.h" #include "base/check_op.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "remoting/base/constants.h" #include "remoting/base/rsa_key_pair.h" #include "remoting/protocol/channel_authenticator.h" @@ -16,12 +16,12 @@ namespace remoting::protocol { // static -const jingle_xmpp::StaticQName ThirdPartyAuthenticatorBase::kTokenUrlTag = - { remoting::kChromotingXmlNamespace, "third-party-token-url" }; -const jingle_xmpp::StaticQName ThirdPartyAuthenticatorBase::kTokenScopeTag = - { remoting::kChromotingXmlNamespace, "third-party-token-scope" }; -const jingle_xmpp::StaticQName ThirdPartyAuthenticatorBase::kTokenTag = - { remoting::kChromotingXmlNamespace, "third-party-token" }; +const jingle_xmpp::StaticQName ThirdPartyAuthenticatorBase::kTokenUrlTag = { + remoting::kChromotingXmlNamespace, "third-party-token-url"}; +const jingle_xmpp::StaticQName ThirdPartyAuthenticatorBase::kTokenScopeTag = { + remoting::kChromotingXmlNamespace, "third-party-token-scope"}; +const jingle_xmpp::StaticQName ThirdPartyAuthenticatorBase::kTokenTag = { + remoting::kChromotingXmlNamespace, "third-party-token"}; ThirdPartyAuthenticatorBase::ThirdPartyAuthenticatorBase( Authenticator::State initial_state) @@ -36,17 +36,19 @@ } Authenticator::State ThirdPartyAuthenticatorBase::state() const { - if (token_state_ == ACCEPTED) + if (token_state_ == ACCEPTED) { return underlying_->state(); + } return token_state_; } -Authenticator::RejectionReason -ThirdPartyAuthenticatorBase::rejection_reason() const { +Authenticator::RejectionReason ThirdPartyAuthenticatorBase::rejection_reason() + const { DCHECK_EQ(state(), REJECTED); - if (token_state_ == REJECTED) + if (token_state_ == REJECTED) { return rejection_reason_; + } return underlying_->rejection_reason(); }
diff --git a/remoting/protocol/third_party_authenticator_base.h b/remoting/protocol/third_party_authenticator_base.h index 47092314..ca1c5914 100644 --- a/remoting/protocol/third_party_authenticator_base.h +++ b/remoting/protocol/third_party_authenticator_base.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "remoting/protocol/authenticator.h" #include "third_party/libjingle_xmpp/xmllite/qname.h"
diff --git a/remoting/protocol/third_party_authenticator_unittest.cc b/remoting/protocol/third_party_authenticator_unittest.cc index 7c1d325..3fd6cc7b 100644 --- a/remoting/protocol/third_party_authenticator_unittest.cc +++ b/remoting/protocol/third_party_authenticator_unittest.cc
@@ -5,7 +5,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" @@ -74,9 +74,7 @@ class FakeTokenValidator : public TokenValidator { public: - FakeTokenValidator() - : token_url_(kTokenUrl), - token_scope_(kTokenScope) {} + FakeTokenValidator() : token_url_(kTokenUrl), token_scope_(kTokenScope) {} ~FakeTokenValidator() override = default; @@ -174,8 +172,7 @@ ASSERT_NO_FATAL_FAILURE(InitAuthenticators()); ASSERT_NO_FATAL_FAILURE(RunHostInitiatedAuthExchange()); ASSERT_EQ(Authenticator::PROCESSING_MESSAGE, client_->state()); - ASSERT_NO_FATAL_FAILURE(token_fetcher_.OnTokenFetched( - kToken, kSharedSecret)); + ASSERT_NO_FATAL_FAILURE(token_fetcher_.OnTokenFetched(kToken, kSharedSecret)); ASSERT_EQ(Authenticator::PROCESSING_MESSAGE, host_->state()); ASSERT_NO_FATAL_FAILURE(token_validator_->OnTokenValidated(std::string())); @@ -202,8 +199,7 @@ ASSERT_EQ(Authenticator::PROCESSING_MESSAGE, client_->state()); ASSERT_NO_FATAL_FAILURE(token_fetcher_.OnTokenFetched(kToken, kSharedSecret)); ASSERT_EQ(Authenticator::PROCESSING_MESSAGE, host_->state()); - ASSERT_NO_FATAL_FAILURE( - token_validator_->OnTokenValidated(kSharedSecretBad)); + ASSERT_NO_FATAL_FAILURE(token_validator_->OnTokenValidated(kSharedSecretBad)); // The end result is that the host rejected the fake authentication. ASSERT_EQ(Authenticator::REJECTED, client_->state()); @@ -216,8 +212,7 @@ ASSERT_NO_FATAL_FAILURE( token_fetcher_.OnTokenFetched(kToken, kSharedSecretBad)); ASSERT_EQ(Authenticator::PROCESSING_MESSAGE, host_->state()); - ASSERT_NO_FATAL_FAILURE( - token_validator_->OnTokenValidated(kSharedSecret)); + ASSERT_NO_FATAL_FAILURE(token_validator_->OnTokenValidated(kSharedSecret)); // The end result is that the host rejected the fake authentication. ASSERT_EQ(Authenticator::REJECTED, client_->state());
diff --git a/remoting/protocol/third_party_client_authenticator.cc b/remoting/protocol/third_party_client_authenticator.cc index bab10bd..ea46b00c 100644 --- a/remoting/protocol/third_party_client_authenticator.cc +++ b/remoting/protocol/third_party_client_authenticator.cc
@@ -7,8 +7,8 @@ #include <utility> #include "base/base64.h" -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/logging.h" #include "remoting/base/constants.h" #include "remoting/base/rsa_key_pair.h" @@ -34,7 +34,7 @@ if (token_url.empty() || token_scope.empty()) { LOG(ERROR) << "Third-party authentication protocol error: " - "missing token verification URL or scope."; + "missing token verification URL or scope."; token_state_ = REJECTED; rejection_reason_ = RejectionReason::PROTOCOL_ERROR; std::move(resume_callback).Run();
diff --git a/remoting/protocol/third_party_client_authenticator.h b/remoting/protocol/third_party_client_authenticator.h index 88c59764..34737ad 100644 --- a/remoting/protocol/third_party_client_authenticator.h +++ b/remoting/protocol/third_party_client_authenticator.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "remoting/protocol/client_authentication_config.h" #include "remoting/protocol/third_party_authenticator_base.h"
diff --git a/remoting/protocol/third_party_host_authenticator.cc b/remoting/protocol/third_party_host_authenticator.cc index 02c5cf0f..46d0252 100644 --- a/remoting/protocol/third_party_host_authenticator.cc +++ b/remoting/protocol/third_party_host_authenticator.cc
@@ -7,8 +7,8 @@ #include <utility> #include "base/base64.h" -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/logging.h" #include "remoting/base/constants.h" #include "remoting/protocol/token_validator.h" @@ -58,12 +58,12 @@ DCHECK(token_validator_->token_url().is_valid()); DCHECK(!token_validator_->token_scope().empty()); - jingle_xmpp::XmlElement* token_url_tag = new jingle_xmpp::XmlElement( - kTokenUrlTag); + jingle_xmpp::XmlElement* token_url_tag = + new jingle_xmpp::XmlElement(kTokenUrlTag); token_url_tag->SetBodyText(token_validator_->token_url().spec()); message->AddElement(token_url_tag); - jingle_xmpp::XmlElement* token_scope_tag = new jingle_xmpp::XmlElement( - kTokenScopeTag); + jingle_xmpp::XmlElement* token_scope_tag = + new jingle_xmpp::XmlElement(kTokenScopeTag); token_scope_tag->SetBodyText(token_validator_->token_scope()); message->AddElement(token_scope_tag); token_state_ = WAITING_MESSAGE;
diff --git a/remoting/protocol/third_party_host_authenticator.h b/remoting/protocol/third_party_host_authenticator.h index 51048ca..64b3e80b 100644 --- a/remoting/protocol/third_party_host_authenticator.h +++ b/remoting/protocol/third_party_host_authenticator.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "remoting/protocol/third_party_authenticator_base.h" #include "remoting/protocol/token_validator.h"
diff --git a/remoting/protocol/token_validator.h b/remoting/protocol/token_validator.h index 1c74ded..56cd5a5 100644 --- a/remoting/protocol/token_validator.h +++ b/remoting/protocol/token_validator.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/ref_counted.h" #include "remoting/base/result.h" #include "remoting/protocol/authenticator.h"
diff --git a/remoting/protocol/transport.h b/remoting/protocol/transport.h index 7ba988b0..f77bc18 100644 --- a/remoting/protocol/transport.h +++ b/remoting/protocol/transport.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "net/base/ip_endpoint.h" #include "remoting/protocol/errors.h" @@ -60,7 +60,8 @@ virtual void Start( Authenticator* authenticator, SendTransportInfoCallback send_transport_info_callback) = 0; - virtual bool ProcessTransportInfo(jingle_xmpp::XmlElement* transport_info) = 0; + virtual bool ProcessTransportInfo( + jingle_xmpp::XmlElement* transport_info) = 0; }; } // namespace remoting::protocol
diff --git a/remoting/protocol/transport_context.cc b/remoting/protocol/transport_context.cc index b5ebdc158..1cb5006 100644 --- a/remoting/protocol/transport_context.cc +++ b/remoting/protocol/transport_context.cc
@@ -7,7 +7,7 @@ #include <sstream> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/task/single_thread_task_runner.h" #include "build/build_config.h"
diff --git a/remoting/protocol/v2_authenticator.cc b/remoting/protocol/v2_authenticator.cc index 3002fa6e..fbc278e 100644 --- a/remoting/protocol/v2_authenticator.cc +++ b/remoting/protocol/v2_authenticator.cc
@@ -20,10 +20,10 @@ namespace { -const jingle_xmpp::StaticQName kEkeTag = { kChromotingXmlNamespace, - "eke-message" }; -const jingle_xmpp::StaticQName kCertificateTag = { kChromotingXmlNamespace, - "certificate" }; +const jingle_xmpp::StaticQName kEkeTag = {kChromotingXmlNamespace, + "eke-message"}; +const jingle_xmpp::StaticQName kCertificateTag = {kChromotingXmlNamespace, + "certificate"}; } // namespace @@ -68,8 +68,9 @@ V2Authenticator::~V2Authenticator() = default; Authenticator::State V2Authenticator::state() const { - if (state_ == ACCEPTED && !pending_messages_.empty()) + if (state_ == ACCEPTED && !pending_messages_.empty()) { return MESSAGE_READY; + } return state_; } @@ -88,7 +89,8 @@ std::move(resume_callback).Run(); } -void V2Authenticator::ProcessMessageInternal(const jingle_xmpp::XmlElement* message) { +void V2Authenticator::ProcessMessageInternal( + const jingle_xmpp::XmlElement* message) { DCHECK_EQ(state(), WAITING_MESSAGE); // Parse the certificate. @@ -152,7 +154,8 @@ std::unique_ptr<jingle_xmpp::XmlElement> V2Authenticator::GetNextMessage() { DCHECK_EQ(state(), MESSAGE_READY); - std::unique_ptr<jingle_xmpp::XmlElement> message = CreateEmptyAuthenticatorMessage(); + std::unique_ptr<jingle_xmpp::XmlElement> message = + CreateEmptyAuthenticatorMessage(); DCHECK(!pending_messages_.empty()); while (!pending_messages_.empty()) { @@ -168,7 +171,8 @@ } if (!local_cert_.empty() && !certificate_sent_) { - jingle_xmpp::XmlElement* certificate_tag = new jingle_xmpp::XmlElement(kCertificateTag); + jingle_xmpp::XmlElement* certificate_tag = + new jingle_xmpp::XmlElement(kCertificateTag); std::string base64_cert; base::Base64Encode(local_cert_, &base64_cert); certificate_tag->SetBodyText(base64_cert); @@ -195,8 +199,8 @@ return SslHmacChannelAuthenticator::CreateForHost( local_cert_, local_key_pair_, auth_key_); } else { - return SslHmacChannelAuthenticator::CreateForClient( - remote_cert_, auth_key_); + return SslHmacChannelAuthenticator::CreateForClient(remote_cert_, + auth_key_); } }
diff --git a/remoting/protocol/v2_authenticator_unittest.cc b/remoting/protocol/v2_authenticator_unittest.cc index c916464..1c2ac55 100644 --- a/remoting/protocol/v2_authenticator_unittest.cc +++ b/remoting/protocol/v2_authenticator_unittest.cc
@@ -4,8 +4,8 @@ #include "remoting/protocol/v2_authenticator.h" -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/run_loop.h" #include "net/base/net_errors.h" #include "remoting/base/rsa_key_pair.h" @@ -44,11 +44,10 @@ protected: void InitAuthenticators(const std::string& client_secret, const std::string& host_secret) { - host_ = V2Authenticator::CreateForHost( - host_cert_, key_pair_, host_secret, - Authenticator::WAITING_MESSAGE); - client_ = V2Authenticator::CreateForClient( - client_secret, Authenticator::MESSAGE_READY); + host_ = V2Authenticator::CreateForHost(host_cert_, key_pair_, host_secret, + Authenticator::WAITING_MESSAGE); + client_ = V2Authenticator::CreateForClient(client_secret, + Authenticator::MESSAGE_READY); } };
diff --git a/remoting/protocol/validating_authenticator.cc b/remoting/protocol/validating_authenticator.cc index 1ceaf92..e188bed 100644 --- a/remoting/protocol/validating_authenticator.cc +++ b/remoting/protocol/validating_authenticator.cc
@@ -8,9 +8,9 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/check_op.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" #include "remoting/protocol/authenticator.h" @@ -67,7 +67,8 @@ weak_factory_.GetWeakPtr(), std::move(resume_callback))); } -std::unique_ptr<jingle_xmpp::XmlElement> ValidatingAuthenticator::GetNextMessage() { +std::unique_ptr<jingle_xmpp::XmlElement> +ValidatingAuthenticator::GetNextMessage() { if (pending_auth_message_) { DCHECK(state_ == ACCEPTED || state_ == WAITING_MESSAGE); return std::move(pending_auth_message_);
diff --git a/remoting/protocol/validating_authenticator.h b/remoting/protocol/validating_authenticator.h index 1b82cff..2e8290f 100644 --- a/remoting/protocol/validating_authenticator.h +++ b/remoting/protocol/validating_authenticator.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "remoting/protocol/authenticator.h"
diff --git a/remoting/protocol/validating_authenticator_unittest.cc b/remoting/protocol/validating_authenticator_unittest.cc index 1198642..28f5bb59 100644 --- a/remoting/protocol/validating_authenticator_unittest.cc +++ b/remoting/protocol/validating_authenticator_unittest.cc
@@ -7,8 +7,8 @@ #include <tuple> #include <utility> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h"
diff --git a/remoting/protocol/video_frame_pump.cc b/remoting/protocol/video_frame_pump.cc index 382839d..8537990 100644 --- a/remoting/protocol/video_frame_pump.cc +++ b/remoting/protocol/video_frame_pump.cc
@@ -8,9 +8,9 @@ #include <memory> #include <utility> -#include "base/bind.h" -#include "base/callback.h" #include "base/check.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/task/single_thread_task_runner.h" #include "base/time/time.h" #include "remoting/base/constants.h" @@ -118,8 +118,9 @@ if (!frame_size_.equals(frame->size()) || !frame_dpi_.equals(dpi)) { frame_size_ = frame->size(); frame_dpi_ = dpi; - if (observer_) + if (observer_) { observer_->OnVideoSizeChanged(this, frame_size_, frame_dpi_); + } } } @@ -157,16 +158,19 @@ std::unique_ptr<VideoPacket> packet; // If |frame| is non-NULL then let the encoder process it. - if (frame) + if (frame) { packet = encoder->Encode(*frame); + } // If |frame| is NULL, or the encoder returned nothing, return an empty // packet. - if (!packet) + if (!packet) { packet = std::make_unique<VideoPacket>(); + } - if (frame) + if (frame) { packet->set_capture_time_ms(frame->capture_time_ms()); + } timestamps->encode_ended_time = base::TimeTicks::Now(); packet->set_encode_time_ms(
diff --git a/remoting/protocol/video_frame_pump_unittest.cc b/remoting/protocol/video_frame_pump_unittest.cc index 31e88fab..2936b76 100644 --- a/remoting/protocol/video_frame_pump_unittest.cc +++ b/remoting/protocol/video_frame_pump_unittest.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" @@ -75,8 +75,7 @@ public: ThreadCheckVideoEncoder( scoped_refptr<base::SingleThreadTaskRunner> task_runner) - : task_runner_(task_runner) { - } + : task_runner_(task_runner) {} ThreadCheckVideoEncoder(const ThreadCheckVideoEncoder&) = delete; ThreadCheckVideoEncoder& operator=(const ThreadCheckVideoEncoder&) = delete;
diff --git a/remoting/protocol/video_stub.h b/remoting/protocol/video_stub.h index 0d01caf5..d501be0 100644 --- a/remoting/protocol/video_stub.h +++ b/remoting/protocol/video_stub.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" namespace remoting {
diff --git a/remoting/protocol/webrtc_audio_module.cc b/remoting/protocol/webrtc_audio_module.cc index f00c95c85..56a5155 100644 --- a/remoting/protocol/webrtc_audio_module.cc +++ b/remoting/protocol/webrtc_audio_module.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/task/single_thread_task_runner.h" #include "base/timer/timer.h" @@ -364,8 +364,9 @@ DCHECK(audio_task_runner_->BelongsToCurrentThread()); base::AutoLock lock(lock_); - if (!audio_transport_) + if (!audio_transport_) { return; + } for (int i = 0; i < kPollInterval.InMilliseconds() / kFrameLengthMs; i++) { int64_t elapsed_time_ms = -1;
diff --git a/remoting/protocol/webrtc_audio_sink_adapter.cc b/remoting/protocol/webrtc_audio_sink_adapter.cc index 0325d26..67b378e 100644 --- a/remoting/protocol/webrtc_audio_sink_adapter.cc +++ b/remoting/protocol/webrtc_audio_sink_adapter.cc
@@ -4,9 +4,9 @@ #include "remoting/protocol/webrtc_audio_sink_adapter.h" -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/task/single_thread_task_runner.h" #include "remoting/proto/audio.pb.h"
diff --git a/remoting/protocol/webrtc_audio_source_adapter.cc b/remoting/protocol/webrtc_audio_source_adapter.cc index 1d3be1f..0a3c12c 100644 --- a/remoting/protocol/webrtc_audio_source_adapter.cc +++ b/remoting/protocol/webrtc_audio_source_adapter.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" #include "base/check_op.h" +#include "base/functional/bind.h" #include "base/observer_list.h" #include "base/synchronization/lock.h" #include "base/task/single_thread_task_runner.h" @@ -95,8 +95,9 @@ std::unique_ptr<AudioPacket> packet) { DCHECK_CALLED_ON_VALID_THREAD(thread_checker_); - if (paused_) + if (paused_) { return; + } DCHECK_EQ(packet->channels(), kChannels); DCHECK_EQ(packet->bytes_per_sample(), kBytesPerSample); @@ -120,7 +121,7 @@ std::min(bytes_per_frame - partial_frame_.size(), data.size()); position += bytes_to_append; partial_frame_.insert(partial_frame_.end(), data.data(), - data.data() + bytes_to_append); + data.data() + bytes_to_append); if (partial_frame_.size() < bytes_per_frame) { // Still don't have full frame. return;
diff --git a/remoting/protocol/webrtc_audio_source_adapter_unittest.cc b/remoting/protocol/webrtc_audio_source_adapter_unittest.cc index 2c5f07e..1aa6d374 100644 --- a/remoting/protocol/webrtc_audio_source_adapter_unittest.cc +++ b/remoting/protocol/webrtc_audio_source_adapter_unittest.cc
@@ -28,7 +28,7 @@ const int kChannels = 2; constexpr auto kFrameDuration = base::Milliseconds(10); -class FakeAudioSink : public webrtc::AudioTrackSinkInterface{ +class FakeAudioSink : public webrtc::AudioTrackSinkInterface { public: FakeAudioSink() = default; ~FakeAudioSink() override = default;
diff --git a/remoting/protocol/webrtc_audio_stream.h b/remoting/protocol/webrtc_audio_stream.h index 717ac56..8e5f00a 100644 --- a/remoting/protocol/webrtc_audio_stream.h +++ b/remoting/protocol/webrtc_audio_stream.h
@@ -13,7 +13,7 @@ namespace base { class SingleThreadTaskRunner; -} // namespace webrtc +} // namespace base namespace webrtc { class PeerConnectionInterface;
diff --git a/remoting/protocol/webrtc_connection_to_client.cc b/remoting/protocol/webrtc_connection_to_client.cc index 03cfc76..32cd84e8 100644 --- a/remoting/protocol/webrtc_connection_to_client.cc +++ b/remoting/protocol/webrtc_connection_to_client.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/logging.h" #include "base/task/single_thread_task_runner.h" @@ -171,8 +171,9 @@ // OnConnectionAuthenticated() call above may result in the connection // being torn down. - if (self) + if (self) { event_handler_->CreateMediaStreams(); + } break; }
diff --git a/remoting/protocol/webrtc_connection_to_host.cc b/remoting/protocol/webrtc_connection_to_host.cc index a8b5b6d9..0b27452 100644 --- a/remoting/protocol/webrtc_connection_to_host.cc +++ b/remoting/protocol/webrtc_connection_to_host.cc
@@ -39,8 +39,9 @@ transport_ = std::make_unique<WebrtcTransport>( webrtc::ThreadWrapper::current(), transport_context, nullptr, this); - if (audio_decode_task_runner_) + if (audio_decode_task_runner_) { transport_->audio_module()->SetAudioTaskRunner(audio_decode_task_runner_); + } session_ = std::move(session); session_->SetEventHandler(this); @@ -108,7 +109,7 @@ case Session::CLOSED: CloseChannels(); - SetState(CLOSED, OK); + SetState(CLOSED, OK); break; case Session::FAILED: @@ -137,8 +138,9 @@ void WebrtcConnectionToHost::OnWebrtcTransportIncomingDataChannel( const std::string& name, std::unique_ptr<MessagePipe> pipe) { - if (!control_dispatcher_) + if (!control_dispatcher_) { control_dispatcher_ = std::make_unique<ClientControlDispatcher>(); + } if (name == control_dispatcher_->channel_name() && !control_dispatcher_->is_connected()) { @@ -170,8 +172,9 @@ void WebrtcConnectionToHost::OnWebrtcTransportMediaStreamRemoved( rtc::scoped_refptr<webrtc::MediaStreamInterface> stream) { - if (video_adapter_ && video_adapter_->label() == stream->id()) + if (video_adapter_ && video_adapter_->label() == stream->id()) { video_adapter_.reset(); + } } void WebrtcConnectionToHost::OnWebrtcTransportRouteChanged( @@ -194,10 +197,12 @@ } void WebrtcConnectionToHost::NotifyIfChannelsReady() { - if (!control_dispatcher_.get() || !control_dispatcher_->is_connected()) + if (!control_dispatcher_.get() || !control_dispatcher_->is_connected()) { return; - if (!event_dispatcher_.get() || !event_dispatcher_->is_connected()) + } + if (!event_dispatcher_.get() || !event_dispatcher_->is_connected()) { return; + } // Start forwarding clipboard and input events. clipboard_forwarder_.set_clipboard_stub(control_dispatcher_.get());
diff --git a/remoting/protocol/webrtc_data_stream_adapter.cc b/remoting/protocol/webrtc_data_stream_adapter.cc index 7b2f6ce..dfd45af 100644 --- a/remoting/protocol/webrtc_data_stream_adapter.cc +++ b/remoting/protocol/webrtc_data_stream_adapter.cc
@@ -7,9 +7,9 @@ #include <stdint.h> #include <utility> -#include "base/bind.h" -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/location.h" #include "base/memory/ptr_util.h" #include "base/task/sequenced_task_runner.h"
diff --git a/remoting/protocol/webrtc_data_stream_adapter.h b/remoting/protocol/webrtc_data_stream_adapter.h index b25948e..8450393 100644 --- a/remoting/protocol/webrtc_data_stream_adapter.h +++ b/remoting/protocol/webrtc_data_stream_adapter.h
@@ -8,8 +8,8 @@ #include <memory> #include <string> -#include "base/callback.h" #include "base/containers/queue.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "remoting/protocol/message_pipe.h"
diff --git a/remoting/protocol/webrtc_event_log_data.cc b/remoting/protocol/webrtc_event_log_data.cc index 105f709..d4218de 100644 --- a/remoting/protocol/webrtc_event_log_data.cc +++ b/remoting/protocol/webrtc_event_log_data.cc
@@ -60,8 +60,9 @@ } bool WebrtcEventLogData::NeedNewSection(size_t log_event_size) const { - if (sections_.empty()) + if (sections_.empty()) { return true; + } // The event log entries are packet headers generated by WebRTC, and it is // assumed that the sizes are small enough to prevent integer overflow.
diff --git a/remoting/protocol/webrtc_frame_scheduler.h b/remoting/protocol/webrtc_frame_scheduler.h index 39a4ace..c4cf92e4 100644 --- a/remoting/protocol/webrtc_frame_scheduler.h +++ b/remoting/protocol/webrtc_frame_scheduler.h
@@ -5,7 +5,7 @@ #ifndef REMOTING_PROTOCOL_WEBRTC_FRAME_SCHEDULER_H_ #define REMOTING_PROTOCOL_WEBRTC_FRAME_SCHEDULER_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" namespace webrtc { class DesktopFrame;
diff --git a/remoting/protocol/webrtc_frame_scheduler_unittest.cc b/remoting/protocol/webrtc_frame_scheduler_unittest.cc index 87640f41..452be5b 100644 --- a/remoting/protocol/webrtc_frame_scheduler_unittest.cc +++ b/remoting/protocol/webrtc_frame_scheduler_unittest.cc
@@ -6,7 +6,7 @@ #include "remoting/protocol/webrtc_frame_scheduler.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/test/task_environment.h" #include "remoting/base/session_options.h" #include "remoting/protocol/frame_stats.h"
diff --git a/remoting/protocol/webrtc_transport.cc b/remoting/protocol/webrtc_transport.cc index 942b8c5..9f4d84e 100644 --- a/remoting/protocol/webrtc_transport.cc +++ b/remoting/protocol/webrtc_transport.cc
@@ -11,8 +11,8 @@ #include <vector> #include "base/base64.h" -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ref.h"
diff --git a/remoting/protocol/webrtc_transport.h b/remoting/protocol/webrtc_transport.h index 79c02df..94ff50d 100644 --- a/remoting/protocol/webrtc_transport.h +++ b/remoting/protocol/webrtc_transport.h
@@ -10,7 +10,7 @@ #include <tuple> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h"
diff --git a/remoting/protocol/webrtc_transport_unittest.cc b/remoting/protocol/webrtc_transport_unittest.cc index d6bad43..a5ef766 100644 --- a/remoting/protocol/webrtc_transport_unittest.cc +++ b/remoting/protocol/webrtc_transport_unittest.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/run_loop.h" #include "base/strings/string_util.h" @@ -72,12 +72,14 @@ // WebrtcTransport::EventHandler interface. void OnWebrtcTransportConnecting() override { - if (!connecting_callback_.is_null()) + if (!connecting_callback_.is_null()) { connecting_callback_.Run(); + } } void OnWebrtcTransportConnected() override { - if (!connected_callback_.is_null()) + if (!connected_callback_.is_null()) { connected_callback_.Run(); + } } void OnWebrtcTransportError(ErrorCode error) override { error_callback_.Run(error); @@ -133,13 +135,15 @@ // MessagePipe::EventHandler interface. void OnMessagePipeOpen() override { is_open_ = true; - if (!open_callback_.is_null()) + if (!open_callback_.is_null()) { open_callback_.Run(); + } } void OnMessageReceived(std::unique_ptr<CompoundBuffer> message) override { received_messages_.push_back(std::move(message)); - if (!message_callback_.is_null()) + if (!message_callback_.is_null()) { message_callback_.Run(); + } } void OnMessagePipeClosed() override { if (!closed_callback_.is_null()) { @@ -178,9 +182,10 @@ base::RunLoop().RunUntilIdle(); } - void ProcessTransportInfo(std::unique_ptr<WebrtcTransport>* target_transport, - bool normalize_line_endings, - std::unique_ptr<jingle_xmpp::XmlElement> transport_info) { + void ProcessTransportInfo( + std::unique_ptr<WebrtcTransport>* target_transport, + bool normalize_line_endings, + std::unique_ptr<jingle_xmpp::XmlElement> transport_info) { ASSERT_TRUE(target_transport); // Reformat the message to normalize line endings by removing CR symbol. @@ -278,13 +283,15 @@ client_message_pipe_ = std::move(pipe); client_message_pipe_->Start(&client_message_pipe_event_handler_); - if (run_loop_ && host_message_pipe_event_handler_.is_open()) + if (run_loop_ && host_message_pipe_event_handler_.is_open()) { run_loop_->Quit(); + } } void OnHostChannelConnected() { - if (run_loop_ && client_message_pipe_event_handler_.is_open()) + if (run_loop_ && client_message_pipe_event_handler_.is_open()) { run_loop_->Quit(); + } } void OnSessionError(TransportRole role, ErrorCode error) { @@ -312,8 +319,9 @@ void QuitRunLoopOnCounter(int* counter) { --(*counter); - if (*counter == 0) + if (*counter == 0) { run_loop_->Quit(); + } } protected:
diff --git a/remoting/protocol/webrtc_video_encoder_wrapper.cc b/remoting/protocol/webrtc_video_encoder_wrapper.cc index a7079c9..c602ac94 100644 --- a/remoting/protocol/webrtc_video_encoder_wrapper.cc +++ b/remoting/protocol/webrtc_video_encoder_wrapper.cc
@@ -10,8 +10,8 @@ #include <string> #include <vector> -#include "base/bind.h" #include "base/cxx17_backports.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/memory/ptr_util.h" #include "base/strings/string_number_conversions.h"
diff --git a/remoting/protocol/webrtc_video_renderer_adapter.cc b/remoting/protocol/webrtc_video_renderer_adapter.cc index 24228c17..e0908780 100644 --- a/remoting/protocol/webrtc_video_renderer_adapter.cc +++ b/remoting/protocol/webrtc_video_renderer_adapter.cc
@@ -8,8 +8,8 @@ #include <string> #include <utility> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/location.h" #include "base/logging.h" #include "base/memory/ptr_util.h" @@ -156,8 +156,9 @@ frame_stats.host_stats = host_stats; FrameStatsConsumer* frame_stats_consumer = video_renderer_->GetFrameStatsConsumer(); - if (frame_stats_consumer) + if (frame_stats_consumer) { frame_stats_consumer->OnVideoFrameStats(frame_stats); + } } void WebrtcVideoRendererAdapter::OnChannelInitialized( @@ -210,8 +211,9 @@ std::unique_ptr<ClientFrameStats> client_stats) { DCHECK(task_runner_->BelongsToCurrentThread()); - if (!video_stats_dispatcher_ || !video_stats_dispatcher_->is_connected()) + if (!video_stats_dispatcher_ || !video_stats_dispatcher_->is_connected()) { return; + } client_stats->time_rendered = base::TimeTicks::Now(); @@ -249,8 +251,9 @@ host_stats_queue_.pop_front(); FrameStatsConsumer* frame_stats_consumer = video_renderer_->GetFrameStatsConsumer(); - if (frame_stats_consumer) + if (frame_stats_consumer) { frame_stats_consumer->OnVideoFrameStats(frame_stats); + } } } // namespace remoting::protocol
diff --git a/remoting/protocol/webrtc_video_renderer_adapter.h b/remoting/protocol/webrtc_video_renderer_adapter.h index 785e8ccc..18ae121 100644 --- a/remoting/protocol/webrtc_video_renderer_adapter.h +++ b/remoting/protocol/webrtc_video_renderer_adapter.h
@@ -8,7 +8,7 @@ #include <list> #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/scoped_refptr.h" #include "base/memory/weak_ptr.h"
diff --git a/remoting/protocol/webrtc_video_stream.cc b/remoting/protocol/webrtc_video_stream.cc index 08f3196..e1e0f8e 100644 --- a/remoting/protocol/webrtc_video_stream.cc +++ b/remoting/protocol/webrtc_video_stream.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/logging.h" #include "base/task/single_thread_task_runner.h"
diff --git a/remoting/protocol/webrtc_video_track_source.cc b/remoting/protocol/webrtc_video_track_source.cc index c86cbea4..16eceadc 100644 --- a/remoting/protocol/webrtc_video_track_source.cc +++ b/remoting/protocol/webrtc_video_track_source.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/task/sequenced_task_runner.h" #include "remoting/protocol/webrtc_video_frame_adapter.h"
diff --git a/remoting/protocol/webrtc_video_track_source.h b/remoting/protocol/webrtc_video_track_source.h index d496c43..f71416e 100644 --- a/remoting/protocol/webrtc_video_track_source.h +++ b/remoting/protocol/webrtc_video_track_source.h
@@ -5,7 +5,7 @@ #ifndef REMOTING_PROTOCOL_WEBRTC_VIDEO_TRACK_SOURCE_H_ #define REMOTING_PROTOCOL_WEBRTC_VIDEO_TRACK_SOURCE_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/task/sequenced_task_runner.h" #include "remoting/codec/webrtc_video_encoder.h"
diff --git a/remoting/protocol/webrtc_video_track_source_unittest.cc b/remoting/protocol/webrtc_video_track_source_unittest.cc index 8a8736e..649f62a3e 100644 --- a/remoting/protocol/webrtc_video_track_source_unittest.cc +++ b/remoting/protocol/webrtc_video_track_source_unittest.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "base/callback_helpers.h" +#include "base/functional/callback_helpers.h" #include "base/test/mock_callback.h" #include "base/test/task_environment.h" #include "testing/gmock/include/gmock/gmock.h"
diff --git a/remoting/signaling/delegating_signal_strategy.cc b/remoting/signaling/delegating_signal_strategy.cc index ba55dbe4..6f43cfb 100644 --- a/remoting/signaling/delegating_signal_strategy.cc +++ b/remoting/signaling/delegating_signal_strategy.cc
@@ -4,7 +4,7 @@ #include "remoting/signaling/delegating_signal_strategy.h" -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/rand_util.h" #include "base/strings/string_number_conversions.h" @@ -51,22 +51,25 @@ void DelegatingSignalStrategy::OnIncomingMessage(const std::string& message) { DCHECK(client_task_runner_->BelongsToCurrentThread()); - std::unique_ptr<jingle_xmpp::XmlElement> stanza(jingle_xmpp::XmlElement::ForStr(message)); + std::unique_ptr<jingle_xmpp::XmlElement> stanza( + jingle_xmpp::XmlElement::ForStr(message)); if (!stanza.get()) { LOG(WARNING) << "Malformed XMPP stanza received: " << message; return; } for (auto& listener : listeners_) { - if (listener.OnSignalStrategyIncomingStanza(stanza.get())) + if (listener.OnSignalStrategyIncomingStanza(stanza.get())) { break; + } } } void DelegatingSignalStrategy::Connect() { DCHECK(client_task_runner_->BelongsToCurrentThread()); - for (auto& observer : listeners_) + for (auto& observer : listeners_) { observer.OnSignalStrategyStateChange(CONNECTED); + } } void DelegatingSignalStrategy::Disconnect() {
diff --git a/remoting/signaling/delegating_signal_strategy.h b/remoting/signaling/delegating_signal_strategy.h index 361e7d2..de712649 100644 --- a/remoting/signaling/delegating_signal_strategy.h +++ b/remoting/signaling/delegating_signal_strategy.h
@@ -5,7 +5,7 @@ #ifndef REMOTING_SIGNALING_DELEGATING_SIGNAL_STRATEGY_H_ #define REMOTING_SIGNALING_DELEGATING_SIGNAL_STRATEGY_H_ -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h" #include "remoting/signaling/signal_strategy.h"
diff --git a/remoting/signaling/fake_signal_strategy.cc b/remoting/signaling/fake_signal_strategy.cc index 8584ce70..96830d3 100644 --- a/remoting/signaling/fake_signal_strategy.cc +++ b/remoting/signaling/fake_signal_strategy.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/logging.h" #include "base/strings/string_number_conversions.h" @@ -53,8 +53,9 @@ return; } state_ = state; - for (auto& observer : listeners_) + for (auto& observer : listeners_) { observer.OnSignalStrategyStateChange(state_); + } } void FakeSignalStrategy::SetPeerCallback(const PeerCallback& peer_callback) { @@ -148,13 +149,15 @@ listeners_.RemoveObserver(listener); } -bool FakeSignalStrategy::SendStanza(std::unique_ptr<jingle_xmpp::XmlElement> stanza) { +bool FakeSignalStrategy::SendStanza( + std::unique_ptr<jingle_xmpp::XmlElement> stanza) { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); address_.SetInMessage(stanza.get(), SignalingAddress::FROM); - if (peer_callback_.is_null()) + if (peer_callback_.is_null()) { return false; + } if (send_delay_.is_zero()) { peer_callback_.Run(std::move(stanza)); @@ -211,8 +214,9 @@ } for (auto& listener : listeners_) { - if (listener.OnSignalStrategyIncomingStanza(stanza_ptr)) + if (listener.OnSignalStrategyIncomingStanza(stanza_ptr)) { break; + } } }
diff --git a/remoting/signaling/fake_signal_strategy.h b/remoting/signaling/fake_signal_strategy.h index 2a45cf70..35b91cd 100644 --- a/remoting/signaling/fake_signal_strategy.h +++ b/remoting/signaling/fake_signal_strategy.h
@@ -38,13 +38,12 @@ ~FakeSignalStrategy() override; - const std::vector<std::unique_ptr<jingle_xmpp::XmlElement>>& received_messages() { + const std::vector<std::unique_ptr<jingle_xmpp::XmlElement>>& + received_messages() { return received_messages_; } - void set_send_delay(base::TimeDelta delay) { - send_delay_ = delay; - } + void set_send_delay(base::TimeDelta delay) { send_delay_ = delay; } void SetError(Error error); void SetIsSignInError(bool is_sign_in_error);
diff --git a/remoting/signaling/ftl_message_reception_channel.cc b/remoting/signaling/ftl_message_reception_channel.cc index c27d5b3..d298d664 100644 --- a/remoting/signaling/ftl_message_reception_channel.cc +++ b/remoting/signaling/ftl_message_reception_channel.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "remoting/base/protobuf_http_status.h" #include "remoting/base/scoped_protobuf_http_request.h"
diff --git a/remoting/signaling/ftl_message_reception_channel.h b/remoting/signaling/ftl_message_reception_channel.h index 4571683..3cf965e5 100644 --- a/remoting/signaling/ftl_message_reception_channel.h +++ b/remoting/signaling/ftl_message_reception_channel.h
@@ -8,7 +8,7 @@ #include <list> #include <memory> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "base/time/time.h"
diff --git a/remoting/signaling/ftl_message_reception_channel_unittest.cc b/remoting/signaling/ftl_message_reception_channel_unittest.cc index ce515e53..893b0ab7 100644 --- a/remoting/signaling/ftl_message_reception_channel_unittest.cc +++ b/remoting/signaling/ftl_message_reception_channel_unittest.cc
@@ -10,8 +10,8 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/weak_ptr.h" #include "base/notreached.h" #include "base/run_loop.h"
diff --git a/remoting/signaling/ftl_messaging_client.cc b/remoting/signaling/ftl_messaging_client.cc index 0fb8828..56cbbde 100644 --- a/remoting/signaling/ftl_messaging_client.cc +++ b/remoting/signaling/ftl_messaging_client.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/guid.h" #include "base/logging.h" #include "base/time/time.h"
diff --git a/remoting/signaling/ftl_messaging_client_unittest.cc b/remoting/signaling/ftl_messaging_client_unittest.cc index 3356dab8..dd6dd475 100644 --- a/remoting/signaling/ftl_messaging_client_unittest.cc +++ b/remoting/signaling/ftl_messaging_client_unittest.cc
@@ -10,9 +10,9 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/check.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/memory/raw_ptr.h" #include "base/notreached.h" #include "base/run_loop.h"
diff --git a/remoting/signaling/ftl_registration_manager.cc b/remoting/signaling/ftl_registration_manager.cc index e14086a7..daaf0c26 100644 --- a/remoting/signaling/ftl_registration_manager.cc +++ b/remoting/signaling/ftl_registration_manager.cc
@@ -6,8 +6,8 @@ #include <utility> -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/logging.h" #include "base/time/time.h" #include "net/traffic_annotation/network_traffic_annotation.h"
diff --git a/remoting/signaling/ftl_registration_manager.h b/remoting/signaling/ftl_registration_manager.h index 66158f4..49262682 100644 --- a/remoting/signaling/ftl_registration_manager.h +++ b/remoting/signaling/ftl_registration_manager.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/scoped_refptr.h" #include "base/timer/timer.h" #include "net/base/backoff_entry.h"
diff --git a/remoting/signaling/ftl_signal_strategy.cc b/remoting/signaling/ftl_signal_strategy.cc index db3cfdc..8680674a 100644 --- a/remoting/signaling/ftl_signal_strategy.cc +++ b/remoting/signaling/ftl_signal_strategy.cc
@@ -6,7 +6,7 @@ #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/memory/ptr_util.h" #include "base/memory/weak_ptr.h" @@ -130,8 +130,9 @@ messaging_client_->RegisterMessageCallback(base::BindRepeating( &Core::OnMessageReceived, weak_factory_.GetWeakPtr())); - for (auto& observer : listeners_) + for (auto& observer : listeners_) { observer.OnSignalStrategyStateChange(CONNECTING); + } StartReceivingMessages(); } @@ -148,8 +149,9 @@ receive_message_subscription_ = {}; messaging_client_->StopReceivingMessages(); - for (auto& observer : listeners_) + for (auto& observer : listeners_) { observer.OnSignalStrategyStateChange(DISCONNECTED); + } } } @@ -304,8 +306,9 @@ local_address_ = SignalingAddress::CreateFtlSignalingAddress( user_email_, registration_manager_->GetRegistrationId()); - for (auto& observer : listeners_) + for (auto& observer : listeners_) { observer.OnSignalStrategyStateChange(CONNECTED); + } } void FtlSignalStrategy::Core::OnReceiveMessagesStreamClosed( @@ -461,8 +464,9 @@ << "\n========================================================="; for (auto& listener : listeners_) { - if (listener.OnSignalStrategyIncomingStanza(stanza.get())) + if (listener.OnSignalStrategyIncomingStanza(stanza.get())) { return; + } } }
diff --git a/remoting/signaling/ftl_signal_strategy_unittest.cc b/remoting/signaling/ftl_signal_strategy_unittest.cc index 2eea051..bb5550e 100644 --- a/remoting/signaling/ftl_signal_strategy_unittest.cc +++ b/remoting/signaling/ftl_signal_strategy_unittest.cc
@@ -8,8 +8,8 @@ #include <string> #include <vector> -#include "base/callback.h" -#include "base/callback_helpers.h" +#include "base/functional/callback.h" +#include "base/functional/callback_helpers.h" #include "base/memory/ptr_util.h" #include "base/memory/raw_ptr.h" #include "base/test/task_environment.h"
diff --git a/remoting/signaling/iq_sender.cc b/remoting/signaling/iq_sender.cc index 8c4e067..ed7b7eb 100644 --- a/remoting/signaling/iq_sender.cc +++ b/remoting/signaling/iq_sender.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/logging.h" #include "base/strings/string_number_conversions.h" @@ -28,8 +28,9 @@ std::unique_ptr<jingle_xmpp::XmlElement> stanza( new jingle_xmpp::XmlElement(kQNameIq)); stanza->AddAttr(kQNameType, type); - if (!addressee.empty()) + if (!addressee.empty()) { stanza->AddAttr(kQNameTo, addressee); + } stanza->AddElement(iq_body.release()); return stanza; } @@ -59,8 +60,9 @@ bool callback_exists = !callback.is_null(); auto request = std::make_unique<IqRequest>(this, std::move(callback), addressee); - if (callback_exists) + if (callback_exists) { requests_[id] = request.get(); + } return request; } @@ -85,10 +87,10 @@ } } -void IqSender::OnSignalStrategyStateChange(SignalStrategy::State state) { -} +void IqSender::OnSignalStrategyStateChange(SignalStrategy::State state) {} -bool IqSender::OnSignalStrategyIncomingStanza(const jingle_xmpp::XmlElement* stanza) { +bool IqSender::OnSignalStrategyIncomingStanza( + const jingle_xmpp::XmlElement* stanza) { if (stanza->Name() != kQNameIq) { LOG(WARNING) << "Received unexpected non-IQ packet " << stanza->Str(); return false; @@ -149,8 +151,9 @@ } void IqRequest::CallCallback(const jingle_xmpp::XmlElement* stanza) { - if (!callback_.is_null()) + if (!callback_.is_null()) { std::move(callback_).Run(this, stanza); + } } void IqRequest::OnTimeout() { @@ -160,14 +163,16 @@ void IqRequest::OnResponse(const jingle_xmpp::XmlElement* stanza) { // It's unsafe to delete signal strategy here, and the callback may // want to do that, so we post task to invoke the callback later. - std::unique_ptr<jingle_xmpp::XmlElement> stanza_copy(new jingle_xmpp::XmlElement(*stanza)); + std::unique_ptr<jingle_xmpp::XmlElement> stanza_copy( + new jingle_xmpp::XmlElement(*stanza)); base::SingleThreadTaskRunner::GetCurrentDefault()->PostTask( FROM_HERE, base::BindOnce(&IqRequest::DeliverResponse, weak_factory_.GetWeakPtr(), std::move(stanza_copy))); } -void IqRequest::DeliverResponse(std::unique_ptr<jingle_xmpp::XmlElement> stanza) { +void IqRequest::DeliverResponse( + std::unique_ptr<jingle_xmpp::XmlElement> stanza) { CallCallback(stanza.get()); }
diff --git a/remoting/signaling/iq_sender.h b/remoting/signaling/iq_sender.h index ca7362c..55019b28 100644 --- a/remoting/signaling/iq_sender.h +++ b/remoting/signaling/iq_sender.h
@@ -9,8 +9,8 @@ #include <memory> #include <string> -#include "base/callback.h" #include "base/compiler_specific.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "remoting/signaling/signal_strategy.h" @@ -63,7 +63,8 @@ // SignalStrategy::Listener implementation. void OnSignalStrategyStateChange(SignalStrategy::State state) override; - bool OnSignalStrategyIncomingStanza(const jingle_xmpp::XmlElement* stanza) override; + bool OnSignalStrategyIncomingStanza( + const jingle_xmpp::XmlElement* stanza) override; private: typedef std::map<std::string, IqRequest*> IqRequestMap;
diff --git a/remoting/signaling/iq_sender_unittest.cc b/remoting/signaling/iq_sender_unittest.cc index a5c25b4..c85400f 100644 --- a/remoting/signaling/iq_sender_unittest.cc +++ b/remoting/signaling/iq_sender_unittest.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/memory/ref_counted.h" #include "base/run_loop.h" #include "base/strings/stringprintf.h" @@ -52,8 +52,9 @@ IqSenderTest() : signal_strategy_(SignalingAddress("local_jid@domain.com")) { EXPECT_CALL(signal_strategy_, AddListener(NotNull())); sender_ = std::make_unique<IqSender>(&signal_strategy_); - EXPECT_CALL(signal_strategy_, RemoveListener( - static_cast<SignalStrategy::Listener*>(sender_.get()))); + EXPECT_CALL( + signal_strategy_, + RemoveListener(static_cast<SignalStrategy::Listener*>(sender_.get()))); } protected: @@ -61,20 +62,18 @@ std::unique_ptr<XmlElement> iq_body( new XmlElement(QName(kNamespace, kBodyTag))); XmlElement* sent_stanza; - EXPECT_CALL(signal_strategy_, GetNextId()) - .WillOnce(Return(kStanzaId)); + EXPECT_CALL(signal_strategy_, GetNextId()).WillOnce(Return(kStanzaId)); EXPECT_CALL(signal_strategy_, SendStanzaPtr(_)) .WillOnce(DoAll(SaveArg<0>(&sent_stanza), Return(true))); request_ = sender_->SendIq(kType, kTo, std::move(iq_body), callback_.Get()); - std::string expected_xml_string = - base::StringPrintf( - "<cli:iq type=\"%s\" to=\"%s\" id=\"%s\" " - "xmlns:cli=\"jabber:client\">" - "<%s:%s xmlns:%s=\"%s\"/>" - "</cli:iq>", - kType, kTo, kStanzaId, kNamespacePrefix, kBodyTag, - kNamespacePrefix, kNamespace); + std::string expected_xml_string = base::StringPrintf( + "<cli:iq type=\"%s\" to=\"%s\" id=\"%s\" " + "xmlns:cli=\"jabber:client\">" + "<%s:%s xmlns:%s=\"%s\"/>" + "</cli:iq>", + kType, kTo, kStanzaId, kNamespacePrefix, kBodyTag, kNamespacePrefix, + kNamespace); EXPECT_EQ(expected_xml_string, sent_stanza->Str()); delete sent_stanza; } @@ -86,14 +85,15 @@ response->AddAttr(QName(std::string(), "id"), kStanzaId); response->AddAttr(QName(std::string(), "from"), from); - XmlElement* response_body = new XmlElement( - QName("test:namespace", "response-body")); + XmlElement* response_body = + new XmlElement(QName("test:namespace", "response-body")); response->AddElement(response_body); bool result = sender_->OnSignalStrategyIncomingStanza(response.get()); - if (response_out) + if (response_out) { *response_out = std::move(response); + } return result; } @@ -106,9 +106,7 @@ }; TEST_F(IqSenderTest, SendIq) { - ASSERT_NO_FATAL_FAILURE({ - SendTestMessage(); - }); + ASSERT_NO_FATAL_FAILURE({ SendTestMessage(); }); std::unique_ptr<XmlElement> response; EXPECT_TRUE(FormatAndDeliverResponse(kTo, &response)); @@ -118,9 +116,7 @@ } TEST_F(IqSenderTest, Timeout) { - ASSERT_NO_FATAL_FAILURE({ - SendTestMessage(); - }); + ASSERT_NO_FATAL_FAILURE({ SendTestMessage(); }); request_->SetTimeout(base::Milliseconds(2)); @@ -131,9 +127,7 @@ } TEST_F(IqSenderTest, NotNormalizedJid) { - ASSERT_NO_FATAL_FAILURE({ - SendTestMessage(); - }); + ASSERT_NO_FATAL_FAILURE({ SendTestMessage(); }); // Set upper-case from value, which is equivalent to kTo in the original // message. @@ -145,9 +139,7 @@ } TEST_F(IqSenderTest, InvalidFrom) { - ASSERT_NO_FATAL_FAILURE({ - SendTestMessage(); - }); + ASSERT_NO_FATAL_FAILURE({ SendTestMessage(); }); EXPECT_FALSE(FormatAndDeliverResponse("different_user@domain.com", nullptr));
diff --git a/remoting/signaling/message_reception_channel.h b/remoting/signaling/message_reception_channel.h index b3063617..44d7e2b6 100644 --- a/remoting/signaling/message_reception_channel.h +++ b/remoting/signaling/message_reception_channel.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "remoting/proto/ftl/v1/ftl_messages.pb.h" namespace remoting {
diff --git a/remoting/signaling/messaging_client.h b/remoting/signaling/messaging_client.h index c2c1e9f..1468ddf 100644 --- a/remoting/signaling/messaging_client.h +++ b/remoting/signaling/messaging_client.h
@@ -7,8 +7,8 @@ #include <memory> -#include "base/callback_forward.h" #include "base/callback_list.h" +#include "base/functional/callback_forward.h" #include "remoting/proto/ftl/v1/chromoting_message.pb.h" #include "remoting/proto/ftl/v1/ftl_messages.pb.h"
diff --git a/remoting/signaling/registration_manager.h b/remoting/signaling/registration_manager.h index 7c832eb9..a353e63 100644 --- a/remoting/signaling/registration_manager.h +++ b/remoting/signaling/registration_manager.h
@@ -7,7 +7,7 @@ #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" namespace remoting {
diff --git a/remoting/signaling/remoting_log_to_server.cc b/remoting/signaling/remoting_log_to_server.cc index abf6384..b7943ba 100644 --- a/remoting/signaling/remoting_log_to_server.cc +++ b/remoting/signaling/remoting_log_to_server.cc
@@ -6,7 +6,7 @@ #include <sstream> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "net/traffic_annotation/network_traffic_annotation.h" #include "remoting/base/protobuf_http_client.h"
diff --git a/remoting/signaling/remoting_log_to_server.h b/remoting/signaling/remoting_log_to_server.h index ea44402..e9f94a15 100644 --- a/remoting/signaling/remoting_log_to_server.h +++ b/remoting/signaling/remoting_log_to_server.h
@@ -7,7 +7,7 @@ #include <memory> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/scoped_refptr.h" #include "base/sequence_checker.h" #include "base/timer/timer.h"
diff --git a/remoting/signaling/server_log_entry.h b/remoting/signaling/server_log_entry.h index 45412e8..10db6cf 100644 --- a/remoting/signaling/server_log_entry.h +++ b/remoting/signaling/server_log_entry.h
@@ -23,10 +23,7 @@ class ServerLogEntry { public: // The mode of a connection. - enum Mode { - IT2ME, - ME2ME - }; + enum Mode { IT2ME, ME2ME }; ServerLogEntry(); ServerLogEntry(const ServerLogEntry& other);
diff --git a/remoting/signaling/server_log_entry_unittest.cc b/remoting/signaling/server_log_entry_unittest.cc index 64158504..3956789 100644 --- a/remoting/signaling/server_log_entry_unittest.cc +++ b/remoting/signaling/server_log_entry_unittest.cc
@@ -53,17 +53,15 @@ return entry; } -bool VerifyStanza( - const std::map<std::string, std::string>& key_value_pairs, - const std::set<std::string> keys, - const XmlElement* elem, - std::string* error) { +bool VerifyStanza(const std::map<std::string, std::string>& key_value_pairs, + const std::set<std::string> keys, + const XmlElement* elem, + std::string* error) { int attrCount = 0; for (const XmlAttr* attr = elem->FirstAttr(); attr != nullptr; attr = attr->NextAttr(), attrCount++) { if (attr->Name().Namespace().length() != 0) { - *error = "attribute has non-empty namespace " + - attr->Name().Namespace(); + *error = "attribute has non-empty namespace " + attr->Name().Namespace(); return false; } const std::string& key = attr->Name().LocalPart(); @@ -77,7 +75,7 @@ } else { if (iter->second != value) { *error = "attribute " + key + " has value " + iter->second + - ": expected " + value; + ": expected " + value; return false; } }
diff --git a/remoting/signaling/server_log_entry_unittest.h b/remoting/signaling/server_log_entry_unittest.h index 66adc82..221d57c 100644 --- a/remoting/signaling/server_log_entry_unittest.h +++ b/remoting/signaling/server_log_entry_unittest.h
@@ -20,21 +20,22 @@ // Verifies that |stanza| contains a <log> element and returns it. Otherwise // returns nullptr and records a test failure. -jingle_xmpp::XmlElement* GetLogElementFromStanza(jingle_xmpp::XmlElement* stanza); +jingle_xmpp::XmlElement* GetLogElementFromStanza( + jingle_xmpp::XmlElement* stanza); // Verifies that |stanza| contains only 1 log entry, and returns the <entry> // element. Otherwise returns nullptr and records a test failure. -jingle_xmpp::XmlElement* GetSingleLogEntryFromStanza(jingle_xmpp::XmlElement* stanza); +jingle_xmpp::XmlElement* GetSingleLogEntryFromStanza( + jingle_xmpp::XmlElement* stanza); // Verifies a logging stanza. // |keyValuePairs| lists the keys that must have specified values, and |keys| // lists the keys that must be present, but may have arbitrary values. // There must be no other keys. -bool VerifyStanza( - const std::map<std::string, std::string>& key_value_pairs, - const std::set<std::string> keys, - const jingle_xmpp::XmlElement* elem, - std::string* error); +bool VerifyStanza(const std::map<std::string, std::string>& key_value_pairs, + const std::set<std::string> keys, + const jingle_xmpp::XmlElement* elem, + std::string* error); } // namespace remoting
diff --git a/remoting/signaling/signaling_address_unittest.cc b/remoting/signaling/signaling_address_unittest.cc index ebd28254..d8eeb89 100644 --- a/remoting/signaling/signaling_address_unittest.cc +++ b/remoting/signaling/signaling_address_unittest.cc
@@ -16,7 +16,8 @@ namespace { std::unique_ptr<jingle_xmpp::XmlElement> GetEmptyJingleMessage() { - return std::unique_ptr<jingle_xmpp::XmlElement>(jingle_xmpp::XmlElement::ForStr( + return std::unique_ptr< + jingle_xmpp::XmlElement>(jingle_xmpp::XmlElement::ForStr( "<iq xmlns='jabber:client'><jingle xmlns='urn:xmpp:jingle:1'/></iq>")); }
diff --git a/remoting/signaling/xmpp_log_to_server.cc b/remoting/signaling/xmpp_log_to_server.cc index 1f94c1c..fbb60e76 100644 --- a/remoting/signaling/xmpp_log_to_server.cc +++ b/remoting/signaling/xmpp_log_to_server.cc
@@ -7,7 +7,7 @@ #include <memory> #include <utility> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/task/sequenced_task_runner.h" #include "remoting/base/constants.h" #include "remoting/signaling/iq_sender.h"
diff --git a/remoting/test/capability_test_stub_main.cc b/remoting/test/capability_test_stub_main.cc index dcfdb78..d919883 100644 --- a/remoting/test/capability_test_stub_main.cc +++ b/remoting/test/capability_test_stub_main.cc
@@ -59,10 +59,10 @@ base::CommandLine::Init(argc, argv); const base::CommandLine* command_line = - base::CommandLine::ForCurrentProcess(); + base::CommandLine::ForCurrentProcess(); if (command_line->HasSwitch(kEvaluateCapabilitySwitchName)) { - return EvaluateCapabilityLocally(command_line->GetSwitchValueASCII( - kEvaluateCapabilitySwitchName)); + return EvaluateCapabilityLocally( + command_line->GetSwitchValueASCII(kEvaluateCapabilitySwitchName)); } return kInvalidCommandLineExitCode;
diff --git a/remoting/test/cli_util.cc b/remoting/test/cli_util.cc index 3d5b7b1..2035e3739 100644 --- a/remoting/test/cli_util.cc +++ b/remoting/test/cli_util.cc
@@ -67,11 +67,13 @@ const int kMaxLen = 1024; std::string str(kMaxLen, 0); char* result = fgets(&str[0], kMaxLen, stdin); - if (!result) + if (!result) { return std::string(); + } size_t newline_index = str.find('\n'); - if (newline_index != std::string::npos) + if (newline_index != std::string::npos) { str[newline_index] = '\0'; + } str.resize(strlen(&str[0])); return str; }
diff --git a/remoting/test/cli_util.h b/remoting/test/cli_util.h index d5d4d51f..c852245 100644 --- a/remoting/test/cli_util.h +++ b/remoting/test/cli_util.h
@@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" namespace remoting { namespace test {
diff --git a/remoting/test/codec_perftest.cc b/remoting/test/codec_perftest.cc index 2c73ce5c..dc0f79e9 100644 --- a/remoting/test/codec_perftest.cc +++ b/remoting/test/codec_perftest.cc
@@ -80,8 +80,9 @@ base::TimeDelta latency = ended - started; total_latency += latency; - if (packet) + if (packet) { total_bytes += packet->data().size(); + } switch (frame_generator_->last_frame_type()) { case CyclicFrameGenerator::ChangeType::NO_CHANGES: @@ -110,15 +111,15 @@ << (total_latency_big_frames / big_frame_count).InMillisecondsF(); if (small_frame_count) { - VLOG(0) << "Average encode latency for small frames: " - << (total_latency_small_frames / small_frame_count) - .InMillisecondsF(); + VLOG(0) + << "Average encode latency for small frames: " + << (total_latency_small_frames / small_frame_count).InMillisecondsF(); } if (empty_frame_count) { - VLOG(0) << "Average encode latency for empty frames: " - << (total_latency_empty_frames / empty_frame_count) - .InMillisecondsF(); + VLOG(0) + << "Average encode latency for empty frames: " + << (total_latency_empty_frames / empty_frame_count).InMillisecondsF(); } VLOG(0) << "Encoded bytes: " << total_bytes;
diff --git a/remoting/test/cyclic_frame_generator.h b/remoting/test/cyclic_frame_generator.h index b56cefa..4ea80c1 100644 --- a/remoting/test/cyclic_frame_generator.h +++ b/remoting/test/cyclic_frame_generator.h
@@ -9,7 +9,7 @@ #include <memory> #include <vector> -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/memory/ref_counted.h" #include "base/time/default_tick_clock.h"
diff --git a/remoting/test/fake_connection_event_logger.cc b/remoting/test/fake_connection_event_logger.cc index 7198d13..a689338a 100644 --- a/remoting/test/fake_connection_event_logger.cc +++ b/remoting/test/fake_connection_event_logger.cc
@@ -8,7 +8,7 @@ #include <utility> #include "base/atomicops.h" -#include "base/callback.h" +#include "base/functional/callback.h" #include "base/memory/raw_ptr.h" #include "base/time/time.h" #include "remoting/proto/audio.pb.h" @@ -26,21 +26,15 @@ template <typename T> class NoBarrierAtomic { public: - T operator++() { - return base::subtle::NoBarrier_AtomicIncrement(&i_, 1) - 1; - } + T operator++() { return base::subtle::NoBarrier_AtomicIncrement(&i_, 1) - 1; } - T operator++(int) { - return base::subtle::NoBarrier_AtomicIncrement(&i_, 1); - } + T operator++(int) { return base::subtle::NoBarrier_AtomicIncrement(&i_, 1); } T operator--() { return base::subtle::NoBarrier_AtomicIncrement(&i_, -1) - 1; } - T operator--(int) { - return base::subtle::NoBarrier_AtomicIncrement(&i_, -1); - } + T operator--(int) { return base::subtle::NoBarrier_AtomicIncrement(&i_, -1); } T operator+=(T other) { return base::subtle::NoBarrier_AtomicIncrement(&i_, other); @@ -50,9 +44,7 @@ return base::subtle::NoBarrier_AtomicIncrement(&i_, -other); } - T operator*() const { - return base::subtle::NoBarrier_Load(&i_); - } + T operator*() const { return base::subtle::NoBarrier_Load(&i_); } private: volatile T i_; @@ -207,7 +199,8 @@ // Analyzes messages from DeliverHostMessage function. class FakeConnectionEventLogger::CounterClientStub - : public protocol::ClientStub, public MessageCounter { + : public protocol::ClientStub, + public MessageCounter { public: CounterClientStub(); @@ -232,8 +225,8 @@ } // Analyzes messages from DeliverClientMessage function. -class FakeConnectionEventLogger::CounterHostStub - : public protocol::HostStub, public MessageCounter { +class FakeConnectionEventLogger::CounterHostStub : public protocol::HostStub, + public MessageCounter { public: CounterHostStub(); @@ -262,8 +255,8 @@ } // Analyzes messages from ProcessAudioPacket function. -class FakeConnectionEventLogger::CounterAudioStub - : public protocol::AudioStub, public MessageCounter { +class FakeConnectionEventLogger::CounterAudioStub : public protocol::AudioStub, + public MessageCounter { public: CounterAudioStub(); @@ -285,8 +278,8 @@ } // Analyzes messages from ProcessVideoPacket function. -class FakeConnectionEventLogger::CounterVideoStub - : public protocol::VideoStub, public MessageCounter { +class FakeConnectionEventLogger::CounterVideoStub : public protocol::VideoStub, + public MessageCounter { public: CounterVideoStub(protocol::FakeConnectionToClient* connection); @@ -323,8 +316,7 @@ base::OnceClosure done) { if (video_packet && video_packet->has_capture_overhead_time_ms()) { // Not a keepalive packet. - if (connection_ && - connection_->video_feedback_stub()) { + if (connection_ && connection_->video_feedback_stub()) { std::unique_ptr<VideoAck> ack(new VideoAck()); ack->set_frame_id(video_packet->frame_id()); connection_->video_feedback_stub()->ProcessVideoAck(std::move(ack)); @@ -339,10 +331,10 @@ FakeConnectionEventLogger::FakeConnectionEventLogger( protocol::FakeConnectionToClient* connection) - : client_stub_(new CounterClientStub()), - host_stub_(new CounterHostStub()), - audio_stub_(new CounterAudioStub()), - video_stub_(new CounterVideoStub(connection)) {} + : client_stub_(new CounterClientStub()), + host_stub_(new CounterHostStub()), + audio_stub_(new CounterAudioStub()), + video_stub_(new CounterVideoStub(connection)) {} FakeConnectionEventLogger::~FakeConnectionEventLogger() {}
diff --git a/remoting/test/fake_network_dispatcher.cc b/remoting/test/fake_network_dispatcher.cc index 3527b9a6..daae3bd 100644 --- a/remoting/test/fake_network_dispatcher.cc +++ b/remoting/test/fake_network_dispatcher.cc
@@ -6,7 +6,7 @@ #include <stddef.h> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/logging.h" #include "base/task/single_thread_task_runner.h" @@ -14,9 +14,7 @@ namespace remoting { -FakeNetworkDispatcher::FakeNetworkDispatcher() - : allocated_address_(0) { -} +FakeNetworkDispatcher::FakeNetworkDispatcher() : allocated_address_(0) {} FakeNetworkDispatcher::~FakeNetworkDispatcher() { CHECK(nodes_.empty());
diff --git a/remoting/test/fake_network_manager.cc b/remoting/test/fake_network_manager.cc index a59c959..e3425f8 100644 --- a/remoting/test/fake_network_manager.cc +++ b/remoting/test/fake_network_manager.cc
@@ -6,7 +6,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/task/single_thread_task_runner.h" #include "components/webrtc/net_address_utils.h"
diff --git a/remoting/test/fake_port_allocator.h b/remoting/test/fake_port_allocator.h index f708aad2..ae4ccb3 100644 --- a/remoting/test/fake_port_allocator.h +++ b/remoting/test/fake_port_allocator.h
@@ -53,7 +53,7 @@ FakePacketSocketFactory* socket_factory() { return socket_factory_.get(); } - // PortAllocatorFactory interface. + // PortAllocatorFactory interface. std::unique_ptr<cricket::PortAllocator> CreatePortAllocator( scoped_refptr<protocol::TransportContext> transport_context, base::WeakPtr<protocol::SessionOptionsProvider> session_options_provider)
diff --git a/remoting/test/fake_socket_factory.cc b/remoting/test/fake_socket_factory.cc index c4a8e67..1a1f460f 100644 --- a/remoting/test/fake_socket_factory.cc +++ b/remoting/test/fake_socket_factory.cc
@@ -10,8 +10,8 @@ #include <memory> #include <string> -#include "base/bind.h" -#include "base/callback.h" +#include "base/functional/bind.h" +#include "base/functional/callback.h" #include "base/location.h" #include "base/memory/raw_ptr.h" #include "base/numerics/math_constants.h" @@ -88,8 +88,7 @@ : factory_(factory), dispatcher_(dispatcher), local_address_(local_address), - state_(STATE_BOUND) { -} + state_(STATE_BOUND) {} FakeUdpSocket::~FakeUdpSocket() { factory_->OnSocketDestroyed(local_address_.port()); @@ -111,13 +110,15 @@ return rtc::SocketAddress(); } -int FakeUdpSocket::Send(const void* data, size_t data_size, +int FakeUdpSocket::Send(const void* data, + size_t data_size, const rtc::PacketOptions& options) { NOTREACHED(); return EINVAL; } -int FakeUdpSocket::SendTo(const void* data, size_t data_size, +int FakeUdpSocket::SendTo(const void* data, + size_t data_size, const rtc::SocketAddress& address, const rtc::PacketOptions& options) { scoped_refptr<net::IOBuffer> buffer = @@ -161,17 +162,14 @@ } // namespace -FakePacketSocketFactory::PendingPacket::PendingPacket() - : data_size(0) { -} +FakePacketSocketFactory::PendingPacket::PendingPacket() : data_size(0) {} FakePacketSocketFactory::PendingPacket::PendingPacket( const rtc::SocketAddress& from, const rtc::SocketAddress& to, const scoped_refptr<net::IOBuffer>& data, int data_size) - : from(from), to(to), data(data), data_size(data_size) { -} + : from(from), to(to), data(data), data_size(data_size) {} FakePacketSocketFactory::PendingPacket::PendingPacket( const PendingPacket& other) = default; @@ -228,8 +226,9 @@ break; } } - if (port < 0) + if (port < 0) { return nullptr; + } } else { do { port = next_port_; @@ -240,9 +239,8 @@ CHECK(local_address.ipaddr() == address_); - FakeUdpSocket* result = - new FakeUdpSocket(this, dispatcher_, - rtc::SocketAddress(local_address.ipaddr(), port)); + FakeUdpSocket* result = new FakeUdpSocket( + this, dispatcher_, rtc::SocketAddress(local_address.ipaddr(), port)); udp_sockets_[port] = base::BindRepeating(&FakeUdpSocket::ReceivePacket, base::Unretained(result)); @@ -267,8 +265,7 @@ return nullptr; } -rtc::AsyncResolverInterface* -FakePacketSocketFactory::CreateAsyncResolver() { +rtc::AsyncResolverInterface* FakePacketSocketFactory::CreateAsyncResolver() { return nullptr; } @@ -302,16 +299,18 @@ } total_buffer_delay_ += delay; - if (delay > max_buffer_delay_) + if (delay > max_buffer_delay_) { max_buffer_delay_ = delay; + } ++total_packets_received_; if (latency_average_.is_positive()) { delay += base::Milliseconds(GetNormalRandom( latency_average_.InMillisecondsF(), latency_stddev_.InMillisecondsF())); } - if (delay.is_negative()) + if (delay.is_negative()) { delay = base::TimeDelta(); + } // Put the packet to the |pending_packets_| and post a task for // DoReceivePackets(). Note that the DoReceivePackets() task posted here may
diff --git a/remoting/test/fake_socket_factory.h b/remoting/test/fake_socket_factory.h index b7db8156..a3eaeea 100644 --- a/remoting/test/fake_socket_factory.h +++ b/remoting/test/fake_socket_factory.h
@@ -10,8 +10,8 @@ #include <list> #include <memory> -#include "base/callback_forward.h" #include "base/compiler_specific.h" +#include "base/functional/callback_forward.h" #include "base/memory/weak_ptr.h" #include "base/task/single_thread_task_runner.h" #include "base/time/time.h" @@ -100,11 +100,10 @@ private: struct PendingPacket { PendingPacket(); - PendingPacket( - const rtc::SocketAddress& from, - const rtc::SocketAddress& to, - const scoped_refptr<net::IOBuffer>& data, - int data_size); + PendingPacket(const rtc::SocketAddress& from, + const rtc::SocketAddress& to, + const scoped_refptr<net::IOBuffer>& data, + int data_size); PendingPacket(const PendingPacket& other); ~PendingPacket();
diff --git a/remoting/test/fake_webrtc_connection.h b/remoting/test/fake_webrtc_connection.h index a8ecba7..5649a2f4 100644 --- a/remoting/test/fake_webrtc_connection.h +++ b/remoting/test/fake_webrtc_connection.h
@@ -5,7 +5,7 @@ #ifndef REMOTING_TEST_FAKE_WEBRTC_CONNECTION_H_ #define REMOTING_TEST_FAKE_WEBRTC_CONNECTION_H_ -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/scoped_refptr.h" #include "remoting/protocol/webrtc_transport.h"
diff --git a/remoting/test/frame_generator_util.cc b/remoting/test/frame_generator_util.cc index abdc89b..26a0655 100644 --- a/remoting/test/frame_generator_util.cc +++ b/remoting/test/frame_generator_util.cc
@@ -44,9 +44,10 @@ file_path = file_path.AppendASCII(name); std::string file_content; - if (!base::ReadFileToString(file_path, &file_content)) + if (!base::ReadFileToString(file_path, &file_content)) { LOG(FATAL) << "Failed to read " << file_path.MaybeAsASCII() << ". Please run remoting/test/data/download.sh"; + } SkBitmap bitmap; gfx::PNGCodec::Decode(reinterpret_cast<const uint8_t*>(file_content.data()), file_content.size(), &bitmap);
diff --git a/remoting/test/ftl_services_playground.cc b/remoting/test/ftl_services_playground.cc index 95505b0b..efd1425 100644 --- a/remoting/test/ftl_services_playground.cc +++ b/remoting/test/ftl_services_playground.cc
@@ -10,10 +10,10 @@ #include <vector> #include "base/base64.h" -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/guid.h" #include "base/logging.h" #include "base/path_service.h"
diff --git a/remoting/test/ftl_services_playground.h b/remoting/test/ftl_services_playground.h index 2fa8c72f..32b5330 100644 --- a/remoting/test/ftl_services_playground.h +++ b/remoting/test/ftl_services_playground.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/memory/weak_ptr.h" #include "remoting/base/oauth_token_getter.h" #include "remoting/signaling/ftl_messaging_client.h"
diff --git a/remoting/test/ftl_signaling_playground.cc b/remoting/test/ftl_signaling_playground.cc index e6c176a..f332d90 100644 --- a/remoting/test/ftl_signaling_playground.cc +++ b/remoting/test/ftl_signaling_playground.cc
@@ -10,10 +10,10 @@ #include <utility> #include <vector> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" #include "base/files/file_path.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/guid.h" #include "base/logging.h" #include "base/memory/ptr_util.h"
diff --git a/remoting/test/ftl_signaling_playground.h b/remoting/test/ftl_signaling_playground.h index c6c9324..b5db372 100644 --- a/remoting/test/ftl_signaling_playground.h +++ b/remoting/test/ftl_signaling_playground.h
@@ -8,7 +8,7 @@ #include <memory> #include <string> -#include "base/callback_forward.h" +#include "base/functional/callback_forward.h" #include "base/timer/timer.h" #include "remoting/base/oauth_token_getter.h" #include "remoting/protocol/client_authentication_config.h"
diff --git a/remoting/test/it2me_cli_host.cc b/remoting/test/it2me_cli_host.cc index 32d2448..0cfcf1a 100644 --- a/remoting/test/it2me_cli_host.cc +++ b/remoting/test/it2me_cli_host.cc
@@ -4,8 +4,8 @@ #include "remoting/test/it2me_cli_host.h" -#include "base/bind.h" #include "base/command_line.h" +#include "base/functional/bind.h" #include "base/json/json_reader.h" #include "base/json/json_writer.h" #include "base/run_loop.h" @@ -159,8 +159,9 @@ } void It2MeCliHost::DoSendMessage(const std::string& json) { - if (!host_) + if (!host_) { return; + } host_->OnMessage(json); } @@ -197,8 +198,9 @@ } void It2MeCliHost::ShutdownHost() { - if (!host_) + if (!host_) { return; + } base::SingleThreadTaskRunner::GetCurrentDefault()->PostTask( FROM_HERE, base::BindOnce(&It2MeCliHost::DoShutdownHost, weak_factory_.GetWeakPtr())); @@ -231,10 +233,11 @@ } else { auto* error_code_value = message.FindKeyOfType(kErrorMessageCode, base::Value::Type::STRING); - if (error_code_value) + if (error_code_value) { error_message = error_code_value->GetString(); - else + } else { error_message = "Unknown CRD Error"; + } } // Notify callback if command is still running. if (command_awaiting_crd_access_code_) { @@ -257,8 +260,9 @@ void It2MeCliHost::OnStateRemoteDisconnected() { // There could be a connection attempt that was not successful, we will // receive "disconnected" message without actually receiving "connected". - if (!remote_connected_) + if (!remote_connected_) { return; + } remote_connected_ = false; // Remote has disconnected, time to send "disconnect" that would result // in shutting down the host.
diff --git a/remoting/test/it2me_standalone_host.cc b/remoting/test/it2me_standalone_host.cc index 3d67f8b8a..cb7e99e 100644 --- a/remoting/test/it2me_standalone_host.cc +++ b/remoting/test/it2me_standalone_host.cc
@@ -9,7 +9,7 @@ #include <memory> #include <vector> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/location.h" #include "base/memory/ptr_util.h" #include "base/memory/ref_counted.h"
diff --git a/remoting/test/protocol_perftest.cc b/remoting/test/protocol_perftest.cc index f1e22952..b31d2b8c 100644 --- a/remoting/test/protocol_perftest.cc +++ b/remoting/test/protocol_perftest.cc
@@ -7,8 +7,8 @@ #include <utility> #include "base/base64.h" -#include "base/bind.h" #include "base/files/file_util.h" +#include "base/functional/bind.h" #include "base/logging.h" #include "base/memory/raw_ptr.h" #include "base/message_loop/message_pump_type.h" @@ -142,8 +142,9 @@ protocol::ErrorCode error) override { if (state == protocol::ConnectionToHost::CONNECTED) { client_connected_ = true; - if (host_connected_) + if (host_connected_) { connecting_loop_->Quit(); + } } } void OnConnectionReady(bool ready) override {} @@ -172,10 +173,12 @@ void DrawFrame(std::unique_ptr<webrtc::DesktopFrame> frame, base::OnceClosure done) override { last_video_frame_ = std::move(frame); - if (on_frame_task_) + if (on_frame_task_) { on_frame_task_.Run(); - if (done) + } + if (done) { std::move(done).Run(); + } } protocol::FrameConsumer::PixelFormat GetPixelFormat() override { @@ -185,8 +188,9 @@ // FrameStatsConsumer interface. void OnVideoFrameStats(const protocol::FrameStats& frame_stats) override { // Ignore store stats for empty frames. - if (!frame_stats.host_stats.frame_size) + if (!frame_stats.host_stats.frame_size) { return; + } frame_stats_.push_back(frame_stats); @@ -224,8 +228,9 @@ void OnHostConnectedMainThread() { host_connected_ = true; - if (client_connected_) + if (client_connected_) { connecting_loop_->Quit(); + } } std::unique_ptr<webrtc::DesktopFrame> ReceiveFrame() { @@ -255,7 +260,7 @@ // host is started on |host_thread_| while the client works on the main // thread. void StartHostAndClient(bool use_webrtc) { - fake_network_dispatcher_ = new FakeNetworkDispatcher(); + fake_network_dispatcher_ = new FakeNetworkDispatcher(); client_signaling_ = std::make_unique<FakeSignalStrategy>(SignalingAddress(kClientJid)); @@ -640,8 +645,9 @@ << " ms"; VLOG(0) << "Total size: " << total_size << " bytes"; VLOG(0) << "Bandwidth utilization: " - << 100 * total_size / (total_time.InSecondsF() * - GetParam().bandwidth_kbps * 1000 / 8) + << 100 * total_size / + (total_time.InSecondsF() * GetParam().bandwidth_kbps * 1000 / + 8) << "%"; VLOG(0) << "Network buffer delay (bufferbloat), average: " << client_socket_factory_->average_buffer_delay().InMilliseconds()
diff --git a/remoting/test/scroll_frame_generator.cc b/remoting/test/scroll_frame_generator.cc index e4124457..35f26106 100644 --- a/remoting/test/scroll_frame_generator.cc +++ b/remoting/test/scroll_frame_generator.cc
@@ -36,7 +36,7 @@ result->CopyPixelsFrom( *base_frame_, webrtc::DesktopVector(0, 0), webrtc::DesktopRect::MakeLTRB(0, top_height, base_frame_->size().width(), - base_frame_->size().height())); + base_frame_->size().height())); result->mutable_updated_region()->SetRect( webrtc::DesktopRect::MakeSize(result->size()));
diff --git a/remoting/test/test_oauth_token_getter.cc b/remoting/test/test_oauth_token_getter.cc index 1b80596e..6318558 100644 --- a/remoting/test/test_oauth_token_getter.cc +++ b/remoting/test/test_oauth_token_getter.cc
@@ -6,9 +6,9 @@ #include <utility> -#include "base/bind.h" -#include "base/callback_helpers.h" #include "base/command_line.h" +#include "base/functional/bind.h" +#include "base/functional/callback_helpers.h" #include "base/strings/escape.h" #include "base/strings/stringprintf.h" #include "base/task/single_thread_task_runner.h"
diff --git a/remoting/test/test_oauth_token_getter.h b/remoting/test/test_oauth_token_getter.h index acce46ed..6e2b74fa 100644 --- a/remoting/test/test_oauth_token_getter.h +++ b/remoting/test/test_oauth_token_getter.h
@@ -8,8 +8,8 @@ #include <memory> #include <string> -#include "base/callback_forward.h" #include "base/containers/queue.h" +#include "base/functional/callback_forward.h" #include "base/memory/raw_ptr.h" #include "base/memory/weak_ptr.h" #include "remoting/base/oauth_token_getter.h"
diff --git a/remoting/test/video_frame_writer.h b/remoting/test/video_frame_writer.h index bde2023ef..a8dc58a 100644 --- a/remoting/test/video_frame_writer.h +++ b/remoting/test/video_frame_writer.h
@@ -14,7 +14,7 @@ namespace webrtc { class DesktopFrame; class DesktopRect; -} +} // namespace webrtc namespace remoting { namespace test {
diff --git a/rlz/chromeos/lib/rlz_value_store_chromeos.cc b/rlz/chromeos/lib/rlz_value_store_chromeos.cc index 8693c17..46f4fd6 100644 --- a/rlz/chromeos/lib/rlz_value_store_chromeos.cc +++ b/rlz/chromeos/lib/rlz_value_store_chromeos.cc
@@ -7,12 +7,12 @@ #include <tuple> #include "base/base_paths.h" -#include "base/bind.h" #include "base/containers/contains.h" #include "base/containers/cxx20_erase.h" #include "base/cxx17_backports.h" #include "base/files/file_util.h" #include "base/files/important_file_writer.h" +#include "base/functional/bind.h" #include "base/json/json_file_value_serializer.h" #include "base/json/json_string_value_serializer.h" #include "base/lazy_instance.h"
diff --git a/rlz/lib/financial_ping.cc b/rlz/lib/financial_ping.cc index 0f2d3b87..7ca76fa 100644 --- a/rlz/lib/financial_ping.cc +++ b/rlz/lib/financial_ping.cc
@@ -61,7 +61,7 @@ #else -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/run_loop.h" #include "base/time/time.h" #include "net/base/load_flags.h"
diff --git a/rlz/lib/rlz_lib_test.cc b/rlz/lib/rlz_lib_test.cc index a5a65a8..36340fb 100644 --- a/rlz/lib/rlz_lib_test.cc +++ b/rlz/lib/rlz_lib_test.cc
@@ -17,7 +17,7 @@ #include <memory> -#include "base/bind.h" +#include "base/functional/bind.h" #include "base/message_loop/message_pump_type.h" #include "base/posix/eintr_wrapper.h" #include "base/strings/stringprintf.h"
diff --git a/services/viz/public/cpp/compositing/mojom_traits_unittest.cc b/services/viz/public/cpp/compositing/mojom_traits_unittest.cc index acc8a99..32004fd 100644 --- a/services/viz/public/cpp/compositing/mojom_traits_unittest.cc +++ b/services/viz/public/cpp/compositing/mojom_traits_unittest.cc
@@ -164,7 +164,8 @@ case cc::FilterOperation::REFERENCE: { ASSERT_EQ(!!input.image_filter(), !!output.image_filter()); if (input.image_filter()) { - EXPECT_EQ(*input.image_filter(), *output.image_filter()); + EXPECT_TRUE( + input.image_filter()->EqualsForTesting(*output.image_filter())); } break; }
diff --git a/testing/buildbot/chromium.android.json b/testing/buildbot/chromium.android.json index 74a9baa..bd39ac1 100644 --- a/testing/buildbot/chromium.android.json +++ b/testing/buildbot/chromium.android.json
@@ -29855,6 +29855,7 @@ "--recover-devices", "--gtest_filter=-ImportantSitesUtilBrowserTest.DSENotConsideredImportantInRegularMode" ], + "isolate_profile_data": true, "merge": { "args": [ "--bucket", @@ -29902,6 +29903,7 @@ "--gs-results-bucket=chromium-result-details", "--recover-devices" ], + "isolate_profile_data": true, "merge": { "args": [ "--bucket", @@ -29947,6 +29949,7 @@ "--gs-results-bucket=chromium-result-details", "--recover-devices" ], + "isolate_profile_data": true, "merge": { "args": [ "--bucket", @@ -29992,6 +29995,7 @@ "--gs-results-bucket=chromium-result-details", "--recover-devices" ], + "isolate_profile_data": true, "merge": { "args": [ "--bucket", @@ -30037,6 +30041,7 @@ "--gs-results-bucket=chromium-result-details", "--recover-devices" ], + "isolate_profile_data": true, "merge": { "args": [ "--bucket", @@ -30086,6 +30091,7 @@ "--use-persistent-shell" ], "ci_only": true, + "isolate_profile_data": true, "merge": { "args": [ "--bucket", @@ -30138,6 +30144,7 @@ "--recover-devices", "--git-revision=${got_revision}" ], + "isolate_profile_data": true, "merge": { "args": [ "--bucket", @@ -30193,6 +30200,7 @@ ], "ci_only": true, "experiment_percentage": 100, + "isolate_profile_data": true, "merge": { "args": [ "--bucket", @@ -30245,6 +30253,7 @@ "--gs-results-bucket=chromium-result-details", "--recover-devices" ], + "isolate_profile_data": true, "merge": { "args": [ "--bucket", @@ -30291,6 +30300,7 @@ "--recover-devices", "--test-launcher-filter-file=../../testing/buildbot/filters/android.pie_arm64.content_browsertests_coverage.filter" ], + "isolate_profile_data": true, "merge": { "args": [ "--bucket", @@ -30341,6 +30351,7 @@ ], "ci_only": true, "experiment_percentage": 100, + "isolate_profile_data": true, "merge": { "args": [ "--bucket", @@ -30388,6 +30399,7 @@ "--gs-results-bucket=chromium-result-details", "--recover-devices" ], + "isolate_profile_data": true, "merge": { "args": [ "--bucket", @@ -30433,6 +30445,7 @@ "--gs-results-bucket=chromium-result-details", "--recover-devices" ], + "isolate_profile_data": true, "merge": { "args": [ "--bucket", @@ -30478,6 +30491,7 @@ "--gs-results-bucket=chromium-result-details", "--recover-devices" ], + "isolate_profile_data": true, "merge": { "args": [ "--bucket", @@ -30523,6 +30537,7 @@ "--gs-results-bucket=chromium-result-details", "--recover-devices" ], + "isolate_profile_data": true, "merge": { "args": [ "--bucket", @@ -30569,6 +30584,7 @@ "--recover-devices", "--test-launcher-filter-file=../../testing/buildbot/filters/android.webview_cts_tests_coverage.filter" ], + "isolate_profile_data": true, "merge": { "args": [ "--bucket", @@ -30624,6 +30640,7 @@ "--use-persistent-shell" ], "ci_only": true, + "isolate_profile_data": true, "merge": { "args": [ "--bucket", @@ -30670,6 +30687,7 @@ "--gs-results-bucket=chromium-result-details", "--recover-devices" ], + "isolate_profile_data": true, "merge": { "args": [ "--bucket", @@ -30712,6 +30730,7 @@ ], "scripts": [ { + "isolate_profile_data": true, "name": "check_network_annotations", "resultdb": { "enable": true,
diff --git a/testing/buildbot/chromium.chromiumos.json b/testing/buildbot/chromium.chromiumos.json index 9597c4f..6ce9bda 100644 --- a/testing/buildbot/chromium.chromiumos.json +++ b/testing/buildbot/chromium.chromiumos.json
@@ -1633,6 +1633,25 @@ "chrome" ] }, + "lacros-arm64-generic-rel-skylab": { + "additional_compile_targets": [ + "chrome" + ], + "skylab_tests": [ + { + "args": [], + "bucket": "chromiumos-image-archive", + "cros_board": "kevin", + "cros_img": "kevin64-public/R109-15222.0.0", + "name": "lacros_tast_tests KEVIN_PUBLIC", + "swarming": {}, + "tast_expr": "(\"group:mainline\" && \"dep:lacros\" && !informational)", + "test": "lacros_tast_tests", + "timeout_sec": 10800, + "variant_id": "KEVIN_PUBLIC" + } + ] + }, "linux-ash-chromium-generator-rel": { "additional_compile_targets": [ "chromiumos_preflight",
diff --git a/testing/buildbot/chromium.fyi.json b/testing/buildbot/chromium.fyi.json index 9ef88de4..66bc064a 100644 --- a/testing/buildbot/chromium.fyi.json +++ b/testing/buildbot/chromium.fyi.json
@@ -74611,11 +74611,10 @@ "bucket": "chromiumos-image-archive", "cros_board": "octopus", "cros_img": "octopus-public/R109-15222.0.0", - "name": "lacros_fyi_tast_tests OCTOPUS_FULL", + "name": "lacros_tast_tests OCTOPUS_FULL", "swarming": {}, "tast_expr": "(\"group:mainline\" && \"dep:lacros\" && !informational)", - "test": "lacros_fyi_tast_tests", - "test_id_prefix": "ninja://chromeos/lacros:lacros_fyi_tast_tests/", + "test": "lacros_tast_tests", "timeout_sec": 10800, "variant_id": "OCTOPUS_FULL" }, @@ -74624,37 +74623,12 @@ "bucket": "chromiumos-image-archive", "cros_board": "eve", "cros_img": "eve-public/R109-15222.0.0", - "name": "lacros_fyi_tast_tests EVE_FULL", + "name": "lacros_tast_tests EVE_FULL", "swarming": {}, "tast_expr": "(\"group:mainline\" && \"dep:lacros\" && !informational)", - "test": "lacros_fyi_tast_tests", - "test_id_prefix": "ninja://chromeos/lacros:lacros_fyi_tast_tests/", + "test": "lacros_tast_tests", "timeout_sec": 10800, "variant_id": "EVE_FULL" - }, - { - "args": [], - "bucket": "chromiumos-image-archive", - "cros_board": "octopus", - "cros_img": "octopus-public/R109-15222.0.0", - "name": "ozone_unittests OCTOPUS_FULL", - "swarming": {}, - "test": "ozone_unittests", - "test_id_prefix": "ninja://ui/ozone:ozone_unittests/", - "timeout_sec": 3600, - "variant_id": "OCTOPUS_FULL" - }, - { - "args": [], - "bucket": "chromiumos-image-archive", - "cros_board": "eve", - "cros_img": "eve-public/R109-15222.0.0", - "name": "ozone_unittests EVE_FULL", - "swarming": {}, - "test": "ozone_unittests", - "test_id_prefix": "ninja://ui/ozone:ozone_unittests/", - "timeout_sec": 3600, - "variant_id": "EVE_FULL" } ] }, @@ -74668,11 +74642,10 @@ "bucket": "chromiumos-image-archive", "cros_board": "jacuzzi", "cros_img": "jacuzzi-public/R109-15222.0.0", - "name": "lacros_fyi_tast_tests JACUZZI_PUBLIC", + "name": "lacros_tast_tests JACUZZI_PUBLIC", "swarming": {}, "tast_expr": "(\"group:mainline\" && \"dep:lacros\" && !informational)", - "test": "lacros_fyi_tast_tests", - "test_id_prefix": "ninja://chromeos/lacros:lacros_fyi_tast_tests/", + "test": "lacros_tast_tests", "timeout_sec": 10800, "variant_id": "JACUZZI_PUBLIC" }, @@ -74681,37 +74654,12 @@ "bucket": "chromiumos-image-archive", "cros_board": "kevin", "cros_img": "kevin64-public/R109-15222.0.0", - "name": "lacros_fyi_tast_tests KEVIN_PUBLIC", + "name": "lacros_tast_tests KEVIN_PUBLIC", "swarming": {}, "tast_expr": "(\"group:mainline\" && \"dep:lacros\" && !informational)", - "test": "lacros_fyi_tast_tests", - "test_id_prefix": "ninja://chromeos/lacros:lacros_fyi_tast_tests/", + "test": "lacros_tast_tests", "timeout_sec": 10800, "variant_id": "KEVIN_PUBLIC" - }, - { - "args": [], - "bucket": "chromiumos-image-archive", - "cros_board": "jacuzzi", - "cros_img": "jacuzzi-public/R109-15222.0.0", - "name": "ozone_unittests JACUZZI_PUBLIC", - "swarming": {}, - "test": "ozone_unittests", - "test_id_prefix": "ninja://ui/ozone:ozone_unittests/", - "timeout_sec": 3600, - "variant_id": "JACUZZI_PUBLIC" - }, - { - "args": [], - "bucket": "chromiumos-image-archive", - "cros_board": "kevin", - "cros_img": "kevin64-public/R109-15222.0.0", - "name": "ozone_unittests KEVIN_PUBLIC", - "swarming": {}, - "test": "ozone_unittests", - "test_id_prefix": "ninja://ui/ozone:ozone_unittests/", - "timeout_sec": 3600, - "variant_id": "KEVIN_PUBLIC" } ] },
diff --git a/testing/buildbot/chromium.mac.json b/testing/buildbot/chromium.mac.json index c078da42..5f9a79a 100644 --- a/testing/buildbot/chromium.mac.json +++ b/testing/buildbot/chromium.mac.json
@@ -27390,28 +27390,6 @@ }, { "args": [ - "--test-launcher-filter-file=../../testing/buildbot/filters/mac.mac11-arm64-rel.browser_tests.filter" - ], - "merge": { - "args": [], - "script": "//testing/merge_scripts/standard_gtest_merge.py" - }, - "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "cpu": "arm64", - "os": "Mac-11" - } - ], - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", - "shards": 30 - }, - "test": "browser_tests", - "test_id_prefix": "ninja://chrome/test:browser_tests/" - }, - { - "args": [ "--gtest_filter=-*UsingRealWebcam*" ], "merge": { @@ -29132,29 +29110,6 @@ }, { "args": [ - "--test-launcher-filter-file=../../testing/buildbot/filters/mac.mac12-arm64-rel.browser_tests.filter" - ], - "ci_only": false, - "merge": { - "args": [], - "script": "//testing/merge_scripts/standard_gtest_merge.py" - }, - "swarming": { - "can_use_on_swarming_builders": true, - "dimension_sets": [ - { - "cpu": "arm64", - "os": "Mac-12" - } - ], - "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com", - "shards": 30 - }, - "test": "browser_tests", - "test_id_prefix": "ninja://chrome/test:browser_tests/" - }, - { - "args": [ "--gtest_filter=-*UsingRealWebcam*" ], "ci_only": true,
diff --git a/testing/buildbot/chromium.updater.json b/testing/buildbot/chromium.updater.json index ac644e81e..55b2c792 100644 --- a/testing/buildbot/chromium.updater.json +++ b/testing/buildbot/chromium.updater.json
@@ -731,6 +731,49 @@ } ] }, + "win10-updater-tester-rel-uac": { + "gtest_tests": [ + { + "merge": { + "args": [], + "script": "//testing/merge_scripts/standard_gtest_merge.py" + }, + "swarming": { + "can_use_on_swarming_builders": true, + "dimension_sets": [ + { + "cpu": "x86-64", + "integrity": "high", + "os": "Windows-10", + "pool": "chromium.win.uac" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "updater_tests_system", + "test_id_prefix": "ninja://chrome/updater:updater_tests_system/" + }, + { + "merge": { + "args": [], + "script": "//testing/merge_scripts/standard_gtest_merge.py" + }, + "swarming": { + "can_use_on_swarming_builders": true, + "dimension_sets": [ + { + "cpu": "x86-64", + "os": "Windows-10", + "pool": "chromium.win.uac" + } + ], + "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com" + }, + "test": "updater_tests_win_uac", + "test_id_prefix": "ninja://chrome/updater:updater_tests_win_uac/" + } + ] + }, "win11-updater-tester-dbg-uac": { "gtest_tests": [ {
diff --git a/testing/buildbot/test_suite_exceptions.pyl b/testing/buildbot/test_suite_exceptions.pyl index 8a30d73..375158e 100644 --- a/testing/buildbot/test_suite_exceptions.pyl +++ b/testing/buildbot/test_suite_exceptions.pyl
@@ -852,6 +852,8 @@ 'Mac10.15 Tests', # https://crbug.com/1042757 'Mac12 Tests (dbg)', # https://crbug.com/1201386 'mac-code-coverage', # https://crbug.com/1201386 + 'mac11-arm64-rel-tests', # https://crbug.com/1406364 + 'mac12-arm64-rel-tests', # https://crbug.com/1406364 'Linux TSan Tests', # https://crbug.com/368525 'Win10 Tests x64 (dbg)', ], @@ -1096,25 +1098,6 @@ '--test-launcher-filter-file=../../testing/buildbot/filters/mac.mac-rel-cft.browser_tests.filter;../../testing/buildbot/filters/mac.mac-rel-cft.interactive_ui_tests.filter', ], }, - 'mac11-arm64-rel-tests': { - 'args': [ - # crbug.com/1262402 - '--test-launcher-filter-file=../../testing/buildbot/filters/mac.mac11-arm64-rel.browser_tests.filter', - ], - 'swarming': { - 'shards': 30, - }, - }, - 'mac12-arm64-rel-tests': { - 'ci_only': False, # https://crbug.com/1234525 - 'args': [ - # crbug.com/1262402 - '--test-launcher-filter-file=../../testing/buildbot/filters/mac.mac12-arm64-rel.browser_tests.filter', - ], - 'swarming': { - 'shards': 30, - }, - }, 'win-asan': { # These are very slow on the ASAN trybot for some reason. # crbug.com/1257927
diff --git a/testing/buildbot/test_suites.pyl b/testing/buildbot/test_suites.pyl index 6c9f363..909fea8e 100644 --- a/testing/buildbot/test_suites.pyl +++ b/testing/buildbot/test_suites.pyl
@@ -4080,6 +4080,13 @@ }, }, + 'lacros_skylab': { + 'lacros_tast_tests': { + 'tast_expr': '("group:mainline" && "dep:lacros" && !informational)', + 'timeout_sec': 10800, + }, + }, + 'lacros_skylab_amd64_fyi': { 'lacros_fyi_tast_tests': { 'tast_expr': '("group:mainline" && "dep:lacros" && !informational)', @@ -4115,7 +4122,7 @@ # create this temporary lacros arm test suites that runs on skylab # TODO(crbug.com/1247425): remove it if it is the same as - # lacros_skylab_poc + # lacros_skylab 'lacros_skylab_arm_tests_fyi': { 'lacros_all_tast_tests': { 'tast_expr': '("group:mainline" && "dep:lacros" && !informational)', @@ -4129,16 +4136,6 @@ }, }, - 'lacros_skylab_poc': { - 'lacros_fyi_tast_tests': { - 'tast_expr': '("group:mainline" && "dep:lacros" && !informational)', - 'timeout_sec': 10800, - }, - 'ozone_unittests': { - 'timeout_sec': 3600, - }, - }, - # Lacros tests that run on Skylab, and these tests are usually HW sensative, # For example, Tast tests and GPU/display related gtest tests. 'lacros_skylab_tests': { @@ -7121,7 +7118,7 @@ }, 'lacros_amd64_generic_rel_skylab_fyi': { - 'lacros_skylab_poc': { + 'lacros_skylab': { 'variants': [ 'CROS_OCTOPUS_FULL', 'CROS_EVE_FULL', @@ -7129,8 +7126,16 @@ }, }, + 'lacros_arm64_generic_rel_skylab': { + 'lacros_skylab': { + 'variants': [ + 'CROS_KEVIN_PUBLIC', + ] + }, + }, + 'lacros_arm64_generic_rel_skylab_fyi': { - 'lacros_skylab_poc': { + 'lacros_skylab': { 'variants': [ 'CROS_JACUZZI_PUBLIC', 'CROS_KEVIN_PUBLIC',
diff --git a/testing/buildbot/waterfalls.pyl b/testing/buildbot/waterfalls.pyl index c5e1bf9..926bfd0 100644 --- a/testing/buildbot/waterfalls.pyl +++ b/testing/buildbot/waterfalls.pyl
@@ -983,6 +983,7 @@ 'android-pie-arm64-rel': { 'mixins': [ 'has_native_resultdb_integration', + 'isolate_profile_data', 'pie_fleet', 'walleye', ], @@ -1469,6 +1470,15 @@ ], 'os_type': 'chromeos' }, + 'lacros-arm64-generic-rel-skylab': { + 'additional_compile_targets': [ + 'chrome', + ], + 'test_suites': { + 'skylab_tests': 'lacros_arm64_generic_rel_skylab', + }, + 'os_type': 'chromeos', + }, 'linux-ash-chromium-generator-rel': { 'additional_compile_targets': [ 'chromiumos_preflight', @@ -5939,6 +5949,22 @@ ] }, }, + 'win10-updater-tester-rel-uac': { + 'mixins': [ + 'win10-any', + 'x86-64', + ], + 'test_suites': { + 'gtest_tests': 'updater_gtests_win_uac', + }, + 'swarming': { + 'dimension_sets': [ + { + 'pool': 'chromium.win.uac', + } + ] + }, + }, 'win11-updater-tester-dbg-uac': { 'mixins': [ 'win11',
diff --git a/testing/variations/fieldtrial_testing_config.json b/testing/variations/fieldtrial_testing_config.json index eeb76b1..89317528 100644 --- a/testing/variations/fieldtrial_testing_config.json +++ b/testing/variations/fieldtrial_testing_config.json
@@ -2950,89 +2950,6 @@ ] } ], - "CombinedNavigationOptimizations2": [ - { - "platforms": [ - "android" - ], - "experiments": [ - { - "name": "Enabled_20221129", - "params": { - "default-parser-budget": "10ms", - "long-parser-budget": "50ms", - "num-yields-with-default-budget": "2" - }, - "enable_features": [ - "BatchImageDecoding", - "DecodeScriptSourceOffThread", - "EstablishGpuChannelAsync", - "OptimizeDataUrls", - "PrefetchFontLookupTables", - "SplitCompositorTask", - "TimedHTMLParserBudget" - ] - } - ] - }, - { - "platforms": [ - "chromeos", - "chromeos_lacros", - "linux", - "mac", - "windows" - ], - "experiments": [ - { - "name": "Enabled_20221129", - "params": { - "default-parser-budget": "10ms", - "long-parser-budget": "500ms", - "num-yields-with-default-budget": "6", - "prewarm_cursive": "false", - "prewarm_fantasy": "false", - "prewarm_fixed": "false", - "prewarm_sans_serif": "true", - "prewarm_serif": "true", - "prewarm_standard": "false" - }, - "enable_features": [ - "AvoidEarlyExtensionScriptContextCreation", - "DecodeScriptSourceOffThread", - "OptimizeDataUrls", - "PrewarmDefaultFontFamilies", - "TimedHTMLParserBudget" - ], - "disable_features": [ - "EstablishGpuChannelAsync" - ] - } - ] - }, - { - "platforms": [ - "android_webview" - ], - "experiments": [ - { - "name": "Enabled_20221129", - "params": { - "default-parser-budget": "10ms", - "long-parser-budget": "50ms", - "num-yields-with-default-budget": "2" - }, - "enable_features": [ - "DecodeScriptSourceOffThread", - "EstablishGpuChannelAsync", - "OptimizeDataUrls", - "PrefetchFontLookupTables", - "TimedHTMLParserBudget" - ] - } - ] - } - ], "CommerceHintAndroid": [ { "platforms": [ @@ -4608,6 +4525,25 @@ ] } ], + "EnterpriseReportingConnectorExtensionEvents": [ + { + "platforms": [ + "chromeos", + "chromeos_lacros", + "linux", + "mac", + "windows" + ], + "experiments": [ + { + "name": "Enabled", + "enable_features": [ + "ExtensionEventsEnabled" + ] + } + ] + } + ], "EvictSubtree": [ { "platforms": [
diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/features.cc index 92ed51f..d53ebfb 100644 --- a/third_party/blink/common/features.cc +++ b/third_party/blink/common/features.cc
@@ -1246,19 +1246,19 @@ #if BUILDFLAG(IS_WIN) BASE_FEATURE(kPrewarmDefaultFontFamilies, "PrewarmDefaultFontFamilies", - base::FEATURE_DISABLED_BY_DEFAULT); + base::FEATURE_ENABLED_BY_DEFAULT); const base::FeatureParam<bool> kPrewarmStandard = {&kPrewarmDefaultFontFamilies, - "prewarm_standard", true}; + "prewarm_standard", false}; const base::FeatureParam<bool> kPrewarmFixed = {&kPrewarmDefaultFontFamilies, - "prewarm_fixed", true}; + "prewarm_fixed", false}; const base::FeatureParam<bool> kPrewarmSerif = {&kPrewarmDefaultFontFamilies, "prewarm_serif", true}; const base::FeatureParam<bool> kPrewarmSansSerif = { &kPrewarmDefaultFontFamilies, "prewarm_sans_serif", true}; const base::FeatureParam<bool> kPrewarmCursive = {&kPrewarmDefaultFontFamilies, - "prewarm_cursive", true}; + "prewarm_cursive", false}; const base::FeatureParam<bool> kPrewarmFantasy = {&kPrewarmDefaultFontFamilies, - "prewarm_fantasy", true}; + "prewarm_fantasy", false}; #endif // Enable `save-data` client hint. @@ -1268,11 +1268,18 @@ BASE_FEATURE(kEstablishGpuChannelAsync, "EstablishGpuChannelAsync", - base::FEATURE_DISABLED_BY_DEFAULT); +#if BUILDFLAG(IS_ANDROID) + base::FEATURE_ENABLED_BY_DEFAULT +#else + // TODO(crbug.com/1278147): Experiment with this more on desktop to + // see if it can help. + base::FEATURE_DISABLED_BY_DEFAULT +#endif +); BASE_FEATURE(kDecodeScriptSourceOffThread, "DecodeScriptSourceOffThread", - base::FEATURE_DISABLED_BY_DEFAULT); + base::FEATURE_ENABLED_BY_DEFAULT); BASE_FEATURE(kDelayAsyncScriptExecution, "DelayAsyncScriptExecution", @@ -1419,7 +1426,12 @@ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) BASE_FEATURE(kPrefetchFontLookupTables, "PrefetchFontLookupTables", - base::FEATURE_DISABLED_BY_DEFAULT); +#if BUILDFLAG(IS_WIN) + base::FEATURE_DISABLED_BY_DEFAULT +#else + base::FEATURE_ENABLED_BY_DEFAULT +#endif +); #endif BASE_FEATURE(kPrecompileInlineScripts, @@ -1479,7 +1491,7 @@ BASE_FEATURE(kTimedHTMLParserBudget, "TimedHTMLParserBudget", - base::FEATURE_DISABLED_BY_DEFAULT); + base::FEATURE_ENABLED_BY_DEFAULT); BASE_FEATURE(kClipboardUnsanitizedContent, "ClipboardUnsanitizedContent",
diff --git a/third_party/blink/public/web/web_local_frame_client.h b/third_party/blink/public/web/web_local_frame_client.h index c27c7cd3..9fa27d4f 100644 --- a/third_party/blink/public/web/web_local_frame_client.h +++ b/third_party/blink/public/web/web_local_frame_client.h
@@ -169,7 +169,7 @@ WebMediaPlayerEncryptedMediaClient*, WebContentDecryptionModule*, const WebString& sink_id, - const cc::LayerTreeSettings& settings, + const cc::LayerTreeSettings* settings, scoped_refptr<base::TaskRunner> compositor_worker_task_runner) { return nullptr; }
diff --git a/third_party/blink/renderer/core/css/invalidation/invalidation_set.cc b/third_party/blink/renderer/core/css/invalidation/invalidation_set.cc index 8b442ac0..0616db8 100644 --- a/third_party/blink/renderer/core/css/invalidation/invalidation_set.cc +++ b/third_party/blink/renderer/core/css/invalidation/invalidation_set.cc
@@ -117,6 +117,7 @@ InvalidationSet::InvalidationSet(InvalidationType type) : type_(static_cast<unsigned>(type)), invalidates_self_(false), + invalidates_nth_(false), is_alive_(true) {} bool InvalidationSet::InvalidatesElement(Element& element) const {
diff --git a/third_party/blink/renderer/core/css/invalidation/invalidation_set.h b/third_party/blink/renderer/core/css/invalidation/invalidation_set.h index 1690a8ff..b460d77d 100644 --- a/third_party/blink/renderer/core/css/invalidation/invalidation_set.h +++ b/third_party/blink/renderer/core/css/invalidation/invalidation_set.h
@@ -139,6 +139,9 @@ void SetInvalidatesSelf() { invalidates_self_ = true; } bool InvalidatesSelf() const { return invalidates_self_; } + void SetInvalidatesNth() { invalidates_nth_ = true; } + bool InvalidatesNth() const { return invalidates_nth_; } + void SetTreeBoundaryCrossing() { invalidation_flags_.SetTreeBoundaryCrossing(true); } @@ -423,6 +426,12 @@ // If true, the element or sibling itself is invalid. unsigned invalidates_self_ : 1; + // If true, scheduling this invalidation set on a node + // will also schedule nth-child invalidation on its parent + // (unless we know for sure no child can be affected by a + // selector of the :nth-child type). + unsigned invalidates_nth_ : 1; + // If true, the instance is alive and can be used. unsigned is_alive_ : 1; };
diff --git a/third_party/blink/renderer/core/css/invalidation/pending_invalidations.cc b/third_party/blink/renderer/core/css/invalidation/pending_invalidations.cc index 2119602..f992e96 100644 --- a/third_party/blink/renderer/core/css/invalidation/pending_invalidations.cc +++ b/third_party/blink/renderer/core/css/invalidation/pending_invalidations.cc
@@ -7,6 +7,7 @@ #include "third_party/blink/renderer/core/css/invalidation/invalidation_set.h" #include "third_party/blink/renderer/core/css/invalidation/style_invalidator.h" #include "third_party/blink/renderer/core/css/style_change_reason.h" +#include "third_party/blink/renderer/core/css/style_engine.h" #include "third_party/blink/renderer/core/dom/document.h" #include "third_party/blink/renderer/core/dom/element.h" #include "third_party/blink/renderer/core/dom/element_traversal.h" @@ -46,6 +47,10 @@ style_change_reason::kStyleInvalidator)); } + if (invalidation_set->InvalidatesNth()) { + PossiblyScheduleNthPseudoInvalidations(node); + } + if (!invalidation_set->IsEmpty()) { requires_descendant_invalidation = true; } @@ -76,6 +81,9 @@ if (pending_invalidations.Siblings().Contains(invalidation_set)) { continue; } + if (invalidation_set->InvalidatesNth()) { + PossiblyScheduleNthPseudoInvalidations(node); + } pending_invalidations.Siblings().push_back(invalidation_set); requires_sibling_invalidation = true; }
diff --git a/third_party/blink/renderer/core/css/rule_feature_set.cc b/third_party/blink/renderer/core/css/rule_feature_set.cc index d6a5c71b..91b5225 100644 --- a/third_party/blink/renderer/core/css/rule_feature_set.cc +++ b/third_party/blink/renderer/core/css/rule_feature_set.cc
@@ -302,6 +302,40 @@ } // anonymous namespace +void RuleFeatureSet::MarkInvalidationSetsWithinNthChild( + const CSSSelector& selector, + bool in_nth_child) { + const CSSSelector* simple_selector = &selector; + for (; simple_selector; simple_selector = simple_selector->TagHistory()) { + if (in_nth_child) { + if (InvalidationSet* invalidation_set = InvalidationSetForSimpleSelector( + *simple_selector, InvalidationType::kInvalidateDescendants, + kAncestor)) { + // This is, strictly speaking, setting the bit on too many classes. + // If we have a selector like :nth-child(.a .b) .c, there's no reason + // to set the invalidates_nth_ bit on .a; what we need is that .b + // has the bit, and that the descendant invalidation set for .a + // contains .b (so that adding .a to some element causes us to go + // looking for .b elements in that element's subtree), and we've + // already done that in AddFeaturesToInvalidationSetsForSelectorList() + // -- setting the bit on .a is not really doing much. So that would be a + // potential future optimization if we find it useful. (We still need to + // traverse the ancestor selectors, though, in case they contain other + // :nth-child() selectors, recursively.) + invalidation_set->SetInvalidatesNth(); + } + } + if (simple_selector->SelectorList()) { + bool sub_in_nth_child = + in_nth_child || + simple_selector->GetPseudoType() == CSSSelector::kPseudoNthChild || + simple_selector->GetPseudoType() == CSSSelector::kPseudoNthLastChild; + MarkInvalidationSetsWithinNthChild( + *simple_selector->SelectorList()->First(), sub_in_nth_child); + } + } +} + InvalidationSet& RuleFeatureSet::EnsureMutableInvalidationSet( InvalidationType type, PositionType position, @@ -493,7 +527,8 @@ InvalidationSetFeatures& last_compound_in_adjacent_chain_features, InvalidationSetFeatures*& sibling_features, InvalidationSetFeatures& descendant_features, - bool for_logical_combination_in_has) { + bool for_logical_combination_in_has, + bool in_nth_child) { if (CSSSelector::IsAdjacentRelation(combinator)) { if (!sibling_features) { sibling_features = &last_compound_in_adjacent_chain_features; @@ -501,7 +536,7 @@ ExtractInvalidationSetFeaturesFromCompound( *last_compound_in_adjacent_chain, last_compound_in_adjacent_chain_features, kAncestor, - for_logical_combination_in_has); + for_logical_combination_in_has, in_nth_child); if (!last_compound_in_adjacent_chain_features.HasFeatures()) { last_compound_in_adjacent_chain_features.invalidation_flags .SetWholeSubtreeInvalid(true); @@ -551,7 +586,7 @@ InvalidationSetFeatures scope_features; ExtractInvalidationSetFeaturesFromCompound( *selector, scope_features, kSubject, - /* for_logical_combination_in_has */ false); + /* for_logical_combination_in_has */ false, /*in_nth_child=*/false); descendant_features.Merge(scope_features); } } @@ -731,8 +766,9 @@ const StyleScope* style_scope) { InvalidationSetFeatures features; FeatureInvalidationType feature_invalidation_type = - UpdateInvalidationSetsForComplex(selector, style_scope, features, - kSubject, CSSSelector::kPseudoUnknown); + UpdateInvalidationSetsForComplex(selector, /*in_nth_child=*/false, + style_scope, features, kSubject, + CSSSelector::kPseudoUnknown); if (feature_invalidation_type == FeatureInvalidationType::kRequiresSubtreeInvalidation) { features.invalidation_flags.SetWholeSubtreeInvalid(true); @@ -750,6 +786,7 @@ RuleFeatureSet::FeatureInvalidationType RuleFeatureSet::UpdateInvalidationSetsForComplex( const CSSSelector& complex, + bool in_nth_child, const StyleScope* style_scope, InvalidationSetFeatures& features, PositionType position, @@ -766,12 +803,13 @@ InvalidationSetFeatures* sibling_features = nullptr; // Step 1. Note that this also, in passing, inserts self-invalidation - // InvalidationSets for the rightmost compound selector. This probably - // isn't the prettiest, but it's how the structure is at this point. + // and nth-child InvalidationSets for the rightmost compound selector. + // This probably isn't the prettiest, but it's how the structure is + // at this point. const CSSSelector* last_in_compound = ExtractInvalidationSetFeaturesFromCompound( complex, features, position, - /* for_logical_combination_in_has */ false); + /* for_logical_combination_in_has */ false, in_nth_child); bool was_whole_subtree_invalid = features.invalidation_flags.WholeSubtreeInvalid(); @@ -800,10 +838,14 @@ if (last_in_compound) { UpdateFeaturesFromCombinator(last_in_compound->Relation(), nullptr, features, sibling_features, features, - /* for_logical_combination_in_has */ false); + /* for_logical_combination_in_has */ false, + in_nth_child); } - AddFeaturesToInvalidationSets(*next_compound, sibling_features, features); + AddFeaturesToInvalidationSets(*next_compound, in_nth_child, + sibling_features, features); + + MarkInvalidationSetsWithinNthChild(*next_compound, in_nth_child); } if (style_scope) { @@ -847,6 +889,7 @@ void RuleFeatureSet::ExtractInvalidationSetFeaturesFromSelectorList( const CSSSelector& simple_selector, + bool in_nth_child, InvalidationSetFeatures& features, PositionType position) { AutoRestoreMaxDirectAdjacentSelectors restore_max(&features); @@ -865,6 +908,9 @@ return; } + in_nth_child |= pseudo_type == CSSSelector::kPseudoNthChild; + in_nth_child |= pseudo_type == CSSSelector::kPseudoNthLastChild; + DCHECK(SupportsInvalidationWithSelectorList(pseudo_type)); bool all_sub_selectors_have_features = true; @@ -874,8 +920,9 @@ for (; sub_selector; sub_selector = CSSSelectorList::Next(*sub_selector)) { InvalidationSetFeatures complex_features; if (UpdateInvalidationSetsForComplex( - *sub_selector, nullptr /* style_scope */, complex_features, - position, pseudo_type) == kRequiresSubtreeInvalidation) { + *sub_selector, in_nth_child, nullptr /* style_scope */, + complex_features, position, + pseudo_type) == kRequiresSubtreeInvalidation) { features.invalidation_flags.SetWholeSubtreeInvalid(true); continue; } @@ -922,7 +969,8 @@ const CSSSelector& compound, InvalidationSetFeatures& features, PositionType position, - bool for_logical_combination_in_has) { + bool for_logical_combination_in_has, + bool in_nth_child) { // NOTE: Due to the check at the bottom of the loop, this loop stops // once we are at the end of the compound, ie., we see a relation that // is not a sub-selector. So for e.g. .a .b.c#d, we will see #d, .c, .b @@ -950,11 +998,18 @@ features.has_nth_pseudo = true; } else if (position == kSubject) { invalidation_set->SetInvalidatesSelf(); + + // If we are within :nth-child(), it means we'll need nth-child + // invalidation for anything within this subject; see RuleFeatureSet + // class comment. + if (in_nth_child) { + invalidation_set->SetInvalidatesNth(); + } } } - ExtractInvalidationSetFeaturesFromSelectorList(*simple_selector, features, - position); + ExtractInvalidationSetFeaturesFromSelectorList( + *simple_selector, in_nth_child, features, position); if (features.invalidation_flags.InvalidatesParts()) { metadata_.invalidates_parts = true; @@ -1130,8 +1185,8 @@ break; default: AddFeaturesToInvalidationSetsForSimpleSelector( - *simple, *compound_in_logical_combination, sibling_features, - descendant_features); + *simple, *compound_in_logical_combination, /*in_nth_child=*/false, + sibling_features, descendant_features); break; } if (descendant_features.has_features_for_rule_set_invalidation) { @@ -1332,7 +1387,8 @@ UpdateFeaturesFromCombinator(combinator, last_compound_in_adjacent_chain, last_compound_in_adjacent_chain_features, sibling_features, descendant_features, - /* for_logical_combination_in_has */ true); + /* for_logical_combination_in_has */ true, + /*in_nth_child=*/false); } void RuleFeatureSet::AddValuesInComplexSelectorInsideIsWhereNot( @@ -1449,6 +1505,7 @@ void RuleFeatureSet::AddFeaturesToInvalidationSetsForSelectorList( const CSSSelector& simple_selector, + bool in_nth_child, InvalidationSetFeatures* sibling_features, InvalidationSetFeatures& descendant_features) { if (!simple_selector.SelectorListOrParent()) { @@ -1462,6 +1519,10 @@ bool selector_list_contains_universal = simple_selector.GetPseudoType() == CSSSelector::kPseudoNot || simple_selector.GetPseudoType() == CSSSelector::kPseudoHostContext; + in_nth_child |= + simple_selector.GetPseudoType() == CSSSelector::kPseudoNthChild; + in_nth_child |= + simple_selector.GetPseudoType() == CSSSelector::kPseudoNthLastChild; for (const CSSSelector* sub_selector = simple_selector.SelectorListOrParent(); sub_selector; sub_selector = CSSSelectorList::Next(*sub_selector)) { @@ -1478,7 +1539,7 @@ descendant_features.has_features_for_rule_set_invalidation = false; - AddFeaturesToInvalidationSets(*sub_selector, sibling_features, + AddFeaturesToInvalidationSets(*sub_selector, in_nth_child, sibling_features, descendant_features); if (!descendant_features.has_features_for_rule_set_invalidation) { @@ -1499,8 +1560,8 @@ InvalidationSetFeatures& features) { for (const CSSSelector* selector = selector_list.First(); selector; selector = CSSSelectorList::Next(*selector)) { - AddFeaturesToInvalidationSets(*selector, nullptr /* sibling_features */, - features); + AddFeaturesToInvalidationSets(*selector, /*in_nth_child=*/false, + nullptr /* sibling_features */, features); } }; @@ -1516,6 +1577,7 @@ void RuleFeatureSet::AddFeaturesToInvalidationSetsForSimpleSelector( const CSSSelector& simple_selector, const CSSSelector& compound, + bool in_nth_child, InvalidationSetFeatures* sibling_features, InvalidationSetFeatures& descendant_features) { if (simple_selector.IsIdClassOrAttributeSelector()) { @@ -1558,6 +1620,9 @@ AddFeaturesToInvalidationSet(*invalidation_set, *sibling_features); if (sibling_features == &descendant_features) { sibling_invalidation_set->SetInvalidatesSelf(); + if (in_nth_child) { + sibling_invalidation_set->SetInvalidatesNth(); + } } else { AddFeaturesToInvalidationSet( sibling_invalidation_set->EnsureSiblingDescendants(), @@ -1578,12 +1643,13 @@ } AddFeaturesToInvalidationSetsForSelectorList( - simple_selector, sibling_features, descendant_features); + simple_selector, in_nth_child, sibling_features, descendant_features); } const CSSSelector* RuleFeatureSet::AddFeaturesToInvalidationSetsForCompoundSelector( const CSSSelector& compound, + bool in_nth_child, InvalidationSetFeatures* sibling_features, InvalidationSetFeatures& descendant_features) { bool compound_has_features_for_rule_set_invalidation = false; @@ -1592,7 +1658,8 @@ base::AutoReset<bool> reset_has_features( &descendant_features.has_features_for_rule_set_invalidation, false); AddFeaturesToInvalidationSetsForSimpleSelector( - *simple_selector, compound, sibling_features, descendant_features); + *simple_selector, compound, in_nth_child, sibling_features, + descendant_features); if (descendant_features.has_features_for_rule_set_invalidation) { compound_has_features_for_rule_set_invalidation = true; } @@ -1616,10 +1683,11 @@ void RuleFeatureSet::AddFeaturesToInvalidationSets( const CSSSelector& selector, + bool in_nth_child, InvalidationSetFeatures* sibling_features, InvalidationSetFeatures& descendant_features) { // selector is the selector immediately to the left of the rightmost - // combinator. descendantFeatures has the features of the rightmost compound + // combinator. descendant_features has the features of the rightmost compound // selector. InvalidationSetFeatures last_compound_in_sibling_chain_features; @@ -1627,12 +1695,13 @@ while (compound) { const CSSSelector* last_in_compound = AddFeaturesToInvalidationSetsForCompoundSelector( - *compound, sibling_features, descendant_features); + *compound, in_nth_child, sibling_features, descendant_features); DCHECK(last_in_compound); UpdateFeaturesFromCombinator(last_in_compound->Relation(), compound, last_compound_in_sibling_chain_features, sibling_features, descendant_features, - /* for_logical_combination_in_has */ false); + /* for_logical_combination_in_has */ false, + in_nth_child); compound = last_in_compound->TagHistory(); } }
diff --git a/third_party/blink/renderer/core/css/rule_feature_set.h b/third_party/blink/renderer/core/css/rule_feature_set.h index d7c8f90..17d4f17 100644 --- a/third_party/blink/renderer/core/css/rule_feature_set.h +++ b/third_party/blink/renderer/core/css/rule_feature_set.h
@@ -53,6 +53,61 @@ // in the class is about invalidation sets, and they are the primary // “features” being extracted from the selector now, the file does not // live in css/invalidation/. Perhaps this should be changed. +// +// In addition to complete invalidation (where we just throw up our +// hands and invalidate everything) and :has() (which is described in +// detail below), we have fundamentally four types of invalidation. +// All will be described for a class selector, but apply equally to +// id etc.: +// +// - Self-invalidation: When an element gets or loses class .c, +// that element needs to be invalidated (.c exists as a subject in +// some selector). We represent this by a bit in .c's invalidation +// set (or by inserting the class name in a Bloom filter; see +// class_invalidation_sets_). +// +// - Descendant invalidation: When an element gets or loses class .c, +// all of its children with class .d need to be invalidated +// (a selector of the form .c .d or .c > .d exists). We represent +// this by storing .d in .c's descendant invalidation set. +// +// - Sibling invalidation: When an element gets or loses class .c, +// all of its _siblings_ with class .d need to be invalidated +// (a selector of the form .c ~ .d or .c + .d exists). +// We represent this by storing .d in c's sibling invalidation set. +// +// - nth-child invalidation: Described immediately below. +// +// nth-child invalidation deals with peculiarities for :nth-child() +// and related selectors (such as :only-of-type). We have a couple +// of distinct strategies for dealing with them: +// +// - When we add or insert a node in the DOM tree where any child +// of the parent has matched such a selector, we forcibly schedule +// the (global) NthSiblingInvalidationSet. In other words, this +// is hardly related to the normal invalidation mechanism at all. +// +// - Finally, for :nth_child(... of :has()), we get a signal when +// a node is affected by :has() subject invalidation +// (in StyleEngine::InvalidateElementAffectedByHas()), and can +// forcibly schedule the NthSiblingInvalidationSet, much like +// the previous point. +// +// - When we have :nth-child(... of S) as a subject (ie., not just +// pure :nth-child(), but anything with a selector), we set the +// invalidates_nth_ bit on all invalidation sets for S. This means +// that whenever we schedule invalidation sets for anything in S, +// and any child of the parent has matched any :nth-child() selector, +// we'll schedule the NthSiblingInvalidationSet. +// +// - For all ancestors, we go through them recursively to find +// S within :nth-child(), and set their invalidates_nth_ similarly. +// This is conceptually the same thing as the previous point, +// but since we already handle subjects and ancestors differently, +// it was convenient with some mild code duplication here. +// +// - When we have sibling selectors against :nth-child, special +// provisions apply; see comments NthSiblingInvalidationSet. class CORE_EXPORT RuleFeatureSet { DISALLOW_NEW(); @@ -528,6 +583,7 @@ // For top-level complex selectors, the PseudoType is kPseudoUnknown. FeatureInvalidationType UpdateInvalidationSetsForComplex( const CSSSelector&, + bool in_nth_child, const StyleScope*, InvalidationSetFeatures&, PositionType, @@ -540,8 +596,10 @@ const CSSSelector&, InvalidationSetFeatures&, PositionType, - bool for_logical_combination_in_has); + bool for_logical_combination_in_has, + bool in_nth_child); void ExtractInvalidationSetFeaturesFromSelectorList(const CSSSelector&, + bool in_nth_child, InvalidationSetFeatures&, PositionType); void UpdateFeaturesFromCombinator( @@ -550,7 +608,8 @@ InvalidationSetFeatures& last_compound_in_adjacent_chain_features, InvalidationSetFeatures*& sibling_features, InvalidationSetFeatures& descendant_features, - bool for_logical_combination_in_has); + bool for_logical_combination_in_has, + bool in_nth_child); void UpdateFeaturesFromStyleScope( const StyleScope&, InvalidationSetFeatures& descendant_features); @@ -559,19 +618,23 @@ const InvalidationSetFeatures&); void AddFeaturesToInvalidationSets( const CSSSelector&, + bool in_nth_child, InvalidationSetFeatures* sibling_features, InvalidationSetFeatures& descendant_features); const CSSSelector* AddFeaturesToInvalidationSetsForCompoundSelector( const CSSSelector&, + bool in_nth_child, InvalidationSetFeatures* sibling_features, InvalidationSetFeatures& descendant_features); void AddFeaturesToInvalidationSetsForSimpleSelector( const CSSSelector& simple_selector, const CSSSelector& compound, + bool in_nth_child, InvalidationSetFeatures* sibling_features, InvalidationSetFeatures& descendant_features); void AddFeaturesToInvalidationSetsForSelectorList( const CSSSelector&, + bool in_nth_child, InvalidationSetFeatures* sibling_features, InvalidationSetFeatures& descendant_features); void AddFeaturesToInvalidationSetsForStyleScope( @@ -699,6 +762,13 @@ CSSSelector::RelationType previous_combinator, AddFeaturesMethodForLogicalCombinationInHas); + // Go recursively through everything in the given selector + // (which is typically an ancestor; see the class comment) + // and mark the invalidation sets of any simple selectors within it + // for Nth-child invalidation. + void MarkInvalidationSetsWithinNthChild(const CSSSelector& selector, + bool in_nth_child); + // Make sure that the pointer in “invalidation_set” has a single // reference that can be modified safely. (This is done through // copy-on-write, if needed, so that it can be modified without
diff --git a/third_party/blink/renderer/core/css/style_engine.cc b/third_party/blink/renderer/core/css/style_engine.cc index a5aff6902..10b19c5 100644 --- a/third_party/blink/renderer/core/css/style_engine.cc +++ b/third_party/blink/renderer/core/css/style_engine.cc
@@ -1160,6 +1160,23 @@ } // namespace +void PossiblyScheduleNthPseudoInvalidations(Node& node) { + if (!node.IsElementNode()) { + return; + } + ContainerNode* parent = node.parentNode(); + if (parent == nullptr) { + return; + } + + if ((parent->ChildrenAffectedByForwardPositionalRules() && + node.nextSibling()) || + (parent->ChildrenAffectedByBackwardPositionalRules() && + node.previousSibling())) { + node.GetDocument().GetStyleEngine().ScheduleNthPseudoInvalidations(*parent); + } +} + void StyleEngine::InvalidateElementAffectedByHas( Element& element, bool for_element_affected_by_pseudo_in_has) { @@ -1177,6 +1194,8 @@ StyleChangeType::kLocalStyleChange, StyleChangeReasonForTracing::Create( blink::style_change_reason::kStyleInvalidator)); + + PossiblyScheduleNthPseudoInvalidations(element); } if (element.AffectedByNonSubjectHas()) {
diff --git a/third_party/blink/renderer/core/css/style_engine.h b/third_party/blink/renderer/core/css/style_engine.h index 9a4e6c1..0714f815 100644 --- a/third_party/blink/renderer/core/css/style_engine.h +++ b/third_party/blink/renderer/core/css/style_engine.h
@@ -1020,6 +1020,8 @@ RuntimeEnabledFeatures::LayoutNGTableFragmentationEnabled(); } +void PossiblyScheduleNthPseudoInvalidations(Node& node); + } // namespace blink #endif // THIRD_PARTY_BLINK_RENDERER_CORE_CSS_STYLE_ENGINE_H_
diff --git a/third_party/blink/renderer/core/display_lock/display_lock_context.cc b/third_party/blink/renderer/core/display_lock/display_lock_context.cc index c652b52f..4338f07c 100644 --- a/third_party/blink/renderer/core/display_lock/display_lock_context.cc +++ b/third_party/blink/renderer/core/display_lock/display_lock_context.cc
@@ -576,6 +576,13 @@ void DisplayLockContext::DispatchStateChangeEventIfNeeded() { DCHECK(state_change_task_pending_); state_change_task_pending_ = false; + // If we're not connected to view, reset the state that we reported so that we + // can report it again on insertion. + if (!ConnectedToView()) { + last_notified_skipped_state_.reset(); + return; + } + if (!last_notified_skipped_state_ || *last_notified_skipped_state_ != is_locked_) { last_notified_skipped_state_ = is_locked_;
diff --git a/third_party/blink/renderer/core/frame/web_frame_test.cc b/third_party/blink/renderer/core/frame/web_frame_test.cc index 1a3fe91..fb4cfdcb 100644 --- a/third_party/blink/renderer/core/frame/web_frame_test.cc +++ b/third_party/blink/renderer/core/frame/web_frame_test.cc
@@ -9607,7 +9607,9 @@ SkColorSetARGB(128, 255, 0, 0)); } -TEST_F(WebFrameSwapTest, DoNotPropagateDisplayNonePropertyOnSwap) { +// TODO(crbug.com/1314493): This test is flaky with the TimedHTMLParserBudget +// feature enabled. +TEST_F(WebFrameSwapTest, DISABLED_DoNotPropagateDisplayNonePropertyOnSwap) { WebFrameSwapTestClient* main_frame_client = static_cast<WebFrameSwapTestClient*>(MainFrame()->Client()); EXPECT_FALSE(main_frame_client->DidPropagateDisplayNoneProperty()); @@ -11898,7 +11900,9 @@ HashMap<KURL, std::unique_ptr<ExpectedRequest>> expected_requests_; }; -TEST_F(WebFrameTest, ChangeResourcePriority) { +// TODO(crbug.com/1314493): This test is flaky with the TimedHTMLParserBudget +// feature enabled. +TEST_F(WebFrameTest, DISABLED_ChangeResourcePriority) { TestResourcePriorityWebFrameClient client; RegisterMockedHttpURLLoad("promote_img_in_viewport_priority.html"); RegisterMockedHttpURLLoad("image_slow.pl");
diff --git a/third_party/blink/renderer/core/frame/web_frame_widget_impl.cc b/third_party/blink/renderer/core/frame/web_frame_widget_impl.cc index c2d4e4e..58577e1 100644 --- a/third_party/blink/renderer/core/frame/web_frame_widget_impl.cc +++ b/third_party/blink/renderer/core/frame/web_frame_widget_impl.cc
@@ -1671,8 +1671,11 @@ return widget_base_->LayerTreeHost()->GetId(); } -const cc::LayerTreeSettings& WebFrameWidgetImpl::GetLayerTreeSettings() { - return widget_base_->LayerTreeHost()->GetSettings(); +const cc::LayerTreeSettings* WebFrameWidgetImpl::GetLayerTreeSettings() { + if (!View()->does_composite()) { + return nullptr; + } + return &widget_base_->LayerTreeHost()->GetSettings(); } void WebFrameWidgetImpl::UpdateBrowserControlsState(
diff --git a/third_party/blink/renderer/core/frame/web_frame_widget_impl.h b/third_party/blink/renderer/core/frame/web_frame_widget_impl.h index 7e9e0b1d..560b82a 100644 --- a/third_party/blink/renderer/core/frame/web_frame_widget_impl.h +++ b/third_party/blink/renderer/core/frame/web_frame_widget_impl.h
@@ -224,7 +224,7 @@ base::OnceCallback<void(base::TimeTicks)> presentation_callback) final; void RequestBeginMainFrameNotExpected(bool request) final; int GetLayerTreeId() final; - const cc::LayerTreeSettings& GetLayerTreeSettings() final; + const cc::LayerTreeSettings* GetLayerTreeSettings() final; void UpdateBrowserControlsState(cc::BrowserControlsState constraints, cc::BrowserControlsState current, bool animate) final;
diff --git a/third_party/blink/renderer/core/html/forms/html_form_control_element.cc b/third_party/blink/renderer/core/html/forms/html_form_control_element.cc index 237bd06..1a94f225 100644 --- a/third_party/blink/renderer/core/html/forms/html_form_control_element.cc +++ b/third_party/blink/renderer/core/html/forms/html_form_control_element.cc
@@ -397,11 +397,13 @@ // popover and set focus to the previously focused element, then the // normal focus management code will reset focus to the clicked control. bool can_show = - popover.popover->IsPopoverReady(PopoverTriggerAction::kShow) && + popover.popover->IsPopoverReady(PopoverTriggerAction::kShow, + /*exception_state=*/nullptr) && (popover.action == PopoverTriggerAction::kToggle || popover.action == PopoverTriggerAction::kShow); bool can_hide = - popover.popover->IsPopoverReady(PopoverTriggerAction::kHide) && + popover.popover->IsPopoverReady(PopoverTriggerAction::kHide, + /*exception_state=*/nullptr) && (popover.action == PopoverTriggerAction::kToggle || popover.action == PopoverTriggerAction::kHide); if (event.type() == event_type_names::kDOMActivate && @@ -409,7 +411,8 @@ if (can_hide) { popover.popover->HidePopoverInternal( HidePopoverFocusBehavior::kFocusPreviousElement, - HidePopoverForcingLevel::kHideAfterAnimations); + HidePopoverForcingLevel::kHideAfterAnimations, + /*exception_state=*/nullptr); } else if (can_show) { popover.popover->InvokePopover(this); }
diff --git a/third_party/blink/renderer/core/html/forms/html_select_menu_element.cc b/third_party/blink/renderer/core/html/forms/html_select_menu_element.cc index 3f1f7c0..3f5d6af 100644 --- a/third_party/blink/renderer/core/html/forms/html_select_menu_element.cc +++ b/third_party/blink/renderer/core/html/forms/html_select_menu_element.cc
@@ -356,7 +356,8 @@ // We will handle focus directly. listbox_part_->HidePopoverInternal( HidePopoverFocusBehavior::kNone, - HidePopoverForcingLevel::kHideAfterAnimations); + HidePopoverForcingLevel::kHideAfterAnimations, + /*exception_state=*/nullptr); } if (button_part_) { button_part_->Focus();
diff --git a/third_party/blink/renderer/core/html/html_element.cc b/third_party/blink/renderer/core/html/html_element.cc index 32fb839..c6d92de 100644 --- a/third_party/blink/renderer/core/html/html_element.cc +++ b/third_party/blink/renderer/core/html/html_element.cc
@@ -1206,7 +1206,8 @@ // If the popover type is changing, hide it. if (popoverOpen()) { HidePopoverInternal(HidePopoverFocusBehavior::kFocusPreviousElement, - HidePopoverForcingLevel::kHideAfterAnimations); + HidePopoverForcingLevel::kHideAfterAnimations, + /*exception_state=*/nullptr); // Event handlers could have changed the popover, including by removing // the popover attribute, or changing its value. If that happened, defer // to the change that already happened, and don't reset it again here. @@ -1247,49 +1248,70 @@ return false; } -const char* HTMLElement::IsPopoverNotReady( - PopoverTriggerAction action, - DOMExceptionCode& exception_code) const { +bool HTMLElement::IsPopoverReady(PopoverTriggerAction action, + ExceptionState* exception_state, + bool include_event_handler_text) const { DCHECK(RuntimeEnabledFeatures::HTMLPopoverAttributeEnabled( GetDocument().GetExecutionContext())); DCHECK_NE(action, PopoverTriggerAction::kNone); DCHECK_NE(action, PopoverTriggerAction::kToggle); + + auto maybe_throw_exception = [&exception_state, &include_event_handler_text]( + DOMExceptionCode code, const char* msg) { + if (exception_state) { + String error_message = + String(msg) + + (include_event_handler_text + ? " This might have been the result of the \"beforetoggle\" " + "event handler changing the state of this popover." + : ""); + exception_state->ThrowDOMException(code, error_message); + } + }; + if (!HasPopoverAttribute()) { - exception_code = DOMExceptionCode::kNotSupportedError; - return "Not supported on elements that do not have a valid value for the " - "'popover' attribute"; + maybe_throw_exception(DOMExceptionCode::kNotSupportedError, + "Not supported on elements that do not have a valid " + "value for the 'popover' attribute."); + return false; } - exception_code = DOMExceptionCode::kInvalidStateError; if (!isConnected()) { - return "Invalid on disconnected popover elements"; + maybe_throw_exception(DOMExceptionCode::kInvalidStateError, + "Invalid on disconnected popover elements."); + return false; } if (action == PopoverTriggerAction::kShow && GetPopoverData()->visibilityState() != PopoverVisibilityState::kHidden) { - return "Invalid on popover elements which aren't hidden"; + maybe_throw_exception(DOMExceptionCode::kInvalidStateError, + "Invalid on popover elements which aren't hidden."); + return false; } if (action == PopoverTriggerAction::kHide && GetPopoverData()->visibilityState() != PopoverVisibilityState::kShowing) { // Important to check that visibility is not kShowing (rather than // popoverOpen()), because a hide transition might have been started on this // popover already, and we don't want to allow a double-hide. - return "Invalid on popover elements that aren't already showing"; + maybe_throw_exception( + DOMExceptionCode::kInvalidStateError, + "Invalid on popover elements that aren't already showing."); + return false; } if (action == PopoverTriggerAction::kShow && IsA<HTMLDialogElement>(this) && hasAttribute(html_names::kOpenAttr)) { - return "The dialog is already open as a dialog, and therefore cannot be " - "opened as a popover."; + maybe_throw_exception(DOMExceptionCode::kInvalidStateError, + "The dialog is already open as a dialog, and " + "therefore cannot be opened as a popover."); + return false; } if (action == PopoverTriggerAction::kShow && Fullscreen::IsFullscreenElement(*this)) { - return "This element is already in fullscreen mode, and therefore cannot " - "be opened as a popover."; + maybe_throw_exception( + DOMExceptionCode::kInvalidStateError, + "This element is already in fullscreen mode, and therefore cannot be " + "opened as a popover."); + return false; } - return nullptr; -} - -bool HTMLElement::IsPopoverReady(PopoverTriggerAction action) const { - DOMExceptionCode exception_code; - return !IsPopoverNotReady(action, exception_code); + return true; } void HTMLElement::togglePopover(ExceptionState& exception_state) { @@ -1321,12 +1343,18 @@ // 3. Set the `:open` pseudo class. // 4. Update style. (Animations/transitions happen here.) void HTMLElement::showPopover(ExceptionState& exception_state) { + ShowPopoverInternal(&exception_state); +} + +void HTMLElement::ShowPopoverInternal(ExceptionState* exception_state) { DCHECK(RuntimeEnabledFeatures::HTMLPopoverAttributeEnabled( GetDocument().GetExecutionContext())); - DOMExceptionCode exception_code; - if (auto* error = - IsPopoverNotReady(PopoverTriggerAction::kShow, exception_code)) { - return exception_state.ThrowDOMException(exception_code, error); + if (!IsPopoverReady(PopoverTriggerAction::kShow, exception_state)) { + DCHECK(exception_state) + << " Callers which aren't supposed to throw exceptions should not call " + "ShowPopoverInternal when the Popover isn't in a valid state to be " + "shown."; + return; } // Fire the "opening" beforetoggle event. @@ -1343,8 +1371,10 @@ // The 'beforetoggle' event handler could have changed this popover, e.g. by // changing its type, removing it from the document, or calling showPopover(). - if (!HasPopoverAttribute() || !isConnected() || popoverOpen()) + if (!IsPopoverReady(PopoverTriggerAction::kShow, exception_state, + /*include_event_handler_text=*/true)) { return; + } bool should_restore_focus = false; auto& document = GetDocument(); @@ -1360,9 +1390,19 @@ // The 'beforetoggle' event handlers could have changed this popover, e.g. // by changing its type, removing it from the document, or calling // showPopover(). - if (!HasPopoverAttribute() || !isConnected() || popoverOpen() || - PopoverType() != original_type) + if (PopoverType() != original_type) { + if (exception_state) { + exception_state->ThrowDOMException( + DOMExceptionCode::kInvalidStateError, + "The value of the popover attribute was changed while hiding the " + "popover."); + } return; + } + if (!IsPopoverReady(PopoverTriggerAction::kShow, exception_state, + /*include_event_handler_text=*/true)) { + return; + } // We only restore focus for popover=auto, and only for the first popover in // the stack. If there's nothing showing, restore focus. @@ -1421,7 +1461,10 @@ auto close_all_open_popovers = [&document, &focus_behavior, &forcing_level]() { while (auto* popover = document.TopmostPopover()) { - popover->HidePopoverInternal(focus_behavior, forcing_level); + // We never throw exceptions from HideAllPopoversUntil, since it is always + // used to close other popovers that are already showing. + popover->HidePopoverInternal(focus_behavior, forcing_level, + /*exception_state=*/nullptr); } }; @@ -1445,21 +1488,20 @@ return close_all_open_popovers(); while (last_to_hide && last_to_hide->popoverOpen() && !document.PopoverStack().empty()) { - document.PopoverStack().back()->HidePopoverInternal(focus_behavior, - forcing_level); + // We never throw exceptions from HideAllPopoversUntil, since it is always + // used to close other popovers that are already showing. + document.PopoverStack().back()->HidePopoverInternal( + focus_behavior, forcing_level, + /*exception_state=*/nullptr); } } void HTMLElement::hidePopover(ExceptionState& exception_state) { DCHECK(RuntimeEnabledFeatures::HTMLPopoverAttributeEnabled( GetDocument().GetExecutionContext())); - DOMExceptionCode exception_code; - if (auto* error = - IsPopoverNotReady(PopoverTriggerAction::kHide, exception_code)) { - return exception_state.ThrowDOMException(exception_code, error); - } HidePopoverInternal(HidePopoverFocusBehavior::kFocusPreviousElement, - HidePopoverForcingLevel::kHideAfterAnimations); + HidePopoverForcingLevel::kHideAfterAnimations, + &exception_state); } // Hiding a popover happens in phases, to facilitate animations and @@ -1477,10 +1519,15 @@ // 5. Remove the popover from the top layer, and add the UA display:none style. // 6. Update style. void HTMLElement::HidePopoverInternal(HidePopoverFocusBehavior focus_behavior, - HidePopoverForcingLevel forcing_level) { + HidePopoverForcingLevel forcing_level, + ExceptionState* exception_state) { DCHECK(RuntimeEnabledFeatures::HTMLPopoverAttributeEnabled( GetDocument().GetExecutionContext())); - DCHECK(HasPopoverAttribute()); + + if (!IsPopoverReady(PopoverTriggerAction::kHide, exception_state)) { + return; + } + auto& document = GetDocument(); if (PopoverType() == PopoverValueType::kAuto) { // Hide any popovers above us in the stack. @@ -1491,6 +1538,12 @@ // hidePopover(). auto& stack = document.PopoverStack(); if (!stack.Contains(this)) { + if (exception_state) { + exception_state->ThrowDOMException( + DOMExceptionCode::kInvalidStateError, + "This popover's \"beforetoggle\" event handler caused it to be " + "hidden (e.g. by calling hidePopover())."); + } return; } @@ -1537,7 +1590,8 @@ // The 'beforetoggle' event handler could have changed this popover, e.g. by // changing its type, removing it from the document, or calling showPopover(). - if (!isConnected() || !popoverOpen()) { + if (!IsPopoverReady(PopoverTriggerAction::kHide, exception_state, + /*include_event_handler_text=*/true)) { return; } @@ -1816,7 +1870,8 @@ // Escape key just pops the topmost popover off the stack. document.TopmostPopover()->HidePopoverInternal( HidePopoverFocusBehavior::kFocusPreviousElement, - HidePopoverForcingLevel::kHideAfterAnimations); + HidePopoverForcingLevel::kHideAfterAnimations, + /*exception_state=*/nullptr); } } } @@ -1827,7 +1882,7 @@ GetDocument().GetExecutionContext())); DCHECK(HasPopoverAttribute()); GetPopoverData()->setInvoker(invoker); - showPopover(ASSERT_NO_EXCEPTION); + ShowPopoverInternal(/*exception_state=*/nullptr); } Element* HTMLElement::anchorElement() const { @@ -2312,7 +2367,8 @@ if (was_in_document) { // We can't run focus event handlers while removing elements. HidePopoverInternal(HidePopoverFocusBehavior::kNone, - HidePopoverForcingLevel::kHideImmediately); + HidePopoverForcingLevel::kHideImmediately, + /*exception_state=*/nullptr); } }
diff --git a/third_party/blink/renderer/core/html/html_element.h b/third_party/blink/renderer/core/html/html_element.h index 9f6781e8..e4f37e88 100644 --- a/third_party/blink/renderer/core/html/html_element.h +++ b/third_party/blink/renderer/core/html/html_element.h
@@ -213,15 +213,20 @@ bool HasPopoverAttribute() const; PopoverValueType PopoverType() const; bool popoverOpen() const; - const char* IsPopoverNotReady(PopoverTriggerAction action, - DOMExceptionCode& exception_code) const; - bool IsPopoverReady(PopoverTriggerAction action) const; + bool IsPopoverReady(PopoverTriggerAction action, + ExceptionState* exception_state, + bool include_event_handler_text = false) const; void togglePopover(ExceptionState& exception_state); void togglePopover(bool force, ExceptionState& exception_state); void showPopover(ExceptionState& exception_state); void hidePopover(ExceptionState& exception_state); + // |exception_state| can be nullptr when exceptions can't be thrown, such as + // when the browser hides a popover during light dismiss or shows a popover in + // response to clicking a button with popovershowtarget. + void ShowPopoverInternal(ExceptionState* exception_state); void HidePopoverInternal(HidePopoverFocusBehavior focus_behavior, - HidePopoverForcingLevel forcing_level); + HidePopoverForcingLevel forcing_level, + ExceptionState* exception_state); void PopoverHideFinishIfNeeded(); static const HTMLElement* FindTopmostPopoverAncestor(const HTMLElement&);
diff --git a/third_party/blink/renderer/core/html/media/video_auto_fullscreen_test.cc b/third_party/blink/renderer/core/html/media/video_auto_fullscreen_test.cc index 854447b..bc1baa5 100644 --- a/third_party/blink/renderer/core/html/media/video_auto_fullscreen_test.cc +++ b/third_party/blink/renderer/core/html/media/video_auto_fullscreen_test.cc
@@ -66,7 +66,7 @@ WebMediaPlayerEncryptedMediaClient*, WebContentDecryptionModule*, const WebString& sink_id, - const cc::LayerTreeSettings& settings, + const cc::LayerTreeSettings* settings, scoped_refptr<base::TaskRunner> compositor_worker_task_runner) final { return new EmptyWebMediaPlayer(); }
diff --git a/third_party/blink/renderer/core/html/media/video_wake_lock_test.cc b/third_party/blink/renderer/core/html/media/video_wake_lock_test.cc index 4de1a88..daaccd33 100644 --- a/third_party/blink/renderer/core/html/media/video_wake_lock_test.cc +++ b/third_party/blink/renderer/core/html/media/video_wake_lock_test.cc
@@ -130,7 +130,7 @@ WebMediaPlayerEncryptedMediaClient*, WebContentDecryptionModule*, const WebString& sink_id, - const cc::LayerTreeSettings& settings, + const cc::LayerTreeSettings* settings, scoped_refptr<base::TaskRunner> compositor_worker_task_runner) override { return web_media_player_.release(); }
diff --git a/third_party/blink/renderer/core/html/parser/html_document_parser.cc b/third_party/blink/renderer/core/html/parser/html_document_parser.cc index 2114be0..bcaea4f 100644 --- a/third_party/blink/renderer/core/html/parser/html_document_parser.cc +++ b/third_party/blink/renderer/core/html/parser/html_document_parser.cc
@@ -199,15 +199,33 @@ base::TimeDelta GetTimedBudget(int times_yielded) { static const base::FeatureParam<int> kNumYieldsWithDefaultBudgetParam{ - &features::kTimedHTMLParserBudget, "num-yields-with-default-budget", - kNumYieldsWithDefaultBudget}; + &features::kTimedHTMLParserBudget, "num-yields-with-default-budget", + // These constants were chosen using experiment data from the field to + // optimize Core Web Vitals metrics: https://web.dev/vitals/#core-web-vitals + // Experiments were run on both Android and desktop to determine the values + // that gave the best aggregate CWV pass rate. +#if BUILDFLAG(IS_ANDROID) + 2 +#else + 6 +#endif + }; // Cache the value to avoid parsing the param string more than once. static const int kNumYieldsWithDefaultBudgetValue = kNumYieldsWithDefaultBudgetParam.Get(); static const base::FeatureParam<base::TimeDelta> kLongParserBudgetParam{ - &features::kTimedHTMLParserBudget, "long-parser-budget", - base::Milliseconds(500)}; + &features::kTimedHTMLParserBudget, "long-parser-budget", + // These constants were chosen using experiment data from the field to + // optimize Core Web Vitals metrics: https://web.dev/vitals/#core-web-vitals + // Experiments were run on both Android and desktop to determine the values + // that gave the best aggregate CWV pass rate. +#if BUILDFLAG(IS_ANDROID) + base::Milliseconds(50) +#else + base::Milliseconds(500) +#endif + }; // Cache the value to avoid parsing the param string more than once. static const base::TimeDelta kLongParserBudgetValue = kLongParserBudgetParam.Get();
diff --git a/third_party/blink/renderer/core/html/parser/html_parser_metrics_test.cc b/third_party/blink/renderer/core/html/parser/html_parser_metrics_test.cc index ddba1c0..8fc9075 100644 --- a/third_party/blink/renderer/core/html/parser/html_parser_metrics_test.cc +++ b/third_party/blink/renderer/core/html/parser/html_parser_metrics_test.cc
@@ -109,7 +109,8 @@ 19, 1); } -#if BUILDFLAG(IS_MAC) && defined(ARCH_CPU_ARM64) +#if (BUILDFLAG(IS_MAC) && defined(ARCH_CPU_ARM64)) || \ + (BUILDFLAG(IS_ANDROID) && defined(ARCH_CPU_X86)) // https://crbug.com/1222653 #define MAYBE_HistogramReportsTwoChunks DISABLED_HistogramReportsTwoChunks #else @@ -173,13 +174,15 @@ histogram_tester.ExpectTotalCount("Blink.HTMLParsing.YieldedTimeAverage4", 1); // Expect specific values for the chunks and tokens counts - histogram_tester.ExpectUniqueSample("Blink.HTMLParsing.ChunkCount4", 2, 1); - histogram_tester.ExpectUniqueSample("Blink.HTMLParsing.TokensParsedMax4", 196, + // TODO(crbug.com/1314493): See if we can get this to parse in two separate + // chunks again with the timed budget. + histogram_tester.ExpectUniqueSample("Blink.HTMLParsing.ChunkCount4", 1, 1); + histogram_tester.ExpectUniqueSample("Blink.HTMLParsing.TokensParsedMax4", 258, 1); - histogram_tester.ExpectUniqueSample("Blink.HTMLParsing.TokensParsedMin4", 24, + histogram_tester.ExpectUniqueSample("Blink.HTMLParsing.TokensParsedMin4", 268, 1); histogram_tester.ExpectUniqueSample("Blink.HTMLParsing.TokensParsedAverage4", - 113, 1); + 258, 1); histogram_tester.ExpectUniqueSample("Blink.HTMLParsing.TokensParsedTotal4", 203, 1);
diff --git a/third_party/blink/renderer/core/imagebitmap/image_bitmap.cc b/third_party/blink/renderer/core/imagebitmap/image_bitmap.cc index de14a7f..0f5381c 100644 --- a/third_party/blink/renderer/core/imagebitmap/image_bitmap.cc +++ b/third_party/blink/renderer/core/imagebitmap/image_bitmap.cc
@@ -53,6 +53,7 @@ namespace blink { constexpr const char* kImageOrientationFlipY = "flipY"; +constexpr const char* kImageOrientationFromImage = "from-image"; constexpr const char* kImageBitmapOptionNone = "none"; constexpr const char* kImageBitmapOptionDefault = "default"; constexpr const char* kImageBitmapOptionPremultiply = "premultiply"; @@ -70,7 +71,8 @@ parsed_options.flip_y = true; } else { parsed_options.flip_y = false; - DCHECK(options->imageOrientation() == kImageBitmapOptionNone); + DCHECK(options->imageOrientation() == kImageBitmapOptionNone || + options->imageOrientation() == kImageOrientationFromImage); } if (options->premultiplyAlpha() == kImageBitmapOptionNone) {
diff --git a/third_party/blink/renderer/core/imagebitmap/image_bitmap_options.idl b/third_party/blink/renderer/core/imagebitmap/image_bitmap_options.idl index 8479d5381..f76bf68 100644 --- a/third_party/blink/renderer/core/imagebitmap/image_bitmap_options.idl +++ b/third_party/blink/renderer/core/imagebitmap/image_bitmap_options.idl
@@ -4,12 +4,12 @@ // https://html.spec.whatwg.org/C/#imagebitmapoptions -enum ImageOrientation { "none", "flipY" }; +enum ImageOrientation { "from-image", "none", "flipY"}; enum PremultiplyAlpha { "none", "premultiply", "default" }; enum ColorSpaceConversion { "none", "default" }; enum ResizeQuality { "pixelated", "low", "medium", "high" }; dictionary ImageBitmapOptions { - ImageOrientation imageOrientation = "none"; + ImageOrientation imageOrientation = "from-image"; PremultiplyAlpha premultiplyAlpha = "default"; ColorSpaceConversion colorSpaceConversion = "default"; [EnforceRange] unsigned long resizeWidth;
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 a74c02a..a387ead 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
@@ -116,7 +116,7 @@ WebMediaPlayerEncryptedMediaClient*, WebContentDecryptionModule*, const WebString& sink_id, - const cc::LayerTreeSettings& settings, + const cc::LayerTreeSettings* settings, scoped_refptr<base::TaskRunner> compositor_worker_task_runner) override { return new MockWebMediaPlayerForContextMenu(); }
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 1333feb..3f5efe9 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
@@ -2899,12 +2899,30 @@ // up and left to be at the origin "as-if all viewport-insetting UI were // hidden". This is done so that the transition container is stable across // navigations where the state of such UI can change (e.g. URL bar hidden -> - // shown). Offset painting of content so that it paints at the fixed viewport - // origin rather than behind the UI. - if (auto* transition = - ViewTransitionUtils::GetActiveTransition(object_.GetDocument()); - transition && transition->IsRootTransitioning()) { - if (object_.IsDocumentElement()) { + // shown). Offset painting of all other content so that it paints at the + // fixed viewport origin rather than behind the UI. Non-root transitions + // paint at their layer's origin and the layer is positioned with this offset + // included. + Document& document = object_.GetDocument(); + ViewTransition* transition = + ViewTransitionUtils::GetActiveTransition(document); + PseudoElement* view_transition_pseudo = + ViewTransitionUtils::GetRootPseudo(document); + // We may have a transition but not yet have setup the pseudo element tree. + // This can happen in view-transition-on-navigation where a transition is + // created waiting for rendering to unblock but pre-paint can still be + // triggered in this state. + DCHECK(!view_transition_pseudo || transition); + if (view_transition_pseudo && transition->IsRootTransitioning()) { + DCHECK(document.documentElement()); + DCHECK(view_transition_pseudo->GetLayoutObject()); + DCHECK(view_transition_pseudo->GetLayoutObject()->Parent()->IsLayoutView()); + + bool is_child_of_root = + object_.Parent() && object_.Parent()->IsLayoutView(); + bool is_view_transition_pseudo = + object_.GetNode() == view_transition_pseudo; + if (is_child_of_root && !is_view_transition_pseudo) { PhysicalOffset offset = PhysicalOffset(transition->GetRootSnapshotPaintOffset()); context_.current.paint_offset += offset;
diff --git a/third_party/blink/renderer/core/paint/text_painter_test.cc b/third_party/blink/renderer/core/paint/text_painter_test.cc index b9fc032..51039eb5 100644 --- a/third_party/blink/renderer/core/paint/text_painter_test.cc +++ b/third_party/blink/renderer/core/paint/text_painter_test.cc
@@ -201,7 +201,7 @@ op = static_cast<const cc::DrawTextBlobOp*>( &item->GetPaintRecord().GetFirstOp()); ASSERT_EQ(cc::PaintOpType::DrawTextBlob, op->GetType()); - EXPECT_NE(flags, op->flags); + EXPECT_FALSE(flags.EqualsForTesting(op->flags)); flags = op->flags; EXPECT_EQ(blob, op->blob); @@ -215,7 +215,7 @@ op = static_cast<const cc::DrawTextBlobOp*>( &item->GetPaintRecord().GetFirstOp()); ASSERT_EQ(cc::PaintOpType::DrawTextBlob, op->GetType()); - EXPECT_EQ(flags, op->flags); + EXPECT_TRUE(flags.EqualsForTesting(op->flags)); EXPECT_NE(blob, op->blob); blob = op->blob; @@ -228,7 +228,7 @@ op = static_cast<const cc::DrawTextBlobOp*>( &item->GetPaintRecord().GetFirstOp()); ASSERT_EQ(cc::PaintOpType::DrawTextBlob, op->GetType()); - EXPECT_EQ(flags, op->flags); + EXPECT_TRUE(flags.EqualsForTesting(op->flags)); EXPECT_NE(blob, op->blob); // In dark mode, the text should be drawn with dark mode flags. @@ -240,7 +240,7 @@ op = static_cast<const cc::DrawTextBlobOp*>( &item->GetPaintRecord().GetFirstOp()); ASSERT_EQ(cc::PaintOpType::DrawTextBlob, op->GetType()); - EXPECT_NE(flags, op->flags); + EXPECT_FALSE(flags.EqualsForTesting(op->flags)); } } // namespace
diff --git a/third_party/blink/renderer/core/paint/video_painter_test.cc b/third_party/blink/renderer/core/paint/video_painter_test.cc index c9fba9a5..0ac85ed 100644 --- a/third_party/blink/renderer/core/paint/video_painter_test.cc +++ b/third_party/blink/renderer/core/paint/video_painter_test.cc
@@ -157,7 +157,7 @@ WebMediaPlayerEncryptedMediaClient*, WebContentDecryptionModule*, const WebString& sink_id, - const cc::LayerTreeSettings& settings, + const cc::LayerTreeSettings* settings, scoped_refptr<base::TaskRunner> compositor_worker_task_runner) override { MockWebMediaPlayer* player = new MockWebMediaPlayer(client); EXPECT_CALL(*player, HasAvailableVideoFrame)
diff --git a/third_party/blink/renderer/core/speculation_rules/document_speculation_rules.cc b/third_party/blink/renderer/core/speculation_rules/document_speculation_rules.cc index 46920683..cce4d4f 100644 --- a/third_party/blink/renderer/core/speculation_rules/document_speculation_rules.cc +++ b/third_party/blink/renderer/core/speculation_rules/document_speculation_rules.cc
@@ -113,9 +113,9 @@ // TODO(mcnee): Speculation rules initially shipped with a bug where a policy // of "no-referrer" would be assumed and the referrer policy restriction was - // not enforced. We emulate that behaviour here as sites don't currently have - // a means of specifying a suitable policy. Once - // SpeculationRulesReferrerPolicyKey ships, this workaround should be removed. + // not enforced. We emulate that behaviour here as sites did not have a means + // of specifying a suitable policy. SpeculationRulesReferrerPolicyKey shipped + // in M111. This workaround should be removed when the flag is removed. // See https://crbug.com/1398772. if (!RuntimeEnabledFeatures::SpeculationRulesReferrerPolicyKeyEnabled( execution_context) &&
diff --git a/third_party/blink/renderer/core/speculation_rules/speculation_rule_set_test.cc b/third_party/blink/renderer/core/speculation_rules/speculation_rule_set_test.cc index 5947f61..788ff39 100644 --- a/third_party/blink/renderer/core/speculation_rules/speculation_rule_set_test.cc +++ b/third_party/blink/renderer/core/speculation_rules/speculation_rule_set_test.cc
@@ -345,9 +345,6 @@ } TEST_F(SpeculationRuleSetTest, DropUnrecognizedRules) { - ScopedSpeculationRulesReferrerPolicyKeyForTest enable_referrer_policy_key{ - true}; - auto* rule_set = CreateRuleSet( R"({"prefetch": [)" @@ -501,9 +498,6 @@ } TEST_F(SpeculationRuleSetTest, ReferrerPolicy) { - ScopedSpeculationRulesReferrerPolicyKeyForTest enable_referrer_policy_key{ - true}; - auto* rule_set = CreateRuleSet(R"({ "prefetch": [{ @@ -527,9 +521,6 @@ } TEST_F(SpeculationRuleSetTest, EmptyReferrerPolicy) { - ScopedSpeculationRulesReferrerPolicyKeyForTest enable_referrer_policy_key{ - true}; - // If an empty string is used for referrer_policy, treat this as if the key // were omitted. auto* rule_set = CreateRuleSet( @@ -1923,9 +1914,6 @@ // Tests that a document rule's specified referrer policy is used. TEST_F(DocumentRulesTest, ReferrerPolicy) { - ScopedSpeculationRulesReferrerPolicyKeyForTest enable_referrer_policy_key{ - true}; - DummyPageHolder page_holder; StubSpeculationHost speculation_host; Document& document = page_holder.GetDocument(); @@ -1954,12 +1942,6 @@ // Tests that a link's referrer-policy value is used if one is not specified // in the document rule. TEST_F(DocumentRulesTest, LinkReferrerPolicy) { - // This test does not use the "referrer_policy" key itself. This is used to - // disable a temporary workaround related to the use of a lax policy. See - // https://crbug.com/1398772. - ScopedSpeculationRulesReferrerPolicyKeyForTest enable_referrer_policy_key{ - true}; - DummyPageHolder page_holder; StubSpeculationHost speculation_host; Document& document = page_holder.GetDocument();
diff --git a/third_party/blink/renderer/core/view_transition/view_transition_utils.h b/third_party/blink/renderer/core/view_transition/view_transition_utils.h index 1af9724d..f31b618 100644 --- a/third_party/blink/renderer/core/view_transition/view_transition_utils.h +++ b/third_party/blink/renderer/core/view_transition/view_transition_utils.h
@@ -119,6 +119,17 @@ return supplement->TakePendingRequests(); return {}; } + + static PseudoElement* GetRootPseudo(const Document& document) { + if (!document.documentElement()) { + return nullptr; + } + + PseudoElement* view_transition_pseudo = + document.documentElement()->GetPseudoElement(kPseudoIdViewTransition); + DCHECK(!view_transition_pseudo || GetActiveTransition(document)); + return view_transition_pseudo; + } }; } // namespace blink
diff --git a/third_party/blink/renderer/modules/direct_sockets/stream_wrapper.cc b/third_party/blink/renderer/modules/direct_sockets/stream_wrapper.cc index 16ae27e4..81dea56 100644 --- a/third_party/blink/renderer/modules/direct_sockets/stream_wrapper.cc +++ b/third_party/blink/renderer/modules/direct_sockets/stream_wrapper.cc
@@ -56,6 +56,42 @@ const Member<ReadableStreamDefaultWrapper> readable_stream_wrapper_; }; +class ForwardingUnderlyingByteSource : public UnderlyingByteSourceBase { + public: + explicit ForwardingUnderlyingByteSource( + ReadableByteStreamWrapper* readable_stream_wrapper) + : readable_stream_wrapper_(readable_stream_wrapper) {} + + ScriptPromise Pull(ReadableByteStreamController* controller, + ExceptionState&) override { + DCHECK_EQ(readable_stream_wrapper_->Controller(), controller); + readable_stream_wrapper_->Pull(); + return ScriptPromise::CastUndefined(GetScriptState()); + } + + ScriptPromise Cancel(ExceptionState&) override { + readable_stream_wrapper_->CloseStream(); + return ScriptPromise::CastUndefined(GetScriptState()); + } + + ScriptPromise Cancel(v8::Local<v8::Value> reason, + ExceptionState& exception_state) override { + return Cancel(exception_state); + } + + ScriptState* GetScriptState() override { + return readable_stream_wrapper_->GetScriptState(); + } + + void Trace(Visitor* visitor) const override { + visitor->Trace(readable_stream_wrapper_); + UnderlyingByteSourceBase::Trace(visitor); + } + + private: + const Member<ReadableByteStreamWrapper> readable_stream_wrapper_; +}; + class ForwardingUnderlyingSink : public UnderlyingSinkBase { public: explicit ForwardingUnderlyingSink( @@ -172,8 +208,8 @@ UnderlyingByteSourceBase* ReadableByteStreamWrapper::MakeForwardingUnderlyingByteSource( ReadableByteStreamWrapper* readable_stream_wrapper) { - NOTIMPLEMENTED(); - return nullptr; + return MakeGarbageCollected<ForwardingUnderlyingByteSource>( + readable_stream_wrapper); } WritableStreamWrapper::WritableStreamWrapper(ScriptState* script_state)
diff --git a/third_party/blink/renderer/modules/direct_sockets/stream_wrapper.h b/third_party/blink/renderer/modules/direct_sockets/stream_wrapper.h index 614c6fa..8a61230 100644 --- a/third_party/blink/renderer/modules/direct_sockets/stream_wrapper.h +++ b/third_party/blink/renderer/modules/direct_sockets/stream_wrapper.h
@@ -27,7 +27,7 @@ public: using CloseOnceCallback = base::OnceCallback<void(ScriptValue exception)>; - enum class State { kOpen, kAborted, kClosed }; + enum class State { kOpen, kAborted, kClosed, kGracefullyClosing }; explicit StreamWrapper(ScriptState*); virtual ~StreamWrapper();
diff --git a/third_party/blink/renderer/modules/direct_sockets/tcp_readable_stream_wrapper.cc b/third_party/blink/renderer/modules/direct_sockets/tcp_readable_stream_wrapper.cc index b5d8aef..d827f4f 100644 --- a/third_party/blink/renderer/modules/direct_sockets/tcp_readable_stream_wrapper.cc +++ b/third_party/blink/renderer/modules/direct_sockets/tcp_readable_stream_wrapper.cc
@@ -11,12 +11,10 @@ #include "net/base/ip_endpoint.h" #include "net/base/net_errors.h" #include "third_party/blink/renderer/bindings/core/v8/v8_throw_dom_exception.h" -#include "third_party/blink/renderer/core/dom/dom_exception.h" #include "third_party/blink/renderer/core/streams/readable_stream.h" -#include "third_party/blink/renderer/core/streams/readable_stream_default_controller_with_script_scope.h" -#include "third_party/blink/renderer/core/streams/underlying_source_base.h" -#include "third_party/blink/renderer/core/typed_arrays/array_buffer/array_buffer_contents.h" +#include "third_party/blink/renderer/core/streams/readable_stream_byob_request.h" #include "third_party/blink/renderer/core/typed_arrays/dom_array_buffer.h" +#include "third_party/blink/renderer/core/typed_arrays/dom_array_piece.h" #include "third_party/blink/renderer/core/typed_arrays/dom_typed_array.h" #include "third_party/blink/renderer/modules/direct_sockets/stream_wrapper.h" #include "third_party/blink/renderer/platform/bindings/exception_code.h" @@ -31,7 +29,7 @@ ScriptState* script_state, CloseOnceCallback on_close, mojo::ScopedDataPipeConsumerHandle handle) - : ReadableStreamDefaultWrapper(script_state), + : ReadableByteStreamWrapper(script_state), on_close_(std::move(on_close)), data_pipe_(std::move(handle)), read_watcher_(FROM_HERE, mojo::SimpleWatcher::ArmingPolicy::MANUAL), @@ -51,18 +49,25 @@ ScriptState::Scope scope(script_state); auto* source = - ReadableStreamDefaultWrapper::MakeForwardingUnderlyingSource(this); + ReadableByteStreamWrapper::MakeForwardingUnderlyingByteSource(this); SetSource(source); - // Set queuing strategy of default behavior with a high water mark of 0. - auto* readable = ReadableStream::CreateWithCountQueueingStrategy( - script_state, source, /*high_water_mark=*/0); + auto* readable = ReadableStream::CreateByteStream(script_state, source); SetReadable(readable); + + // UnderlyingByteSourceBase doesn't expose Controller() until the first call + // to Pull(); this becomes problematic if the socket is errored beforehand - + // calls to close() / error() will be invoked on a nullptr. Hence we obtain + // the controller directly. + auto* controller = + To<ReadableByteStreamController>(readable->GetController()); + DCHECK(controller); + SetController(controller); } void TCPReadableStreamWrapper::Trace(Visitor* visitor) const { visitor->Trace(pending_exception_); - ReadableStreamDefaultWrapper::Trace(visitor); + ReadableByteStreamWrapper::Trace(visitor); } void TCPReadableStreamWrapper::OnHandleReady(MojoResult result, @@ -93,9 +98,27 @@ MOJO_BEGIN_READ_DATA_FLAG_NONE); switch (result) { case MOJO_RESULT_OK: { - auto* buffer = DOMUint8Array::Create( - static_cast<const uint8_t*>(data_buffer), data_length); - Controller()->Enqueue(buffer); + // respond() or enqueue() will only throw if their arguments are invalid + // or the stream is errored. The code below guarantees that the length is + // in range and the chunk is a valid view. If the stream becomes errored + // then this method cannot be called because the watcher is disarmed. + NonThrowableExceptionState exception_state; + + auto* script_state = GetScriptState(); + ScriptState::Scope scope(script_state); + + if (ReadableStreamBYOBRequest* request = Controller()->byobRequest()) { + DOMArrayPiece view(request->view().Get()); + data_length = std::min( + data_length, base::saturated_cast<uint32_t>(view.ByteLength())); + std::memcpy(view.Data(), data_buffer, data_length); + request->respond(script_state, data_length, exception_state); + } else { + auto buffer = NotShared(DOMUint8Array::Create( + static_cast<const uint8_t*>(data_buffer), data_length)); + Controller()->enqueue(script_state, buffer, exception_state); + } + result = data_pipe_->EndReadData(data_length); DCHECK_EQ(result, MOJO_RESULT_OK); @@ -117,24 +140,13 @@ } void TCPReadableStreamWrapper::CloseStream() { - if (GetState() != State::kOpen) { + // Even if we're in the process of graceful close, readable.cancel() has + // priority. + if (GetState() != State::kOpen && GetState() != State::kGracefullyClosing) { return; } SetState(State::kClosed); - // If close request came from reader.cancel(), the internal state of the - // stream is already set to closed. Therefore we don't have to do anything - // with the controller. - if (!data_pipe_) { - // This is a rare case indicating that reader.cancel() interrupted the - // OnReadError() call where the pipe already got reset, but the - // corresponding IPC hasn't yet arrived. The simplest way is to abort - // CloseStream by setting state to Open and allow the IPC to finish the - // job. - SetState(State::kOpen); - return; - } - ResetPipe(); std::move(on_close_).Run(ScriptValue()); return; @@ -146,10 +158,23 @@ } graceful_peer_shutdown_ = (error_code == net::OK); + auto* script_state = GetScriptState(); + ScriptState::Scope scope(script_state); + if (graceful_peer_shutdown_) { - SetState(State::kClosed); - if (!data_pipe_) { - Controller()->Close(); + if (data_pipe_) { + // This is the case where OnReadError() arrived before pipe break. + // Set |state| to kGracefullyClosing and handle the rest in + // OnHandleReset(). + SetState(State::kGracefullyClosing); + } else { + // This is the case where OnReadError() arrived after pipe break. + // Since all data has already been read, we can simply close the + // controller, set |state| to kClosed and invoke the closing callback. + SetState(State::kClosed); + DCHECK(ReadableStream::IsReadable(Readable())); + NonThrowableExceptionState exception_state; + Controller()->close(script_state, exception_state); std::move(on_close_).Run(ScriptValue()); } return; @@ -157,11 +182,6 @@ SetState(State::kAborted); - auto* script_state = GetScriptState(); - // Scope is needed because there's no ScriptState* on the call stack for - // ScriptValue::From. - ScriptState::Scope scope{script_state}; - auto exception = ScriptValue::From( script_state, V8ThrowDOMException::CreateOrDie(script_state->GetIsolate(), @@ -174,7 +194,7 @@ return; } - Controller()->Error(exception); + Controller()->error(script_state, exception); std::move(on_close_).Run(exception); } @@ -204,15 +224,25 @@ ResetPipe(); + auto* script_state = GetScriptState(); + // Happens in unit tests if V8TestingScope goes out before OnHandleReset + // propagates. + if (!script_state->ContextIsValid()) { + return; + } + + ScriptState::Scope scope(script_state); if (!pending_exception_.IsEmpty()) { - Controller()->Error(pending_exception_); + Controller()->error(script_state, pending_exception_); SetState(State::kAborted); std::move(on_close_).Run(pending_exception_); pending_exception_.Clear(); } else if (graceful_peer_shutdown_) { - Controller()->Close(); + DCHECK(ReadableStream::IsReadable(Readable())); + NonThrowableExceptionState exception_state; + Controller()->close(script_state, exception_state); SetState(State::kClosed); std::move(on_close_).Run(ScriptValue());
diff --git a/third_party/blink/renderer/modules/direct_sockets/tcp_readable_stream_wrapper.h b/third_party/blink/renderer/modules/direct_sockets/tcp_readable_stream_wrapper.h index 2e89e3b..e22391b 100644 --- a/third_party/blink/renderer/modules/direct_sockets/tcp_readable_stream_wrapper.h +++ b/third_party/blink/renderer/modules/direct_sockets/tcp_readable_stream_wrapper.h
@@ -25,7 +25,7 @@ // Helper class to read from a mojo consumer handle class MODULES_EXPORT TCPReadableStreamWrapper : public GarbageCollected<TCPReadableStreamWrapper>, - public ReadableStreamDefaultWrapper { + public ReadableByteStreamWrapper { USING_PRE_FINALIZER(TCPReadableStreamWrapper, Dispose); public:
diff --git a/third_party/blink/renderer/modules/direct_sockets/tcp_readable_stream_wrapper_unittest.cc b/third_party/blink/renderer/modules/direct_sockets/tcp_readable_stream_wrapper_unittest.cc index a8f1e2e0..7d2470c 100644 --- a/third_party/blink/renderer/modules/direct_sockets/tcp_readable_stream_wrapper_unittest.cc +++ b/third_party/blink/renderer/modules/direct_sockets/tcp_readable_stream_wrapper_unittest.cc
@@ -334,9 +334,9 @@ stream_creator->ResetPipe(); + // cancel() always has priority. ASSERT_EQ(tcp_readable_stream_wrapper->GetState(), - graceful ? StreamWrapper::State::kClosed - : StreamWrapper::State::kAborted); + StreamWrapper::State::kClosed); } } // namespace
diff --git a/third_party/blink/renderer/modules/document_picture_in_picture/picture_in_picture_controller_test.cc b/third_party/blink/renderer/modules/document_picture_in_picture/picture_in_picture_controller_test.cc index 857a761..b3f6bbd 100644 --- a/third_party/blink/renderer/modules/document_picture_in_picture/picture_in_picture_controller_test.cc +++ b/third_party/blink/renderer/modules/document_picture_in_picture/picture_in_picture_controller_test.cc
@@ -279,7 +279,7 @@ WebMediaPlayerEncryptedMediaClient*, WebContentDecryptionModule*, const WebString& sink_id, - const cc::LayerTreeSettings& settings, + const cc::LayerTreeSettings* settings, scoped_refptr<base::TaskRunner> compositor_worker_task_runner) override { return web_media_player_.release(); }
diff --git a/third_party/blink/renderer/modules/peerconnection/mock_rtc_peer_connection_handler_client.h b/third_party/blink/renderer/modules/peerconnection/mock_rtc_peer_connection_handler_client.h index d3615d4..3e35125 100644 --- a/third_party/blink/renderer/modules/peerconnection/mock_rtc_peer_connection_handler_client.h +++ b/third_party/blink/renderer/modules/peerconnection/mock_rtc_peer_connection_handler_client.h
@@ -18,7 +18,8 @@ namespace blink { class MockRTCPeerConnectionHandlerClient - : public RTCPeerConnectionHandlerClient { + : public GarbageCollected<MockRTCPeerConnectionHandlerClient>, + public RTCPeerConnectionHandlerClient { public: MockRTCPeerConnectionHandlerClient();
diff --git a/third_party/blink/renderer/modules/peerconnection/peer_connection_dependency_factory_test.cc b/third_party/blink/renderer/modules/peerconnection/peer_connection_dependency_factory_test.cc index b89b365b..3355ae4 100644 --- a/third_party/blink/renderer/modules/peerconnection/peer_connection_dependency_factory_test.cc +++ b/third_party/blink/renderer/modules/peerconnection/peer_connection_dependency_factory_test.cc
@@ -16,6 +16,10 @@ class PeerConnectionDependencyFactoryTest : public ::testing::Test { public: + PeerConnectionDependencyFactoryTest() + : mock_client_( + MakeGarbageCollected<MockRTCPeerConnectionHandlerClient>()) {} + void EnsureDependencyFactory(ExecutionContext& context) { dependency_factory_ = &PeerConnectionDependencyFactory::From(context); ASSERT_TRUE(dependency_factory_); @@ -24,7 +28,7 @@ std::unique_ptr<RTCPeerConnectionHandler> CreateRTCPeerConnectionHandler() { std::unique_ptr<RTCPeerConnectionHandler> handler = dependency_factory_->CreateRTCPeerConnectionHandler( - &mock_client_, + mock_client_, blink::scheduler::GetSingleThreadTaskRunnerForTesting(), /*encoded_insertable_streams=*/false); DummyExceptionStateForTesting exception_state; @@ -38,7 +42,7 @@ protected: Persistent<PeerConnectionDependencyFactory> dependency_factory_; - MockRTCPeerConnectionHandlerClient mock_client_; + Persistent<MockRTCPeerConnectionHandlerClient> mock_client_; }; TEST_F(PeerConnectionDependencyFactoryTest, CreateRTCPeerConnectionHandler) {
diff --git a/third_party/blink/renderer/modules/peerconnection/peer_connection_tracker_test.cc b/third_party/blink/renderer/modules/peerconnection/peer_connection_tracker_test.cc index 57d06a21..6fb6339 100644 --- a/third_party/blink/renderer/modules/peerconnection/peer_connection_tracker_test.cc +++ b/third_party/blink/renderer/modules/peerconnection/peer_connection_tracker_test.cc
@@ -105,23 +105,27 @@ public: MockPeerConnectionHandler() : MockPeerConnectionHandler( - MakeGarbageCollected<MockPeerConnectionDependencyFactory>()) {} + MakeGarbageCollected<MockPeerConnectionDependencyFactory>(), + MakeGarbageCollected<MockRTCPeerConnectionHandlerClient>()) {} MOCK_METHOD0(CloseClientPeerConnection, void()); MOCK_METHOD1(OnThermalStateChange, void(mojom::blink::DeviceThermalState)); MOCK_METHOD1(OnSpeedLimitChange, void(int)); private: - explicit MockPeerConnectionHandler( - MockPeerConnectionDependencyFactory* factory) - : RTCPeerConnectionHandler( - &client_, + MockPeerConnectionHandler(MockPeerConnectionDependencyFactory* factory, + MockRTCPeerConnectionHandlerClient* client) + : + + RTCPeerConnectionHandler( + client, factory, blink::scheduler::GetSingleThreadTaskRunnerForTesting(), /*encoded_insertable_streams=*/false), - factory_(factory) {} + factory_(factory), + client_(client) {} Persistent<MockPeerConnectionDependencyFactory> factory_; - MockRTCPeerConnectionHandlerClient client_; + Persistent<MockRTCPeerConnectionHandlerClient> client_; }; webrtc::PeerConnectionInterface::RTCConfiguration DefaultConfig() {
diff --git a/third_party/blink/renderer/modules/peerconnection/rtc_peer_connection.cc b/third_party/blink/renderer/modules/peerconnection/rtc_peer_connection.cc index db62875..0395f6e 100644 --- a/third_party/blink/renderer/modules/peerconnection/rtc_peer_connection.cc +++ b/third_party/blink/renderer/modules/peerconnection/rtc_peer_connection.cc
@@ -670,7 +670,7 @@ // Promptly clears the handler's pointer to |this| // so that content/ doesn't access it in a lazy sweeping phase. if (peer_handler_) { - peer_handler_->CloseAndUnregister(); + peer_handler_.reset(); } }
diff --git a/third_party/blink/renderer/modules/peerconnection/rtc_peer_connection_handler.cc b/third_party/blink/renderer/modules/peerconnection/rtc_peer_connection_handler.cc index e5b6ca8..7841edc 100644 --- a/third_party/blink/renderer/modules/peerconnection/rtc_peer_connection_handler.cc +++ b/third_party/blink/renderer/modules/peerconnection/rtc_peer_connection_handler.cc
@@ -2008,6 +2008,9 @@ native_peer_connection_->Close(); // This object may no longer forward call backs to blink. + // Clear the pointer to client_ so that it no longer prevents + // garbage collection. + client_ = nullptr; is_closed_ = true; }
diff --git a/third_party/blink/renderer/modules/peerconnection/rtc_peer_connection_handler.h b/third_party/blink/renderer/modules/peerconnection/rtc_peer_connection_handler.h index cfe9cc9..74fc0df 100644 --- a/third_party/blink/renderer/modules/peerconnection/rtc_peer_connection_handler.h +++ b/third_party/blink/renderer/modules/peerconnection/rtc_peer_connection_handler.h
@@ -421,7 +421,7 @@ // It is valid for the lifetime of this object, but is cleared when // CloseAndUnregister() is called, in order to make sure it doesn't // interfere with garbage collection of the owner object. - RTCPeerConnectionHandlerClient* client_ = nullptr; + Persistent<RTCPeerConnectionHandlerClient> client_; // True if this PeerConnection has been closed. // After the PeerConnection has been closed, this object may no longer // forward callbacks to blink.
diff --git a/third_party/blink/renderer/modules/peerconnection/rtc_peer_connection_handler_test.cc b/third_party/blink/renderer/modules/peerconnection/rtc_peer_connection_handler_test.cc index 2d36256..38e6117 100644 --- a/third_party/blink/renderer/modules/peerconnection/rtc_peer_connection_handler_test.cc +++ b/third_party/blink/renderer/modules/peerconnection/rtc_peer_connection_handler_test.cc
@@ -308,7 +308,7 @@ void SetUp() override { SimTest::SetUp(); mock_client_ = - std::make_unique<NiceMock<MockRTCPeerConnectionHandlerClient>>(); + MakeGarbageCollected<NiceMock<MockRTCPeerConnectionHandlerClient>>(); mock_dependency_factory_ = MakeGarbageCollected<MockPeerConnectionDependencyFactory>(); @@ -335,7 +335,7 @@ std::unique_ptr<RTCPeerConnectionHandlerUnderTest> CreateRTCPeerConnectionHandlerUnderTest() { return std::make_unique<RTCPeerConnectionHandlerUnderTest>( - mock_client_.get(), mock_dependency_factory_.Get()); + mock_client_, mock_dependency_factory_.Get()); } // Creates a local MediaStream. @@ -603,7 +603,7 @@ public: ScopedTestingPlatformSupport<AudioCapturerSourceTestingPlatformSupport> webrtc_audio_device_platform_support_; - std::unique_ptr<MockRTCPeerConnectionHandlerClient> mock_client_; + Persistent<MockRTCPeerConnectionHandlerClient> mock_client_; Persistent<MockPeerConnectionDependencyFactory> mock_dependency_factory_; Persistent<NiceMock<MockPeerConnectionTracker>> mock_tracker_; std::unique_ptr<RTCPeerConnectionHandlerUnderTest> pc_handler_; @@ -626,29 +626,27 @@ TEST_F(RTCPeerConnectionHandlerTest, NoCallbacksToClientAfterStop) { pc_handler_->Close(); - EXPECT_CALL(*mock_client_.get(), NegotiationNeeded()).Times(0); + EXPECT_CALL(*mock_client_, NegotiationNeeded()).Times(0); pc_handler_->observer()->OnRenegotiationNeeded(); - EXPECT_CALL(*mock_client_.get(), DidGenerateICECandidate(_)).Times(0); + EXPECT_CALL(*mock_client_, DidGenerateICECandidate(_)).Times(0); std::unique_ptr<webrtc::IceCandidateInterface> native_candidate( mock_dependency_factory_->CreateIceCandidate("sdpMid", 1, kDummySdp)); pc_handler_->observer()->OnIceCandidate(native_candidate.get()); - EXPECT_CALL(*mock_client_.get(), DidChangeIceGatheringState(_)).Times(0); + EXPECT_CALL(*mock_client_, DidChangeIceGatheringState(_)).Times(0); pc_handler_->observer()->OnIceGatheringChange( webrtc::PeerConnectionInterface::kIceGatheringNew); - EXPECT_CALL(*mock_client_.get(), DidModifyTransceiversForMock(_, _, _)) - .Times(0); + EXPECT_CALL(*mock_client_, DidModifyTransceiversForMock(_, _, _)).Times(0); rtc::scoped_refptr<webrtc::MediaStreamInterface> remote_stream( AddRemoteMockMediaStream("remote_stream", "video", "audio")); InvokeOnAddStream(remote_stream); - EXPECT_CALL(*mock_client_.get(), DidModifyTransceiversForMock(_, _, _)) - .Times(0); + EXPECT_CALL(*mock_client_, DidModifyTransceiversForMock(_, _, _)).Times(0); InvokeOnRemoveStream(remote_stream); - EXPECT_CALL(*mock_client_.get(), DidAddRemoteDataChannel(_)).Times(0); + EXPECT_CALL(*mock_client_, DidAddRemoteDataChannel(_)).Times(0); webrtc::DataChannelInit config; rtc::scoped_refptr<webrtc::DataChannelInterface> remote_data_channel( new rtc::RefCountedObject<blink::MockDataChannel>("dummy", &config)); @@ -1057,7 +1055,7 @@ TrackConnectionStateChange( pc_handler_.get(), webrtc::PeerConnectionInterface::PeerConnectionState::kNew)); - EXPECT_CALL(*mock_client_.get(), + EXPECT_CALL(*mock_client_, DidChangePeerConnectionState( webrtc::PeerConnectionInterface::PeerConnectionState::kNew)); pc_handler_->observer()->OnConnectionChange(new_state); @@ -1069,7 +1067,7 @@ pc_handler_.get(), webrtc::PeerConnectionInterface::PeerConnectionState::kConnecting)); EXPECT_CALL( - *mock_client_.get(), + *mock_client_, DidChangePeerConnectionState( webrtc::PeerConnectionInterface::PeerConnectionState::kConnecting)); pc_handler_->observer()->OnConnectionChange(new_state); @@ -1081,7 +1079,7 @@ pc_handler_.get(), webrtc::PeerConnectionInterface::PeerConnectionState::kConnected)); EXPECT_CALL( - *mock_client_.get(), + *mock_client_, DidChangePeerConnectionState( webrtc::PeerConnectionInterface::PeerConnectionState::kConnected)); pc_handler_->observer()->OnConnectionChange(new_state); @@ -1094,7 +1092,7 @@ pc_handler_.get(), webrtc::PeerConnectionInterface::PeerConnectionState::kDisconnected)); EXPECT_CALL( - *mock_client_.get(), + *mock_client_, DidChangePeerConnectionState( webrtc::PeerConnectionInterface::PeerConnectionState::kDisconnected)); pc_handler_->observer()->OnConnectionChange(new_state); @@ -1106,7 +1104,7 @@ pc_handler_.get(), webrtc::PeerConnectionInterface::PeerConnectionState::kFailed)); EXPECT_CALL( - *mock_client_.get(), + *mock_client_, DidChangePeerConnectionState( webrtc::PeerConnectionInterface::PeerConnectionState::kFailed)); pc_handler_->observer()->OnConnectionChange(new_state); @@ -1118,7 +1116,7 @@ pc_handler_.get(), webrtc::PeerConnectionInterface::PeerConnectionState::kClosed)); EXPECT_CALL( - *mock_client_.get(), + *mock_client_, DidChangePeerConnectionState( webrtc::PeerConnectionInterface::PeerConnectionState::kClosed)); pc_handler_->observer()->OnConnectionChange(new_state); @@ -1130,21 +1128,21 @@ TrackIceGatheringStateChange( pc_handler_.get(), webrtc::PeerConnectionInterface::kIceGatheringNew)); - EXPECT_CALL(*mock_client_.get(), + EXPECT_CALL(*mock_client_, DidChangeIceGatheringState( webrtc::PeerConnectionInterface::kIceGatheringNew)); EXPECT_CALL(*mock_tracker_.Get(), TrackIceGatheringStateChange( pc_handler_.get(), webrtc::PeerConnectionInterface::kIceGatheringGathering)); - EXPECT_CALL(*mock_client_.get(), + EXPECT_CALL(*mock_client_, DidChangeIceGatheringState( webrtc::PeerConnectionInterface::kIceGatheringGathering)); EXPECT_CALL(*mock_tracker_.Get(), TrackIceGatheringStateChange( pc_handler_.get(), webrtc::PeerConnectionInterface::kIceGatheringComplete)); - EXPECT_CALL(*mock_client_.get(), + EXPECT_CALL(*mock_client_, DidChangeIceGatheringState( webrtc::PeerConnectionInterface::kIceGatheringComplete)); @@ -1169,7 +1167,7 @@ EXPECT_CALL(*mock_tracker_.Get(), TrackAddIceCandidate(pc_handler_.get(), _, PeerConnectionTracker::kSourceLocal, true)); - EXPECT_CALL(*mock_client_.get(), DidGenerateICECandidate(_)); + EXPECT_CALL(*mock_client_, DidGenerateICECandidate(_)); std::unique_ptr<webrtc::IceCandidateInterface> native_candidate( mock_dependency_factory_->CreateIceCandidate("sdpMid", 1, kDummySdp)); @@ -1184,7 +1182,7 @@ testing::InSequence sequence; EXPECT_CALL(*mock_tracker_.Get(), TrackOnRenegotiationNeeded(pc_handler_.get())); - EXPECT_CALL(*mock_client_.get(), NegotiationNeeded()); + EXPECT_CALL(*mock_client_, NegotiationNeeded()); pc_handler_->observer()->OnNegotiationNeededEvent(42); } @@ -1202,7 +1200,7 @@ TEST_F(RTCPeerConnectionHandlerTest, CheckInsertableStreamsConfig) { for (bool encoded_insertable_streams : {true, false}) { auto handler = std::make_unique<RTCPeerConnectionHandlerUnderTest>( - mock_client_.get(), mock_dependency_factory_.Get(), + mock_client_, mock_dependency_factory_.Get(), encoded_insertable_streams); EXPECT_EQ(handler->encoded_insertable_streams(), encoded_insertable_streams);
diff --git a/third_party/blink/renderer/modules/webcodecs/fuzzer_inputs.proto b/third_party/blink/renderer/modules/webcodecs/fuzzer_inputs.proto index a3711104..9be9767 100644 --- a/third_party/blink/renderer/modules/webcodecs/fuzzer_inputs.proto +++ b/third_party/blink/renderer/modules/webcodecs/fuzzer_inputs.proto
@@ -284,7 +284,7 @@ message ImageBitmapOptions { enum ImageOrientation { - ORIENTATION_NONE = 0; + ORIENTATION_FROM_IMAGE = 0; FLIPY = 1; } enum PremultiplyAlpha {
diff --git a/third_party/blink/renderer/platform/graphics/accelerated_static_bitmap_image_test.cc b/third_party/blink/renderer/platform/graphics/accelerated_static_bitmap_image_test.cc index 237ffb3..4e130a0 100644 --- a/third_party/blink/renderer/platform/graphics/accelerated_static_bitmap_image_test.cc +++ b/third_party/blink/renderer/platform/graphics/accelerated_static_bitmap_image_test.cc
@@ -83,7 +83,7 @@ cc::PaintImage stored_image = bitmap->PaintImageForCurrentFrame(); auto stored_image2 = bitmap->PaintImageForCurrentFrame(); - EXPECT_EQ(stored_image, stored_image2); + EXPECT_TRUE(stored_image.IsSameForTesting(stored_image2)); } TEST_F(AcceleratedStaticBitmapImageTest, CopyToTextureSynchronization) {
diff --git a/third_party/blink/renderer/platform/graphics/bitmap_image_test.cc b/third_party/blink/renderer/platform/graphics/bitmap_image_test.cc index 4b3d56b..49f009e 100644 --- a/third_party/blink/renderer/platform/graphics/bitmap_image_test.cc +++ b/third_party/blink/renderer/platform/graphics/bitmap_image_test.cc
@@ -354,7 +354,7 @@ ASSERT_EQ(image_->SetData(partial_buffer, false), Image::kSizeAvailable); auto image1 = image_->PaintImageForCurrentFrame(); auto image2 = image_->PaintImageForCurrentFrame(); - EXPECT_EQ(image1, image2); + EXPECT_TRUE(image1.IsSameForTesting(image2)); auto sk_image1 = image1.GetSwSkImage(); auto sk_image2 = image2.GetSwSkImage(); EXPECT_EQ(sk_image1->uniqueID(), sk_image2->uniqueID()); @@ -407,7 +407,7 @@ // But the PaintImage should be the same. auto paint_image1 = default_image1->PaintImageForCurrentFrame(); auto paint_image2 = default_image2->PaintImageForCurrentFrame(); - EXPECT_EQ(paint_image1, paint_image2); + EXPECT_TRUE(paint_image1.IsSameForTesting(paint_image2)); EXPECT_EQ(paint_image1.GetSwSkImage()->uniqueID(), paint_image2.GetSwSkImage()->uniqueID()); }
diff --git a/third_party/blink/renderer/platform/graphics/box_reflection.h b/third_party/blink/renderer/platform/graphics/box_reflection.h index 6deb297..39650b08 100644 --- a/third_party/blink/renderer/platform/graphics/box_reflection.h +++ b/third_party/blink/renderer/platform/graphics/box_reflection.h
@@ -65,7 +65,9 @@ inline bool operator==(const BoxReflection& a, const BoxReflection& b) { return a.Direction() == b.Direction() && a.Offset() == b.Offset() && - a.Mask() == b.Mask() && a.MaskBounds() == b.MaskBounds(); + // False negatives are allowed, but not false positives. + a.Mask().empty() && b.Mask().empty() && + a.MaskBounds() == b.MaskBounds(); } inline bool operator!=(const BoxReflection& a, const BoxReflection& b) {
diff --git a/third_party/blink/renderer/platform/graphics/canvas_2d_layer_bridge_test.cc b/third_party/blink/renderer/platform/graphics/canvas_2d_layer_bridge_test.cc index 0fcb0f5..0442563f 100644 --- a/third_party/blink/renderer/platform/graphics/canvas_2d_layer_bridge_test.cc +++ b/third_party/blink/renderer/platform/graphics/canvas_2d_layer_bridge_test.cc
@@ -34,6 +34,7 @@ #include "build/build_config.h" #include "cc/layers/texture_layer.h" #include "cc/paint/paint_flags.h" +#include "cc/test/paint_image_matchers.h" #include "cc/test/skia_common.h" #include "cc/test/stub_decode_cache.h" #include "components/viz/common/resources/release_callback.h" @@ -68,6 +69,10 @@ #include <memory> +namespace blink { + +namespace { + using testing::_; using testing::AnyNumber; using testing::AtLeast; @@ -77,10 +82,6 @@ using testing::SetArgPointee; using testing::Test; -namespace blink { - -namespace { - class ImageTrackingDecodeCache : public cc::StubDecodeCache { public: ImageTrackingDecodeCache() = default; @@ -833,7 +834,7 @@ SkCanvas::kFast_SrcRectConstraint); bridge->NewImageSnapshot(); - EXPECT_EQ(image_decode_cache_.decoded_images(), images); + EXPECT_THAT(image_decode_cache_.decoded_images(), cc::ImagesAreSame(images)); } TEST_F(Canvas2DLayerBridgeTest, EnsureCCImageCacheUseWithColorConversion) { @@ -857,7 +858,7 @@ SkCanvas::kFast_SrcRectConstraint); bridge->NewImageSnapshot(); - EXPECT_EQ(image_decode_cache_.decoded_images(), images); + EXPECT_THAT(image_decode_cache_.decoded_images(), cc::ImagesAreSame(images)); } TEST_F(Canvas2DLayerBridgeTest, ImagesLockedUntilCacheLimit) {
diff --git a/third_party/blink/renderer/platform/graphics/paint/drawing_display_item.cc b/third_party/blink/renderer/platform/graphics/paint/drawing_display_item.cc index 189b2194..eabafe2 100644 --- a/third_party/blink/renderer/platform/graphics/paint/drawing_display_item.cc +++ b/third_party/blink/renderer/platform/graphics/paint/drawing_display_item.cc
@@ -68,17 +68,27 @@ auto bounds = VisualRect(); const auto& other_bounds = other.VisualRect(); - if (bounds != other_bounds) + if (bounds != other_bounds) { return false; + } const auto& record = GetPaintRecord(); const auto& other_record = other.GetPaintRecord(); - if (record == other_record) { + if (record.empty() && other_record.empty()) { return true; } - - // Sometimes the client may produce different records for the same visual - // result, which should be treated as equal. + // memcmp() may touch uninitialized gaps in PaintRecord, so skip this check + // for MSAN. +#if !defined(MEMORY_SANITIZER) + if (record.buffer().next_op_offset() == + other_record.buffer().next_op_offset() && + memcmp(&record.GetFirstOp(), &other_record.GetFirstOp(), + record.buffer().next_op_offset()) == 0) { + return true; + } +#endif + // By checking equality of bitmaps, different records for the same visual + // result are also treated as equal. return BitmapsEqual(record, other_record, bounds); }
diff --git a/third_party/blink/renderer/platform/peerconnection/rtc_peer_connection_handler_client.h b/third_party/blink/renderer/platform/peerconnection/rtc_peer_connection_handler_client.h index 61cb8f3..60f97f9 100644 --- a/third_party/blink/renderer/platform/peerconnection/rtc_peer_connection_handler_client.h +++ b/third_party/blink/renderer/platform/peerconnection/rtc_peer_connection_handler_client.h
@@ -35,6 +35,7 @@ #include "base/memory/scoped_refptr.h" #include "third_party/abseil-cpp/absl/types/optional.h" +#include "third_party/blink/renderer/platform/heap/garbage_collected.h" #include "third_party/blink/renderer/platform/platform_export.h" #include "third_party/blink/renderer/platform/wtf/text/wtf_string.h" #include "third_party/blink/renderer/platform/wtf/vector.h" @@ -55,7 +56,8 @@ webrtc::DtlsTransportInformation(webrtc::DtlsTransportState::kNew); }; -class PLATFORM_EXPORT RTCPeerConnectionHandlerClient { +class PLATFORM_EXPORT RTCPeerConnectionHandlerClient + : public GarbageCollectedMixin { public: virtual ~RTCPeerConnectionHandlerClient();
diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5 index 933364d..9b7a66a 100644 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
@@ -2661,8 +2661,10 @@ "name": "SpeculationRulesPrefetchWithSubresources", }, // Adds a "referrer_policy" key to speculation rules. See https://crbug.com/1355146 + // TODO(mcnee): This feature shipped in M111. Clean up this flag in M113. { name: "SpeculationRulesReferrerPolicyKey", + status: "stable", base_feature: "SpeculationRulesReferrerPolicyKey", origin_trial_feature_name: "SpeculationRulesReferrerPolicyKey", implied_by: ["SpeculationRulesPrefetchFuture"],
diff --git a/third_party/blink/renderer/platform/widget/frame_widget.h b/third_party/blink/renderer/platform/widget/frame_widget.h index 669b180..e941312 100644 --- a/third_party/blink/renderer/platform/widget/frame_widget.h +++ b/third_party/blink/renderer/platform/widget/frame_widget.h
@@ -90,8 +90,9 @@ virtual int GetLayerTreeId() = 0; // Return the LayerTreeSettings from the compositor. These are constant from - // the time the compositor is created. - virtual const cc::LayerTreeSettings& GetLayerTreeSettings() = 0; + // the time the compositor is created. This may return null if the widget + // does not composite. + virtual const cc::LayerTreeSettings* GetLayerTreeSettings() = 0; // Sets the state of the browser controls. (Used for URL bar animations.) virtual void UpdateBrowserControlsState(cc::BrowserControlsState constraints,
diff --git a/third_party/blink/renderer/platform/wtf/text/text_codec_icu.cc b/third_party/blink/renderer/platform/wtf/text/text_codec_icu.cc index a70b359..33ce43f 100644 --- a/third_party/blink/renderer/platform/wtf/text/text_codec_icu.cc +++ b/third_party/blink/renderer/platform/wtf/text/text_codec_icu.cc
@@ -116,6 +116,10 @@ continue; } #endif + // Avoid codecs supported by `TextCodecCJK`. + if (is_text_codec_cjk_enabled && TextCodecCJK::IsSupported(standard_name)) { + continue; + } // A number of these aliases are handled in Chrome's copy of ICU, but // Chromium can be compiled with the system ICU. @@ -144,12 +148,13 @@ } #endif - if (is_text_codec_cjk_enabled && TextCodecCJK::IsSupported(standard_name)) { - continue; + // Avoid registering codecs registered by + // `TextCodecCJK::RegisterEncodingNames`. + if (!is_text_codec_cjk_enabled || + !TextCodecCJK::IsSupported(standard_name)) { + registrar(standard_name, standard_name); } - registrar(standard_name, standard_name); - uint16_t num_aliases = ucnv_countAliases(name, &error); DCHECK(U_SUCCESS(error)); if (U_SUCCESS(error)) @@ -289,6 +294,7 @@ continue; } #endif + // Avoid codecs supported by `TextCodecCJK`. if (is_text_codec_cjk_enabled && TextCodecCJK::IsSupported(standard_name)) { continue; }
diff --git a/third_party/blink/tools/blinkpy/common/config/builders.json b/third_party/blink/tools/blinkpy/common/config/builders.json index 55367c06..003e68c 100644 --- a/third_party/blink/tools/blinkpy/common/config/builders.json +++ b/third_party/blink/tools/blinkpy/common/config/builders.json
@@ -68,19 +68,43 @@ "main": "chromium.fyi", "port_name": "linux-trusty", "specifiers": ["Trusty", "Release"], - "is_try_builder": true + "is_try_builder": true, + "steps": { + "wpt_tests_suite (with patch, experimental)": { + "uses_wptrunner": true, + "product": "chrome" + } + } }, "linux-wpt-content-shell-fyi-rel": { "main": "chromium.fyi", "port_name": "linux-trusty", "specifiers": ["Trusty", "Release"], - "is_try_builder": true + "is_try_builder": true, + "steps": { + "wpt_tests_suite (with patch, experimental)": { + "uses_wptrunner": true + }, + "wpt_tests_suite_highdpi (with patch, experimental)": { + "uses_wptrunner": true, + "flag_specific": "highdpi" + }, + "wpt_tests_suite_not_site_per_process (with patch, experimental)": { + "uses_wptrunner": true, + "flag_specific": "disable-site-isolation-trials" + } + } }, "win10-wpt-content-shell-fyi-rel": { "main": "chromium.fyi", "port_name": "win-win10.20h2", "specifiers": ["Win10.20h2", "Release"], - "is_try_builder": true + "is_try_builder": true, + "steps": { + "wpt_tests_suite (with patch, experimental)": { + "uses_wptrunner": true + } + } }, "linux-blink-rel": { "main": "tryserver.blink",
diff --git a/third_party/blink/tools/blinkpy/presubmit/audit_non_blink_usage.py b/third_party/blink/tools/blinkpy/presubmit/audit_non_blink_usage.py index 0a5559dc..0203123 100755 --- a/third_party/blink/tools/blinkpy/presubmit/audit_non_blink_usage.py +++ b/third_party/blink/tools/blinkpy/presubmit/audit_non_blink_usage.py
@@ -597,9 +597,6 @@ # nested in the blink namespace. 'internal::.+', - # TODO(crbug.com/1296161): Remove this when the CHIPS OT ends. - "net::features::kPartitionedCookiesBypassOriginTrial", - # TODO(https://crbug.com/1261328): Remove this once the Blob URL # partitioning killswitch is removed. "net::features::kSupportPartitionedBlobUrl",
diff --git a/third_party/blink/tools/blinkpy/tool/commands/rebaseline.py b/third_party/blink/tools/blinkpy/tool/commands/rebaseline.py index aa490ec5..b8919569 100644 --- a/third_party/blink/tools/blinkpy/tool/commands/rebaseline.py +++ b/third_party/blink/tools/blinkpy/tool/commands/rebaseline.py
@@ -352,7 +352,7 @@ #TODO: we should make the selection of (builder, step) deterministic for builder, step in list(release_build_steps) + list( debug_build_steps): - if not self._tool.builders.is_wpt_builder(builder): + if not self._tool.builders.uses_wptrunner(builder): # Some result db related unit tests set step to None is_legacy_step = step is None or 'blink_web_tests' in step flag_spec_option = self._tool.builders.flag_specific_option(
diff --git a/third_party/blink/tools/blinkpy/tool/commands/rebaseline_cl.py b/third_party/blink/tools/blinkpy/tool/commands/rebaseline_cl.py index 9f88bd76..4c1e8f64 100644 --- a/third_party/blink/tools/blinkpy/tool/commands/rebaseline_cl.py +++ b/third_party/blink/tools/blinkpy/tool/commands/rebaseline_cl.py
@@ -242,7 +242,7 @@ return set([ builder for builder in try_builders - if not self._tool.builders.is_wpt_builder(builder) + if not self._tool.builders.uses_wptrunner(builder) ]) @property
diff --git a/third_party/blink/tools/blinkpy/tool/commands/update_metadata.py b/third_party/blink/tools/blinkpy/tool/commands/update_metadata.py index 291e24ca..f6f596fc 100644 --- a/third_party/blink/tools/blinkpy/tool/commands/update_metadata.py +++ b/third_party/blink/tools/blinkpy/tool/commands/update_metadata.py
@@ -14,8 +14,11 @@ import optparse import re from typing import ( + Any, ClassVar, Collection, + Dict, + FrozenSet, Iterable, Iterator, List, @@ -23,6 +26,7 @@ Mapping, Optional, Set, + Tuple, TypedDict, ) @@ -41,7 +45,7 @@ path_finder.bootstrap_wpt_imports() from manifest import manifest as wptmanifest -from wptrunner import metadata, testloader, wpttest +from wptrunner import manifestupdate, metadata, testloader, wpttest from wptrunner.wptmanifest.backends import conditional _log = logging.getLogger(__name__) @@ -91,14 +95,12 @@ optparse.make_option( '--overwrite-conditions', default='fill', - metavar='{yes,no,auto,fill}', - choices=['yes', 'no', 'auto', 'fill'], - help=( - 'Specify whether to reformat conditional statuses. ' - '"auto" will reformat conditions if every platform ' - 'a test is enabled for has results. ' - '"fill" will reformat conditions using existing statuses ' - 'for platforms without results. (default: "fill")')), + metavar='{fill,yes,no}', + choices=['fill', 'yes', 'no'], + help=('Specify whether to reformat conditional statuses. ' + '"fill" will reformat conditions using existing ' + 'expectations for platforms without results. (default: ' + '"fill")')), # TODO(crbug.com/1299650): This reason should be optional, but # nargs='?' is only supported by argparse, which we should # eventually migrate to. @@ -154,6 +156,7 @@ manifests = load_and_update_manifests(self._path_finder) updater = MetadataUpdater.from_manifests( manifests, + self.generate_configs(), self._explicit_include_patterns(options, args), options.exclude, overwrite_conditions=options.overwrite_conditions, @@ -350,7 +353,7 @@ builders = self._tool.builders.all_try_builder_names() return [ Build(builder) for builder in builders - if self._tool.builders.is_wpt_builder(builder) + if self._tool.builders.uses_wptrunner(builder) ] def _explicit_include_patterns(self, options: optparse.Values, @@ -437,6 +440,56 @@ '%r is neither a regular file nor a directory' % value) setattr(parser.values, option.dest, reports) + def generate_configs(self) -> FrozenSet[metadata.RunInfo]: + """Construct run info representing all Chromium test environments. + + Each property in a config represents a value that metadata keys can be + conditioned on (e.g., 'os'). + """ + configs = set() + wptrunner_builders = { + builder + for builder in self._tool.builders.all_builder_names() + if self._tool.builders.uses_wptrunner(builder) + } + # The version group matches anything like: + # "<major>.<minor>.<patch><revision>" + version_pattern = re.compile(r'[a-z-_]*(?P<version>\d+(\.\d+){,2}\w*)') + cpu_pattern = re.compile(r'(?P<arch>x86|arm)[_-]?(?P<bits>\d+)?') + + for builder in wptrunner_builders: + port_name = self._tool.builders.port_name_for_builder_name(builder) + _, build_config, *_ = self._tool.builders.specifiers_for_builder( + builder) + port = self._tool.port_factory.get( + port_name, optparse.Values({ + 'configuration': build_config, + })) + config = port.test_configuration() + + version = config.version + version_match = version_pattern.match(config.version) + if version_match: + version = version_match['version'] + cpu_match = cpu_pattern.match(config.architecture) + + for step in self._tool.builders.step_names_for_builder(builder): + flag_specific = self._tool.builders.flag_specific_option( + builder, step) + product = self._tool.builders.product_for_build_step( + builder, step) + configs.add( + metadata.RunInfo({ + 'os': port.operating_system(), + 'version': version, + 'processor': cpu_match['arch'], + 'bits': int(cpu_match['bits'] or 32), + 'debug': config.build_type != 'release', + 'product': product, + 'flag_specific': flag_specific or '', + })) + return configs + class UpdateAbortError(Exception): """Exception raised when the update should be aborted.""" @@ -454,16 +507,16 @@ def __init__( self, test_files: TestFileMap, + configs: FrozenSet[metadata.RunInfo], primary_properties: Optional[List[str]] = None, dependent_properties: Optional[Mapping[str, str]] = None, - overwrite_conditions: Literal['yes', 'no', 'fill', - 'auto'] = 'fill', + overwrite_conditions: Literal['yes', 'no', 'fill'] = 'fill', disable_intermittent: Optional[str] = None, keep_statuses: bool = False, bug: Optional[int] = None, dry_run: bool = False, ): - self._test_files = test_files + self._configs = configs self._default_expected = _default_expected_by_type() self._primary_properties = primary_properties or [ 'debug', @@ -481,10 +534,12 @@ self._keep_statuses = keep_statuses self._bug = bug self._dry_run = dry_run + self._updater = metadata.ExpectedUpdater(test_files) @classmethod def from_manifests(cls, manifests: ManifestMap, + configs: FrozenSet[metadata.RunInfo], include: Optional[List[str]] = None, exclude: Optional[List[str]] = None, **options) -> 'MetadataUpdater': @@ -517,23 +572,23 @@ manifest)) finally: manifest.itertypes = itertypes - return cls(test_files, **options) + return cls(test_files, configs, **options) def collect_results(self, reports: Iterable[io.TextIOBase]) -> Set[str]: """Parse and record test results.""" - updater = metadata.ExpectedUpdater(self._test_files) test_ids = set() for report in reports: report = self._merge_retry_reports(map(json.loads, report)) test_ids.update(result['test'] for result in report['results']) - updater.update_from_wptreport_log(report) + self._updater.update_from_wptreport_log(report) return test_ids def _merge_retry_reports(self, retry_reports): report, results_by_test = {}, collections.defaultdict(list) for retry_report in retry_reports: - run_info = report.get('run_info', retry_report['run_info']) - if run_info != retry_report['run_info']: + retry_report['run_info'] = config = self._reduce_config( + retry_report['run_info']) + if config != report.get('run_info', config): raise ValueError('run info values should be identical ' 'across retries') report.update(retry_report) @@ -545,26 +600,109 @@ report['results'].extend(results) return report + def _reduce_config(self, config: Dict[str, Any]) -> Dict[str, Any]: + properties = frozenset(self._primary_properties).union( + *self._dependent_properties.values()) + return { + prop: value + for prop, value in config.items() if prop in properties + } + def test_files_to_update(self) -> List[metadata.TestFileData]: test_files = { test_file - for test_file in self._test_files.values() + for test_file in self._updater.id_test_map.values() if not test_file.test_path.endswith('__dir__') } return sorted(test_files, key=lambda test_file: test_file.test_path) - def _determine_if_full_update(self, - test_file: metadata.TestFileData) -> bool: - if self._overwrite_conditions == 'fill': - # TODO(crbug.com/1299650): To be implemented. - return True - elif self._overwrite_conditions == 'auto': - # TODO(crbug.com/1299650): To be implemented. - return False - elif self._overwrite_conditions == 'yes': - return True - else: - return False + def _fill_missing(self, test_file: metadata.TestFileData): + """Fill in results for any missing port. + + A filled-in status is derived by evaluating the expectation conditions + against each port's (i.e., "config's") properties. The statuses are + then "replayed" as if the results had been from a wptreport. + + The purpose of result replay is to prevent the update backend from + clobbering expectations for ports without results. + """ + for test_id, subtest_id, node in self._iterate_tests_and_subtests( + test_file): + updated_configs = self._updated_configs(test_file, test_id, + subtest_id) + # Nothing to update. This commonly occurs when every port runs + # expectedly. As an optimization, skip this file's update entirely + # instead of replaying every result. + if not updated_configs: + continue + self._updater.test_start({'test': test_id}) + missing_configs = self._enabled_configs(node) - updated_configs + for config in missing_configs: + try: + statuses = node.get('expected', config) + except KeyError: + statuses = self._default_expected[test_file.item_type, + subtest_id is not None] + if isinstance(statuses, str): + statuses = [statuses] + expected, *known_intermittent = statuses + self._updater.suite_start({'run_info': config.data}) + if subtest_id: + self._updater.test_status({ + 'test': + test_id, + 'subtest': + subtest_id, + 'status': + expected, + 'known_intermittent': + known_intermittent, + }) + else: + self._updater.test_end({ + 'test': + test_id, + 'status': + expected, + 'known_intermittent': + known_intermittent, + }) + + def _iterate_tests_and_subtests( + self, + test_file: metadata.TestFileData, + ) -> Iterator[Tuple[str, Optional[str], manifestupdate.TestNode]]: + expectations = test_file.expected( + (self._primary_properties, self._dependent_properties), + update_intermittent=(not self._disable_intermittent), + remove_intermittent=(not self._keep_statuses)) + for test in expectations.child_map.values(): + yield test.id, None, test + for subtest_id, subtest in test.subtests.items(): + yield test.id, subtest_id, subtest + + def _updated_configs( + self, + test_file: metadata.TestFileData, + test_id: str, + subtest_id: Optional[str] = None, + ) -> FrozenSet[metadata.RunInfo]: + """Find configurations a (sub)test has results for so far.""" + return frozenset( + run_info for _, run_info, _ in test_file.data[test_id][subtest_id]) + + def _enabled_configs( + self, + node: manifestupdate.TestNode, + ) -> FrozenSet[metadata.RunInfo]: + """Find which configurations a (sub)test is enabled for.""" + configs = set() + for config in self._configs: + with contextlib.suppress(KeyError): + if node.disabled(config): + continue + configs.add(config) + return configs def update(self, test_file: metadata.TestFileData) -> bool: """Update and serialize the AST of a metadata file. @@ -572,10 +710,12 @@ Returns: Whether the test file's metadata was modified. """ + if self._overwrite_conditions == 'fill': + self._fill_missing(test_file) expected = test_file.update( self._default_expected, (self._primary_properties, self._dependent_properties), - full_update=self._determine_if_full_update(test_file), + full_update=(self._overwrite_conditions != 'no'), disable_intermittent=self._disable_intermittent, # `disable_intermittent` becomes a no-op when `update_intermittent` # is set, so always force them to be opposites. See:
diff --git a/third_party/blink/tools/blinkpy/tool/commands/update_metadata_unittest.py b/third_party/blink/tools/blinkpy/tool/commands/update_metadata_unittest.py index 88fdf6de..a1a83c8 100644 --- a/third_party/blink/tools/blinkpy/tool/commands/update_metadata_unittest.py +++ b/third_party/blink/tools/blinkpy/tool/commands/update_metadata_unittest.py
@@ -24,9 +24,9 @@ path_finder.bootstrap_wpt_imports() from manifest.manifest import Manifest +from wptrunner import metadata -@patch('concurrent.futures.ThreadPoolExecutor.map', new=map) class BaseUpdateMetadataTest(LoggingTestCase): def setUp(self): super().setUp() @@ -108,6 +108,7 @@ yield stack +@patch('concurrent.futures.ThreadPoolExecutor.map', new=map) class UpdateMetadataExecuteTest(BaseUpdateMetadataTest): """Verify the tool's frontend and build infrastructure interactions.""" @@ -118,11 +119,20 @@ 'port_name': 'test-linux-trusty', 'specifiers': ['Trusty', 'Release'], 'is_try_builder': True, + 'steps': { + 'wpt_tests_suite (with patch)': {}, + 'wpt_tests_suite_highdpi (with patch)': { + 'flag_specific': 'highdpi', + }, + }, }, 'test-mac-wpt-rel': { - 'port_name': 'test-mac-mac12', - 'specifiers': ['Mac12', 'Release'], + 'port_name': 'test-mac-mac10.11', + 'specifiers': ['Mac10.11', 'Debug'], 'is_try_builder': True, + 'steps': { + 'wpt_tests_suite (with patch)': {}, + }, }, 'Test Linux Tests (wpt)': { 'port_name': 'test-linux-trusty', @@ -341,7 +351,7 @@ "INFO: Updated 'crash.html'\n", ]) self.assertEqual(self.tool.filesystem.files, files_before) - self.assertEqual(self.tool.executive.calls, [['luci-auth', 'token']]) + self.assertIn(['luci-auth', 'token'], self.tool.executive.calls) self.assertEqual(self.tool.git().added_paths, set()) def test_execute_only_changed_tests(self): @@ -488,6 +498,28 @@ 'infrastructure', 'metadata', 'testdriver.html.ini'))) + def test_generate_configs(self): + linux, linux_highdpi, mac = sorted( + self.command.generate_configs(), + key=lambda config: (config['os'], config['flag_specific'])) + + self.assertEqual(linux['os'], 'linux') + self.assertEqual(linux['version'], 'trusty') + self.assertEqual(linux['processor'], 'x86') + self.assertEqual(linux['bits'], 64) + self.assertFalse(linux['debug']) + self.assertEqual(linux['flag_specific'], '') + + self.assertEqual(linux_highdpi['os'], 'linux') + self.assertEqual(linux_highdpi['flag_specific'], 'highdpi') + + self.assertEqual(mac['os'], 'mac') + self.assertEqual(mac['version'], '10.11') + self.assertEqual(mac['processor'], 'arm') + self.assertEqual(mac['bits'], 64) + self.assertTrue(mac['debug']) + self.assertEqual(mac['flag_specific'], '') + class UpdateMetadataASTSerializationTest(BaseUpdateMetadataTest): """Verify the metadata ASTs are manipulated and written correctly. @@ -507,14 +539,13 @@ } with self._patch_builtins(): manifests = load_and_update_manifests(self.finder) - updater = MetadataUpdater.from_manifests(manifests, **options) for report in reports: report['run_info'] = { 'os': 'mac', 'version': '12', 'processor': 'arm', 'bits': 64, - 'flag_specific': None, + 'flag_specific': '', 'product': 'chrome', 'debug': False, **(report.get('run_info') or {}), @@ -523,8 +554,13 @@ **result_defaults, **result } for result in report['results']] - buf = io.StringIO(json.dumps(report)) - updater.collect_results([buf]) + + configs = frozenset( + metadata.RunInfo(report['run_info']) for report in reports) + updater = MetadataUpdater.from_manifests(manifests, configs, + **options) + updater.collect_results( + io.StringIO(json.dumps(report)) for report in reports) for test_file in updater.test_files_to_update(): updater.update(test_file) @@ -940,6 +976,64 @@ """), }) + def test_condition_keep(self): + """Updating one platform's results should preserve those of others. + + This test exercises the `--overwrite-conditions=fill` option (the + default). + """ + self.write_contents( + 'external/wpt/variant.html.ini', """\ + [variant.html?foo=baz] + [subtest] + expected: + if os == "win": PASS + FAIL + """) + self.update( + { + 'run_info': { + 'os': 'win' + }, + 'results': [{ + 'test': + '/variant.html?foo=baz', + 'status': + 'TIMEOUT', + 'expected': + 'OK', + 'subtests': [{ + 'name': 'subtest', + 'status': 'TIMEOUT', + 'expected': 'PASS', + }], + }], + }, { + 'run_info': { + 'os': 'mac' + }, + 'results': [], + }) + # Without result replay, the `FAIL` expectation is erroneously deleted, + # which will give either: + # expected: TIMEOUT + # + # with a full update alone (i.e., `--overwrite-conditions=yes`), or + # expected: + # if os == "win": TIMEOUT + # + # without a full update (i.e., `--overwrite-conditions=no`). + self.assert_contents( + 'external/wpt/variant.html.ini', """\ + [variant.html?foo=baz] + expected: + if os == "win": TIMEOUT + [subtest] + expected: + if os == "win": TIMEOUT + FAIL + """) + class UpdateMetadataArgumentParsingTest(unittest.TestCase): def setUp(self):
diff --git a/third_party/blink/tools/blinkpy/w3c/test_importer.py b/third_party/blink/tools/blinkpy/w3c/test_importer.py index da06ffc..39582296 100644 --- a/third_party/blink/tools/blinkpy/w3c/test_importer.py +++ b/third_party/blink/tools/blinkpy/w3c/test_importer.py
@@ -253,7 +253,7 @@ wptrunner_builders = { builder for builder in try_bots - if self.host.builders.is_wpt_builder(builder) + if self.host.builders.uses_wptrunner(builder) } rebaselining_builders = try_bots - wptrunner_builders if rebaselining_builders:
diff --git a/third_party/blink/tools/blinkpy/w3c/test_importer_unittest.py b/third_party/blink/tools/blinkpy/w3c/test_importer_unittest.py index f9dda16d..f7e6bde 100644 --- a/third_party/blink/tools/blinkpy/w3c/test_importer_unittest.py +++ b/third_party/blink/tools/blinkpy/w3c/test_importer_unittest.py
@@ -51,6 +51,11 @@ 'port_name': 'linux-trusty', 'specifiers': ['Trusty', 'Release'], 'is_try_builder': True, + 'steps': { + 'wpt_tests_suite (with patch)': { + 'uses_wptrunner': True, + }, + } }, 'CI Builder D': { 'port_name': 'linux-trusty',
diff --git a/third_party/blink/tools/blinkpy/web_tests/builder_list.py b/third_party/blink/tools/blinkpy/web_tests/builder_list.py index c4e8871..1f60d58 100644 --- a/third_party/blink/tools/blinkpy/web_tests/builder_list.py +++ b/third_party/blink/tools/blinkpy/web_tests/builder_list.py
@@ -203,8 +203,14 @@ def is_try_server_builder(self, builder_name): return self._builders[builder_name].get('is_try_builder', False) - def is_wpt_builder(self, builder_name): - return 'wpt' in builder_name + def uses_wptrunner(self, builder_name: str) -> bool: + return any( + step.get('uses_wptrunner', 'wpt_tests_suite' in step_name) + for step_name, step in self._steps(builder_name).items()) + + def product_for_build_step(self, builder_name: str, step_name: str) -> str: + steps = self._steps(builder_name) + return steps[step_name].get('product', 'content_shell') def flag_specific_option(self, builder_name, step_name): steps = self._steps(builder_name)
diff --git a/third_party/blink/tools/blinkpy/web_tests/builder_list_unittest.py b/third_party/blink/tools/blinkpy/web_tests/builder_list_unittest.py index b0484340..1ee3338 100644 --- a/third_party/blink/tools/blinkpy/web_tests/builder_list_unittest.py +++ b/third_party/blink/tools/blinkpy/web_tests/builder_list_unittest.py
@@ -39,7 +39,10 @@ 'port_name': 'port-c', 'specifiers': ['C', 'Release'], 'steps': { - "wpt_tests_suite (with patch)": {}, + 'wpt_tests_suite (with patch)': {}, + 'wpt_tests_suite_chrome (with patch)': { + 'product': 'chrome', + }, }, 'is_try_builder': True, }, @@ -296,7 +299,18 @@ builders.version_specifier_for_port_name('port-b')) self.assertIsNone(builders.version_specifier_for_port_name('port-x')) - def test_is_wpt_builder(self): + def test_uses_wptrunner(self): builders = self.sample_builder_list() - self.assertFalse(builders.is_wpt_builder('Blink A')) - self.assertTrue(builders.is_wpt_builder('some-wpt-bot')) + self.assertFalse(builders.uses_wptrunner('Blink A')) + self.assertTrue(builders.uses_wptrunner('some-wpt-bot')) + + def test_product_for_build_step(self): + builders = self.sample_builder_list() + self.assertEqual( + builders.product_for_build_step('some-wpt-bot', + 'wpt_tests_suite (with patch)'), + 'content_shell') + self.assertEqual( + builders.product_for_build_step( + 'some-wpt-bot', 'wpt_tests_suite_chrome (with patch)'), + 'chrome')
diff --git a/third_party/blink/tools/blinkpy/web_tests/port/base.py b/third_party/blink/tools/blinkpy/web_tests/port/base.py index a887be6..a88617c 100644 --- a/third_party/blink/tools/blinkpy/web_tests/port/base.py +++ b/third_party/blink/tools/blinkpy/web_tests/port/base.py
@@ -156,7 +156,7 @@ ('mac12', 'x86_64'), ('mac12-arm64', 'arm64'), ('win10.20h2', 'x86'), - ('win11', 'x64'), + ('win11', 'x86_64'), ('trusty', 'x86_64'), ('fuchsia', 'x86_64'), )
diff --git a/third_party/blink/tools/blinkpy/web_tests/port/test.py b/third_party/blink/tools/blinkpy/web_tests/port/test.py index 29cbbaa..aef7d46 100644 --- a/third_party/blink/tools/blinkpy/web_tests/port/test.py +++ b/third_party/blink/tools/blinkpy/web_tests/port/test.py
@@ -700,6 +700,8 @@ if self._operating_system == 'linux': self._architecture = 'x86_64' + elif self._operating_system == 'mac': + self._architecture = 'arm64' self.all_systems = (('mac10.10', 'x86'), ('mac10.11', 'x86'), ('win7', 'x86'), ('win10', 'x86'),
diff --git a/third_party/blink/tools/blinkpy/web_tests/views/printing_unittest.py b/third_party/blink/tools/blinkpy/web_tests/views/printing_unittest.py index d8ae62a..901277ca 100644 --- a/third_party/blink/tools/blinkpy/web_tests/views/printing_unittest.py +++ b/third_party/blink/tools/blinkpy/web_tests/views/printing_unittest.py
@@ -127,7 +127,7 @@ printer._options.seed = 1234 printer.print_config(self._port) self.assertIn("Using port 'test-mac-mac10.10'", err.getvalue()) - self.assertIn('Test configuration: <mac10.10, x86, release>', + self.assertIn('Test configuration: <mac10.10, arm64, release>', err.getvalue()) self.assertIn('View the test results at file:///tmp', err.getvalue()) self.assertIn(
diff --git a/third_party/blink/tools/run_wpt_tests.py b/third_party/blink/tools/run_wpt_tests.py index 949eda10..eee5535 100755 --- a/third_party/blink/tools/run_wpt_tests.py +++ b/third_party/blink/tools/run_wpt_tests.py
@@ -412,7 +412,7 @@ process_return = self.process_and_upload_results() if (process_return != exit_codes.INTERRUPTED_EXIT_STATUS - and self.options.show_results): + and self.options.show_results and self.has_regressions()): self.show_results_in_browser() def show_results_in_browser(self): @@ -421,6 +421,15 @@ 'results.html') self.port.show_results_html_file(results_file) + def has_regressions(self): + full_results_file = self.fs.join(self.fs.dirname(self.wpt_output), + self.layout_test_results_subdir, + 'full_results.json') + with self.fs.open_text_file_for_reading( + full_results_file) as full_results: + results = json.load(full_results) + return results["num_regressions"] > 0 + def clean_up_after_test_run(self): if self._include_filename: self.fs.remove(self._include_filename)
diff --git a/third_party/blink/web_tests/FlagExpectations/disable-layout-ng b/third_party/blink/web_tests/FlagExpectations/disable-layout-ng deleted file mode 100644 index 3c2d58d..0000000 --- a/third_party/blink/web_tests/FlagExpectations/disable-layout-ng +++ /dev/null
@@ -1,2298 +0,0 @@ -# tags: [ Android Fuchsia Linux Mac Mac10.13 Mac11 Mac12 Win Win10.20h2 Win11 ] -# tags: [ Release Debug ] -# results: [ Timeout Crash Pass Failure Slow Skip ] - -# These expectations are used when LayoutNG is disabled. We test this -# configuration on trybot linux_layout_tests_layout_ng_disabled. -# Though LayoutNG has been enabled in M76, we still keep running web tests with -# LayoutNG disabled because we still use legacy layout for editing, multicol, -# etc. Though we have tests for editing and multicol, the tests don't fully -# cover all layout code paths, so we need to run all web tests to ensure legacy -# layout still fully works. - -# Tests that fail in legacy but pass in NG - -# ====== New tests from wpt-importer added here ====== -crbug.com/626703 external/wpt/webcodecs/videoFrame-serialization.crossAgentCluster.https.html [ Timeout ] -crbug.com/626703 virtual/idna-2008/external/wpt/url/url-setters-a-area.window.html?include=mailto [ Crash Failure ] -crbug.com/626703 virtual/idna-2008/external/wpt/url/a-element-xhtml.xhtml?exclude=(file|javascript|mailto) [ Crash Failure ] -crbug.com/626703 external/wpt/css/css-text/bidi/bidi-tab-001.html [ Failure ] -crbug.com/626703 virtual/plz-dedicated-worker/external/wpt/resource-timing/response-status-code.html [ Timeout ] -crbug.com/626703 virtual/force-renderer-accessibility/external/wpt/accessibility/crashtests/bdo-table-cell.html [ Crash ] -crbug.com/626703 external/wpt/url/a-element.html?include=mailto [ Crash Failure ] -crbug.com/626703 external/wpt/url/url-setters-a-area.window.html?exclude=(file|javascript|mailto) [ Crash Failure ] -crbug.com/626703 virtual/idna-2008/external/wpt/url/url-constructor.any.worker.html?exclude=(file|javascript|mailto) [ Crash Failure ] -crbug.com/626703 virtual/idna-2008/external/wpt/url/url-setters.any.html?include=mailto [ Crash Failure ] -crbug.com/626703 external/wpt/css/selectors/invalidation/media-pseudo-classes-in-has.html [ Timeout ] -crbug.com/626703 external/wpt/fullscreen/api/document-exit-fullscreen-nested-in-iframe.html [ Timeout ] -crbug.com/626703 external/wpt/css/css-sizing/aspect-ratio/replaced-element-039.html [ Failure ] -crbug.com/626703 external/wpt/css/css-sizing/aspect-ratio/replaced-element-040.html [ Failure ] -crbug.com/626703 external/wpt/dom/events/scrolling/scrollend-event-fired-to-element-with-overscroll-behavior.html [ Timeout ] -crbug.com/626703 external/wpt/geolocation-API/enabled-by-permission-policy-attribute-redirect-on-load.https.sub.html [ Timeout ] -crbug.com/626703 external/wpt/geolocation-API/enabled-by-permission-policy-attribute.https.sub.html [ Timeout ] -crbug.com/626703 external/wpt/geolocation-API/enabled-by-permissions-policy.https.sub.html [ Timeout ] -crbug.com/626703 external/wpt/geolocation-API/enabled-on-self-origin-by-permissions-policy.https.sub.html [ Timeout ] -crbug.com/626703 external/wpt/webxr/xr_viewport_scale.https.html [ Timeout ] -crbug.com/626703 external/wpt/css/css-multicol/relative-child-overflowing-container.html [ Failure ] -crbug.com/626703 external/wpt/html/user-activation/consumption-crossorigin.sub.tentative.html [ Failure Timeout ] -crbug.com/626703 external/wpt/screen-orientation/active-lock.html [ Timeout ] -crbug.com/626703 external/wpt/css/selectors/media/media-loading-state.html [ Timeout ] -crbug.com/626703 external/wpt/css/selectors/media/media-playback-state.html [ Timeout ] -crbug.com/626703 external/wpt/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-suspend-resume-close.html [ Timeout ] -crbug.com/626703 external/wpt/editing/crashtests/inserthorizontalrule-in-textarea-in-editor-and-undo-on-error-events.html [ Timeout ] -crbug.com/626703 external/wpt/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/same-document-traversal-same-document-traversal-hashchange.html [ Timeout ] -crbug.com/626703 external/wpt/html/browsers/browsing-the-web/overlapping-navigations-and-traversals/same-document-traversal-same-document-traversal-pushstate.html [ Timeout ] -crbug.com/626703 external/wpt/screen-orientation/non-fully-active.html [ Timeout ] -crbug.com/626703 external/wpt/fetch/api/abort/serviceworker-intercepted.https.html [ Timeout ] -crbug.com/626703 virtual/orb-v01/external/wpt/fetch/api/abort/serviceworker-intercepted.https.html [ Timeout ] -crbug.com/626703 virtual/plz-dedicated-worker/external/wpt/fetch/api/abort/serviceworker-intercepted.https.html [ Timeout ] -crbug.com/626703 external/wpt/encoding/unsupported-labels.window.html [ Failure Timeout ] -crbug.com/626703 external/wpt/css/css-flexbox/flexbox-definite-cross-size-constrained-percentage.html [ Failure ] -crbug.com/626703 external/wpt/css/css-contain/content-visibility/content-visibility-fieldset-size.html [ Failure ] -crbug.com/626703 virtual/offsetparent-old-behavior/external/wpt/css/css-contain/content-visibility/content-visibility-fieldset-size.html [ Failure ] -crbug.com/626703 external/wpt/page-visibility/visibility-state-entry.tentative.html [ Timeout ] -crbug.com/626703 external/wpt/css/css-sizing/svg-intrinsic-size-001.html [ Failure ] -crbug.com/626703 external/wpt/css/css-sizing/svg-intrinsic-size-003.html [ Failure ] -crbug.com/626703 external/wpt/dom/nodes/NodeList-static-length-getter-tampered-indexOf-1.html [ Timeout ] -crbug.com/626703 external/wpt/dom/nodes/NodeList-static-length-getter-tampered-indexOf-2.html [ Timeout ] -crbug.com/626703 external/wpt/dom/nodes/NodeList-static-length-getter-tampered-indexOf-3.html [ Timeout ] -crbug.com/626703 external/wpt/html/semantics/embedded-content/the-img-element/image-loading-lazy-zero-intersection-area.html [ Timeout ] -crbug.com/626703 external/wpt/html/browsers/windows/clear-window-name.https.html [ Timeout ] -crbug.com/626703 external/wpt/css/css-pseudo/highlight-currentcolor-root-explicit-default-002.html [ Failure ] -crbug.com/626703 virtual/css-highlight-inheritance/external/wpt/css/css-pseudo/highlight-currentcolor-root-explicit-default-002.html [ Failure ] -crbug.com/626703 external/wpt/css/css-sizing/aspect-ratio/block-aspect-ratio-050.html [ Failure ] -crbug.com/626703 external/wpt/css/css-sizing/aspect-ratio/grid-aspect-ratio-040.html [ Crash ] -crbug.com/626703 external/wpt/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-028.html [ Crash ] -crbug.com/626703 external/wpt/css/cssom/caretPositionFromPoint-with-transformation.html [ Timeout ] -crbug.com/626703 external/wpt/css/css-sizing/aspect-ratio/block-aspect-ratio-046.html [ Failure ] -crbug.com/626703 external/wpt/css/css-sizing/aspect-ratio/block-aspect-ratio-048.html [ Failure ] -crbug.com/626703 external/wpt/css/css-display/display-flow-root-002.html [ Failure ] -crbug.com/626703 external/wpt/css/css-sizing/aspect-ratio/block-aspect-ratio-040.html [ Failure ] -crbug.com/626703 external/wpt/service-workers/cache-storage/crashtests/cache-response-clone.https.html [ Timeout ] -crbug.com/626703 virtual/plz-dedicated-worker/external/wpt/service-workers/cache-storage/crashtests/cache-response-clone.https.html [ Timeout ] -crbug.com/626703 external/wpt/css/css-sizing/aspect-ratio/floats-aspect-ratio-001.html [ Failure ] -crbug.com/626703 external/wpt/content-security-policy/wasm-unsafe-eval/postMessage-wasm-module.html [ Timeout ] -crbug.com/626703 external/wpt/css/css-writing-modes/abs-pos-border-offset-001.html [ Failure ] -crbug.com/626703 external/wpt/css/css-writing-modes/abs-pos-border-offset-002.html [ Failure ] -crbug.com/626703 external/wpt/css/css-writing-modes/abs-pos-vlr-border-001.html [ Failure ] -crbug.com/626703 external/wpt/css/CSS2/floats/floats-wrap-bfc-with-margin-001.html [ Failure ] -crbug.com/626703 external/wpt/css/CSS2/floats/floats-wrap-bfc-with-margin-001a.tentative.html [ Failure ] -crbug.com/626703 external/wpt/css/CSS2/floats/floats-wrap-bfc-with-margin-002.tentative.html [ Failure ] -crbug.com/626703 external/wpt/fetch/metadata/generated/css-images.https.sub.tentative.html [ Timeout ] -crbug.com/626703 external/wpt/fetch/metadata/generated/css-images.sub.tentative.html [ Timeout ] -crbug.com/626703 external/wpt/fetch/metadata/generated/element-link-icon.https.sub.html [ Timeout ] -crbug.com/626703 external/wpt/fetch/metadata/generated/element-link-icon.sub.html [ Timeout ] -crbug.com/626703 external/wpt/fetch/metadata/generated/element-video-poster.https.sub.html [ Timeout ] -crbug.com/626703 virtual/plz-dedicated-worker/external/wpt/fetch/metadata/generated/css-images.https.sub.tentative.html [ Timeout ] -crbug.com/626703 virtual/plz-dedicated-worker/external/wpt/fetch/metadata/generated/css-images.sub.tentative.html [ Timeout ] -crbug.com/626703 virtual/plz-dedicated-worker/external/wpt/fetch/metadata/generated/element-link-icon.https.sub.html [ Timeout ] -crbug.com/626703 virtual/plz-dedicated-worker/external/wpt/fetch/metadata/generated/element-link-icon.sub.html [ Timeout ] -crbug.com/626703 virtual/plz-dedicated-worker/external/wpt/fetch/metadata/generated/element-video-poster.https.sub.html [ Timeout ] -crbug.com/626703 external/wpt/css/css-writing-modes/abs-pos-replaced-vrl-001.html [ Failure ] -crbug.com/626703 external/wpt/css/css-sizing/aspect-ratio/flex-aspect-ratio-039.html [ Failure ] -crbug.com/626703 external/wpt/css/css-multicol/column-fill-balance-orthog-block-001.html [ Failure ] -crbug.com/626703 wpt_internal/prerender/unload-on-prerender-cross-origin-subframe-navigation.html [ Timeout ] -crbug.com/626703 wpt_internal/prerender/unload-on-prerender-main-frame-navigation.html [ Timeout ] -crbug.com/626703 wpt_internal/prerender/unload-on-prerender-remove-subframe.html [ Timeout ] -crbug.com/626703 wpt_internal/prerender/unload-on-prerender-same-origin-subframe-navigation.html [ Timeout ] -crbug.com/626703 external/wpt/geolocation-API/getCurrentPosition_permission_allow.https.html [ Timeout ] -crbug.com/626703 external/wpt/css/css-grid/abspos/positioned-grid-items-025.html [ Failure ] -crbug.com/626703 external/wpt/wasm/webapi/esm-integration/exported-names.tentative.html [ Timeout ] -crbug.com/626703 external/wpt/wasm/webapi/esm-integration/js-wasm-cycle.tentative.html [ Timeout ] -crbug.com/626703 external/wpt/wasm/webapi/esm-integration/wasm-import-wasm-export.tentative.html [ Timeout ] -crbug.com/626703 external/wpt/wasm/webapi/esm-integration/wasm-js-cycle.tentative.html [ Timeout ] -crbug.com/626703 external/wpt/wasm/webapi/esm-integration/worker-import.tentative.html [ Timeout ] -crbug.com/626703 external/wpt/wasm/webapi/esm-integration/worker.tentative.html [ Timeout ] -crbug.com/626703 external/wpt/speculation-rules/prerender/restrictions.html [ Failure Timeout ] -crbug.com/626703 external/wpt/css/css-flexbox/abspos/flex-abspos-staticpos-margin-003.html [ Failure ] -crbug.com/626703 external/wpt/css/css-overflow/scrollbar-gutter-vertical-lr-002.html [ Failure ] -crbug.com/626703 external/wpt/css/css-writing-modes/inline-box-orthogonal-child-with-margins.html [ Failure ] -crbug.com/626703 external/wpt/selection/textcontrols/onselectionchange-content-attribute.html [ Timeout ] -crbug.com/626703 external/wpt/infrastructure/channels/test_call.html [ Timeout ] -crbug.com/626703 external/wpt/infrastructure/channels/test_postMessage.html [ Timeout ] -crbug.com/626703 external/wpt/infrastructure/channels/test_serialize.html [ Timeout ] -crbug.com/626703 external/wpt/css/css-flexbox/percentage-heights-019.html [ Failure ] -crbug.com/626703 external/wpt/css/css-grid/grid-items/aspect-ratio-005.html [ Failure ] -crbug.com/626703 external/wpt/media-capabilities/encodingInfo.any.worker.html [ Crash ] -crbug.com/626703 external/wpt/css/css-sizing/dynamic-change-inline-size-002.html [ Failure ] -crbug.com/626703 external/wpt/css/css-flexbox/flex-basis-intrinsics-001.html [ Failure ] -crbug.com/626703 external/wpt/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-003.html [ Failure ] -crbug.com/626703 external/wpt/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-004.html [ Failure ] -crbug.com/626703 external/wpt/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-007.html [ Failure ] -crbug.com/626703 external/wpt/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-008.html [ Failure ] - -# accessibility/ -crbug.com/1159730 accessibility/inline-text-box-next-on-line.html [ Failure ] -crbug.com/591099 accessibility/listitem-presentation-inherited.html [ Failure ] -crbug.com/591099 accessibility/presentation-owned-elements.html [ Failure ] -crbug.com/591099 accessibility/role-attribute.html [ Failure ] -# Broken by CL:4027071: Stable ids for AXObjects with DOM nodes. -# However, this edge case only crashes in the old layout code, so leaving as expectations: -accessibility/details-summary-crash.html [ Crash ] - -### editing/pasteboard/ -crbug.com/591099 editing/pasteboard/mathml-sanitizer-bypass.html [ Failure ] - -### editing/selection/select-line-up-down.html -crbug.com/591099 editing/selection/select-line-up-down.html [ Failure ] - -### external/wpt/css/CSS2/floats/ -crbug.com/591099 external/wpt/css/CSS2/floats/float-nowrap-3.html [ Failure ] -crbug.com/591099 external/wpt/css/CSS2/floats/floats-line-wrap-shifted-001.html [ Failure ] -crbug.com/591099 external/wpt/css/CSS2/floats/floats-wrap-bfc-with-margin-003.tentative.html [ Failure ] -crbug.com/591099 external/wpt/css/CSS2/floats/floats-wrap-bfc-with-margin-004.html [ Failure ] -crbug.com/591099 external/wpt/css/CSS2/floats/floats-wrap-bfc-with-margin-005.html [ Failure ] -crbug.com/591099 external/wpt/css/CSS2/floats/overhanging-float-paint-order.html [ Failure ] -crbug.com/591099 external/wpt/css/CSS2/floats/zero-width-floats-positioning.tentative.html [ Failure ] - -### external/wpt/css/CSS2/floats-clear/ -crbug.com/591099 external/wpt/css/CSS2/floats-clear/no-clearance-adjoining-opposite-float.html [ Failure ] -crbug.com/591099 external/wpt/css/CSS2/floats-clear/no-clearance-due-to-large-margin-after-left-right.html [ Failure ] - -### external/wpt/css/CSS2/linebox/ -crbug.com/591099 external/wpt/css/CSS2/linebox/anonymous-inline-inherit-001.html [ Failure ] - -### external/wpt/css/CSS2/normal-flow/ -crbug.com/591099 external/wpt/css/CSS2/normal-flow/block-in-inline-empty-001.xht [ Failure ] -crbug.com/591099 external/wpt/css/CSS2/normal-flow/block-in-inline-empty-004.xht [ Failure ] -crbug.com/591099 external/wpt/css/CSS2/normal-flow/block-in-inline-insert-001e.xht [ Failure ] -crbug.com/591099 external/wpt/css/CSS2/normal-flow/block-in-inline-insert-001h.xht [ Failure ] -crbug.com/591099 external/wpt/css/CSS2/normal-flow/block-in-inline-insert-002e.xht [ Failure ] -crbug.com/591099 external/wpt/css/CSS2/normal-flow/block-in-inline-nested-002.xht [ Failure ] -crbug.com/591099 external/wpt/css/CSS2/normal-flow/block-in-inline-remove-006.xht [ Failure ] -crbug.com/591099 external/wpt/css/CSS2/normal-flow/max-height-separates-margin.html [ Failure ] -crbug.com/591099 external/wpt/css/CSS2/normal-flow/min-height-separates-margin.html [ Failure ] - -### external/wpt/css/CSS2/text/ -crbug.com/591099 external/wpt/css/CSS2/text/white-space-mixed-003.xht [ Failure ] - -### external/wpt/css/css-backgrounds/ -crbug.com/1194738 external/wpt/css/css-backgrounds/linear-gradient-currentcolor-first-line.html [ Failure ] - -### external/wpt/css/css-break/ -crbug.com/829028 external/wpt/css/css-break/abspos-in-opacity-001.html [ Failure ] -crbug.com/829028 external/wpt/css/css-break/avoid-border-break.html [ Failure ] -crbug.com/829028 external/wpt/css/css-break/borders-000.html [ Failure ] -crbug.com/829028 external/wpt/css/css-break/borders-001.html [ Failure ] -crbug.com/829028 external/wpt/css/css-break/borders-002.html [ Failure ] -crbug.com/829028 external/wpt/css/css-break/borders-003.html [ Failure ] -crbug.com/829028 external/wpt/css/css-break/borders-004.html [ Failure ] -crbug.com/829028 external/wpt/css/css-break/borders-005.html [ Failure ] -crbug.com/269061 external/wpt/css/css-break/box-shadow-001.html [ Failure ] -crbug.com/829028 external/wpt/css/css-break/break-at-end-container-edge-000.html [ Failure ] -crbug.com/829028 external/wpt/css/css-break/break-at-end-container-edge-001.html [ Failure ] -crbug.com/829028 external/wpt/css/css-break/break-at-end-container-edge-002.html [ Failure ] -crbug.com/829028 external/wpt/css/css-break/break-at-end-container-edge-004.html [ Failure ] -crbug.com/829028 external/wpt/css/css-break/break-between-avoid-000.html [ Failure ] -crbug.com/829028 external/wpt/css/css-break/break-between-avoid-001.html [ Failure ] -crbug.com/829028 external/wpt/css/css-break/break-between-avoid-003.html [ Failure ] -crbug.com/829028 external/wpt/css/css-break/break-between-avoid-004.html [ Failure ] -crbug.com/829028 external/wpt/css/css-break/break-between-avoid-007.html [ Failure ] -crbug.com/829028 external/wpt/css/css-break/break-between-avoid-009.html [ Failure ] -crbug.com/829028 external/wpt/css/css-break/break-between-avoid-010.html [ Failure ] -crbug.com/829028 external/wpt/css/css-break/break-between-avoid-011.html [ Failure ] -crbug.com/829028 external/wpt/css/css-break/break-between-avoid-012.html [ Failure ] -crbug.com/829028 external/wpt/css/css-break/break-between-avoid-013.html [ Failure ] -crbug.com/829028 external/wpt/css/css-break/break-between-avoid-014.html [ Failure ] -crbug.com/726125 external/wpt/css/css-break/chrome-bug-1289999-crash.https.html [ Skip ] -crbug.com/829028 external/wpt/css/css-break/clearance-parallel-flow-001.html [ Failure ] -crbug.com/829028 external/wpt/css/css-break/clearance-parallel-flow-002.html [ Failure ] -crbug.com/829028 external/wpt/css/css-break/fieldset-003.html [ Failure ] -crbug.com/829028 external/wpt/css/css-break/fieldset-004.html [ Failure ] -crbug.com/829028 external/wpt/css/css-break/fieldset-005.html [ Failure ] -crbug.com/829028 external/wpt/css/css-break/fieldset-006.html [ Failure ] -crbug.com/660611 external/wpt/css/css-break/flexbox/flex-container-fragmentation-003.html [ Failure ] -crbug.com/660611 external/wpt/css/css-break/flexbox/flex-container-fragmentation-004.html [ Failure ] -crbug.com/660611 external/wpt/css/css-break/flexbox/flex-container-fragmentation-007.tentative.html [ Failure ] -crbug.com/660611 external/wpt/css/css-break/flexbox/multi-line-column-flex-fragmentation-015.html [ Failure ] -crbug.com/660611 external/wpt/css/css-break/flexbox/multi-line-column-flex-fragmentation-016.html [ Failure ] -crbug.com/660611 external/wpt/css/css-break/flexbox/multi-line-column-flex-fragmentation-017.html [ Failure ] -crbug.com/660611 external/wpt/css/css-break/flexbox/multi-line-column-flex-fragmentation-018.html [ Failure ] -crbug.com/660611 external/wpt/css/css-break/flexbox/multi-line-column-flex-fragmentation-019.html [ Failure ] -crbug.com/660611 external/wpt/css/css-break/flexbox/multi-line-column-flex-fragmentation-020.html [ Failure ] -crbug.com/660611 external/wpt/css/css-break/flexbox/multi-line-column-flex-fragmentation-021.html [ Failure ] -crbug.com/660611 external/wpt/css/css-break/flexbox/multi-line-column-flex-fragmentation-022.html [ Failure ] -crbug.com/660611 external/wpt/css/css-break/flexbox/multi-line-column-flex-fragmentation-023.html [ Failure ] -crbug.com/660611 external/wpt/css/css-break/flexbox/multi-line-column-flex-fragmentation-024.html [ Failure ] -crbug.com/660611 external/wpt/css/css-break/flexbox/multi-line-column-flex-fragmentation-025.html [ Failure ] -crbug.com/660611 external/wpt/css/css-break/flexbox/multi-line-column-flex-fragmentation-026.html [ Failure ] -crbug.com/660611 external/wpt/css/css-break/flexbox/multi-line-column-flex-fragmentation-031.html [ Failure ] -crbug.com/660611 external/wpt/css/css-break/flexbox/multi-line-column-flex-fragmentation-032.html [ Failure ] -crbug.com/660611 external/wpt/css/css-break/flexbox/multi-line-column-flex-fragmentation-033.html [ Failure ] -crbug.com/660611 external/wpt/css/css-break/flexbox/multi-line-column-flex-fragmentation-034.html [ Failure ] -crbug.com/660611 external/wpt/css/css-break/flexbox/multi-line-column-flex-fragmentation-035.html [ Failure ] -crbug.com/660611 external/wpt/css/css-break/flexbox/multi-line-column-flex-fragmentation-036.tentative.html [ Failure ] -crbug.com/660611 external/wpt/css/css-break/flexbox/multi-line-column-flex-fragmentation-037.html [ Failure ] -crbug.com/660611 external/wpt/css/css-break/flexbox/multi-line-column-flex-fragmentation-039.html [ Failure ] -crbug.com/660611 external/wpt/css/css-break/flexbox/multi-line-column-flex-fragmentation-040.html [ Failure ] -crbug.com/660611 external/wpt/css/css-break/flexbox/multi-line-column-flex-fragmentation-047.html [ Failure ] -crbug.com/660611 external/wpt/css/css-break/flexbox/multi-line-column-flex-fragmentation-048.html [ Failure ] -crbug.com/660611 external/wpt/css/css-break/flexbox/multi-line-column-flex-fragmentation-049.html [ Failure ] -crbug.com/660611 external/wpt/css/css-break/flexbox/multi-line-column-flex-fragmentation-051.html [ Failure ] -crbug.com/660611 external/wpt/css/css-break/flexbox/multi-line-column-flex-fragmentation-052.html [ Failure ] -crbug.com/660611 external/wpt/css/css-break/flexbox/multi-line-column-flex-fragmentation-053.html [ Failure ] -crbug.com/660611 external/wpt/css/css-break/flexbox/multi-line-row-flex-fragmentation-007.html [ Failure ] -crbug.com/660611 external/wpt/css/css-break/flexbox/multi-line-row-flex-fragmentation-008.html [ Failure ] -crbug.com/660611 external/wpt/css/css-break/flexbox/multi-line-row-flex-fragmentation-010.html [ Failure ] -crbug.com/660611 external/wpt/css/css-break/flexbox/multi-line-row-flex-fragmentation-012.html [ Failure ] -crbug.com/660611 external/wpt/css/css-break/flexbox/multi-line-row-flex-fragmentation-014.html [ Failure ] -crbug.com/660611 external/wpt/css/css-break/flexbox/multi-line-row-flex-fragmentation-015.html [ Failure ] -crbug.com/660611 external/wpt/css/css-break/flexbox/multi-line-row-flex-fragmentation-016.html [ Failure ] -crbug.com/660611 external/wpt/css/css-break/flexbox/multi-line-row-flex-fragmentation-018.html [ Failure ] -crbug.com/660611 external/wpt/css/css-break/flexbox/multi-line-row-flex-fragmentation-019.html [ Failure ] -crbug.com/660611 external/wpt/css/css-break/flexbox/multi-line-row-flex-fragmentation-020.html [ Failure ] -crbug.com/660611 external/wpt/css/css-break/flexbox/multi-line-row-flex-fragmentation-021.html [ Failure ] -crbug.com/660611 external/wpt/css/css-break/flexbox/multi-line-row-flex-fragmentation-022.html [ Failure ] -crbug.com/660611 external/wpt/css/css-break/flexbox/multi-line-row-flex-fragmentation-023.html [ Failure ] -crbug.com/660611 external/wpt/css/css-break/flexbox/multi-line-row-flex-fragmentation-024.html [ Failure ] -crbug.com/660611 external/wpt/css/css-break/flexbox/multi-line-row-flex-fragmentation-025.html [ Failure ] -crbug.com/660611 external/wpt/css/css-break/flexbox/multi-line-row-flex-fragmentation-026.html [ Failure ] -crbug.com/660611 external/wpt/css/css-break/flexbox/multi-line-row-flex-fragmentation-027.html [ Failure ] -crbug.com/660611 external/wpt/css/css-break/flexbox/multi-line-row-flex-fragmentation-028.html [ Failure ] -crbug.com/660611 external/wpt/css/css-break/flexbox/multi-line-row-flex-fragmentation-029.html [ Failure ] -crbug.com/660611 external/wpt/css/css-break/flexbox/multi-line-row-flex-fragmentation-030.html [ Failure ] -crbug.com/660611 external/wpt/css/css-break/flexbox/multi-line-row-flex-fragmentation-031.html [ Failure ] -crbug.com/660611 external/wpt/css/css-break/flexbox/multi-line-row-flex-fragmentation-032.html [ Failure ] -crbug.com/660611 external/wpt/css/css-break/flexbox/multi-line-row-flex-fragmentation-033.html [ Failure ] -crbug.com/660611 external/wpt/css/css-break/flexbox/multi-line-row-flex-fragmentation-034.html [ Failure ] -crbug.com/660611 external/wpt/css/css-break/flexbox/multi-line-row-flex-fragmentation-035.html [ Failure ] -crbug.com/660611 external/wpt/css/css-break/flexbox/multi-line-row-flex-fragmentation-037.html [ Failure ] -crbug.com/660611 external/wpt/css/css-break/flexbox/multi-line-row-flex-fragmentation-038.html [ Failure ] -crbug.com/660611 external/wpt/css/css-break/flexbox/multi-line-row-flex-fragmentation-039.html [ Failure ] -crbug.com/660611 external/wpt/css/css-break/flexbox/multi-line-row-flex-fragmentation-040.html [ Failure ] -crbug.com/660611 external/wpt/css/css-break/flexbox/multi-line-row-flex-fragmentation-041.tentative.html [ Failure ] -crbug.com/660611 external/wpt/css/css-break/flexbox/multi-line-row-flex-fragmentation-042.tentative.html [ Failure ] -crbug.com/660611 external/wpt/css/css-break/flexbox/multi-line-row-flex-fragmentation-044.html [ Failure ] -crbug.com/660611 external/wpt/css/css-break/flexbox/multi-line-row-flex-fragmentation-045.html [ Failure ] -crbug.com/660611 external/wpt/css/css-break/flexbox/multi-line-row-flex-fragmentation-052.html [ Failure ] -crbug.com/660611 external/wpt/css/css-break/flexbox/multi-line-row-flex-fragmentation-053.html [ Failure ] -crbug.com/660611 external/wpt/css/css-break/flexbox/multi-line-row-flex-fragmentation-054.html [ Failure ] -crbug.com/660611 external/wpt/css/css-break/flexbox/multi-line-row-flex-fragmentation-058.html [ Failure ] -crbug.com/660611 external/wpt/css/css-break/flexbox/multi-line-row-flex-fragmentation-059.html [ Failure ] -crbug.com/660611 external/wpt/css/css-break/flexbox/single-line-column-flex-fragmentation-012.html [ Failure ] -crbug.com/660611 external/wpt/css/css-break/flexbox/single-line-column-flex-fragmentation-014.html [ Failure ] -crbug.com/660611 external/wpt/css/css-break/flexbox/single-line-column-flex-fragmentation-015.html [ Failure ] -crbug.com/660611 external/wpt/css/css-break/flexbox/single-line-column-flex-fragmentation-016.html [ Failure ] -crbug.com/660611 external/wpt/css/css-break/flexbox/single-line-column-flex-fragmentation-017.html [ Failure ] -crbug.com/660611 external/wpt/css/css-break/flexbox/single-line-column-flex-fragmentation-018.html [ Failure ] -crbug.com/660611 external/wpt/css/css-break/flexbox/single-line-column-flex-fragmentation-019.html [ Failure ] -crbug.com/660611 external/wpt/css/css-break/flexbox/single-line-column-flex-fragmentation-020.html [ Failure ] -crbug.com/660611 external/wpt/css/css-break/flexbox/single-line-column-flex-fragmentation-022.html [ Failure ] -crbug.com/660611 external/wpt/css/css-break/flexbox/single-line-column-flex-fragmentation-023.html [ Failure ] -crbug.com/660611 external/wpt/css/css-break/flexbox/single-line-column-flex-fragmentation-030.html [ Failure ] -crbug.com/660611 external/wpt/css/css-break/flexbox/single-line-column-flex-fragmentation-031.html [ Failure ] -crbug.com/660611 external/wpt/css/css-break/flexbox/single-line-column-flex-fragmentation-032.html [ Failure ] -crbug.com/660611 external/wpt/css/css-break/flexbox/single-line-column-flex-fragmentation-034.html [ Failure ] -crbug.com/660611 external/wpt/css/css-break/flexbox/single-line-column-flex-fragmentation-035.html [ Failure ] -crbug.com/660611 external/wpt/css/css-break/flexbox/single-line-column-flex-fragmentation-039.html [ Failure ] -crbug.com/660611 external/wpt/css/css-break/flexbox/single-line-column-flex-fragmentation-043.html [ Failure ] -crbug.com/660611 external/wpt/css/css-break/flexbox/single-line-column-flex-fragmentation-044.html [ Failure ] -crbug.com/660611 external/wpt/css/css-break/flexbox/single-line-column-flex-fragmentation-045.html [ Failure ] -crbug.com/660611 external/wpt/css/css-break/flexbox/single-line-column-flex-fragmentation-046.html [ Failure ] -crbug.com/660611 external/wpt/css/css-break/flexbox/single-line-column-flex-fragmentation-050.html [ Failure ] -crbug.com/660611 external/wpt/css/css-break/flexbox/single-line-column-flex-fragmentation-054.html [ Failure ] -crbug.com/660611 external/wpt/css/css-break/flexbox/single-line-column-flex-fragmentation-057.html [ Failure ] -crbug.com/660611 external/wpt/css/css-break/flexbox/single-line-row-flex-fragmentation-014.html [ Failure ] -crbug.com/660611 external/wpt/css/css-break/flexbox/single-line-row-flex-fragmentation-015.html [ Failure ] -crbug.com/660611 external/wpt/css/css-break/flexbox/single-line-row-flex-fragmentation-016.html [ Failure ] -crbug.com/660611 external/wpt/css/css-break/flexbox/single-line-row-flex-fragmentation-017.html [ Failure ] -crbug.com/660611 external/wpt/css/css-break/flexbox/single-line-row-flex-fragmentation-018.html [ Failure ] -crbug.com/660611 external/wpt/css/css-break/flexbox/single-line-row-flex-fragmentation-019.html [ Failure ] -crbug.com/660611 external/wpt/css/css-break/flexbox/single-line-row-flex-fragmentation-020.html [ Failure ] -crbug.com/660611 external/wpt/css/css-break/flexbox/single-line-row-flex-fragmentation-024.html [ Failure ] -crbug.com/660611 external/wpt/css/css-break/flexbox/single-line-row-flex-fragmentation-032.html [ Failure ] -crbug.com/660611 external/wpt/css/css-break/flexbox/single-line-row-flex-fragmentation-037.html [ Failure ] -crbug.com/660611 external/wpt/css/css-break/flexbox/single-line-row-flex-fragmentation-040.html [ Failure ] -crbug.com/829028 external/wpt/css/css-break/float-005.html [ Failure ] -crbug.com/829028 external/wpt/css/css-break/float-006.html [ Failure ] -crbug.com/829028 external/wpt/css/css-break/float-007.html [ Failure ] -crbug.com/829028 external/wpt/css/css-break/float-008.html [ Failure ] -crbug.com/829028 external/wpt/css/css-break/forced-break-at-fragmentainer-start-000.html [ Failure ] -crbug.com/829028 external/wpt/css/css-break/fragmented-autowidth-fc-root-beside-floats.html [ Failure ] -crbug.com/829028 external/wpt/css/css-break/hit-test-transformed.html [ Failure ] -crbug.com/829028 external/wpt/css/css-break/monolithic-content-with-forced-break-002.html [ Failure ] -crbug.com/829028 external/wpt/css/css-break/monolithic-content-with-forced-break-003.html [ Failure ] -crbug.com/829028 external/wpt/css/css-break/monolithic-with-overflow-lr.html [ Failure ] -crbug.com/829028 external/wpt/css/css-break/monolithic-with-overflow-rl.html [ Failure ] -crbug.com/829028 external/wpt/css/css-break/monolithic-with-overflow.html [ Failure ] -crbug.com/829028 external/wpt/css/css-break/out-of-flow-in-multicolumn-012.html [ Failure ] -crbug.com/829028 external/wpt/css/css-break/out-of-flow-in-multicolumn-029.html [ Failure ] -crbug.com/829028 external/wpt/css/css-break/out-of-flow-in-multicolumn-030.html [ Failure ] -crbug.com/829028 external/wpt/css/css-break/out-of-flow-in-multicolumn-032.html [ Failure ] -crbug.com/829028 external/wpt/css/css-break/out-of-flow-in-multicolumn-034.html [ Failure ] -crbug.com/829028 external/wpt/css/css-break/out-of-flow-in-multicolumn-035.html [ Failure ] -crbug.com/829028 external/wpt/css/css-break/out-of-flow-in-multicolumn-036.html [ Failure ] -crbug.com/829028 external/wpt/css/css-break/out-of-flow-in-multicolumn-038.html [ Failure ] -crbug.com/829028 external/wpt/css/css-break/out-of-flow-in-multicolumn-039.html [ Failure ] -crbug.com/829028 external/wpt/css/css-break/out-of-flow-in-multicolumn-040.html [ Failure ] -crbug.com/829028 external/wpt/css/css-break/out-of-flow-in-multicolumn-041.html [ Failure ] -crbug.com/829028 external/wpt/css/css-break/out-of-flow-in-multicolumn-042.html [ Failure ] -crbug.com/829028 external/wpt/css/css-break/out-of-flow-in-multicolumn-043.html [ Failure ] -crbug.com/829028 external/wpt/css/css-break/out-of-flow-in-multicolumn-044.html [ Failure ] -crbug.com/829028 external/wpt/css/css-break/out-of-flow-in-multicolumn-045.html [ Failure ] -crbug.com/829028 external/wpt/css/css-break/out-of-flow-in-multicolumn-046.html [ Failure ] -crbug.com/829028 external/wpt/css/css-break/out-of-flow-in-multicolumn-047.html [ Failure ] -crbug.com/829028 external/wpt/css/css-break/out-of-flow-in-multicolumn-052.html [ Failure ] -crbug.com/829028 external/wpt/css/css-break/out-of-flow-in-multicolumn-054.html [ Failure ] -crbug.com/829028 external/wpt/css/css-break/out-of-flow-in-multicolumn-057.html [ Failure ] -crbug.com/829028 external/wpt/css/css-break/out-of-flow-in-multicolumn-058.html [ Failure ] -crbug.com/829028 external/wpt/css/css-break/out-of-flow-in-multicolumn-059.html [ Failure ] -crbug.com/829028 external/wpt/css/css-break/out-of-flow-in-multicolumn-060.html [ Failure ] -crbug.com/829028 external/wpt/css/css-break/out-of-flow-in-multicolumn-061.html [ Failure ] -crbug.com/829028 external/wpt/css/css-break/out-of-flow-in-multicolumn-062.html [ Failure ] -crbug.com/829028 external/wpt/css/css-break/out-of-flow-in-multicolumn-063.html [ Failure ] -crbug.com/829028 external/wpt/css/css-break/out-of-flow-in-multicolumn-065.html [ Failure ] -crbug.com/829028 external/wpt/css/css-break/out-of-flow-in-multicolumn-066.html [ Failure ] -crbug.com/829028 external/wpt/css/css-break/out-of-flow-in-multicolumn-071.html [ Failure ] -crbug.com/829028 external/wpt/css/css-break/out-of-flow-in-multicolumn-073.html [ Failure ] -crbug.com/829028 external/wpt/css/css-break/out-of-flow-in-multicolumn-079.html [ Failure ] -crbug.com/829028 external/wpt/css/css-break/out-of-flow-in-multicolumn-080.html [ Failure ] -crbug.com/829028 external/wpt/css/css-break/out-of-flow-in-multicolumn-081.html [ Failure ] -crbug.com/829028 external/wpt/css/css-break/out-of-flow-in-multicolumn-085.html [ Failure ] -crbug.com/829028 external/wpt/css/css-break/out-of-flow-in-multicolumn-086.html [ Failure ] -crbug.com/829028 external/wpt/css/css-break/out-of-flow-in-multicolumn-087.html [ Failure ] -crbug.com/829028 external/wpt/css/css-break/out-of-flow-in-multicolumn-088.html [ Failure ] -crbug.com/829028 external/wpt/css/css-break/out-of-flow-in-multicolumn-089.html [ Failure ] -crbug.com/829028 external/wpt/css/css-break/out-of-flow-in-multicolumn-090.html [ Failure ] -crbug.com/829028 external/wpt/css/css-break/out-of-flow-in-multicolumn-094.html [ Failure ] -crbug.com/829028 external/wpt/css/css-break/out-of-flow-in-multicolumn-095.html [ Failure ] -crbug.com/829028 external/wpt/css/css-break/out-of-flow-in-multicolumn-096.html [ Failure ] -crbug.com/829028 external/wpt/css/css-break/out-of-flow-in-multicolumn-099.html [ Failure ] -crbug.com/829028 external/wpt/css/css-break/out-of-flow-in-multicolumn-105.html [ Failure ] -crbug.com/829028 external/wpt/css/css-break/out-of-flow-in-multicolumn-106.html [ Failure ] -crbug.com/829028 external/wpt/css/css-break/out-of-flow-in-multicolumn-109.html [ Failure ] -crbug.com/829028 external/wpt/css/css-break/out-of-flow-in-multicolumn-114.html [ Failure ] -crbug.com/829028 external/wpt/css/css-break/out-of-flow-in-multicolumn-115.html [ Failure ] -crbug.com/829028 external/wpt/css/css-break/overflow-clip-000.html [ Failure ] -crbug.com/829028 external/wpt/css/css-break/overflow-clip-001.html [ Failure ] -crbug.com/829028 external/wpt/css/css-break/overflow-clip-010.html [ Failure ] -crbug.com/829028 external/wpt/css/css-break/overflowed-block-with-no-room-after-001.html [ Failure ] -crbug.com/829028 external/wpt/css/css-break/overflowed-block-with-no-room-after-000.html [ Failure ] -crbug.com/1078927 external/wpt/css/css-break/parallel-flow-trailing-margin-001.html [ Failure ] -crbug.com/1078927 external/wpt/css/css-break/parallel-flow-trailing-margin-002.html [ Failure ] -crbug.com/829028 external/wpt/css/css-break/relpos-inline-hit-testing.html [ Failure ] -crbug.com/829028 external/wpt/css/css-break/relpos-inline.html [ Failure ] -crbug.com/829028 external/wpt/css/css-break/ruby-003.html [ Failure ] -crbug.com/1078927 external/wpt/css/css-break/table/border-spacing-at-breaks.tentative.html [ Failure ] -crbug.com/1078927 external/wpt/css/css-break/table/break-after-table-cell.html [ Failure ] -crbug.com/1078927 external/wpt/css/css-break/table/break-after-table-cell-child.html [ Failure ] -crbug.com/1078927 external/wpt/css/css-break/table/break-avoidance-001.html [ Failure ] -crbug.com/1078927 external/wpt/css/css-break/table/break-avoidance-002.html [ Failure ] -crbug.com/1078927 external/wpt/css/css-break/table/break-avoidance-003.html [ Failure ] -crbug.com/1078927 external/wpt/css/css-break/table/break-avoidance-004.html [ Failure ] -crbug.com/1078927 external/wpt/css/css-break/table/break-avoidance-005.html [ Failure ] -crbug.com/1078927 external/wpt/css/css-break/table/break-avoidance-006.html [ Failure ] -crbug.com/1078927 external/wpt/css/css-break/table/break-avoidance-007.html [ Failure ] -crbug.com/1078927 external/wpt/css/css-break/table/break-avoidance-in-table-in-grid.html [ Failure ] -crbug.com/1078927 external/wpt/css/css-break/table/break-before-expansion-001.html [ Failure ] -crbug.com/1078927 external/wpt/css/css-break/table/break-before-expansion-002.html [ Failure ] -crbug.com/1078927 external/wpt/css/css-break/table/break-before-table-cell.html [ Failure ] -crbug.com/1078927 external/wpt/css/css-break/table/break-before-table-cell-child.html [ Failure ] -crbug.com/1078927 external/wpt/css/css-break/table/caption-margin-002.html [ Failure ] -crbug.com/1078927 external/wpt/css/css-break/table/overflow-scroll-section.html [ Failure ] -crbug.com/1078927 external/wpt/css/css-break/table/repeated-section/abspos.tentative.html [ Failure ] -crbug.com/1078927 external/wpt/css/css-break/table/repeated-section/abspos-in-monolithic.tentative.html [ Failure ] -crbug.com/1078927 external/wpt/css/css-break/table/repeated-section/abspos-uncontained-text.html [ Failure ] -crbug.com/1078927 external/wpt/css/css-break/table/repeated-section/abspos-uncontained.tentative.html [ Failure ] -crbug.com/1078927 external/wpt/css/css-break/table/repeated-section/balanced-inner-multicol.html [ Failure ] -crbug.com/1078927 external/wpt/css/css-break/table/repeated-section/block-in-inline.tentative.html [ Failure ] -crbug.com/1078927 external/wpt/css/css-break/table/repeated-section/break-avoidance-in-bottom-caption.tentative.html [ Failure ] -crbug.com/1078927 external/wpt/css/css-break/table/repeated-section/captions.tentative.html [ Failure ] -crbug.com/1078927 external/wpt/css/css-break/table/repeated-section/footer.tentative.html [ Failure ] -crbug.com/1078927 external/wpt/css/css-break/table/repeated-section/header-after-break.tentative.html [ Failure ] -crbug.com/1078927 external/wpt/css/css-break/table/repeated-section/header-footer.tentative.html [ Failure ] -crbug.com/1078927 external/wpt/css/css-break/table/repeated-section/header.tentative.html [ Failure ] -crbug.com/1078927 external/wpt/css/css-break/table/repeated-section/hit-test-relative-in-transform.tentative.html [ Failure ] -crbug.com/1078927 external/wpt/css/css-break/table/repeated-section/hit-test-relative.tentative.html [ Failure ] -crbug.com/1078927 external/wpt/css/css-break/table/repeated-section/hit-test.tentative.html [ Failure ] -crbug.com/1078927 external/wpt/css/css-break/table/repeated-section/inline-block.tentative.html [ Failure ] -crbug.com/1078927 external/wpt/css/css-break/table/repeated-section/multicol.tentative.html [ Failure ] -crbug.com/1078927 external/wpt/css/css-break/table/repeated-section/multiple-row-groups.tentative.html [ Failure ] -crbug.com/1078927 external/wpt/css/css-break/table/repeated-section/repeated-header-border-spacing.tentative.html [ Failure ] -crbug.com/1078927 external/wpt/css/css-break/table/repeated-section/tall-monolithic-after-repeated-header.tentative.html [ Failure ] -crbug.com/1078927 external/wpt/css/css-break/table/repeated-section/variable-fragmentainer-size-001.html [ Failure ] -crbug.com/1078927 external/wpt/css/css-break/table/specified-block-size-007.html [ Failure ] -crbug.com/1078927 external/wpt/css/css-break/table/table-border-005.html [ Failure ] -crbug.com/1078927 external/wpt/css/css-break/table/table-border-006.html [ Failure ] -crbug.com/1078927 external/wpt/css/css-break/table/table-cell-expansion-003.html [ Failure ] -crbug.com/1078927 external/wpt/css/css-break/table/table-col-paint-htb-ltr.html [ Failure ] -crbug.com/1078927 external/wpt/css/css-break/table/table-collapsed-borders-paint-at-boundary.tentative.html [ Failure ] -crbug.com/1078927 external/wpt/css/css-break/table/table-collapsed-borders-paint-htb-ltr.html [ Failure ] -crbug.com/1078927 external/wpt/css/css-break/table/table-collapsed-borders-paint-vlr-rtl.html [ Failure ] -crbug.com/1078927 external/wpt/css/css-break/table/table-collapsed-borders-paint-vrl-ltr.html [ Failure ] -crbug.com/1078927 external/wpt/css/css-break/table/table-parts-offsetheight.html [ Failure ] -crbug.com/1078927 external/wpt/css/css-break/table/table-row-paint-vlr-rtl.html [ Failure ] -crbug.com/1078927 external/wpt/css/css-break/table/table-row-paint-vrl-rtl.html [ Failure ] -crbug.com/1078927 external/wpt/css/css-break/table/table-rowspan-001.html [ Failure ] -crbug.com/1078927 external/wpt/css/css-break/table/table-section-paint-vrl-rtl.html [ Failure ] -crbug.com/829028 external/wpt/css/css-break/tall-content-inside-constrained-block-000.tentative.html [ Failure ] -crbug.com/829028 external/wpt/css/css-break/tall-content-inside-constrained-block-001.tentative.html [ Failure ] -crbug.com/829028 external/wpt/css/css-break/tall-content-inside-constrained-block-002.tentative.html [ Failure ] -crbug.com/829028 external/wpt/css/css-break/tall-content-inside-constrained-block-003.tentative.html [ Failure ] -crbug.com/829028 external/wpt/css/css-break/tall-content-inside-constrained-block-004.tentative.html [ Failure ] -crbug.com/829028 external/wpt/css/css-break/tall-content-inside-constrained-block-005.tentative.html [ Failure ] -crbug.com/829028 external/wpt/css/css-break/tall-content-inside-constrained-block-006.tentative.html [ Failure ] -crbug.com/829028 external/wpt/css/css-break/tall-line-in-short-fragmentainer-000.html [ Failure ] -crbug.com/829028 external/wpt/css/css-break/tall-line-in-short-fragmentainer-001.html [ Failure ] -crbug.com/829028 external/wpt/css/css-break/tall-line-in-short-fragmentainer-002.html [ Failure ] -crbug.com/829028 external/wpt/css/css-break/trailing-child-margin-000.html [ Failure ] -crbug.com/829028 external/wpt/css/css-break/trailing-child-margin-002.html [ Failure ] -crbug.com/1058792 external/wpt/css/css-break/transform-003.html [ Failure ] -crbug.com/1058792 external/wpt/css/css-break/transform-004.html [ Failure ] -crbug.com/1058792 external/wpt/css/css-break/transform-005.html [ Failure ] -crbug.com/829028 external/wpt/css/css-break/transform-006.html [ Failure ] -crbug.com/829028 external/wpt/css/css-break/transform-008.html [ Failure ] -crbug.com/829028 external/wpt/css/css-break/transform-010.html [ Failure ] -crbug.com/829028 external/wpt/css/css-break/underflow-from-next-page-print.html [ Failure ] -crbug.com/614667 external/wpt/css/css-break/grid/grid-container-fragmentation-010.html [ Failure ] -crbug.com/614667 external/wpt/css/css-break/grid/grid-container-fragmentation-011.html [ Failure ] -crbug.com/614667 external/wpt/css/css-break/grid/grid-item-fragmentation-020.html [ Failure ] -crbug.com/614667 external/wpt/css/css-break/grid/grid-item-fragmentation-027.tentative.html [ Failure ] -crbug.com/614667 external/wpt/css/css-break/grid/grid-item-fragmentation-028.html [ Failure ] -crbug.com/614667 external/wpt/css/css-break/grid/grid-item-fragmentation-029.html [ Failure ] -crbug.com/614667 external/wpt/css/css-break/grid/grid-item-fragmentation-030.html [ Failure ] -crbug.com/614667 external/wpt/css/css-break/grid/grid-item-fragmentation-031.html [ Failure ] -crbug.com/614667 external/wpt/css/css-break/grid/grid-item-fragmentation-032.html [ Failure ] -crbug.com/614667 external/wpt/css/css-break/grid/grid-item-fragmentation-033.html [ Failure ] -crbug.com/614667 external/wpt/css/css-break/grid/grid-item-fragmentation-034.html [ Failure ] -crbug.com/614667 external/wpt/css/css-break/grid/grid-item-fragmentation-037.html [ Failure ] -crbug.com/614667 external/wpt/css/css-break/grid/grid-item-fragmentation-038.html [ Failure ] -crbug.com/614667 external/wpt/css/css-break/grid/grid-item-fragmentation-041.html [ Failure ] -crbug.com/614667 external/wpt/css/css-break/grid/grid-item-fragmentation-042.html [ Failure ] -crbug.com/614667 external/wpt/css/css-break/grid/grid-item-fragmentation-043.html [ Failure ] -crbug.com/614667 external/wpt/css/css-break/grid/grid-item-fragmentation-044.html [ Failure ] -crbug.com/614667 external/wpt/css/css-break/grid/grid-item-fragmentation-045.html [ Failure ] -crbug.com/614667 external/wpt/css/css-break/grid/grid-item-fragmentation-046.html [ Failure ] -crbug.com/614667 external/wpt/css/css-break/grid/grid-item-fragmentation-047.html [ Failure ] -crbug.com/614667 external/wpt/css/css-break/grid/grid-item-fragmentation-048.html [ Failure ] -crbug.com/614667 external/wpt/css/css-break/grid/grid-item-oof-004.html [ Failure ] -crbug.com/614667 external/wpt/css/css-break/grid/grid-item-oof-005.html [ Failure ] -crbug.com/614667 external/wpt/css/css-break/grid/grid-item-oof-007.html [ Failure ] -crbug.com/614667 external/wpt/css/css-break/grid/grid-item-oof-009.html [ Failure ] -crbug.com/614667 external/wpt/css/css-break/grid/grid-item-oof-010.html [ Failure ] - -### external/wpt/css/css-flexbox/ -crbug.com/591099 external/wpt/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-001.html [ Failure ] -crbug.com/591099 external/wpt/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-002.html [ Failure ] -crbug.com/591099 external/wpt/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-003.html [ Failure ] -crbug.com/591099 external/wpt/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-004.html [ Failure ] -crbug.com/591099 external/wpt/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-005.html [ Failure ] -crbug.com/591099 external/wpt/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-006.html [ Failure ] -crbug.com/591099 external/wpt/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-007.html [ Failure ] -crbug.com/591099 external/wpt/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-008.html [ Failure ] -crbug.com/591099 external/wpt/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-rtl-001.html [ Failure ] -crbug.com/591099 external/wpt/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-rtl-002.html [ Failure ] -crbug.com/591099 external/wpt/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-rtl-003.html [ Failure ] -crbug.com/591099 external/wpt/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-rtl-004.html [ Failure ] -crbug.com/591099 external/wpt/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-vertWM-001.html [ Failure ] -crbug.com/591099 external/wpt/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-vertWM-003.html [ Failure ] -crbug.com/591099 external/wpt/css/css-flexbox/alignment/flex-align-baseline-001.html [ Failure ] -crbug.com/591099 external/wpt/css/css-flexbox/alignment/flex-align-baseline-002.html [ Failure ] -crbug.com/591099 external/wpt/css/css-flexbox/alignment/flex-align-baseline-003.html [ Failure ] -crbug.com/591099 external/wpt/css/css-flexbox/alignment/flex-align-baseline-004.html [ Failure ] -crbug.com/591099 external/wpt/css/css-flexbox/alignment/flex-align-baseline-005.html [ Failure ] -crbug.com/591099 external/wpt/css/css-flexbox/alignment/flex-align-baseline-006.html [ Failure ] -crbug.com/591099 external/wpt/css/css-flexbox/alignment/flex-align-baseline-007.html [ Failure ] -crbug.com/591099 external/wpt/css/css-flexbox/alignment/flex-align-baseline-fieldset-001.html [ Failure ] -crbug.com/591099 external/wpt/css/css-flexbox/alignment/flex-align-baseline-fieldset-002.html [ Failure ] -crbug.com/591099 external/wpt/css/css-flexbox/alignment/flex-align-baseline-fieldset-003.html [ Failure ] -crbug.com/591099 external/wpt/css/css-flexbox/alignment/flex-align-baseline-flex-001.html [ Failure ] -crbug.com/591099 external/wpt/css/css-flexbox/alignment/flex-align-baseline-flex-002.html [ Failure ] -crbug.com/591099 external/wpt/css/css-flexbox/alignment/flex-align-baseline-flex-003.html [ Failure ] -crbug.com/591099 external/wpt/css/css-flexbox/alignment/flex-align-baseline-flex-004.html [ Failure ] -crbug.com/591099 external/wpt/css/css-flexbox/alignment/flex-align-baseline-grid-001.html [ Failure ] -crbug.com/591099 external/wpt/css/css-flexbox/alignment/flex-align-baseline-grid-002.html [ Failure ] -crbug.com/591099 external/wpt/css/css-flexbox/alignment/flex-align-baseline-grid-003.html [ Failure ] -crbug.com/591099 external/wpt/css/css-flexbox/alignment/flex-align-baseline-line-clamp-001.tentative.html [ Failure ] -crbug.com/591099 external/wpt/css/css-flexbox/alignment/flex-align-baseline-line-clamp-002.tentative.html [ Failure ] -crbug.com/591099 external/wpt/css/css-flexbox/alignment/flex-align-baseline-line-clamp-003.tentative.html [ Failure ] -crbug.com/591099 external/wpt/css/css-flexbox/alignment/flex-align-baseline-multicol-001.html [ Failure ] -crbug.com/591099 external/wpt/css/css-flexbox/alignment/flex-align-baseline-multicol-002.html [ Failure ] -crbug.com/591099 external/wpt/css/css-flexbox/alignment/flex-align-baseline-multicol-003.html [ Failure ] -crbug.com/591099 external/wpt/css/css-flexbox/alignment/flex-align-baseline-overflow-001.html [ Failure ] -crbug.com/591099 external/wpt/css/css-flexbox/alignment/flex-align-baseline-overflow-002.html [ Failure ] -crbug.com/591099 external/wpt/css/css-flexbox/alignment/flex-align-baseline-overflow-003.html [ Failure ] -crbug.com/591099 external/wpt/css/css-flexbox/alignment/flex-align-baseline-table-001.html [ Failure ] -crbug.com/591099 external/wpt/css/css-flexbox/alignment/flex-align-baseline-table-002.html [ Failure ] -crbug.com/591099 external/wpt/css/css-flexbox/alignment/flex-align-baseline-table-003.html [ Failure ] -crbug.com/591099 external/wpt/css/css-flexbox/align-baseline.html [ Failure ] -crbug.com/591099 external/wpt/css/css-flexbox/align-items-baseline-column-horz.html [ Failure ] -crbug.com/591099 external/wpt/css/css-flexbox/align-items-baseline-column-vert.html [ Failure ] -crbug.com/591099 external/wpt/css/css-flexbox/align-items-baseline-row-vert.html [ Failure ] -crbug.com/591099 external/wpt/css/css-flexbox/aspect-ratio-intrinsic-size-001.html [ Failure ] -crbug.com/591099 external/wpt/css/css-flexbox/aspect-ratio-intrinsic-size-002.html [ Failure ] -crbug.com/591099 external/wpt/css/css-flexbox/aspect-ratio-intrinsic-size-003.html [ Failure ] -crbug.com/591099 external/wpt/css/css-flexbox/aspect-ratio-intrinsic-size-004.html [ Failure ] -crbug.com/591099 external/wpt/css/css-flexbox/aspect-ratio-intrinsic-size-005.html [ Failure ] -crbug.com/591099 external/wpt/css/css-flexbox/baseline-synthesis-001.html [ Failure ] -crbug.com/591099 external/wpt/css/css-flexbox/baseline-synthesis-004.html [ Failure ] -crbug.com/591099 external/wpt/css/css-flexbox/dynamic-baseline-change.html [ Failure ] -crbug.com/591099 external/wpt/css/css-flexbox/dynamic-baseline-change-nested.html [ Failure ] -crbug.com/1132627 external/wpt/css/css-flexbox/flex-minimum-width-flex-items-007.xht [ Failure ] -crbug.com/591099 external/wpt/css/css-flexbox/flexbox-align-self-horiz-002.xhtml [ Failure ] -crbug.com/591099 external/wpt/css/css-flexbox/flexbox-align-self-baseline-horiz-001a.xhtml [ Failure ] -crbug.com/591099 external/wpt/css/css-flexbox/flexbox-align-self-baseline-horiz-001b.xhtml [ Failure ] -crbug.com/591099 external/wpt/css/css-flexbox/flexbox-align-self-baseline-horiz-003.xhtml [ Failure ] -crbug.com/591099 external/wpt/css/css-flexbox/flexbox-align-self-baseline-horiz-006.xhtml [ Failure ] -crbug.com/591099 external/wpt/css/css-flexbox/flexbox-align-self-baseline-horiz-007.xhtml [ Failure ] -crbug.com/591099 external/wpt/css/css-flexbox/flexbox-align-self-vert-001.xhtml [ Failure ] -crbug.com/591099 external/wpt/css/css-flexbox/flexbox-align-self-vert-002.xhtml [ Failure ] -crbug.com/591099 external/wpt/css/css-flexbox/flexbox-align-self-vert-003.xhtml [ Failure ] -crbug.com/591099 external/wpt/css/css-flexbox/flexbox-align-self-vert-004.xhtml [ Failure ] -crbug.com/591099 external/wpt/css/css-flexbox/flexbox-align-self-vert-rtl-001.xhtml [ Failure ] -crbug.com/591099 external/wpt/css/css-flexbox/flexbox-align-self-vert-rtl-002.xhtml [ Failure ] -crbug.com/591099 external/wpt/css/css-flexbox/flexbox-align-self-vert-rtl-003.xhtml [ Failure ] -crbug.com/591099 external/wpt/css/css-flexbox/flexbox-align-self-vert-rtl-004.xhtml [ Failure ] -crbug.com/591099 external/wpt/css/css-flexbox/flexbox-align-self-vert-rtl-005.xhtml [ Failure ] -crbug.com/591099 external/wpt/css/css-flexbox/flexbox-baseline-align-self-baseline-vert-001.html [ Failure ] -crbug.com/591099 external/wpt/css/css-flexbox/flexbox-baseline-multi-line-horiz-002.html [ Failure ] -crbug.com/591099 external/wpt/css/css-flexbox/flexbox-baseline-multi-line-vert-002.html [ Failure ] -crbug.com/553838 external/wpt/css/css-flexbox/flexbox-min-height-auto-002a.html [ Failure ] -crbug.com/553838 external/wpt/css/css-flexbox/flexbox-min-height-auto-002c.html [ Failure ] -crbug.com/1132627 external/wpt/css/css-flexbox/flexbox-min-width-auto-002a.html [ Failure ] -crbug.com/1132627 external/wpt/css/css-flexbox/flexbox-min-width-auto-002c.html [ Failure ] -crbug.com/591099 external/wpt/css/css-flexbox/image-as-flexitem-size-001v.html [ Failure Pass ] -crbug.com/591099 external/wpt/css/css-flexbox/image-as-flexitem-size-003.html [ Failure ] -crbug.com/591099 external/wpt/css/css-flexbox/image-as-flexitem-size-003v.html [ Failure ] -crbug.com/591099 external/wpt/css/css-flexbox/image-as-flexitem-size-004.html [ Failure ] -crbug.com/591099 external/wpt/css/css-flexbox/image-as-flexitem-size-004v.html [ Failure ] -crbug.com/591099 external/wpt/css/css-flexbox/image-as-flexitem-size-007v.html [ Failure Pass ] -crbug.com/1162704 external/wpt/css/css-flexbox/flex-aspect-ratio-img-row-015.html [ Failure ] -crbug.com/591099 external/wpt/css/css-flexbox/flex-item-compressible-001.html [ Failure ] -crbug.com/1033476 external/wpt/css/css-flexbox/flex-minimum-height-flex-items-025.html [ Failure ] -crbug.com/1033476 external/wpt/css/css-flexbox/flex-minimum-width-flex-items-015.html [ Failure ] -crbug.com/1173843 external/wpt/css/css-flexbox/frameset-crash.html [ Skip ] -crbug.com/1069614 external/wpt/css/css-flexbox/overflow-area-001.html [ Failure ] -crbug.com/1069614 external/wpt/css/css-flexbox/overflow-area-002.html [ Failure ] -crbug.com/591099 external/wpt/css/css-flexbox/scrollbars-auto.html [ Failure ] -crbug.com/591099 external/wpt/css/css-flexbox/scrollbars.html [ Failure ] -crbug.com/591099 external/wpt/css/css-flexbox/synthesize-vrl-baseline.html [ Failure ] -crbug.com/1181403 external/wpt/css/css-flexbox/table-as-item-inflexible-in-column-2.html [ Failure ] -crbug.com/1181403 external/wpt/css/css-flexbox/table-as-item-specified-height.html [ Failure ] -crbug.com/1181403 external/wpt/css/css-flexbox/table-as-item-min-height-1.html [ Failure ] -crbug.com/1069614 external/wpt/css/css-flexbox/overflow-top-left.html [ Failure ] -crbug.com/1011718 external/wpt/css/css-flexbox/flexbox-justify-content-vert-006.xhtml [ Failure ] -crbug.com/1011718 external/wpt/css/css-flexbox/flexbox_justifycontent-left-002.html [ Failure ] -crbug.com/1011718 external/wpt/css/css-flexbox/flexbox_justifycontent-right-002.html [ Failure ] -crbug.com/470421 external/wpt/css/css-flexbox/flexbox-flex-basis-content-001a.html [ Failure ] -crbug.com/470421 external/wpt/css/css-flexbox/flexbox-flex-basis-content-001b.html [ Failure ] -crbug.com/470421 external/wpt/css/css-flexbox/flexbox-flex-basis-content-002a.html [ Failure ] -crbug.com/470421 external/wpt/css/css-flexbox/flexbox-flex-basis-content-002b.html [ Failure ] -crbug.com/470421 external/wpt/css/css-flexbox/fixed-table-layout-with-percentage-width-in-flex-item.html [ Failure ] -crbug.com/591099 external/wpt/css/css-flexbox/dynamic-isize-change-002.html [ Crash Failure Pass ] -crbug.com/1003506 external/wpt/css/css-flexbox/percentage-heights-007.html [ Failure ] -crbug.com/1255340 external/wpt/css/css-flexbox/percentage-heights-016.html [ Failure ] -crbug.com/1255340 external/wpt/css/css-flexbox/percentage-heights-017.html [ Failure ] -crbug.com/1255340 external/wpt/css/css-flexbox/percentage-heights-018.html [ Failure ] -crbug.com/1246126 external/wpt/css/css-flexbox/flex-minimum-width-flex-items-013.html [ Failure ] -crbug.com/591099 external/wpt/css/css-flexbox/multiline-reverse-wrap-baseline.html [ Failure ] -crbug.com/1251689 external/wpt/css/css-flexbox/table-as-item-specified-width-vertical.html [ Failure ] - -### external/wpt/css/css-fonts/ -crbug.com/591099 external/wpt/css/css-fonts/font-features-across-space-1.html [ Failure ] -crbug.com/591099 external/wpt/css/css-fonts/font-features-across-space-3.html [ Failure ] - -### crbug.com/1045599 external/wpt/css/css-grid: -crbug.com/1045599 external/wpt/css/css-grid/abspos/descendant-static-position-001.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/abspos/descendant-static-position-002.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/abspos/descendant-static-position-003.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/abspos/grid-abspos-staticpos-align-self-img-last-baseline-001.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/abspos/grid-abspos-staticpos-align-self-img-last-baseline-002.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/abspos/grid-abspos-staticpos-align-self-last-baseline-001.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/abspos/grid-abspos-staticpos-align-self-last-baseline-002.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/abspos/grid-abspos-staticpos-align-self-rtl-last-baseline-001.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/abspos/grid-abspos-staticpos-align-self-rtl-last-baseline-002.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/abspos/grid-abspos-staticpos-align-self-rtl-last-baseline-003.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/abspos/grid-abspos-staticpos-align-self-rtl-last-baseline-004.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/abspos/grid-abspos-staticpos-align-self-vertWM-last-baseline-001.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/abspos/grid-abspos-staticpos-align-self-vertWM-last-baseline-002.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/abspos/grid-abspos-staticpos-align-self-vertWM-last-baseline-003.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/abspos/grid-abspos-staticpos-align-self-vertWM-last-baseline-004.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/abspos/grid-abspos-staticpos-align-self-002.html [ Failure ] -crbug.com/1192763 external/wpt/css/css-grid/abspos/grid-abspos-staticpos-align-self-img-002.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/abspos/grid-abspos-staticpos-align-self-rtl-003.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/abspos/grid-abspos-staticpos-align-self-rtl-004.html [ Failure ] -crbug.com/1192763 external/wpt/css/css-grid/abspos/grid-abspos-staticpos-align-self-vertWM-003.html [ Failure ] -crbug.com/1192763 external/wpt/css/css-grid/abspos/grid-abspos-staticpos-align-self-vertWM-004.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/abspos/grid-abspos-staticpos-justify-self-002.html [ Failure ] -crbug.com/1192763 external/wpt/css/css-grid/abspos/grid-abspos-staticpos-justify-self-img-002.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/abspos/grid-abspos-staticpos-justify-self-rtl-003.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/abspos/grid-abspos-staticpos-justify-self-rtl-004.html [ Failure ] -crbug.com/1192763 external/wpt/css/css-grid/abspos/grid-abspos-staticpos-justify-self-vertWM-003.html [ Failure ] -crbug.com/1192763 external/wpt/css/css-grid/abspos/grid-abspos-staticpos-justify-self-vertWM-004.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/abspos/grid-abspos-staticpos-justify-self-img-last-baseline-001.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/abspos/grid-abspos-staticpos-justify-self-img-last-baseline-002.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/abspos/grid-abspos-staticpos-justify-self-last-baseline-001.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/abspos/grid-abspos-staticpos-justify-self-last-baseline-002.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/abspos/grid-abspos-staticpos-justify-self-rtl-last-baseline-001.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/abspos/grid-abspos-staticpos-justify-self-rtl-last-baseline-002.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/abspos/grid-abspos-staticpos-justify-self-rtl-last-baseline-003.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/abspos/grid-abspos-staticpos-justify-self-rtl-last-baseline-004.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/abspos/grid-abspos-staticpos-justify-self-vertWM-last-baseline-001.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/abspos/grid-abspos-staticpos-justify-self-vertWM-last-baseline-002.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/abspos/grid-abspos-staticpos-justify-self-vertWM-last-baseline-003.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/abspos/grid-abspos-staticpos-justify-self-vertWM-last-baseline-004.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/alignment/self-baseline/grid-self-baseline-002-b.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/alignment/self-baseline/grid-self-baseline-002.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/alignment/self-baseline/grid-self-baseline-horiz-002.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/alignment/self-baseline/grid-self-baseline-horiz-003.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/alignment/self-baseline/grid-self-baseline-horiz-005.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/alignment/self-baseline/grid-self-baseline-horiz-007.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-lr-002.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-lr-004.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-lr-005.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-lr-007.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-rl-002.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-rl-003.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-rl-004.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-rl-005.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/alignment/self-baseline/grid-self-baseline-vertical-rl-007.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/alignment/grid-alignment-implies-size-change-011.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/alignment/grid-alignment-implies-size-change-012.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/alignment/grid-alignment-implies-size-change-013.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/alignment/grid-alignment-implies-size-change-014.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/alignment/grid-alignment-implies-size-change-017.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/alignment/grid-alignment-implies-size-change-018.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/alignment/grid-alignment-implies-size-change-029.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/alignment/grid-alignment-implies-size-change-030.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/alignment/grid-alignment-implies-size-change-031.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/alignment/grid-alignment-implies-size-change-035.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/alignment/grid-alignment-implies-size-change-036.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/alignment/grid-alignment-style-changes-003.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/alignment/grid-alignment-style-changes-004.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/alignment/grid-align-baseline-001.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/alignment/grid-align-baseline-002.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/alignment/grid-align-baseline-003.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/alignment/grid-align-baseline-004.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/alignment/grid-align-baseline-fieldset-001.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/alignment/grid-align-baseline-fieldset-002.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/alignment/grid-align-baseline-fieldset-003.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/alignment/grid-align-baseline-flex-001.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/alignment/grid-align-baseline-flex-002.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/alignment/grid-align-baseline-flex-003.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/alignment/grid-align-baseline-flex-004.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/alignment/grid-align-baseline-grid-001.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/alignment/grid-align-baseline-grid-002.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/alignment/grid-align-baseline-grid-003.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/alignment/grid-align-baseline-line-clamp-001.tentative.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/alignment/grid-align-baseline-line-clamp-002.tentative.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/alignment/grid-align-baseline-line-clamp-003.tentative.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/alignment/grid-align-baseline-multicol-001.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/alignment/grid-align-baseline-multicol-002.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/alignment/grid-align-baseline-multicol-003.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/alignment/grid-align-baseline-overflow-001.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/alignment/grid-align-baseline-overflow-002.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/alignment/grid-align-baseline-overflow-003.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/alignment/grid-align-baseline-table-001.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/alignment/grid-align-baseline-table-002.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/alignment/grid-align-baseline-table-003.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/alignment/grid-baseline-004.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/alignment/grid-container-baseline-001.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/alignment/grid-content-alignment-overflow-002.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/alignment/grid-content-alignment-with-abspos-001.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/alignment/grid-item-aspect-ratio-stretch-1.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/alignment/grid-item-aspect-ratio-stretch-2.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/alignment/grid-item-aspect-ratio-stretch-3.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/alignment/grid-item-aspect-ratio-stretch-4.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/alignment/grid-item-self-baseline-001.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/alignment/grid-inline-baseline.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/alignment/grid-justify-baseline-001.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/alignment/grid-justify-baseline-002.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/alignment/grid-justify-baseline-003.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/alignment/grid-justify-baseline-004.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/alignment/grid-justify-baseline-005.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/alignment/grid-row-axis-self-baseline-synthesized-001.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/alignment/grid-row-axis-self-baseline-synthesized-002.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/alignment/grid-row-axis-self-baseline-synthesized-003.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/alignment/grid-row-axis-self-baseline-synthesized-004.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/alignment/grid-self-baseline-not-applied-if-sizing-cyclic-dependency-002.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/alignment/grid-self-baseline-not-applied-if-sizing-cyclic-dependency-003.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/alignment/grid-self-alignment-baseline-with-grid-001.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/alignment/grid-self-alignment-baseline-with-grid-002.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/alignment/grid-self-alignment-baseline-with-grid-003.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/alignment/grid-self-alignment-baseline-with-grid-004.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/alignment/grid-self-alignment-positioned-items-with-margin-border-padding-016.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/alignment/replaced-alignment-with-aspect-ratio-001.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/alignment/replaced-alignment-with-aspect-ratio-002.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/alignment/replaced-alignment-with-aspect-ratio-006.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/alignment/replaced-alignment-with-aspect-ratio-007.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/alignment/replaced-alignment-with-aspect-ratio-008.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/alignment/replaced-alignment-with-aspect-ratio-009.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/animation/grid-template-columns-001.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/animation/grid-template-columns-composition.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/animation/grid-template-columns-interpolation.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/animation/grid-template-columns-neutral-keyframe-001.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/animation/grid-template-columns-neutral-keyframe-002.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/animation/grid-template-columns-neutral-keyframe-003.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/animation/grid-template-columns-neutral-keyframe-004.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/animation/grid-template-rows-001.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/animation/grid-template-rows-composition.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/animation/grid-template-rows-interpolation.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/animation/grid-template-rows-neutral-keyframe-001.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/animation/grid-template-rows-neutral-keyframe-002.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/animation/grid-template-rows-neutral-keyframe-003.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/animation/grid-template-rows-neutral-keyframe-004.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/grid-definition/grid-auto-fill-columns-001.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/grid-definition/grid-auto-fill-rows-001.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/grid-definition/grid-auto-fit-columns-001.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/grid-definition/grid-auto-fit-rows-001.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/grid-definition/grid-auto-repeat-aspect-ratio-001.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/grid-definition/grid-auto-repeat-aspect-ratio-002.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/grid-definition/grid-auto-repeat-dynamic-001.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/grid-definition/grid-auto-repeat-dynamic-003.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/grid-definition/grid-auto-repeat-minmax.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/grid-definition/grid-limits-001.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/grid-items/aspect-ratio-004.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/grid-items/grid-intrinsic-maximums.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/grid-items/grid-item-inline-contribution-003.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/grid-items/grid-size-with-orthogonal-child-dynamic.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/grid-items/percentage-margin-dynamic.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/grid-items/replaced-element-015.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/grid-model/grid-areas-overflowing-grid-container-001.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/grid-model/grid-areas-overflowing-grid-container-002.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/grid-model/grid-areas-overflowing-grid-container-003.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/grid-model/grid-item-hit-test.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/grid-model/grid-overflow-padding-001.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/grid-model/grid-overflow-padding-002.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/layout-algorithm/baseline-alignment-affects-intrinsic-size-001.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/layout-algorithm/baseline-alignment-affects-intrinsic-size-003.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/layout-algorithm/baseline-alignment-affects-intrinsic-size-004.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/layout-algorithm/flex-sizing-rows-indefinite-height.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/layout-algorithm/flex-tracks-with-fractional-size.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/layout-algorithm/grid-content-distribution-must-account-for-track-sizing-002.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/layout-algorithm/grid-flex-track-intrinsic-sizes-001.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/layout-algorithm/grid-flex-track-intrinsic-sizes-002.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/layout-algorithm/grid-flex-track-intrinsic-sizes-003.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/layout-algorithm/grid-intrinsic-size-dynamic-block-size.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/layout-algorithm/grid-intrinsic-size-with-orthogonal-items.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/layout-algorithm/grid-minimum-contribution-baseline-shim-vertical-rl.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/layout-algorithm/grid-template-flexible-rerun-track-sizing.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/grid-within-flexbox-indefinite.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/grid-with-dynamic-img.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/grid-with-orthogonal-child-within-flexbox.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/parsing/grid-template-columns-computed-nogrid.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-grid/parsing/grid-template-rows-computed-nogrid.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-025.html [ Failure ] -crbug.com/1045599 external/wpt/css/css-sizing/contain-intrinsic-size/contain-intrinsic-size-026.html [ Failure ] -crbug.com/1045599 fast/css-grid-layout/grid-auto-repeat-huge-grid-001.html [ Failure ] -crbug.com/1045599 fast/css-grid-layout/grid-auto-repeat-huge-grid-002.html [ Failure ] -crbug.com/1045599 fast/css-grid-layout/grid-auto-repeat-huge-grid-003.html [ Failure ] -crbug.com/1045599 fast/css-grid-layout/grid-auto-repeat-huge-grid-004.html [ Failure ] -crbug.com/1045599 fast/css-grid-layout/grid-auto-repeat-huge-grid-005.html [ Failure ] -crbug.com/1045599 fast/css-grid-layout/grid-auto-repeat-huge-grid-006.html [ Failure ] -crbug.com/1045599 fast/css-grid-layout/grid-auto-repeat-huge-grid-007.html [ Failure ] -crbug.com/1045599 fast/css-grid-layout/grid-auto-repeat-huge-grid-008.html [ Failure ] -crbug.com/1045599 fast/css-grid-layout/grid-auto-repeat-huge-grid-009.html [ Failure ] -crbug.com/1045599 fast/css-grid-layout/grid-auto-repeat-huge-grid-010.html [ Failure ] -crbug.com/1045599 fast/css-grid-layout/grid-auto-repeat-huge-grid-011.html [ Failure ] -crbug.com/1045599 fast/css-grid-layout/grid-auto-repeat-huge-grid-012.html [ Failure ] -crbug.com/1045599 fast/css-grid-layout/grid-auto-repeat-huge-grid-013.html [ Failure ] -crbug.com/1045599 fast/css-grid-layout/grid-auto-repeat-huge-grid-014.html [ Failure ] -crbug.com/1045599 fast/css-grid-layout/grid-auto-repeat-huge-grid-015.html [ Failure ] -crbug.com/1045599 fast/css-grid-layout/grid-auto-repeat-huge-grid-016.html [ Failure ] -crbug.com/1045599 fast/css-grid-layout/grid-auto-repeat-huge-grid-017.html [ Failure ] -crbug.com/1045599 fast/css-grid-layout/grid-auto-repeat-huge-grid-018.html [ Failure ] -crbug.com/1045599 fast/css-grid-layout/grid-auto-repeat-huge-grid-019.html [ Failure ] -crbug.com/1045599 fast/css-grid-layout/grid-item-spanning-and-orthogonal-flows.html [ Failure ] -crbug.com/1045599 fast/css-grid-layout/grid-track-sizing-with-orthogonal-flows.html [ Failure ] -crbug.com/1045599 fast/css-grid-layout/maximize-tracks-definite-indefinite-height.html [ Failure ] -crbug.com/1045599 fast/css-grid-layout/non-grid-element-repeat-get-set.html [ Failure ] -crbug.com/1045599 fast/css-grid-layout/non-named-grid-line-get-set.html [ Failure ] -crbug.com/1045599 http/tests/devtools/elements/highlight/highlight-css-grid-area.js [ Failure ] -crbug.com/1045599 http/tests/devtools/elements/highlight/highlight-css-grid-direction.js [ Failure ] -crbug.com/1045599 http/tests/devtools/elements/highlight/highlight-css-grid-huge.js [ Failure ] -crbug.com/1045599 http/tests/devtools/elements/highlight/highlight-css-grid-line-names.js [ Failure ] -crbug.com/1045599 http/tests/devtools/elements/highlight/highlight-css-grid.js [ Failure ] -crbug.com/1045599 http/tests/devtools/elements/highlight/highlight-display-locked-grid.js [ Failure ] - -### Subgrid will not be implemented in legacy. -crbug.com/618969 external/wpt/css/css-grid/subgrid/* [ Skip ] - -### external/wpt/css/css-images -crbug.com/1076121 external/wpt/css/css-images/image-orientation/image-orientation-list-style-image.html [ Failure ] - -### external/wpt/css/css-layout-api/ -crbug.com/591099 external/wpt/css/css-layout-api/* [ Skip ] - -### external/wpt/css/css-multicol/ -crbug.com/829028 external/wpt/css/css-multicol/abspos-containing-block-outside-spanner.html [ Failure ] -crbug.com/829028 external/wpt/css/css-multicol/auto-fill-auto-size-002-print.html [ Failure ] -crbug.com/829028 external/wpt/css/css-multicol/balance-break-avoidance-001.html [ Failure ] -crbug.com/829028 external/wpt/css/css-multicol/balance-break-avoidance-002.html [ Failure ] -crbug.com/829028 external/wpt/css/css-multicol/balance-orphans-widows-000.html [ Failure ] -crbug.com/829028 external/wpt/css/css-multicol/baseline-001.html [ Failure ] -crbug.com/829028 external/wpt/css/css-multicol/baseline-007.html [ Failure ] -crbug.com/829028 external/wpt/css/css-multicol/fixed-in-multicol-with-transform-container.html [ Failure ] -crbug.com/829028 external/wpt/css/css-multicol/hit-test-transformed-child.html [ Failure ] -crbug.com/829028 external/wpt/css/css-multicol/multicol-fill-balance-008.html [ Failure ] -crbug.com/829028 external/wpt/css/css-multicol/multicol-fill-balance-009.html [ Failure ] -crbug.com/829028 external/wpt/css/css-multicol/multicol-fill-balance-010.html [ Failure ] -crbug.com/829028 external/wpt/css/css-multicol/multicol-fill-balance-011.html [ Failure ] -crbug.com/829028 external/wpt/css/css-multicol/multicol-fill-balance-012.html [ Failure ] -crbug.com/829028 external/wpt/css/css-multicol/multicol-fill-balance-013.html [ Failure ] -crbug.com/829028 external/wpt/css/css-multicol/multicol-fill-balance-014.html [ Failure ] -crbug.com/829028 external/wpt/css/css-multicol/multicol-fill-balance-021.html [ Failure ] -crbug.com/829028 external/wpt/css/css-multicol/multicol-fill-balance-022.html [ Failure ] -crbug.com/829028 external/wpt/css/css-multicol/multicol-fill-balance-023.html [ Failure ] -crbug.com/829028 external/wpt/css/css-multicol/multicol-nested-007.html [ Failure ] -crbug.com/829028 external/wpt/css/css-multicol/multicol-nested-008.html [ Failure ] -crbug.com/829028 external/wpt/css/css-multicol/multicol-nested-009.html [ Failure ] -crbug.com/829028 external/wpt/css/css-multicol/multicol-nested-010.html [ Failure ] -crbug.com/829028 external/wpt/css/css-multicol/multicol-nested-011.html [ Failure ] -crbug.com/829028 external/wpt/css/css-multicol/multicol-nested-012.html [ Failure ] -crbug.com/829028 external/wpt/css/css-multicol/multicol-nested-013.html [ Failure ] -crbug.com/829028 external/wpt/css/css-multicol/multicol-nested-015.html [ Failure ] -crbug.com/829028 external/wpt/css/css-multicol/multicol-nested-016.html [ Failure ] -crbug.com/829028 external/wpt/css/css-multicol/multicol-nested-017.html [ Failure ] -crbug.com/829028 external/wpt/css/css-multicol/multicol-nested-018.html [ Failure ] -crbug.com/829028 external/wpt/css/css-multicol/multicol-nested-022.html [ Failure ] -crbug.com/829028 external/wpt/css/css-multicol/multicol-nested-023.html [ Failure ] -crbug.com/829028 external/wpt/css/css-multicol/multicol-nested-026.html [ Failure ] -crbug.com/1246602 external/wpt/css/css-multicol/multicol-oof-inline-cb-001.html [ Failure ] -crbug.com/1246602 external/wpt/css/css-multicol/multicol-oof-inline-cb-002.html [ Failure ] -crbug.com/990240 external/wpt/css/css-multicol/multicol-rule-nested-balancing-004.html [ Failure ] -crbug.com/829028 external/wpt/css/css-multicol/multicol-span-all-children-height-009.html [ Failure ] -crbug.com/829028 external/wpt/css/css-multicol/multicol-span-all-children-height-010.html [ Failure ] -crbug.com/829028 external/wpt/css/css-multicol/multicol-span-all-children-height-012.html [ Failure ] -crbug.com/874051 external/wpt/css/css-multicol/multicol-span-all-fieldset-001.html [ Failure ] -crbug.com/874051 external/wpt/css/css-multicol/multicol-span-all-fieldset-002.html [ Failure ] -crbug.com/874051 external/wpt/css/css-multicol/multicol-span-all-fieldset-003.html [ Failure ] -crbug.com/915204 external/wpt/css/css-multicol/multicol-span-all-005.html [ Failure ] -crbug.com/915204 external/wpt/css/css-multicol/multicol-span-all-006.html [ Failure ] -crbug.com/915204 external/wpt/css/css-multicol/multicol-span-all-007.html [ Failure ] -crbug.com/915204 external/wpt/css/css-multicol/multicol-span-all-009.html [ Failure ] -crbug.com/915204 external/wpt/css/css-multicol/multicol-span-all-008.html [ Failure ] -crbug.com/915204 external/wpt/css/css-multicol/multicol-span-all-011.html [ Failure ] -crbug.com/829028 external/wpt/css/css-multicol/multicol-span-all-014.html [ Failure ] -crbug.com/829028 external/wpt/css/css-multicol/multicol-span-all-015.html [ Failure ] -crbug.com/591099 external/wpt/css/css-multicol/multicol-span-all-list-item-002.html [ Failure ] -crbug.com/892817 external/wpt/css/css-multicol/multicol-span-all-margin-bottom-001.xht [ Failure ] -crbug.com/792446 external/wpt/css/css-multicol/multicol-span-float-001.xht [ Failure ] -crbug.com/792446 external/wpt/css/css-multicol/multicol-span-float-002.html [ Failure ] -crbug.com/792446 external/wpt/css/css-multicol/multicol-span-float-003.html [ Failure ] -crbug.com/829028 external/wpt/css/css-multicol/nested-at-outer-boundary-as-fieldset.html [ Failure ] -crbug.com/829028 external/wpt/css/css-multicol/nested-floated-multicol-with-monolithic-child.html [ Failure ] -crbug.com/829028 external/wpt/css/css-multicol/nested-past-fragmentation-line.html [ Failure ] -crbug.com/829028 external/wpt/css/css-multicol/nested-with-too-tall-line.html [ Failure ] -crbug.com/829028 external/wpt/css/css-multicol/non-adjacent-spanners-000.html [ Failure ] -crbug.com/829028 external/wpt/css/css-multicol/orthogonal-writing-mode-spanner.html [ Failure ] -crbug.com/829028 external/wpt/css/css-multicol/overflow-unsplittable-001.html [ Failure ] -crbug.com/829028 external/wpt/css/css-multicol/overflow-unsplittable-002.html [ Failure ] -crbug.com/829028 external/wpt/css/css-multicol/overflow-unsplittable-003.html [ Failure ] -crbug.com/829028 external/wpt/css/css-multicol/spanner-fragmentation-001.html [ Failure ] -crbug.com/829028 external/wpt/css/css-multicol/spanner-fragmentation-009.html [ Failure ] -crbug.com/829028 external/wpt/css/css-multicol/spanner-fragmentation-010.html [ Failure ] -crbug.com/829028 external/wpt/css/css-multicol/spanner-fragmentation-011.html [ Failure ] -crbug.com/1078927 external/wpt/css/css-multicol/table/table-cell-multicol-nested-002.html [ Failure ] -crbug.com/1078927 external/wpt/css/css-multicol/table/table-cell-multicol-nested-003.html [ Failure ] -crbug.com/998423 external/wpt/css/css-multicol/with-custom-layout-on-same-element-crash.https.html [ Skip ] -crbug.com/998423 external/wpt/css/css-multicol/with-custom-layout-on-same-element.https.html [ Skip ] - -### external/wpt/css/css-position/ -crbug.com/591099 external/wpt/css/css-position/position-absolute-center-003.html [ Failure ] -crbug.com/591099 external/wpt/css/css-position/position-absolute-center-004.html [ Failure ] -crbug.com/591099 external/wpt/css/css-position/position-absolute-center-006.html [ Failure ] -crbug.com/591099 external/wpt/css/css-position/position-absolute-dynamic-overflow-002.html [ Failure ] -crbug.com/591099 external/wpt/css/css-position/position-absolute-fit-content.html [ Failure ] -crbug.com/591099 external/wpt/css/css-position/position-absolute-in-inline-003.html [ Failure ] -crbug.com/591099 external/wpt/css/css-position/position-absolute-in-inline-004.html [ Failure ] -crbug.com/591099 external/wpt/css/css-position/position-absolute-replaced-intrinsic-size.tentative.html [ Failure ] -crbug.com/591099 external/wpt/css/css-position/position-absolute-replaced-no-intrinsic-size.tentative.html [ Failure ] -crbug.com/591099 external/wpt/css/css-position/position-absolute-semi-replaced-stretch-button.html [ Failure ] -crbug.com/591099 external/wpt/css/css-position/position-absolute-semi-replaced-stretch-input.html [ Failure ] -crbug.com/591099 external/wpt/css/css-position/position-absolute-semi-replaced-stretch-other.html [ Failure ] -crbug.com/591099 external/wpt/css/css-position/position-relative-001.html [ Failure ] -crbug.com/591099 external/wpt/css/css-position/position-relative-002.html [ Failure ] -crbug.com/591099 external/wpt/css/css-position/position-relative-004.html [ Failure ] -crbug.com/591099 external/wpt/css/css-position/position-relative-011.html [ Failure ] -crbug.com/591099 external/wpt/css/css-position/position-relative-012.html [ Failure ] -crbug.com/591099 external/wpt/css/css-position/position-relative-013.html [ Failure ] - -### external/wpt/css/css-position/static-position/ -crbug.com/591099 external/wpt/css/css-position/static-position/htb-ltr-rtl.tentative.html [ Failure ] -crbug.com/591099 external/wpt/css/css-position/static-position/htb-rtl-ltr.tentative.html [ Failure ] -crbug.com/591099 external/wpt/css/css-position/static-position/htb-rtl-rtl.html [ Failure ] -crbug.com/591099 external/wpt/css/css-position/static-position/vlr-ltr-rtl.tentative.html [ Failure ] -crbug.com/591099 external/wpt/css/css-position/static-position/vlr-rtl-ltr.tentative.html [ Failure ] -crbug.com/591099 external/wpt/css/css-position/static-position/vlr-rtl-rtl.html [ Failure ] -crbug.com/591099 external/wpt/css/css-position/static-position/vrl-ltr-rtl.tentative.html [ Failure ] -crbug.com/591099 external/wpt/css/css-position/static-position/vrl-rtl-ltr.tentative.html [ Failure ] -crbug.com/591099 external/wpt/css/css-position/static-position/vrl-rtl-rtl.html [ Failure ] - -### external/wpt/css/css-pseudo/ -crbug.com/1101040 external/wpt/css/css-pseudo/marker-content-016.html [ Failure ] -crbug.com/1101034 external/wpt/css/css-pseudo/marker-content-018.html [ Failure ] -crbug.com/1108830 external/wpt/css/css-pseudo/marker-hyphens.html [ Failure ] -crbug.com/1108830 external/wpt/css/css-pseudo/marker-line-break.html [ Failure ] -crbug.com/1108830 external/wpt/css/css-pseudo/marker-line-height.html [ Failure ] -crbug.com/1108830 external/wpt/css/css-pseudo/marker-overflow-wrap.html [ Failure ] -crbug.com/1108830 external/wpt/css/css-pseudo/marker-text-decoration-skip-ink.html [ Failure ] -crbug.com/1108830 external/wpt/css/css-pseudo/marker-text-emphasis.html [ Failure ] -crbug.com/1108830 external/wpt/css/css-pseudo/marker-text-shadow.html [ Failure ] -crbug.com/1108830 external/wpt/css/css-pseudo/marker-text-transform-dynamic.html [ Failure ] -crbug.com/1108830 external/wpt/css/css-pseudo/marker-text-transform-uppercase.html [ Failure ] -crbug.com/1108830 external/wpt/css/css-pseudo/marker-word-break.html [ Failure ] -crbug.com/1012289 external/wpt/css/css-pseudo/marker-unicode-bidi-default.html [ Failure ] -crbug.com/1012289 external/wpt/css/css-pseudo/marker-unicode-bidi-normal.html [ Failure ] -crbug.com/1136817 external/wpt/css/css-pseudo/target-text-007.html [ Failure ] -crbug.com/1035708 wpt_internal/css/css-pseudo/spelling-error-color-001.html [ Failure ] -crbug.com/1035708 wpt_internal/css/css-pseudo/grammar-error-color-001.html [ Failure ] -crbug.com/1035708 external/wpt/css/css-pseudo/selection-background-painting-order.html [ Failure ] -crbug.com/1035708 external/wpt/css/css-pseudo/selection-originating-decoration-color.html [ Failure ] -crbug.com/1035708 virtual/css-highlight-inheritance/external/wpt/css/css-pseudo/selection-background-painting-order.html [ Failure ] -crbug.com/1035708 virtual/css-highlight-inheritance/external/wpt/css/css-pseudo/selection-originating-decoration-color.html [ Failure ] - -### external/wpt/css/css-ruby/ -crbug.com/591099 external/wpt/css/css-ruby/abs-in-ruby-base-container.html [ Failure ] -crbug.com/591099 external/wpt/css/css-ruby/abs-in-ruby-base.html [ Failure ] -crbug.com/591099 external/wpt/css/css-ruby/br-clear-all-002.html [ Failure ] -crbug.com/591099 external/wpt/css/css-ruby/ruby-line-breaking-002.html [ Failure ] -crbug.com/591099 external/wpt/css/css-ruby/ruby-with-floats-002.html [ Failure ] -crbug.com/591099 external/wpt/css/css-ruby/ruby-with-floats-003.html [ Failure ] - -### external/wpt/css/css-shapes/shape-outside/shape-box/ -crbug.com/591099 external/wpt/css/css-shapes/shape-outside/shape-box/shape-outside-border-box-border-radius-003.html [ Failure ] -crbug.com/591099 external/wpt/css/css-shapes/shape-outside/shape-box/shape-outside-border-box-border-radius-004.html [ Failure ] -crbug.com/591099 external/wpt/css/css-shapes/shape-outside/shape-box/shape-outside-content-box-border-radius-002.html [ Failure ] -crbug.com/591099 external/wpt/css/css-shapes/shape-outside/shape-box/shape-outside-margin-box-border-radius-003.html [ Failure ] -crbug.com/591099 external/wpt/css/css-shapes/shape-outside/shape-box/shape-outside-margin-box-border-radius-004.html [ Failure ] -crbug.com/591099 external/wpt/css/css-shapes/shape-outside/shape-box/shape-outside-margin-box-border-radius-008.html [ Failure ] -crbug.com/591099 external/wpt/css/css-shapes/shape-outside/shape-box/shape-outside-padding-box-border-radius-002.html [ Failure ] - -### external/wpt/css/css-shapes/shape-outside/supported-shapes/ -crbug.com/591099 external/wpt/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-042.html [ Failure ] -crbug.com/591099 external/wpt/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-044.html [ Failure ] -crbug.com/591099 external/wpt/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-050.html [ Failure ] -crbug.com/591099 external/wpt/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-055.html [ Failure ] -crbug.com/591099 external/wpt/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-038.html [ Failure ] -crbug.com/591099 external/wpt/css/css-shapes/shape-outside/supported-shapes/ellipse/shape-outside-ellipse-039.html [ Failure ] -crbug.com/591099 external/wpt/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-024.html [ Failure ] - -### external/wpt/css/css-shapes/shape-outside/supported-shapes/polygon/ -crbug.com/591099 external/wpt/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-017.html [ Failure ] - -### external/wpt/css/css-sizing/ -crbug.com/1045668 external/wpt/css/css-sizing/aspect-ratio/abspos-013.html [ Pass ] -crbug.com/1154572 external/wpt/css/css-sizing/aspect-ratio/block-aspect-ratio-030.html [ Failure ] -crbug.com/1154572 external/wpt/css/css-sizing/aspect-ratio/block-aspect-ratio-037.html [ Failure ] -crbug.com/1157740 external/wpt/css/css-sizing/aspect-ratio/flex-aspect-ratio-024.html [ Failure ] -crbug.com/1157740 external/wpt/css/css-sizing/aspect-ratio/flex-aspect-ratio-026.html [ Failure ] -crbug.com/1157740 external/wpt/css/css-sizing/aspect-ratio/flex-aspect-ratio-042.html [ Failure ] -crbug.com/591099 external/wpt/css/css-sizing/calc-margins-block.html [ Failure ] -crbug.com/591099 external/wpt/css/css-sizing/calc-margins-fieldset-content.html [ Failure ] -crbug.com/591099 external/wpt/css/css-sizing/calc-margins-fieldset-legend.html [ Failure ] -crbug.com/591099 external/wpt/css/css-sizing/calc-margins-flex.html [ Failure ] -crbug.com/591099 external/wpt/css/css-sizing/calc-margins-table-caption.html [ Failure ] -crbug.com/591099 external/wpt/css/css-sizing/clone-nowrap-intrinsic-size-bidi.html [ Failure ] -crbug.com/591099 external/wpt/css/css-sizing/intrinsic-percent-non-replaced-004.html [ Failure ] -crbug.com/591099 external/wpt/css/css-sizing/intrinsic-percent-non-replaced-005.html [ Failure ] -crbug.com/591099 external/wpt/css/css-sizing/intrinsic-percent-replaced-008.html [ Failure ] -crbug.com/591099 external/wpt/css/css-sizing/intrinsic-percent-replaced-dynamic-001.html [ Failure ] -crbug.com/591099 external/wpt/css/css-sizing/intrinsic-percent-replaced-dynamic-002.html [ Failure ] -crbug.com/591099 external/wpt/css/css-sizing/intrinsic-percent-replaced-dynamic-004.html [ Failure ] -crbug.com/591099 external/wpt/css/css-sizing/intrinsic-percent-replaced-dynamic-006.html [ Failure ] -crbug.com/591099 external/wpt/css/css-sizing/intrinsic-percent-replaced-dynamic-007.html [ Failure ] -crbug.com/591099 external/wpt/css/css-sizing/intrinsic-percent-replaced-dynamic-008.html [ Failure ] -crbug.com/591099 external/wpt/css/css-sizing/whitespace-and-break.html [ Failure ] -crbug.com/1135287 external/wpt/css/css-sizing/image-min-max-content-intrinsic-size-change-001.html [ Failure ] -crbug.com/1135287 external/wpt/css/css-sizing/image-min-max-content-intrinsic-size-change-002.html [ Failure ] -crbug.com/1135287 external/wpt/css/css-sizing/image-min-max-content-intrinsic-size-change-003.html [ Failure ] -crbug.com/1135287 external/wpt/css/css-sizing/image-min-max-content-intrinsic-size-change-004.html [ Failure ] -crbug.com/1135287 external/wpt/css/css-sizing/image-min-max-content-intrinsic-size-change-005.html [ Failure ] -crbug.com/1135287 external/wpt/css/css-sizing/image-min-max-content-intrinsic-size-change-006.html [ Failure ] -crbug.com/1135287 external/wpt/css/css-sizing/image-min-max-content-intrinsic-size-change-007.html [ Failure ] -crbug.com/1135287 external/wpt/css/css-sizing/image-min-max-content-intrinsic-size-change-008.html [ Failure ] -crbug.com/591099 wpt_internal/css/css-sizing/stretch-positioned-replaced.html [ Failure ] -crbug.com/591099 wpt_internal/css/css-sizing/stretch-positioned-non-replaced.html [ Failure ] - -### external/wpt/css/css-text/boundary-shaping/ -crbug.com/591099 external/wpt/css/css-text/boundary-shaping/boundary-shaping-001.html [ Failure ] -crbug.com/591099 external/wpt/css/css-text/boundary-shaping/boundary-shaping-003.html [ Failure ] -crbug.com/591099 external/wpt/css/css-text/boundary-shaping/boundary-shaping-004.html [ Failure ] -crbug.com/591099 external/wpt/css/css-text/boundary-shaping/boundary-shaping-005.html [ Failure ] -crbug.com/591099 external/wpt/css/css-text/boundary-shaping/boundary-shaping-010.html [ Failure ] - -### external/wpt/css/css-text/hyphens/ -crbug.com/924069 external/wpt/css/css-text/hyphens/hyphenate-limit-chars-001.html [ Failure ] -crbug.com/591099 external/wpt/css/css-text/hyphens/hyphens-shaping-001.html [ Failure ] -crbug.com/958672 external/wpt/css/css-text/hyphens/hyphens-shaping-002.html [ Failure ] -crbug.com/958672 external/wpt/css/css-text/hyphens/hyphens-span-001.html [ Failure ] -crbug.com/1267606 external/wpt/css/css-text/hyphens/hyphens-character.html [ Failure ] - -### external/wpt/css/css-text/line-break/ -crbug.com/591099 external/wpt/css/css-text/line-break/line-break-anywhere-001.html [ Failure ] -crbug.com/591099 external/wpt/css/css-text/line-break/line-break-anywhere-and-white-space-004.html [ Failure ] -crbug.com/591099 external/wpt/css/css-text/line-break/line-break-anywhere-and-white-space-006.html [ Failure ] -crbug.com/591099 external/wpt/css/css-text/line-break/line-break-anywhere-and-white-space-007.html [ Failure ] -crbug.com/591099 external/wpt/css/css-text/line-break/line-break-shaping-001.html [ Failure ] - -### external/wpt/css/css-text/line-breaking/ -crbug.com/591099 external/wpt/css/css-text/line-breaking/line-breaking-009.html [ Failure ] -crbug.com/591099 external/wpt/css/css-text/line-breaking/line-breaking-011.html [ Failure ] -crbug.com/591099 external/wpt/css/css-text/line-breaking/line-breaking-015.html [ Failure ] -crbug.com/591099 external/wpt/css/css-text/line-breaking/line-breaking-ic-002.html [ Failure ] -crbug.com/591099 external/wpt/css/css-text/line-breaking/line-breaking-ic-003.html [ Failure ] - -### external/wpt/css/css-text/overflow-wrap/ -crbug.com/1019695 external/wpt/css/css-text/overflow-wrap/overflow-wrap-shaping-001.html [ Failure ] -crbug.com/1019695 external/wpt/css/css-text/overflow-wrap/overflow-wrap-shaping-002.html [ Failure ] -crbug.com/1020749 external/wpt/css/css-text/overflow-wrap/overflow-wrap-anywhere-inline-004.tentative.html [ Failure ] -crbug.com/1205334 external/wpt/css/css-text/overflow-wrap/overflow-wrap-min-content-size-009.html [ Failure ] - -### external/wpt/css/css-text/shaping/ -crbug.com/591099 external/wpt/css/css-text/shaping/shaping-000.html [ Failure ] -crbug.com/591099 external/wpt/css/css-text/shaping/shaping-001.html [ Failure ] -crbug.com/591099 external/wpt/css/css-text/shaping/shaping-002.html [ Failure ] -crbug.com/591099 external/wpt/css/css-text/shaping/shaping-003.html [ Failure ] -crbug.com/591099 external/wpt/css/css-text/shaping/shaping-004.html [ Failure ] -crbug.com/591099 external/wpt/css/css-text/shaping/shaping-005.html [ Failure ] -crbug.com/591099 external/wpt/css/css-text/shaping/shaping-006.html [ Failure ] -crbug.com/591099 external/wpt/css/css-text/shaping/shaping-007.html [ Failure ] -crbug.com/591099 external/wpt/css/css-text/shaping/shaping-008.html [ Failure ] -crbug.com/591099 external/wpt/css/css-text/shaping/shaping-014.html [ Failure ] -crbug.com/591099 external/wpt/css/css-text/shaping/shaping-016.html [ Failure ] -crbug.com/591099 external/wpt/css/css-text/shaping/shaping-017.html [ Failure ] -crbug.com/591099 external/wpt/css/css-text/shaping/shaping-018.html [ Failure ] -crbug.com/591099 external/wpt/css/css-text/shaping/shaping-020.html [ Failure ] -crbug.com/591099 external/wpt/css/css-text/shaping/shaping-021.html [ Failure ] -crbug.com/591099 external/wpt/css/css-text/shaping/shaping-022.html [ Failure ] -crbug.com/591099 external/wpt/css/css-text/shaping/shaping-023.html [ Failure ] -crbug.com/591099 external/wpt/css/css-text/shaping/shaping_lig-000.html [ Failure ] - -### external/wpt/css/css-text/text-encoding/ -crbug.com/591099 external/wpt/css/css-text/text-encoding/shaping-join-003.html [ Failure ] -crbug.com/591099 external/wpt/css/css-text/text-encoding/shaping-tatweel-003.html [ Failure ] - -### external/wpt/css/css-text/text-transform/ -crbug.com/591099 external/wpt/css/css-text/text-transform/text-transform-shaping-001.html [ Failure ] -crbug.com/591099 external/wpt/css/css-text/text-transform/text-transform-shaping-002.html [ Failure ] -crbug.com/591099 external/wpt/css/css-text/text-transform/text-transform-shaping-003.html [ Failure ] -crbug.com/750990 external/wpt/css/css-text/text-transform/text-transform-upperlower-105.html [ Crash ] - -### external/wpt/css/css-text/white-space/ -crbug.com/591099 external/wpt/css/css-text/white-space/control-chars-00C.html [ Failure ] -crbug.com/591099 external/wpt/css/css-text/white-space/line-edge-white-space-collapse-001.html [ Failure ] -crbug.com/591099 external/wpt/css/css-text/white-space/line-edge-white-space-collapse-002.html [ Failure ] -crbug.com/591099 external/wpt/css/css-text/white-space/pre-line-with-space-and-newline.html [ Failure ] -crbug.com/1151784 external/wpt/css/css-text/white-space/seg-break-transformation-016.tentative.html [ Failure ] -crbug.com/1151784 external/wpt/css/css-text/white-space/seg-break-transformation-017.tentative.html [ Failure ] -crbug.com/1162836 external/wpt/css/css-text/white-space/trailing-ideographic-space-017.html [ Failure ] -crbug.com/1162836 external/wpt/css/css-text/white-space/trailing-ideographic-space-020.html [ Failure ] -crbug.com/1162836 external/wpt/css/css-text/white-space/trailing-ideographic-space-023.html [ Failure ] -crbug.com/1162836 external/wpt/css/css-text/hyphens/hyphens-auto-004.html [ Failure ] -crbug.com/782638 external/wpt/css/css-text/white-space/trailing-space-and-text-alignment-001.html [ Failure ] -crbug.com/782638 external/wpt/css/css-text/white-space/trailing-space-and-text-alignment-003.html [ Failure ] -crbug.com/782638 external/wpt/css/css-text/white-space/trailing-space-and-text-alignment-004.html [ Failure ] -crbug.com/782638 external/wpt/css/css-text/white-space/trailing-space-and-text-alignment-005.html [ Failure ] -crbug.com/782638 external/wpt/css/css-text/white-space/trailing-space-and-text-alignment-rtl-001.html [ Failure ] -crbug.com/782638 external/wpt/css/css-text/white-space/trailing-space-and-text-alignment-rtl-003.html [ Failure ] -crbug.com/782638 external/wpt/css/css-text/white-space/trailing-space-and-text-alignment-rtl-004.html [ Failure ] -crbug.com/782638 external/wpt/css/css-text/white-space/trailing-space-and-text-alignment-rtl-005.html [ Failure ] - -### external/wpt/css/css-text/word-break/ -crbug.com/591099 external/wpt/css/css-text/word-break/word-break-break-all-004.html [ Failure ] -crbug.com/964181 external/wpt/css/css-text/word-break/word-break-break-all-inline-006.html [ Failure ] -crbug.com/1017164 external/wpt/css/css-text/word-break/word-break-break-all-inline-008.html [ Failure ] -crbug.com/1205334 external/wpt/css/css-text/word-break/word-break-min-content-007.html [ Failure ] - -### external/wpt/css/css-text-decor/ -crbug.com/1366288 external/wpt/css/css-text-decor/text-decoration-decorating-box-001.html [ Failure ] -crbug.com/591099 external/wpt/css/css-text-decor/text-decoration-skip-ink-vertical-001.html [ Failure ] -crbug.com/591099 external/wpt/css/css-text-decor/text-decoration-skip-ink-vertical-002.html [ Failure ] -crbug.com/1008951 external/wpt/css/css-text-decor/text-decoration-subelements-002.html [ Failure ] -crbug.com/1008951 external/wpt/css/css-text-decor/text-decoration-subelements-003.html [ Failure ] -crbug.com/591099 external/wpt/css/css-text-decor/text-decoration-thickness-overline-001.html [ Failure ] -crbug.com/591099 external/wpt/css/css-text-decor/text-decoration-thickness-scroll-001.html [ Failure ] -crbug.com/591099 external/wpt/css/css-text-decor/text-decoration-thickness-underline-001.html [ Failure ] -crbug.com/591099 external/wpt/css/css-text-decor/text-decoration-thickness-vertical-001.html [ Failure ] - -### external/wpt/css/css-ui/ -crbug.com/591099 external/wpt/css/css-ui/text-overflow-010.html [ Failure ] -crbug.com/1063319 external/wpt/css/css-ui/text-overflow-028.html [ Failure ] -crbug.com/1078539 external/wpt/css/css-ui/outline-025.html [ Failure ] -crbug.com/1078539 external/wpt/css/css-ui/outline-026.html [ Failure ] - -### external/wpt/css/css-writing-modes/ -crbug.com/591099 external/wpt/css/css-writing-modes/abs-pos-non-replaced-icb-vlr-003.xht [ Failure ] -crbug.com/591099 external/wpt/css/css-writing-modes/abs-pos-non-replaced-icb-vlr-005.xht [ Failure ] -crbug.com/591099 external/wpt/css/css-writing-modes/abs-pos-non-replaced-icb-vlr-011.xht [ Failure ] -crbug.com/591099 external/wpt/css/css-writing-modes/abs-pos-non-replaced-icb-vlr-013.xht [ Failure ] -crbug.com/591099 external/wpt/css/css-writing-modes/abs-pos-non-replaced-icb-vlr-033.xht [ Failure ] -crbug.com/591099 external/wpt/css/css-writing-modes/abs-pos-non-replaced-icb-vrl-002.xht [ Failure ] -crbug.com/591099 external/wpt/css/css-writing-modes/abs-pos-non-replaced-icb-vrl-004.xht [ Failure ] -crbug.com/591099 external/wpt/css/css-writing-modes/abs-pos-non-replaced-icb-vrl-006.xht [ Failure ] -crbug.com/591099 external/wpt/css/css-writing-modes/abs-pos-non-replaced-icb-vrl-008.xht [ Failure ] -crbug.com/591099 external/wpt/css/css-writing-modes/abs-pos-non-replaced-icb-vrl-010.xht [ Failure ] -crbug.com/591099 external/wpt/css/css-writing-modes/abs-pos-non-replaced-icb-vrl-012.xht [ Failure ] -crbug.com/591099 external/wpt/css/css-writing-modes/abs-pos-non-replaced-icb-vrl-014.xht [ Failure ] -crbug.com/591099 external/wpt/css/css-writing-modes/abs-pos-non-replaced-icb-vrl-016.xht [ Failure ] -crbug.com/591099 external/wpt/css/css-writing-modes/abs-pos-non-replaced-icb-vrl-018.xht [ Failure ] -crbug.com/591099 external/wpt/css/css-writing-modes/abs-pos-non-replaced-icb-vrl-020.xht [ Failure ] -crbug.com/591099 external/wpt/css/css-writing-modes/abs-pos-non-replaced-icb-vrl-030.xht [ Failure ] -crbug.com/591099 external/wpt/css/css-writing-modes/abs-pos-non-replaced-vlr-005.xht [ Failure ] -crbug.com/591099 external/wpt/css/css-writing-modes/abs-pos-non-replaced-vlr-017.xht [ Failure ] -crbug.com/591099 external/wpt/css/css-writing-modes/abs-pos-non-replaced-vlr-029.xht [ Failure ] -crbug.com/591099 external/wpt/css/css-writing-modes/abs-pos-non-replaced-vlr-041.xht [ Failure ] -crbug.com/591099 external/wpt/css/css-writing-modes/abs-pos-non-replaced-vlr-053.xht [ Failure ] -crbug.com/591099 external/wpt/css/css-writing-modes/abs-pos-non-replaced-vlr-065.xht [ Failure ] -crbug.com/591099 external/wpt/css/css-writing-modes/abs-pos-non-replaced-vlr-077.xht [ Failure ] -crbug.com/591099 external/wpt/css/css-writing-modes/abs-pos-non-replaced-vlr-089.xht [ Failure ] -crbug.com/591099 external/wpt/css/css-writing-modes/abs-pos-non-replaced-vlr-095.xht [ Failure ] -crbug.com/591099 external/wpt/css/css-writing-modes/abs-pos-non-replaced-vlr-105.xht [ Failure ] -crbug.com/591099 external/wpt/css/css-writing-modes/abs-pos-non-replaced-vlr-109.xht [ Failure ] -crbug.com/591099 external/wpt/css/css-writing-modes/abs-pos-non-replaced-vlr-121.xht [ Failure ] -crbug.com/591099 external/wpt/css/css-writing-modes/abs-pos-non-replaced-vlr-125.xht [ Failure ] -crbug.com/591099 external/wpt/css/css-writing-modes/abs-pos-non-replaced-vlr-137.xht [ Failure ] -crbug.com/591099 external/wpt/css/css-writing-modes/abs-pos-non-replaced-vlr-141.xht [ Failure ] -crbug.com/591099 external/wpt/css/css-writing-modes/abs-pos-non-replaced-vlr-153.xht [ Failure ] -crbug.com/591099 external/wpt/css/css-writing-modes/abs-pos-non-replaced-vlr-157.xht [ Failure ] -crbug.com/591099 external/wpt/css/css-writing-modes/abs-pos-non-replaced-vlr-169.xht [ Failure ] -crbug.com/591099 external/wpt/css/css-writing-modes/abs-pos-non-replaced-vlr-173.xht [ Failure ] -crbug.com/591099 external/wpt/css/css-writing-modes/abs-pos-non-replaced-vlr-185.xht [ Failure ] -crbug.com/591099 external/wpt/css/css-writing-modes/abs-pos-non-replaced-vlr-189.xht [ Failure ] -crbug.com/591099 external/wpt/css/css-writing-modes/abs-pos-non-replaced-vlr-201.xht [ Failure ] -crbug.com/591099 external/wpt/css/css-writing-modes/abs-pos-non-replaced-vlr-205.xht [ Failure ] -crbug.com/591099 external/wpt/css/css-writing-modes/abs-pos-non-replaced-vlr-217.xht [ Failure ] -crbug.com/591099 external/wpt/css/css-writing-modes/abs-pos-non-replaced-vlr-221.xht [ Failure ] -crbug.com/591099 external/wpt/css/css-writing-modes/abs-pos-non-replaced-vlr-225.xht [ Failure ] -crbug.com/591099 external/wpt/css/css-writing-modes/abs-pos-non-replaced-vlr-229.xht [ Failure ] -crbug.com/591099 external/wpt/css/css-writing-modes/abs-pos-non-replaced-vrl-004.xht [ Failure ] -crbug.com/591099 external/wpt/css/css-writing-modes/abs-pos-non-replaced-vrl-010.xht [ Failure ] -crbug.com/591099 external/wpt/css/css-writing-modes/abs-pos-non-replaced-vrl-016.xht [ Failure ] -crbug.com/591099 external/wpt/css/css-writing-modes/abs-pos-non-replaced-vrl-028.xht [ Failure ] -crbug.com/591099 external/wpt/css/css-writing-modes/abs-pos-non-replaced-vrl-034.xht [ Failure ] -crbug.com/591099 external/wpt/css/css-writing-modes/abs-pos-non-replaced-vrl-040.xht [ Failure ] -crbug.com/591099 external/wpt/css/css-writing-modes/abs-pos-non-replaced-vrl-052.xht [ Failure ] -crbug.com/591099 external/wpt/css/css-writing-modes/abs-pos-non-replaced-vrl-064.xht [ Failure ] -crbug.com/591099 external/wpt/css/css-writing-modes/abs-pos-non-replaced-vrl-076.xht [ Failure ] -crbug.com/591099 external/wpt/css/css-writing-modes/abs-pos-non-replaced-vrl-088.xht [ Failure ] -crbug.com/591099 external/wpt/css/css-writing-modes/abs-pos-non-replaced-vrl-104.xht [ Failure ] -crbug.com/591099 external/wpt/css/css-writing-modes/abs-pos-non-replaced-vrl-108.xht [ Failure ] -crbug.com/591099 external/wpt/css/css-writing-modes/abs-pos-non-replaced-vrl-112.xht [ Failure ] -crbug.com/591099 external/wpt/css/css-writing-modes/abs-pos-non-replaced-vrl-116.xht [ Failure ] -crbug.com/591099 external/wpt/css/css-writing-modes/abs-pos-non-replaced-vrl-124.xht [ Failure ] -crbug.com/591099 external/wpt/css/css-writing-modes/abs-pos-non-replaced-vrl-128.xht [ Failure ] -crbug.com/591099 external/wpt/css/css-writing-modes/abs-pos-non-replaced-vrl-136.xht [ Failure ] -crbug.com/591099 external/wpt/css/css-writing-modes/abs-pos-non-replaced-vrl-140.xht [ Failure ] -crbug.com/591099 external/wpt/css/css-writing-modes/abs-pos-non-replaced-vrl-144.xht [ Failure ] -crbug.com/591099 external/wpt/css/css-writing-modes/abs-pos-non-replaced-vrl-148.xht [ Failure ] -crbug.com/591099 external/wpt/css/css-writing-modes/abs-pos-non-replaced-vrl-156.xht [ Failure ] -crbug.com/591099 external/wpt/css/css-writing-modes/abs-pos-non-replaced-vrl-160.xht [ Failure ] -crbug.com/591099 external/wpt/css/css-writing-modes/abs-pos-non-replaced-vrl-172.xht [ Failure ] -crbug.com/591099 external/wpt/css/css-writing-modes/abs-pos-non-replaced-vrl-176.xht [ Failure ] -crbug.com/591099 external/wpt/css/css-writing-modes/abs-pos-non-replaced-vrl-188.xht [ Failure ] -crbug.com/591099 external/wpt/css/css-writing-modes/abs-pos-non-replaced-vrl-192.xht [ Failure ] -crbug.com/591099 external/wpt/css/css-writing-modes/abs-pos-non-replaced-vrl-204.xht [ Failure ] -crbug.com/591099 external/wpt/css/css-writing-modes/abs-pos-non-replaced-vrl-208.xht [ Failure ] -crbug.com/591099 external/wpt/css/css-writing-modes/abs-pos-non-replaced-vrl-220.xht [ Failure ] -crbug.com/591099 external/wpt/css/css-writing-modes/abs-pos-non-replaced-vrl-224.xht [ Failure ] -crbug.com/591099 external/wpt/css/css-writing-modes/abs-pos-with-replaced-child.html [ Failure ] -crbug.com/591099 external/wpt/css/css-writing-modes/available-size-002.html [ Failure ] -crbug.com/591099 external/wpt/css/css-writing-modes/available-size-010.html [ Failure ] -crbug.com/591099 external/wpt/css/css-writing-modes/available-size-017.html [ Failure ] -crbug.com/591099 external/wpt/css/css-writing-modes/baseline-with-orthogonal-flow-001.html [ Failure ] -crbug.com/591099 external/wpt/css/css-writing-modes/block-flow-direction-vrl-009.xht [ Failure ] -crbug.com/492664 external/wpt/css/css-writing-modes/clip-rect-vlr-003.xht [ Failure ] -crbug.com/492664 external/wpt/css/css-writing-modes/clip-rect-vlr-005.xht [ Failure ] -crbug.com/492664 external/wpt/css/css-writing-modes/clip-rect-vlr-007.xht [ Failure ] -crbug.com/492664 external/wpt/css/css-writing-modes/clip-rect-vlr-009.xht [ Failure ] -crbug.com/492664 external/wpt/css/css-writing-modes/clip-rect-vrl-002.xht [ Failure ] -crbug.com/492664 external/wpt/css/css-writing-modes/clip-rect-vrl-004.xht [ Failure ] -crbug.com/492664 external/wpt/css/css-writing-modes/clip-rect-vrl-006.xht [ Failure ] -crbug.com/492664 external/wpt/css/css-writing-modes/clip-rect-vrl-008.xht [ Failure ] -crbug.com/492664 external/wpt/css/css-writing-modes/inline-block-alignment-003.xht [ Failure ] -crbug.com/492664 external/wpt/css/css-writing-modes/inline-block-alignment-005.xht [ Failure ] -crbug.com/492664 external/wpt/css/css-writing-modes/inline-block-alignment-007.xht [ Failure ] -crbug.com/591099 external/wpt/css/css-writing-modes/inline-box-border-vlr-001.html [ Failure ] -crbug.com/591099 external/wpt/css/css-writing-modes/line-box-direction-vrl-009.xht [ Failure ] -crbug.com/591099 external/wpt/css/css-writing-modes/line-box-height-vlr-021.xht [ Failure ] -crbug.com/591099 external/wpt/css/css-writing-modes/line-box-height-vlr-023.xht [ Failure ] -crbug.com/464569 external/wpt/css/css-writing-modes/margin-collapse-vrl-022.xht [ Failure ] -crbug.com/591099 external/wpt/css/css-writing-modes/ortho-htb-alongside-vrl-floats-006.xht [ Failure ] -crbug.com/591099 external/wpt/css/css-writing-modes/ortho-htb-alongside-vrl-floats-014.xht [ Failure ] -crbug.com/1281318 external/wpt/css/css-writing-modes/padding-percent-orthogonal-dynamic.html [ Failure ] -crbug.com/591099 external/wpt/css/css-writing-modes/sizing-orthog-htb-in-vlr-001.xht [ Failure ] -crbug.com/591099 external/wpt/css/css-writing-modes/sizing-orthog-htb-in-vlr-004.xht [ Failure ] -crbug.com/591099 external/wpt/css/css-writing-modes/sizing-orthog-prct-htb-in-vlr-001.xht [ Failure ] -crbug.com/591099 external/wpt/css/css-writing-modes/sizing-orthog-prct-htb-in-vlr-002.xht [ Failure ] -crbug.com/591099 external/wpt/css/css-writing-modes/sizing-orthog-prct-htb-in-vrl-001.xht [ Failure ] -crbug.com/591099 external/wpt/css/css-writing-modes/sizing-orthog-prct-htb-in-vrl-002.xht [ Failure ] -crbug.com/591099 external/wpt/css/css-writing-modes/sizing-orthog-prct-vlr-in-htb-001.xht [ Failure ] -crbug.com/591099 external/wpt/css/css-writing-modes/sizing-orthog-prct-vlr-in-htb-002.xht [ Failure ] -crbug.com/591099 external/wpt/css/css-writing-modes/sizing-orthog-prct-vrl-in-htb-001.xht [ Failure ] -crbug.com/591099 external/wpt/css/css-writing-modes/sizing-orthog-prct-vrl-in-htb-002.xht [ Failure ] -crbug.com/591099 external/wpt/css/css-writing-modes/sizing-orthog-vlr-in-htb-001.xht [ Failure ] -crbug.com/591099 external/wpt/css/css-writing-modes/sizing-orthog-vlr-in-htb-004.xht [ Failure ] -crbug.com/591099 external/wpt/css/css-writing-modes/sizing-orthog-vrl-in-htb-001.xht [ Failure ] -crbug.com/591099 external/wpt/css/css-writing-modes/sizing-orthog-vrl-in-htb-004.xht [ Failure ] -crbug.com/591099 external/wpt/css/css-writing-modes/text-shadow-orientation-upright-001.html [ Failure ] -crbug.com/591099 external/wpt/css/css-writing-modes/two-levels-of-orthogonal-flows-percentage.html [ Failure ] -crbug.com/591099 external/wpt/css/css-writing-modes/vertical-alignment-003.xht [ Failure ] -crbug.com/591099 external/wpt/css/css-writing-modes/vertical-alignment-009.xht [ Failure ] - -### external/wpt/css/cssom-view/ -crbug.com/997705 external/wpt/css/cssom-view/getBoundingClientRect-empty-inline.html [ Failure ] -crbug.com/638177 external/wpt/css/cssom-view/offsetParent-block-in-inline.html [ Failure ] -crbug.com/953479 external/wpt/css/cssom-view/offsetTopLeft-empty-inline.html [ Failure ] -crbug.com/953479 external/wpt/css/cssom-view/offsetTopLeft-leading-space-inline.html [ Failure ] - -### external/wpt/css/filter-effects/ -crbug.com/591099 external/wpt/css/filter-effects/filtered-inline-applies-to-float.html [ Failure ] - -### external/wpt/css/css-lists/ -crbug.com/1012289 external/wpt/css/css-lists/list-style-type-string-005a.html [ Failure ] -crbug.com/1012289 external/wpt/css/css-lists/list-style-type-string-006.html [ Failure ] - -### external/wpt/css/css-content/ -crbug.com/591099 external/wpt/css/css-content/quotes-033.html [ Failure ] - -### external/wpt/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/ -crbug.com/886592 external/wpt/css/css-flexbox/abspos/flex-abspos-staticpos-margin-002.html [ Failure ] - -### external/wpt/css/vendor-imports/mozilla/mozilla-central-reftests/counter-styles-3/ -crbug.com/591099 external/wpt/css/css-counter-styles/counter-style-at-rule/descriptor-pad.html [ Failure ] -crbug.com/591099 external/wpt/css/css-counter-styles/counter-style-at-rule/descriptor-range.html [ Failure ] -crbug.com/591099 external/wpt/css/css-counter-styles/counter-style-at-rule/system-extends.html [ Failure ] - -### external/wpt/css/vendor-imports/mozilla/mozilla-central-reftests/selectors4/ - -### external/wpt/css/vendor-imports/mozilla/mozilla-central-reftests/sizing/ -crbug.com/591099 external/wpt/css/css-sizing/block-size-with-min-or-max-content-1a.html [ Failure ] -crbug.com/591099 external/wpt/css/css-sizing/block-size-with-min-or-max-content-1b.html [ Failure ] -crbug.com/591099 external/wpt/css/css-sizing/hori-block-size-small-or-larger-than-container-with-min-or-max-content-1.html [ Failure ] -crbug.com/591099 external/wpt/css/css-sizing/hori-block-size-small-or-larger-than-container-with-min-or-max-content-2a.html [ Failure ] -crbug.com/591099 external/wpt/css/css-sizing/hori-block-size-small-or-larger-than-container-with-min-or-max-content-2b.html [ Failure ] -crbug.com/591099 external/wpt/css/css-sizing/vert-block-size-small-or-larger-than-container-with-min-or-max-content-2a.html [ Failure ] -crbug.com/591099 external/wpt/css/css-sizing/vert-block-size-small-or-larger-than-container-with-min-or-max-content-2b.html [ Failure ] - -### external/wpt/css/vendor-imports/mozilla/mozilla-central-reftests/writing-modes-3/ -crbug.com/736319 external/wpt/css/css-writing-modes/text-combine-upright-break-inside-001a.html [ Failure ] - -### external/wpt/quirks/ -crbug.com/591099 external/wpt/quirks/body-fills-html-quirk-vertical.html [ Failure ] -crbug.com/591099 external/wpt/quirks/body-fills-html-quirk.html [ Failure ] -crbug.com/591099 external/wpt/quirks/line-height-trailing-collapsable-whitespace.html [ Failure ] - -### fast/box-decoration-break/ -crbug.com/612641 fast/box-decoration-break/box-decoration-break-min-max.html [ Failure ] -crbug.com/682173 fast/box-decoration-break/box-decoration-break-rendering.html [ Failure ] - -### fast/css/ -crbug.com/591099 fast/css/absolute-inline-alignment-2.html [ Failure ] -crbug.com/591099 fast/css/getComputedStyle/getComputedStyle-use-computedFontSize-lineHeight.html [ Failure ] -crbug.com/591099 fast/css/text-overflow-ellipsis-button.html [ Failure ] - -### fast/css-intrinsic-dimensions/ -crbug.com/591099 fast/css-intrinsic-dimensions/orthogonal-max-width-fit-content-in-max-content.html [ Failure ] - -### fast/forms/color-scheme/href/ -crbug.com/591099 fast/forms/color-scheme/href/href-appearance-basic.html [ Failure ] - -### fast/multicol/ -crbug.com/467477 fast/multicol/vertical-rl/nested-columns.html [ Failure ] - -### fast/selectors/ -crbug.com/591099 fast/selectors/input-with-selection-pseudo-element.html [ Failure ] - -### fast/writing-mode/ -crbug.com/591099 fast/writing-mode/flipped-blocks-inline-map-local-to-container.html [ Failure ] - -# fragmentation/ -crbug.com/1078927 fragmentation/break-in-second-table-section.html [ Failure ] -crbug.com/1078927 fragmentation/break-in-tbody-after-caption.html [ Failure ] -crbug.com/1078927 fragmentation/fragmented-rowspan-alignment.html [ Failure ] -crbug.com/1078927 fragmentation/fragmented-rowspan.html [ Failure ] -crbug.com/1078927 fragmentation/multi-line-cells.html [ Failure ] -crbug.com/1078927 fragmentation/repeating-thead-exceeds-page-size.html [ Failure ] -crbug.com/1078927 fragmentation/repeating-thead-no-room-for-content-row-on-first-page.html [ Failure ] -crbug.com/1078927 fragmentation/repeating-thead-tfoot-different-fragment-height.html [ Failure ] -crbug.com/1078927 fragmentation/repeating-thead-under-repeating-thead.html [ Failure ] -crbug.com/1078927 fragmentation/single-cells-multiple-tables-no-repeating-thead.html [ Failure ] -crbug.com/1078927 fragmentation/single-line-cells-in-multiple-table-sections.html [ Failure ] -crbug.com/1078927 fragmentation/single-line-cells-multiple-tables-caption-repeating-thead-tfoot-with-border-spacing-at-top-of-row-2.html [ Failure ] -crbug.com/1078927 fragmentation/single-line-cells-multiple-tables-caption-repeating-thead-tfoot-with-border-spacing-at-top-of-row-3.html [ Failure ] -crbug.com/1078927 fragmentation/single-line-cells-multiple-tables-caption-repeating-thead-tfoot-with-border-spacing-at-top-of-row-4.html [ Failure ] -crbug.com/1078927 fragmentation/single-line-cells-multiple-tables-caption-repeating-thead-tfoot-with-border-spacing-at-top-of-row.html [ Failure ] -crbug.com/1078927 fragmentation/single-line-cells-nested-repeating-thead-nested-repeating-tfoot.html [ Failure ] -crbug.com/1078927 fragmentation/single-line-cells-nested-repeating-thead-tfoot-2.html [ Failure ] -crbug.com/1078927 fragmentation/single-line-cells-nested-repeating-thead-tfoot-3.html [ Failure ] -crbug.com/1078927 fragmentation/single-line-cells-nested-repeating-thead-tfoot-4.html [ Failure ] -crbug.com/1078927 fragmentation/single-line-cells-nested-repeating-thead-tfoot.html [ Failure ] -crbug.com/1078927 fragmentation/single-line-cells-repeating-thead-cell-straddles-page.html [ Failure ] -crbug.com/1078927 fragmentation/single-line-cells-repeating-thead-cell-straddles-page-unsplittable-div.html [ Failure ] -crbug.com/1078927 fragmentation/single-line-cells-repeating-thead-starts-middle-of-page-break-after-avoid.html [ Failure ] -crbug.com/1078927 fragmentation/single-line-cells-repeating-thead-tfoot-starts-middle-of-page-break-after-avoid-2.html [ Failure ] -crbug.com/1078927 fragmentation/single-line-cells-repeating-thead-tfoot-starts-middle-of-page-break-after-avoid-3.html [ Failure ] -crbug.com/1078927 fragmentation/single-line-cells-repeating-thead-tfoot-starts-middle-of-page-break-after-avoid.html [ Failure ] -crbug.com/1078927 fragmentation/single-line-cells-repeating-thead-tfoot-starts-middle-of-page.html [ Failure ] -crbug.com/1078927 fragmentation/single-line-cells-repeating-thead-tfoot-with-border-spacing-at-top-of-row.html [ Failure ] -crbug.com/1078927 fragmentation/single-line-cells-repeating-thead-tfoot-with-caption.html [ Failure ] -crbug.com/1078927 fragmentation/single-line-cells-repeating-thead-tfoot-with-two-captions.html [ Failure ] -crbug.com/1078927 fragmentation/single-line-cells-repeating-thead-tfoot.html [ Failure ] -crbug.com/1078927 fragmentation/single-line-cells.html [ Failure ] -crbug.com/1078927 fragmentation/table-overlapping-rowspan.html [ Failure ] -crbug.com/1078927 fragmentation/table-row-dimensions-break-freely.html [ Failure ] -crbug.com/1078927 fragmentation/table-row-page-break-collapsed-border.html [ Failure ] - -### external/wpt/html/rendering -crbug.com/591099 external/wpt/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-baseline.html [ Failure ] -crbug.com/591099 external/wpt/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-block-size.html [ Failure ] -crbug.com/880062 external/wpt/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-content-before-legend.html [ Failure ] -crbug.com/880062 external/wpt/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-generated-content.html [ Failure ] -crbug.com/591099 external/wpt/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-overflow-hidden.html [ Failure ] -crbug.com/591099 external/wpt/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-overflow.html [ Crash Failure ] -crbug.com/591099 external/wpt/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/grid-template-propagation.html [ Failure ] -crbug.com/875235 external/wpt/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-painting-order.html [ Failure ] -crbug.com/1151295 external/wpt/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-position-relative-2.html [ Failure ] - -### virtual/text-antialias/ -crbug.com/591099 virtual/text-antialias/justify-ideograph-simple.html [ Failure ] -crbug.com/591099 virtual/text-antialias/apply-start-width-after-skipped-text.html [ Failure ] -crbug.com/870219 virtual/text-antialias/hyphens/hyphens-auto-mock.html [ Failure ] -crbug.com/639223 virtual/text-antialias/line-break-between-text-nodes-latin1.html [ Failure ] - -### http/tests/ -crbug.com/1159760 http/tests/devtools/elements/highlight/highlight-css-flex-alignment.js [ Skip ] -crbug.com/1159760 http/tests/devtools/elements/highlight/highlight-css-flex-gap.js [ Skip ] -crbug.com/1159760 http/tests/devtools/elements/highlight/highlight-css-flex-multiline.js [ Skip ] -crbug.com/1159760 http/tests/devtools/elements/highlight/highlight-css-flex-reverse.js [ Skip ] -crbug.com/1159760 http/tests/devtools/elements/highlight/highlight-css-flex.js [ Skip ] -crbug.com/591099 http/tests/devtools/elements/highlight/highlight-node-vertical-rl.js [ Failure ] - -### inspector-protocol/ -crbug.com/591099 inspector-protocol/layout-fonts/languages-emoji-rare-glyphs.js [ Failure ] - -### media/ -crbug.com/591099 media/controls-layout-direction.html [ Failure ] -crbug.com/591099 media/media-controls-clone.html [ Failure ] - -# Newline painting difference with LayoutNG disabled. -crbug.com/591099 external/wpt/forced-colors-mode/forced-colors-mode-14.html [ Failure ] -crbug.com/591099 virtual/forced-high-contrast-colors/external/wpt/forced-colors-mode/forced-colors-mode-14.html [ Failure ] - -### http/tests/credentialmanagement/ -crbug.com/874695 http/tests/credentialmanagement/credentialscontainer-create-with-virtual-authenticator.html [ Failure ] - -### http/tests/csslayout/ -crbug.com/591099 http/tests/csslayout/* [ Skip ] - -### Container Queries tests require enabled LayoutNG -crbug.com/1145970 external/wpt/css/css-contain/container-queries/* [ Skip ] -crbug.com/1145970 external/wpt/css/css-contain/contain-inline-size-* [ Skip ] -crbug.com/1154574 external/wpt/css/css-contain/contain-size-monolithic-002.html [ Failure ] -crbug.com/1145970 external/wpt/scroll-animations/css/scroll-timeline-in-container-query.html [ Skip ] -crbug.com/1145970 inspector-protocol/css/css-get-styles-for-node.js [ Skip ] -crbug.com/1145970 inspector-protocol/css/container-queries/* [ Skip ] -crbug.com/1145970 inspector-protocol/dom/container-queries/* [ Skip ] -crbug.com/1145970 inspector-protocol/overlay/overlay-container-query.js [ Skip ] - -### scroll-animations -crbug.com/1317765 external/wpt/scroll-animations/css/view-timeline-inset-animation.html [ Skip ] - -### virtual/controls-refresh-hc/ -virtual/controls-refresh-hc/* [ Skip ] - -### virtual/dark-color-scheme/fast/forms/color-scheme/href/ -crbug.com/591099 virtual/dark-color-scheme/fast/forms/color-scheme/href/href-appearance-basic.html [ Failure ] - -### virtual/dark-color-scheme/media/ -crbug.com/591099 virtual/dark-color-scheme/media/audio-controls-rendering.html [ Failure ] -crbug.com/591099 virtual/dark-color-scheme/media/audio-focus-ring.html [ Failure ] - -### virtual/exotic-color-space/images/ - -### virtual/gpu-rasterization/images/ -crbug.com/591099 virtual/gpu-rasterization/images/color-profile-image-filter-all.html [ Failure Slow ] - -crbug.com/591099 external/wpt/css/css-counter-styles/cssom/cssom-name-setter-invalid.html [ Failure ] -crbug.com/591099 external/wpt/css/css-counter-styles/cssom/cssom-name-setter.html [ Failure ] -crbug.com/591099 external/wpt/css/css-counter-styles/hebrew/css3-counter-styles-016.html [ Failure ] -crbug.com/591099 external/wpt/css/css-counter-styles/hiragana/css3-counter-styles-030.html [ Failure ] -crbug.com/591099 external/wpt/css/css-counter-styles/hiragana/css3-counter-styles-031.html [ Failure ] -crbug.com/591099 external/wpt/css/css-counter-styles/hiragana-iroha/css3-counter-styles-033.html [ Failure ] -crbug.com/591099 external/wpt/css/css-counter-styles/hiragana-iroha/css3-counter-styles-034.html [ Failure ] -crbug.com/591099 external/wpt/css/css-counter-styles/katakana/css3-counter-styles-036.html [ Failure ] -crbug.com/591099 external/wpt/css/css-counter-styles/katakana/css3-counter-styles-037.html [ Failure ] -crbug.com/591099 external/wpt/css/css-counter-styles/katakana/css3-counter-styles-038.html [ Failure ] -crbug.com/591099 external/wpt/css/css-counter-styles/katakana-iroha/css3-counter-styles-039.html [ Failure ] -crbug.com/591099 external/wpt/css/css-counter-styles/katakana-iroha/css3-counter-styles-040.html [ Failure ] -crbug.com/591099 external/wpt/css/css-counter-styles/lower-roman/css3-counter-styles-019.html [ Failure ] -crbug.com/591099 external/wpt/css/css-counter-styles/lower-roman/css3-counter-styles-020.html [ Failure ] -crbug.com/591099 external/wpt/css/css-counter-styles/lower-roman/css3-counter-styles-020a.html [ Failure ] -crbug.com/591099 external/wpt/css/css-counter-styles/lower-roman/css3-counter-styles-020b.html [ Failure ] -crbug.com/591099 external/wpt/css/css-counter-styles/upper-roman/css3-counter-styles-023.html [ Failure ] -crbug.com/591099 external/wpt/css/css-counter-styles/upper-roman/css3-counter-styles-024.html [ Failure ] -crbug.com/591099 external/wpt/css/css-counter-styles/upper-roman/css3-counter-styles-024a.html [ Failure ] - -crbug.com/591099 external/wpt/css/css-tables/absolute-tables-002.html [ Failure ] -crbug.com/591099 external/wpt/css/css-tables/absolute-tables-007.html [ Failure ] -crbug.com/591099 external/wpt/css/css-tables/absolute-tables-011.tentative.html [ Failure ] -crbug.com/591099 external/wpt/css/css-tables/absolute-tables-015.html [ Failure ] - -# Line clamp overflow fixed in NG -crbug.com/591099 external/wpt/css/css-overflow/webkit-line-clamp-009.html [ Failure ] -crbug.com/591099 external/wpt/css/css-overflow/webkit-line-clamp-010.html [ Failure ] -crbug.com/591099 external/wpt/css/css-overflow/webkit-line-clamp-011.html [ Failure ] -crbug.com/591099 external/wpt/css/css-overflow/webkit-line-clamp-012.html [ Failure ] -crbug.com/591099 external/wpt/css/css-overflow/webkit-line-clamp-013.html [ Failure ] -crbug.com/591099 external/wpt/css/css-overflow/webkit-line-clamp-014.html [ Failure ] -crbug.com/591099 external/wpt/css/css-overflow/webkit-line-clamp-027.html [ Failure ] -crbug.com/591099 external/wpt/css/css-overflow/webkit-line-clamp-038.html [ Failure ] -crbug.com/591099 external/wpt/css/css-overflow/webkit-line-clamp-039.html [ Failure ] - -# Scrollable overflow changes in NG -crbug.com/591099 external/wpt/css/cssom-view/scrollWidthHeight.xht [ Failure ] -crbug.com/591099 external/wpt/css/css-overflow/orthogonal-flow-with-inline-end-margin.html [ Failure ] -crbug.com/591099 external/wpt/css/css-overflow/overflow-padding.html [ Failure ] -crbug.com/591099 external/wpt/css/css-overflow/scrollable-overflow-padding.html [ Failure ] - -# White space, absolute position and paint timing failures from June 5, 2020 -crbug.com/591099 external/wpt/paint-timing/fcp-only/fcp-pseudo-element-visibility.html [ Failure ] -crbug.com/591099 external/wpt/css/css-position/position-absolute-center-001.html [ Failure ] -crbug.com/591099 external/wpt/css/css-position/position-absolute-center-002.html [ Failure ] -crbug.com/591099 external/wpt/css/css-text/white-space/break-spaces-051.html [ Failure ] -crbug.com/591099 external/wpt/css/css-text/white-space/break-spaces-052.html [ Failure ] -crbug.com/591099 external/wpt/css/css-text/white-space/pre-wrap-051.html [ Failure ] -crbug.com/591099 external/wpt/css/css-text/white-space/pre-wrap-052.html [ Failure ] -crbug.com/591099 external/wpt/css/css-text/white-space/white-space-pre-031.html [ Failure ] -crbug.com/591099 external/wpt/css/css-text/white-space/white-space-pre-032.html [ Failure ] -crbug.com/591099 external/wpt/css/css-text/white-space/white-space-pre-035.html [ Failure ] -crbug.com/591099 external/wpt/css/css-text/white-space/white-space-pre-051.html [ Failure ] -crbug.com/591099 external/wpt/css/css-text/white-space/white-space-pre-052.html [ Failure ] - -### 7/22/2019 update -crbug.com/591099 compositing/overflow/scrollbar-layer-placement-negative-z-index-child.html [ Failure ] -crbug.com/591099 virtual/text-antialias/emoji-vertical-origin-visual.html [ Failure ] -crbug.com/591099 virtual/gpu/fast/canvas/image-object-in-canvas.html [ Failure ] -crbug.com/591099 virtual/prefer_compositing_to_lcd_text/compositing/overflow/scrollbar-layer-placement-negative-z-index-child.html [ Failure ] - -# Just because these need a re-baseline from "LayoutNGBlockFlow" to "LayoutBlockFlow" -crbug.com/591099 paint/invalidation/scroll/sticky/invalidate-after-composited-scroll-with-sticky.html [ Failure ] -crbug.com/591099 virtual/compositor_threaded_scrollbar_scrolling/paint/invalidation/scroll/sticky/invalidate-after-composited-scroll-with-sticky.html [ Failure ] - -crbug.com/591099 external/wpt/css/css-flexbox/flexbox-min-width-auto-005.html [ Failure ] -crbug.com/591099 external/wpt/css/css-flexbox/flexbox-min-width-auto-006.html [ Failure ] -crbug.com/591099 external/wpt/css/css-flexbox/flexbox_align-items-stretch-3.html [ Failure ] -crbug.com/591099 external/wpt/css/css-flexbox/percentage-heights-006.html [ Failure ] -crbug.com/591099 external/wpt/css/css-flexbox/percentage-heights-014.html [ Failure ] -crbug.com/591099 external/wpt/css/css-flexbox/flex-minimum-height-flex-items-023.html [ Failure ] -crbug.com/1132627 external/wpt/css/css-flexbox/flex-minimum-height-flex-items-007.xht [ Failure ] -crbug.com/1132627 external/wpt/css/css-flexbox/flex-aspect-ratio-img-column-011.html [ Failure ] -crbug.com/721123 css3/flexbox/flexitem.html [ Failure ] -crbug.com/591099 css3/flexbox/flex-flow-auto-margins-no-available-space-assert.html [ Failure ] -crbug.com/591099 css3/flexbox/multiline-align-self.html [ Failure ] -crbug.com/721123 external/wpt/css/css-flexbox/flexitem-stretch-image.html [ Failure ] -crbug.com/704294 external/wpt/css/css-flexbox/flex-aspect-ratio-img-row-006.html [ Failure ] -crbug.com/704294 external/wpt/css/css-flexbox/canvas-dynamic-change-001.html [ Failure ] -crbug.com/987000 external/wpt/css/css-flexbox/flex-aspect-ratio-img-row-007.html [ Failure ] -crbug.com/987000 external/wpt/css/css-flexbox/flex-aspect-ratio-img-row-010.html [ Failure ] -crbug.com/987000 external/wpt/css/css-flexbox/flex-aspect-ratio-img-column-012.html [ Failure ] -crbug.com/987000 external/wpt/css/css-flexbox/flex-aspect-ratio-img-column-015.html [ Failure ] -crbug.com/987000 external/wpt/css/css-flexbox/svg-root-as-flex-item-002.html [ Failure ] -crbug.com/591099 external/wpt/css/css-flexbox/table-as-item-percent-width-cell-001.html [ Failure ] - -# These would need a rebaseline back from LayoutNGBlockFlow to LayoutBlockFlow -crbug.com/864567 paint/invalidation/compositing/iframe-inside-squashed-layer.html [ Failure ] -crbug.com/864567 paint/invalidation/position/layout-state-only-positioned.html [ Failure ] -crbug.com/864567 paint/invalidation/scroll/overflow-scroll-body-appear.html [ Failure ] -crbug.com/864567 paint/invalidation/scroll/scrolled-iframe-scrollbar-change.html [ Failure ] -compositing/squashing/squash-same-transform-ancestor.html [ Failure ] -compositing/geometry/layer-due-to-layer-children-deep-switch.html [ Failure ] -compositing/geometry/layer-due-to-layer-children-switch.html [ Failure ] -compositing/layer-creation/overlap-transformed-layer-with-transform-body.html [ Failure ] -compositing/overflow/rotate-then-clip-effect-interleave.html [ Failure ] -compositing/overflow/rotate-then-clip-z-order-interleave.html [ Failure ] -compositing/overflow/rotate-then-clip.html [ Failure ] -paint/invalidation/offset-change-wrong-invalidation-with-float.html [ Failure ] -virtual/prefer_compositing_to_lcd_text/compositing/overflow/rotate-then-clip-effect-interleave.html [ Failure ] -virtual/prefer_compositing_to_lcd_text/compositing/overflow/rotate-then-clip-z-order-interleave.html [ Failure ] -virtual/prefer_compositing_to_lcd_text/compositing/overflow/rotate-then-clip.html [ Failure ] -crbug.com/1016759 paint/invalidation/multi-layout-one-frame.html [ Failure ] -crbug.com/1016759 paint/invalidation/search-field-cancel.html [ Failure ] -crbug.com/1016759 paint/invalidation/subtree-root-skipped.html [ Failure ] -crbug.com/1016759 paint/invalidation/svg/animated-path-inside-transformed-html.xhtml [ Failure ] - -# display-locking -wpt_internal/display-lock/css-content-visibility/hiddenuntilfound/hidden-until-found-005.html [ Failure ] - -# 10/02/2019 Mark tests as failing. Mostly shapes, slight image differences -external/wpt/css/CSS2/text/white-space-bidirectionality-001.xht [ Failure ] -external/wpt/css/css-text/shaping/shaping-024.html [ Failure ] -external/wpt/css/css-text/shaping/shaping-025.html [ Failure ] -external/wpt/css/css-text/white-space/seg-break-transformation-018.tentative.html [ Failure ] -external/wpt/css/css-text/white-space/white-space-intrinsic-size-001.html [ Failure ] -external/wpt/css/css-writing-modes/available-size-007.html [ Failure ] -external/wpt/css/css-writing-modes/sizing-orthog-htb-in-vrl-001.xht [ Failure ] -external/wpt/css/css-writing-modes/sizing-orthog-htb-in-vrl-004.xht [ Failure ] -external/wpt/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-048.html [ Failure ] -external/wpt/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-049.html [ Failure ] -external/wpt/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-051.html [ Failure ] -external/wpt/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-025.html [ Failure ] -external/wpt/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-020.html [ Failure ] -external/wpt/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-021.html [ Failure ] -virtual/text-antialias/ellipsis-with-self-painting-layer.html [ Failure ] -virtual/text-antialias/zwnj-disables-kerning.html [ Failure ] -virtual/text-antialias/international/shape-across-elements-simple.html [ Failure ] -paint/invalidation/overflow/float-overflow.html [ Failure ] -svg/zoom/text/zoom-svg-float-border-padding.xml [ Failure ] -virtual/forced-high-contrast-colors/fast/css/forced-colors-mode/forced-colors-mode-15.html [ Failure ] -virtual/forced-high-contrast-colors/fast/css/forced-colors-mode/backplate/forced-colors-mode-backplate-07.html [ Failure ] - - -# 10/27/2019 updates. -external/wpt/css/css-writing-modes/wm-propagation-body-044.html [ Failure ] - -crbug.com/591099 paint/invalidation/compositing/composited-float-under-composited-inline-individual.html [ Failure ] -crbug.com/591099 paint/invalidation/compositing/composited-float-under-composited-inline.html [ Failure ] -crbug.com/591099 paint/invalidation/compositing/float-under-composited-inline.html [ Failure ] -crbug.com/591099 paint/invalidation/compositing/stacked-float-under-composited-inline.html [ Failure ] - -# No H.264 decoder support in bot - just skip all webrtc tests. -crbug.com/840659 external/wpt/webrtc/* [ Skip ] - -# MathML depends on LayoutNG. -crbug.com/6606 external/wpt/mathml/* [ Skip ] -crbug.com/6606 external/wpt/css/css-display/display-math-on-pseudo-elements-001.html [ Skip ] -crbug.com/6606 external/wpt/css/css-display/display-math-on-pseudo-elements-002.html [ Skip ] - -crbug.com/1034944 webexposed/global-interface-listing.html [ Skip ] - -# TODO(iopopesc) these need to be rebaselined for focus ring changes. -crbug.com/1035582 fast/css/focus-ring-detached.html [ Failure ] -crbug.com/1035582 fast/events/sequential-focus-navigation-starting-point.html [ Skip ] -crbug.com/1035582 fast/inline/continuation-outlines-with-layers.html [ Failure ] -crbug.com/1035582 fast/inline/continuation-outlines.html [ Failure ] -crbug.com/1035582 paint/invalidation/4776765.html [ Failure ] -crbug.com/1035582 paint/invalidation/clip/caret-ancestor-clip-change.html [ Failure ] -crbug.com/1035582 paint/invalidation/invalidate-caret-before-text-node-update.html [ Failure ] -crbug.com/1035582 paint/invalidation/outline/focus-continuations.html [ Failure ] -crbug.com/1035582 paint/invalidation/outline/focus-enable-continuations.html [ Failure ] -crbug.com/1035582 paint/invalidation/outline/focus-ring-on-continuation-move.html [ Failure ] -crbug.com/1035582 paint/invalidation/outline/focus-ring-on-child-move.html [ Failure ] -crbug.com/1035582 paint/invalidation/outline/focus-ring-on-inline-continuation-move.html [ Failure ] -crbug.com/1035582 paint/invalidation/outline/focus-ring-for-anchor.html [ Failure ] -crbug.com/1035582 paint/invalidation/outline/focus-ring-for-anchor1.html [ Failure ] -crbug.com/1035582 paint/invalidation/outline/outline-become-affected-by-descendant.html [ Failure ] -crbug.com/1035582 paint/invalidation/outline/outline-become-not-affected-by-descendant.html [ Failure ] -crbug.com/1035582 paint/invalidation/scroll/invalidate-caret-in-composited-scrolling-container.html [ Failure ] -crbug.com/1035582 paint/invalidation/scroll/invalidate-caret-in-non-composited-scrolling-container.html [ Failure ] -crbug.com/1035582 paint/invalidation/svg/scrolling-embedded-svg-file-image-repaint-problem.html [ Failure ] -crbug.com/1035582 paint/invalidation/table/caret-contenteditable-content-after.html [ Failure ] -crbug.com/1035582 external/wpt/css/css-text-decor/text-decoration-subelements-001.html [ Failure ] -crbug.com/1035582 paint/background/background-clip-text-descendants.html [ Failure ] -crbug.com/1035582 tables/mozilla/bugs/bug2479-3.html [ Failure ] -crbug.com/1035582 paint/invalidation/overflow/float-overflow-right.html [ Failure ] -crbug.com/1035582 virtual/scalefactor150/fast/hidpi/static/calendar-picker-appearance.html [ Failure Timeout ] -crbug.com/1035582 http/tests/devtools/sources/debugger-breakpoints/disable-breakpoints.js [ Failure Timeout ] -crbug.com/1035582 editing/input/linux_rtl_composition_underline.html [ Failure ] -crbug.com/1035582 fast/forms/form-element-geometry.html [ Failure ] -crbug.com/1035582 fast/forms/plaintext-mode-2.html [ Failure ] -crbug.com/1035582 fast/forms/validation-bubble-appearance-rtl-ui.html [ Failure ] -crbug.com/1035582 paint/invalidation/float-offscreen.html [ Failure ] -crbug.com/1035582 tables/mozilla/bugs/bug2479-2.html [ Failure ] -crbug.com/1035582 tables/mozilla/bugs/bug46368-1.html [ Failure ] -crbug.com/1035582 tables/mozilla/bugs/bug46368-2.html [ Failure ] -crbug.com/1035582 tables/mozilla/bugs/bug59354.html [ Failure ] -crbug.com/1035582 tables/mozilla/bugs/bug7342.html [ Failure ] - -crbug.com/845235 external/wpt/quirks/percentage-height-quirk-excludes-flex-grid-001.html [ Failure ] -crbug.com/845235 external/wpt/css/css-flexbox/hittest-overlapping-order.html [ Failure ] - -crbug.com/1074752 editing/selection/selection-color.html [ Failure ] - -crbug.com/1002937 external/wpt/editing/run/caret-navigation-around-line-break.html [ Failure ] - -crbug.com/1074752 external/wpt/css/css-pseudo/active-selection-051.html [ Failure ] -crbug.com/1074752 external/wpt/css/css-pseudo/active-selection-052.html [ Failure ] -crbug.com/1074752 external/wpt/css/css-pseudo/active-selection-053.html [ Failure ] -crbug.com/1074752 external/wpt/css/css-pseudo/active-selection-054.html [ Failure ] - -# TODO(masonfreed) These were previously skipped by the [Skip] on several virtual suites (e.g. controls-refresh/*). -crbug.com/1034611 fast/forms/color-scheme/text-selection-outside-control.html [ Skip ] -crbug.com/1034611 fast/forms/color-scheme/date/date-appearance-basic.html [ Skip ] -crbug.com/1034611 fast/forms/color-scheme/datetimelocal/datetimelocal-appearance-basic.html [ Skip ] -crbug.com/1034611 fast/forms/color-scheme/file/file-appearance-basic.html [ Skip ] -crbug.com/1034611 fast/forms/color-scheme/month/month-appearance-basic.html [ Skip ] -crbug.com/1034611 fast/forms/color-scheme/select/select-popup-appearance-basic.html [ Skip ] -crbug.com/1034611 fast/forms/color-scheme/suggestion-picker/datetimelocal-suggestion-picker-appearance.html [ Skip ] -crbug.com/1034611 fast/forms/color-scheme/suggestion-picker/time-suggestion-picker-appearance.html [ Skip ] -crbug.com/1034611 fast/forms/color-scheme/time/time-appearance-basic.html [ Skip ] -crbug.com/1034611 fast/forms/color-scheme/week/week-appearance-basic.html [ Skip ] -crbug.com/1034611 virtual/use-common-select-popup/fast/forms/color-scheme/select/select-popup-appearance-basic.html [ Skip ] - - -###### TablesNG start - -### Random tests without tables that are failing when trying to land TablesNG -crbug.com/958381 external/wpt/css/css-contain/content-visibility/content-visibility-081.html [ Failure ] -crbug.com/958381 external/wpt/css/css-pseudo/selection-input-011.html [ Failure ] -crbug.com/958381 external/wpt/css/css-pseudo/selection-textarea-011.html [ Failure ] -crbug.com/958381 external/wpt/css/css-text/white-space/tab-bidi-001.html [ Failure ] -crbug.com/958381 external/wpt/css/css-text/word-break/break-boundary-2-chars-001.html [ Failure ] -crbug.com/958381 external/wpt/css/css-tables/border-writing-mode-dynamic-001.html [ Failure ] -crbug.com/958381 tables/mozilla/bugs/bug137388-3.html [ Failure ] - -### Should we rebase virtuals too? -crbug.com/958381 virtual/gpu/fast/canvas/canvas-composite-video-shadow.html [ Failure ] -crbug.com/958381 virtual/gpu/fast/canvas/canvas-composite-video.html [ Failure ] -crbug.com/958381 virtual/text-antialias/textIteratorNilRenderer.html [ Failure ] -crbug.com/958381 virtual/text-antialias/basic/generic-family-reset.html [ Failure ] -crbug.com/958381 virtual/text-antialias/international/bidi-layout-across-linebreak.html [ Failure ] - -### Pass in Legacy, fail in NG -crbug.com/958381 external/wpt/css/css-tables/visibility-collapse-rowspan-005.html [ Pass ] -crbug.com/958381 accessibility/inline-text-textarea.html [ Pass ] -crbug.com/958381 accessibility/table-cells-with-colspan.html [ Pass ] -crbug.com/958381 accessibility/table-with-hidden-head-section.html [ Pass ] -crbug.com/958381 external/wpt/css/css-tables/height-distribution/percentage-sizing-of-table-cell-children.html [ Pass ] -crbug.com/958381 fast/table/border-collapsing/composited-cell-collapsed-border.html [ Pass ] -crbug.com/958381 fast/table/border-collapsing/composited-row-collapsed-border.html [ Pass ] - -### Tests that pass in ng and fail in Legacy - -# external/wpt/css/CSS2/normal-flow/ -crbug.com/716930 external/wpt/css/CSS2/normal-flow/block-in-inline-float-in-layer-001.html [ Failure ] -crbug.com/711807 external/wpt/css/CSS2/normal-flow/block-in-inline-insert-001f.xht [ Failure ] -crbug.com/711807 external/wpt/css/CSS2/normal-flow/block-in-inline-insert-002f.xht [ Failure ] -crbug.com/711807 external/wpt/css/CSS2/normal-flow/max-width-applies-to-013.xht [ Failure ] -crbug.com/711807 external/wpt/css/CSS2/normal-flow/max-width-applies-to-014.xht [ Failure ] -crbug.com/626703 external/wpt/css/CSS2/normal-flow/min-height-applies-to-014.xht [ Failure ] -crbug.com/711807 external/wpt/css/CSS2/normal-flow/min-width-applies-to-005.xht [ Failure ] -crbug.com/711807 external/wpt/css/CSS2/normal-flow/min-width-applies-to-006.xht [ Failure ] -crbug.com/711807 external/wpt/css/CSS2/normal-flow/min-width-applies-to-014.xht [ Failure ] - -# external/wpt/css/CSS2/stacking-context/ -crbug.com/836244 external/wpt/css/CSS2/stacking-context/opacity-affects-block-in-inline.html [ Failure ] -crbug.com/764458 external/wpt/css/CSS2/stacking-context/zindex-affects-block-in-inline.html [ Failure ] - -### external/wpt/css/CSS2/tables/ -crbug.com/958381 external/wpt/css/CSS2/tables/border-collapse-dynamic-row-002.xht [ Failure ] -crbug.com/958381 external/wpt/css/CSS2/tables/border-collapse-dynamic-rowgroup-002.xht [ Failure ] -crbug.com/958381 external/wpt/css/CSS2/tables/caption-side-applies-to-007.xht [ Failure ] -crbug.com/958381 external/wpt/css/CSS2/tables/fixed-table-layout-025.xht [ Failure ] -crbug.com/958381 external/wpt/css/CSS2/tables/fixed-table-layout-026.xht [ Failure ] -crbug.com/958381 external/wpt/css/CSS2/tables/fixed-table-layout-027.xht [ Failure ] -crbug.com/958381 external/wpt/css/CSS2/tables/fixed-table-layout-028.xht [ Failure ] -crbug.com/958381 external/wpt/css/CSS2/tables/fixed-table-layout-029.xht [ Failure ] -crbug.com/958381 external/wpt/css/CSS2/tables/fixed-table-layout-030.xht [ Failure ] -crbug.com/958381 external/wpt/css/CSS2/tables/fixed-table-layout-031.xht [ Failure ] -crbug.com/958381 external/wpt/css/CSS2/tables/table-backgrounds-bc-colgroup-001.xht [ Failure ] -crbug.com/958381 external/wpt/css/CSS2/tables/table-backgrounds-bc-column-001.xht [ Failure ] -crbug.com/958381 external/wpt/css/CSS2/tables/table-backgrounds-bs-colgroup-001.xht [ Failure ] -crbug.com/958381 external/wpt/css/CSS2/tables/table-backgrounds-bs-column-001.xht [ Failure ] -crbug.com/958381 external/wpt/css/CSS2/tables/table-backgrounds-bs-rowgroup-001.xht [ Failure ] - -### external/wpt/css/css-align/baseline-rules/ -crbug.com/591099 external/wpt/css/css-align/baseline-rules/grid-item-input-type-number.html [ Failure ] -crbug.com/591099 external/wpt/css/css-align/baseline-rules/grid-item-input-type-text.html [ Failure ] -crbug.com/799016 external/wpt/css/css-align/baseline-rules/synthesized-baseline-table-cell-001.html [ Failure ] - -### external/wpt/css/css-flexbox/ -crbug.com/958381 external/wpt/css/css-flexbox/table-as-item-flex-cross-size.html [ Failure ] -crbug.com/958381 external/wpt/css/css-flexbox/table-as-item-stretch-cross-size.html [ Failure ] - -### external/wpt/css/css-position/ -crbug.com/417223 external/wpt/css/css-position/position-relative-table-tbody-left-absolute-child.html [ Failure ] -crbug.com/417223 external/wpt/css/css-position/position-relative-table-tbody-left.html [ Failure ] -crbug.com/417223 external/wpt/css/css-position/position-relative-table-tbody-top-absolute-child.html [ Failure ] -crbug.com/417223 external/wpt/css/css-position/position-relative-table-tbody-top.html [ Failure ] -crbug.com/417223 external/wpt/css/css-position/position-relative-table-tfoot-left-absolute-child.html [ Failure ] -crbug.com/417223 external/wpt/css/css-position/position-relative-table-tfoot-left.html [ Failure ] -crbug.com/417223 external/wpt/css/css-position/position-relative-table-tfoot-top-absolute-child.html [ Failure ] -crbug.com/417223 external/wpt/css/css-position/position-relative-table-tfoot-top.html [ Failure ] -crbug.com/417223 external/wpt/css/css-position/position-relative-table-thead-left-absolute-child.html [ Failure ] -crbug.com/417223 external/wpt/css/css-position/position-relative-table-thead-left.html [ Failure ] -crbug.com/417223 external/wpt/css/css-position/position-relative-table-thead-top-absolute-child.html [ Failure ] -crbug.com/417223 external/wpt/css/css-position/position-relative-table-thead-top.html [ Failure ] -crbug.com/417223 external/wpt/css/css-position/position-relative-table-tr-left-absolute-child.html [ Failure ] -crbug.com/417223 external/wpt/css/css-position/position-relative-table-tr-left.html [ Failure ] -crbug.com/417223 external/wpt/css/css-position/position-relative-table-tr-top-absolute-child.html [ Failure ] -crbug.com/417223 external/wpt/css/css-position/position-relative-table-tr-top.html [ Failure ] - -### external/wpt/css/css-position/multicol/ -crbug.com/829028 external/wpt/css/css-position/multicol/static-position/vlr-ltr-rtl-in-multicol.tentative.html [ Failure ] -crbug.com/829028 external/wpt/css/css-position/multicol/static-position/vlr-rtl-ltr-in-multicol.tentative.html [ Failure ] -crbug.com/829028 external/wpt/css/css-position/multicol/static-position/vlr-rtl-rtl-in-multicol.html [ Failure ] -crbug.com/829028 external/wpt/css/css-position/multicol/static-position/vrl-ltr-rtl-in-multicol.tentative.html [ Failure ] -crbug.com/829028 external/wpt/css/css-position/multicol/static-position/vrl-rtl-ltr-in-multicol.tentative.html [ Failure ] -crbug.com/829028 external/wpt/css/css-position/multicol/static-position/vrl-rtl-rtl-in-multicol.html [ Failure ] -crbug.com/829028 external/wpt/css/css-position/multicol/vlr-ltr-rtl-in-multicols.tentative.html [ Failure ] -crbug.com/829028 external/wpt/css/css-position/multicol/vlr-rtl-ltr-in-multicols.tentative.html [ Failure ] -crbug.com/829028 external/wpt/css/css-position/multicol/vlr-rtl-rtl-in-multicols.html [ Failure ] -crbug.com/829028 external/wpt/css/css-position/multicol/vrl-ltr-rtl-in-multicols.tentative.html [ Failure ] -crbug.com/829028 external/wpt/css/css-position/multicol/vrl-rtl-ltr-in-multicols.tentative.html [ Failure ] -crbug.com/829028 external/wpt/css/css-position/multicol/vrl-rtl-rtl-in-multicols.html [ Failure ] - -### external/wpt/css/css-position/sticky/ -crbug.com/702927 external/wpt/css/css-position/sticky/position-sticky-table-tfoot-bottom.html [ Failure ] -crbug.com/702927 external/wpt/css/css-position/sticky/position-sticky-table-thead-top.html [ Failure ] -crbug.com/702927 external/wpt/css/css-position/sticky/position-sticky-table-tr-bottom.html [ Failure ] -crbug.com/702927 external/wpt/css/css-position/sticky/position-sticky-table-tr-top.html [ Failure ] - -### external/wpt/css/css-sizing/aspect-ratio/ -crbug.com/1164474 external/wpt/css/css-sizing/aspect-ratio/table-element-001.html [ Failure ] - -### external/wpt/css/css-tables/ -crbug.com/613753 external/wpt/css/css-tables/border-spacing-included-in-sizes-001.html [ Failure ] -crbug.com/591099 external/wpt/css/css-tables/collapsed-scroll-overflow.html [ Failure ] -crbug.com/1108224 external/wpt/css/css-tables/min-max-size-table-content-box.html [ Failure ] -crbug.com/377847 external/wpt/css/css-tables/subpixel-table-cell-height-001.html [ Failure ] -crbug.com/377847 external/wpt/css/css-tables/subpixel-table-cell-width-001.html [ Failure ] -crbug.com/377847 external/wpt/css/css-tables/subpixel-table-cell-width-002.html [ Failure ] -crbug.com/377847 external/wpt/css/css-tables/subpixel-table-width-001.html [ Failure ] -crbug.com/598134 external/wpt/css/css-tables/table-has-box-sizing-border-box-002.html [ Failure ] -crbug.com/764031 external/wpt/css/css-tables/toggle-row-display-property-001.html [ Failure ] -crbug.com/591099 external/wpt/css/css-tables/visibility-collapse-border-spacing.html [ Failure ] -crbug.com/174167 external/wpt/css/css-tables/visibility-collapse-col-001.html [ Failure ] -crbug.com/174167 external/wpt/css/css-tables/visibility-collapse-col-002.html [ Failure ] -crbug.com/174167 external/wpt/css/css-tables/visibility-collapse-col-003.html [ Failure ] -crbug.com/174167 external/wpt/css/css-tables/visibility-collapse-col-004-dynamic.html [ Failure ] -crbug.com/174167 external/wpt/css/css-tables/visibility-collapse-col-005.html [ Failure ] -crbug.com/174167 external/wpt/css/css-tables/visibility-collapse-colspan-001.html [ Failure ] -crbug.com/174167 external/wpt/css/css-tables/visibility-collapse-colspan-002.html [ Failure ] -crbug.com/174167 external/wpt/css/css-tables/visibility-collapse-row-004.html [ Failure ] -crbug.com/174167 external/wpt/css/css-tables/visibility-collapse-rowcol-001.html [ Failure ] -crbug.com/174167 external/wpt/css/css-tables/visibility-collapse-rowcol-002.html [ Failure ] -crbug.com/591099 external/wpt/css/css-tables/width-distribution/computing-column-measure-1.html [ Failure ] - -### external/wpt/css/css-tables/height-distribution/ -crbug.com/708345 external/wpt/css/css-tables/height-distribution/extra-height-given-to-all-row-groups-001.html [ Failure ] -crbug.com/708345 external/wpt/css/css-tables/height-distribution/extra-height-given-to-all-row-groups-003.html [ Failure ] -crbug.com/708345 external/wpt/css/css-tables/height-distribution/extra-height-given-to-all-row-groups-005.html [ Failure ] -crbug.com/353580 external/wpt/css/css-tables/height-distribution/percentage-sizing-of-table-cell-children-005.html [ Failure ] - -### external/wpt/css/css-tables/paint/ -crbug.com/591099 external/wpt/css/css-tables/paint/col-paint-vrl-rtl.html [ Failure ] - -### external/wpt/css/css-tables/tentative/ -crbug.com/958381 external/wpt/css/css-tables/tentative/baseline-table.html [ Failure ] -crbug.com/958381 external/wpt/css/css-tables/tentative/baseline-td.html [ Failure ] -crbug.com/958381 external/wpt/css/css-tables/tentative/caption.html [ Failure ] -crbug.com/958381 external/wpt/css/css-tables/tentative/colgroup-col.html [ Failure ] -crbug.com/958381 external/wpt/css/css-tables/tentative/colspan-redistribution.html [ Failure ] -crbug.com/174167 external/wpt/css/css-tables/tentative/element-sizing.html [ Failure ] -crbug.com/958381 external/wpt/css/css-tables/tentative/paint/background-image-column.html [ Failure ] -crbug.com/958381 external/wpt/css/css-tables/tentative/paint/collapsed-border-large-cell.html [ Failure ] -crbug.com/958381 external/wpt/css/css-tables/tentative/position-sticky-container.html [ Failure ] -crbug.com/958381 external/wpt/css/css-tables/tentative/rowspan-height-redistribution.html [ Failure ] -crbug.com/958381 external/wpt/css/css-tables/tentative/section-no-tbody-fixed-distribution.html [ Failure ] -crbug.com/958381 external/wpt/css/css-tables/tentative/section-no-tbody-percent-distribution.html [ Failure ] -crbug.com/958381 external/wpt/css/css-tables/tentative/table-height-redistribution.html [ Failure ] -crbug.com/958381 external/wpt/css/css-tables/tentative/table-minmax.html [ Failure ] -crbug.com/958381 external/wpt/css/css-tables/tentative/table-width-redistribution.html [ Failure ] -crbug.com/958381 external/wpt/css/css-tables/tentative/table-width-redistribution-fixed-padding.html [ Failure ] -crbug.com/958381 external/wpt/css/css-tables/tentative/tbody-height-redistribution.html [ Failure ] -crbug.com/958381 external/wpt/css/css-tables/tentative/td-box-sizing-001.html [ Failure ] -crbug.com/958381 external/wpt/css/css-tables/tentative/td-box-sizing-002.html [ Failure ] - -### external/wpt/css/css-tables/tentative/paint/ -crbug.com/958381 external/wpt/css/css-tables/tentative/paint/background-image-column-collapsed.html [ Failure ] - -### external/wpt/css/css-writing-modes/ -crbug.com/1020373 external/wpt/css/css-writing-modes/block-flow-direction-vlr-018.xht [ Failure ] -crbug.com/1020373 external/wpt/css/css-writing-modes/block-flow-direction-vrl-017.xht [ Failure ] -crbug.com/492664 external/wpt/css/css-writing-modes/box-offsets-rel-pos-vlr-005.xht [ Failure ] -crbug.com/492664 external/wpt/css/css-writing-modes/box-offsets-rel-pos-vrl-004.xht [ Failure ] -crbug.com/664386 external/wpt/css/css-writing-modes/inline-table-alignment-003.xht [ Failure ] -crbug.com/664386 external/wpt/css/css-writing-modes/inline-table-alignment-005.xht [ Failure ] -crbug.com/1020373 external/wpt/css/css-writing-modes/line-box-direction-vlr-016.xht [ Failure ] -crbug.com/1020373 external/wpt/css/css-writing-modes/line-box-direction-vrl-015.xht [ Failure ] -crbug.com/1020373 external/wpt/css/css-writing-modes/table-cell-001.html [ Failure ] -crbug.com/1020373 external/wpt/css/css-writing-modes/table-cell-002.html [ Failure ] - -# Ref image failures -crbug.com/958381 paint/tables/collapsed-border-cell-visibility.html [ Failure ] -crbug.com/958381 fast/css/vertical-align-baseline-rowspan-008.htm [ Failure ] - -# Text failures, no new baselines -crbug.com/958381 fast/css/empty-cell-baseline.html [ Failure ] -crbug.com/958381 fast/css/inline-table-first-row-empty-cell-non-auto.html [ Failure ] - -# New failures after TablesNG landed, most likely rebaselined tests -crbug.com/958381 accessibility/table-column-track-merging.html [ Failure ] -crbug.com/958381 fast/table/colspanMinWidth.html [ Failure ] -crbug.com/958381 fast/table/colspanMinWidth-vertical.html [ Failure ] -crbug.com/958381 fast/table/large-col-span-crash.html [ Failure ] -crbug.com/958381 external/wpt/css/css-tables/column-track-merging.html [ Failure ] -crbug.com/958381 paint/invalidation/table/table-extra-bottom-grow.html [ Failure ] - -# TablesNG end - -### compositing/filters/ -crbug.com/591099 compositing/filters/sw-nested-shadow-overlaps-hw-nested-shadow.html [ Failure ] - -### external/wpt/appmanifest/start_url-member/ - -### external/wpt/css/css-flexbox/ -crbug.com/591099 external/wpt/css/css-flexbox/fieldset-baseline-alignment.html [ Failure ] -crbug.com/591099 external/wpt/css/css-flexbox/percentage-size-quirks-002.html [ Failure ] -crbug.com/591099 external/wpt/css/css-flexbox/negative-overflow.html [ Failure ] -crbug.com/591099 external/wpt/css/css-flexbox/negative-overflow-002.html [ Failure ] -crbug.com/591099 external/wpt/css/css-flexbox/abspos/position-absolute-014.html [ Failure ] -crbug.com/591099 external/wpt/css/css-flexbox/abspos/position-absolute-015.html [ Failure ] - -### external/wpt/css/css-grid/ -crbug.com/667785 external/wpt/css/css-grid/table-grid-item-005.html [ Failure ] - -### external/wpt/css/css-highlight-api/ -crbug.com/1274174 external/wpt/css/css-highlight-api/painting/custom-highlight-painting-text-decoration-* [ Failure ] - -### external/wpt/css/css-highlight-api/ -crbug.com/591099 virtual/css-highlight-inheritance/external/wpt/css/css-highlight-api/painting/custom-highlight-painting-inheritance-* [ Failure ] - -### external/wpt/css/css-pseudo/ -crbug.com/591099 external/wpt/css/css-pseudo/active-selection-011.html [ Failure ] -crbug.com/591099 external/wpt/css/css-pseudo/active-selection-012.html [ Failure ] - -### external/wpt/css/css-writing-modes/ -crbug.com/591099 external/wpt/css/css-writing-modes/table-column-order-002.xht [ Failure ] -crbug.com/591099 external/wpt/css/css-writing-modes/table-column-order-003.xht [ Failure ] -crbug.com/591099 external/wpt/css/css-writing-modes/table-column-order-004.xht [ Failure ] -crbug.com/591099 external/wpt/css/css-writing-modes/table-column-order-005.xht [ Failure ] - -### external/wpt/html/links/manifest/ - -### external/wpt/layout-instability -crbug.com/829028 external/wpt/layout-instability/multicol-000.html [ Failure ] -crbug.com/829028 external/wpt/layout-instability/multicol-001.html [ Failure ] - -### virtual/stable/compositing/filters/ -crbug.com/591099 virtual/stable/compositing/filters/sw-nested-shadow-overlaps-hw-nested-shadow.html [ Failure ] - -### external/wpt/css/css-counter-styles/ -crbug.com/591099 external/wpt/css/css-counter-styles/counter-style-at-rule/fallbacks-in-shadow-dom.html [ Failure ] -crbug.com/591099 external/wpt/css/css-counter-styles/counter-style-at-rule/override-in-shadow-dom.html [ Failure ] - -### wpt_internal/webcodecs/ -crbug.com/591099 wpt_internal/webcodecs/annexb_decoding.https.any.html [ Failure ] -crbug.com/591099 wpt_internal/webcodecs/annexb_decoding.https.any.worker.html [ Failure ] - -# broken by https://chromium-review.googlesource.com/c/chromium/src/+/2392444 -crbug.com/958381 external/wpt/css/css-flexbox/table-as-item-wide-content.html [ Failure ] -crbug.com/958381 external/wpt/css/css-flexbox/table-as-item-fixed-min-width.html [ Failure ] - -crbug.com/1128262 external/wpt/css/css-flexbox/table-as-item-fixed-min-width-3.html [ Failure ] -crbug.com/1189359 external/wpt/css/css-flexbox/table-as-item-stretch-cross-size-4.html [ Failure ] - -# math display values are only supported when MathML Core is enabled. -crbug.com/6606 external/wpt/css/css-display/display-math-on-non-mathml-elements.html [ Failure ] -crbug.com/6606 external/wpt/css/css-typed-om/the-stylepropertymap/properties/display.html [ Failure ] - -# FormattedText is supported only through layout NG -crbug.com/1176933 fast/formatted-text/formattedtext-1.html [ Skip ] -crbug.com/1176933 fast/formatted-text/formattedtext-2.html [ Skip ] -crbug.com/1176933 fast/formatted-text/formattedtext-api.html [ Skip ] -crbug.com/1176933 wpt_internal/formatted-text/formattedtext-style.html [ Skip ] - -# DPI-independent text -crbug.com/1327530 fast/css/text-rendering.html [ Failure ] -crbug.com/1327530 svg/text/current-text-position-initial.html [ Failure ] - - -# Failures accumulated until 2021-3-3 -crbug.com/591099 accessibility/element-role-mapping-normal.html [ Failure ] -crbug.com/591099 external/wpt/css/css-flexbox/table-as-item-inflexible-in-column-1.html [ Failure ] -crbug.com/591099 external/wpt/css/css-flexbox/table-as-item-narrow-content-2.html [ Failure ] -crbug.com/591099 external/wpt/css/css-flexbox/table-as-item-stretch-cross-size-2.html [ Failure ] -crbug.com/591099 http/tests/devtools/elements/highlight/highlight-css-flex-item.js [ Failure ] - -# Failures accumulated until 2021-5-11 -crbug.com/591099 compositing/transform-3d-scales-different-x-y.html [ Failure ] -crbug.com/591099 editing/deleting/delete-across-editable-content-boundaries-2.html [ Failure ] -crbug.com/591099 editing/deleting/delete_selection_contains_table_row.html [ Failure ] -crbug.com/591099 editing/deleting/delete_to_empty_row.html [ Failure ] -crbug.com/591099 editing/deleting/replace_text_in_node_preserving_markers_crash.html [ Failure ] -crbug.com/591099 editing/selection/caret_at_soft_line_break.html [ Failure ] -crbug.com/591099 editing/selection/home-end.html [ Failure ] -crbug.com/591099 editing/selection/modify-up-on-rtl-wrapping-text.html [ Failure ] -crbug.com/591099 editing/selection/extend/extend_selection_17_ltr_forward_lineboundary.html [ Failure ] -crbug.com/591099 editing/selection/extend/extend_selection_17_ltr_right_lineboundary.html [ Failure ] -crbug.com/591099 external/wpt/css/CSS2/normal-flow/replaced-intrinsic-003.xht [ Failure ] -crbug.com/591099 external/wpt/css/css-flexbox/aspect-ratio-intrinsic-size-006.html [ Failure ] -crbug.com/591099 external/wpt/css/css-flexbox/percentage-padding-002.html [ Crash ] -crbug.com/591099 external/wpt/css/css-sizing/replaced-aspect-ratio-stretch-fit-001.html [ Failure ] -crbug.com/591099 external/wpt/css/css-sizing/replaced-aspect-ratio-stretch-fit-002.html [ Failure ] -crbug.com/591099 external/wpt/css/css-sizing/replaced-aspect-ratio-stretch-fit-003.html [ Failure ] -crbug.com/1135287 external/wpt/css/css-sizing/replaced-aspect-ratio-intrinsic-size-001.html [ Failure ] -crbug.com/591099 external/wpt/css/css-sizing/aspect-ratio/abspos-020.html [ Failure ] -crbug.com/591099 external/wpt/css/css-sizing/aspect-ratio/block-aspect-ratio-035.html [ Failure ] -crbug.com/591099 external/wpt/css/css-typed-om/idlharness.html [ Failure ] -crbug.com/591099 external/wpt/css/css-ui/box-sizing-014.html [ Failure ] -crbug.com/591099 external/wpt/css/css-ui/box-sizing-015.html [ Failure ] -crbug.com/591099 external/wpt/css/css-ui/box-sizing-016.html [ Failure ] -crbug.com/591099 external/wpt/css/css-ui/box-sizing-018.html [ Failure ] -crbug.com/591099 external/wpt/css/css-ui/box-sizing-019.html [ Failure ] -crbug.com/591099 external/wpt/css/css-ui/box-sizing-024.html [ Failure ] -crbug.com/591099 external/wpt/css/css-ui/box-sizing-025.html [ Failure ] -crbug.com/591099 external/wpt/css/cssom/idlharness.html [ Failure ] -crbug.com/591099 external/wpt/webcodecs/video-encoder-config.https.any.html [ Failure ] -crbug.com/591099 external/wpt/webcodecs/video-encoder-config.https.any.worker.html [ Failure ] -crbug.com/591099 fast/replaced/table-percent-width.html [ Failure ] -crbug.com/591099 fast/table/background-gradient-border-collapsed.html [ Failure ] -crbug.com/591099 fast/writing-mode/border-image-vertical-lr.html [ Failure ] -crbug.com/591099 media/audio-controls-rendering.html [ Failure ] -crbug.com/591099 media/media-document-audio-repaint.html [ Failure ] -crbug.com/591099 paint/markers/document-markers-font-64px.html [ Failure ] -crbug.com/591099 paint/markers/ellipsis-ltr-text-in-ltr-flow-with-markers.html [ Failure ] -crbug.com/591099 paint/markers/ellipsis-ltr-text-in-rtl-flow-with-markers.html [ Failure ] -crbug.com/591099 paint/markers/ellipsis-mixed-text-in-ltr-flow-with-markers.html [ Failure ] -crbug.com/591099 paint/markers/ellipsis-mixed-text-in-rtl-flow-with-markers.html [ Failure ] -crbug.com/591099 paint/markers/ellipsis-rtl-text-in-ltr-flow-with-markers.html [ Failure ] -crbug.com/591099 paint/markers/ellipsis-rtl-text-in-rtl-flow-with-markers.html [ Failure ] -crbug.com/591099 paint/markers/inline_spelling_markers.html [ Failure ] -crbug.com/591099 paint/markers/vertical-lr.html [ Failure ] -crbug.com/591099 paint/markers/vertical-rl.html [ Failure ] -crbug.com/591099 svg/as-background-image/background-image-preserveaspectRatio-support.html [ Failure ] -crbug.com/591099 svg/transforms/text-with-pattern-inside-transformed-html.xhtml [ Failure ] -crbug.com/591099 transforms/3d/general/perspective-units.html [ Failure ] -crbug.com/591099 virtual/exotic-color-space/images/color-profile-image-filter-all.html [ Failure ] -crbug.com/591099 virtual/oopr-canvas2d/fast/canvas/canvas-composite-video-shadow.html [ Failure ] -crbug.com/591099 virtual/oopr-canvas2d/fast/canvas/canvas-composite-video.html [ Failure ] -crbug.com/591099 virtual/oopr-canvas2d/fast/canvas/image-object-in-canvas.html [ Failure ] -crbug.com/591099 virtual/oopr-canvas2d/fast/canvas/patternfill-repeat.html [ Failure ] -crbug.com/591099 wpt_internal/mediastream/mediastreamtrackprocessor-transfer-to-worker.html [ Failure ] -crbug.com/591099 external/wpt/css/css-contain/contain-body-t-o-001.html [ Failure ] -crbug.com/591099 external/wpt/css/css-contain/contain-body-t-o-002.html [ Failure ] -crbug.com/591099 external/wpt/css/css-contain/contain-layout-breaks-002.html [ Failure ] -crbug.com/591099 external/wpt/css/css-flexbox/flex-aspect-ratio-img-row-013.html [ Failure ] - -# The no-layout-ng bot compiles without proprietary codecs. -# Timeout due to https://github.com/web-platform-tests/wpt/issues/29373 -crbug.com/591099 external/wpt/webcodecs/audio-decoder.crossOriginIsolated.https.any.html [ Failure ] -crbug.com/591099 external/wpt/webcodecs/audioDecoder-codec-specific.https.any.html?adts_aac [ Failure ] -crbug.com/591099 external/wpt/webcodecs/audioDecoder-codec-specific.https.any.html?mp4_aac [ Failure ] -crbug.com/591099 external/wpt/webcodecs/video-decoder.crossOriginIsolated.https.any.html [ Failure ] -crbug.com/591099 external/wpt/webcodecs/videoDecoder-codec-specific.https.any.html?h264_annexb [ Failure ] -crbug.com/591099 external/wpt/webcodecs/videoDecoder-codec-specific.https.any.html?h264_avc [ Failure ] -crbug.com/591099 external/wpt/webcodecs/audio-decoder.crossOriginIsolated.https.any.worker.html [ Failure Timeout ] -crbug.com/591099 external/wpt/webcodecs/audioDecoder-codec-specific.https.any.worker.html?adts_aac [ Failure Timeout ] -crbug.com/591099 external/wpt/webcodecs/audioDecoder-codec-specific.https.any.worker.html?mp4_aac [ Failure Timeout ] -crbug.com/591099 external/wpt/webcodecs/video-decoder.crossOriginIsolated.https.any.worker.html [ Failure Timeout ] -crbug.com/591099 external/wpt/webcodecs/videoDecoder-codec-specific.https.any.worker.html?h264_annexb [ Failure Timeout ] -crbug.com/591099 external/wpt/webcodecs/videoDecoder-codec-specific.https.any.worker.html?h264_avc [ Failure Timeout ] - -# Flaky only in legacy layout -crbug.com/1231658 transforms/transformed-caret.html [ Failure Pass ] - -crbug.com/591099 fast/forms/time/time-appearance-basic.html [ Failure ] - -# unblock wpt-importer -crbug.com/591099 external/wpt/css/css-lists/list-style-type-decimal-vertical-lr.html [ Failure ] -crbug.com/591099 external/wpt/css/css-lists/list-style-type-decimal-vertical-rl.html [ Failure ] - -# unblock wpt-importer -crbug.com/591099 external/wpt/editing/other/insert-text-in-void-element.tentative.html [ Failure ] - -# unblock wpt-importer -crbug.com/591099 external/wpt/css/css-content/attr-case-sensitivity-003.html [ Failure ] -crbug.com/591099 external/wpt/css/css-sizing/aspect-ratio/flex-aspect-ratio-027.html [ Failure ] -crbug.com/591099 external/wpt/css/css-sizing/aspect-ratio/flex-aspect-ratio-028.html [ Failure ] - -#unblock wpt-importer -crbug.com/591099 external/wpt/css/css-overflow/scrollable-overflow-input-001.html [ Failure ] -crbug.com/591099 external/wpt/editing/run/delete.html?7001-last [ Failure ] -crbug.com/591099 external/wpt/mimesniff/media/media-sniff.window.html [ Failure ] -crbug.com/591099 external/wpt/editing/other/insert-paragraph-in-void-element.tentative.html [ Failure ] - -# The baseline path (with an `-expected.txt` suffix) is too long on Windows. -# Skip for now. - -# inline-end overflow -crbug.com/1245722 overflow/overflow-basic-002.html [ Failure ] - -# Backgrounds and border tests fail only with legacy layout. -crbug.com/626703 external/wpt/css/CSS2/backgrounds/background-attachment-applies-to-014.xht [ Failure ] -crbug.com/626703 external/wpt/css/CSS2/backgrounds/background-position-applies-to-005.xht [ Failure ] -crbug.com/626703 external/wpt/css/CSS2/backgrounds/background-position-applies-to-006.xht [ Failure ] -crbug.com/626703 external/wpt/css/CSS2/backgrounds/background-root-020.xht [ Failure ] -crbug.com/626703 external/wpt/css/CSS2/borders/border-left-applies-to-014.xht [ Failure ] -crbug.com/626703 external/wpt/css/CSS2/borders/border-left-color-applies-to-014.xht [ Failure ] -crbug.com/626703 external/wpt/css/CSS2/borders/border-left-width-applies-to-014.xht [ Failure ] -crbug.com/626703 external/wpt/css/CSS2/borders/border-right-applies-to-014.xht [ Failure ] -crbug.com/626703 external/wpt/css/CSS2/borders/border-right-color-applies-to-014.xht [ Failure ] -crbug.com/626703 external/wpt/css/CSS2/borders/border-right-width-applies-to-014.xht [ Failure ] - -# Failures when enabling CompositeAfterPaint -crbug.com/591099 svg/dom/viewspec-aspectparams.html [ Failure ] -crbug.com/591099 svg/dom/viewspec-transformparams.html [ Failure ] -crbug.com/591099 svg/dom/viewspec-viewboxparams.html [ Failure ] -crbug.com/591099 svg/dom/viewspec-viewtargetparams.html [ Failure ] -crbug.com/591099 svg/dom/viewspec-zoomandpanparams.html [ Failure ] -crbug.com/591099 external/wpt/css/css-multicol/multicol-scroll-content.html [ Failure ] - -# Fails with ForceSynchronousHTMLParsing enabled, might be a fluke: -crbug.com/1254921 svg/as-image/image-respects-deviceScaleFactor.html [ Failure ] - -crbug.com/674631 external/wpt/css/css-color/inline-opacity-float-child.html [ Failure ] -crbug.com/1275215 external/wpt/svg/text/scripted/getstartpositionofchar-dominant-baseline.html [ Failure ] -crbug.com/1179585 svg/custom/visibility-collapse.html [ Failure ] - -# layout-ng and SAB are unrelated. No need to spent time on interactions in -# between both. -crbug.com/591099 virtual/shared_array_buffer_on_desktop/* [ Skip ] - -# Off by one errors cause by SwiftShader update -crbug.com/1266821 compositing/gestures/gesture-tapHighlight-pixel-rotated-div.html [ Failure ] -crbug.com/1266821 media/video-zoom-controls.html [ Failure ] -crbug.com/1266821 virtual/gpu-rasterization/images/12-55.html [ Failure ] -crbug.com/1266821 virtual/gpu-rasterization/images/182.html [ Failure ] -crbug.com/1266821 virtual/gpu-rasterization/images/2-dht.html [ Failure ] -crbug.com/1266821 virtual/gpu-rasterization/images/23-55.html [ Failure ] -crbug.com/1266821 virtual/gpu-rasterization/images/55.html [ Failure ] -crbug.com/1266821 virtual/gpu-rasterization/images/imagemap-focus-ring-zoom.html [ Failure ] - -# Invisible antialiased pixel differences. Can't rebaseline ref tests. -crbug.com/1123630 editing/caret/in-multicol-child.html [ Failure ] -crbug.com/1123630 paint/caret/multicol_block_children.html [ Failure ] -crbug.com/1123630 paint/caret/multicol_inline_children.html [ Failure ] - -# broken by https://chromium-review.googlesource.com/c/chromium/src/+/3376745 -crbug.com/1283025 external/wpt/css/css-tables/fractional-percent-width.html [ Failure ] - -# https://chromium-review.googlesource.com/c/chromium/src/+/3422590 -crbug.com/591099 fast/forms/text/input-appearance-scroll-size-mocked.html [ Failure ] - -# https://chromium-review.googlesource.com/c/chromium/src/+/3697708 -crbug.com/1337210 external/wpt/paint-timing/fcp-only/fcp-text-input.html [ Failure ] - -# HighlightOverlayPainting is only implemented in ng -crbug.com/1147859 virtual/css-highlight-overlay-painting/* [ Skip ] -crbug.com/1147859 dark-mode/colors/selection.html [ Failure ] -crbug.com/1147859 external/wpt/css/css-highlight-api/painting/custom-highlight-painting-001.html [ Failure ] -crbug.com/1147859 external/wpt/css/css-highlight-api/painting/custom-highlight-painting-002.html [ Failure ] -crbug.com/1147859 external/wpt/css/css-highlight-api/painting/custom-highlight-painting-003.html [ Failure ] -crbug.com/1147859 external/wpt/css/css-highlight-api/painting/custom-highlight-painting-005.html [ Failure ] -crbug.com/1147859 external/wpt/css/css-highlight-api/painting/custom-highlight-painting-006.html [ Failure ] -crbug.com/1147859 external/wpt/css/css-highlight-api/painting/custom-highlight-painting-007.html [ Failure ] -crbug.com/1147859 external/wpt/css/css-highlight-api/painting/custom-highlight-painting-008.html [ Failure ] -crbug.com/1147859 external/wpt/css/css-highlight-api/painting/custom-highlight-painting-009.html [ Failure ] -crbug.com/1147859 external/wpt/css/css-highlight-api/painting/custom-highlight-painting-010.html [ Failure ] -crbug.com/1147859 external/wpt/css/css-highlight-api/painting/custom-highlight-painting-011.html [ Failure ] -crbug.com/1147859 external/wpt/css/css-highlight-api/painting/custom-highlight-painting-012.html [ Failure ] -crbug.com/1147859 external/wpt/css/css-highlight-api/painting/custom-highlight-painting-013.html [ Failure ] -crbug.com/1147859 external/wpt/css/css-highlight-api/painting/custom-highlight-painting-014.html [ Failure ] -crbug.com/1147859 external/wpt/css/css-highlight-api/painting/custom-highlight-painting-015.html [ Failure ] -crbug.com/1147859 external/wpt/css/css-highlight-api/painting/custom-highlight-painting-016.html [ Failure ] -crbug.com/1147859 external/wpt/css/css-highlight-api/painting/custom-highlight-painting-017.html [ Failure ] -crbug.com/1147859 external/wpt/css/css-highlight-api/painting/custom-highlight-painting-018.html [ Failure ] -crbug.com/1147859 external/wpt/css/css-highlight-api/painting/custom-highlight-painting-below-selection.html [ Failure ] -crbug.com/1147859 external/wpt/css/css-highlight-api/painting/custom-highlight-painting-iframe-001.html [ Failure ] -crbug.com/1147859 external/wpt/css/css-highlight-api/painting/custom-highlight-painting-iframe-002.html [ Failure ] -crbug.com/1147859 external/wpt/css/css-highlight-api/painting/custom-highlight-painting-iframe-003.html [ Failure ] -crbug.com/1147859 external/wpt/css/css-highlight-api/painting/custom-highlight-painting-iframe-004.html [ Failure ] -crbug.com/1147859 external/wpt/css/css-highlight-api/painting/custom-highlight-painting-iframe-005.html [ Failure ] -crbug.com/1147859 external/wpt/css/css-highlight-api/painting/custom-highlight-painting-inheritance-001.html [ Failure ] -crbug.com/1147859 external/wpt/css/css-highlight-api/painting/custom-highlight-painting-inheritance-002.html [ Failure ] -crbug.com/1147859 external/wpt/css/css-highlight-api/painting/custom-highlight-painting-invalidation-001.html [ Failure ] -crbug.com/1147859 external/wpt/css/css-highlight-api/painting/custom-highlight-painting-invalidation-003.html [ Failure ] -crbug.com/1147859 external/wpt/css/css-highlight-api/painting/custom-highlight-painting-invalidation-004.html [ Failure ] -crbug.com/1147859 external/wpt/css/css-highlight-api/painting/custom-highlight-painting-invalidation-005.html [ Failure ] -crbug.com/1147859 external/wpt/css/css-highlight-api/painting/custom-highlight-painting-invalidation-006.html [ Failure ] -crbug.com/1147859 external/wpt/css/css-highlight-api/painting/custom-highlight-painting-invalidation-007.html [ Failure ] -crbug.com/1147859 external/wpt/css/css-highlight-api/painting/custom-highlight-painting-overlapping-highlights-001.html [ Failure ] -crbug.com/1147859 external/wpt/css/css-highlight-api/painting/custom-highlight-painting-overlapping-highlights-002.html [ Failure ] -crbug.com/1147859 external/wpt/css/css-highlight-api/painting/custom-highlight-painting-prioritization-001.html [ Failure ] -crbug.com/1147859 external/wpt/css/css-highlight-api/painting/custom-highlight-painting-prioritization-002.html [ Failure ] -crbug.com/1147859 external/wpt/css/css-highlight-api/painting/custom-highlight-painting-staticrange-002.html [ Failure ] -crbug.com/1147859 external/wpt/css/css-highlight-api/painting/custom-highlight-painting-staticrange-003.html [ Failure ] -crbug.com/1147859 external/wpt/css/css-highlight-api/painting/custom-highlight-painting-text-shadow.tentative.html [ Failure ] -crbug.com/1147859 external/wpt/css/css-pseudo/highlight-painting-003.html [ Failure ] -crbug.com/1147859 external/wpt/css/css-pseudo/highlight-painting-004.html [ Failure ] -crbug.com/1147859 external/wpt/css/css-pseudo/highlight-currentcolor-painting-properties-001.html [ Failure ] -crbug.com/1147859 external/wpt/css/css-pseudo/highlight-currentcolor-painting-properties-002.html [ Failure ] -crbug.com/1147859 external/wpt/css/css-pseudo/highlight-painting-soft-hyphens-001.html [ Failure ] -crbug.com/1147859 external/wpt/css/css-pseudo/highlight-paired-cascade-004.html [ Failure ] -crbug.com/1147859 external/wpt/css/css-pseudo/highlight-styling-003.tentative.html [ Failure ] -crbug.com/1147859 external/wpt/css/css-pseudo/target-text-001.html [ Failure ] -crbug.com/1147859 external/wpt/css/css-pseudo/target-text-002.html [ Failure ] -crbug.com/1147859 external/wpt/css/css-pseudo/target-text-003.html [ Failure ] -crbug.com/1147859 external/wpt/css/css-pseudo/target-text-004.html [ Failure ] -crbug.com/1147859 external/wpt/css/css-pseudo/target-text-005.html [ Failure ] -crbug.com/1147859 external/wpt/css/css-pseudo/target-text-006.html [ Failure ] -crbug.com/1147859 external/wpt/css/css-pseudo/target-text-text-decoration-001.html [ Failure ] -crbug.com/1147859 paint/markers/document-markers-font-8px.html [ Failure ] -crbug.com/1147859 paint/markers/document-markers-zoom-125.html [ Failure ] -crbug.com/1147859 paint/markers/document-markers-zoom-150.html [ Failure ] -crbug.com/1147859 paint/markers/document-markers-zoom-175.html [ Failure ] -crbug.com/1147859 paint/markers/document-markers-zoom-200.html [ Failure ] -crbug.com/1147859 paint/markers/document-markers-zoom-2000.html [ Failure ] -crbug.com/1147859 paint/markers/document-markers-zoom-250.html [ Failure ] -crbug.com/1147859 paint/markers/document-markers.html [ Failure ] -crbug.com/1147859 paint/markers/first-letter.html [ Failure ] -crbug.com/1147859 paint/markers/grammar-markers-hidpi.html [ Failure ] -crbug.com/1147859 paint/markers/grammar-markers.html [ Failure ] -crbug.com/1147859 paint/markers/inline-spelling-markers-hidpi-composited.html [ Failure ] -crbug.com/1147859 paint/markers/inline-spelling-markers-hidpi.html [ Failure ] -crbug.com/1147859 paint/markers/marker-early-break-bug.html [ Failure ] -crbug.com/1147859 paint/markers/markers-zoomed.html [ Failure ] -crbug.com/1121942 printing/abspos-multicol-with-abspos.html [ Failure ] -crbug.com/1121942 printing/block-with-overflow-in-bottom-aligned-fixedpos.html [ Pass ] -crbug.com/1311165 printing/fixed-positioned-but-static-headers-and-footers.html [ Failure ] -crbug.com/1121942 printing/fixed-positioned-headers-and-footers-clipped.html [ Pass ] -crbug.com/1121942 printing/fixed-positioned-headers-and-footers-larger-than-page.html [ Pass ] -crbug.com/1121942 printing/fixed-positioned-overflow-scroll.html [ Pass ] -crbug.com/1121942 printing/fixedpos-in-multicol.html [ Failure ] -crbug.com/1121942 printing/flexbox-with-overflow-in-bottom-aligned-fixedpos.html [ Pass ] -crbug.com/1121942 printing/multi-page-background.html [ Failure ] -crbug.com/1121942 printing/oof-in-clipped-container-006.html [ Failure ] -crbug.com/1121942 printing/page-break-avoid.html [ Failure ] -crbug.com/1121942 printing/width-overflow.html [ Pass ] -crbug.com/1147859 virtual/css-highlight-inheritance/external/wpt/css/css-highlight-api/painting/custom-highlight-painting-001.html [ Failure ] -crbug.com/1147859 virtual/css-highlight-inheritance/external/wpt/css/css-highlight-api/painting/custom-highlight-painting-002.html [ Failure ] -crbug.com/1147859 virtual/css-highlight-inheritance/external/wpt/css/css-highlight-api/painting/custom-highlight-painting-003.html [ Failure ] -crbug.com/1147859 virtual/css-highlight-inheritance/external/wpt/css/css-highlight-api/painting/custom-highlight-painting-005.html [ Failure ] -crbug.com/1147859 virtual/css-highlight-inheritance/external/wpt/css/css-highlight-api/painting/custom-highlight-painting-006.html [ Failure ] -crbug.com/1147859 virtual/css-highlight-inheritance/external/wpt/css/css-highlight-api/painting/custom-highlight-painting-007.html [ Failure ] -crbug.com/1147859 virtual/css-highlight-inheritance/external/wpt/css/css-highlight-api/painting/custom-highlight-painting-008.html [ Failure ] -crbug.com/1147859 virtual/css-highlight-inheritance/external/wpt/css/css-highlight-api/painting/custom-highlight-painting-009.html [ Failure ] -crbug.com/1147859 virtual/css-highlight-inheritance/external/wpt/css/css-highlight-api/painting/custom-highlight-painting-010.html [ Failure ] -crbug.com/1147859 virtual/css-highlight-inheritance/external/wpt/css/css-highlight-api/painting/custom-highlight-painting-011.html [ Failure ] -crbug.com/1147859 virtual/css-highlight-inheritance/external/wpt/css/css-highlight-api/painting/custom-highlight-painting-012.html [ Failure ] -crbug.com/1147859 virtual/css-highlight-inheritance/external/wpt/css/css-highlight-api/painting/custom-highlight-painting-013.html [ Failure ] -crbug.com/1147859 virtual/css-highlight-inheritance/external/wpt/css/css-highlight-api/painting/custom-highlight-painting-014.html [ Failure ] -crbug.com/1147859 virtual/css-highlight-inheritance/external/wpt/css/css-highlight-api/painting/custom-highlight-painting-015.html [ Failure ] -crbug.com/1147859 virtual/css-highlight-inheritance/external/wpt/css/css-highlight-api/painting/custom-highlight-painting-016.html [ Failure ] -crbug.com/1147859 virtual/css-highlight-inheritance/external/wpt/css/css-highlight-api/painting/custom-highlight-painting-017.html [ Failure ] -crbug.com/1147859 virtual/css-highlight-inheritance/external/wpt/css/css-highlight-api/painting/custom-highlight-painting-018.html [ Failure ] -crbug.com/1147859 virtual/css-highlight-inheritance/external/wpt/css/css-highlight-api/painting/custom-highlight-painting-below-selection.html [ Failure ] -crbug.com/1147859 virtual/css-highlight-inheritance/external/wpt/css/css-highlight-api/painting/custom-highlight-painting-iframe-001.html [ Failure ] -crbug.com/1147859 virtual/css-highlight-inheritance/external/wpt/css/css-highlight-api/painting/custom-highlight-painting-iframe-002.html [ Failure ] -crbug.com/1147859 virtual/css-highlight-inheritance/external/wpt/css/css-highlight-api/painting/custom-highlight-painting-iframe-003.html [ Failure ] -crbug.com/1147859 virtual/css-highlight-inheritance/external/wpt/css/css-highlight-api/painting/custom-highlight-painting-iframe-004.html [ Failure ] -crbug.com/1147859 virtual/css-highlight-inheritance/external/wpt/css/css-highlight-api/painting/custom-highlight-painting-iframe-005.html [ Failure ] -crbug.com/1147859 virtual/css-highlight-inheritance/external/wpt/css/css-highlight-api/painting/custom-highlight-painting-invalidation-001.html [ Failure ] -crbug.com/1147859 virtual/css-highlight-inheritance/external/wpt/css/css-highlight-api/painting/custom-highlight-painting-invalidation-003.html [ Failure ] -crbug.com/1147859 virtual/css-highlight-inheritance/external/wpt/css/css-highlight-api/painting/custom-highlight-painting-invalidation-004.html [ Failure ] -crbug.com/1147859 virtual/css-highlight-inheritance/external/wpt/css/css-highlight-api/painting/custom-highlight-painting-invalidation-005.html [ Failure ] -crbug.com/1147859 virtual/css-highlight-inheritance/external/wpt/css/css-highlight-api/painting/custom-highlight-painting-invalidation-006.html [ Failure ] -crbug.com/1147859 virtual/css-highlight-inheritance/external/wpt/css/css-highlight-api/painting/custom-highlight-painting-invalidation-007.html [ Failure ] -crbug.com/1147859 virtual/css-highlight-inheritance/external/wpt/css/css-highlight-api/painting/custom-highlight-painting-overlapping-highlights-001.html [ Failure ] -crbug.com/1147859 virtual/css-highlight-inheritance/external/wpt/css/css-highlight-api/painting/custom-highlight-painting-overlapping-highlights-002.html [ Failure ] -crbug.com/1147859 virtual/css-highlight-inheritance/external/wpt/css/css-highlight-api/painting/custom-highlight-painting-prioritization-001.html [ Failure ] -crbug.com/1147859 virtual/css-highlight-inheritance/external/wpt/css/css-highlight-api/painting/custom-highlight-painting-prioritization-002.html [ Failure ] -crbug.com/1147859 virtual/css-highlight-inheritance/external/wpt/css/css-highlight-api/painting/custom-highlight-painting-staticrange-002.html [ Failure ] -crbug.com/1147859 virtual/css-highlight-inheritance/external/wpt/css/css-highlight-api/painting/custom-highlight-painting-staticrange-003.html [ Failure ] -crbug.com/1147859 virtual/css-highlight-inheritance/external/wpt/css/css-highlight-api/painting/custom-highlight-painting-text-shadow.tentative.html [ Failure ] -crbug.com/1147859 virtual/css-highlight-inheritance/external/wpt/css/css-pseudo/highlight-painting-003.html [ Failure ] -crbug.com/1147859 virtual/css-highlight-inheritance/external/wpt/css/css-pseudo/highlight-painting-004.html [ Failure ] -crbug.com/1147859 virtual/css-highlight-inheritance/external/wpt/css/css-pseudo/highlight-painting-soft-hyphens-001.html [ Failure ] -crbug.com/1147859 virtual/css-highlight-inheritance/external/wpt/css/css-pseudo/highlight-paired-cascade-004.html [ Failure ] -crbug.com/1147859 virtual/css-highlight-inheritance/external/wpt/css/css-pseudo/target-text-001.html [ Failure ] -crbug.com/1147859 virtual/css-highlight-inheritance/external/wpt/css/css-pseudo/target-text-002.html [ Failure ] -crbug.com/1147859 virtual/css-highlight-inheritance/external/wpt/css/css-pseudo/target-text-003.html [ Failure ] -crbug.com/1147859 virtual/css-highlight-inheritance/external/wpt/css/css-pseudo/target-text-004.html [ Failure ] -crbug.com/1147859 virtual/css-highlight-inheritance/external/wpt/css/css-pseudo/target-text-005.html [ Failure ] -crbug.com/1147859 virtual/css-highlight-inheritance/external/wpt/css/css-pseudo/target-text-006.html [ Failure ] -crbug.com/1147859 virtual/css-highlight-inheritance/external/wpt/css/css-pseudo/target-text-dynamic-001.html [ Failure ] -crbug.com/1147859 virtual/css-highlight-inheritance/external/wpt/css/css-pseudo/target-text-dynamic-002.html [ Failure ] -crbug.com/1147859 virtual/css-highlight-inheritance/external/wpt/css/css-pseudo/target-text-text-decoration-001.html [ Failure ] -crbug.com/1147859 virtual/css-highlight-inheritance/wpt_internal/css/css-pseudo/target-text-002.html [ Failure ] -crbug.com/1147859 virtual/dark-mode-default/dark-mode/colors/selection.html [ Failure ] -crbug.com/1147859 wpt_internal/css/css-pseudo/target-text-002.html [ Failure ] - -# CSS Anchor Positioning is only implemented in ng. -crbug.com/1309178 external/wpt/css/css-anchor-position/* [ Skip ] -external/wpt/html/semantics/popovers/popover-anchor-change-display.tentative.html [ Skip ] -external/wpt/html/semantics/popovers/popover-anchor-display-none.tentative.html [ Skip ] -external/wpt/html/semantics/popovers/popover-anchor-display.tentative.html [ Skip ] -external/wpt/html/semantics/popovers/popover-anchor-multicol-display.tentative.html [ Skip ] -external/wpt/html/semantics/popovers/popover-anchor-scroll-display.tentative.html [ Skip ] -external/wpt/html/semantics/popovers/popover-anchor-nested-display.tentative.html [ Skip ] - -# HTML <selectmenu> depends on CSS Anchor Positioning -external/wpt/html/semantics/forms/the-selectmenu-element/* [ Skip ] - -crbug.com/1303102 external/wpt/css/css-images/object-view-box* [ Skip ] - -crbug.com/1303102 virtual/view-transition/external/wpt/css/css-view-transitions/new-content-with-overflow-zoomed.html [ Skip ] -crbug.com/1303102 virtual/view-transition/external/wpt/css/css-view-transitions/old-content-with-overflow-zoomed.html [ Skip ] -crbug.com/1321217 virtual/view-transition/external/wpt/css/css-view-transitions/old-content-with-overflow.html [ Skip ] -crbug.com/1321217 virtual/view-transition/external/wpt/css/css-view-transitions/new-content-with-overflow.html [ Skip ] -crbug.com/1303102 virtual/view-transition/external/wpt/css/css-view-transitions/no-root-capture.html [ Skip ] -crbug.com/1303102 virtual/view-transition/external/wpt/css/css-view-transitions/new-content-captures-different-size.html [ Skip ] -crbug.com/1303102 virtual/view-transition/external/wpt/css/css-view-transitions/old-content-captures-different-size.html [ Skip ] -crbug.com/1377777 virtual/view-transition/external/wpt/css/css-view-transitions/content-with-inline-child.html [ Skip ] -crbug.com/1321217 virtual/view-transition-wide-gamut/external/wpt/css/css-view-transitions/element-with-overflow.html [ Skip ] -crbug.com/1321217 virtual/view-transition/external/wpt/css/css-view-transitions/inline-child-with-filter.html [ Skip ] -crbug.com/1321217 virtual/view-transition-wide-gamut/external/wpt/css/css-view-transitions/inline-child-with-filter.html [ Skip ] -crbug.com/1321217 virtual/view-transition/external/wpt/css/css-view-transitions/element-with-overflow.html [ Skip ] - -crbug.com/1321217 virtual/view-transition-wide-gamut/external/wpt/css/css-view-transitions/scroller.html [ Skip ] -crbug.com/1321217 virtual/view-transition/external/wpt/css/css-view-transitions/scroller.html [ Skip ] -crbug.com/1321217 virtual/view-transition-wide-gamut/external/wpt/css/css-view-transitions/scroller-child.html [ Skip ] -crbug.com/1321217 virtual/view-transition/external/wpt/css/css-view-transitions/scroller-child.html [ Skip ] -crbug.com/1321217 virtual/view-transition-wide-gamut/external/wpt/css/css-view-transitions/scroller-child-abspos.html [ Skip ] -crbug.com/1321217 virtual/view-transition/external/wpt/css/css-view-transitions/scroller-child-abspos.html [ Skip ] - -crbug.com/1303102 virtual/view-transition-wide-gamut/external/wpt/css/css-view-transitions/old-content-captures-different-size.html [ Skip ] -crbug.com/1303102 virtual/view-transition-wide-gamut/external/wpt/css/css-view-transitions/new-content-captures-different-size.html [ Skip ] -crbug.com/1303102 virtual/view-transition-wide-gamut/external/wpt/css/css-view-transitions/new-content-with-overflow-zoomed.html [ Skip ] -crbug.com/1303102 virtual/view-transition-wide-gamut/external/wpt/css/css-view-transitions/old-content-with-overflow-zoomed.html [ Skip ] -crbug.com/1321217 virtual/view-transition-wide-gamut/external/wpt/css/css-view-transitions/old-content-with-overflow.html [ Skip ] -crbug.com/1321217 virtual/view-transition-wide-gamut/external/wpt/css/css-view-transitions/new-content-with-overflow.html [ Skip ] -crbug.com/1303102 virtual/view-transition-wide-gamut/external/wpt/css/css-view-transitions/no-root-capture.html [ Skip ] -crbug.com/1303102 virtual/view-transition-wide-gamut/external/wpt/css/css-view-transitions/new-and-old-sizes-match.html [ Skip ] -crbug.com/1377777 virtual/view-transition-wide-gamut/external/wpt/css/css-view-transitions/content-with-inline-child.html [ Skip ] - -# The following failures are due to a bug in object-view-box implementation specific to layoutng being disabled. -crbug.com/1310798 virtual/view-transition/external/wpt/css/css-view-transitions/old-content-object-view-box-clip-path.html [ Failure ] -crbug.com/1310798 virtual/view-transition/external/wpt/css/css-view-transitions/old-content-object-view-box-clip-path-reference.html [ Failure ] -crbug.com/1310798 virtual/view-transition/external/wpt/css/css-view-transitions/old-content-object-view-box-overflow.html [ Failure ] -crbug.com/1310798 virtual/view-transition-on-navigation/wpt_internal/view-transition-on-navigation/root-and-nested-element-transition.html [ Failure ] - -crbug.com/1310798 virtual/view-transition-wide-gamut/external/wpt/css/css-view-transitions/old-content-object-view-box-clip-path.html [ Failure ] -crbug.com/1310798 virtual/view-transition-wide-gamut/external/wpt/css/css-view-transitions/old-content-object-view-box-clip-path-reference.html [ Failure ] -crbug.com/1310798 virtual/view-transition-wide-gamut/external/wpt/css/css-view-transitions/old-content-object-view-box-overflow.html [ Failure ] - -# only NGHighlightPainter has the ability to paint decorations added by ::target-text -crbug.com/1223918 wpt_internal/css/css-pseudo/target-text-001.html [ Failure ] -crbug.com/1223918 virtual/css-highlight-inheritance/wpt_internal/css/css-pseudo/target-text-001.html [ Failure ] - -# These Focusgroup-related tests are expected to fail without LayoutNG. -external/wpt/html/interaction/focus/focusgroup/tentative/grid-navigation/col-flow-only.html [ Failure ] -external/wpt/html/interaction/focus/focusgroup/tentative/grid-navigation/colspan.html [ Failure ] -external/wpt/html/interaction/focus/focusgroup/tentative/grid-navigation/col-wrap-and-row-flow.html [ Failure ] -external/wpt/html/interaction/focus/focusgroup/tentative/grid-navigation/col-wrap-only.html [ Failure ] -external/wpt/html/interaction/focus/focusgroup/tentative/grid-navigation/css-table.html [ Failure ] -external/wpt/html/interaction/focus/focusgroup/tentative/grid-navigation/empty-spaces.html [ Failure ] -external/wpt/html/interaction/focus/focusgroup/tentative/grid-navigation/flows-in-both-axes.html [ Failure ] -external/wpt/html/interaction/focus/focusgroup/tentative/grid-navigation/moves-across-table-sections.html [ Failure ] -external/wpt/html/interaction/focus/focusgroup/tentative/grid-navigation/relayout-before-navigation.html [ Failure ] -external/wpt/html/interaction/focus/focusgroup/tentative/grid-navigation/row-flow-only.html [ Failure ] -external/wpt/html/interaction/focus/focusgroup/tentative/grid-navigation/rowspan.html [ Failure ] -external/wpt/html/interaction/focus/focusgroup/tentative/grid-navigation/row-wrap-and-col-flow.html [ Failure ] -external/wpt/html/interaction/focus/focusgroup/tentative/grid-navigation/row-wrap-only.html [ Failure ] -external/wpt/html/interaction/focus/focusgroup/tentative/grid-navigation/simple-case.html [ Failure ] -external/wpt/html/interaction/focus/focusgroup/tentative/grid-navigation/simple-case-with-non-focusable-cell-in-the-center.html [ Failure ] -external/wpt/html/interaction/focus/focusgroup/tentative/grid-navigation/wraps-in-both-axes.html [ Failure ] - -crbug.com/1047358 paint/pagination/composited-paginated-outlined-box.html [ Failure ] - -crbug.com/829028 compositing/gestures/gesture-tapHighlight-lines-and-float-in-multicol.html [ Failure ] - -crbug.com/591099 fast/backgrounds/quirks-mode-line-box-backgrounds.html [ Failure ] -crbug.com/591099 fast/css3-text/css3-text-decoration/text-underline-position/text-underline-position-under.html [ Failure ] -crbug.com/591099 editing/selection/paint-hyphen.html [ Failure Pass ] - -crbug.com/1012289 external/wpt/css/css-lists/list-style-type-string-005b.html [ Failure ] - -# baseline-source not implemented in legacy. -crbug.com/591099 external/wpt/css/css-inline/baseline-source/* [ Skip ] - -# The initial-letter implements only in LayoutNG. -crbug.com/1276900 external/wpt/css/css-inline/initial-letter/* [ Skip ] -crbug.com/1276900 fast/inline/initial-letter-inline-kerning.html [ Skip ] - -# crbug.com/1339051: some ref tests generate output with minor differences. -crbug.com/1339051 external/wpt/css/css-transforms/perspective-split-by-zero-w.html [ Failure ] -crbug.com/1339051 virtual/backface-visibility-interop/external/wpt/css/css-transforms/perspective-split-by-zero-w.html [ Failure ] -crbug.com/1339051 virtual/off-main-thread-css-paint/external/wpt/css/css-paint-api/paint2d-canvasFilter.tentative.https.html [ Failure ] -crbug.com/1339051 virtual/off-main-thread-css-paint/external/wpt/css/css-paint-api/paint2d-filter.https.html [ Failure ] - -svg/text/caret-in-svg-text.xhtml [ Failure ] - -svg/filters/feImage-filterUnits-objectBoundingBox-primitiveUnits-objectBoundingBox.svg [ Failure ] -svg/filters/feImage-filterUnits-objectBoundingBox-primitiveUnits-userSpaceOnUse.svg [ Failure ] -svg/filters/feImage-filterUnits-userSpaceOnUse-primitiveUnits-objectBoundingBox.svg [ Failure ] -svg/filters/feImage-filterUnits-userSpaceOnUse-primitiveUnits-userSpaceOnUse.svg [ Failure ] -svg/overflow/overflow-on-outermost-svg-element-in-xhtml-defaults.xhtml [ Failure ]
diff --git a/third_party/blink/web_tests/FlagSpecificConfig b/third_party/blink/web_tests/FlagSpecificConfig index 157ae00..f1e45723b 100644 --- a/third_party/blink/web_tests/FlagSpecificConfig +++ b/third_party/blink/web_tests/FlagSpecificConfig
@@ -13,7 +13,8 @@ }, { "name": "disable-layout-ng", - "args": ["--disable-blink-features=LayoutNG,LayoutNGBlockFragmentation"] + "args": ["--disable-blink-features=LayoutNG,LayoutNGBlockFragmentation"], + "smoke_file": "SmokeTests/disable-layout-ng" }, { "name": "disable-site-isolation-trials",
diff --git a/third_party/blink/web_tests/SmokeTests/disable-layout-ng b/third_party/blink/web_tests/SmokeTests/disable-layout-ng new file mode 100644 index 0000000..5139498 --- /dev/null +++ b/third_party/blink/web_tests/SmokeTests/disable-layout-ng
@@ -0,0 +1 @@ +fast/block/block-add-child-crash.html
diff --git a/third_party/blink/web_tests/TestExpectations b/third_party/blink/web_tests/TestExpectations index a7b049e..12b9bd2a 100644 --- a/third_party/blink/web_tests/TestExpectations +++ b/third_party/blink/web_tests/TestExpectations
@@ -1775,15 +1775,6 @@ crbug.com/248894 external/wpt/css/css-typed-om/the-stylepropertymap/properties/text-justify.html [ Failure ] crbug.com/248894 external/wpt/web-animations/responsive/textIndent.html [ Failure ] -# nth-* selectors -crbug.com/304163 external/wpt/css/selectors/invalidation/nth-child-containing-ancestor.html [ Failure ] -crbug.com/304163 external/wpt/css/selectors/invalidation/nth-child-in-shadow-root.html [ Failure ] -crbug.com/304163 external/wpt/css/selectors/invalidation/nth-child-of-attr.html [ Failure ] -crbug.com/304163 external/wpt/css/selectors/invalidation/nth-child-of-class.html [ Failure ] -crbug.com/304163 external/wpt/css/selectors/invalidation/nth-child-of-has.html [ Failure ] -crbug.com/304163 external/wpt/css/selectors/invalidation/nth-child-of-in-ancestor.html [ Failure ] -crbug.com/304163 external/wpt/css/selectors/invalidation/nth-child-of-sibling.html [ Failure ] - crbug.com/1377648 external/wpt/css/selectors/media/media-loading-state.html [ Skip Timeout ] crbug.com/1377648 external/wpt/css/selectors/media/media-playback-state.html [ Timeout ] crbug.com/1383480 external/wpt/css/selectors/invalidation/media-pseudo-classes-in-has.html [ Timeout ] @@ -6961,3 +6952,5 @@ crbug.com/1347831 http/tests/devtools/cache-storage/cache-live-update-cache-content.js [ Failure Pass ] crbug.com/1347831 http/tests/devtools/cache-storage/cache-live-update-list.js [ Failure Pass ] crbug.com/1347831 http/tests/devtools/cache-storage/cache-names.js [ Failure Pass ] + +crbug.com/1406661 [ Mac12 ] http/tests/devtools/persistence/automapping-dynamic-uisourcecodes.js [ Failure Pass ] \ No newline at end of file
diff --git a/third_party/blink/web_tests/VirtualTestSuites b/third_party/blink/web_tests/VirtualTestSuites index 5d85965e..d64084b4 100644 --- a/third_party/blink/web_tests/VirtualTestSuites +++ b/third_party/blink/web_tests/VirtualTestSuites
@@ -1076,7 +1076,6 @@ "external/wpt/speculation-rules/prerender/csp-script-src-inline-speculation-rules.tentative.html" ], "args": [ - "--enable-blink-features=SpeculationRulesReferrerPolicyKey", "--enable-features=SameSiteCrossOriginForSpeculationRulesPrerender,Prerender2ContentSecurityPolicyExtensions" ], "expires": "Jul 1, 2023" @@ -1535,7 +1534,7 @@ ], "exclusive_tests": "ALL", "args": [ - "--enable-blink-features=SpeculationRulesPrefetchProxy,SpeculationRulesFetchFromHeader,SpeculationRulesReferrerPolicyKey,SpeculationRulesDocumentRules,NoVarySearchPrefetch", + "--enable-blink-features=SpeculationRulesPrefetchProxy,SpeculationRulesFetchFromHeader,SpeculationRulesDocumentRules,NoVarySearchPrefetch", "--enable-features=SpeculationRulesPrefetchProxy,PrefetchUseContentRefactor", "--bypass-prefetch-proxy-for-host=not-web-platform.test" ],
diff --git a/third_party/blink/web_tests/external/WPT_BASE_MANIFEST_8.json b/third_party/blink/web_tests/external/WPT_BASE_MANIFEST_8.json index 1a7fb46a..91f10ed0 100644 --- a/third_party/blink/web_tests/external/WPT_BASE_MANIFEST_8.json +++ b/third_party/blink/web_tests/external/WPT_BASE_MANIFEST_8.json
@@ -133685,12 +133685,12 @@ ], "image-set": { "image-set-content-rendering.html": [ - "f0622a895061b8378bb06347a534db5b7bbbb5b7", + "aa6d1d6f1c84a333bccab9434ddff3204a687567", [ null, [ [ - "/css/css-images/image-set/reference/image-set-content-rendering-ref.html", + "/css/css-images/image-set/reference/image-set-rendering-ref.html", "==" ] ], @@ -133698,7 +133698,7 @@ ] ], "image-set-dpi-rendering-2.html": [ - "d7bd02e767731f8eec3366a0cc5b0c9ad782b91d", + "688c60a688a387e32abaecc07ec109983d1e58d9", [ null, [ @@ -133711,7 +133711,7 @@ ] ], "image-set-dpi-rendering.html": [ - "be18e85ffb07e0833b92a1eccca5c02a15f9f942", + "3288034d529b61a3b1302eb2960fa1f511354bd5", [ null, [ @@ -133724,7 +133724,7 @@ ] ], "image-set-dppx-rendering.html": [ - "1fc2f8c85d94268e6c563806bb813991a14c5ac5", + "d111dfb7ff2682071ea3c38d93eadddcac8ebea0", [ null, [ @@ -133737,7 +133737,7 @@ ] ], "image-set-empty-url-rendering.html": [ - "0286d7372f027acb3f5fb0e8f2295f375c3714d7", + "f5b99922216bbb104606834401e634d85ccbe6b8", [ null, [ @@ -133750,7 +133750,7 @@ ] ], "image-set-first-match-rendering.html": [ - "4d5b9d7d9ce8d7ab84feec41bd25efd9f2e96908", + "51d6aeeb241dee054c2f36d1221abf5238e8ac60", [ null, [ @@ -133763,7 +133763,7 @@ ] ], "image-set-invalid-resolution-rendering-2.html": [ - "88917e1e3f769bc38fe65c33582202a45a47cf9d", + "c8b560b7fcb3773947ea6c443441fe4397d3bf8e", [ null, [ @@ -133776,7 +133776,7 @@ ] ], "image-set-invalid-resolution-rendering.html": [ - "0cdcf6018e6513c4f3e5ce0afa413b6f46d30cf3", + "91aeaccebdc323a45240ab971989fe1f6464f46b", [ null, [ @@ -133789,7 +133789,7 @@ ] ], "image-set-linear-gradient-rendering.html": [ - "62f41a743f2b31ded22c273c0612e0d08974200b", + "2fc31b95a81e3c46fde0f42edcaad04c1ed6f1b9", [ null, [ @@ -133802,7 +133802,7 @@ ] ], "image-set-no-res-rendering-2.html": [ - "2cb98bb9c2e0dd69440f67af83473ee9a628084c", + "f588980be330d1aeb00793275fbcc96e13d3626a", [ null, [ @@ -133815,7 +133815,7 @@ ] ], "image-set-no-res-rendering.html": [ - "927d4c67f1da268a55ce5008c9f84123031ba521", + "577728894d9e62f2ee501d37ee60e715dd236563", [ null, [ @@ -133828,7 +133828,7 @@ ] ], "image-set-no-url-rendering.html": [ - "7af722d7c06cf7e5df7eac7c051fe8056b781373", + "f50ebb676abb3075ef71d0cbae60806745d74f33", [ null, [ @@ -133841,7 +133841,7 @@ ] ], "image-set-radial-gradient-rendering.html": [ - "7bf950a403736e2629236aed42677e8fa9aa490c", + "b4e09ea3519be225b66a6db86223f433ac30e469", [ null, [ @@ -133854,7 +133854,7 @@ ] ], "image-set-rendering-2.html": [ - "a6724553d629606cced4f7966af06ead5afe6369", + "fa1749518f4aeadbb4b6c1648349763a32401d6a", [ null, [ @@ -133867,7 +133867,7 @@ ] ], "image-set-rendering.html": [ - "ce4a900403dd5cccd6c1c5676b526f878932016c", + "a105438cc4b3fa121d63d9f33ae42a74c4add73b", [ null, [ @@ -133919,7 +133919,7 @@ ] ], "image-set-type-first-match-rendering.html": [ - "1283d22d1ff75ad1412ffd9f9ae895acdc69ce71", + "7e6ea8fa1f785ccde919b85ce2922c78c886acbe", [ null, [ @@ -133932,7 +133932,7 @@ ] ], "image-set-type-rendering-2.html": [ - "897118acd602737e5e01d61f998bee3b7e9f25ef", + "23e90ea9e43dbb57cd397c45af98d791c2547761", [ null, [ @@ -133945,7 +133945,7 @@ ] ], "image-set-type-rendering-3.html": [ - "51dbe2c922189e4a67780089dc4a834d1ad9bc88", + "b47c4d82a3350cceaff5160ca8f21b5943748054", [ null, [ @@ -133958,7 +133958,7 @@ ] ], "image-set-type-rendering.html": [ - "16055dbccf7d9408cc249dd80f23f6255d7f8c78", + "069e2c867f586c39e505115671bbeb4ea8de8eed", [ null, [ @@ -133971,7 +133971,7 @@ ] ], "image-set-type-skip-unsupported-rendering.html": [ - "e555633cdda39fab6cc71a74c4abcb4dde0bf8c7", + "4473e816bd17fad8199c7391dedaec164a84dccc", [ null, [ @@ -133984,7 +133984,7 @@ ] ], "image-set-type-unsupported-rendering-2.html": [ - "3f9fcd27d826eeea2b7ae470fec46984dd50cf16", + "d9d2f457076c9b5d9ff8f7d4ee7be8cfc204b1c8", [ null, [ @@ -133997,7 +133997,7 @@ ] ], "image-set-type-unsupported-rendering.html": [ - "6e9e56a4eb070a9e036ad064eb45401340b941ee", + "a7cf98bb58b00190dfbbf51bb23f85857f4c453d", [ null, [ @@ -134010,7 +134010,7 @@ ] ], "image-set-unordered-res-rendering.html": [ - "c1063b74df613ba7fd0d365e7335dc3fb212f806", + "2085b416b6bc8350028c24e11a65cc93a664c46b", [ null, [ @@ -236148,6 +236148,19 @@ {} ] ], + "filter-region-calc-001.html": [ + "7f894ef24bf5baa6d3af565103be47c9fd7f3fe5", + [ + null, + [ + [ + "/css/filter-effects/reference/green-100x100.html", + "==" + ] + ], + {} + ] + ], "filter-region-negative-positioned-child-001.html": [ "8f302ab52abe2f1008ca60d46fbc77d8ce35c22a", [ @@ -236187,6 +236200,19 @@ {} ] ], + "filter-region-units-001.html": [ + "332ca1016ab475ed442040bc8688134666e6d63a", + [ + null, + [ + [ + "/css/filter-effects/reference/green-100x100.html", + "==" + ] + ], + {} + ] + ], "filter-saturate-001-test.html": [ "0342cf0acd0a17ff89898c85105d1f147f2447d2", [ @@ -239201,6 +239227,32 @@ {} ] ], + "nth-child-containing-ancestor.html": [ + "7266cd5a2518bb533e2729859f43d21ac59f1279", + [ + null, + [ + [ + "/css/selectors/invalidation/nth-child-containing-ancestor-ref.html", + "==" + ] + ], + {} + ] + ], + "nth-child-in-shadow-root.html": [ + "dfe2c36a5a71410d192d3cec770cf0bb0937ffa9", + [ + null, + [ + [ + "/css/selectors/invalidation/nth-child-in-shadow-root-ref.html", + "==" + ] + ], + {} + ] + ], "nth-child-of-attr.html": [ "d929d6a50db02d3e34d024d83200649573ca20a4", [ @@ -261749,11 +261801,11 @@ "support": { ".cache": { "gitignore2.json": [ - "6a82deb9ea7cf954b7c9fc6aed6ee877360a68a5", + "0421eeeb4e95bad5d47c2e0d3bf99688cd55904b", [] ], "mtime.json": [ - "7f2d433f3ee55d58cd572eecabbb9796e6aa9669", + "31c60d30ae1669ac9a687226c50008b33771cb50", [] ] }, @@ -300689,26 +300741,16 @@ [] ], "reference": { - "image-set-content-rendering-ref.html": [ - "c1ef6d4531cc13aef85c785d92ac42f5e8e4de77", - [] - ], "image-set-linear-gradient-rendering-ref.html": [ - "272bab9c58281997f574ce0f6388544fcc9c0ba9", + "7f95f46eaf4fa1f7375f5a8b01c90389eff338c0", [] ], "image-set-radial-gradient-rendering-ref.html": [ - "f5545af5e6b142e45d0a5b8a2cda4f38896198ae", + "3c49f87d910402e6cead4e330ca50f8c3db92db0", [] ], "image-set-rendering-ref.html": [ - "2ca6b3352d1060ffa6ea4747de6fee64983827f9", - [] - ] - }, - "resources": { - "image-set-rendering-helper.js": [ - "5045679b4cce3794cbf049efe02e2ef75f372fe2", + "8a56bbf4d29b3373a72b4edf93058e2238c76be5", [] ] } @@ -301999,7 +302041,7 @@ [] ], "initial-letter-block-position-raise-under-ruby.html.ini": [ - "eede05d174440899bdc8f37125124321ef974f11", + "276cc0309be8647f2538c5f6e9e21bf973f0e5e7", [] ], "initial-letter-computed.html.ini": [ @@ -302111,7 +302153,7 @@ [] ], "initial-letter-indentation-rtl.html.ini": [ - "495a53a6ef2d7a4f80602738e4b7058d62834041", + "8fc71fc25a0831120a807eb952a9ca9ffbd48507", [] ], "initial-letter-indentation.html.ini": [ @@ -308310,7 +308352,7 @@ [] ], "at-property-animation.html.ini": [ - "bebce713c93dbe005f359be363b68db71ea378e3", + "c237a1b6de2ceb7a950f1acc1571ae82a84b1f88", [] ], "at-property-cssom-expected.txt": [ @@ -317473,7 +317515,7 @@ ] }, "text-transform-capitalize-001.html.ini": [ - "83483d77631ebaa0a77a19d292f9ff840793b675", + "5e5a56d5e0bebe70c5314003537ebadeb0bb67fb", [] ], "text-transform-capitalize-003.html.ini": [ @@ -333324,6 +333366,18 @@ "153ead5932ba240998e297aaf9c6cba2dbfac03f", [] ], + "nth-child-containing-ancestor-ref.html": [ + "4dc7247e41ef83e0640828bdb6887f29c3c8ee98", + [] + ], + "nth-child-in-shadow-root-ref.html": [ + "f28d358cdc53d71501fd35c0c6dc2db41e042b2b", + [] + ], + "nth-child-in-shadow-root.html.ini": [ + "b9eada79e2af1e1d386e389225fdfb6aef722cec", + [] + ], "nth-child-of-attr-ref.html": [ "41205174eb0ad5bfca3189f6e03912530c990f9e", [] @@ -347411,7 +347465,7 @@ [] ], "parent-yes-child1-no-subdomain-child2-yes-subdomain2.sub.https.html.ini": [ - "22c892623efadcaa7c28ad944d7cc94494cdd611", + "6dddf491b31eb5237d5401c2a16f116f9ee2b5bf", [] ], "parent-yes-child1-no-subdomain-child2-yes-subdomainport.sub.https.html.headers": [ @@ -350294,6 +350348,12 @@ "d0524194c9186da948d150da7b36f0f1144a61f9", [] ], + "drawing-images-to-the-canvas": { + "2d.drawImage.animated.poster.html.ini": [ + "3ec7ea02c3d519b9f76bbab9f707e6ccde0ac149", + [] + ] + }, "fill-and-stroke-styles": { "2d.pattern.paint.repeat.basic.html.ini": [ "59c6d7d3f9c14d3dd9470bb82563a12804617949", @@ -351688,7 +351748,7 @@ [] ], "access-to-coop-page-from-other_coop-ro_cross-origin.https.html.ini": [ - "9d900f4ef49f137c4a203c800383fa3e42adb161", + "81a4bcfdff5cb849edf2ce90e90df4a01de2d46c", [] ], "property-blur.https.html.ini": [ @@ -351700,7 +351760,7 @@ [] ], "property-closed.https.html.ini": [ - "ad0e9b09c8038704d41611c2b79cea264d3166a5", + "c86a604f63e8d52c8d81ea59f7fa569a08fdaec0", [] ], "property-focus.https.html.ini": [ @@ -351708,7 +351768,7 @@ [] ], "property-frames.https.html.ini": [ - "01f4fcd2960d85861b72c469942031529268ec2f", + "0c518e00799a95f34918412003f16eac8f0cdc0c", [] ], "property-indexed-getter.https.html.headers": [ @@ -351748,11 +351808,11 @@ [] ], "property-self.https.html.ini": [ - "189215bc7f4f6a65585c207e1ea409f9b0320ac5", + "02f61bbcb64962a760c09be9769c29ca7218e3e7", [] ], "property-top.https.html.ini": [ - "e3a7586a247307c588eb7e9c9a3cdb75dbe2b04c", + "a0f5275d823242458b007c30d0da2799d5633235", [] ], "property-window.https.html.ini": [ @@ -352692,6 +352752,10 @@ "af0a222712ae6ba3b982f86cabdb1963585ac44a", [] ], + "script-inserted-module-script.tentative.html.ini": [ + "1300db71de88366d5e48d1fb7c620651e7ca4cd1", + [] + ], "script-inserted-script.html.ini": [ "45c02d636f553fdcd6ab7ee816e9fbc33b3f6ef5", [] @@ -370419,7 +370483,7 @@ [] ], "mediasource-avtracks.html.ini": [ - "554fc5fb959026607aff0c8080c31674ff48be58", + "2adcabd75930c0d2b1e61a5d69442a889a8eb0ae", [] ], "mediasource-buffered-expected.txt": [ @@ -377451,7 +377515,7 @@ ] }, "response-status-code.html.ini": [ - "72e144875957872a800c411556b5476ca01b0440", + "174472ce385c144c43a4538114e8c816995d8e6d", [] ], "sleep.py": [ @@ -436993,6 +437057,13 @@ {} ] ], + "content-visibility-auto-state-changed-removed.html": [ + "ae1c946fa311166d49ee51c90cbe7d0c4b478253", + [ + null, + {} + ] + ], "content-visibility-auto-state-changed.html": [ "65b501de1bfc22c1ff0488f8b570586ee70ff701", [ @@ -448024,7 +448095,7 @@ ] }, "at-property-animation.html": [ - "9f81ae846ef721e1fda9fc3cc8d026f95bdaa17f", + "6d467ab2b992b703a433de7212a061f8deab4144", [ null, {}
diff --git a/third_party/blink/web_tests/external/wpt/css/css-contain/content-visibility/content-visibility-auto-state-changed-removed.html b/third_party/blink/web_tests/external/wpt/css/css-contain/content-visibility/content-visibility-auto-state-changed-removed.html new file mode 100644 index 0000000..ae1c946 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/css/css-contain/content-visibility/content-visibility-auto-state-changed-removed.html
@@ -0,0 +1,41 @@ +<!doctype HTML> +<html> +<meta charset="utf8"> +<title>Content Visibility: ContentVisibilityAutoStateChange event.</title> +<link rel="author" title="Vladimir Levin" href="mailto:vmpstr@chromium.org"> +<link rel="help" href="https://drafts.csswg.org/css-contain/#content-visibility"> +<meta name="assert" content="ContentVisibilityAutoStateChange does not fire on disconnected element"> + +<script src="/resources/testharness.js"></script> +<script src="/resources/testharnessreport.js"></script> + +<style> +.spacer { + height: 10000px; +} +#bottomdiv { + content-visibility: auto; +} +</style> + +<div class=spacer></div> +<div id=bottomdiv></div> + +<script> +promise_test(t => new Promise(async (resolve, reject) => { + await new Promise((waited, _) => { + requestAnimationFrame(() => requestAnimationFrame(waited)); + }); + + let observed = false; + bottomdiv.addEventListener("contentvisibilityautostatechange", () => { + reject("unexpected signal") + }); + + bottomdiv.remove() + requestAnimationFrame(() => requestAnimationFrame(resolve)); + +}), "ContentVisibilityAutoStateChange does not fire on disconnected element"); + +</script> +
diff --git a/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-block-position-raise-under-ruby.html.ini b/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-block-position-raise-under-ruby.html.ini index eede05d..276cc03 100644 --- a/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-block-position-raise-under-ruby.html.ini +++ b/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-block-position-raise-under-ruby.html.ini
@@ -1,3 +1,2 @@ [initial-letter-block-position-raise-under-ruby.html] - expected: - if flag_specific == "disable-layout-ng": FAIL + expected: FAIL
diff --git a/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-indentation-rtl.html.ini b/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-indentation-rtl.html.ini index 495a53a6..8fc71fc2 100644 --- a/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-indentation-rtl.html.ini +++ b/third_party/blink/web_tests/external/wpt/css/css-inline/initial-letter/initial-letter-indentation-rtl.html.ini
@@ -1,3 +1,2 @@ [initial-letter-indentation-rtl.html] - expected: - if flag_specific == "disable-layout-ng": FAIL + expected: FAIL
diff --git a/third_party/blink/web_tests/external/wpt/css/css-properties-values-api/at-property-animation.html b/third_party/blink/web_tests/external/wpt/css/css-properties-values-api/at-property-animation.html index 9f81ae8..6d467ab 100644 --- a/third_party/blink/web_tests/external/wpt/css/css-properties-values-api/at-property-animation.html +++ b/third_party/blink/web_tests/external/wpt/css/css-properties-values-api/at-property-animation.html
@@ -295,4 +295,47 @@ }); }, 'No transition when removing @property rule'); +test_with_at_property({ + syntax: '"<length>"', + inherits: false, + initialValue: '0px' +}, (name) => { + with_style_node(` + @keyframes test { + from { ${name}: 100px; } + to { ${name}: 200px; } + } + #div { + animation: test 100s -50s linear; + --unregistered: var(${name}); + } + `, () => { + assert_equals(getComputedStyle(div).getPropertyValue('--unregistered'), '150px'); + }); +}, 'Unregistered properties referencing animated properties update correctly.'); + +test_with_at_property({ + syntax: '"<length>"', + inherits: false, + initialValue: '0px' +}, (name) => { + with_style_node(` + @keyframes test { + from { ${name}: 100px; } + to { ${name}: 200px; } + } + @property --registered { + syntax: "<length>"; + inherits: false; + initialValue: 0px; + } + #div { + animation: test 100s -50s linear; + --registered: var(${name}); + } + `, () => { + assert_equals(getComputedStyle(div).getPropertyValue('--registered'), '150px'); + }); +}, 'Registered properties referencing animated properties update correctly.'); + </script>
diff --git a/third_party/blink/web_tests/external/wpt/css/css-properties-values-api/at-property-animation.html.ini b/third_party/blink/web_tests/external/wpt/css/css-properties-values-api/at-property-animation.html.ini index bebce713..c237a1b 100644 --- a/third_party/blink/web_tests/external/wpt/css/css-properties-values-api/at-property-animation.html.ini +++ b/third_party/blink/web_tests/external/wpt/css/css-properties-values-api/at-property-animation.html.ini
@@ -1,3 +1,9 @@ [at-property-animation.html] [No transition when removing @property rule] expected: FAIL + + [Registered properties referencing animated properties update correctly.] + expected: FAIL + + [Unregistered properties referencing animated properties update correctly.] + expected: FAIL
diff --git a/third_party/blink/web_tests/external/wpt/css/css-text/text-transform/text-transform-capitalize-001.html.ini b/third_party/blink/web_tests/external/wpt/css/css-text/text-transform/text-transform-capitalize-001.html.ini index 83483d7..5e5a56d 100644 --- a/third_party/blink/web_tests/external/wpt/css/css-text/text-transform/text-transform-capitalize-001.html.ini +++ b/third_party/blink/web_tests/external/wpt/css/css-text/text-transform/text-transform-capitalize-001.html.ini
@@ -1,3 +1,2 @@ [text-transform-capitalize-001.html] - expected: - if product == "chrome": FAIL + expected: FAIL
diff --git a/third_party/blink/web_tests/external/wpt/css/css-view-transitions/dialog-in-rtl-iframe-ref.html b/third_party/blink/web_tests/external/wpt/css/css-view-transitions/dialog-in-rtl-iframe-ref.html new file mode 100644 index 0000000..44ed094 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/css/css-view-transitions/dialog-in-rtl-iframe-ref.html
@@ -0,0 +1,19 @@ +<!DOCTYPE html> +<html> +<head> + <title>View transitions: Dialog element in RTL scrollable iframe</title> + <link rel="help" href="https://github.com/WICG/view-transitions"> + <link rel="author" href="mailto:bokan@chromium.org"> + <style> + iframe { + width: 50vw; + height: 50vh; + } + </style> +</head> + +<body> + <iframe src="support/dialog-in-rtl-iframe-child.html?show"> + </iframe> +</body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/css-view-transitions/dialog-in-rtl-iframe.html b/third_party/blink/web_tests/external/wpt/css/css-view-transitions/dialog-in-rtl-iframe.html new file mode 100644 index 0000000..7a4d200 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/css/css-view-transitions/dialog-in-rtl-iframe.html
@@ -0,0 +1,34 @@ +<!DOCTYPE html> +<html class=reftest-wait> +<head> + <title>View transitions: Dialog element in RTL scrollable iframe</title> + <link rel="help" href="https://github.com/WICG/view-transitions"> + <link rel="author" href="mailto:bokan@chromium.org"> + <link rel="match" href="dialog-in-rtl-iframe-ref.html"> + <meta name=fuzzy content="dialog-in-rtl-iframe-ref.html:0-80;0-500"> + <script src="/common/reftest-wait.js"></script> + <style> + iframe { + width: 50vw; + height: 50vh; + } + </style> + <script> + onload = () => { + requestAnimationFrame(()=>{requestAnimationFrame(()=> { + frames[0].window.startTransition(); + frames[0].window.transition.ready.then(() => { + requestAnimationFrame(()=>{requestAnimationFrame(()=> { + takeScreenshot(); + })}); + }); + })}); + } + </script> +</head> + +<body> + <iframe src="support/dialog-in-rtl-iframe-child.html"> + </iframe> +</body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/css-view-transitions/support/dialog-in-rtl-iframe-child.html b/third_party/blink/web_tests/external/wpt/css/css-view-transitions/support/dialog-in-rtl-iframe-child.html new file mode 100644 index 0000000..f1b3f02 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/css/css-view-transitions/support/dialog-in-rtl-iframe-child.html
@@ -0,0 +1,47 @@ +<!DOCTYPE html> +<html dir="rtl"> + <head> + <style> + body { + height: 200vh; + } + + ::view-transition-new(*) { + animation: unset; + opacity: 1; + } + ::view-transition-old(*) { + animation-duration: 30s; + opacity: 0; + } + + dialog { + width: 50dvw; + height: 50dvh; + box-sizing: border-box; + background-color: limegreen; + border: 1px solid black; + } + + </style> + <script> + function show() { + document.getElementById('dialog').showModal(); + } + function startTransition() { + window.transition = document.startViewTransition(() => { + show(); + }); + } + + const params = new URLSearchParams(window.location.search); + if (params.has('show')) { + addEventListener('load', show); + } + </script> + </head> + <body> + <dialog id="dialog"> + </dialog> + </body> +</html>
diff --git a/third_party/blink/web_tests/external/wpt/css/selectors/invalidation/nth-child-in-shadow-root.html.ini b/third_party/blink/web_tests/external/wpt/css/selectors/invalidation/nth-child-in-shadow-root.html.ini new file mode 100644 index 0000000..b9eada79 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/css/selectors/invalidation/nth-child-in-shadow-root.html.ini
@@ -0,0 +1,2 @@ +[nth-child-in-shadow-root.html] + expected: FAIL
diff --git a/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-no-subdomain-child2-yes-subdomain2.sub.https.html.ini b/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-no-subdomain-child2-yes-subdomain2.sub.https.html.ini index 22c89262..6dddf49 100644 --- a/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-no-subdomain-child2-yes-subdomain2.sub.https.html.ini +++ b/third_party/blink/web_tests/external/wpt/html/browsers/origin/origin-keyed-agent-clusters/2-iframes/parent-yes-child1-no-subdomain-child2-yes-subdomain2.sub.https.html.ini
@@ -1,12 +1,6 @@ [parent-yes-child1-no-subdomain-child2-yes-subdomain2.sub.https.html] - [child1 to child2: setting document.domain must not give sync access] - expected: - if flag_specific == "disable-site-isolation-trials": FAIL + [Parent to child1: setting document.domain must not give sync access] + expected: FAIL - [child2 to child1: setting document.domain must not give sync access] - expected: - if flag_specific == "disable-site-isolation-trials": FAIL - - [child2: originAgentCluster must equal true] - expected: - if flag_specific == "disable-site-isolation-trials": FAIL + [parent: originAgentCluster must equal true] + expected: FAIL
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/element/manual/imagebitmap/createImageBitmap-exif-orientation-expected.txt b/third_party/blink/web_tests/external/wpt/html/canvas/element/manual/imagebitmap/createImageBitmap-exif-orientation-expected.txt index f6b4491..b791d53 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/element/manual/imagebitmap/createImageBitmap-exif-orientation-expected.txt +++ b/third_party/blink/web_tests/external/wpt/html/canvas/element/manual/imagebitmap/createImageBitmap-exif-orientation-expected.txt
@@ -1,7 +1,7 @@ This is a testharness.js-based test. -PASS createImageBitmap with EXIF rotation, imageOrientation none, and no cropping +PASS createImageBitmap with EXIF rotation, imageOrientation from-image, and no cropping FAIL createImageBitmap with EXIF rotation, imageOrientation flipY, and no cropping assert_array_approx_equals: Pixel value at (40,40) 255,128,128,255 =~ 0,0,0,255. property 0, expected 255 +/- 1, expected 255 but got 0 -FAIL createImageBitmap with EXIF rotation, imageOrientation none, and cropping assert_array_approx_equals: Pixel value at (40,40) 0,255,0,255 =~ 128,127,254,255. property 0, expected 0 +/- 1, expected 0 but got 128 +FAIL createImageBitmap with EXIF rotation, imageOrientation from-image, and cropping assert_array_approx_equals: Pixel value at (40,40) 0,255,0,255 =~ 128,127,254,255. property 0, expected 0 +/- 1, expected 0 but got 128 FAIL createImageBitmap with EXIF rotation, imageOrientation flipY, and cropping assert_array_approx_equals: Pixel value at (40,40) 128,255,128,255 =~ 128,128,128,255. property 1, expected 255 +/- 1, expected 255 but got 128 Harness: the test ran to completion.
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/element/manual/imagebitmap/createImageBitmap-exif-orientation.html b/third_party/blink/web_tests/external/wpt/html/canvas/element/manual/imagebitmap/createImageBitmap-exif-orientation.html index 95d13d33..d476d090 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/element/manual/imagebitmap/createImageBitmap-exif-orientation.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/element/manual/imagebitmap/createImageBitmap-exif-orientation.html
@@ -50,7 +50,7 @@ [1, 3, 128, 128, 128, 255], ]); })); -}, "createImageBitmap with EXIF rotation, imageOrientation none, and no cropping"); +}, "createImageBitmap with EXIF rotation, imageOrientation from-image, and no cropping"); async_test(function(t) { const canvas = document.createElement("canvas"); @@ -96,7 +96,7 @@ [1, 1, 128, 128, 255, 255], ]); })); -}, "createImageBitmap with EXIF rotation, imageOrientation none, and cropping"); +}, "createImageBitmap with EXIF rotation, imageOrientation from-image, and cropping"); async_test(function(t) { const canvas = document.createElement("canvas");
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/element/manual/imagebitmap/createImageBitmap-exif-orientation.html.ini b/third_party/blink/web_tests/external/wpt/html/canvas/element/manual/imagebitmap/createImageBitmap-exif-orientation.html.ini index 310c2dd..2806489b 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/element/manual/imagebitmap/createImageBitmap-exif-orientation.html.ini +++ b/third_party/blink/web_tests/external/wpt/html/canvas/element/manual/imagebitmap/createImageBitmap-exif-orientation.html.ini
@@ -2,7 +2,7 @@ [createImageBitmap with EXIF rotation, imageOrientation flipY, and no cropping] expected: FAIL - [createImageBitmap with EXIF rotation, imageOrientation none, and cropping] + [createImageBitmap with EXIF rotation, imageOrientation from-image, and cropping] expected: FAIL [createImageBitmap with EXIF rotation, imageOrientation flipY, and cropping]
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/element/manual/imagebitmap/createImageBitmap-flipY-expected.txt b/third_party/blink/web_tests/external/wpt/html/canvas/element/manual/imagebitmap/createImageBitmap-flipY-expected.txt index b24d6caa..fd63b836 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/element/manual/imagebitmap/createImageBitmap-flipY-expected.txt +++ b/third_party/blink/web_tests/external/wpt/html/canvas/element/manual/imagebitmap/createImageBitmap-flipY-expected.txt
@@ -1,25 +1,25 @@ This is a testharness.js-based test. -PASS createImageBitmap from an HTMLCanvasElement imageOrientation: "none", and drawImage on the created ImageBitmap +PASS createImageBitmap from an HTMLCanvasElement imageOrientation: "from-image", and drawImage on the created ImageBitmap PASS createImageBitmap from an HTMLCanvasElement imageOrientation: "flipY", and drawImage on the created ImageBitmap -FAIL createImageBitmap from an HTMLVideoElement imageOrientation: "none", and drawImage on the created ImageBitmap assert_approx_equals: Red channel of the pixel at (5, 5) expected 247 +/- 3 but got 254 +FAIL createImageBitmap from an HTMLVideoElement imageOrientation: "from-image", and drawImage on the created ImageBitmap assert_approx_equals: Red channel of the pixel at (5, 5) expected 247 +/- 3 but got 254 FAIL createImageBitmap from an HTMLVideoElement imageOrientation: "flipY", and drawImage on the created ImageBitmap assert_approx_equals: Red channel of the pixel at (5, 5) expected 28 +/- 3 but got 6 -FAIL createImageBitmap from an HTMLVideoElement from a data URL imageOrientation: "none", and drawImage on the created ImageBitmap assert_approx_equals: Red channel of the pixel at (5, 5) expected 247 +/- 3 but got 254 +FAIL createImageBitmap from an HTMLVideoElement from a data URL imageOrientation: "from-image", and drawImage on the created ImageBitmap assert_approx_equals: Red channel of the pixel at (5, 5) expected 247 +/- 3 but got 254 FAIL createImageBitmap from an HTMLVideoElement from a data URL imageOrientation: "flipY", and drawImage on the created ImageBitmap assert_approx_equals: Red channel of the pixel at (5, 5) expected 28 +/- 3 but got 6 -PASS createImageBitmap from a bitmap HTMLImageElement imageOrientation: "none", and drawImage on the created ImageBitmap +PASS createImageBitmap from a bitmap HTMLImageElement imageOrientation: "from-image", and drawImage on the created ImageBitmap PASS createImageBitmap from a bitmap HTMLImageElement imageOrientation: "flipY", and drawImage on the created ImageBitmap -PASS createImageBitmap from a vector HTMLImageElement imageOrientation: "none", and drawImage on the created ImageBitmap +PASS createImageBitmap from a vector HTMLImageElement imageOrientation: "from-image", and drawImage on the created ImageBitmap PASS createImageBitmap from a vector HTMLImageElement imageOrientation: "flipY", and drawImage on the created ImageBitmap -PASS createImageBitmap from a bitmap SVGImageElement imageOrientation: "none", and drawImage on the created ImageBitmap +PASS createImageBitmap from a bitmap SVGImageElement imageOrientation: "from-image", and drawImage on the created ImageBitmap PASS createImageBitmap from a bitmap SVGImageElement imageOrientation: "flipY", and drawImage on the created ImageBitmap -PASS createImageBitmap from a vector SVGImageElement imageOrientation: "none", and drawImage on the created ImageBitmap +PASS createImageBitmap from a vector SVGImageElement imageOrientation: "from-image", and drawImage on the created ImageBitmap PASS createImageBitmap from a vector SVGImageElement imageOrientation: "flipY", and drawImage on the created ImageBitmap -PASS createImageBitmap from an OffscreenCanvas imageOrientation: "none", and drawImage on the created ImageBitmap +PASS createImageBitmap from an OffscreenCanvas imageOrientation: "from-image", and drawImage on the created ImageBitmap PASS createImageBitmap from an OffscreenCanvas imageOrientation: "flipY", and drawImage on the created ImageBitmap -PASS createImageBitmap from an ImageData imageOrientation: "none", and drawImage on the created ImageBitmap +PASS createImageBitmap from an ImageData imageOrientation: "from-image", and drawImage on the created ImageBitmap PASS createImageBitmap from an ImageData imageOrientation: "flipY", and drawImage on the created ImageBitmap -PASS createImageBitmap from an ImageBitmap imageOrientation: "none", and drawImage on the created ImageBitmap +PASS createImageBitmap from an ImageBitmap imageOrientation: "from-image", and drawImage on the created ImageBitmap PASS createImageBitmap from an ImageBitmap imageOrientation: "flipY", and drawImage on the created ImageBitmap -PASS createImageBitmap from a Blob imageOrientation: "none", and drawImage on the created ImageBitmap +PASS createImageBitmap from a Blob imageOrientation: "from-image", and drawImage on the created ImageBitmap PASS createImageBitmap from a Blob imageOrientation: "flipY", and drawImage on the created ImageBitmap Harness: the test ran to completion.
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/element/manual/imagebitmap/createImageBitmap-flipY.html b/third_party/blink/web_tests/external/wpt/html/canvas/element/manual/imagebitmap/createImageBitmap-flipY.html index 32791b0..9b0d2df 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/element/manual/imagebitmap/createImageBitmap-flipY.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/element/manual/imagebitmap/createImageBitmap-flipY.html
@@ -55,10 +55,10 @@ for (let { name, factory } of imageSourceTypes) { promise_test(function() { return factory().then(function(img) { - const options = { imageOrientation: 'none' }; + const options = { imageOrientation: 'from-image' }; return testDrawImageBitmap(img, [options], false); }); - }, `createImageBitmap from ${name} imageOrientation: "none", and drawImage on the created ImageBitmap`); + }, `createImageBitmap from ${name} imageOrientation: "from-image", and drawImage on the created ImageBitmap`); promise_test(function() { return factory().then(function(img) {
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/element/manual/imagebitmap/createImageBitmap-flipY.html.ini b/third_party/blink/web_tests/external/wpt/html/canvas/element/manual/imagebitmap/createImageBitmap-flipY.html.ini index 894b624..427e183 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/element/manual/imagebitmap/createImageBitmap-flipY.html.ini +++ b/third_party/blink/web_tests/external/wpt/html/canvas/element/manual/imagebitmap/createImageBitmap-flipY.html.ini
@@ -1,11 +1,11 @@ [createImageBitmap-flipY.html] - [createImageBitmap from an HTMLVideoElement imageOrientation: "none", and drawImage on the created ImageBitmap] + [createImageBitmap from an HTMLVideoElement imageOrientation: "from-image", and drawImage on the created ImageBitmap] expected: FAIL [createImageBitmap from an HTMLVideoElement imageOrientation: "flipY", and drawImage on the created ImageBitmap] expected: FAIL - [createImageBitmap from an HTMLVideoElement from a data URL imageOrientation: "none", and drawImage on the created ImageBitmap] + [createImageBitmap from an HTMLVideoElement from a data URL imageOrientation: "from-image", and drawImage on the created ImageBitmap] expected: FAIL [createImageBitmap from an HTMLVideoElement from a data URL imageOrientation: "flipY", and drawImage on the created ImageBitmap]
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/element/manual/imagebitmap/createImageBitmap-sizeOverflow.html b/third_party/blink/web_tests/external/wpt/html/canvas/element/manual/imagebitmap/createImageBitmap-sizeOverflow.html index 1be8184..25c1fb68 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/element/manual/imagebitmap/createImageBitmap-sizeOverflow.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/element/manual/imagebitmap/createImageBitmap-sizeOverflow.html
@@ -32,7 +32,7 @@ promise_test(function(t) { var imgData = new ImageData(20, 20); - var imageBitmapOptions = {imageOrientation:'none', premultiplyAlpha:'default', + var imageBitmapOptions = {imageOrientation:'from-image', premultiplyAlpha:'default', colorSpaceConversion:'none', resizeHeight:2122252543, resizeQuality:'high'}; return createImageBitmap(imgData, 0, 0, 4294967295, 64) .then(imageBitmap => promise_rejects_dom(t, "InvalidStateError", @@ -41,7 +41,7 @@ promise_test(function(t) { var imgData = new ImageData(20, 20); - var imageBitmapOptions = {imageOrientation:'none', premultiplyAlpha:'default', + var imageBitmapOptions = {imageOrientation:'from-image', premultiplyAlpha:'default', colorSpaceConversion:'none', resizeWidth:2122252543, resizeQuality:'high'}; return createImageBitmap(imgData, 0, 0, 4294967295, 64) .then(imageBitmap => promise_rejects_dom(t, "InvalidStateError",
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/element/manual/imagebitmap/imageBitmapRendering-transferFromImageBitmap-expected.html b/third_party/blink/web_tests/external/wpt/html/canvas/element/manual/imagebitmap/imageBitmapRendering-transferFromImageBitmap-expected.html index 747615f..bababda4 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/element/manual/imagebitmap/imageBitmapRendering-transferFromImageBitmap-expected.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/element/manual/imagebitmap/imageBitmapRendering-transferFromImageBitmap-expected.html
@@ -1,6 +1,6 @@ <!DOCTYPE html> <body> - <p>Test whether the imageOrientation "none" works when creating an ImageBitmap from the ImageData of a canvas, and then transfered to an ImageBitmapRenderingContext.</p> + <p>Test whether the imageOrientation "from-image" works when creating an ImageBitmap from the ImageData of a canvas, and then transfered to an ImageBitmapRenderingContext.</p> <canvas id="canvas" width="300" height="300"></canvas> </body> <script>
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/element/manual/imagebitmap/imageBitmapRendering-transferFromImageBitmap.html b/third_party/blink/web_tests/external/wpt/html/canvas/element/manual/imagebitmap/imageBitmapRendering-transferFromImageBitmap.html index d615583..6d3d886 100644 --- a/third_party/blink/web_tests/external/wpt/html/canvas/element/manual/imagebitmap/imageBitmapRendering-transferFromImageBitmap.html +++ b/third_party/blink/web_tests/external/wpt/html/canvas/element/manual/imagebitmap/imageBitmapRendering-transferFromImageBitmap.html
@@ -1,7 +1,7 @@ <!DOCTYPE html> <link rel="match" href="imageBitmapRendering-transferFromImageBitmap-expected.html" /> <body> - <p>Test whether the imageOrientation "none" works when creating an ImageBitmap from the ImageData of a canvas, and then transfered to an ImageBitmapRenderingContext.</p> + <p>Test whether the imageOrientation "from-image" works when creating an ImageBitmap from the ImageData of a canvas, and then transfered to an ImageBitmapRenderingContext.</p> <canvas id="canvas" width="300" height="300"></canvas> </body> <script> @@ -22,7 +22,7 @@ const ctx_temp = canvas_temp.getContext('2d'); drawSquares(ctx_temp); const imageSource = ctx_temp.getImageData(0, 0, 300, 300); - const imageOrientation = 'none'; + const imageOrientation = 'from-image'; imageIDFlipped = await createImageBitmap(imageSource, 0, 0, 300, 300, { imageOrientation }); const canvas = document.getElementById('canvas'); const ctx = canvas.getContext('bitmaprenderer');
diff --git a/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.animated.poster.html.ini b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.animated.poster.html.ini new file mode 100644 index 0000000..3ec7ea02 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/html/canvas/offscreen/drawing-images-to-the-canvas/2d.drawImage.animated.poster.html.ini
@@ -0,0 +1,2 @@ +[2d.drawImage.animated.poster.html] + expected: ERROR
diff --git a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/access-to-coop-page-from-other_coop-ro_cross-origin.https.html.ini b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/access-to-coop-page-from-other_coop-ro_cross-origin.https.html.ini index 9d900f4e..81a4bcf 100644 --- a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/access-to-coop-page-from-other_coop-ro_cross-origin.https.html.ini +++ b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/access-to-coop-page-from-other_coop-ro_cross-origin.https.html.ini
@@ -1,3 +1,3 @@ [access-to-coop-page-from-other_coop-ro_cross-origin.https.html] - expected: - if product == "chrome": ERROR + [access-to-coop-page-from-other (COOP-RO)] + expected: FAIL
diff --git a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/property-closed.https.html.ini b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/property-closed.https.html.ini index ad0e9b0..c86a604 100644 --- a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/property-closed.https.html.ini +++ b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/property-closed.https.html.ini
@@ -1,3 +1,7 @@ [property-closed.https.html] - expected: - if product == "chrome": ERROR + expected: [OK, ERROR] + [cross-origin > w => w.closed] + expected: FAIL + + [same-origin > w => w.closed] + expected: FAIL
diff --git a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/property-frames.https.html.ini b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/property-frames.https.html.ini index 01f4fcd..0c518e00 100644 --- a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/property-frames.https.html.ini +++ b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/property-frames.https.html.ini
@@ -1,3 +1,6 @@ [property-frames.https.html] - expected: - if product == "chrome": ERROR + [same-origin > w => w.frames] + expected: FAIL + + [cross-origin > w => w.frames] + expected: FAIL
diff --git a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/property-self.https.html.ini b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/property-self.https.html.ini index 189215bc..02f61bb 100644 --- a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/property-self.https.html.ini +++ b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/property-self.https.html.ini
@@ -1,3 +1,6 @@ [property-self.https.html] - expected: - if product == "chrome": ERROR + [same-origin > w => w.self] + expected: FAIL + + [cross-origin > w => w.self] + expected: FAIL
diff --git a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/property-top.https.html.ini b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/property-top.https.html.ini index e3a7586a..a0f5275 100644 --- a/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/property-top.https.html.ini +++ b/third_party/blink/web_tests/external/wpt/html/cross-origin-opener-policy/reporting/access-reporting/property-top.https.html.ini
@@ -1,3 +1,6 @@ [property-top.https.html] - expected: - if product == "chrome": ERROR + [same-origin > w => w.top] + expected: FAIL + + [cross-origin > w => w.top] + expected: FAIL
diff --git a/third_party/blink/web_tests/external/wpt/html/dom/render-blocking/script-inserted-module-script.tentative.html.ini b/third_party/blink/web_tests/external/wpt/html/dom/render-blocking/script-inserted-module-script.tentative.html.ini new file mode 100644 index 0000000..1300db7 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/html/dom/render-blocking/script-inserted-module-script.tentative.html.ini
@@ -0,0 +1,3 @@ +[script-inserted-module-script.tentative.html] + [Rendering is blocked before render-blocking resources are loaded] + expected: FAIL
diff --git a/third_party/blink/web_tests/external/wpt/html/semantics/popovers/hide-other-popover-side-effects.html b/third_party/blink/web_tests/external/wpt/html/semantics/popovers/hide-other-popover-side-effects.html new file mode 100644 index 0000000..9fe6673 --- /dev/null +++ b/third_party/blink/web_tests/external/wpt/html/semantics/popovers/hide-other-popover-side-effects.html
@@ -0,0 +1,21 @@ +<!DOCTYPE html> +<link rel=author href="mailto:jarhar@chromium.org"> +<link rel=help href="https://chromium-review.googlesource.com/c/chromium/src/+/4094463/8/third_party/blink/renderer/core/html/html_element.cc#1404"> +<script src="/resources/testharness.js"></script> +<script src="/resources/testharnessreport.js"></script> + +<div id=popover1 popover=auto>popover1</div> +<div id=popover2 popover=auto>popover2</div> + +<script> +test(() => { + const popover2 = document.getElementById('popover2'); + popover1.showPopover(); + popover1.addEventListener('beforetoggle', () => { + popover2.remove(); + }); + assert_throws_dom('InvalidStateError', () => popover2.showPopover(), + "popover1's beforetoggle event handler removes popover2 so showPopover should throw."); + assert_false(popover2.matches(':open'), 'popover2 should not match :open once it is closed.'); +}, 'Removing a popover while it is opening and force closing another popover should throw an exception.'); +</script>
diff --git a/third_party/blink/web_tests/external/wpt/html/semantics/popovers/popover-attribute-basic.tentative.html b/third_party/blink/web_tests/external/wpt/html/semantics/popovers/popover-attribute-basic.tentative.html index d16e34f..9b03c7b 100644 --- a/third_party/blink/web_tests/external/wpt/html/semantics/popovers/popover-attribute-basic.tentative.html +++ b/third_party/blink/web_tests/external/wpt/html/semantics/popovers/popover-attribute-basic.tentative.html
@@ -292,10 +292,10 @@ },{once: true}); assert_true(other_popover.matches(':open')); assert_false(popover.matches(':open')); - popover.showPopover(); + assert_throws_dom('InvalidStateError', () => popover.showPopover()); assert_false(other_popover.matches(':open'),'unrelated popover is hidden'); assert_false(popover.matches(':open'),'popover is not shown if its type changed during show'); - },`Changing the popover type in a "beforetoggle" event handler should not cause problems (during showPopover())`); + },`Changing the popover type in a "beforetoggle" event handler should throw an exception (during showPopover())`); test((t) => { const popover = createPopover(t); @@ -319,11 +319,11 @@ },{once: true}); assert_true(popover.matches(':open')); assert_true(other_popover.matches(':open')); - popover.hidePopover(); + assert_throws_dom('InvalidStateError', () => popover.hidePopover()); assert_false(other_popover.matches(':open'),'unrelated popover is hidden'); assert_false(popover.matches(':open'),'popover is still hidden if its type changed during hide event'); assert_throws_dom("InvalidStateError",() => other_popover.hidePopover(),'Nested popover should already be hidden'); - },`Changing the popover type in a "beforetoggle" event handler should not cause problems (during hidePopover())`); + },`Changing the popover type in a "beforetoggle" event handler should throw an exception (during hidePopover())`); function interpretedType(typeString,method) { if (validTypes.includes(typeString)) @@ -371,7 +371,9 @@ // Keeping the type the same should not hide it or fire events. assert_true(popover.matches(':open'),'popover should remain open when not changing the type'); assert_false(gotEvent); - popover.hidePopover(); // Cleanup + try { + popover.hidePopover(); // Cleanup + } catch (e) {} } else { // Changing the type at all should hide the popover. The hide event // handler should run, set a new type, and that type should end up
diff --git a/third_party/blink/web_tests/external/wpt/html/semantics/popovers/popover-light-dismiss.tentative.html b/third_party/blink/web_tests/external/wpt/html/semantics/popovers/popover-light-dismiss.tentative.html index 3c48bd92..587418b 100644 --- a/third_party/blink/web_tests/external/wpt/html/semantics/popovers/popover-light-dismiss.tentative.html +++ b/third_party/blink/web_tests/external/wpt/html/semantics/popovers/popover-light-dismiss.tentative.html
@@ -485,7 +485,7 @@ p14.hidePopover(); },{once:true}); assert_true(p13.matches(':open') && p14.matches(':open') && p15.matches(':open'),'all three should be open'); - p14.hidePopover(); + assert_throws_dom('InvalidStateError',() => p14.hidePopover(),'should throw because the event listener has already hidden the popover'); assert_true(p13.matches(':open'),'p13 should still be open'); assert_false(p14.matches(':open')); assert_false(p15.matches(':open'));
diff --git a/third_party/blink/web_tests/external/wpt/media-source/mediasource-avtracks.html.ini b/third_party/blink/web_tests/external/wpt/media-source/mediasource-avtracks.html.ini index 554fc5fb9..2adcabd7 100644 --- a/third_party/blink/web_tests/external/wpt/media-source/mediasource-avtracks.html.ini +++ b/third_party/blink/web_tests/external/wpt/media-source/mediasource-avtracks.html.ini
@@ -3,7 +3,4 @@ expected: FAIL [Media tracks must be removed when the SourceBuffer is removed from the MediaSource] - expected: - if (flag_specific == "") and (product == "chrome"): PASS - if flag_specific == "disable-site-isolation-trials": PASS - FAIL + expected: FAIL
diff --git a/third_party/blink/web_tests/external/wpt/resource-timing/response-status-code.html.ini b/third_party/blink/web_tests/external/wpt/resource-timing/response-status-code.html.ini index 72e14487..174472c 100644 --- a/third_party/blink/web_tests/external/wpt/resource-timing/response-status-code.html.ini +++ b/third_party/blink/web_tests/external/wpt/resource-timing/response-status-code.html.ini
@@ -150,7 +150,7 @@ expected: [PASS, NOTRUN] [This test validates the response status of resources. 255] - expected: [NOTRUN, PASS] + expected: [PASS, FAIL] [This test validates the response status of resources. 263] expected: [NOTRUN, PASS] @@ -532,3 +532,21 @@ [This test validates the response status of resources. 276] expected: [PASS, FAIL] + + [This test validates the response status of resources. 277] + expected: [PASS, FAIL] + + [This test validates the response status of resources. 298] + expected: [PASS, FAIL] + + [This test validates the response status of resources. 272] + expected: [PASS, FAIL] + + [This test validates the response status of resources. 246] + expected: [PASS, FAIL] + + [This test validates the response status of resources. 293] + expected: [PASS, FAIL] + + [This test validates the response status of resources. 278] + expected: [PASS, FAIL]
diff --git a/third_party/blink/web_tests/fast/canvas/canvas-ImageBitmap-structured-clone.html b/third_party/blink/web_tests/fast/canvas/canvas-ImageBitmap-structured-clone.html index 13f689da..f112999 100644 --- a/third_party/blink/web_tests/fast/canvas/canvas-ImageBitmap-structured-clone.html +++ b/third_party/blink/web_tests/fast/canvas/canvas-ImageBitmap-structured-clone.html
@@ -91,7 +91,7 @@ var context = document.getElementById("canvas").getContext("2d", {willReadFrequently: true}); var p1 = createImageBitmap(image1).then(function(image) {imageBitmap1 = image}); -var p2 = createImageBitmap(image2, {imageOrientation: "none", premultiplyAlpha: "none"}).then(function(image) {imageBitmap2 = image}); +var p2 = createImageBitmap(image2, {imageOrientation: "from-image", premultiplyAlpha: "none"}).then(function(image) {imageBitmap2 = image}); Promise.all([p1, p2]).then(function() { getNewImageDataFromImageBitmap(imageBitmap1); imageData1 = newImage.data;
diff --git a/third_party/blink/web_tests/fast/webgl/resources/imageBitmap-transferable.js b/third_party/blink/web_tests/fast/webgl/resources/imageBitmap-transferable.js index 573d88b5..3a86c968 100644 --- a/third_party/blink/web_tests/fast/webgl/resources/imageBitmap-transferable.js +++ b/third_party/blink/web_tests/fast/webgl/resources/imageBitmap-transferable.js
@@ -1,5 +1,5 @@ self.onmessage = function(e) { - createImageBitmap(e.data, {imageOrientation: "none", premultiplyAlpha: "none"}).then(imageBitmap => { + createImageBitmap(e.data, {imageOrientation: "from-image", premultiplyAlpha: "none"}).then(imageBitmap => { postMessage(imageBitmap, [imageBitmap]); }); };
diff --git a/third_party/blink/web_tests/fast/webgl/resources/tex-image-and-sub-image-image-bitmap-utils-resize.js b/third_party/blink/web_tests/fast/webgl/resources/tex-image-and-sub-image-image-bitmap-utils-resize.js index 6c9d9df6..c89894db 100644 --- a/third_party/blink/web_tests/fast/webgl/resources/tex-image-and-sub-image-image-bitmap-utils-resize.js +++ b/third_party/blink/web_tests/fast/webgl/resources/tex-image-and-sub-image-image-bitmap-utils-resize.js
@@ -149,7 +149,7 @@ var p1 = createImageBitmap(imageSource, options).then( function(imageBitmap) { bitmaps.defaultOption = imageBitmap }); - options.imageOrientation = "none"; + options.imageOrientation = "from-image"; options.premultiplyAlpha = "premultiply"; var p2 = createImageBitmap(imageSource, options).then( function(imageBitmap) { bitmaps.noFlipYPremul = imageBitmap });
diff --git a/third_party/blink/web_tests/fast/webgl/texImage-imageBitmap-from-blob.html b/third_party/blink/web_tests/fast/webgl/texImage-imageBitmap-from-blob.html index 64928309..ff403cd 100644 --- a/third_party/blink/web_tests/fast/webgl/texImage-imageBitmap-from-blob.html +++ b/third_party/blink/web_tests/fast/webgl/texImage-imageBitmap-from-blob.html
@@ -45,9 +45,9 @@ gl.clearDepth(1); var p1 = createImageBitmap(blob1).then(function(imageBitmap) { bitmaps.defaultOption = imageBitmap }); - var p2 = createImageBitmap(blob1, {imageOrientation: "none", premultiplyAlpha: "premultiply"}).then(function(imageBitmap) { bitmaps.noFlipYPremul = imageBitmap }); - var p3 = createImageBitmap(blob1, {imageOrientation: "none", premultiplyAlpha: "default"}).then(function(imageBitmap) { bitmaps.noFlipYDefault = imageBitmap }); - var p4 = createImageBitmap(blob1, {imageOrientation: "none", premultiplyAlpha: "none"}).then(function(imageBitmap) { bitmaps.noFlipYUnpremul = imageBitmap }); + var p2 = createImageBitmap(blob1, {imageOrientation: "from-image", premultiplyAlpha: "premultiply"}).then(function(imageBitmap) { bitmaps.noFlipYPremul = imageBitmap }); + var p3 = createImageBitmap(blob1, {imageOrientation: "from-image", premultiplyAlpha: "default"}).then(function(imageBitmap) { bitmaps.noFlipYDefault = imageBitmap }); + var p4 = createImageBitmap(blob1, {imageOrientation: "from-image", premultiplyAlpha: "none"}).then(function(imageBitmap) { bitmaps.noFlipYUnpremul = imageBitmap }); var p5 = createImageBitmap(blob1, {imageOrientation: "flipY", premultiplyAlpha: "premultiply"}).then(function(imageBitmap) { bitmaps.flipYPremul = imageBitmap }); var p6 = createImageBitmap(blob1, {imageOrientation: "flipY", premultiplyAlpha: "default"}).then(function(imageBitmap) { bitmaps.flipYDefault = imageBitmap }); var p7 = createImageBitmap(blob1, {imageOrientation: "flipY", premultiplyAlpha: "none"}).then(function(imageBitmap) { bitmaps.flipYUnpremul = imageBitmap });
diff --git a/third_party/blink/web_tests/fast/webgl/texImage-imageBitmap-from-canvas.html b/third_party/blink/web_tests/fast/webgl/texImage-imageBitmap-from-canvas.html index 64d0a7d..1319972 100644 --- a/third_party/blink/web_tests/fast/webgl/texImage-imageBitmap-from-canvas.html +++ b/third_party/blink/web_tests/fast/webgl/texImage-imageBitmap-from-canvas.html
@@ -63,9 +63,9 @@ setCanvasToRedGreen(ctx); var p1 = createImageBitmap(testCanvas).then(function(imageBitmap) { bitmaps.defaultOption = imageBitmap }); - var p2 = createImageBitmap(testCanvas, {imageOrientation: "none", premultiplyAlpha: "premultiply"}).then(function(imageBitmap) { bitmaps.noFlipYPremul = imageBitmap }); - var p3 = createImageBitmap(testCanvas, {imageOrientation: "none", premultiplyAlpha: "default"}).then(function(imageBitmap) { bitmaps.noFlipYDefault = imageBitmap }); - var p4 = createImageBitmap(testCanvas, {imageOrientation: "none", premultiplyAlpha: "none"}).then(function(imageBitmap) { bitmaps.noFlipYUnpremul = imageBitmap }); + var p2 = createImageBitmap(testCanvas, {imageOrientation: "from-image", premultiplyAlpha: "premultiply"}).then(function(imageBitmap) { bitmaps.noFlipYPremul = imageBitmap }); + var p3 = createImageBitmap(testCanvas, {imageOrientation: "from-image", premultiplyAlpha: "default"}).then(function(imageBitmap) { bitmaps.noFlipYDefault = imageBitmap }); + var p4 = createImageBitmap(testCanvas, {imageOrientation: "from-image", premultiplyAlpha: "none"}).then(function(imageBitmap) { bitmaps.noFlipYUnpremul = imageBitmap }); var p5 = createImageBitmap(testCanvas, {imageOrientation: "flipY", premultiplyAlpha: "premultiply"}).then(function(imageBitmap) { bitmaps.flipYPremul = imageBitmap }); var p6 = createImageBitmap(testCanvas, {imageOrientation: "flipY", premultiplyAlpha: "default"}).then(function(imageBitmap) { bitmaps.flipYDefault = imageBitmap }); var p7 = createImageBitmap(testCanvas, {imageOrientation: "flipY", premultiplyAlpha: "none"}).then(function(imageBitmap) { bitmaps.flipYUnpremul = imageBitmap });
diff --git a/third_party/blink/web_tests/fast/webgl/texImage-imageBitmap-from-image.html b/third_party/blink/web_tests/fast/webgl/texImage-imageBitmap-from-image.html index 6a4b33b4d..8267afbc 100644 --- a/third_party/blink/web_tests/fast/webgl/texImage-imageBitmap-from-image.html +++ b/third_party/blink/web_tests/fast/webgl/texImage-imageBitmap-from-image.html
@@ -45,9 +45,9 @@ gl.clearDepth(1); var p1 = createImageBitmap(image1).then(function(imageBitmap) { bitmaps.defaultOption = imageBitmap }); - var p2 = createImageBitmap(image1, {imageOrientation: "none", premultiplyAlpha: "premultiply"}).then(function(imageBitmap) { bitmaps.noFlipYPremul = imageBitmap }); - var p3 = createImageBitmap(image1, {imageOrientation: "none", premultiplyAlpha: "default"}).then(function(imageBitmap) { bitmaps.noFlipYDefault = imageBitmap }); - var p4 = createImageBitmap(image1, {imageOrientation: "none", premultiplyAlpha: "none"}).then(function(imageBitmap) { bitmaps.noFlipYUnpremul = imageBitmap }); + var p2 = createImageBitmap(image1, {imageOrientation: "from-image", premultiplyAlpha: "premultiply"}).then(function(imageBitmap) { bitmaps.noFlipYPremul = imageBitmap }); + var p3 = createImageBitmap(image1, {imageOrientation: "from-image", premultiplyAlpha: "default"}).then(function(imageBitmap) { bitmaps.noFlipYDefault = imageBitmap }); + var p4 = createImageBitmap(image1, {imageOrientation: "from-image", premultiplyAlpha: "none"}).then(function(imageBitmap) { bitmaps.noFlipYUnpremul = imageBitmap }); var p5 = createImageBitmap(image1, {imageOrientation: "flipY", premultiplyAlpha: "premultiply"}).then(function(imageBitmap) { bitmaps.flipYPremul = imageBitmap }); var p6 = createImageBitmap(image1, {imageOrientation: "flipY", premultiplyAlpha: "default"}).then(function(imageBitmap) { bitmaps.flipYDefault = imageBitmap }); var p7 = createImageBitmap(image1, {imageOrientation: "flipY", premultiplyAlpha: "none"}).then(function(imageBitmap) { bitmaps.flipYUnpremul = imageBitmap });
diff --git a/third_party/blink/web_tests/fast/webgl/texImage-imageBitmap-from-imageBitmap-from-blob.html b/third_party/blink/web_tests/fast/webgl/texImage-imageBitmap-from-imageBitmap-from-blob.html index fb28b31e..3819a3f 100644 --- a/third_party/blink/web_tests/fast/webgl/texImage-imageBitmap-from-imageBitmap-from-blob.html +++ b/third_party/blink/web_tests/fast/webgl/texImage-imageBitmap-from-imageBitmap-from-blob.html
@@ -44,12 +44,12 @@ gl.clearDepth(1); var bitmap; // bitmap will be in unpremultiplied format - createImageBitmap(blob, {imageOrientation: "none", premultiplyAlpha: "none"}).then(function(imageBitmap) { + createImageBitmap(blob, {imageOrientation: "from-image", premultiplyAlpha: "none"}).then(function(imageBitmap) { bitmap = imageBitmap; var p1 = createImageBitmap(bitmap).then(function(imageBitmap) { bitmaps.defaultOption = imageBitmap }); - var p2 = createImageBitmap(bitmap, {imageOrientation: "none", premultiplyAlpha: "premultiply"}).then(function(imageBitmap) { bitmaps.noFlipYPremul = imageBitmap }); - var p3 = createImageBitmap(bitmap, {imageOrientation: "none", premultiplyAlpha: "default"}).then(function(imageBitmap) { bitmaps.noFlipYDefault = imageBitmap }); - var p4 = createImageBitmap(bitmap, {imageOrientation: "none", premultiplyAlpha: "none"}).then(function(imageBitmap) { bitmaps.noFlipYUnpremul = imageBitmap }); + var p2 = createImageBitmap(bitmap, {imageOrientation: "from-image", premultiplyAlpha: "premultiply"}).then(function(imageBitmap) { bitmaps.noFlipYPremul = imageBitmap }); + var p3 = createImageBitmap(bitmap, {imageOrientation: "from-image", premultiplyAlpha: "default"}).then(function(imageBitmap) { bitmaps.noFlipYDefault = imageBitmap }); + var p4 = createImageBitmap(bitmap, {imageOrientation: "from-image", premultiplyAlpha: "none"}).then(function(imageBitmap) { bitmaps.noFlipYUnpremul = imageBitmap }); var p5 = createImageBitmap(bitmap, {imageOrientation: "flipY", premultiplyAlpha: "premultiply"}).then(function(imageBitmap) { bitmaps.flipYPremul = imageBitmap }); var p6 = createImageBitmap(bitmap, {imageOrientation: "flipY", premultiplyAlpha: "default"}).then(function(imageBitmap) { bitmaps.flipYDefault = imageBitmap }); var p7 = createImageBitmap(bitmap, {imageOrientation: "flipY", premultiplyAlpha: "none"}).then(function(imageBitmap) { bitmaps.flipYUnpremul = imageBitmap });
diff --git a/third_party/blink/web_tests/fast/webgl/texImage-imageBitmap-from-imageBitmap-from-canvas.html b/third_party/blink/web_tests/fast/webgl/texImage-imageBitmap-from-imageBitmap-from-canvas.html index 75c00be9..5d0b8845 100644 --- a/third_party/blink/web_tests/fast/webgl/texImage-imageBitmap-from-imageBitmap-from-canvas.html +++ b/third_party/blink/web_tests/fast/webgl/texImage-imageBitmap-from-imageBitmap-from-canvas.html
@@ -63,12 +63,12 @@ setCanvasToRedGreen(ctx); var bitmap; // bitmap will be in unpremultiplied format - createImageBitmap(testCanvas, {imageOrientation: "none", premultiplyAlpha: "none"}).then(function(imageBitmap) { + createImageBitmap(testCanvas, {imageOrientation: "from-image", premultiplyAlpha: "none"}).then(function(imageBitmap) { bitmap = imageBitmap; var p1 = createImageBitmap(bitmap).then(function(imageBitmap) { bitmaps.defaultOption = imageBitmap }); - var p2 = createImageBitmap(bitmap, {imageOrientation: "none", premultiplyAlpha: "premultiply"}).then(function(imageBitmap) { bitmaps.noFlipYPremul = imageBitmap }); - var p3 = createImageBitmap(bitmap, {imageOrientation: "none", premultiplyAlpha: "default"}).then(function(imageBitmap) { bitmaps.noFlipYDefault = imageBitmap }); - var p4 = createImageBitmap(bitmap, {imageOrientation: "none", premultiplyAlpha: "none"}).then(function(imageBitmap) { bitmaps.noFlipYUnpremul = imageBitmap }); + var p2 = createImageBitmap(bitmap, {imageOrientation: "from-image", premultiplyAlpha: "premultiply"}).then(function(imageBitmap) { bitmaps.noFlipYPremul = imageBitmap }); + var p3 = createImageBitmap(bitmap, {imageOrientation: "from-image", premultiplyAlpha: "default"}).then(function(imageBitmap) { bitmaps.noFlipYDefault = imageBitmap }); + var p4 = createImageBitmap(bitmap, {imageOrientation: "from-image", premultiplyAlpha: "none"}).then(function(imageBitmap) { bitmaps.noFlipYUnpremul = imageBitmap }); var p5 = createImageBitmap(bitmap, {imageOrientation: "flipY", premultiplyAlpha: "premultiply"}).then(function(imageBitmap) { bitmaps.flipYPremul = imageBitmap }); var p6 = createImageBitmap(bitmap, {imageOrientation: "flipY", premultiplyAlpha: "default"}).then(function(imageBitmap) { bitmaps.flipYDefault = imageBitmap }); var p7 = createImageBitmap(bitmap, {imageOrientation: "flipY", premultiplyAlpha: "none"}).then(function(imageBitmap) { bitmaps.flipYUnpremul = imageBitmap });
diff --git a/third_party/blink/web_tests/fast/webgl/texImage-imageBitmap-from-imageBitmap-from-image.html b/third_party/blink/web_tests/fast/webgl/texImage-imageBitmap-from-imageBitmap-from-image.html index 6d52986..8079aac 100644 --- a/third_party/blink/web_tests/fast/webgl/texImage-imageBitmap-from-imageBitmap-from-image.html +++ b/third_party/blink/web_tests/fast/webgl/texImage-imageBitmap-from-imageBitmap-from-image.html
@@ -44,12 +44,12 @@ gl.clearDepth(1); var bitmap; // bitmap will be in unpremultiplied format - createImageBitmap(image, {imageOrientation: "none", premultiplyAlpha: "none"}).then(function(imageBitmap) { + createImageBitmap(image, {imageOrientation: "from-image", premultiplyAlpha: "none"}).then(function(imageBitmap) { bitmap = imageBitmap; var p1 = createImageBitmap(bitmap).then(function(imageBitmap) { bitmaps.defaultOption = imageBitmap }); - var p2 = createImageBitmap(bitmap, {imageOrientation: "none", premultiplyAlpha: "premultiply"}).then(function(imageBitmap) { bitmaps.noFlipYPremul = imageBitmap }); - var p3 = createImageBitmap(bitmap, {imageOrientation: "none", premultiplyAlpha: "default"}).then(function(imageBitmap) { bitmaps.noFlipYDefault = imageBitmap }); - var p4 = createImageBitmap(bitmap, {imageOrientation: "none", premultiplyAlpha: "none"}).then(function(imageBitmap) { bitmaps.noFlipYUnpremul = imageBitmap }); + var p2 = createImageBitmap(bitmap, {imageOrientation: "from-image", premultiplyAlpha: "premultiply"}).then(function(imageBitmap) { bitmaps.noFlipYPremul = imageBitmap }); + var p3 = createImageBitmap(bitmap, {imageOrientation: "from-image", premultiplyAlpha: "default"}).then(function(imageBitmap) { bitmaps.noFlipYDefault = imageBitmap }); + var p4 = createImageBitmap(bitmap, {imageOrientation: "from-image", premultiplyAlpha: "none"}).then(function(imageBitmap) { bitmaps.noFlipYUnpremul = imageBitmap }); var p5 = createImageBitmap(bitmap, {imageOrientation: "flipY", premultiplyAlpha: "premultiply"}).then(function(imageBitmap) { bitmaps.flipYPremul = imageBitmap }); var p6 = createImageBitmap(bitmap, {imageOrientation: "flipY", premultiplyAlpha: "default"}).then(function(imageBitmap) { bitmaps.flipYDefault = imageBitmap }); var p7 = createImageBitmap(bitmap, {imageOrientation: "flipY", premultiplyAlpha: "none"}).then(function(imageBitmap) { bitmaps.flipYUnpremul = imageBitmap });
diff --git a/third_party/blink/web_tests/fast/webgl/texImage-imageBitmap-from-imageBitmap-from-imageData.html b/third_party/blink/web_tests/fast/webgl/texImage-imageBitmap-from-imageBitmap-from-imageData.html index 8e547ab9..9548b7d 100644 --- a/third_party/blink/web_tests/fast/webgl/texImage-imageBitmap-from-imageBitmap-from-imageData.html +++ b/third_party/blink/web_tests/fast/webgl/texImage-imageBitmap-from-imageBitmap-from-imageData.html
@@ -50,12 +50,12 @@ 2, 2); var bitmap; // bitmap will be in unpremultiplied format - createImageBitmap(imageData, {imageOrientation: "none", premultiplyAlpha: "none"}).then(function(image) { + createImageBitmap(imageData, {imageOrientation: "from-image", premultiplyAlpha: "none"}).then(function(image) { bitmap = image; var p1 = createImageBitmap(bitmap).then(function(imageBitmap) { bitmaps.defaultOption = imageBitmap }); - var p2 = createImageBitmap(bitmap, {imageOrientation: "none", premultiplyAlpha: "premultiply"}).then(function(imageBitmap) { bitmaps.noFlipYPremul = imageBitmap }); - var p3 = createImageBitmap(bitmap, {imageOrientation: "none", premultiplyAlpha: "default"}).then(function(imageBitmap) { bitmaps.noFlipYDefault = imageBitmap }); - var p4 = createImageBitmap(bitmap, {imageOrientation: "none", premultiplyAlpha: "none"}).then(function(imageBitmap) { bitmaps.noFlipYUnpremul = imageBitmap }); + var p2 = createImageBitmap(bitmap, {imageOrientation: "from-image", premultiplyAlpha: "premultiply"}).then(function(imageBitmap) { bitmaps.noFlipYPremul = imageBitmap }); + var p3 = createImageBitmap(bitmap, {imageOrientation: "from-image", premultiplyAlpha: "default"}).then(function(imageBitmap) { bitmaps.noFlipYDefault = imageBitmap }); + var p4 = createImageBitmap(bitmap, {imageOrientation: "from-image", premultiplyAlpha: "none"}).then(function(imageBitmap) { bitmaps.noFlipYUnpremul = imageBitmap }); var p5 = createImageBitmap(bitmap, {imageOrientation: "flipY", premultiplyAlpha: "premultiply"}).then(function(imageBitmap) { bitmaps.flipYPremul = imageBitmap }); var p6 = createImageBitmap(bitmap, {imageOrientation: "flipY", premultiplyAlpha: "default"}).then(function(imageBitmap) { bitmaps.flipYDefault = imageBitmap }); var p7 = createImageBitmap(bitmap, {imageOrientation: "flipY", premultiplyAlpha: "none"}).then(function(imageBitmap) { bitmaps.flipYUnpremul = imageBitmap });
diff --git a/third_party/blink/web_tests/fast/webgl/texImage-imageBitmap-from-imageBitmap-from-offscreen-canvas.html b/third_party/blink/web_tests/fast/webgl/texImage-imageBitmap-from-imageBitmap-from-offscreen-canvas.html index 4b97c8b..e4ea9d89 100644 --- a/third_party/blink/web_tests/fast/webgl/texImage-imageBitmap-from-imageBitmap-from-offscreen-canvas.html +++ b/third_party/blink/web_tests/fast/webgl/texImage-imageBitmap-from-imageBitmap-from-offscreen-canvas.html
@@ -64,12 +64,12 @@ setCanvasToRedGreen(ctx); var bitmap; // bitmap will be in unpremultiplied format - createImageBitmap(offscreen, {imageOrientation: "none", premultiplyAlpha: "none"}).then(function(imageBitmap) { + createImageBitmap(offscreen, {imageOrientation: "from-image", premultiplyAlpha: "none"}).then(function(imageBitmap) { bitmap = imageBitmap; var p1 = createImageBitmap(bitmap).then(function(imageBitmap) { bitmaps.defaultOption = imageBitmap }); - var p2 = createImageBitmap(bitmap, {imageOrientation: "none", premultiplyAlpha: "premultiply"}).then(function(imageBitmap) { bitmaps.noFlipYPremul = imageBitmap }); - var p3 = createImageBitmap(bitmap, {imageOrientation: "none", premultiplyAlpha: "default"}).then(function(imageBitmap) { bitmaps.noFlipYDefault = imageBitmap }); - var p4 = createImageBitmap(bitmap, {imageOrientation: "none", premultiplyAlpha: "none"}).then(function(imageBitmap) { bitmaps.noFlipYUnpremul = imageBitmap }); + var p2 = createImageBitmap(bitmap, {imageOrientation: "from-image", premultiplyAlpha: "premultiply"}).then(function(imageBitmap) { bitmaps.noFlipYPremul = imageBitmap }); + var p3 = createImageBitmap(bitmap, {imageOrientation: "from-image", premultiplyAlpha: "default"}).then(function(imageBitmap) { bitmaps.noFlipYDefault = imageBitmap }); + var p4 = createImageBitmap(bitmap, {imageOrientation: "from-image", premultiplyAlpha: "none"}).then(function(imageBitmap) { bitmaps.noFlipYUnpremul = imageBitmap }); var p5 = createImageBitmap(bitmap, {imageOrientation: "flipY", premultiplyAlpha: "premultiply"}).then(function(imageBitmap) { bitmaps.flipYPremul = imageBitmap }); var p6 = createImageBitmap(bitmap, {imageOrientation: "flipY", premultiplyAlpha: "default"}).then(function(imageBitmap) { bitmaps.flipYDefault = imageBitmap }); var p7 = createImageBitmap(bitmap, {imageOrientation: "flipY", premultiplyAlpha: "none"}).then(function(imageBitmap) { bitmaps.flipYUnpremul = imageBitmap });
diff --git a/third_party/blink/web_tests/fast/webgl/texImage-imageBitmap-from-imageData.html b/third_party/blink/web_tests/fast/webgl/texImage-imageBitmap-from-imageData.html index abb7c4c..708a3f07 100644 --- a/third_party/blink/web_tests/fast/webgl/texImage-imageBitmap-from-imageData.html +++ b/third_party/blink/web_tests/fast/webgl/texImage-imageBitmap-from-imageData.html
@@ -50,9 +50,9 @@ 2, 2); var p1 = createImageBitmap(imageData).then(function(imageBitmap) { bitmaps.defaultOption = imageBitmap }); - var p2 = createImageBitmap(imageData, {imageOrientation: "none", premultiplyAlpha: "premultiply"}).then(function(imageBitmap) { bitmaps.noFlipYPremul = imageBitmap }); - var p3 = createImageBitmap(imageData, {imageOrientation: "none", premultiplyAlpha: "default"}).then(function(imageBitmap) { bitmaps.noFlipYDefault = imageBitmap }); - var p4 = createImageBitmap(imageData, {imageOrientation: "none", premultiplyAlpha: "none"}).then(function(imageBitmap) { bitmaps.noFlipYUnpremul = imageBitmap }); + var p2 = createImageBitmap(imageData, {imageOrientation: "from-image", premultiplyAlpha: "premultiply"}).then(function(imageBitmap) { bitmaps.noFlipYPremul = imageBitmap }); + var p3 = createImageBitmap(imageData, {imageOrientation: "from-image", premultiplyAlpha: "default"}).then(function(imageBitmap) { bitmaps.noFlipYDefault = imageBitmap }); + var p4 = createImageBitmap(imageData, {imageOrientation: "from-image", premultiplyAlpha: "none"}).then(function(imageBitmap) { bitmaps.noFlipYUnpremul = imageBitmap }); var p5 = createImageBitmap(imageData, {imageOrientation: "flipY", premultiplyAlpha: "premultiply"}).then(function(imageBitmap) { bitmaps.flipYPremul = imageBitmap }); var p6 = createImageBitmap(imageData, {imageOrientation: "flipY", premultiplyAlpha: "default"}).then(function(imageBitmap) { bitmaps.flipYDefault = imageBitmap }); var p7 = createImageBitmap(imageData, {imageOrientation: "flipY", premultiplyAlpha: "none"}).then(function(imageBitmap) { bitmaps.flipYUnpremul = imageBitmap });
diff --git a/third_party/blink/web_tests/fast/webgl/texImage-imageBitmap-from-offscreen-canvas.html b/third_party/blink/web_tests/fast/webgl/texImage-imageBitmap-from-offscreen-canvas.html index f647da89..86e1d0de 100644 --- a/third_party/blink/web_tests/fast/webgl/texImage-imageBitmap-from-offscreen-canvas.html +++ b/third_party/blink/web_tests/fast/webgl/texImage-imageBitmap-from-offscreen-canvas.html
@@ -63,9 +63,9 @@ setCanvasToRedGreen(ctx); var p1 = createImageBitmap(offscreen).then(function(imageBitmap) { bitmaps.defaultOption = imageBitmap }); - var p2 = createImageBitmap(offscreen, {imageOrientation: "none", premultiplyAlpha: "premultiply"}).then(function(imageBitmap) { bitmaps.noFlipYPremul = imageBitmap }); - var p3 = createImageBitmap(offscreen, {imageOrientation: "none", premultiplyAlpha: "default"}).then(function(imageBitmap) { bitmaps.noFlipYDefault = imageBitmap }); - var p4 = createImageBitmap(offscreen, {imageOrientation: "none", premultiplyAlpha: "none"}).then(function(imageBitmap) { bitmaps.noFlipYUnpremul = imageBitmap }); + var p2 = createImageBitmap(offscreen, {imageOrientation: "from-image", premultiplyAlpha: "premultiply"}).then(function(imageBitmap) { bitmaps.noFlipYPremul = imageBitmap }); + var p3 = createImageBitmap(offscreen, {imageOrientation: "from-image", premultiplyAlpha: "default"}).then(function(imageBitmap) { bitmaps.noFlipYDefault = imageBitmap }); + var p4 = createImageBitmap(offscreen, {imageOrientation: "from-image", premultiplyAlpha: "none"}).then(function(imageBitmap) { bitmaps.noFlipYUnpremul = imageBitmap }); var p5 = createImageBitmap(offscreen, {imageOrientation: "flipY", premultiplyAlpha: "premultiply"}).then(function(imageBitmap) { bitmaps.flipYPremul = imageBitmap }); var p6 = createImageBitmap(offscreen, {imageOrientation: "flipY", premultiplyAlpha: "default"}).then(function(imageBitmap) { bitmaps.flipYDefault = imageBitmap }); var p7 = createImageBitmap(offscreen, {imageOrientation: "flipY", premultiplyAlpha: "none"}).then(function(imageBitmap) { bitmaps.flipYUnpremul = imageBitmap });
diff --git a/third_party/blink/web_tests/fast/webgl/texImage-imageBitmap-from-video.html b/third_party/blink/web_tests/fast/webgl/texImage-imageBitmap-from-video.html index 9d817a17..65c376b 100644 --- a/third_party/blink/web_tests/fast/webgl/texImage-imageBitmap-from-video.html +++ b/third_party/blink/web_tests/fast/webgl/texImage-imageBitmap-from-video.html
@@ -44,9 +44,9 @@ gl.clearDepth(1); var p1 = createImageBitmap(video).then(function(imageBitmap) { bitmaps.defaultOption = imageBitmap }); - var p2 = createImageBitmap(video, {imageOrientation: "none", premultiplyAlpha: "premultiply"}).then(function(imageBitmap) { bitmaps.noFlipYPremul = imageBitmap }); - var p3 = createImageBitmap(video, {imageOrientation: "none", premultiplyAlpha: "default"}).then(function(imageBitmap) { bitmaps.noFlipYDefault = imageBitmap }); - var p4 = createImageBitmap(video, {imageOrientation: "none", premultiplyAlpha: "none"}).then(function(imageBitmap) { bitmaps.noFlipYUnpremul = imageBitmap }); + var p2 = createImageBitmap(video, {imageOrientation: "from-image", premultiplyAlpha: "premultiply"}).then(function(imageBitmap) { bitmaps.noFlipYPremul = imageBitmap }); + var p3 = createImageBitmap(video, {imageOrientation: "from-image", premultiplyAlpha: "default"}).then(function(imageBitmap) { bitmaps.noFlipYDefault = imageBitmap }); + var p4 = createImageBitmap(video, {imageOrientation: "from-image", premultiplyAlpha: "none"}).then(function(imageBitmap) { bitmaps.noFlipYUnpremul = imageBitmap }); var p5 = createImageBitmap(video, {imageOrientation: "flipY", premultiplyAlpha: "premultiply"}).then(function(imageBitmap) { bitmaps.flipYPremul = imageBitmap }); var p6 = createImageBitmap(video, {imageOrientation: "flipY", premultiplyAlpha: "default"}).then(function(imageBitmap) { bitmaps.flipYDefault = imageBitmap }); var p7 = createImageBitmap(video, {imageOrientation: "flipY", premultiplyAlpha: "none"}).then(function(imageBitmap) { bitmaps.flipYUnpremul = imageBitmap });
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/accessibility/aria-owns-sends-notification-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/accessibility/aria-owns-sends-notification-expected.txt deleted file mode 100644 index 07bd145e..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/accessibility/aria-owns-sends-notification-expected.txt +++ /dev/null
@@ -1,6 +0,0 @@ -This is a testharness.js-based test. -PASS A mark dirty notification is fired when an aria-owned child gets added to the tree. -PASS A mark dirty notification is fired when an aria-owned attribute is added to an element that causes it to reparent another element to become its child. -PASS A mark dirty notification is fired on the old parent when one of its children gets reparented to another element due to aria-owns. -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/accessibility/element-role-mapping-normal-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/accessibility/element-role-mapping-normal-expected.txt deleted file mode 100644 index 17e176d..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/accessibility/element-role-mapping-normal-expected.txt +++ /dev/null
@@ -1,195 +0,0 @@ -This is a Header for this page -Heading -Division - -Paragraph - -韓國한국 -Coffee -- black hot drink -Milk -- white cold drink -x + a / b -Most important heading here -Google Chrome - -Google Chrome is a free, open-source web browser developed by Google, released in 2008. - -Footer in article - -HTML | CSS | JavaScript | - -Text that appears under aside - -Text in a pre -element - -Most important heading here - -Section - -Footer in section - -Written by Julie -Visit us at:www.chromium.org - - -January -This is an open dialog window - -Caption -Cell1 Cell2 -Fig1. - Blue Box - -This is a footer. - -This test make sure that unfocuasable elements are mapped implicitly to AX roles. - -On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". - -AXRole: AXGenericContainer - AXRole: AXHeader - AXRole: AXStaticText "This is a Header for this page" - AXRole: AXInlineTextBox "This is a Header for this page" - AXRole: AXHeading "Heading" - AXRole: AXStaticText "Heading" - AXRole: AXInlineTextBox "Heading" - AXRole: AXGenericContainer - AXRole: AXStaticText "Division" - AXRole: AXInlineTextBox "Division" - AXRole: AXParagraph - AXRole: AXStaticText "Paragraph" - AXRole: AXInlineTextBox "Paragraph" - AXRole: AXRuby - AXRole: AXStaticText "韓國" - AXRole: AXInlineTextBox "韓國" - AXRole: AXRubyAnnotation "한국" - AXRole: AXDescriptionList - AXRole: AXDescriptionListTerm - AXRole: AXStaticText "Coffee" - AXRole: AXInlineTextBox "Coffee" - AXRole: AXDescriptionListDetail - AXRole: AXStaticText "- black hot drink" - AXRole: AXInlineTextBox "- black hot drink" - AXRole: AXDescriptionListTerm - AXRole: AXStaticText "Milk" - AXRole: AXInlineTextBox "Milk" - AXRole: AXDescriptionListDetail - AXRole: AXStaticText "- white cold drink" - AXRole: AXInlineTextBox "- white cold drink" - AXRole: AXMath - AXRole: AXStaticText "x " - AXRole: AXInlineTextBox "x " - AXRole: AXStaticText "+ " - AXRole: AXInlineTextBox "+ " - AXRole: AXStaticText "a " - AXRole: AXInlineTextBox "a " - AXRole: AXStaticText "/ " - AXRole: AXInlineTextBox "/ " - AXRole: AXStaticText "b" - AXRole: AXInlineTextBox "b" - AXRole: AXMain - AXRole: AXArticle - AXRole: AXHeaderAsNonLandmark - AXRole: AXHeading "Most important heading here" - AXRole: AXStaticText "Most important heading here" - AXRole: AXInlineTextBox "Most important heading here" - AXRole: AXHeading "Google Chrome" - AXRole: AXStaticText "Google Chrome" - AXRole: AXInlineTextBox "Google Chrome" - AXRole: AXParagraph - AXRole: AXStaticText "Google Chrome is a free, open-source web browser developed by Google, released in 2008." - AXRole: AXInlineTextBox "Google Chrome is a free, open-source web browser developed by Google, " - AXRole: AXInlineTextBox "released in 2008." - AXRole: AXFooterAsNonLandmark - AXRole: AXParagraph - AXRole: AXStaticText "Footer in article" - AXRole: AXInlineTextBox "Footer in article" - AXRole: AXNavigation - AXRole: AXLink "HTML" - AXRole: AXStaticText "HTML" - AXRole: AXInlineTextBox "HTML" - AXRole: AXStaticText " | " - AXRole: AXInlineTextBox " | " - AXRole: AXLink "CSS" - AXRole: AXStaticText "CSS" - AXRole: AXInlineTextBox "CSS" - AXRole: AXStaticText " | " - AXRole: AXInlineTextBox " | " - AXRole: AXLink "JavaScript" - AXRole: AXStaticText "JavaScript" - AXRole: AXInlineTextBox "JavaScript" - AXRole: AXStaticText " |" - AXRole: AXInlineTextBox " |" - AXRole: AXComplementary - AXRole: AXParagraph - AXRole: AXStaticText "Text that appears under aside" - AXRole: AXInlineTextBox "Text that appears under aside" - AXRole: AXPre - AXRole: AXStaticText "Text in a pre -element -" - AXRole: AXInlineTextBox "Text in a pre" - AXRole: AXInlineTextBox " -" - AXRole: AXInlineTextBox "element" - AXRole: AXInlineTextBox " -" - AXRole: AXSection - AXRole: AXHeaderAsNonLandmark - AXRole: AXHeading "Most important heading here" - AXRole: AXStaticText "Most important heading here" - AXRole: AXInlineTextBox "Most important heading here" - AXRole: AXParagraph - AXRole: AXStaticText "Section" - AXRole: AXInlineTextBox "Section" - AXRole: AXFooterAsNonLandmark - AXRole: AXParagraph - AXRole: AXStaticText "Footer in section" - AXRole: AXInlineTextBox "Footer in section" - AXRole: AXGenericContainer - AXRole: AXStaticText "Written by Julie" - AXRole: AXInlineTextBox "Written by Julie" - AXRole: AXLineBreak " -" - AXRole: AXInlineTextBox " -" - AXRole: AXStaticText "Visit us at:www.chromium.org" - AXRole: AXInlineTextBox "Visit us at:www.chromium.org" - AXRole: AXLineBreak " -" - AXRole: AXInlineTextBox " -" - AXRole: AXParagraph - AXRole: AXStaticText "January" - AXRole: AXInlineTextBox "January" - AXRole: AXDialog - AXRole: AXStaticText "This is an open dialog window" - AXRole: AXInlineTextBox "This is an open dialog window" - AXRole: AXTable "Caption" - AXRole: AXCaption - AXRole: AXStaticText "Caption" - AXRole: AXInlineTextBox "Caption" - AXRole: AXRowGroup - AXRole: AXRow - AXRole: AXCell "Cell1" - AXRole: AXStaticText "Cell1" - AXRole: AXInlineTextBox "Cell1" - AXRole: AXCell "Cell2" - AXRole: AXStaticText "Cell2" - AXRole: AXInlineTextBox "Cell2" - AXRole: AXFigure "Fig1. - Blue Box" - AXRole: AXImage "blue" - AXRole: AXFigcaption - AXRole: AXStaticText "Fig1. - Blue Box" - AXRole: AXInlineTextBox "Fig1. - Blue Box" - AXRole: AXEmbeddedObject - AXRole: AXFooter - AXRole: AXParagraph - AXRole: AXStaticText "This is a footer." - AXRole: AXInlineTextBox "This is a footer." - -PASS successfullyParsed is true - -TEST COMPLETE -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/accessibility/inline-text-box-next-on-line-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/accessibility/inline-text-box-next-on-line-expected.txt deleted file mode 100644 index 27278940..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/accessibility/inline-text-box-next-on-line-expected.txt +++ /dev/null
@@ -1,10 +0,0 @@ -This is a testharness.js-based test. -PASS Test |NextOnLine| and |PreviousOnLine| on |AXInlineTextBox|. -PASS Test |NextOnLine| and |PreviousOnLine| on |AXLayoutObject|. -PASS Test |NextOnLine| and |PreviousOnLine| on paragraphs with links. -PASS Test |NextOnLine| and |PreviousOnLine| on paragraphs with anonymous blocks. -FAIL Test |NextOnLine| and |PreviousOnLine| on list markers. assert_equals: expected "AXRole: AXListMarker" but got "AXRole: AXList" -PASS Test |NextOnLine| and |PreviousOnLine| on multiline inline elements. -PASS Test |NextOnLine| and |PreviousOnLine| on anonymous multiline inline elements. -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/accessibility/inline-text-textarea-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/accessibility/inline-text-textarea-expected.txt deleted file mode 100644 index 502256ff..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/accessibility/inline-text-textarea-expected.txt +++ /dev/null
@@ -1,10 +0,0 @@ -Demonstrates that when typing in a textarea, not all of the InlineTextBoxes need to be updated for every character pressed. - -On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". - -PASS firstInlineTextBoxBefore.isEqual(firstInlineTextBoxAfter) is false -PASS lastInlineTextBoxBefore.isEqual(lastInlineTextBoxAfter) is true -PASS successfullyParsed is true - -TEST COMPLETE -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/absolute-inside-out-of-view-fixed-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/absolute-inside-out-of-view-fixed-expected.txt deleted file mode 100644 index 6b18539..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/absolute-inside-out-of-view-fixed-expected.txt +++ /dev/null
@@ -1,35 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [785, 2513], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='wrapper box'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#008000" - }, - { - "name": "VerticalScrollbar", - "position": [785, 0], - "bounds": [15, 600], - "contentsOpaque": true - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [0, -200, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/background-color/background-color-coverage-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/background-color/background-color-coverage-expected.txt deleted file mode 100644 index f480d89..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/background-color/background-color-coverage-expected.txt +++ /dev/null
@@ -1,169 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='green1'", - "bounds": [170, 170], - "contentsOpaque": true, - "backgroundColor": "#008000" - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='green2'", - "bounds": [170, 170], - "contentsOpaque": true, - "backgroundColor": "#008000", - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='green3'", - "bounds": [110, 110], - "contentsOpaqueForText": true, - "backgroundColor": "#008000", - "transform": 2 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='brown1'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#664C00", - "transform": 3 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='brown2'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#664C00", - "transform": 4 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='brown3'", - "bounds": [100, 100], - "contentsOpaqueForText": true, - "drawsContent": false, - "transform": 5 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='brown3'", - "bounds": [85, 85], - "drawsContent": false, - "transform": 5 - }, - { - "name": "HorizontalScrollbar", - "position": [0, 85], - "bounds": [100, 15], - "contentsOpaqueForText": true, - "transform": 5 - }, - { - "name": "VerticalScrollbar", - "position": [85, 0], - "bounds": [15, 85], - "contentsOpaque": true, - "transform": 5 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='brown3'", - "bounds": [85, 10000], - "contentsOpaque": true, - "backgroundColor": "#664C00", - "transform": 5 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='brown4'", - "bounds": [100, 100], - "contentsOpaqueForText": true, - "drawsContent": false, - "transform": 6 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='brown4'", - "bounds": [85, 85], - "drawsContent": false, - "transform": 6 - }, - { - "name": "HorizontalScrollbar", - "position": [0, 85], - "bounds": [100, 15], - "contentsOpaqueForText": true, - "transform": 6 - }, - { - "name": "VerticalScrollbar", - "position": [85, 0], - "bounds": [15, 85], - "contentsOpaque": true, - "transform": 6 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='brown4'", - "bounds": [85, 10000], - "contentsOpaque": true, - "backgroundColor": "#664C00", - "transform": 6 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [200, 0, 0, 1] - ] - }, - { - "id": 2, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [400, 0, 0, 1] - ] - }, - { - "id": 3, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [0, 200, 0, 1] - ] - }, - { - "id": 4, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [200, 200, 0, 1] - ] - }, - { - "id": 5, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [400, 200, 0, 1] - ] - }, - { - "id": 6, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [600, 200, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/clip-child-by-non-stacking-ancestor-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/clip-child-by-non-stacking-ancestor-expected.txt deleted file mode 100644 index 43257c83..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/clip-child-by-non-stacking-ancestor-expected.txt +++ /dev/null
@@ -1,29 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow DIV class='container'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#C0C0C0", - "transform": 1 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 8, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/contents-opaque/background-clip-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/contents-opaque/background-clip-expected.txt deleted file mode 100644 index e4a74c2..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/contents-opaque/background-clip-expected.txt +++ /dev/null
@@ -1,61 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow DIV class='box composited'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#008000", - "transform": 1 - }, - { - "name": "LayoutBlockFlow DIV class='box composited padding-clip'", - "bounds": [100, 100], - "contentsOpaqueForText": true, - "backgroundColor": "#008000", - "transform": 2 - }, - { - "name": "LayoutBlockFlow DIV class='box composited content-clip'", - "bounds": [100, 100], - "contentsOpaqueForText": true, - "backgroundColor": "#008000", - "transform": 3 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [13, 8, 0, 1] - ] - }, - { - "id": 2, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [13, 113, 0, 1] - ] - }, - { - "id": 3, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [13, 218, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/contents-opaque/background-color-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/contents-opaque/background-color-expected.txt deleted file mode 100644 index 1cc7053..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/contents-opaque/background-color-expected.txt +++ /dev/null
@@ -1,61 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow DIV class='box composited'", - "bounds": [100, 100], - "contentsOpaqueForText": true, - "drawsContent": false, - "transform": 1 - }, - { - "name": "LayoutBlockFlow DIV class='box translucent composited'", - "bounds": [100, 100], - "contentsOpaqueForText": true, - "backgroundColor": "#00FF0080", - "transform": 2 - }, - { - "name": "LayoutBlockFlow DIV class='box opaque composited'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#008000", - "transform": 3 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 8, 0, 1] - ] - }, - { - "id": 2, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 108, 0, 1] - ] - }, - { - "id": 3, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 208, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/contents-opaque/body-background-painted-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/contents-opaque/body-background-painted-expected.txt deleted file mode 100644 index b2c48b9..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/contents-opaque/body-background-painted-expected.txt +++ /dev/null
@@ -1,36 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#D3D3D3" - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='underbody'", - "bounds": [200, 200], - "contentsOpaque": true, - "backgroundColor": "#008000", - "transform": 1 - }, - { - "name": "LayoutBlockFlow HTML", - "position": [8, 8], - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#0000FF" - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 8, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/contents-opaque/body-background-skipped-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/contents-opaque/body-background-skipped-expected.txt deleted file mode 100644 index eeb324c0..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/contents-opaque/body-background-skipped-expected.txt +++ /dev/null
@@ -1,36 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#0000FF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='underbody'", - "bounds": [200, 200], - "contentsOpaque": true, - "backgroundColor": "#008000", - "transform": 1 - }, - { - "name": "LayoutBlockFlow HTML", - "position": [8, 8], - "bounds": [100, 100], - "contentsOpaqueForText": true, - "drawsContent": false - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 8, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/contents-opaque/control-layer-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/contents-opaque/control-layer-expected.txt deleted file mode 100644 index 98caef7..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/contents-opaque/control-layer-expected.txt +++ /dev/null
@@ -1,29 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutButton INPUT id='control' class='composited'", - "bounds": [127, 22], - "contentsOpaqueForText": true, - "backgroundColor": "#EFEFEF", - "transform": 1 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 8, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/contents-opaque/filter-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/contents-opaque/filter-expected.txt deleted file mode 100644 index 8426d03a..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/contents-opaque/filter-expected.txt +++ /dev/null
@@ -1,43 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow DIV class='composited container-box'", - "bounds": [100, 100], - "contentsOpaqueForText": true, - "transform": 1 - }, - { - "name": "LayoutBlockFlow DIV class='composited container-box'", - "bounds": [100, 100], - "contentsOpaqueForText": true, - "transform": 2 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [10, 10, 0, 1] - ] - }, - { - "id": 2, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [10, 120, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/contents-opaque/hidden-with-visible-child-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/contents-opaque/hidden-with-visible-child-expected.txt deleted file mode 100644 index f3670e2..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/contents-opaque/hidden-with-visible-child-expected.txt +++ /dev/null
@@ -1,29 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='caption'", - "bounds": [200, 100], - "contentsOpaque": true, - "backgroundColor": "#0000FF", - "transform": 1 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 13, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/contents-opaque/hidden-with-visible-text-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/contents-opaque/hidden-with-visible-text-expected.txt deleted file mode 100644 index 6acd2ec..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/contents-opaque/hidden-with-visible-text-expected.txt +++ /dev/null
@@ -1,30 +0,0 @@ -Caption -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='caption'", - "bounds": [50, 19], - "contentsOpaque": true, - "backgroundColor": "#0000FF", - "transform": 1 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 13, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/contents-opaque/layer-opacity-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/contents-opaque/layer-opacity-expected.txt deleted file mode 100644 index 92efc48..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/contents-opaque/layer-opacity-expected.txt +++ /dev/null
@@ -1,29 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow DIV class='box opaque-background translucent composited'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#008000", - "transform": 1 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 8, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/contents-opaque/layer-transform-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/contents-opaque/layer-transform-expected.txt deleted file mode 100644 index 3d3c08b..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/contents-opaque/layer-transform-expected.txt +++ /dev/null
@@ -1,40 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow DIV class='box'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#008000", - "transform": 2 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 8, 0, 1] - ] - }, - { - "id": 2, - "parent": 1, - "transform": [ - [0.866025403784439, 0.5, 0, 0], - [-0.5, 0.866025403784439, 0, 0], - [0, 0, 1, 0], - [0, 0, 0, 1] - ], - "origin": [50, 50] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/contents-opaque/overflow-hidden-child-layers-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/contents-opaque/overflow-hidden-child-layers-expected.txt deleted file mode 100644 index cb7474a..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/contents-opaque/overflow-hidden-child-layers-expected.txt +++ /dev/null
@@ -1,30 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow DIV class='box'", - "position": [-30, -30], - "bounds": [160, 160], - "contentsOpaqueForText": true, - "backgroundColor": "#C0C0C0", - "transform": 1 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [58, 50, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/filters/sw-layer-overlaps-hw-shadow-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/filters/sw-layer-overlaps-hw-shadow-expected.txt deleted file mode 100644 index 9601c5e..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/filters/sw-layer-overlaps-hw-shadow-expected.txt +++ /dev/null
@@ -1,35 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='composited'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#000000", - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='software'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#008000" - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [105, 105, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/filters/sw-nested-shadow-overlaps-hw-nested-shadow-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/filters/sw-nested-shadow-overlaps-hw-nested-shadow-expected.txt deleted file mode 100644 index 30f83d1..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/filters/sw-nested-shadow-overlaps-hw-nested-shadow-expected.txt +++ /dev/null
@@ -1,41 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='composited-parent'", - "position": [-100, -100], - "bounds": [200, 200], - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='software-parent'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#008000" - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='software-child'", - "position": [100, 100], - "bounds": [50, 50], - "contentsOpaque": true, - "backgroundColor": "#0000FF" - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [330, 330, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/filters/sw-shadow-overlaps-hw-layer-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/filters/sw-shadow-overlaps-hw-layer-expected.txt deleted file mode 100644 index 56b0ad9..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/filters/sw-shadow-overlaps-hw-layer-expected.txt +++ /dev/null
@@ -1,34 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='composited'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#000000", - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='software'", - "bounds": [125, 125], - "contentsOpaqueForText": true - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [105, 105, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/filters/sw-shadow-overlaps-hw-shadow-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/filters/sw-shadow-overlaps-hw-shadow-expected.txt deleted file mode 100644 index 52b868c..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/filters/sw-shadow-overlaps-hw-shadow-expected.txt +++ /dev/null
@@ -1,34 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='composited'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#000000", - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='software'", - "bounds": [125, 125], - "contentsOpaqueForText": true - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [130, 130, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/fixed-body-background-positioned-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/fixed-body-background-positioned-expected.txt deleted file mode 100644 index 318e9f6..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/fixed-body-background-positioned-expected.txt +++ /dev/null
@@ -1,34 +0,0 @@ -{ - "layers": [ - { - "name": "LayoutView #document", - "bounds": [785, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow HTML", - "bounds": [785, 3700], - "contentsOpaqueForText": true, - "transform": 1 - }, - { - "name": "VerticalScrollbar", - "position": [785, 0], - "bounds": [15, 600], - "contentsOpaque": true - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [0, -200, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/fixed-position-changed-to-absolute-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/fixed-position-changed-to-absolute-expected.txt deleted file mode 100644 index 17ebb78..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/fixed-position-changed-to-absolute-expected.txt +++ /dev/null
@@ -1,42 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#402B3C" - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='composited'", - "bounds": [150, 150], - "contentsOpaque": true, - "backgroundColor": "#D9CCA7", - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='layer-A'", - "position": [20, 20], - "bounds": [226, 60], - "contentsOpaqueForText": true - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='layer-B'", - "position": [100, 100], - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#F26835" - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 13, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/force-compositing-mode/overflow-iframe-enter-compositing-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/force-compositing-mode/overflow-iframe-enter-compositing-expected.txt deleted file mode 100644 index b90e7674..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/force-compositing-mode/overflow-iframe-enter-compositing-expected.txt +++ /dev/null
@@ -1,50 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "HorizontalScrollbar", - "position": [0, 135], - "bounds": [135, 15], - "contentsOpaque": true, - "transform": 1 - }, - { - "name": "VerticalScrollbar", - "position": [135, 0], - "bounds": [15, 135], - "contentsOpaque": true, - "transform": 1 - }, - { - "name": "Scroll corner of LayoutView #document", - "position": [135, 135], - "bounds": [15, 15], - "contentsOpaque": true, - "transform": 1 - }, - { - "name": "LayoutBlockFlow HTML", - "bounds": [508, 516], - "contentsOpaqueForText": true, - "backgroundColor": "#0000FF", - "transform": 1 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [10, 10, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/force-compositing-mode/overflow-iframe-layer-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/force-compositing-mode/overflow-iframe-layer-expected.txt deleted file mode 100644 index b90e7674..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/force-compositing-mode/overflow-iframe-layer-expected.txt +++ /dev/null
@@ -1,50 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "HorizontalScrollbar", - "position": [0, 135], - "bounds": [135, 15], - "contentsOpaque": true, - "transform": 1 - }, - { - "name": "VerticalScrollbar", - "position": [135, 0], - "bounds": [15, 135], - "contentsOpaque": true, - "transform": 1 - }, - { - "name": "Scroll corner of LayoutView #document", - "position": [135, 135], - "bounds": [15, 15], - "contentsOpaque": true, - "transform": 1 - }, - { - "name": "LayoutBlockFlow HTML", - "bounds": [508, 516], - "contentsOpaqueForText": true, - "backgroundColor": "#0000FF", - "transform": 1 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [10, 10, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/geometry/ancestor-overflow-change-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/geometry/ancestor-overflow-change-expected.txt deleted file mode 100644 index 74dd7e7c..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/geometry/ancestor-overflow-change-expected.txt +++ /dev/null
@@ -1,39 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow DIV class='box'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#008000", - "transform": 2 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 8, 0, 1] - ] - }, - { - "id": 2, - "parent": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [0, 0, 1, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/geometry/bounds-clipped-composited-child-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/geometry/bounds-clipped-composited-child-expected.txt deleted file mode 100644 index 6e625f53..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/geometry/bounds-clipped-composited-child-expected.txt +++ /dev/null
@@ -1,39 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow DIV class='container'", - "bounds": [200, 100], - "contentsOpaque": true, - "backgroundColor": "#008000", - "transform": 2 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [58, 8, 0, 1] - ] - }, - { - "id": 2, - "parent": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [-50, 0, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/geometry/bounds-ignores-hidden-composited-descendant-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/geometry/bounds-ignores-hidden-composited-descendant-expected.txt deleted file mode 100644 index adccdc1..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/geometry/bounds-ignores-hidden-composited-descendant-expected.txt +++ /dev/null
@@ -1,61 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutImage (positioned) IMG", - "position": [10, 10], - "bounds": [50, 50], - "contentsOpaque": true, - "backgroundColor": "#000000" - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV class='inner'", - "position": [500, 120], - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#0000FF" - }, - { - "name": "LayoutImage (positioned) IMG", - "position": [10, 10], - "bounds": [50, 50], - "contentsOpaque": true, - "backgroundColor": "#000000", - "transform": 1 - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV class='composited inner'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#0000FF", - "transform": 2 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [0, 250, 0, 1] - ] - }, - { - "id": 2, - "parent": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [500, 120, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/geometry/bounds-ignores-hidden-dynamic-negzindex-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/geometry/bounds-ignores-hidden-dynamic-negzindex-expected.txt deleted file mode 100644 index f0048f58..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/geometry/bounds-ignores-hidden-dynamic-negzindex-expected.txt +++ /dev/null
@@ -1,59 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='composited'", - "bounds": [150, 150], - "contentsOpaqueForText": true - }, - { - "name": "LayoutImage (positioned) IMG class='to-visible'", - "position": [400, 150], - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#000000" - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='composited'", - "bounds": [150, 150], - "contentsOpaqueForText": true, - "transform": 1 - }, - { - "name": "LayoutBlockFlow PRE id='layers'", - "position": [8, 8], - "bounds": [784, 16], - "drawsContent": false - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='indicator box'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#008000" - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='indicator box'", - "position": [0, 250], - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#008000" - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [0, 250, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/geometry/clip-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/geometry/clip-expected.txt deleted file mode 100644 index 58b9a897..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/geometry/clip-expected.txt +++ /dev/null
@@ -1,68 +0,0 @@ -Test CSS clip with composited layers. Left and right sides should look the same. - -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='composited box'", - "position": [-5, -5], - "bounds": [110, 110], - "contentsOpaqueForText": true, - "backgroundColor": "#666666", - "transform": 2 - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV class='composited inner'", - "bounds": [120, 120], - "contentsOpaqueForText": true, - "backgroundColor": "#00000033", - "transform": 4 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [20, 20, 0, 1] - ] - }, - { - "id": 2, - "parent": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [0, 0, 1, 1] - ] - }, - { - "id": 3, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [210, 10, 0, 1] - ] - }, - { - "id": 4, - "parent": 3, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [0, 0, 1, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/geometry/clip-inside-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/geometry/clip-inside-expected.txt deleted file mode 100644 index 8a043301..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/geometry/clip-inside-expected.txt +++ /dev/null
@@ -1,68 +0,0 @@ -Test CSS clip with composited layers. Left and right sides should look the same. - -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='composited box'", - "position": [5, 15], - "bounds": [90, 80], - "contentsOpaque": true, - "backgroundColor": "#666666", - "transform": 2 - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV class='composited inner'", - "bounds": [120, 120], - "contentsOpaqueForText": true, - "backgroundColor": "#00000033", - "transform": 4 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [20, 20, 0, 1] - ] - }, - { - "id": 2, - "parent": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [0, 0, 1, 1] - ] - }, - { - "id": 3, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [210, 10, 0, 1] - ] - }, - { - "id": 4, - "parent": 3, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [0, 0, 1, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/geometry/clip-with-shadow-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/geometry/clip-with-shadow-expected.txt deleted file mode 100644 index bdc9cc3..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/geometry/clip-with-shadow-expected.txt +++ /dev/null
@@ -1,66 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='composited box'", - "position": [-5, -5], - "bounds": [110, 110], - "contentsOpaqueForText": true, - "backgroundColor": "#666666", - "transform": 2 - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV class='composited inner'", - "bounds": [120, 120], - "contentsOpaqueForText": true, - "backgroundColor": "#00000033", - "transform": 4 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [20, 20, 0, 1] - ] - }, - { - "id": 2, - "parent": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [0, 0, 1, 1] - ] - }, - { - "id": 3, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [210, 10, 0, 1] - ] - }, - { - "id": 4, - "parent": 3, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [0, 0, 1, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/geometry/flipped-writing-mode-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/geometry/flipped-writing-mode-expected.txt deleted file mode 100644 index 2a55d06e..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/geometry/flipped-writing-mode-expected.txt +++ /dev/null
@@ -1,47 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow DIV class='composited flipped'", - "bounds": [250, 200], - "contentsOpaque": true, - "backgroundColor": "#C0C0C0", - "transform": 1 - }, - { - "name": "LayoutBlockFlow DIV class='composited box'", - "position": [-95, 0], - "bounds": [195, 100], - "contentsOpaqueForText": true, - "backgroundColor": "#0000FF", - "transform": 2 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [18, 10, 0, 1] - ] - }, - { - "id": 2, - "parent": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [130, 10, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/geometry/foreground-layer-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/geometry/foreground-layer-expected.txt deleted file mode 100644 index 0993234..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/geometry/foreground-layer-expected.txt +++ /dev/null
@@ -1,118 +0,0 @@ - -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV class='main box'", - "position": [-30, -30], - "bounds": [340, 340], - "contentsOpaqueForText": true, - "backgroundColor": "#FF0000", - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='negative child'", - "bounds": [50, 50], - "contentsOpaqueForText": true, - "drawsContent": false, - "transform": 3 - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV class='main box'", - "position": [40, 40], - "bounds": [200, 204], - "contentsOpaqueForText": true, - "backgroundColor": "#008000", - "transform": 1 - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV class='main box'", - "position": [-30, -30], - "bounds": [340, 340], - "contentsOpaqueForText": true, - "backgroundColor": "#FF0000", - "transform": 4 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='negative child'", - "bounds": [50, 50], - "contentsOpaqueForText": true, - "drawsContent": false, - "transform": 6 - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV class='main box'", - "position": [40, 40], - "bounds": [200, 200], - "contentsOpaque": true, - "backgroundColor": "#008000", - "transform": 4 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [38, 108, 0, 1] - ] - }, - { - "id": 2, - "parent": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [40, 40, 0, 1] - ] - }, - { - "id": 3, - "parent": 2, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [0, 0, 1, 1] - ] - }, - { - "id": 4, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [382, 38, 0, 1] - ] - }, - { - "id": 5, - "parent": 4, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [40, 40, 0, 1] - ] - }, - { - "id": 6, - "parent": 5, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [0, 0, 1, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/geometry/limit-layer-bounds-opacity-transition-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/geometry/limit-layer-bounds-opacity-transition-expected.txt deleted file mode 100644 index 04adcd4..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/geometry/limit-layer-bounds-opacity-transition-expected.txt +++ /dev/null
@@ -1,38 +0,0 @@ -Test -Fader -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow DIV class='compositing'", - "bounds": [1, 1], - "contentsOpaqueForText": true, - "drawsContent": false, - "transform": 1 - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV class='test'", - "position": [8, 0], - "bounds": [100, 99], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 8, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/geometry/limit-layer-bounds-overflow-root-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/geometry/limit-layer-bounds-overflow-root-expected.txt deleted file mode 100644 index f38043fa..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/geometry/limit-layer-bounds-overflow-root-expected.txt +++ /dev/null
@@ -1,33 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='compositing'", - "bounds": [100, 100], - "contentsOpaqueForText": true, - "drawsContent": false, - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='indicator'", - "bounds": [216, 142] - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [21, 21, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/geometry/limit-layer-bounds-positioned-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/geometry/limit-layer-bounds-positioned-expected.txt deleted file mode 100644 index 9c2de98..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/geometry/limit-layer-bounds-positioned-expected.txt +++ /dev/null
@@ -1,36 +0,0 @@ -Text here -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='compositing'", - "bounds": [100, 100], - "contentsOpaqueForText": true, - "drawsContent": false, - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='indicator'", - "position": [8, 8], - "bounds": [142, 142], - "contentsOpaqueForText": true - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [29, 29, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/geometry/limit-layer-bounds-positioned-transition-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/geometry/limit-layer-bounds-positioned-transition-expected.txt deleted file mode 100644 index edfe8866..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/geometry/limit-layer-bounds-positioned-transition-expected.txt +++ /dev/null
@@ -1,37 +0,0 @@ -Text here -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='compositing'", - "bounds": [100, 100], - "contentsOpaqueForText": true, - "drawsContent": false, - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='indicator'", - "position": [0, 8], - "bounds": [429, 142], - "contentsOpaqueForText": true, - "backgroundColor": "#008000" - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [29, 29, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/geometry/limit-layer-bounds-transformed-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/geometry/limit-layer-bounds-transformed-expected.txt deleted file mode 100644 index 49410bac..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/geometry/limit-layer-bounds-transformed-expected.txt +++ /dev/null
@@ -1,37 +0,0 @@ -Text here -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='compositing'", - "bounds": [100, 100], - "contentsOpaqueForText": true, - "drawsContent": false, - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='indicator'", - "position": [0, 8], - "bounds": [350, 142], - "contentsOpaqueForText": true, - "backgroundColor": "#008000" - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [129, 29, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/geometry/preserve-3d-switching-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/geometry/preserve-3d-switching-expected.txt deleted file mode 100644 index 5ab73c7..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/geometry/preserve-3d-switching-expected.txt +++ /dev/null
@@ -1,105 +0,0 @@ -The green box appear angled out from the yellow box and embedded in it. - -transform: translateZ(-100px) rotateY(45deg); -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV id='container'", - "bounds": [304, 304], - "contentsOpaqueForText": true, - "transform": 1 - }, - { - "name": "LayoutBlockFlow DIV id='parent'", - "bounds": [280, 280], - "contentsOpaque": true, - "backgroundColor": "#FFFF00", - "transform": 4 - }, - { - "name": "LayoutBlockFlow (positioned) DIV", - "bounds": [200, 200], - "contentsOpaque": true, - "backgroundColor": "#008000", - "transform": 6 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [108, 73, 0, 1] - ] - }, - { - "id": 2, - "parent": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, -0.002], - [0, 0, 0, 1] - ], - "origin": [152, 152] - }, - { - "id": 3, - "parent": 2, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [12, 12, 0, 1] - ], - "flattenInheritedTransform": false - }, - { - "id": 4, - "parent": 3, - "transform": [ - [0.766044443118978, -0.556670399226419, -0.32139380484327, 0], - [0, 0.5, -0.866025403784439, 0], - [0.642787609686539, 0.663413948168938, 0.383022221559489, 0], - [0, 0, 0, 1] - ], - "origin": [140, 140], - "flattenInheritedTransform": false, - "renderingContext": 1 - }, - { - "id": 5, - "parent": 4, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [40, 40, 0, 1] - ], - "flattenInheritedTransform": false, - "renderingContext": 1 - }, - { - "id": 6, - "parent": 5, - "transform": [ - [0.766044443118978, 0, 0.642787609686539, 0], - [0, 1, 0, 0], - [-0.642787609686539, 0, 0.766044443118978, 0], - [0, 0, 50, 1] - ], - "origin": [100, 100], - "flattenInheritedTransform": false, - "renderingContext": 1 - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/geometry/root-layer-update-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/geometry/root-layer-update-expected.png deleted file mode 100644 index cbd6684..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/geometry/root-layer-update-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/geometry/transfrom-origin-on-zero-size-layer-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/geometry/transfrom-origin-on-zero-size-layer-expected.png deleted file mode 100644 index e186ea19..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/geometry/transfrom-origin-on-zero-size-layer-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/gestures/gesture-tapHighlight-pixel-rotated-div-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/gestures/gesture-tapHighlight-pixel-rotated-div-expected.png deleted file mode 100644 index 987052d..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/gestures/gesture-tapHighlight-pixel-rotated-div-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/iframes/become-composited-nested-iframes-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/iframes/become-composited-nested-iframes-expected.txt deleted file mode 100644 index 518bb41..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/iframes/become-composited-nested-iframes-expected.txt +++ /dev/null
@@ -1,97 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [785, 1500], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow DIV id='iframe-content' class='box'", - "bounds": [210, 210], - "contentsOpaque": true, - "backgroundColor": "#0000FF", - "transform": 3 - }, - { - "name": "LayoutBlockFlow DIV id='iframe-content' class='box'", - "bounds": [210, 210], - "contentsOpaque": true, - "backgroundColor": "#0000FF", - "transform": 6 - }, - { - "name": "LayoutBlockFlow DIV id='box' class='composited'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#0000FF" - }, - { - "name": "VerticalScrollbar", - "position": [785, 0], - "bounds": [15, 600], - "contentsOpaque": true - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [22, 122, 0, 1] - ] - }, - { - "id": 2, - "parent": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [9, 9, 0, 1] - ] - }, - { - "id": 3, - "parent": 2, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [18, 10, 0, 1] - ] - }, - { - "id": 4, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [22, 346, 0, 1] - ] - }, - { - "id": 5, - "parent": 4, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [9, 9, 0, 1] - ] - }, - { - "id": 6, - "parent": 5, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [18, 10, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/iframes/become-overlapped-iframe-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/iframes/become-overlapped-iframe-expected.txt deleted file mode 100644 index e40324bf..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/iframes/become-overlapped-iframe-expected.txt +++ /dev/null
@@ -1,60 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "VerticalScrollbar", - "position": [305, 0], - "bounds": [15, 170], - "contentsOpaque": true, - "transform": 1 - }, - { - "name": "Scrolling background of LayoutView #document", - "bounds": [305, 230], - "contentsOpaque": true, - "backgroundColor": "#C0C0C0", - "transform": 1 - }, - { - "name": "LayoutBlockFlow DIV id='iframe-content' class='box'", - "bounds": [210, 210], - "contentsOpaque": true, - "backgroundColor": "#0000FF", - "transform": 2 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='overlay'", - "position": [5, 5], - "bounds": [150, 150], - "contentsOpaqueForText": true, - "backgroundColor": "#00000099" - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [73, 73, 0, 1] - ] - }, - { - "id": 2, - "parent": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [18, 10, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/iframes/composited-parent-iframe-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/iframes/composited-parent-iframe-expected.txt deleted file mode 100644 index e71462ac..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/iframes/composited-parent-iframe-expected.txt +++ /dev/null
@@ -1,70 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutIFrame IFRAME", - "position": [-30, -30], - "bounds": [390, 240], - "contentsOpaqueForText": true, - "transform": 1 - }, - { - "name": "VerticalScrollbar", - "position": [285, 0], - "bounds": [15, 150], - "contentsOpaque": true, - "transform": 2 - }, - { - "name": "Scrolling background of LayoutView #document", - "bounds": [285, 230], - "contentsOpaque": true, - "backgroundColor": "#C0C0C0", - "transform": 2 - }, - { - "name": "LayoutBlockFlow DIV id='iframe-content' class='box'", - "bounds": [210, 210], - "contentsOpaque": true, - "backgroundColor": "#0000FF", - "transform": 3 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 8, 0, 1] - ] - }, - { - "id": 2, - "parent": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [15, 15, 0, 1] - ] - }, - { - "id": 3, - "parent": 2, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [18, 10, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/iframes/connect-compositing-iframe-delayed-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/iframes/connect-compositing-iframe-delayed-expected.txt deleted file mode 100644 index c100373..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/iframes/connect-compositing-iframe-delayed-expected.txt +++ /dev/null
@@ -1,71 +0,0 @@ -When the parent document becomes composited, the layer trees should get connected together. - -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "VerticalScrollbar", - "position": [285, 0], - "bounds": [15, 150], - "contentsOpaque": true, - "transform": 1 - }, - { - "name": "Scrolling background of LayoutView #document", - "bounds": [285, 230], - "contentsOpaque": true, - "backgroundColor": "#C0C0C0", - "transform": 1 - }, - { - "name": "LayoutBlockFlow DIV id='iframe-content' class='box'", - "bounds": [210, 210], - "contentsOpaque": true, - "backgroundColor": "#0000FF", - "transform": 2 - }, - { - "name": "LayoutBlockFlow DIV id='box' class='composited'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#0000FF", - "transform": 3 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [43, 143, 0, 1] - ] - }, - { - "id": 2, - "parent": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [18, 10, 0, 1] - ] - }, - { - "id": 3, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 8, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/iframes/connect-compositing-iframe-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/iframes/connect-compositing-iframe-expected.txt deleted file mode 100644 index 1d3c79c..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/iframes/connect-compositing-iframe-expected.txt +++ /dev/null
@@ -1,77 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutIFrame IFRAME id='parent-iframe'", - "position": [-30, -30], - "bounds": [390, 240], - "contentsOpaqueForText": true, - "transform": 1 - }, - { - "name": "VerticalScrollbar", - "position": [285, 0], - "bounds": [15, 150], - "contentsOpaque": true, - "transform": 2 - }, - { - "name": "Scrolling background of LayoutView #document", - "bounds": [285, 230], - "contentsOpaque": true, - "backgroundColor": "#C0C0C0", - "transform": 2 - }, - { - "name": "LayoutBlockFlow DIV id='test' class='composited box'", - "bounds": [210, 210], - "contentsOpaque": true, - "backgroundColor": "#0000FF", - "transform": 3 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='overlay'", - "position": [5, 5], - "bounds": [50, 50], - "contentsOpaqueForText": true, - "backgroundColor": "#00000033" - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [28, 28, 0, 1] - ] - }, - { - "id": 2, - "parent": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [15, 15, 0, 1] - ] - }, - { - "id": 3, - "parent": 2, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [18, 10, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/iframes/connect-compositing-iframe2-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/iframes/connect-compositing-iframe2-expected.txt deleted file mode 100644 index d6dca6e1..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/iframes/connect-compositing-iframe2-expected.txt +++ /dev/null
@@ -1,77 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutIFrame IFRAME id='iframe'", - "position": [-30, -30], - "bounds": [390, 240], - "contentsOpaqueForText": true, - "transform": 1 - }, - { - "name": "VerticalScrollbar", - "position": [285, 0], - "bounds": [15, 150], - "contentsOpaque": true, - "transform": 2 - }, - { - "name": "Scrolling background of LayoutView #document", - "bounds": [285, 230], - "contentsOpaque": true, - "backgroundColor": "#C0C0C0", - "transform": 2 - }, - { - "name": "LayoutBlockFlow DIV id='iframe-content' class='box'", - "bounds": [210, 210], - "contentsOpaque": true, - "backgroundColor": "#0000FF", - "transform": 3 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='overlay'", - "position": [5, 5], - "bounds": [50, 50], - "contentsOpaqueForText": true, - "backgroundColor": "#00000033" - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [28, 28, 0, 1] - ] - }, - { - "id": 2, - "parent": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [15, 15, 0, 1] - ] - }, - { - "id": 3, - "parent": 2, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [18, 10, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/iframes/connect-compositing-iframe3-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/iframes/connect-compositing-iframe3-expected.txt deleted file mode 100644 index 3bfb2dcb..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/iframes/connect-compositing-iframe3-expected.txt +++ /dev/null
@@ -1,70 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutIFrame IFRAME id='iframe' class='composited'", - "position": [-30, -30], - "bounds": [390, 240], - "contentsOpaqueForText": true, - "transform": 1 - }, - { - "name": "VerticalScrollbar", - "position": [285, 0], - "bounds": [15, 150], - "contentsOpaque": true, - "transform": 2 - }, - { - "name": "Scrolling background of LayoutView #document", - "bounds": [285, 230], - "contentsOpaque": true, - "backgroundColor": "#C0C0C0", - "transform": 2 - }, - { - "name": "LayoutBlockFlow DIV id='iframe-content' class='box'", - "bounds": [210, 210], - "contentsOpaque": true, - "backgroundColor": "#0000FF", - "transform": 3 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [28, 28, 0, 1] - ] - }, - { - "id": 2, - "parent": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [15, 15, 0, 1] - ] - }, - { - "id": 3, - "parent": 2, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [18, 10, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/iframes/content-visibility-hidden-div-with-frame-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/iframes/content-visibility-hidden-div-with-frame-expected.txt deleted file mode 100644 index eb31492..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/iframes/content-visibility-hidden-div-with-frame-expected.txt +++ /dev/null
@@ -1,7 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x200 - LayoutBlockFlow {HTML} at (0,0) size 800x200 - LayoutBlockFlow {BODY} at (0,0) size 800x200 -layer at (0,0) size 800x0 - LayoutBlockFlow {DIV} at (0,0) size 800x0 (display-locked)
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/iframes/content-visibility-hidden-frame-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/iframes/content-visibility-hidden-frame-expected.txt deleted file mode 100644 index a413cb33..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/iframes/content-visibility-hidden-frame-expected.txt +++ /dev/null
@@ -1,7 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x200 - LayoutBlockFlow {HTML} at (0,0) size 800x200 - LayoutBlockFlow {BODY} at (0,0) size 800x200 -layer at (8,7) size 10x10 - LayoutIFrame (positioned) {IFRAME} at (8,7) size 10x10 (display-locked)
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/iframes/enter-compositing-iframe-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/iframes/enter-compositing-iframe-expected.txt deleted file mode 100644 index d101427..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/iframes/enter-compositing-iframe-expected.txt +++ /dev/null
@@ -1,60 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "VerticalScrollbar", - "position": [285, 0], - "bounds": [15, 150], - "contentsOpaque": true, - "transform": 1 - }, - { - "name": "Scrolling background of LayoutView #document", - "bounds": [285, 230], - "contentsOpaque": true, - "backgroundColor": "#C0C0C0", - "transform": 1 - }, - { - "name": "LayoutBlockFlow DIV id='test' class='composited box'", - "bounds": [210, 210], - "contentsOpaque": true, - "backgroundColor": "#0000FF", - "transform": 2 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='overlay'", - "position": [5, 5], - "bounds": [50, 50], - "contentsOpaqueForText": true, - "backgroundColor": "#00000033" - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [43, 43, 0, 1] - ] - }, - { - "id": 2, - "parent": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [18, 10, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/iframes/iframe-resize-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/iframes/iframe-resize-expected.txt deleted file mode 100644 index 64255289..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/iframes/iframe-resize-expected.txt +++ /dev/null
@@ -1,60 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "VerticalScrollbar", - "position": [385, 0], - "bounds": [15, 120], - "contentsOpaque": true, - "transform": 1 - }, - { - "name": "Scrolling background of LayoutView #document", - "bounds": [385, 230], - "contentsOpaque": true, - "backgroundColor": "#C0C0C0", - "transform": 1 - }, - { - "name": "LayoutBlockFlow DIV id='iframe-content' class='box'", - "bounds": [210, 210], - "contentsOpaque": true, - "backgroundColor": "#0000FF", - "transform": 2 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='overlay'", - "position": [5, 5], - "bounds": [50, 50], - "contentsOpaqueForText": true, - "backgroundColor": "#00000033" - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [43, 43, 0, 1] - ] - }, - { - "id": 2, - "parent": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [18, 10, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/iframes/iframe-size-from-zero-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/iframes/iframe-size-from-zero-expected.txt deleted file mode 100644 index f7e5b637..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/iframes/iframe-size-from-zero-expected.txt +++ /dev/null
@@ -1,60 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "VerticalScrollbar", - "position": [285, 0], - "bounds": [15, 150], - "contentsOpaque": true, - "transform": 1 - }, - { - "name": "Scrolling background of LayoutView #document", - "bounds": [285, 230], - "contentsOpaque": true, - "backgroundColor": "#C0C0C0", - "transform": 1 - }, - { - "name": "LayoutBlockFlow DIV id='iframe-content' class='box'", - "bounds": [210, 210], - "contentsOpaque": true, - "backgroundColor": "#0000FF", - "transform": 2 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='overlay'", - "position": [5, 5], - "bounds": [50, 50], - "contentsOpaqueForText": true, - "backgroundColor": "#00000033" - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [43, 43, 0, 1] - ] - }, - { - "id": 2, - "parent": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [18, 10, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/iframes/invisible-nested-iframe-hide-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/iframes/invisible-nested-iframe-hide-expected.txt deleted file mode 100644 index 6a8b7ec..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/iframes/invisible-nested-iframe-hide-expected.txt +++ /dev/null
@@ -1,29 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow DIV class='box'", - "bounds": [210, 210], - "contentsOpaque": true, - "backgroundColor": "#0000FF", - "transform": 1 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [18, 10, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/iframes/invisible-nested-iframe-show-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/iframes/invisible-nested-iframe-show-expected.txt deleted file mode 100644 index 2a47a5f..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/iframes/invisible-nested-iframe-show-expected.txt +++ /dev/null
@@ -1,75 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow DIV id='iframe-content' class='box'", - "bounds": [210, 210], - "contentsOpaque": true, - "backgroundColor": "#0000FF", - "transform": 3 - }, - { - "name": "LayoutBlockFlow DIV class='box'", - "bounds": [210, 210], - "contentsOpaque": true, - "backgroundColor": "#0000FF", - "transform": 5 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [23, 23, 0, 1] - ] - }, - { - "id": 2, - "parent": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [9, 9, 0, 1] - ] - }, - { - "id": 3, - "parent": 2, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [18, 10, 0, 1] - ] - }, - { - "id": 4, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [18, 203, 0, 1] - ] - }, - { - "id": 5, - "parent": 4, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [0, 0, 1, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/iframes/overlapped-iframe-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/iframes/overlapped-iframe-expected.txt deleted file mode 100644 index f7e5b637..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/iframes/overlapped-iframe-expected.txt +++ /dev/null
@@ -1,60 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "VerticalScrollbar", - "position": [285, 0], - "bounds": [15, 150], - "contentsOpaque": true, - "transform": 1 - }, - { - "name": "Scrolling background of LayoutView #document", - "bounds": [285, 230], - "contentsOpaque": true, - "backgroundColor": "#C0C0C0", - "transform": 1 - }, - { - "name": "LayoutBlockFlow DIV id='iframe-content' class='box'", - "bounds": [210, 210], - "contentsOpaque": true, - "backgroundColor": "#0000FF", - "transform": 2 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='overlay'", - "position": [5, 5], - "bounds": [50, 50], - "contentsOpaqueForText": true, - "backgroundColor": "#00000033" - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [43, 43, 0, 1] - ] - }, - { - "id": 2, - "parent": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [18, 10, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/iframes/overlapped-iframe-iframe-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/iframes/overlapped-iframe-iframe-expected.txt deleted file mode 100644 index 98f6f50..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/iframes/overlapped-iframe-iframe-expected.txt +++ /dev/null
@@ -1,62 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow DIV id='iframe-content' class='box'", - "bounds": [210, 210], - "contentsOpaque": true, - "backgroundColor": "#0000FF", - "transform": 2 - }, - { - "name": "VerticalScrollbar", - "position": [285, 0], - "bounds": [15, 300], - "contentsOpaque": true, - "transform": 3 - }, - { - "name": "Scrolling background of LayoutView #document", - "bounds": [285, 1018], - "contentsOpaque": true, - "backgroundColor": "#C0C0C0", - "transform": 3 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [2, 2, 0, 1] - ] - }, - { - "id": 2, - "parent": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [18, 10, 0, 1] - ] - }, - { - "id": 3, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [252, 2, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/iframes/overlapped-nested-iframes-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/iframes/overlapped-nested-iframes-expected.txt deleted file mode 100644 index ec6cf45..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/iframes/overlapped-nested-iframes-expected.txt +++ /dev/null
@@ -1,109 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [785, 1650], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "transform": 1 - }, - { - "name": "LayoutBlockFlow DIV id='iframe-content' class='box'", - "bounds": [210, 210], - "contentsOpaque": true, - "backgroundColor": "#0000FF", - "transform": 4 - }, - { - "name": "LayoutBlockFlow DIV id='iframe-content' class='box'", - "bounds": [210, 210], - "contentsOpaque": true, - "backgroundColor": "#0000FF", - "transform": 7 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='banner'", - "bounds": [785, 120], - "contentsOpaqueForText": true, - "backgroundColor": "#00000080" - }, - { - "name": "VerticalScrollbar", - "position": [785, 0], - "bounds": [15, 600], - "contentsOpaque": true - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [0, -100, 0, 1] - ] - }, - { - "id": 2, - "parent": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [22, 152, 0, 1] - ] - }, - { - "id": 3, - "parent": 2, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [9, 9, 0, 1] - ] - }, - { - "id": 4, - "parent": 3, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [18, 10, 0, 1] - ] - }, - { - "id": 5, - "parent": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [22, 376, 0, 1] - ] - }, - { - "id": 6, - "parent": 5, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [9, 9, 0, 1] - ] - }, - { - "id": 7, - "parent": 6, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [18, 10, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/iframes/resizer-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/iframes/resizer-expected.txt deleted file mode 100644 index 932c29f..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/iframes/resizer-expected.txt +++ /dev/null
@@ -1,76 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutIFrame IFRAME class='container'", - "bounds": [304, 154], - "contentsOpaqueForText": true, - "transform": 1 - }, - { - "name": "VerticalScrollbar", - "position": [285, 0], - "bounds": [15, 150], - "contentsOpaque": true, - "transform": 2 - }, - { - "name": "Scrolling background of LayoutView #document", - "bounds": [285, 230], - "contentsOpaque": true, - "backgroundColor": "#C0C0C0", - "transform": 2 - }, - { - "name": "LayoutBlockFlow DIV id='iframe-content' class='box'", - "bounds": [210, 210], - "contentsOpaque": true, - "backgroundColor": "#0000FF", - "transform": 3 - }, - { - "name": "Scroll corner of LayoutIFrame IFRAME class='container'", - "position": [287, 137], - "bounds": [15, 15], - "contentsOpaqueForText": true, - "transform": 1 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 8, 0, 1] - ] - }, - { - "id": 2, - "parent": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [2, 2, 0, 1] - ] - }, - { - "id": 3, - "parent": 2, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [18, 10, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/iframes/scrolling-iframe-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/iframes/scrolling-iframe-expected.txt deleted file mode 100644 index 9ccd8cee..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/iframes/scrolling-iframe-expected.txt +++ /dev/null
@@ -1,84 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "HorizontalScrollbar", - "position": [0, 135], - "bounds": [285, 15], - "contentsOpaque": true, - "transform": 1 - }, - { - "name": "VerticalScrollbar", - "position": [285, 0], - "bounds": [15, 135], - "contentsOpaque": true, - "transform": 1 - }, - { - "name": "Scroll corner of LayoutView #document", - "position": [285, 135], - "bounds": [15, 15], - "contentsOpaque": true, - "transform": 1 - }, - { - "name": "Scrolling background of LayoutView #document", - "bounds": [508, 608], - "contentsOpaque": true, - "backgroundColor": "#C0C0C0", - "transform": 2 - }, - { - "name": "LayoutBlockFlow DIV id='iframe-content' class='box'", - "bounds": [200, 200], - "contentsOpaque": true, - "backgroundColor": "#0000FF", - "transform": 3 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='overlay'", - "position": [5, 5], - "bounds": [50, 50], - "contentsOpaqueForText": true, - "backgroundColor": "#00000033" - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [43, 43, 0, 1] - ] - }, - { - "id": 2, - "parent": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [-80, -80, 0, 1] - ] - }, - { - "id": 3, - "parent": 2, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [108, 100, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/layer-creation/animation-overlap-with-children-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/layer-creation/animation-overlap-with-children-expected.txt deleted file mode 100644 index c752f5f..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/layer-creation/animation-overlap-with-children-expected.txt +++ /dev/null
@@ -1,63 +0,0 @@ -Should be composited -Should not be composited -Should be composited -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow DIV id='to-animate' class='container animating'", - "bounds": [262, 212], - "contentsOpaqueForText": true, - "transform": 1 - }, - { - "name": "LayoutBlockFlow DIV class='composited banner'", - "bounds": [250, 50], - "contentsOpaque": true, - "backgroundColor": "#C0C0C0", - "transform": 2 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='test1 box'", - "position": [11, 21], - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#FFA500", - "transform": 1 - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV class='box'", - "position": [18, 230], - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#0000FF" - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 8, 0, 1] - ] - }, - { - "id": 2, - "parent": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [6, 6, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/layer-creation/fixed-position-and-transform-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/layer-creation/fixed-position-and-transform-expected.txt deleted file mode 100644 index 3439dd0c..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/layer-creation/fixed-position-and-transform-expected.txt +++ /dev/null
@@ -1,51 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [785, 5021], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='indicator'", - "bounds": [256, 256], - "contentsOpaque": true, - "backgroundColor": "#FF0000", - "transform": 2 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='overlap'", - "bounds": [500, 500], - "contentsOpaque": true, - "backgroundColor": "#008000" - }, - { - "name": "VerticalScrollbar", - "position": [785, 0], - "bounds": [15, 600], - "contentsOpaque": true - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [0, -1000, 0, 1] - ] - }, - { - "id": 2, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [100, 100, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/layer-creation/fixed-position-change-out-of-view-in-view-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/layer-creation/fixed-position-change-out-of-view-in-view-expected.txt deleted file mode 100644 index 31b6107..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/layer-creation/fixed-position-change-out-of-view-in-view-expected.txt +++ /dev/null
@@ -1,88 +0,0 @@ -Layer tree when the fixed elements are out-of-view (should have just a root layer): -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [785, 4016], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "VerticalScrollbar", - "position": [785, 0], - "bounds": [15, 600], - "contentsOpaque": true - } - ] -} - -Layer tree when the fixed elements are in-view (both fixed elements should have layers): -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [785, 4016], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='fixed1'", - "bounds": [10, 10], - "contentsOpaque": true, - "backgroundColor": "#C0C0C0", - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='fixed2'", - "bounds": [10, 10], - "contentsOpaque": true, - "backgroundColor": "#C0C0C0", - "transform": 2 - }, - { - "name": "VerticalScrollbar", - "position": [785, 0], - "bounds": [15, 600], - "contentsOpaque": true - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [100, 50, 0, 1] - ] - }, - { - "id": 2, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [100, 100, 0, 1] - ] - } - ] -} - -Layer tree when the fixed elements are out-of-view again (should have just a root layer): -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [785, 4016], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "VerticalScrollbar", - "position": [785, 0], - "bounds": [15, 600], - "contentsOpaque": true - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/layer-creation/fixed-position-in-fixed-overflow-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/layer-creation/fixed-position-in-fixed-overflow-expected.txt deleted file mode 100644 index 1fd8caf..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/layer-creation/fixed-position-in-fixed-overflow-expected.txt +++ /dev/null
@@ -1,56 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='overflow fixed'", - "bounds": [800, 600], - "contentsOpaqueForText": true, - "drawsContent": false, - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='overflow fixed'", - "bounds": [785, 600], - "drawsContent": false, - "transform": 1 - }, - { - "name": "VerticalScrollbar", - "position": [785, 0], - "bounds": [15, 600], - "contentsOpaque": true, - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='overflow fixed'", - "bounds": [100, 1000], - "contentsOpaque": true, - "backgroundColor": "#0000FF", - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='yellow fixed'", - "position": [200, 13], - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#FFFF00" - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 13, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/layer-creation/fixed-position-no-content-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/layer-creation/fixed-position-no-content-expected.txt deleted file mode 100644 index 75f632c..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/layer-creation/fixed-position-no-content-expected.txt +++ /dev/null
@@ -1,42 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [785, 1021], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='fixed'", - "bounds": [50, 50], - "contentsOpaqueForText": true, - "drawsContent": false, - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='absolute'", - "position": [40, 40], - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#808080" - }, - { - "name": "VerticalScrollbar", - "position": [785, 0], - "bounds": [15, 600], - "contentsOpaque": true - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [10, 10, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/layer-creation/fixed-position-nonscrollable-body-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/layer-creation/fixed-position-nonscrollable-body-expected.txt deleted file mode 100644 index 40a30ce..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/layer-creation/fixed-position-nonscrollable-body-expected.txt +++ /dev/null
@@ -1,29 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 4021], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='fixed lime box'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#00FF00", - "transform": 1 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [10, 100, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/layer-creation/fixed-position-nonscrollable-body-mismatch-containers-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/layer-creation/fixed-position-nonscrollable-body-mismatch-containers-expected.txt deleted file mode 100644 index 11ad1c4..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/layer-creation/fixed-position-nonscrollable-body-mismatch-containers-expected.txt +++ /dev/null
@@ -1,59 +0,0 @@ -Even though the fixed-position element's container is nonscrollable, it should still be composited because one of its ancestors is scrolling. - -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow DIV class='scrollable bigBox'", - "position": [1, 1], - "bounds": [285, 285], - "drawsContent": false, - "transform": 1 - }, - { - "name": "HorizontalScrollbar", - "position": [1, 286], - "bounds": [300, 15], - "contentsOpaqueForText": true, - "transform": 1 - }, - { - "name": "VerticalScrollbar", - "position": [286, 1], - "bounds": [15, 285], - "contentsOpaque": true, - "transform": 1 - }, - { - "name": "LayoutBlockFlow DIV class='scrollable bigBox'", - "position": [1, 1], - "bounds": [285, 800], - "contentsOpaqueForText": true, - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='fixed lime box'", - "position": [10, 100], - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#00FF00" - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 72, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/layer-creation/fixed-position-nonscrollable-body-overlap-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/layer-creation/fixed-position-nonscrollable-body-overlap-expected.txt deleted file mode 100644 index ae5d3e7..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/layer-creation/fixed-position-nonscrollable-body-overlap-expected.txt +++ /dev/null
@@ -1,47 +0,0 @@ -Even though we can opt-out of fixed-position compositing for unscrollable fixed-position containers, we still need to composite fixed-position layers that need compositing for other reasons such as overlap. - -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 4024], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='absolute composited red box'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#FF0000", - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='fixed lime box'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#00FF00", - "transform": 2 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [10, 100, 0, 1] - ] - }, - { - "id": 2, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [10, 100, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/layer-creation/fixed-position-nonscrollable-iframes-in-scrollable-page-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/layer-creation/fixed-position-nonscrollable-iframes-in-scrollable-page-expected.txt deleted file mode 100644 index fe2c936f..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/layer-creation/fixed-position-nonscrollable-iframes-in-scrollable-page-expected.txt +++ /dev/null
@@ -1,137 +0,0 @@ -In all iframes, the green fixed-position element should not be composited. -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [785, 4016], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='composited box'", - "bounds": [300, 100], - "contentsOpaque": true, - "backgroundColor": "#00FFFF", - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='fixed lime box'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#00FF00", - "transform": 3 - }, - { - "name": "LayoutIFrame (positioned) IFRAME id='iframe2' class='composited'", - "bounds": [154, 154], - "contentsOpaqueForText": true, - "transform": 4 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='fixed lime box'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#00FF00", - "transform": 6 - }, - { - "name": "LayoutIFrame (positioned) IFRAME id='iframe3'", - "position": [10, 380], - "bounds": [154, 154], - "contentsOpaqueForText": true - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='fixed lime box'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#00FF00", - "transform": 8 - }, - { - "name": "VerticalScrollbar", - "position": [785, 0], - "bounds": [15, 600], - "contentsOpaque": true - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [50, 360, 0, 1] - ] - }, - { - "id": 2, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [12, 32, 0, 1] - ] - }, - { - "id": 3, - "parent": 2, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [10, 10, 0, 1] - ] - }, - { - "id": 4, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [10, 200, 0, 1] - ] - }, - { - "id": 5, - "parent": 4, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [2, 2, 0, 1] - ] - }, - { - "id": 6, - "parent": 5, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [10, 10, 0, 1] - ] - }, - { - "id": 7, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [12, 382, 0, 1] - ] - }, - { - "id": 8, - "parent": 7, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [10, 10, 0, 1] - ] - } - ] -} - -Composited box underneath iframe.
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/layer-creation/fixed-position-out-of-view-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/layer-creation/fixed-position-out-of-view-expected.txt deleted file mode 100644 index 8312b1b2..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/layer-creation/fixed-position-out-of-view-expected.txt +++ /dev/null
@@ -1,30 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [785, 1021], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='fixed'", - "bounds": [10, 10], - "contentsOpaque": true, - "backgroundColor": "#C0C0C0" - }, - { - "name": "LayoutBlockFlow HTML", - "position": [8, 13], - "bounds": [769, 1000], - "contentsOpaqueForText": true, - "drawsContent": false - }, - { - "name": "VerticalScrollbar", - "position": [785, 0], - "bounds": [15, 600], - "contentsOpaque": true - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/layer-creation/fixed-position-out-of-view-positioning-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/layer-creation/fixed-position-out-of-view-positioning-expected.txt deleted file mode 100644 index 0f78d28..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/layer-creation/fixed-position-out-of-view-positioning-expected.txt +++ /dev/null
@@ -1,114 +0,0 @@ -PASS layerTree is internals.layerTreeAsText(document) -PASS successfullyParsed is true - -TEST COMPLETE - -The layer trees before and after should be the same, except for the position of the 50x50 sized composited fixed position layer. -BEFORE: -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [2008, 2016], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='positionedAndTransformed fixed'", - "position": [0, 100], - "bounds": [50, 50], - "contentsOpaque": true, - "backgroundColor": "#C0C0C0", - "transform": 1 - }, - { - "name": "HorizontalScrollbar", - "position": [0, 585], - "bounds": [785, 15], - "contentsOpaque": true - }, - { - "name": "VerticalScrollbar", - "position": [785, 0], - "bounds": [15, 585], - "contentsOpaque": true - }, - { - "name": "Scroll corner of LayoutView #document", - "position": [785, 585], - "bounds": [15, 15], - "contentsOpaque": true - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [20, -80, 0, 1] - ] - } - ] -} - -AFTER: -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [2008, 2016], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='positionedAndTransformed fixed'", - "position": [0, 100], - "bounds": [50, 50], - "contentsOpaque": true, - "backgroundColor": "#C0C0C0", - "transform": 2 - }, - { - "name": "HorizontalScrollbar", - "position": [0, 585], - "bounds": [785, 15], - "contentsOpaque": true - }, - { - "name": "VerticalScrollbar", - "position": [785, 0], - "bounds": [15, 585], - "contentsOpaque": true - }, - { - "name": "Scroll corner of LayoutView #document", - "position": [785, 585], - "bounds": [15, 15], - "contentsOpaque": true - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [0, -10, 0, 1] - ] - }, - { - "id": 2, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [20, -80, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/layer-creation/fixed-position-out-of-view-scaled-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/layer-creation/fixed-position-out-of-view-scaled-expected.txt deleted file mode 100644 index 0f1020b..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/layer-creation/fixed-position-out-of-view-scaled-expected.txt +++ /dev/null
@@ -1,252 +0,0 @@ -Not scaled: -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [4008, 4016], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='fixed'", - "bounds": [10, 10], - "contentsOpaque": true, - "backgroundColor": "#C0C0C0", - "transform": 2 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='fixed'", - "bounds": [10, 10], - "contentsOpaque": true, - "backgroundColor": "#C0C0C0", - "transform": 3 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='fixed'", - "bounds": [10, 10], - "contentsOpaque": true, - "backgroundColor": "#C0C0C0", - "transform": 4 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='fixed'", - "bounds": [10, 10], - "contentsOpaque": true, - "backgroundColor": "#C0C0C0", - "transform": 1 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [0.5, 0, 0, 0], - [0, 0.5, 0, 0], - [0, 0, 1, 0], - [0, 0, 0, 1] - ], - "origin": [0, 0], - "flattenInheritedTransform": false - }, - { - "id": 2, - "parent": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 1008, 0, 1] - ] - }, - { - "id": 3, - "parent": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [1000, 0, 0, 1] - ] - }, - { - "id": 4, - "parent": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [600, 0, 0, 1] - ] - } - ] -} - -Scale=0.5: -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [4008, 4016], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='fixed'", - "bounds": [10, 10], - "contentsOpaque": true, - "backgroundColor": "#C0C0C0", - "transform": 2 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='fixed'", - "bounds": [10, 10], - "contentsOpaque": true, - "backgroundColor": "#C0C0C0", - "transform": 3 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='fixed'", - "bounds": [10, 10], - "contentsOpaque": true, - "backgroundColor": "#C0C0C0", - "transform": 4 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='fixed'", - "bounds": [10, 10], - "contentsOpaque": true, - "backgroundColor": "#C0C0C0", - "transform": 1 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [0.5, 0, 0, 0], - [0, 0.5, 0, 0], - [0, 0, 1, 0], - [0, 0, 0, 1] - ], - "origin": [0, 0], - "flattenInheritedTransform": false - }, - { - "id": 2, - "parent": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 1008, 0, 1] - ] - }, - { - "id": 3, - "parent": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [1000, 0, 0, 1] - ] - }, - { - "id": 4, - "parent": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [600, 0, 0, 1] - ] - } - ] -} - -Scale=1.5: -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [4008, 4016], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='fixed'", - "bounds": [10, 10], - "contentsOpaque": true, - "backgroundColor": "#C0C0C0", - "transform": 2 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='fixed'", - "bounds": [10, 10], - "contentsOpaque": true, - "backgroundColor": "#C0C0C0", - "transform": 3 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='fixed'", - "bounds": [10, 10], - "contentsOpaque": true, - "backgroundColor": "#C0C0C0", - "transform": 4 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='fixed'", - "bounds": [10, 10], - "contentsOpaque": true, - "backgroundColor": "#C0C0C0", - "transform": 1 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1.5, 0, 0, 0], - [0, 1.5, 0, 0], - [0, 0, 1, 0], - [0, 0, 0, 1] - ], - "origin": [0, 0], - "flattenInheritedTransform": false - }, - { - "id": 2, - "parent": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 1008, 0, 1] - ] - }, - { - "id": 3, - "parent": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [1000, 0, 0, 1] - ] - }, - { - "id": 4, - "parent": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [600, 0, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/layer-creation/fixed-position-out-of-view-scaled-scroll-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/layer-creation/fixed-position-out-of-view-scaled-scroll-expected.txt deleted file mode 100644 index b78376a..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/layer-creation/fixed-position-out-of-view-scaled-scroll-expected.txt +++ /dev/null
@@ -1,282 +0,0 @@ -Not scaled: -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [4008, 4016], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "transform": 2 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='fixed'", - "bounds": [10, 10], - "contentsOpaque": true, - "backgroundColor": "#C0C0C0", - "transform": 3 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='fixed'", - "bounds": [10, 10], - "contentsOpaque": true, - "backgroundColor": "#C0C0C0", - "transform": 4 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='fixed'", - "bounds": [10, 10], - "contentsOpaque": true, - "backgroundColor": "#C0C0C0", - "transform": 5 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='fixed'", - "bounds": [10, 10], - "contentsOpaque": true, - "backgroundColor": "#C0C0C0", - "transform": 1 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [0.5, 0, 0, 0], - [0, 0.5, 0, 0], - [0, 0, 1, 0], - [0, 0, 0, 1] - ], - "origin": [0, 0], - "flattenInheritedTransform": false - }, - { - "id": 2, - "parent": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [-100, -100, 0, 1] - ] - }, - { - "id": 3, - "parent": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 1008, 0, 1] - ] - }, - { - "id": 4, - "parent": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [1000, 0, 0, 1] - ] - }, - { - "id": 5, - "parent": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [600, 0, 0, 1] - ] - } - ] -} - -Scale=0.5: -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [4008, 4016], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "transform": 2 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='fixed'", - "bounds": [10, 10], - "contentsOpaque": true, - "backgroundColor": "#C0C0C0", - "transform": 3 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='fixed'", - "bounds": [10, 10], - "contentsOpaque": true, - "backgroundColor": "#C0C0C0", - "transform": 4 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='fixed'", - "bounds": [10, 10], - "contentsOpaque": true, - "backgroundColor": "#C0C0C0", - "transform": 5 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='fixed'", - "bounds": [10, 10], - "contentsOpaque": true, - "backgroundColor": "#C0C0C0", - "transform": 1 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [0.5, 0, 0, 0], - [0, 0.5, 0, 0], - [0, 0, 1, 0], - [0, 0, 0, 1] - ], - "origin": [0, 0], - "flattenInheritedTransform": false - }, - { - "id": 2, - "parent": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [-100, -100, 0, 1] - ] - }, - { - "id": 3, - "parent": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 1008, 0, 1] - ] - }, - { - "id": 4, - "parent": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [1000, 0, 0, 1] - ] - }, - { - "id": 5, - "parent": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [600, 0, 0, 1] - ] - } - ] -} - -Scale=1.5: -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [4008, 4016], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "transform": 2 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='fixed'", - "bounds": [10, 10], - "contentsOpaque": true, - "backgroundColor": "#C0C0C0", - "transform": 3 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='fixed'", - "bounds": [10, 10], - "contentsOpaque": true, - "backgroundColor": "#C0C0C0", - "transform": 4 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='fixed'", - "bounds": [10, 10], - "contentsOpaque": true, - "backgroundColor": "#C0C0C0", - "transform": 5 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='fixed'", - "bounds": [10, 10], - "contentsOpaque": true, - "backgroundColor": "#C0C0C0", - "transform": 1 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1.5, 0, 0, 0], - [0, 1.5, 0, 0], - [0, 0, 1, 0], - [0, 0, 0, 1] - ], - "origin": [0, 0], - "flattenInheritedTransform": false - }, - { - "id": 2, - "parent": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [-100, -100, 0, 1] - ] - }, - { - "id": 3, - "parent": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 1008, 0, 1] - ] - }, - { - "id": 4, - "parent": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [1000, 0, 0, 1] - ] - }, - { - "id": 5, - "parent": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [600, 0, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/layer-creation/fixed-position-out-of-view-with-backdrop-filter-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/layer-creation/fixed-position-out-of-view-with-backdrop-filter-expected.txt deleted file mode 100644 index a83ba8a..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/layer-creation/fixed-position-out-of-view-with-backdrop-filter-expected.txt +++ /dev/null
@@ -1,29 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [785, 1021], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='fixed'", - "bounds": [10, 10], - "contentsOpaqueForText": true - }, - { - "name": "LayoutBlockFlow HTML", - "position": [8, 13], - "bounds": [769, 1000], - "contentsOpaqueForText": true, - "drawsContent": false - }, - { - "name": "VerticalScrollbar", - "position": [785, 0], - "bounds": [15, 600], - "contentsOpaque": true - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/layer-creation/fixed-position-under-transform-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/layer-creation/fixed-position-under-transform-expected.txt deleted file mode 100644 index db398ac8..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/layer-creation/fixed-position-under-transform-expected.txt +++ /dev/null
@@ -1,63 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [785, 5021], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='indicator'", - "position": [100, 100], - "bounds": [256, 256], - "contentsOpaque": true, - "backgroundColor": "#FF0000", - "transform": 3 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='overlap'", - "bounds": [500, 500], - "contentsOpaque": true, - "backgroundColor": "#008000" - }, - { - "name": "VerticalScrollbar", - "position": [785, 0], - "bounds": [15, 600], - "contentsOpaque": true - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [0, -1000, 0, 1] - ] - }, - { - "id": 2, - "parent": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 13, 0, 1] - ] - }, - { - "id": 3, - "parent": 2, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [0, 1000, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/layer-creation/impl-thread-scrolling-non-composited-fixed-no-scroll-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/layer-creation/impl-thread-scrolling-non-composited-fixed-no-scroll-expected.txt deleted file mode 100644 index aba2ec5..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/layer-creation/impl-thread-scrolling-non-composited-fixed-no-scroll-expected.txt +++ /dev/null
@@ -1,17 +0,0 @@ -TEST -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='fixed'", - "position": [10, 10], - "bounds": [39, 20] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/layer-creation/main-thread-scrolling-non-composited-fixed-overflow-hidden-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/layer-creation/main-thread-scrolling-non-composited-fixed-overflow-hidden-expected.txt deleted file mode 100644 index 428db41..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/layer-creation/main-thread-scrolling-non-composited-fixed-overflow-hidden-expected.txt +++ /dev/null
@@ -1,28 +0,0 @@ -TEST -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 5021], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='fixed'", - "bounds": [39, 20], - "transform": 1 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [10, 10, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/layer-creation/no-compositing-for-fixed-position-under-transform-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/layer-creation/no-compositing-for-fixed-position-under-transform-expected.txt deleted file mode 100644 index cf9e296..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/layer-creation/no-compositing-for-fixed-position-under-transform-expected.txt +++ /dev/null
@@ -1,30 +0,0 @@ -TEST -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow DIV class='transform'", - "bounds": [100, 30], - "contentsOpaque": true, - "backgroundColor": "#0000FF", - "transform": 1 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 8, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/layer-creation/no-compositing-for-preserve-3d-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/layer-creation/no-compositing-for-preserve-3d-expected.txt deleted file mode 100644 index ecf549d..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/layer-creation/no-compositing-for-preserve-3d-expected.txt +++ /dev/null
@@ -1,132 +0,0 @@ -This layer should not be composited. -This layer should not be composited. -This layer should be composited. -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [785, 618], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV id='box1' class='box'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#C0C0C0", - "transform": 2 - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV id='box2' class='box'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#C0C0C0", - "transform": 5 - }, - { - "name": "LayoutBlockFlow DIV id='layer3' class='preserve3d'", - "bounds": [342, 182], - "transform": 7 - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV id='box3' class='box'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#C0C0C0", - "transform": 9 - }, - { - "name": "VerticalScrollbar", - "position": [785, 0], - "bounds": [15, 600], - "contentsOpaque": true - } - ], - "transforms": [ - { - "id": 1, - "renderingContext": 1 - }, - { - "id": 2, - "parent": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [49, 61, 0, 1] - ], - "flattenInheritedTransform": false, - "renderingContext": 1 - }, - { - "id": 3, - "renderingContext": 2 - }, - { - "id": 4, - "parent": 3, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [49, 253, 0, 1] - ], - "flattenInheritedTransform": false, - "renderingContext": 2 - }, - { - "id": 5, - "parent": 4, - "transform": [ - [0.984807753012208, 0.17364817766693, 0, 0], - [-0.17364817766693, 0.984807753012208, 0, 0], - [0, 0, 1, 0], - [0, 0, 0, 1] - ], - "origin": [50, 50], - "flattenInheritedTransform": false, - "renderingContext": 2 - }, - { - "id": 6, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [18, 394, 0, 1] - ] - }, - { - "id": 7, - "parent": 6, - "renderingContext": 3 - }, - { - "id": 8, - "parent": 7, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [31, 51, 0, 1] - ], - "flattenInheritedTransform": false, - "renderingContext": 3 - }, - { - "id": 9, - "parent": 8, - "transform": [ - [0.984807753012208, 0, -0.17364817766693, 0], - [0, 1, 0, 0], - [0.17364817766693, 0, 0.984807753012208, 0], - [0, 0, 0, 1] - ], - "origin": [50, 50], - "flattenInheritedTransform": false, - "renderingContext": 3 - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/layer-creation/overflow-hidden-scroll-with-fixed-overlap-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/layer-creation/overflow-hidden-scroll-with-fixed-overlap-expected.txt deleted file mode 100644 index 766da13..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/layer-creation/overflow-hidden-scroll-with-fixed-overlap-expected.txt +++ /dev/null
@@ -1,88 +0,0 @@ -Before: -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='fixed'", - "bounds": [30, 30], - "contentsOpaque": true, - "backgroundColor": "#0000FF", - "transform": 2 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [10, 10, 0, 1] - ] - }, - { - "id": 2, - "parent": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 100, 0, 1] - ] - } - ] -} - -After scroll: -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='fixed'", - "bounds": [30, 30], - "contentsOpaque": true, - "backgroundColor": "#0000FF", - "transform": 2 - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV class='overlapped'", - "position": [8, 102], - "bounds": [40, 40], - "contentsOpaque": true, - "backgroundColor": "#FFA500", - "transform": 1 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [10, 10, 0, 1] - ] - }, - { - "id": 2, - "parent": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 100, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/layer-creation/overflow-scroll-overlap-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/layer-creation/overflow-scroll-overlap-expected.txt deleted file mode 100644 index a7c03ea2b..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/layer-creation/overflow-scroll-overlap-expected.txt +++ /dev/null
@@ -1,35 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow DIV class='composited'", - "bounds": [30, 30], - "contentsOpaque": true, - "backgroundColor": "#808080", - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='scroller' class='overflow'", - "position": [20, 20], - "bounds": [306, 206], - "contentsOpaqueForText": true - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 8, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/layer-creation/overlap-animation-clipping-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/layer-creation/overlap-animation-clipping-expected.txt deleted file mode 100644 index dd7b1fa..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/layer-creation/overlap-animation-clipping-expected.txt +++ /dev/null
@@ -1,118 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [785, 812], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV id='to-animate1' class='box animating1'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#0000FF", - "transform": 2 - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV class='container'", - "position": [58, 230], - "bounds": [122, 462], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV class='box gray force-layer'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#808080", - "transform": 4 - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV id='to-animate2' class='box animating2'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#0000FF", - "transform": 6 - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV class='box yellow'", - "position": [69, 571], - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#FFFF00" - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV class='box yellow'", - "position": [18, 702], - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#FFFF00" - }, - { - "name": "VerticalScrollbar", - "position": [785, 0], - "bounds": [15, 600], - "contentsOpaque": true - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [...], - [...], - [...], - [...] - ] - }, - { - "id": 2, - "parent": 1, - "transform": [ - [...], - [...], - [...], - [...] - ] - }, - { - "id": 3, - "transform": [ - [...], - [...], - [...], - [...] - ] - }, - { - "id": 4, - "parent": 3, - "transform": [ - [...], - [...], - [...], - [...] - ] - }, - { - "id": 5, - "transform": [ - [...], - [...], - [...], - [...] - ] - }, - { - "id": 6, - "parent": 5, - "transform": [ - [...], - [...], - [...], - [...] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/layer-creation/overlap-animation-container-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/layer-creation/overlap-animation-container-expected.txt deleted file mode 100644 index cdb1c30f..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/layer-creation/overlap-animation-container-expected.txt +++ /dev/null
@@ -1,178 +0,0 @@ -Before: -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [785, 802], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV id='to-animate1' class='box animating1'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#0000FF", - "transform": 2 - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV class='container'", - "position": [46, 230], - "bounds": [146, 452], - "contentsOpaqueForText": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV class='box gray force-layer'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#808080", - "transform": 4 - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV class='box yellow'", - "position": [18, 692], - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#FFFF00" - }, - { - "name": "VerticalScrollbar", - "position": [785, 0], - "bounds": [15, 600], - "contentsOpaque": true - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [...], - [...], - [...], - [...] - ] - }, - { - "id": 2, - "parent": 1, - "transform": [ - [...], - [...], - [...], - [...] - ] - }, - { - "id": 3, - "transform": [ - [...], - [...], - [...], - [...] - ] - }, - { - "id": 4, - "parent": 3, - "transform": [ - [...], - [...], - [...], - [...] - ] - } - ] -} - -After: -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [785, 802], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV id='to-animate1' class='box animating1'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#0000FF", - "transform": 2 - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV class='container'", - "position": [58, 230], - "bounds": [122, 452], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV class='box gray force-layer'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#808080", - "transform": 4 - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV id='first-green-box' class='box green rotate-45deg'", - "position": [46, 328], - "bounds": [146, 344], - "contentsOpaqueForText": true - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV class='box yellow'", - "position": [18, 692], - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#FFFF00" - }, - { - "name": "VerticalScrollbar", - "position": [785, 0], - "bounds": [15, 600], - "contentsOpaque": true - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [...], - [...], - [...], - [...] - ] - }, - { - "id": 2, - "parent": 1, - "transform": [ - [...], - [...], - [...], - [...] - ] - }, - { - "id": 3, - "transform": [ - [...], - [...], - [...], - [...] - ] - }, - { - "id": 4, - "parent": 3, - "transform": [ - [...], - [...], - [...], - [...] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/layer-creation/overlap-animation-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/layer-creation/overlap-animation-expected.txt deleted file mode 100644 index 4a99d1e..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/layer-creation/overlap-animation-expected.txt +++ /dev/null
@@ -1,46 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV id='to-animate' class='animating box'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#0000FF", - "transform": 2 - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV class='box'", - "position": [18, 129], - "bounds": [101, 231], - "contentsOpaqueForText": true - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [...], - [...], - [...], - [...] - ] - }, - { - "id": 2, - "parent": 1, - "transform": [ - [...], - [...], - [...], - [...] - ], - "origin": [50, 50] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/layer-creation/overlap-child-layer-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/layer-creation/overlap-child-layer-expected.txt deleted file mode 100644 index 1d6d5421..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/layer-creation/overlap-child-layer-expected.txt +++ /dev/null
@@ -1,36 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='red'", - "position": [-400, 0], - "bounds": [256, 256], - "contentsOpaque": true, - "backgroundColor": "#FF0000", - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='green'", - "bounds": [300, 300], - "contentsOpaque": true, - "backgroundColor": "#008000" - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [400, 0, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/layer-creation/overlap-clipping-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/layer-creation/overlap-clipping-expected.txt deleted file mode 100644 index a77f15b..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/layer-creation/overlap-clipping-expected.txt +++ /dev/null
@@ -1,52 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow DIV id='child'", - "bounds": [500, 100], - "contentsOpaque": true, - "backgroundColor": "#008000", - "transform": 1 - }, - { - "name": "LayoutBlockFlow DIV id='child'", - "bounds": [500, 100], - "contentsOpaque": true, - "backgroundColor": "#008000", - "transform": 2 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='overlap'", - "position": [450, 200], - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#0000FF" - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [50, 50, 0, 1] - ] - }, - { - "id": 2, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [50, 200, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/layer-creation/overlap-nested-fixed-position-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/layer-creation/overlap-nested-fixed-position-expected.txt deleted file mode 100644 index dc2d068..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/layer-creation/overlap-nested-fixed-position-expected.txt +++ /dev/null
@@ -1,47 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [785, 1061], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='fixed parent'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#FFFF00" - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='fixed nested'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#FFFF00", - "transform": 1 - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV class='overlapped with-parent'", - "position": [8, 208], - "bounds": [270, 40], - "contentsOpaqueForText": true - }, - { - "name": "VerticalScrollbar", - "position": [785, 0], - "bounds": [15, 600], - "contentsOpaque": true - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [200, 0, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/layer-creation/overlap-transformed-3d-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/layer-creation/overlap-transformed-3d-expected.txt deleted file mode 100644 index 32d09efce..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/layer-creation/overlap-transformed-3d-expected.txt +++ /dev/null
@@ -1,95 +0,0 @@ -Before: -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='green-box' class='box green center composited'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#008000", - "transform": 2 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [108, 108, 0, 1] - ] - }, - { - "id": 2, - "parent": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [0, 0, -1, 1] - ] - } - ] -} - -After: -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='green-box' class='box green center composited'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#008000", - "transform": 2 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='box top left'", - "position": [8, 8], - "bounds": [100, 300], - "contentsOpaque": true, - "backgroundColor": "#808080" - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='box top right'", - "position": [208, 8], - "bounds": [100, 300], - "contentsOpaque": true, - "backgroundColor": "#808080" - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [108, 108, 0, 1] - ] - }, - { - "id": 2, - "parent": 1, - "transform": [ - [0.707106781186548, 0.707106781186548, 0, 0], - [-0.707106781186548, 0.707106781186548, 0, 0], - [0, 0, 1, 0], - [0, 0, -1, 1] - ], - "origin": [50, 50] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/layer-creation/overlap-transformed-and-clipped-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/layer-creation/overlap-transformed-and-clipped-expected.txt deleted file mode 100644 index 58a1ef0..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/layer-creation/overlap-transformed-and-clipped-expected.txt +++ /dev/null
@@ -1,36 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='under composited'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#FF0000", - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='over'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#008000", - "transform": 1 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [110, 0, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/layer-creation/overlap-transformed-preserved-3d-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/layer-creation/overlap-transformed-preserved-3d-expected.txt deleted file mode 100644 index 192c6a6..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/layer-creation/overlap-transformed-preserved-3d-expected.txt +++ /dev/null
@@ -1,412 +0,0 @@ -1 -2 -3 -4 -5 -6 -Before: -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='side side-1'", - "bounds": [100, 100], - "backgroundColor": "#00FF00CC", - "transform": 5 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='side side-2'", - "bounds": [100, 100], - "backgroundColor": "#00FF00CC", - "transform": 7 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='side side-3'", - "bounds": [100, 100], - "backgroundColor": "#00FF00CC", - "transform": 9 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='side side-4'", - "bounds": [100, 100], - "backgroundColor": "#00FF00CC", - "transform": 11 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='side side-5'", - "bounds": [100, 100], - "backgroundColor": "#00FF00CC", - "transform": 13 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='side side-6'", - "bounds": [100, 100], - "backgroundColor": "#00FF00CC", - "transform": 15 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [108, 108, 0, 1] - ] - }, - { - "id": 2, - "parent": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, -0.005], - [0, 0, 0, 1] - ], - "origin": [50, 50] - }, - { - "id": 3, - "parent": 2, - "transform": [ - [0.353553390593274, 0.25, -0.5, 0], - [0, 0.353553390593274, 0.707106781186548, 0], - [0.353553390593274, -0.25, 0.5, 0], - [0, 0, 0, 1] - ], - "origin": [50, 50], - "flattenInheritedTransform": false, - "renderingContext": 1 - }, - { - "id": 4, - "parent": 3, - "flattenInheritedTransform": false, - "renderingContext": 1 - }, - { - "id": 5, - "parent": 4, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [0, 0, 50, 1] - ], - "flattenInheritedTransform": false, - "renderingContext": 1 - }, - { - "id": 6, - "parent": 3, - "flattenInheritedTransform": false, - "renderingContext": 1 - }, - { - "id": 7, - "parent": 6, - "transform": [ - [0, 0, -1, 0], - [0, 1, 0, 0], - [1, 0, 0, 0], - [50, 0, 0, 1] - ], - "origin": [50, 50], - "flattenInheritedTransform": false, - "renderingContext": 1 - }, - { - "id": 8, - "parent": 3, - "flattenInheritedTransform": false, - "renderingContext": 1 - }, - { - "id": 9, - "parent": 8, - "transform": [ - [-1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, -1, 0], - [0, 0, -50, 1] - ], - "origin": [50, 50], - "flattenInheritedTransform": false, - "renderingContext": 1 - }, - { - "id": 10, - "parent": 3, - "flattenInheritedTransform": false, - "renderingContext": 1 - }, - { - "id": 11, - "parent": 10, - "transform": [ - [0, 0, 1, 0], - [0, 1, 0, 0], - [-1, 0, 0, 0], - [-50, 0, 0, 1] - ], - "origin": [50, 50], - "flattenInheritedTransform": false, - "renderingContext": 1 - }, - { - "id": 12, - "parent": 3, - "flattenInheritedTransform": false, - "renderingContext": 1 - }, - { - "id": 13, - "parent": 12, - "transform": [ - [1, 0, 0, 0], - [0, 0, 1, 0], - [0, -1, 0, 0], - [0, -50, 0, 1] - ], - "origin": [50, 50], - "flattenInheritedTransform": false, - "renderingContext": 1 - }, - { - "id": 14, - "parent": 3, - "flattenInheritedTransform": false, - "renderingContext": 1 - }, - { - "id": 15, - "parent": 14, - "transform": [ - [1, 0, 0, 0], - [0, 0, -1, 0], - [0, 1, 0, 0], - [0, 50, 0, 1] - ], - "origin": [50, 50], - "flattenInheritedTransform": false, - "renderingContext": 1 - } - ] -} - -After: -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='side side-1'", - "bounds": [100, 100], - "backgroundColor": "#00FF00CC", - "transform": 5 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='side side-2'", - "bounds": [100, 100], - "backgroundColor": "#00FF00CC", - "transform": 7 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='side side-3'", - "bounds": [100, 100], - "backgroundColor": "#00FF00CC", - "transform": 9 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='side side-4'", - "bounds": [100, 100], - "backgroundColor": "#00FF00CC", - "transform": 11 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='side side-5'", - "bounds": [100, 100], - "backgroundColor": "#00FF00CC", - "transform": 13 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='side side-6'", - "bounds": [100, 100], - "backgroundColor": "#00FF00CC", - "transform": 15 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='box top left'", - "position": [8, 8], - "bounds": [100, 300], - "contentsOpaque": true, - "backgroundColor": "#808080" - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='box top right'", - "position": [208, 8], - "bounds": [100, 300], - "contentsOpaque": true, - "backgroundColor": "#808080" - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [108, 108, 0, 1] - ] - }, - { - "id": 2, - "parent": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, -0.005], - [0, 0, 0, 1] - ], - "origin": [50, 50] - }, - { - "id": 3, - "parent": 2, - "transform": [ - [0.707106781186548, 0.5, -0.5, 0], - [0, 0.707106781186548, 0.707106781186548, 0], - [0.707106781186548, -0.5, 0.5, 0], - [0, 0, 0, 1] - ], - "origin": [50, 50], - "flattenInheritedTransform": false, - "renderingContext": 1 - }, - { - "id": 4, - "parent": 3, - "flattenInheritedTransform": false, - "renderingContext": 1 - }, - { - "id": 5, - "parent": 4, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [0, 0, 50, 1] - ], - "flattenInheritedTransform": false, - "renderingContext": 1 - }, - { - "id": 6, - "parent": 3, - "flattenInheritedTransform": false, - "renderingContext": 1 - }, - { - "id": 7, - "parent": 6, - "transform": [ - [0, 0, -1, 0], - [0, 1, 0, 0], - [1, 0, 0, 0], - [50, 0, 0, 1] - ], - "origin": [50, 50], - "flattenInheritedTransform": false, - "renderingContext": 1 - }, - { - "id": 8, - "parent": 3, - "flattenInheritedTransform": false, - "renderingContext": 1 - }, - { - "id": 9, - "parent": 8, - "transform": [ - [-1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, -1, 0], - [0, 0, -50, 1] - ], - "origin": [50, 50], - "flattenInheritedTransform": false, - "renderingContext": 1 - }, - { - "id": 10, - "parent": 3, - "flattenInheritedTransform": false, - "renderingContext": 1 - }, - { - "id": 11, - "parent": 10, - "transform": [ - [0, 0, 1, 0], - [0, 1, 0, 0], - [-1, 0, 0, 0], - [-50, 0, 0, 1] - ], - "origin": [50, 50], - "flattenInheritedTransform": false, - "renderingContext": 1 - }, - { - "id": 12, - "parent": 3, - "flattenInheritedTransform": false, - "renderingContext": 1 - }, - { - "id": 13, - "parent": 12, - "transform": [ - [1, 0, 0, 0], - [0, 0, 1, 0], - [0, -1, 0, 0], - [0, -50, 0, 1] - ], - "origin": [50, 50], - "flattenInheritedTransform": false, - "renderingContext": 1 - }, - { - "id": 14, - "parent": 3, - "flattenInheritedTransform": false, - "renderingContext": 1 - }, - { - "id": 15, - "parent": 14, - "transform": [ - [1, 0, 0, 0], - [0, 0, -1, 0], - [0, 1, 0, 0], - [0, 50, 0, 1] - ], - "origin": [50, 50], - "flattenInheritedTransform": false, - "renderingContext": 1 - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/layer-creation/overlap-transforms-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/layer-creation/overlap-transforms-expected.txt deleted file mode 100644 index 1695e4fb..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/layer-creation/overlap-transforms-expected.txt +++ /dev/null
@@ -1,39 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV class='transformed box'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#0000FF", - "transform": 2 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [19, 19, 0, 1] - ] - }, - { - "id": 2, - "parent": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [0, 0, 1, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/layer-creation/remove-clipping-layer-with-no-children-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/layer-creation/remove-clipping-layer-with-no-children-expected.txt deleted file mode 100644 index 6e14a42dd..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/layer-creation/remove-clipping-layer-with-no-children-expected.txt +++ /dev/null
@@ -1,29 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow DIV id='parent' class='fade'", - "bounds": [400, 400], - "contentsOpaque": true, - "backgroundColor": "#FFC0CB", - "transform": 1 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 8, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/layer-creation/rotate3d-overlap-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/layer-creation/rotate3d-overlap-expected.txt deleted file mode 100644 index 20a1f3c..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/layer-creation/rotate3d-overlap-expected.txt +++ /dev/null
@@ -1,102 +0,0 @@ - - -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV class='box translateZ'", - "position": [-5, -5], - "bounds": [110, 110], - "contentsOpaqueForText": true, - "backgroundColor": "#0000FF", - "transform": 1 - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV class='composited box rotate15'", - "position": [-5, -5], - "bounds": [110, 110], - "contentsOpaqueForText": true, - "backgroundColor": "#0000FF", - "transform": 3 - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV class='box'", - "position": [167, 143], - "bounds": [110, 110], - "contentsOpaqueForText": true, - "backgroundColor": "#0000FF" - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV class='composited box rotate45'", - "position": [-5, -5], - "bounds": [110, 110], - "contentsOpaqueForText": true, - "backgroundColor": "#0000FF", - "transform": 5 - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV class='box'", - "position": [311, 143], - "bounds": [110, 110], - "contentsOpaqueForText": true, - "backgroundColor": "#0000FF" - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [28, 28, 0, 1] - ] - }, - { - "id": 2, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [172, 28, 0, 1] - ] - }, - { - "id": 3, - "parent": 2, - "transform": [ - [0.965925826289068, 0.258819045102521, 0, 0], - [-0.258819045102521, 0.965925826289068, 0, 0], - [0, 0, 1, 0], - [0, 0, 0, 1] - ], - "origin": [50, 50] - }, - { - "id": 4, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [316, 28, 0, 1] - ] - }, - { - "id": 5, - "parent": 4, - "transform": [ - [0.707106781186548, 0.707106781186548, 0, 0], - [-0.707106781186548, 0.707106781186548, 0, 0], - [0, 0, 1, 0], - [0, 0, 0, 1] - ], - "origin": [50, 50] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/layer-creation/scroll-partial-update-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/layer-creation/scroll-partial-update-expected.txt deleted file mode 100644 index c911430e..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/layer-creation/scroll-partial-update-expected.txt +++ /dev/null
@@ -1,36 +0,0 @@ -scroll me -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow DIV id='composited'", - "bounds": [20, 20], - "contentsOpaqueForText": true, - "drawsContent": false, - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='overlay'", - "position": [10, 8], - "bounds": [400, 204], - "contentsOpaqueForText": true - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 8, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/layer-creation/spanOverlapsCanvas-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/layer-creation/spanOverlapsCanvas-expected.txt deleted file mode 100644 index 41362eb7..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/layer-creation/spanOverlapsCanvas-expected.txt +++ /dev/null
@@ -1,23 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutHTMLCanvas CANVAS id='world'", - "position": [8, 8], - "bounds": [100, 50] - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='output'", - "position": [8, 8], - "bounds": [100, 50], - "contentsOpaque": true, - "backgroundColor": "#008000" - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/layer-creation/squashing-into-ancestor-clipping-layer-change-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/layer-creation/squashing-into-ancestor-clipping-layer-change-expected.txt deleted file mode 100644 index 2144d40..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/layer-creation/squashing-into-ancestor-clipping-layer-change-expected.txt +++ /dev/null
@@ -1,36 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV id='composited'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#FA8072", - "transform": 1 - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV id='squashed'", - "position": [8, 58], - "bounds": [100, 50], - "contentsOpaque": true, - "backgroundColor": "#008000" - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 58, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/layer-creation/stacking-context-overlap-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/layer-creation/stacking-context-overlap-expected.txt deleted file mode 100644 index bc3ff5d4..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/layer-creation/stacking-context-overlap-expected.txt +++ /dev/null
@@ -1,35 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow DIV class='trigger'", - "bounds": [20, 20], - "contentsOpaque": true, - "backgroundColor": "#0000FF", - "transform": 1 - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV class='container'", - "position": [8, 18], - "bounds": [142, 142], - "contentsOpaqueForText": true - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 8, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/layer-creation/stacking-context-overlap-nested-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/layer-creation/stacking-context-overlap-nested-expected.txt deleted file mode 100644 index 83a369de..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/layer-creation/stacking-context-overlap-nested-expected.txt +++ /dev/null
@@ -1,55 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='composited box'", - "position": [-10, -10], - "bounds": [120, 120], - "contentsOpaqueForText": true, - "backgroundColor": "#008000", - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='composited box'", - "position": [-10, -10], - "bounds": [220, 120], - "contentsOpaqueForText": true, - "backgroundColor": "#FF000099", - "transform": 2 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='indicator'", - "position": [75, 75], - "bounds": [56, 56], - "contentsOpaque": true, - "backgroundColor": "#0000FF" - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [20, 20, 0, 1] - ] - }, - { - "id": 2, - "parent": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [50, 50, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/layer-creation/translatez-added-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/layer-creation/translatez-added-expected.txt deleted file mode 100644 index 0c5f53f9..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/layer-creation/translatez-added-expected.txt +++ /dev/null
@@ -1,29 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow DIV id='test' class='box composited'", - "bounds": [210, 210], - "contentsOpaque": true, - "backgroundColor": "#0000FF", - "transform": 1 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [18, 10, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/layer-creation/translatez-overlap-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/layer-creation/translatez-overlap-expected.txt deleted file mode 100644 index f6bbf9c..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/layer-creation/translatez-overlap-expected.txt +++ /dev/null
@@ -1,29 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV class='composited box'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#0000FF", - "transform": 1 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [18, 10, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/masks/mask-layer-size-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/masks/mask-layer-size-expected.txt deleted file mode 100644 index 7156d098..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/masks/mask-layer-size-expected.txt +++ /dev/null
@@ -1,36 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow DIV id='masked'", - "bounds": [400, 200], - "contentsOpaque": true, - "backgroundColor": "#000000", - "transform": 1 - }, - { - "name": "LayoutBlockFlow DIV id='masked'", - "position": [-2, -2], - "bounds": [404, 204], - "contentsOpaqueForText": true, - "transform": 1 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [10, 10, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/overflow/accelerated-overflow-scroll-should-not-affect-perspective-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/overflow/accelerated-overflow-scroll-should-not-affect-perspective-expected.txt deleted file mode 100644 index 825af66..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/overflow/accelerated-overflow-scroll-should-not-affect-perspective-expected.txt +++ /dev/null
@@ -1,118 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='container'", - "bounds": [200, 200], - "contentsOpaqueForText": true, - "drawsContent": false, - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='container'", - "bounds": [185, 185], - "drawsContent": false, - "transform": 1 - }, - { - "name": "HorizontalScrollbar", - "position": [0, 185], - "bounds": [200, 15], - "contentsOpaqueForText": true, - "transform": 1 - }, - { - "name": "VerticalScrollbar", - "position": [185, 0], - "bounds": [15, 185], - "contentsOpaque": true, - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='child first'", - "bounds": [60, 200], - "contentsOpaque": true, - "backgroundColor": "#008000", - "transform": 4 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='child second'", - "bounds": [60, 200], - "contentsOpaque": true, - "backgroundColor": "#0000FF", - "transform": 6 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 8, 0, 1] - ] - }, - { - "id": 2, - "parent": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, -0.01], - [0, 0, 0, 1] - ], - "origin": [100, 100] - }, - { - "id": 3, - "parent": 2, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [0, 65, 0, 1] - ], - "flattenInheritedTransform": false - }, - { - "id": 4, - "parent": 3, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [0, 0, 10, 1] - ], - "flattenInheritedTransform": false - }, - { - "id": 5, - "parent": 2, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [65, 65, 0, 1] - ], - "flattenInheritedTransform": false - }, - { - "id": 6, - "parent": 5, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [0, 0, 20, 1] - ], - "flattenInheritedTransform": false - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/overflow/clip-descendents-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/overflow/clip-descendents-expected.txt deleted file mode 100644 index 23c3352..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/overflow/clip-descendents-expected.txt +++ /dev/null
@@ -1,117 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow DIV class='box'", - "bounds": [100, 150], - "contentsOpaque": true, - "backgroundColor": "#808080", - "transform": 2 - }, - { - "name": "LayoutBlockFlow DIV class='box'", - "bounds": [100, 150], - "contentsOpaque": true, - "backgroundColor": "#808080", - "transform": 4 - }, - { - "name": "LayoutBlockFlow DIV class='box'", - "bounds": [100, 150], - "contentsOpaque": true, - "backgroundColor": "#808080", - "transform": 6 - }, - { - "name": "LayoutBlockFlow DIV class='box'", - "bounds": [100, 150], - "contentsOpaque": true, - "backgroundColor": "#808080", - "transform": 8 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [50, 50, 0, 1] - ] - }, - { - "id": 2, - "parent": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [0, 0, 1, 1] - ] - }, - { - "id": 3, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [242, 50, 0, 1] - ] - }, - { - "id": 4, - "parent": 3, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [0, 0, 1, 1] - ] - }, - { - "id": 5, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [50, 242, 0, 1] - ] - }, - { - "id": 6, - "parent": 5, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [0, 0, 1, 1] - ] - }, - { - "id": 7, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [242, 242, 0, 1] - ] - }, - { - "id": 8, - "parent": 7, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [0, 0, 1, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/overflow/content-gains-scrollbars-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/overflow/content-gains-scrollbars-expected.txt deleted file mode 100644 index b679876..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/overflow/content-gains-scrollbars-expected.txt +++ /dev/null
@@ -1,157 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='container'", - "bounds": [100, 100], - "contentsOpaqueForText": true, - "drawsContent": false, - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='container'", - "bounds": [85, 100], - "drawsContent": false, - "transform": 1 - }, - { - "name": "VerticalScrollbar", - "position": [85, 0], - "bounds": [15, 100], - "contentsOpaque": true, - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='vertical' class='content tall'", - "bounds": [10, 200], - "contentsOpaqueForText": true, - "drawsContent": false, - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='container'", - "bounds": [100, 100], - "contentsOpaqueForText": true, - "drawsContent": false, - "transform": 2 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='container'", - "bounds": [100, 85], - "drawsContent": false, - "transform": 2 - }, - { - "name": "HorizontalScrollbar", - "position": [0, 85], - "bounds": [100, 15], - "contentsOpaque": true, - "transform": 2 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='horizontal' class='content wide'", - "bounds": [200, 10], - "contentsOpaqueForText": true, - "drawsContent": false, - "transform": 2 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='container'", - "bounds": [100, 100], - "contentsOpaqueForText": true, - "drawsContent": false, - "transform": 3 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='container'", - "bounds": [85, 85], - "drawsContent": false, - "transform": 3 - }, - { - "name": "HorizontalScrollbar", - "position": [0, 85], - "bounds": [85, 15], - "contentsOpaque": true, - "transform": 3 - }, - { - "name": "VerticalScrollbar", - "position": [85, 0], - "bounds": [15, 85], - "contentsOpaque": true, - "transform": 3 - }, - { - "name": "Scroll corner of LayoutBlockFlow (positioned) DIV class='container'", - "position": [85, 85], - "bounds": [15, 15], - "contentsOpaque": true, - "transform": 3 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='both' class='content wide tall'", - "bounds": [200, 200], - "contentsOpaqueForText": true, - "drawsContent": false, - "transform": 3 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='corner' class='container resizeWidget'", - "bounds": [100, 100], - "contentsOpaqueForText": true, - "transform": 4 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='content'", - "bounds": [10, 10], - "contentsOpaqueForText": true, - "drawsContent": false, - "transform": 4 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 13, 0, 1] - ] - }, - { - "id": 2, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 13, 0, 1] - ] - }, - { - "id": 3, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 13, 0, 1] - ] - }, - { - "id": 4, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 13, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/overflow/content-loses-scrollbars-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/overflow/content-loses-scrollbars-expected.txt deleted file mode 100644 index 230d5f0..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/overflow/content-loses-scrollbars-expected.txt +++ /dev/null
@@ -1,105 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='container'", - "bounds": [100, 100], - "contentsOpaqueForText": true, - "drawsContent": false, - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='vertical' class='content'", - "bounds": [10, 10], - "contentsOpaqueForText": true, - "drawsContent": false, - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='container'", - "bounds": [100, 100], - "contentsOpaqueForText": true, - "drawsContent": false, - "transform": 2 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='horizontal' class='content'", - "bounds": [10, 10], - "contentsOpaqueForText": true, - "drawsContent": false, - "transform": 2 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='container'", - "bounds": [100, 100], - "contentsOpaqueForText": true, - "drawsContent": false, - "transform": 3 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='both' class='content'", - "bounds": [10, 10], - "contentsOpaqueForText": true, - "drawsContent": false, - "transform": 3 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='corner' class='container'", - "bounds": [100, 100], - "contentsOpaqueForText": true, - "drawsContent": false, - "transform": 4 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='content'", - "bounds": [10, 10], - "contentsOpaqueForText": true, - "drawsContent": false, - "transform": 4 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 13, 0, 1] - ] - }, - { - "id": 2, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 13, 0, 1] - ] - }, - { - "id": 3, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 13, 0, 1] - ] - }, - { - "id": 4, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 13, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/overflow/overflow-scrollbar-layers-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/overflow/overflow-scrollbar-layers-expected.txt deleted file mode 100644 index f5c304b..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/overflow/overflow-scrollbar-layers-expected.txt +++ /dev/null
@@ -1,157 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='container'", - "bounds": [100, 100], - "contentsOpaqueForText": true, - "drawsContent": false, - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='container'", - "bounds": [85, 100], - "drawsContent": false, - "transform": 1 - }, - { - "name": "VerticalScrollbar", - "position": [85, 0], - "bounds": [15, 100], - "contentsOpaque": true, - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='content tall'", - "bounds": [10, 200], - "contentsOpaqueForText": true, - "drawsContent": false, - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='container'", - "bounds": [100, 100], - "contentsOpaqueForText": true, - "drawsContent": false, - "transform": 2 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='container'", - "bounds": [100, 85], - "drawsContent": false, - "transform": 2 - }, - { - "name": "HorizontalScrollbar", - "position": [0, 85], - "bounds": [100, 15], - "contentsOpaque": true, - "transform": 2 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='content wide'", - "bounds": [200, 10], - "contentsOpaqueForText": true, - "drawsContent": false, - "transform": 2 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='container'", - "bounds": [100, 100], - "contentsOpaqueForText": true, - "drawsContent": false, - "transform": 3 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='container'", - "bounds": [85, 85], - "drawsContent": false, - "transform": 3 - }, - { - "name": "HorizontalScrollbar", - "position": [0, 85], - "bounds": [85, 15], - "contentsOpaque": true, - "transform": 3 - }, - { - "name": "VerticalScrollbar", - "position": [85, 0], - "bounds": [15, 85], - "contentsOpaque": true, - "transform": 3 - }, - { - "name": "Scroll corner of LayoutBlockFlow (positioned) DIV class='container'", - "position": [85, 85], - "bounds": [15, 15], - "contentsOpaque": true, - "transform": 3 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='content wide tall'", - "bounds": [200, 200], - "contentsOpaqueForText": true, - "drawsContent": false, - "transform": 3 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='container resizeWidget'", - "bounds": [100, 100], - "contentsOpaqueForText": true, - "transform": 4 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='content'", - "bounds": [10, 10], - "contentsOpaqueForText": true, - "drawsContent": false, - "transform": 4 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 13, 0, 1] - ] - }, - { - "id": 2, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 13, 0, 1] - ] - }, - { - "id": 3, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 13, 0, 1] - ] - }, - { - "id": 4, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 13, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/overflow/reparented-scrollbars-non-sc-anc-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/overflow/reparented-scrollbars-non-sc-anc-expected.txt deleted file mode 100644 index e26af13..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/overflow/reparented-scrollbars-non-sc-anc-expected.txt +++ /dev/null
@@ -1,51 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [1208, 821], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow DIV id='scroller'", - "bounds": [1200, 1000], - "drawsContent": false, - "transform": 1 - }, - { - "name": "LayoutBlockFlow DIV id='scroller'", - "bounds": [1200, 10000], - "contentsOpaque": true, - "backgroundColor": "#008000", - "transform": 1 - }, - { - "name": "VerticalScrollbar", - "position": [1193, 0], - "bounds": [7, 1000], - "transform": 1 - }, - { - "name": "HorizontalScrollbar", - "position": [0, 593], - "bounds": [793, 7] - }, - { - "name": "VerticalScrollbar", - "position": [793, 0], - "bounds": [7, 593] - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 8, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/overflow/resize-painting-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/overflow/resize-painting-expected.txt deleted file mode 100644 index 1852427..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/overflow/resize-painting-expected.txt +++ /dev/null
@@ -1,28 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow DIV class='resizable composited box'", - "bounds": [100, 100], - "contentsOpaqueForText": true, - "transform": 1 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [18, 10, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/overflow/rotate-clip-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/overflow/rotate-clip-expected.txt deleted file mode 100644 index cce5161..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/overflow/rotate-clip-expected.txt +++ /dev/null
@@ -1,50 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow DIV", - "bounds": [400, 400], - "contentsOpaque": true, - "backgroundColor": "#0000FF", - "transform": 3 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [108, 100, 0, 1] - ] - }, - { - "id": 2, - "parent": 1, - "transform": [ - [0.707106781186548, 0.707106781186548, 0, 0], - [-0.707106781186548, 0.707106781186548, 0, 0], - [0, 0, 1, 0], - [0, 0, 0, 1] - ], - "origin": [120, 120] - }, - { - "id": 3, - "parent": 2, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [20, 20, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/overflow/rotate-then-clip-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/overflow/rotate-then-clip-expected.png deleted file mode 100644 index a66542e..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/overflow/rotate-then-clip-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/overflow/rotate-then-clip-z-order-interleave-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/overflow/rotate-then-clip-z-order-interleave-expected.png deleted file mode 100644 index 07d2a97..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/overflow/rotate-then-clip-z-order-interleave-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/overflow/scroll-parent-with-non-stacking-context-composited-ancestor-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/overflow/scroll-parent-with-non-stacking-context-composited-ancestor-expected.txt deleted file mode 100644 index 46533b2..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/overflow/scroll-parent-with-non-stacking-context-composited-ancestor-expected.txt +++ /dev/null
@@ -1,60 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow DIV id='intervening'", - "bounds": [300, 300], - "contentsOpaque": true, - "backfaceVisibility": "hidden", - "backgroundColor": "#FFEFD5", - "transform": 1 - }, - { - "name": "LayoutBlockFlow DIV id='scroller'", - "position": [1, 1], - "bounds": [100, 100], - "drawsContent": false, - "backfaceVisibility": "hidden", - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='fixed'", - "position": [60, 60], - "bounds": [80, 80], - "contentsOpaque": true, - "backgroundColor": "#008000" - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV class='scrolled'", - "position": [5, 5], - "bounds": [60, 172], - "contentsOpaqueForText": true, - "backfaceVisibility": "hidden", - "transform": 1 - }, - { - "name": "VerticalScrollbar", - "position": [94, 1], - "bounds": [7, 100], - "backfaceVisibility": "hidden", - "transform": 1 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [98, 90, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/overflow/scrollbar-layer-placement-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/overflow/scrollbar-layer-placement-expected.txt deleted file mode 100644 index 45d9694e..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/overflow/scrollbar-layer-placement-expected.txt +++ /dev/null
@@ -1,201 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='outer A'", - "position": [-21, -21], - "bounds": [352, 294], - "contentsOpaqueForText": true, - "transform": 1 - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV class='scroller'", - "position": [5, 5], - "bounds": [220, 160], - "drawsContent": false, - "transform": 2 - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV class='scroller'", - "position": [5, 5], - "bounds": [220, 236], - "contentsOpaque": true, - "backgroundColor": "#DDDDDD", - "transform": 2 - }, - { - "name": "VerticalScrollbar", - "position": [218, 5], - "bounds": [7, 160], - "transform": 2 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='outer B'", - "position": [-21, -21], - "bounds": [352, 294], - "contentsOpaqueForText": true, - "transform": 3 - }, - { - "name": "LayoutBlockFlow DIV class='scroller'", - "position": [5, 5], - "bounds": [220, 160], - "drawsContent": false, - "transform": 4 - }, - { - "name": "LayoutBlockFlow DIV class='scroller'", - "position": [5, 5], - "bounds": [220, 236], - "contentsOpaque": true, - "backgroundColor": "#DDDDDD", - "transform": 4 - }, - { - "name": "VerticalScrollbar", - "position": [218, 5], - "bounds": [7, 160], - "transform": 4 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='outer C'", - "position": [-21, -21], - "bounds": [352, 294], - "contentsOpaqueForText": true, - "transform": 5 - }, - { - "name": "LayoutBlockFlow DIV class='scroller'", - "position": [5, 5], - "bounds": [220, 160], - "drawsContent": false, - "transform": 6 - }, - { - "name": "LayoutBlockFlow DIV class='scroller'", - "position": [5, 5], - "bounds": [220, 236], - "contentsOpaque": true, - "backgroundColor": "#DDDDDD", - "transform": 6 - }, - { - "name": "VerticalScrollbar", - "position": [218, 5], - "bounds": [7, 160], - "transform": 6 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='outer D'", - "position": [-21, -21], - "bounds": [352, 294], - "contentsOpaqueForText": true, - "transform": 7 - }, - { - "name": "LayoutBlockFlow DIV class='scroller'", - "position": [5, 5], - "bounds": [220, 160], - "drawsContent": false, - "transform": 8 - }, - { - "name": "LayoutBlockFlow DIV class='scroller'", - "position": [5, 5], - "bounds": [220, 236], - "contentsOpaque": true, - "backgroundColor": "#DDDDDD", - "transform": 8 - }, - { - "name": "VerticalScrollbar", - "position": [218, 5], - "bounds": [7, 160], - "transform": 8 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [21, 21, 0, 1] - ] - }, - { - "id": 2, - "parent": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [41, 41, 0, 1] - ] - }, - { - "id": 3, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [370, 21, 0, 1] - ] - }, - { - "id": 4, - "parent": 3, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [41, 41, 0, 1] - ] - }, - { - "id": 5, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [21, 312, 0, 1] - ] - }, - { - "id": 6, - "parent": 5, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [40, 40, 0, 1] - ] - }, - { - "id": 7, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [370, 312, 0, 1] - ] - }, - { - "id": 8, - "parent": 7, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [40, 40, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/overflow/scrollbar-layer-placement-negative-z-index-child-positioned-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/overflow/scrollbar-layer-placement-negative-z-index-child-positioned-expected.txt deleted file mode 100644 index 83a59402..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/overflow/scrollbar-layer-placement-negative-z-index-child-positioned-expected.txt +++ /dev/null
@@ -1,75 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='outer'", - "position": [-21, -21], - "bounds": [352, 294], - "contentsOpaqueForText": true, - "transform": 1 - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV class='content'", - "position": [17, 17], - "bounds": [196, 212], - "contentsOpaque": true, - "backgroundColor": "#DDDDDD", - "transform": 2 - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV class='scroller'", - "position": [-30, -30], - "bounds": [290, 230], - "contentsOpaqueForText": true, - "transform": 2 - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV class='scroller'", - "position": [5, 5], - "bounds": [220, 160], - "drawsContent": false, - "transform": 2 - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV class='scroller'", - "position": [5, 5], - "bounds": [220, 236], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "transform": 2 - }, - { - "name": "VerticalScrollbar", - "position": [218, 5], - "bounds": [7, 160], - "transform": 2 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [21, 21, 0, 1] - ] - }, - { - "id": 2, - "parent": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [41, 41, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/overflow/scrolling-content-clip-to-viewport-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/overflow/scrolling-content-clip-to-viewport-expected.txt deleted file mode 100644 index 4066a7a..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/overflow/scrolling-content-clip-to-viewport-expected.txt +++ /dev/null
@@ -1,35 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow DIV class='scroller'", - "bounds": [305, 325], - "drawsContent": false - }, - { - "name": "HorizontalScrollbar", - "position": [0, 325], - "bounds": [320, 15], - "contentsOpaqueForText": true - }, - { - "name": "VerticalScrollbar", - "position": [305, 0], - "bounds": [15, 325], - "contentsOpaque": true - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV class='column'", - "position": [10, 10], - "bounds": [284, 1204], - "contentsOpaque": true, - "backgroundColor": "#C0C0C0" - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/overflow/textarea-scroll-touch-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/overflow/textarea-scroll-touch-expected.txt deleted file mode 100644 index 299cbf7..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/overflow/textarea-scroll-touch-expected.txt +++ /dev/null
@@ -1,108 +0,0 @@ - -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutTextControl TEXTAREA", - "position": [1, 1], - "bounds": [189, 124], - "drawsContent": false, - "transform": 1 - }, - { - "name": "Scroll corner of LayoutTextControl TEXTAREA", - "position": [193, 18], - "bounds": [261, 140] - }, - { - "name": "VerticalScrollbar", - "position": [190, 1], - "bounds": [15, 109], - "contentsOpaque": true, - "transform": 1 - }, - { - "name": "LayoutTextControl TEXTAREA", - "position": [1, 1], - "bounds": [189, 328], - "contentsOpaque": true, - "backgroundColor": "#CCCCCC", - "transform": 2 - }, - { - "name": "LayoutTextControl TEXTAREA", - "position": [1, 1], - "bounds": [189, 124], - "drawsContent": false, - "transform": 3 - }, - { - "name": "Scroll corner of LayoutTextControl TEXTAREA", - "position": [175, 95], - "bounds": [30, 30], - "contentsOpaqueForText": true, - "transform": 3 - }, - { - "name": "VerticalScrollbar", - "position": [190, 1], - "bounds": [15, 109], - "contentsOpaque": true, - "transform": 3 - }, - { - "name": "LayoutTextControl TEXTAREA", - "position": [1, 1], - "bounds": [189, 328], - "contentsOpaque": true, - "backgroundColor": "#CCCCCC", - "transform": 4 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [18, 18, 0, 1] - ] - }, - { - "id": 2, - "parent": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [0, -50, 0, 1] - ] - }, - { - "id": 3, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [248, 18, 0, 1] - ] - }, - { - "id": 4, - "parent": 3, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [0, -50, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/overflow/universal-accelerated-overflow-scroll-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/overflow/universal-accelerated-overflow-scroll-expected.txt deleted file mode 100644 index 00bfad04..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/overflow/universal-accelerated-overflow-scroll-expected.txt +++ /dev/null
@@ -1,885 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [785, 2016], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow DIV id='container-absolute-grandchildren-not-contained' class='overflow'", - "position": [2, 2], - "bounds": [85, 85], - "drawsContent": false, - "transform": 1 - }, - { - "name": "HorizontalScrollbar", - "position": [10, 97], - "bounds": [104, 257], - "contentsOpaqueForText": true - }, - { - "name": "VerticalScrollbar", - "position": [87, 2], - "bounds": [15, 85], - "contentsOpaque": true, - "transform": 1 - }, - { - "name": "LayoutBlockFlow DIV id='container-absolute-grandchildren-not-contained' class='overflow'", - "position": [2, 6], - "bounds": [85, 136], - "contentsOpaqueForText": true, - "drawsContent": false, - "transform": 2 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='positioned-absolute-grandchildren-not-contained' class='positionAbsolute positioned'", - "position": [35, 10], - "bounds": [199, 105], - "contentsOpaqueForText": true - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV id='scrolled-absolute-grandchildren-not-contained' class='scrolled'", - "position": [6, 6], - "bounds": [75, 136], - "contentsOpaqueForText": true, - "transform": 2 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='container-absolute-grandchildren' class='positionAbsolute overflow'", - "position": [2, 2], - "bounds": [85, 85], - "drawsContent": false, - "transform": 3 - }, - { - "name": "HorizontalScrollbar", - "position": [2, 87], - "bounds": [85, 15], - "contentsOpaque": true, - "transform": 3 - }, - { - "name": "VerticalScrollbar", - "position": [87, 2], - "bounds": [15, 85], - "contentsOpaque": true, - "transform": 3 - }, - { - "name": "Scroll corner of LayoutBlockFlow (positioned) DIV id='container-absolute-grandchildren' class='positionAbsolute overflow'", - "position": [217, 10], - "bounds": [137, 104], - "contentsOpaqueForText": true - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='container-absolute-grandchildren' class='positionAbsolute overflow'", - "position": [2, 6], - "bounds": [105, 136], - "contentsOpaqueForText": true, - "transform": 4 - }, - { - "name": "LayoutBlockFlow DIV id='container-absolute-not-contained' class='overflow'", - "position": [2, 2], - "bounds": [85, 85], - "drawsContent": false, - "transform": 5 - }, - { - "name": "HorizontalScrollbar", - "position": [2, 87], - "bounds": [100, 15], - "contentsOpaqueForText": true, - "transform": 5 - }, - { - "name": "VerticalScrollbar", - "position": [87, 2], - "bounds": [15, 85], - "contentsOpaque": true, - "transform": 5 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='positioned-absolute-not-contained' class='positionAbsolute positioned'", - "position": [275, 10], - "bounds": [199, 105], - "contentsOpaqueForText": true - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV id='scrolled-absolute-not-contained' class='scrolled'", - "position": [6, 6], - "bounds": [75, 136], - "contentsOpaqueForText": true, - "transform": 6 - }, - { - "name": "LayoutBlockFlow DIV id='container-absolute-sibling-grandchildren-not-contained' class='overflow'", - "position": [2, 2], - "bounds": [85, 85], - "drawsContent": false, - "transform": 7 - }, - { - "name": "HorizontalScrollbar", - "position": [2, 87], - "bounds": [100, 15], - "contentsOpaqueForText": true, - "transform": 7 - }, - { - "name": "VerticalScrollbar", - "position": [87, 2], - "bounds": [15, 85], - "contentsOpaque": true, - "transform": 7 - }, - { - "name": "LayoutBlockFlow DIV id='container-absolute-sibling-grandchildren-not-contained' class='overflow'", - "position": [2, 6], - "bounds": [85, 136], - "contentsOpaqueForText": true, - "drawsContent": false, - "transform": 8 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='positioned-absolute-sibling-grandchildren-not-contained' class='positionAbsolute positioned'", - "position": [395, 75], - "bounds": [80, 40], - "contentsOpaque": true, - "backgroundColor": "#800080" - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV id='scrolled-absolute-sibling-grandchildren-not-contained' class='scrolled'", - "position": [6, 34], - "bounds": [75, 80], - "contentsOpaqueForText": true, - "transform": 8 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='container-absolute-sibling-grandchildren' class='positionAbsolute overflow'", - "position": [2, 2], - "bounds": [85, 85], - "drawsContent": false, - "transform": 9 - }, - { - "name": "HorizontalScrollbar", - "position": [2, 87], - "bounds": [85, 15], - "contentsOpaque": true, - "transform": 9 - }, - { - "name": "VerticalScrollbar", - "position": [87, 2], - "bounds": [15, 85], - "contentsOpaque": true, - "transform": 9 - }, - { - "name": "Scroll corner of LayoutBlockFlow (positioned) DIV id='container-absolute-sibling-grandchildren' class='positionAbsolute overflow'", - "position": [97, 130], - "bounds": [137, 104], - "contentsOpaqueForText": true - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='container-absolute-sibling-grandchildren' class='positionAbsolute overflow'", - "position": [2, 6], - "bounds": [105, 136], - "contentsOpaqueForText": true, - "transform": 10 - }, - { - "name": "LayoutBlockFlow DIV id='container-absolute-sibling-not-contained' class='overflow'", - "position": [2, 2], - "bounds": [85, 85], - "drawsContent": false, - "transform": 11 - }, - { - "name": "HorizontalScrollbar", - "position": [130, 217], - "bounds": [224, 137], - "contentsOpaqueForText": true - }, - { - "name": "VerticalScrollbar", - "position": [87, 2], - "bounds": [15, 85], - "contentsOpaque": true, - "transform": 11 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='positioned-absolute-sibling-not-contained' class='positionAbsolute positioned'", - "position": [155, 130], - "bounds": [199, 105], - "contentsOpaqueForText": true - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV id='scrolled-absolute-sibling-not-contained' class='scrolled'", - "position": [6, 34], - "bounds": [75, 80], - "contentsOpaqueForText": true, - "transform": 12 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='container-absolute-sibling' class='positionAbsolute overflow'", - "position": [2, 2], - "bounds": [85, 85], - "drawsContent": false, - "transform": 13 - }, - { - "name": "HorizontalScrollbar", - "position": [2, 87], - "bounds": [85, 15], - "contentsOpaque": true, - "transform": 13 - }, - { - "name": "VerticalScrollbar", - "position": [87, 2], - "bounds": [15, 85], - "contentsOpaque": true, - "transform": 13 - }, - { - "name": "Scroll corner of LayoutBlockFlow (positioned) DIV id='container-absolute-sibling' class='positionAbsolute overflow'", - "position": [337, 130], - "bounds": [137, 104], - "contentsOpaqueForText": true - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='positioned-absolute-sibling' class='positionAbsolute positioned'", - "position": [6, 34], - "bounds": [101, 80], - "contentsOpaqueForText": true, - "transform": 14 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='container-absolute' class='positionAbsolute overflow'", - "position": [2, 2], - "bounds": [85, 85], - "drawsContent": false, - "transform": 15 - }, - { - "name": "HorizontalScrollbar", - "position": [2, 87], - "bounds": [85, 15], - "contentsOpaque": true, - "transform": 15 - }, - { - "name": "VerticalScrollbar", - "position": [87, 2], - "bounds": [15, 85], - "contentsOpaque": true, - "transform": 15 - }, - { - "name": "Scroll corner of LayoutBlockFlow (positioned) DIV id='container-absolute' class='positionAbsolute overflow'", - "position": [370, 217], - "bounds": [104, 137], - "contentsOpaqueForText": true - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='positioned-absolute' class='positionAbsolute positioned'", - "position": [6, 34], - "bounds": [101, 80], - "contentsOpaqueForText": true, - "transform": 16 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='container-fixed-sibling-grandchildren' class='positionAbsolute overflow'", - "position": [2, 2], - "bounds": [85, 85], - "drawsContent": false, - "transform": 17 - }, - { - "name": "HorizontalScrollbar", - "position": [2, 87], - "bounds": [100, 15], - "contentsOpaqueForText": true, - "transform": 17 - }, - { - "name": "VerticalScrollbar", - "position": [87, 2], - "bounds": [15, 85], - "contentsOpaque": true, - "transform": 17 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='container-fixed-sibling-grandchildren' class='positionAbsolute overflow'", - "position": [2, 6], - "bounds": [85, 136], - "contentsOpaqueForText": true, - "drawsContent": false, - "transform": 18 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='positioned-fixed-sibling-grandchildren' class='positionFixed positioned'", - "bounds": [80, 40], - "contentsOpaque": true, - "backgroundColor": "#800080", - "transform": 19 - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV id='scrolled-fixed-sibling-grandchildren' class='scrolled'", - "position": [6, 34], - "bounds": [75, 80], - "contentsOpaqueForText": true, - "transform": 18 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='container-fixed-sibling' class='positionAbsolute overflow'", - "position": [2, 2], - "bounds": [85, 85], - "drawsContent": false, - "transform": 20 - }, - { - "name": "HorizontalScrollbar", - "position": [2, 87], - "bounds": [100, 15], - "contentsOpaqueForText": true, - "transform": 20 - }, - { - "name": "VerticalScrollbar", - "position": [87, 2], - "bounds": [15, 85], - "contentsOpaque": true, - "transform": 20 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='positioned-fixed-sibling' class='positionFixed positioned'", - "bounds": [80, 40], - "contentsOpaque": true, - "backgroundColor": "#800080", - "transform": 21 - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV id='scrolled-fixed-sibling' class='scrolled'", - "position": [6, 34], - "bounds": [75, 80], - "contentsOpaqueForText": true, - "transform": 22 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='container-fixed-grandchildren' class='positionAbsolute overflow'", - "position": [2, 2], - "bounds": [85, 85], - "drawsContent": false, - "transform": 23 - }, - { - "name": "HorizontalScrollbar", - "position": [2, 87], - "bounds": [100, 15], - "contentsOpaqueForText": true, - "transform": 23 - }, - { - "name": "VerticalScrollbar", - "position": [87, 2], - "bounds": [15, 85], - "contentsOpaque": true, - "transform": 23 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='container-fixed-grandchildren' class='positionAbsolute overflow'", - "position": [2, 6], - "bounds": [85, 136], - "contentsOpaqueForText": true, - "drawsContent": false, - "transform": 24 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='positioned-fixed-grandchildren' class='positionFixed positioned'", - "bounds": [80, 40], - "contentsOpaque": true, - "backgroundColor": "#800080", - "transform": 25 - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV id='scrolled-fixed-grandchildren' class='scrolled'", - "position": [6, 34], - "bounds": [75, 80], - "contentsOpaqueForText": true, - "transform": 24 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='container-fixed' class='positionAbsolute overflow'", - "position": [2, 2], - "bounds": [85, 85], - "drawsContent": false, - "transform": 26 - }, - { - "name": "HorizontalScrollbar", - "position": [2, 87], - "bounds": [100, 15], - "contentsOpaqueForText": true, - "transform": 26 - }, - { - "name": "VerticalScrollbar", - "position": [87, 2], - "bounds": [15, 85], - "contentsOpaque": true, - "transform": 26 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='positioned-fixed' class='positionFixed positioned'", - "bounds": [80, 40], - "contentsOpaque": true, - "backgroundColor": "#800080", - "transform": 27 - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV id='scrolled-fixed' class='scrolled'", - "position": [6, 34], - "bounds": [75, 80], - "contentsOpaqueForText": true, - "transform": 28 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='sibling-absolute-sibling-grandchildren-not-contained' class='positionFixed sibling'", - "bounds": [50, 100], - "contentsOpaque": true, - "backgroundColor": "#008000", - "transform": 29 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='sibling-absolute-sibling-grandchildren' class='positionFixed sibling'", - "bounds": [50, 100], - "contentsOpaque": true, - "backgroundColor": "#008000", - "transform": 30 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='sibling-absolute-sibling-not-contained' class='positionFixed sibling'", - "bounds": [50, 100], - "contentsOpaque": true, - "backgroundColor": "#008000", - "transform": 31 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='sibling-absolute-sibling' class='positionFixed sibling'", - "bounds": [50, 100], - "contentsOpaque": true, - "backgroundColor": "#008000", - "transform": 32 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='sibling-fixed-sibling-grandchildren' class='positionFixed sibling'", - "bounds": [50, 100], - "contentsOpaque": true, - "backgroundColor": "#008000", - "transform": 33 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='sibling-fixed-sibling' class='positionFixed sibling'", - "bounds": [50, 100], - "contentsOpaque": true, - "backgroundColor": "#008000", - "transform": 34 - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV id='scrolled-absolute-sibling-grandchildren-not-contained' class='scrolled onTop'", - "position": [6, 6], - "bounds": [75, 136], - "contentsOpaqueForText": true, - "transform": 8 - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV id='scrolled-absolute-sibling-grandchildren' class='scrolled onTop'", - "position": [6, 6], - "bounds": [75, 136], - "contentsOpaqueForText": true, - "transform": 10 - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV id='scrolled-absolute-sibling-not-contained' class='scrolled onTop'", - "position": [6, 6], - "bounds": [75, 136], - "contentsOpaqueForText": true, - "transform": 12 - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV id='scrolled-absolute-sibling' class='scrolled onTop'", - "position": [6, 6], - "bounds": [75, 136], - "contentsOpaqueForText": true, - "transform": 14 - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV id='scrolled-absolute' class='scrolled onTop'", - "position": [6, 6], - "bounds": [75, 136], - "contentsOpaqueForText": true, - "transform": 16 - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV id='scrolled-fixed-sibling-grandchildren' class='scrolled onTop'", - "position": [6, 6], - "bounds": [75, 136], - "contentsOpaqueForText": true, - "transform": 18 - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV id='scrolled-fixed-sibling' class='scrolled onTop'", - "position": [6, 6], - "bounds": [75, 136], - "contentsOpaqueForText": true, - "transform": 22 - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV id='scrolled-fixed-grandchildren' class='scrolled onTop'", - "position": [6, 6], - "bounds": [75, 136], - "contentsOpaqueForText": true, - "transform": 24 - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV id='scrolled-fixed' class='scrolled onTop'", - "position": [6, 6], - "bounds": [75, 136], - "contentsOpaqueForText": true, - "transform": 28 - }, - { - "name": "VerticalScrollbar", - "position": [785, 0], - "bounds": [15, 600], - "contentsOpaque": true - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [10, 10, 0, 1] - ] - }, - { - "id": 2, - "parent": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [0, -59, 0, 1] - ] - }, - { - "id": 3, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [130, 10, 0, 1] - ] - }, - { - "id": 4, - "parent": 3, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [0, -59, 0, 1] - ] - }, - { - "id": 5, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [250, 10, 0, 1] - ] - }, - { - "id": 6, - "parent": 5, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [0, -59, 0, 1] - ] - }, - { - "id": 7, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [370, 10, 0, 1] - ] - }, - { - "id": 8, - "parent": 7, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [0, -59, 0, 1] - ] - }, - { - "id": 9, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [10, 130, 0, 1] - ] - }, - { - "id": 10, - "parent": 9, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [0, -59, 0, 1] - ] - }, - { - "id": 11, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [130, 130, 0, 1] - ] - }, - { - "id": 12, - "parent": 11, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [0, -59, 0, 1] - ] - }, - { - "id": 13, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [250, 130, 0, 1] - ] - }, - { - "id": 14, - "parent": 13, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [0, -59, 0, 1] - ] - }, - { - "id": 15, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [370, 130, 0, 1] - ] - }, - { - "id": 16, - "parent": 15, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [0, -59, 0, 1] - ] - }, - { - "id": 17, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [10, 250, 0, 1] - ] - }, - { - "id": 18, - "parent": 17, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [0, -59, 0, 1] - ] - }, - { - "id": 19, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [35, 315, 0, 1] - ] - }, - { - "id": 20, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [130, 250, 0, 1] - ] - }, - { - "id": 21, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [155, 315, 0, 1] - ] - }, - { - "id": 22, - "parent": 20, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [0, -59, 0, 1] - ] - }, - { - "id": 23, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [250, 250, 0, 1] - ] - }, - { - "id": 24, - "parent": 23, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [0, -59, 0, 1] - ] - }, - { - "id": 25, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [275, 315, 0, 1] - ] - }, - { - "id": 26, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [370, 250, 0, 1] - ] - }, - { - "id": 27, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [395, 315, 0, 1] - ] - }, - { - "id": 28, - "parent": 26, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [0, -59, 0, 1] - ] - }, - { - "id": 29, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [375, 20, 0, 1] - ] - }, - { - "id": 30, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [15, 140, 0, 1] - ] - }, - { - "id": 31, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [135, 140, 0, 1] - ] - }, - { - "id": 32, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [255, 140, 0, 1] - ] - }, - { - "id": 33, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [15, 260, 0, 1] - ] - }, - { - "id": 34, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [135, 260, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/reflections/compositing-change-inside-reflection-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/reflections/compositing-change-inside-reflection-expected.png deleted file mode 100644 index 5cc9aa2..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/reflections/compositing-change-inside-reflection-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/reflections/reflection-positioning-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/reflections/reflection-positioning-expected.png deleted file mode 100644 index ca05e6a..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/reflections/reflection-positioning-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/reflections/reflection-positioning2-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/reflections/reflection-positioning2-expected.png deleted file mode 100644 index ede9a990..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/reflections/reflection-positioning2-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/reflections/transform-inside-reflection-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/reflections/transform-inside-reflection-expected.png deleted file mode 100644 index fe53f1c..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/reflections/transform-inside-reflection-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/rendering-contexts-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/rendering-contexts-expected.txt deleted file mode 100644 index 3fab5dcd1..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/rendering-contexts-expected.txt +++ /dev/null
@@ -1,65 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow DIV id='grandparent' class='composited'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#008000", - "transform": 2 - }, - { - "name": "LayoutBlockFlow DIV id='parent' class='composited'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#008000", - "transform": 4 - }, - { - "name": "LayoutBlockFlow DIV id='child' class='composited'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#008000", - "transform": 5 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 8, 0, 1] - ] - }, - { - "id": 2, - "parent": 1, - "renderingContext": 1 - }, - { - "id": 3, - "parent": 2, - "flattenInheritedTransform": false, - "renderingContext": 1 - }, - { - "id": 4, - "parent": 3, - "flattenInheritedTransform": false, - "renderingContext": 1 - }, - { - "id": 5, - "parent": 4, - "renderingContext": 2 - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/rtl/rtl-absolute-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/rtl/rtl-absolute-expected.txt deleted file mode 100644 index 6bdc96be..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/rtl/rtl-absolute-expected.txt +++ /dev/null
@@ -1,29 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='positioned layer'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#008000", - "transform": 1 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [50, 50, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/rtl/rtl-absolute-overflow-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/rtl/rtl-absolute-overflow-expected.txt deleted file mode 100644 index e6eb404..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/rtl/rtl-absolute-overflow-expected.txt +++ /dev/null
@@ -1,58 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [1000, 1000], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='positioned layer'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#008000", - "transform": 2 - }, - { - "name": "HorizontalScrollbar", - "position": [0, 585], - "bounds": [785, 15], - "contentsOpaque": true - }, - { - "name": "VerticalScrollbar", - "position": [785, 0], - "bounds": [15, 585], - "contentsOpaque": true - }, - { - "name": "Scroll corner of LayoutView #document", - "position": [785, 585], - "bounds": [15, 15], - "contentsOpaque": true - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [-215, 0, 0, 1] - ] - }, - { - "id": 2, - "parent": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [265, 50, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/rtl/rtl-absolute-overflow-scrolled-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/rtl/rtl-absolute-overflow-scrolled-expected.txt deleted file mode 100644 index 6acbb84..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/rtl/rtl-absolute-overflow-scrolled-expected.txt +++ /dev/null
@@ -1,58 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [1000, 1000], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='layer' class='positioned'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#008000", - "transform": 2 - }, - { - "name": "HorizontalScrollbar", - "position": [0, 585], - "bounds": [785, 15], - "contentsOpaque": true - }, - { - "name": "VerticalScrollbar", - "position": [785, 0], - "bounds": [15, 585], - "contentsOpaque": true - }, - { - "name": "Scroll corner of LayoutView #document", - "position": [785, 585], - "bounds": [15, 15], - "contentsOpaque": true - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [-1, 0, 0, 1] - ] - }, - { - "id": 2, - "parent": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [51, 50, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/rtl/rtl-fixed-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/rtl/rtl-fixed-expected.txt deleted file mode 100644 index 9bfe6a4..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/rtl/rtl-fixed-expected.txt +++ /dev/null
@@ -1,36 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='positioned indicator'", - "position": [50, 50], - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#FF0000" - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='positioned layer'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#008000", - "transform": 1 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [50, 50, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/rtl/rtl-fixed-overflow-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/rtl/rtl-fixed-overflow-expected.txt deleted file mode 100644 index cddb971..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/rtl/rtl-fixed-overflow-expected.txt +++ /dev/null
@@ -1,73 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [1000, 1000], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='positioned indicator'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#FF0000", - "transform": 2 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='positioned layer'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#008000", - "transform": 3 - }, - { - "name": "HorizontalScrollbar", - "position": [0, 585], - "bounds": [785, 15], - "contentsOpaque": true - }, - { - "name": "VerticalScrollbar", - "position": [785, 0], - "bounds": [15, 585], - "contentsOpaque": true - }, - { - "name": "Scroll corner of LayoutView #document", - "position": [785, 585], - "bounds": [15, 15], - "contentsOpaque": true - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [-215, 0, 0, 1] - ] - }, - { - "id": 2, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [50, 50, 0, 1] - ] - }, - { - "id": 3, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [50, 50, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/rtl/rtl-fixed-overflow-scrolled-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/rtl/rtl-fixed-overflow-scrolled-expected.txt deleted file mode 100644 index 33c40bc..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/rtl/rtl-fixed-overflow-scrolled-expected.txt +++ /dev/null
@@ -1,73 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [1000, 1000], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='positioned indicator'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#FF0000", - "transform": 2 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='positioned layer'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#008000", - "transform": 3 - }, - { - "name": "HorizontalScrollbar", - "position": [0, 585], - "bounds": [785, 15], - "contentsOpaque": true - }, - { - "name": "VerticalScrollbar", - "position": [785, 0], - "bounds": [15, 585], - "contentsOpaque": true - }, - { - "name": "Scroll corner of LayoutView #document", - "position": [785, 585], - "bounds": [15, 15], - "contentsOpaque": true - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [-1, 0, 0, 1] - ] - }, - { - "id": 2, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [50, 50, 0, 1] - ] - }, - { - "id": 3, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [50, 50, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/rtl/rtl-iframe-absolute-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/rtl/rtl-iframe-absolute-expected.txt deleted file mode 100644 index 6bdc96be..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/rtl/rtl-iframe-absolute-expected.txt +++ /dev/null
@@ -1,29 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='positioned layer'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#008000", - "transform": 1 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [50, 50, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/rtl/rtl-iframe-absolute-overflow-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/rtl/rtl-iframe-absolute-overflow-expected.txt deleted file mode 100644 index cab14ea..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/rtl/rtl-iframe-absolute-overflow-expected.txt +++ /dev/null
@@ -1,64 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "HorizontalScrollbar", - "position": [15, 385], - "bounds": [385, 15], - "contentsOpaque": true - }, - { - "name": "VerticalScrollbar", - "bounds": [15, 385], - "contentsOpaque": true - }, - { - "name": "Scroll corner of LayoutView #document", - "position": [0, 385], - "bounds": [15, 15], - "contentsOpaque": true - }, - { - "name": "Scrolling background of LayoutView #document", - "position": [15, 0], - "bounds": [1000, 1000], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='positioned layer'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#008000", - "transform": 2 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [-615, 0, 0, 1] - ] - }, - { - "id": 2, - "parent": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [680, 50, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/rtl/rtl-iframe-absolute-overflow-scrolled-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/rtl/rtl-iframe-absolute-overflow-scrolled-expected.txt deleted file mode 100644 index aa354bf..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/rtl/rtl-iframe-absolute-overflow-scrolled-expected.txt +++ /dev/null
@@ -1,64 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "HorizontalScrollbar", - "position": [15, 385], - "bounds": [385, 15], - "contentsOpaque": true - }, - { - "name": "VerticalScrollbar", - "bounds": [15, 385], - "contentsOpaque": true - }, - { - "name": "Scroll corner of LayoutView #document", - "position": [0, 385], - "bounds": [15, 15], - "contentsOpaque": true - }, - { - "name": "Scrolling background of LayoutView #document", - "position": [15, 0], - "bounds": [1000, 1000], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='layer' class='positioned'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#008000", - "transform": 2 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [-615, 0, 0, 1] - ] - }, - { - "id": 2, - "parent": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [66, 50, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/rtl/rtl-iframe-fixed-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/rtl/rtl-iframe-fixed-expected.txt deleted file mode 100644 index 6bdc96be..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/rtl/rtl-iframe-fixed-expected.txt +++ /dev/null
@@ -1,29 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='positioned layer'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#008000", - "transform": 1 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [50, 50, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/rtl/rtl-iframe-fixed-overflow-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/rtl/rtl-iframe-fixed-overflow-expected.txt deleted file mode 100644 index de138d8..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/rtl/rtl-iframe-fixed-overflow-expected.txt +++ /dev/null
@@ -1,79 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "HorizontalScrollbar", - "position": [15, 385], - "bounds": [385, 15], - "contentsOpaque": true - }, - { - "name": "VerticalScrollbar", - "bounds": [15, 385], - "contentsOpaque": true - }, - { - "name": "Scroll corner of LayoutView #document", - "position": [0, 385], - "bounds": [15, 15], - "contentsOpaque": true - }, - { - "name": "Scrolling background of LayoutView #document", - "position": [15, 0], - "bounds": [1000, 1000], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='positioned indicator'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#FF0000", - "transform": 2 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='positioned layer'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#008000", - "transform": 3 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [-615, 0, 0, 1] - ] - }, - { - "id": 2, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [65, 50, 0, 1] - ] - }, - { - "id": 3, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [65, 50, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/rtl/rtl-iframe-fixed-overflow-scrolled-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/rtl/rtl-iframe-fixed-overflow-scrolled-expected.txt deleted file mode 100644 index de138d8..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/rtl/rtl-iframe-fixed-overflow-scrolled-expected.txt +++ /dev/null
@@ -1,79 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "HorizontalScrollbar", - "position": [15, 385], - "bounds": [385, 15], - "contentsOpaque": true - }, - { - "name": "VerticalScrollbar", - "bounds": [15, 385], - "contentsOpaque": true - }, - { - "name": "Scroll corner of LayoutView #document", - "position": [0, 385], - "bounds": [15, 15], - "contentsOpaque": true - }, - { - "name": "Scrolling background of LayoutView #document", - "position": [15, 0], - "bounds": [1000, 1000], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='positioned indicator'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#FF0000", - "transform": 2 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='positioned layer'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#008000", - "transform": 3 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [-615, 0, 0, 1] - ] - }, - { - "id": 2, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [65, 50, 0, 1] - ] - }, - { - "id": 3, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [65, 50, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/rtl/rtl-iframe-relative-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/rtl/rtl-iframe-relative-expected.txt deleted file mode 100644 index 2ca3029..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/rtl/rtl-iframe-relative-expected.txt +++ /dev/null
@@ -1,29 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV id='layer'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#008000", - "transform": 1 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [242, 58, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/rtl/rtl-relative-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/rtl/rtl-relative-expected.txt deleted file mode 100644 index 3d55004a..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/rtl/rtl-relative-expected.txt +++ /dev/null
@@ -1,29 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV id='layer'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#008000", - "transform": 1 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [642, 58, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/scrollbars/nested-overlay-scrollbars-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/scrollbars/nested-overlay-scrollbars-expected.txt deleted file mode 100644 index b0918863..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/scrollbars/nested-overlay-scrollbars-expected.txt +++ /dev/null
@@ -1,95 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='outer'", - "position": [2, 2], - "bounds": [400, 400], - "drawsContent": false, - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='inner'", - "bounds": [204, 204], - "contentsOpaqueForText": true, - "transform": 3 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='inner'", - "position": [2, 2], - "bounds": [200, 200], - "drawsContent": false, - "transform": 3 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='inner'", - "position": [2, 2], - "bounds": [2000, 9000], - "contentsOpaqueForText": true, - "transform": 3 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='spacer'", - "position": [2, 2002], - "bounds": [5000, 1000], - "contentsOpaqueForText": true, - "drawsContent": false, - "transform": 3 - }, - { - "name": "HorizontalScrollbar", - "position": [2, 195], - "bounds": [193, 7], - "transform": 3 - }, - { - "name": "VerticalScrollbar", - "position": [195, 2], - "bounds": [7, 193], - "transform": 3 - }, - { - "name": "VerticalScrollbar", - "position": [395, 2], - "bounds": [7, 400], - "transform": 1 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 8, 0, 1] - ] - }, - { - "id": 2, - "parent": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [0, -304, 0, 1] - ] - }, - { - "id": 3, - "parent": 2, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [2, 502, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/squashing/add-remove-squashed-layers-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/squashing/add-remove-squashed-layers-expected.txt deleted file mode 100644 index 2c8bcf62..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/squashing/add-remove-squashed-layers-expected.txt +++ /dev/null
@@ -1,239 +0,0 @@ -Test that layers can be nicely added or removed from a squashed layer, without unnecessary repaints on any layer. Click anywhere to test interactively; keep clicking to proceed through the test. - -CASE 1, original layer tree with overlap1 and overlap2: -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='composited'", - "bounds": [400, 400], - "contentsOpaque": true, - "backgroundColor": "#808080", - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='A' class='overlap1'", - "position": [140, 140], - "bounds": [120, 120], - "contentsOpaqueForText": true, - "backgroundColor": "#00FF00" - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [60, 60, 0, 1] - ] - } - ] -} - -CASE 2, overlap3 gets added: -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='composited'", - "bounds": [400, 400], - "contentsOpaque": true, - "backgroundColor": "#808080", - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='A' class='overlap1'", - "position": [140, 140], - "bounds": [140, 140], - "contentsOpaqueForText": true, - "backgroundColor": "#FF00FF", - "invalidations": [ - [40, 40, 100, 100] - ] - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [60, 60, 0, 1] - ] - } - ] -} - -CASE 3, overlap2 gets removed. Since this does not resize the layer, there should only be a repaint of overlap2: -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='composited'", - "bounds": [400, 400], - "contentsOpaque": true, - "backgroundColor": "#808080", - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='A' class='overlap1'", - "position": [140, 140], - "bounds": [140, 140], - "contentsOpaqueForText": true, - "backgroundColor": "#FF00FF", - "invalidations": [ - [20, 20, 100, 100] - ] - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [60, 60, 0, 1] - ] - } - ] -} - -CASE 4, overlap1 gets removed: -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='composited'", - "bounds": [400, 400], - "contentsOpaque": true, - "backgroundColor": "#808080", - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='C' class='overlap3'", - "position": [180, 180], - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#FF00FF", - "invalidations": [ - [0, 0, 100, 100] - ] - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [60, 60, 0, 1] - ] - } - ] -} - -CASE 5, overlap2 gets added back: -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='composited'", - "bounds": [400, 400], - "contentsOpaque": true, - "backgroundColor": "#808080", - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='B' class='overlap2'", - "position": [160, 160], - "bounds": [120, 120], - "contentsOpaqueForText": true, - "backgroundColor": "#FF00FF", - "invalidations": [ - [0, 0, 120, 120] - ] - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [60, 60, 0, 1] - ] - } - ] -} - -CASE 6, overlap1 gets added back, and overlap3 gets removed: -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='composited'", - "bounds": [400, 400], - "contentsOpaque": true, - "backgroundColor": "#808080", - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='A' class='overlap1'", - "position": [140, 140], - "bounds": [120, 120], - "contentsOpaqueForText": true, - "backgroundColor": "#00FF00", - "invalidations": [ - [0, 0, 120, 120] - ] - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [60, 60, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/squashing/clipping-ancestor-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/squashing/clipping-ancestor-expected.txt deleted file mode 100644 index 51df8b00..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/squashing/clipping-ancestor-expected.txt +++ /dev/null
@@ -1,36 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow DIV id='inner'", - "bounds": [200, 10], - "contentsOpaque": true, - "backgroundColor": "#F5F5F5", - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='hoverable'", - "position": [8, 0], - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#90EE90" - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 8, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/squashing/composited-bounds-for-negative-z-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/squashing/composited-bounds-for-negative-z-expected.txt deleted file mode 100644 index 318e00e..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/squashing/composited-bounds-for-negative-z-expected.txt +++ /dev/null
@@ -1,65 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV", - "bounds": [10, 10], - "contentsOpaque": true, - "backgroundColor": "#FF0000", - "transform": 1 - }, - { - "name": "LayoutBlockFlow HTML", - "position": [8, 100], - "bounds": [784, 300], - "contentsOpaqueForText": true, - "drawsContent": false - }, - { - "name": "LayoutBlockFlow DIV", - "bounds": [285, 300], - "drawsContent": false, - "transform": 2 - }, - { - "name": "VerticalScrollbar", - "position": [285, 0], - "bounds": [15, 300], - "contentsOpaque": true, - "transform": 2 - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV", - "bounds": [285, 1000], - "contentsOpaque": true, - "backgroundColor": "#ADD8E6", - "transform": 2 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 100, 0, 1] - ] - }, - { - "id": 2, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [108, 100, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/squashing/iframes-are-never-squashed-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/squashing/iframes-are-never-squashed-expected.txt deleted file mode 100644 index b98e9b6a..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/squashing/iframes-are-never-squashed-expected.txt +++ /dev/null
@@ -1,35 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow DIV", - "bounds": [200, 200], - "contentsOpaque": true, - "backgroundColor": "#D3D3D3", - "transform": 1 - }, - { - "name": "LayoutIFrame (positioned) IFRAME", - "bounds": [104, 104], - "contentsOpaque": true, - "backgroundColor": "#ADD8E6" - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 8, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/squashing/invisible-layers-should-not-affect-geometry-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/squashing/invisible-layers-should-not-affect-geometry-expected.txt deleted file mode 100644 index 807811c6..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/squashing/invisible-layers-should-not-affect-geometry-expected.txt +++ /dev/null
@@ -1,36 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='composited box'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#008000", - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='box'", - "position": [10, 10], - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#008000" - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [10, 10, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/squashing/keep-lcd-text-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/squashing/keep-lcd-text-expected.txt deleted file mode 100644 index 78459d76..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/squashing/keep-lcd-text-expected.txt +++ /dev/null
@@ -1,28 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='composited'", - "bounds": [300, 300], - "contentsOpaqueForText": true, - "drawsContent": false - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='non-opaque'", - "bounds": [220, 120] - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='opaque'", - "position": [0, 50], - "bounds": [220, 220], - "contentsOpaque": true, - "backgroundColor": "#FFFF00" - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/squashing/move-squashing-layer-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/squashing/move-squashing-layer-expected.txt deleted file mode 100644 index 333d11c..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/squashing/move-squashing-layer-expected.txt +++ /dev/null
@@ -1,54 +0,0 @@ -This tests that squashed layers' offset from renderer is updated properly. If not properly updated, the two divs will appear to be aligned vertically in the pixel results, while really the blue div ('squashed') should be offset 100px left of the green ('host'). - -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='background'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#FFFF00", - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='host'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#008000", - "transform": 2 - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV id='squashed'", - "position": [8, 8], - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#0000FF" - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 50, 0, 1] - ] - }, - { - "id": 2, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [100, 100, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/squashing/no-squashing-for-filters-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/squashing/no-squashing-for-filters-expected.txt deleted file mode 100644 index d4d0a0bf..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/squashing/no-squashing-for-filters-expected.txt +++ /dev/null
@@ -1,34 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow DIV", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#ADD8E6", - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='trysquashed'", - "bounds": [100, 100], - "contentsOpaqueForText": true - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 8, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/squashing/no-squashing-into-another-clip-layer-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/squashing/no-squashing-into-another-clip-layer-expected.txt deleted file mode 100644 index 603e1d3..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/squashing/no-squashing-into-another-clip-layer-expected.txt +++ /dev/null
@@ -1,43 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow DIV", - "bounds": [784, 10], - "contentsOpaque": true, - "backgroundColor": "#ADD8E6", - "transform": 1 - }, - { - "name": "LayoutBlockFlow DIV id='inner'", - "bounds": [784, 10], - "contentsOpaque": true, - "backgroundColor": "#F5F5F5", - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='hoverable'", - "position": [8, 0], - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#90EE90" - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 8, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/squashing/no-squashing-into-fixed-position-that-clips-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/squashing/no-squashing-into-fixed-position-that-clips-expected.txt deleted file mode 100644 index bfe3de9e..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/squashing/no-squashing-into-fixed-position-that-clips-expected.txt +++ /dev/null
@@ -1,42 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='fixedpos'", - "position": [0, 50], - "bounds": [800, 550], - "contentsOpaque": true, - "backgroundColor": "#ADD8E6" - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='compositedlayer'", - "bounds": [24, 100], - "contentsOpaque": true, - "backgroundColor": "#D3D3D3", - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='notsquashedelement'", - "bounds": [800, 60], - "contentsOpaque": true, - "backgroundColor": "#008000" - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [400, 40, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/squashing/opacity-squashed-owner-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/squashing/opacity-squashed-owner-expected.txt deleted file mode 100644 index e4c795a..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/squashing/opacity-squashed-owner-expected.txt +++ /dev/null
@@ -1,35 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow DIV id='target' class='composited box opaque'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#ADD8E6", - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='squashed'", - "position": [16, 4], - "bounds": [40, 90], - "contentsOpaqueForText": true - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 8, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/squashing/repaint-child-of-squashed-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/squashing/repaint-child-of-squashed-expected.txt deleted file mode 100644 index 065154c5..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/squashing/repaint-child-of-squashed-expected.txt +++ /dev/null
@@ -1,77 +0,0 @@ -CASE 1, original layer tree -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='composited box behind'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#0000FF", - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='box top'", - "position": [130, 130], - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#00FFFF" - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [50, 50, 0, 1] - ] - } - ] -} - -CASE 2, change color of "inner" to red -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='composited box behind'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#0000FF", - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='box top'", - "position": [130, 130], - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#00FFFF", - "invalidations": [ - [10, 10, 50, 50] - ] - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [50, 50, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/squashing/selection-repaint-with-gaps-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/squashing/selection-repaint-with-gaps-expected.png deleted file mode 100644 index dd509a30..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/squashing/selection-repaint-with-gaps-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/squashing/selection-repaint-with-gaps-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/squashing/selection-repaint-with-gaps-expected.txt deleted file mode 100644 index d28b577..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/squashing/selection-repaint-with-gaps-expected.txt +++ /dev/null
@@ -1,79 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow DIV class='overlap'", - "bounds": [300, 500], - "contentsOpaqueForText": true, - "drawsContent": false, - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='item'", - "position": [15, 35], - "bounds": [100, 210], - "contentsOpaqueForText": true, - "invalidations": [ - [0, 80, 40, 19], - [0, 99, 39, 20] - ] - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 8, 0, 1] - ] - } - ] -} -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow DIV class='overlap'", - "bounds": [300, 500], - "contentsOpaqueForText": true, - "drawsContent": false, - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='item'", - "position": [15, 35], - "bounds": [100, 210], - "contentsOpaqueForText": true, - "invalidations": [ - [0, 99, 42, 20], - [0, 160, 40, 19], - [0, 80, 40, 19], - [0, 179, 39, 20] - ] - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 8, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/squashing/squash-above-fixed-1-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/squashing/squash-above-fixed-1-expected.txt deleted file mode 100644 index 67ebee4..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/squashing/squash-above-fixed-1-expected.txt +++ /dev/null
@@ -1,201 +0,0 @@ -The gray div is a composited fixed-position element, and the cyan/lime elements should be squashed together on top. When scrolling, paragraphs may pop in-and-out of the squashing layer when they change overlapping status with respect to the composited layer underneath. - -This scenario tests (1) that content repaints correctly as layers pop in and out of squashing, and (2) that the positioning of the squashing layer remains correct (i.e. scrolls properly) when the squashing layer is on top of a fixed-position composited layer. - -CASE 1, original layer tree: -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [785, 1400], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='composited background'", - "bounds": [300, 300], - "contentsOpaque": true, - "backgroundColor": "#D3D3D3", - "transform": 1 - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV id='paragraph-a' class='overlapping cyan'", - "bounds": [200, 1400], - "contentsOpaqueForText": true - }, - { - "name": "VerticalScrollbar", - "position": [785, 0], - "bounds": [15, 600], - "contentsOpaque": true - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [100, 150, 0, 1] - ] - } - ] -} - -CASE 2, scrolling y to 80, new layers will be squashed, so things repaint: -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [785, 1400], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='composited background'", - "bounds": [300, 300], - "contentsOpaque": true, - "backgroundColor": "#D3D3D3", - "transform": 2 - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV id='paragraph-a' class='overlapping cyan'", - "bounds": [200, 1400], - "contentsOpaqueForText": true, - "transform": 1 - }, - { - "name": "VerticalScrollbar", - "position": [785, 0], - "bounds": [15, 600], - "contentsOpaque": true - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [0, -80, 0, 1] - ] - }, - { - "id": 2, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [100, 150, 0, 1] - ] - } - ] -} - -CASE 3, scrolling y to 120, no repaints expected: -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [785, 1400], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='composited background'", - "bounds": [300, 300], - "contentsOpaque": true, - "backgroundColor": "#D3D3D3", - "transform": 2 - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV id='paragraph-a' class='overlapping cyan'", - "bounds": [200, 1400], - "contentsOpaqueForText": true, - "transform": 1 - }, - { - "name": "VerticalScrollbar", - "position": [785, 0], - "bounds": [15, 600], - "contentsOpaque": true - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [0, -120, 0, 1] - ] - }, - { - "id": 2, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [100, 150, 0, 1] - ] - } - ] -} - -CASE 4, scrolling y to 170 new layers will be squashed, so things repaint: -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [785, 1400], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='composited background'", - "bounds": [300, 300], - "contentsOpaque": true, - "backgroundColor": "#D3D3D3", - "transform": 2 - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV id='paragraph-a' class='overlapping cyan'", - "bounds": [200, 1400], - "contentsOpaqueForText": true, - "transform": 1 - }, - { - "name": "VerticalScrollbar", - "position": [785, 0], - "bounds": [15, 600], - "contentsOpaque": true - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [0, -170, 0, 1] - ] - }, - { - "id": 2, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [100, 150, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/squashing/squash-above-fixed-2-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/squashing/squash-above-fixed-2-expected.txt deleted file mode 100644 index 5a1e3b32..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/squashing/squash-above-fixed-2-expected.txt +++ /dev/null
@@ -1,79 +0,0 @@ -This scenario verifies that the cyan "container" element scrolls properly with squashing enabled. The "container" element should not squash into a composited layer mapping owned by the fixed position layer or its descendant, since this would make it behave like a fixed position element during composited scrolling. - -CASE 1, original layer tree: -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [785, 4050], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='fixed'", - "bounds": [400, 200], - "contentsOpaque": true, - "backfaceVisibility": "hidden", - "backgroundColor": "#0000FF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='container'", - "position": [100, 50], - "bounds": [200, 4000], - "contentsOpaque": true, - "backgroundColor": "#00FFFF" - }, - { - "name": "VerticalScrollbar", - "position": [785, 0], - "bounds": [15, 600], - "contentsOpaque": true - } - ] -} - -CASE 2, scrolling y to 80, the "container" element should remain positioned with respect to the scrolled document, the fixed-pos layer compensates for the new scroll position: -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [785, 4050], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='fixed'", - "bounds": [400, 200], - "contentsOpaque": true, - "backfaceVisibility": "hidden", - "backgroundColor": "#0000FF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='container'", - "position": [100, 50], - "bounds": [200, 4000], - "contentsOpaque": true, - "backgroundColor": "#00FFFF", - "transform": 1 - }, - { - "name": "VerticalScrollbar", - "position": [785, 0], - "bounds": [15, 600], - "contentsOpaque": true - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [0, -80, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/squashing/squash-above-fixed-3-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/squashing/squash-above-fixed-3-expected.txt deleted file mode 100644 index b9b3db94..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/squashing/squash-above-fixed-3-expected.txt +++ /dev/null
@@ -1,196 +0,0 @@ -This scenario verifies that the green "container" element and lime "innerScrolling" element scroll properly even though there is a blue fixed-position element layered in between them. - -The catch is that the squashing requirements should be computed in correct paint order, so that the green container does not accidentally position itself with respect to the wrong layer and not scroll. - -CASE 1, original layer tree: -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [785, 4100], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='backgroundFixed'", - "bounds": [400, 400], - "contentsOpaque": true, - "backgroundColor": "#808080" - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='container'", - "position": [100, 100], - "bounds": [100, 4000], - "contentsOpaque": true, - "backgroundColor": "#008000" - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='innerFixed'", - "bounds": [200, 100], - "contentsOpaque": true, - "backgroundColor": "#0000FF", - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='innerScrolling'", - "position": [200, 100], - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#00FF00" - }, - { - "name": "VerticalScrollbar", - "position": [785, 0], - "bounds": [15, 600], - "contentsOpaque": true - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [100, 150, 0, 1] - ] - } - ] -} - -CASE 2, scrolling y by 10 pixels, both the "container" and "inner" should scroll properly. -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [785, 4100], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='backgroundFixed'", - "bounds": [400, 400], - "contentsOpaque": true, - "backgroundColor": "#808080" - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='container'", - "position": [100, 100], - "bounds": [100, 4000], - "contentsOpaque": true, - "backgroundColor": "#008000", - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='innerFixed'", - "bounds": [200, 100], - "contentsOpaque": true, - "backgroundColor": "#0000FF", - "transform": 2 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='innerScrolling'", - "position": [200, 100], - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#00FF00", - "transform": 1 - }, - { - "name": "VerticalScrollbar", - "position": [785, 0], - "bounds": [15, 600], - "contentsOpaque": true - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [0, -10, 0, 1] - ] - }, - { - "id": 2, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [100, 150, 0, 1] - ] - } - ] -} - -CASE 3, scrolling y further so that "inner" no longer overlaps the fixed-pos layer, then the stacking context of "container" includes the "innerScrolling" layer, and doubles in width: -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [785, 4100], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='backgroundFixed'", - "bounds": [400, 400], - "contentsOpaque": true, - "backgroundColor": "#808080" - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='container'", - "position": [100, 100], - "bounds": [100, 4000], - "contentsOpaque": true, - "backgroundColor": "#008000", - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='innerFixed'", - "bounds": [200, 100], - "contentsOpaque": true, - "backgroundColor": "#0000FF", - "transform": 2 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='innerScrolling'", - "position": [200, 100], - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#00FF00", - "transform": 1 - }, - { - "name": "VerticalScrollbar", - "position": [785, 0], - "bounds": [15, 600], - "contentsOpaque": true - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [0, -110, 0, 1] - ] - }, - { - "id": 2, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [100, 150, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/squashing/squash-compositing-hover-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/squashing/squash-compositing-hover-expected.txt deleted file mode 100644 index d27c2f8..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/squashing/squash-compositing-hover-expected.txt +++ /dev/null
@@ -1,242 +0,0 @@ -Test overlap is rendered correctly when hovering over elements - -Case 1, original layer tree: -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='composited box behind'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#0000FF", - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='box middle'", - "position": [180, 180], - "bounds": [140, 140], - "contentsOpaqueForText": true, - "backgroundColor": "#00FFFF" - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [100, 100, 0, 1] - ] - } - ] -} - -Case 2: hovering over the "middle" element (causes that div to become its own composited layer) -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='composited box behind'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#0000FF", - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='box middle'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#008000", - "transform": 2 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='box middle2'", - "position": [200, 200], - "bounds": [120, 120], - "contentsOpaqueForText": true, - "backgroundColor": "#00FFFF" - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [100, 100, 0, 1] - ] - }, - { - "id": 2, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [180, 180, 0, 1] - ] - } - ] -} - -Case 3: hovering over the "middle2" element (causes that div to become its own composited layer) -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='composited box behind'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#0000FF", - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='box middle'", - "position": [180, 180], - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#00FF00" - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='box middle2'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#008000", - "transform": 2 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='box top'", - "position": [220, 220], - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#00FFFF" - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [100, 100, 0, 1] - ] - }, - { - "id": 2, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [200, 200, 0, 1] - ] - } - ] -} - -Case 4: hovering over the "top" element (causes that div to become its own composited layer) -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='composited box behind'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#0000FF", - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='box middle'", - "position": [180, 180], - "bounds": [120, 120], - "contentsOpaqueForText": true, - "backgroundColor": "#FF00FF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='box top'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#008000", - "transform": 2 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [100, 100, 0, 1] - ] - }, - { - "id": 2, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [220, 220, 0, 1] - ] - } - ] -} - -Case 5: back to situation in case 1 -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='composited box behind'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#0000FF", - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='box middle'", - "position": [180, 180], - "bounds": [140, 140], - "contentsOpaqueForText": true, - "backgroundColor": "#00FFFF" - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [100, 100, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/squashing/squash-onto-nephew-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/squashing/squash-onto-nephew-expected.txt deleted file mode 100644 index 75e14f1..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/squashing/squash-onto-nephew-expected.txt +++ /dev/null
@@ -1,35 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='composited box behind'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#0000FF", - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='box middle'", - "position": [40, 40], - "bounds": [180, 190], - "contentsOpaqueForText": true - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [125, 125, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/squashing/squash-onto-transform-backing-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/squashing/squash-onto-transform-backing-expected.txt deleted file mode 100644 index 2fbabcf..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/squashing/squash-onto-transform-backing-expected.txt +++ /dev/null
@@ -1,47 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='compositedAndRotated box behind'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#0000FF", - "transform": 2 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='box middle'", - "position": [20, 20], - "bounds": [130, 130], - "contentsOpaqueForText": true, - "backgroundColor": "#00FFFF" - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [100, 100, 0, 1] - ] - }, - { - "id": 2, - "parent": 1, - "transform": [ - [0.707106781186548, 0.707106781186548, 0, 0], - [-0.707106781186548, 0.707106781186548, 0, 0], - [0, 0, 1, 0], - [0, 0, 0, 1] - ], - "origin": [50, 50] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/squashing/squash-paint-invalidation-fixed-position-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/squashing/squash-paint-invalidation-fixed-position-expected.txt deleted file mode 100644 index 7349f23..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/squashing/squash-paint-invalidation-fixed-position-expected.txt +++ /dev/null
@@ -1,77 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV", - "bounds": [100, 5000], - "contentsOpaque": true, - "backgroundColor": "#ADD8E6", - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV", - "position": [8, 25], - "bounds": [100, 125], - "contentsOpaque": true, - "backgroundColor": "#FF0000", - "invalidations": [ - [0, 25, 100, 100] - ] - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 8, 0, 1] - ] - } - ] -} - { - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV", - "bounds": [100, 5000], - "contentsOpaque": true, - "backgroundColor": "#ADD8E6", - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV", - "position": [8, 25], - "bounds": [100, 125], - "contentsOpaque": true, - "backgroundColor": "#0000FF", - "invalidations": [ - [0, 25, 100, 100] - ] - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 8, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/squashing/squash-same-transform-ancestor-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/squashing/squash-same-transform-ancestor-expected.txt deleted file mode 100644 index c463320..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/squashing/squash-same-transform-ancestor-expected.txt +++ /dev/null
@@ -1,46 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutNGView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutNGBlockFlow (positioned) DIV id='squashing'", - "bounds": [1, 1], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "transform": 2 - }, - { - "name": "LayoutNGBlockFlow (positioned) DIV id='squashed'", - "position": [-100, 0], - "bounds": [200, 200], - "transform": 2 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 8, 0, 1] - ] - }, - { - "id": 2, - "parent": 1, - "transform": [ - [0.866025403784438, -0.5, 0, 0], - [0.5, 0.866025403784438, 0, 0], - [0, 0, 1, 0], - [100, 100, 0, 1] - ], - "origin": [50, 50] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/squashing/squash-simple-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/squashing/squash-simple-expected.txt deleted file mode 100644 index e3e7a802..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/squashing/squash-simple-expected.txt +++ /dev/null
@@ -1,36 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='composited box behind'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#0000FF", - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='box middle'", - "position": [20, 20], - "bounds": [130, 130], - "contentsOpaqueForText": true, - "backgroundColor": "#00FFFF" - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [100, 100, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/squashing/squash-three-layers-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/squashing/squash-three-layers-expected.txt deleted file mode 100644 index ad38f60..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/squashing/squash-three-layers-expected.txt +++ /dev/null
@@ -1,35 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='composited box behind'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#0000FF", - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='box middle'", - "position": [40, 40], - "bounds": [180, 190], - "contentsOpaqueForText": true - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [100, 100, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/squashing/squash-transform-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/squashing/squash-transform-expected.txt deleted file mode 100644 index 81e4ebe..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/squashing/squash-transform-expected.txt +++ /dev/null
@@ -1,34 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='composited box behind'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#0000FF", - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='box middle'", - "bounds": [150, 150], - "contentsOpaqueForText": true - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [100, 100, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/squashing/squash-transform-repainting-child-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/squashing/squash-transform-repainting-child-expected.txt deleted file mode 100644 index 388e38d..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/squashing/squash-transform-repainting-child-expected.txt +++ /dev/null
@@ -1,111 +0,0 @@ -CASE 1, original layer tree -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='composited box behind'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#0000FF", - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='box middle'", - "bounds": [150, 150], - "contentsOpaqueForText": true - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [100, 100, 0, 1] - ] - } - ] -} - -CASE 2, hovering over the outer div -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='composited box behind'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#0000FF", - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='box middle'", - "bounds": [150, 150], - "contentsOpaqueForText": true, - "invalidations": [ - [0, 0, 141, 141] - ] - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [100, 100, 0, 1] - ] - } - ] -} - -CASE 3, hovering over the inner div -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='composited box behind'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#0000FF", - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='box middle'", - "bounds": [150, 150], - "contentsOpaqueForText": true, - "invalidations": [ - [0, 0, 141, 141] - ] - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [100, 100, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/squashing/squash-transform-repainting-transformed-child-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/squashing/squash-transform-repainting-transformed-child-expected.txt deleted file mode 100644 index fc8d4c0..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/squashing/squash-transform-repainting-transformed-child-expected.txt +++ /dev/null
@@ -1,114 +0,0 @@ -CASE 1, original layer tree -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='composited box behind'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#0000FF", - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='box middle'", - "position": [4, 4], - "bounds": [146, 146], - "contentsOpaqueForText": true - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [100, 100, 0, 1] - ] - } - ] -} - -CASE 2, hovering over the outer div -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='composited box behind'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#0000FF", - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='box middle'", - "position": [4, 4], - "bounds": [146, 146], - "contentsOpaqueForText": true, - "invalidations": [ - [0, 0, 132, 132] - ] - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [100, 100, 0, 1] - ] - } - ] -} - -CASE 3, hovering over the inner div -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='composited box behind'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#0000FF", - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='box middle'", - "position": [4, 4], - "bounds": [146, 146], - "contentsOpaqueForText": true, - "invalidations": [ - [46, 46, 100, 100] - ] - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [100, 100, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/squashing/squashed-layer-loses-graphicslayer-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/squashing/squashed-layer-loses-graphicslayer-expected.txt deleted file mode 100644 index cd40544..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/squashing/squashed-layer-loses-graphicslayer-expected.txt +++ /dev/null
@@ -1,57 +0,0 @@ -A squashing Layer that becomes non-composited should correctly send a repaint invalidation to the new container GraphicsLayer that it paints into. When run interactively, hovering over the force-composited gray div should not cause other layers to disappear. - -CASE 1, original layer tree: -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='forceComposited' class='composited underneath'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#808080", - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='A' class='overlap1'", - "position": [140, 140], - "bounds": [140, 140], - "contentsOpaqueForText": true, - "backgroundColor": "#FF00FF" - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [60, 60, 0, 1] - ] - } - ] -} - -CASE 2, The original composited layer is no longer composited, which then also removes all squashing layers. The important point is that there should be an appropriate repaint to the root GraphicsLayer: -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "invalidations": [ - [180, 180, 100, 100], - [160, 160, 100, 100], - [140, 140, 100, 100], - [60, 60, 100, 100] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/squashing/squashed-repaints-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/squashing/squashed-repaints-expected.txt deleted file mode 100644 index a6f5b6d2..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/squashing/squashed-repaints-expected.txt +++ /dev/null
@@ -1,202 +0,0 @@ -Basic repaint test for squashed layers. The entire squashing layer should not need repainting when only a portion of it is invalidated. Test interactively by using --show-paint-rects and hovering over elements to change their color. - -CASE 1, original layer tree: -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='composited'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#808080", - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='A' class='overlap1'", - "position": [140, 140], - "bounds": [140, 140], - "contentsOpaqueForText": true, - "backgroundColor": "#FF00FF" - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [60, 60, 0, 1] - ] - } - ] -} - -CASE 2, overlap1 changes color: -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='composited'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#808080", - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='A' class='overlap1'", - "position": [140, 140], - "bounds": [140, 140], - "contentsOpaqueForText": true, - "backgroundColor": "#FF00FF", - "invalidations": [ - [0, 0, 100, 100] - ] - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [60, 60, 0, 1] - ] - } - ] -} - -CASE 3, overlap1 and overlap2 change color: -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='composited'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#808080", - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='A' class='overlap1'", - "position": [140, 140], - "bounds": [140, 140], - "contentsOpaqueForText": true, - "backgroundColor": "#FF00FF", - "invalidations": [ - [20, 20, 100, 100], - [0, 0, 100, 100] - ] - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [60, 60, 0, 1] - ] - } - ] -} - -CASE 4, overlap2 and overlap3 change color: -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='composited'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#808080", - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='A' class='overlap1'", - "position": [140, 140], - "bounds": [140, 140], - "contentsOpaqueForText": true, - "backgroundColor": "#008000", - "invalidations": [ - [40, 40, 100, 100], - [20, 20, 100, 100] - ] - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [60, 60, 0, 1] - ] - } - ] -} - -CASE 5, overlap3 and overlap1 change color: -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='composited'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#808080", - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='A' class='overlap1'", - "position": [140, 140], - "bounds": [140, 140], - "contentsOpaqueForText": true, - "backgroundColor": "#0000FF", - "invalidations": [ - [40, 40, 100, 100], - [0, 0, 100, 100] - ] - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [60, 60, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/squashing/squashing-inside-perspective-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/squashing/squashing-inside-perspective-expected.txt deleted file mode 100644 index 5842b51..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/squashing/squashing-inside-perspective-expected.txt +++ /dev/null
@@ -1,51 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV", - "bounds": [200, 200], - "contentsOpaque": true, - "backgroundColor": "#00008B", - "transform": 3 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 8, 0, 1] - ] - }, - { - "id": 2, - "parent": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, -0.001], - [0, 0, 0, 1] - ], - "origin": [0, 0] - }, - { - "id": 3, - "parent": 2, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [0, 74, 200, 1] - ], - "flattenInheritedTransform": false - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/squashing/squashing-sparsity-heuristic-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/squashing/squashing-sparsity-heuristic-expected.txt deleted file mode 100644 index 1c66d3a..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/squashing/squashing-sparsity-heuristic-expected.txt +++ /dev/null
@@ -1,41 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='composited'", - "bounds": [400, 400], - "contentsOpaque": true, - "backgroundColor": "#808080", - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='A' class='overlap1'", - "position": [140, 140], - "bounds": [30, 30], - "contentsOpaqueForText": true - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='C' class='overlap3'", - "position": [220, 300], - "bounds": [25, 10], - "contentsOpaqueForText": true - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [60, 60, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/tiled-layers-hidpi-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/tiled-layers-hidpi-expected.txt deleted file mode 100644 index e5932f9..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/tiled-layers-hidpi-expected.txt +++ /dev/null
@@ -1,35 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [3616, 1170], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow DIV id='composited'", - "bounds": [3600, 20], - "contentsOpaque": true, - "backgroundColor": "#0000FF", - "transform": 1 - }, - { - "name": "HorizontalScrollbar", - "position": [0, 1170], - "bounds": [1600, 30], - "contentsOpaque": true - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [16, 16, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/transform-3d-scales-different-x-y-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/transform-3d-scales-different-x-y-expected.png deleted file mode 100644 index 0b4512e..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/transform-3d-scales-different-x-y-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/video/video-controls-layer-creation-squashing-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/video/video-controls-layer-creation-squashing-expected.txt deleted file mode 100644 index fbb9700..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/video/video-controls-layer-creation-squashing-expected.txt +++ /dev/null
@@ -1,35 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV", - "bounds": [300, 300], - "contentsOpaque": true, - "backgroundColor": "#008000", - "transform": 1 - }, - { - "name": "LayoutVideo (positioned) VIDEO", - "bounds": [272, 153], - "contentsOpaque": true, - "backgroundColor": "#333333" - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [0, 100, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/video/video-poster-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/video/video-poster-expected.txt deleted file mode 100644 index 8d7ee4d..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/video/video-poster-expected.txt +++ /dev/null
@@ -1,72 +0,0 @@ -A <video> should not have a layer until playback begins. -This test can not be run manually, it requires testRunner.layerTreeAsText. - -Case: No src, no poster -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - } - ] -} - - -Case: Displaying poster -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - } - ] -} - - -Case: Displaying movie -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [785, 813], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutVideo VIDEO", - "bounds": [352, 288], - "transform": 1 - }, - { - "name": "LayoutFlexibleBox DIV class='sizing-small phase-pre-ready state-no-source'", - "bounds": [352, 288], - "contentsOpaqueForText": true, - "drawsContent": false, - "transform": 1 - }, - { - "name": "VerticalScrollbar", - "position": [785, 0], - "bounds": [15, 600], - "contentsOpaque": true - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 8, 0, 1] - ] - } - ] -} - - -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/visibility/layer-visible-content-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/visibility/layer-visible-content-expected.txt deleted file mode 100644 index 3921497..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/visibility/layer-visible-content-expected.txt +++ /dev/null
@@ -1,22 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow DIV class='composited box'", - "bounds": [10, 10], - "contentsOpaqueForText": true, - "drawsContent": false - }, - { - "name": "LayoutBlockFlow PRE id='layer-tree'", - "bounds": [800, 16], - "drawsContent": false - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/visibility/visibility-image-layers-dynamic-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/visibility/visibility-image-layers-dynamic-expected.txt deleted file mode 100644 index a032849b..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/visibility/visibility-image-layers-dynamic-expected.txt +++ /dev/null
@@ -1,247 +0,0 @@ -Initial -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [785, 626], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow DIV class='composited container'", - "bounds": [749, 145], - "contentsOpaqueForText": true, - "drawsContent": false, - "transform": 1 - }, - { - "name": "LayoutImage IMG class='visible composited box'", - "bounds": [100, 100], - "contentsOpaqueForText": true, - "transform": 3 - }, - { - "name": "VerticalScrollbar", - "position": [785, 0], - "bounds": [15, 600], - "contentsOpaque": true - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [18, 10, 0, 1] - ] - }, - { - "id": 2, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [18, 320, 0, 1] - ] - }, - { - "id": 3, - "parent": 2, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [20, 20, 0, 1] - ] - } - ] -} - -After step 1 -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [785, 1590], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow DIV class='composited container'", - "bounds": [749, 145], - "contentsOpaqueForText": true, - "drawsContent": false, - "transform": 1 - }, - { - "name": "LayoutImage IMG class='hidden composited box'", - "bounds": [100, 100], - "contentsOpaqueForText": true, - "transform": 2 - }, - { - "name": "LayoutImage IMG class='visible composited box'", - "bounds": [100, 100], - "contentsOpaqueForText": true, - "transform": 4 - }, - { - "name": "VerticalScrollbar", - "position": [785, 0], - "bounds": [15, 600], - "contentsOpaque": true - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [18, 10, 0, 1] - ] - }, - { - "id": 2, - "parent": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [20, 20, 0, 1] - ] - }, - { - "id": 3, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [18, 320, 0, 1] - ] - }, - { - "id": 4, - "parent": 3, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [20, 20, 0, 1] - ] - } - ] -} - -After step 2 -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [785, 2809], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow DIV class='composited container'", - "bounds": [749, 145], - "contentsOpaqueForText": true, - "drawsContent": false, - "transform": 1 - }, - { - "name": "LayoutImage IMG class='hidden composited box'", - "bounds": [100, 100], - "contentsOpaqueForText": true, - "transform": 2 - }, - { - "name": "LayoutBlockFlow DIV class='composited hidden container'", - "position": [-4, -4], - "bounds": [757, 153], - "contentsOpaqueForText": true, - "transform": 3 - }, - { - "name": "LayoutImage IMG class='composited box'", - "bounds": [100, 100], - "contentsOpaqueForText": true, - "transform": 4 - }, - { - "name": "LayoutImage IMG class='visible composited box'", - "bounds": [100, 100], - "contentsOpaqueForText": true, - "transform": 6 - }, - { - "name": "VerticalScrollbar", - "position": [785, 0], - "bounds": [15, 600], - "contentsOpaque": true - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [18, 10, 0, 1] - ] - }, - { - "id": 2, - "parent": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [20, 20, 0, 1] - ] - }, - { - "id": 3, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [18, 165, 0, 1] - ] - }, - { - "id": 4, - "parent": 3, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [20, 20, 0, 1] - ] - }, - { - "id": 5, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [18, 320, 0, 1] - ] - }, - { - "id": 6, - "parent": 5, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [20, 20, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/will-change/composited-layers-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/will-change/composited-layers-expected.txt deleted file mode 100644 index 0b4575a9..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/compositing/will-change/composited-layers-expected.txt +++ /dev/null
@@ -1,157 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow DIV id='willChangeOpacity' class='shouldComposite'", - "bounds": [30, 30], - "contentsOpaque": true, - "backgroundColor": "#008000", - "transform": 1 - }, - { - "name": "LayoutBlockFlow DIV id='willChangeTransform' class='shouldComposite'", - "bounds": [30, 30], - "contentsOpaque": true, - "backgroundColor": "#008000", - "transform": 2 - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV id='willChangeLeft' class='positioned shouldComposite'", - "bounds": [30, 30], - "contentsOpaque": true, - "backgroundColor": "#008000", - "transform": 3 - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV id='willChangeRight' class='positioned shouldComposite'", - "bounds": [30, 30], - "contentsOpaque": true, - "backgroundColor": "#008000", - "transform": 4 - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV id='willChangeTop' class='positioned shouldComposite'", - "bounds": [30, 30], - "contentsOpaque": true, - "backgroundColor": "#008000", - "transform": 5 - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV id='willChangeBottom' class='positioned shouldComposite'", - "bounds": [30, 30], - "contentsOpaque": true, - "backgroundColor": "#008000", - "transform": 6 - }, - { - "name": "LayoutBlockFlow DIV id='willChangeFilter' class='shouldComposite'", - "bounds": [30, 30], - "contentsOpaque": true, - "backgroundColor": "#008000", - "transform": 7 - }, - { - "name": "LayoutBlockFlow DIV id='willChangeBackdropFilter' class='shouldComposite'", - "bounds": [30, 30], - "contentsOpaque": true, - "backgroundColor": "#008000", - "transform": 8 - }, - { - "name": "LayoutBlockFlow DIV id='willChangeCombinationThatComposites' class='shouldComposite'", - "bounds": [30, 30], - "contentsOpaque": true, - "backgroundColor": "#008000", - "transform": 9 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [12, 42, 0, 1] - ] - }, - { - "id": 2, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [12, 76, 0, 1] - ] - }, - { - "id": 3, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [12, 144, 0, 1] - ] - }, - { - "id": 4, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [12, 212, 0, 1] - ] - }, - { - "id": 5, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [12, 280, 0, 1] - ] - }, - { - "id": 6, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [12, 348, 0, 1] - ] - }, - { - "id": 7, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [12, 382, 0, 1] - ] - }, - { - "id": 8, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [12, 416, 0, 1] - ] - }, - { - "id": 9, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [12, 450, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css1/basic/inheritance-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css1/basic/inheritance-expected.png deleted file mode 100644 index 18e4822..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css1/basic/inheritance-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css1/box_properties/acid_test-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css1/box_properties/acid_test-expected.png deleted file mode 100644 index 749cdf7..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css1/box_properties/acid_test-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css1/box_properties/border_bottom-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css1/box_properties/border_bottom-expected.png deleted file mode 100644 index 22694491..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css1/box_properties/border_bottom-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css1/box_properties/border_left-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css1/box_properties/border_left-expected.png deleted file mode 100644 index d226d5b..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css1/box_properties/border_left-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css1/box_properties/border_right_inline-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css1/box_properties/border_right_inline-expected.png deleted file mode 100644 index ea9e8f9..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css1/box_properties/border_right_inline-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css1/box_properties/border_top-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css1/box_properties/border_top-expected.png deleted file mode 100644 index b9a619e2..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css1/box_properties/border_top-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css1/box_properties/float_on_text_elements-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css1/box_properties/float_on_text_elements-expected.png deleted file mode 100644 index e056b3e..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css1/box_properties/float_on_text_elements-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css1/classification/display-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css1/classification/display-expected.png deleted file mode 100644 index a2424ed3..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css1/classification/display-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css1/classification/list_style-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css1/classification/list_style-expected.png deleted file mode 100644 index f146b31..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css1/classification/list_style-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css1/color_and_background/background_attachment-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css1/color_and_background/background_attachment-expected.png deleted file mode 100644 index c8d34d8..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css1/color_and_background/background_attachment-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css1/formatting_model/canvas-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css1/formatting_model/canvas-expected.png deleted file mode 100644 index 7d3112854..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css1/formatting_model/canvas-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css1/formatting_model/height_of_lines-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css1/formatting_model/height_of_lines-expected.png deleted file mode 100644 index cf0fc2de..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css1/formatting_model/height_of_lines-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css1/formatting_model/inline_elements-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css1/formatting_model/inline_elements-expected.png deleted file mode 100644 index e6ecf65..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css1/formatting_model/inline_elements-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css1/pseudo/anchor-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css1/pseudo/anchor-expected.png deleted file mode 100644 index ef00aeaa..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css1/pseudo/anchor-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css1/text_properties/text_transform-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css1/text_properties/text_transform-expected.png deleted file mode 100644 index 77e38f0e..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css1/text_properties/text_transform-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css1/units/urls-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css1/units/urls-expected.png deleted file mode 100644 index ee5b67f1..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css1/units/urls-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/20110323/border-conflict-style-079-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/20110323/border-conflict-style-079-expected.png deleted file mode 100644 index 34d54d0..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/20110323/border-conflict-style-079-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/20110323/border-conflict-style-088-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/20110323/border-conflict-style-088-expected.png deleted file mode 100644 index f31de00..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/20110323/border-conflict-style-088-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/20110323/c543-txt-decor-000-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/20110323/c543-txt-decor-000-expected.png deleted file mode 100644 index 40b1cd1d..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/20110323/c543-txt-decor-000-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/20110323/outline-color-applies-to-014-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/20110323/outline-color-applies-to-014-expected.png deleted file mode 100644 index 68f1ef5..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/20110323/outline-color-applies-to-014-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/20110323/table-height-algorithm-023-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/20110323/table-height-algorithm-023-expected.png deleted file mode 100644 index 162ec53e..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/20110323/table-height-algorithm-023-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/20110323/table-height-algorithm-024-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/20110323/table-height-algorithm-024-expected.png deleted file mode 100644 index 162ec53e..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/20110323/table-height-algorithm-024-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t051103-dom-hover-01-c-io-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t051103-dom-hover-01-c-io-expected.png deleted file mode 100644 index 1d8298f..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t051103-dom-hover-01-c-io-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t051103-dom-hover-02-c-io-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t051103-dom-hover-02-c-io-expected.png deleted file mode 100644 index e4a15d0..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t051103-dom-hover-02-c-io-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t0805-c5516-brdr-c-00-a-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t0805-c5516-brdr-c-00-a-expected.png deleted file mode 100644 index 74ec001..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t0805-c5516-brdr-c-00-a-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t0805-c5516-ibrdr-c-00-a-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t0805-c5516-ibrdr-c-00-a-expected.png deleted file mode 100644 index 2d29e77..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t0805-c5516-ibrdr-c-00-a-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t0805-c5519-brdr-r-01-e-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t0805-c5519-brdr-r-01-e-expected.png deleted file mode 100644 index 9a2754b..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t0805-c5519-brdr-r-01-e-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t0805-c5521-brdr-l-01-e-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t0805-c5521-brdr-l-01-e-expected.png deleted file mode 100644 index 72c47d9..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t0805-c5521-brdr-l-01-e-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t09-c5526c-display-00-e-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t09-c5526c-display-00-e-expected.png deleted file mode 100644 index bd75bae..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t09-c5526c-display-00-e-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t0905-c414-flt-02-c-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t0905-c414-flt-02-c-expected.png deleted file mode 100644 index 89469e1..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t0905-c414-flt-02-c-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t0905-c414-flt-03-c-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t0905-c414-flt-03-c-expected.png deleted file mode 100644 index db6237e..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t0905-c414-flt-03-c-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t0905-c414-flt-04-c-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t0905-c414-flt-04-c-expected.png deleted file mode 100644 index 025bad1..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t0905-c414-flt-04-c-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t0905-c414-flt-wrap-01-d-g-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t0905-c414-flt-wrap-01-d-g-expected.png deleted file mode 100644 index 9507f7677..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t0905-c414-flt-wrap-01-d-g-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t0905-c5525-fltcont-00-d-g-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t0905-c5525-fltcont-00-d-g-expected.png deleted file mode 100644 index 2fb8e3bc..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t0905-c5525-fltcont-00-d-g-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t0905-c5525-fltwidth-00-c-g-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t0905-c5525-fltwidth-00-c-g-expected.png deleted file mode 100644 index 10af5b1..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t0905-c5525-fltwidth-00-c-g-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t0905-c5525-fltwrap-00-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t0905-c5525-fltwrap-00-b-expected.png deleted file mode 100644 index 4a6395d..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t0905-c5525-fltwrap-00-b-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t100801-c544-valgn-00-a-ag-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t100801-c544-valgn-00-a-ag-expected.png deleted file mode 100644 index f872046..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t100801-c544-valgn-00-a-ag-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t100801-c544-valgn-03-d-agi-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t100801-c544-valgn-03-d-agi-expected.png deleted file mode 100644 index cfd03cdbd..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t100801-c544-valgn-03-d-agi-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t1202-counter-08-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t1202-counter-08-b-expected.png deleted file mode 100644 index 0ef2d45..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t1202-counter-08-b-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t1202-counter-13-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t1202-counter-13-b-expected.png deleted file mode 100644 index 37dc7f7..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t1202-counter-13-b-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t1202-counter-14-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t1202-counter-14-b-expected.png deleted file mode 100644 index 37dc7f7..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t1202-counter-14-b-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t1202-counters-08-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t1202-counters-08-b-expected.png deleted file mode 100644 index 875c9822..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t1202-counters-08-b-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t1202-counters-13-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t1202-counters-13-b-expected.png deleted file mode 100644 index e2c1fc7..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t1202-counters-13-b-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t1202-counters-14-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t1202-counters-14-b-expected.png deleted file mode 100644 index e2c1fc7..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t1202-counters-14-b-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t1204-order-01-d-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t1204-order-01-d-expected.png deleted file mode 100644 index 35daf02..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t1204-order-01-d-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t120401-scope-00-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t120401-scope-00-b-expected.png deleted file mode 100644 index 496ca3a..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t120401-scope-00-b-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t1402-c45-bg-canvas-00-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t1402-c45-bg-canvas-00-b-expected.png deleted file mode 100644 index 55a0681f..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t1402-c45-bg-canvas-00-b-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t140201-c535-bg-fixd-00-b-g-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t140201-c535-bg-fixd-00-b-g-expected.png deleted file mode 100644 index 72ca4229..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t140201-c535-bg-fixd-00-b-g-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t140201-c537-bgfxps-00-c-ag-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t140201-c537-bgfxps-00-c-ag-expected.png deleted file mode 100644 index 6d6f637..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t140201-c537-bgfxps-00-c-ag-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t1602-c546-txt-align-00-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t1602-c546-txt-align-00-b-expected.png deleted file mode 100644 index 4cd901ee..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t1602-c546-txt-align-00-b-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-01-d-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-01-d-expected.png deleted file mode 100644 index 384f713..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-01-d-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-02-d-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-02-d-expected.png deleted file mode 100644 index ce744c9..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-02-d-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-03-d-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-03-d-expected.png deleted file mode 100644 index 5e8c7f6..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-03-d-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-04-d-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-04-d-expected.png deleted file mode 100644 index c0f5997b..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-04-d-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-05-d-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-05-d-expected.png deleted file mode 100644 index 0f32b3c..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-05-d-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-06-d-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-06-d-expected.png deleted file mode 100644 index 6aea7dc..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-06-d-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-07-d-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-07-d-expected.png deleted file mode 100644 index 9bfacfa4..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-07-d-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-08-d-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-08-d-expected.png deleted file mode 100644 index 708eed58..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-08-d-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-13-d-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-13-d-expected.png deleted file mode 100644 index b199e9c4..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-13-d-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-14-d-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-14-d-expected.png deleted file mode 100644 index 073ac19a..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-14-d-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-15-d-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-15-d-expected.png deleted file mode 100644 index 3ebf7f3..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-15-d-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-16-d-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-16-d-expected.png deleted file mode 100644 index 2af80b05..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-16-d-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-17-d-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-17-d-expected.png deleted file mode 100644 index 402409a..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-17-d-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-18-d-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-18-d-expected.png deleted file mode 100644 index e6f66ed..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-18-d-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-19-d-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-19-d-expected.png deleted file mode 100644 index d95b5b9..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-19-d-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-23-d-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-23-d-expected.png deleted file mode 100644 index ef1c332a..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-23-d-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-24-d-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-24-d-expected.png deleted file mode 100644 index d265e51..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-24-d-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-25-d-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-25-d-expected.png deleted file mode 100644 index 1b47b28..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-25-d-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-26-d-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-26-d-expected.png deleted file mode 100644 index a89c928b..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-26-d-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-27-d-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-27-d-expected.png deleted file mode 100644 index e0e89d34..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-27-d-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-28-d-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-28-d-expected.png deleted file mode 100644 index 7d7833e3..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-28-d-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-29-d-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-29-d-expected.png deleted file mode 100644 index 7ae1379d..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-29-d-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-33-d-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-33-d-expected.png deleted file mode 100644 index 7f6c8ef..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-33-d-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-34-d-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-34-d-expected.png deleted file mode 100644 index 4d6b00d..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-34-d-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-35-d-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-35-d-expected.png deleted file mode 100644 index 86f3808..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-35-d-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-36-d-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-36-d-expected.png deleted file mode 100644 index 08ac1e7e..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-36-d-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-37-d-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-37-d-expected.png deleted file mode 100644 index f7efa44..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-37-d-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-38-d-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-38-d-expected.png deleted file mode 100644 index 99ab9a4..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-38-d-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-39-d-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-39-d-expected.png deleted file mode 100644 index 6ac1b9d..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-39-d-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-41-d-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-41-d-expected.png deleted file mode 100644 index 3a146673..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-41-d-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-42-d-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-42-d-expected.png deleted file mode 100644 index 8f9124a..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-42-d-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-43-d-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-43-d-expected.png deleted file mode 100644 index deea941d..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-43-d-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-44-d-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-44-d-expected.png deleted file mode 100644 index 34a041c..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-44-d-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-45-d-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-45-d-expected.png deleted file mode 100644 index dc0a514d..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-45-d-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-46-d-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-46-d-expected.png deleted file mode 100644 index 51469ac..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-46-d-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-47-d-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-47-d-expected.png deleted file mode 100644 index 56ca45f..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-47-d-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-48-d-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-48-d-expected.png deleted file mode 100644 index 8d5592e1..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-48-d-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-49-d-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-49-d-expected.png deleted file mode 100644 index 4531f79..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-49-d-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-51-d-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-51-d-expected.png deleted file mode 100644 index 030c267c..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-51-d-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-52-d-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-52-d-expected.png deleted file mode 100644 index 8114aa4b..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-52-d-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-53-d-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-53-d-expected.png deleted file mode 100644 index 98457a0..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-53-d-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-54-d-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-54-d-expected.png deleted file mode 100644 index 0e19c97..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-54-d-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-55-d-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-55-d-expected.png deleted file mode 100644 index f939c28..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-55-d-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-56-d-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-56-d-expected.png deleted file mode 100644 index b7cad0b..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-56-d-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-57-d-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-57-d-expected.png deleted file mode 100644 index 37bc231..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-57-d-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-58-d-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-58-d-expected.png deleted file mode 100644 index 6b2fd882..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-58-d-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-59-d-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-59-d-expected.png deleted file mode 100644 index f83fe40..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-59-d-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-61-d-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-61-d-expected.png deleted file mode 100644 index e671d82f..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-61-d-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-62-d-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-62-d-expected.png deleted file mode 100644 index f0f774bc..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-62-d-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-63-d-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-63-d-expected.png deleted file mode 100644 index d80e6c6a..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-63-d-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-64-d-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-64-d-expected.png deleted file mode 100644 index 9ea3995..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-64-d-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-65-d-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-65-d-expected.png deleted file mode 100644 index 0695604..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-65-d-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-66-d-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-66-d-expected.png deleted file mode 100644 index 3bad7cd..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-66-d-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-67-d-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-67-d-expected.png deleted file mode 100644 index 443d4cad..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-67-d-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-68-d-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-68-d-expected.png deleted file mode 100644 index 19f84cc..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-68-d-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-69-d-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-69-d-expected.png deleted file mode 100644 index 99b9d84..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-69-d-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-71-d-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-71-d-expected.png deleted file mode 100644 index 6db348a..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-71-d-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-72-d-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-72-d-expected.png deleted file mode 100644 index 365a28a5..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-72-d-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-73-d-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-73-d-expected.png deleted file mode 100644 index 7b0a8668..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-73-d-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-74-d-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-74-d-expected.png deleted file mode 100644 index 0202b49..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-74-d-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-75-d-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-75-d-expected.png deleted file mode 100644 index 26d1617d..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-75-d-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-76-d-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-76-d-expected.png deleted file mode 100644 index d90406a..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-76-d-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-77-d-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-77-d-expected.png deleted file mode 100644 index 20032906..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-77-d-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-78-d-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-78-d-expected.png deleted file mode 100644 index d2e5c1498..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-78-d-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-79-d-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-79-d-expected.png deleted file mode 100644 index c949870..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-79-d-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-81-d-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-81-d-expected.png deleted file mode 100644 index b0469c4..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-81-d-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-82-d-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-82-d-expected.png deleted file mode 100644 index 14976e9..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-82-d-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-83-d-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-83-d-expected.png deleted file mode 100644 index e737f86..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-83-d-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-84-d-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-84-d-expected.png deleted file mode 100644 index b56ceeb9..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-84-d-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-85-d-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-85-d-expected.png deleted file mode 100644 index 274be25..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-85-d-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-86-d-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-86-d-expected.png deleted file mode 100644 index 08306aa..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-86-d-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-87-d-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-87-d-expected.png deleted file mode 100644 index f84ca2c..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-87-d-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-88-d-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-88-d-expected.png deleted file mode 100644 index 7c1d9b82..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-88-d-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-89-d-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-89-d-expected.png deleted file mode 100644 index bad0fbc..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-89-d-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-93-d-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-93-d-expected.png deleted file mode 100644 index cb7af70..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-93-d-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-94-d-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-94-d-expected.png deleted file mode 100644 index 11490ec..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-94-d-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-95-d-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-95-d-expected.png deleted file mode 100644 index afc650f..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-95-d-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-96-d-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-96-d-expected.png deleted file mode 100644 index 5954975..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-96-d-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-97-d-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-97-d-expected.png deleted file mode 100644 index 19ee068..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-97-d-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-98-d-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-98-d-expected.png deleted file mode 100644 index e773080..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css2.1/t170602-bdr-conflct-w-98-d-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css3/blending/mix-blend-mode-2nd-stacking-context-composited-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css3/blending/mix-blend-mode-2nd-stacking-context-composited-expected.txt deleted file mode 100644 index ebada22..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css3/blending/mix-blend-mode-2nd-stacking-context-composited-expected.txt +++ /dev/null
@@ -1,33 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='stacking-context'", - "bounds": [160, 90], - "backgroundColor": "#008000", - "transform": 1 - }, - { - "name": "LayoutBlockFlow HTML", - "position": [8, 8], - "bounds": [784, 579] - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 8, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css3/blending/mix-blend-mode-composited-layers-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css3/blending/mix-blend-mode-composited-layers-expected.txt deleted file mode 100644 index c3e61a4..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css3/blending/mix-blend-mode-composited-layers-expected.txt +++ /dev/null
@@ -1,40 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600] - }, - { - "name": "LayoutBlockFlow DIV", - "position": [8, 18], - "bounds": [10, 10], - "contentsOpaque": true, - "backgroundColor": "#0000FF" - }, - { - "name": "LayoutBlockFlow DIV", - "bounds": [10, 10], - "contentsOpaque": true, - "backgroundColor": "#FFFF00", - "transform": 1 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 18, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css3/blending/mix-blend-mode-composited-reason-children-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css3/blending/mix-blend-mode-composited-reason-children-expected.txt deleted file mode 100644 index d2db03b5..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css3/blending/mix-blend-mode-composited-reason-children-expected.txt +++ /dev/null
@@ -1,47 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='stacking-context'", - "position": [8, 8], - "bounds": [160, 90], - "contentsOpaque": true, - "backgroundColor": "#008000" - }, - { - "name": "LayoutBlockFlow DIV class='blended'", - "position": [8, 8], - "bounds": [160, 90], - "contentsOpaque": true, - "backgroundColor": "#0000FF" - }, - { - "name": "LayoutImage IMG class='accelerated'", - "bounds": [160, 90], - "contentsOpaqueForText": true, - "transform": 1 - }, - { - "name": "LayoutBlockFlow HTML", - "position": [8, 8], - "bounds": [784, 579] - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 8, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css3/blending/mix-blend-mode-isolation-2-stacking-contexts-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css3/blending/mix-blend-mode-isolation-2-stacking-contexts-expected.txt deleted file mode 100644 index ed59961..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css3/blending/mix-blend-mode-isolation-2-stacking-contexts-expected.txt +++ /dev/null
@@ -1,62 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='stacking-context'", - "position": [8, 8], - "bounds": [160, 90], - "contentsOpaque": true, - "backgroundColor": "#008000" - }, - { - "name": "LayoutImage IMG class='accelerated blended'", - "bounds": [160, 90], - "contentsOpaqueForText": true, - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='stacking-context'", - "bounds": [160, 90], - "contentsOpaque": true, - "backgroundColor": "#008000", - "transform": 2 - }, - { - "name": "LayoutImage IMG class='accelerated blended'", - "bounds": [160, 90], - "contentsOpaqueForText": true, - "transform": 2 - }, - { - "name": "LayoutBlockFlow HTML", - "position": [8, 8], - "bounds": [784, 579] - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 8, 0, 1] - ] - }, - { - "id": 2, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 8, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css3/blending/mix-blend-mode-isolation-layer-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css3/blending/mix-blend-mode-isolation-layer-expected.txt deleted file mode 100644 index b711cd6..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css3/blending/mix-blend-mode-isolation-layer-expected.txt +++ /dev/null
@@ -1,40 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='stacking-context'", - "position": [8, 8], - "bounds": [160, 90], - "contentsOpaque": true, - "backgroundColor": "#008000" - }, - { - "name": "LayoutImage IMG class='accelerated blended'", - "bounds": [160, 90], - "contentsOpaqueForText": true, - "transform": 1 - }, - { - "name": "LayoutBlockFlow HTML", - "position": [8, 8], - "bounds": [784, 579] - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 8, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css3/blending/mix-blend-mode-isolation-remove-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css3/blending/mix-blend-mode-isolation-remove-expected.txt deleted file mode 100644 index 3321700..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css3/blending/mix-blend-mode-isolation-remove-expected.txt +++ /dev/null
@@ -1,43 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow DIV class='accelerated-stacking-context'", - "bounds": [784, 90], - "contentsOpaque": true, - "backgroundColor": "#0000FF", - "transform": 1 - }, - { - "name": "LayoutBlockFlow DIV id='intermediary' class='accelerated-no-stacking-context'", - "bounds": [784, 90], - "contentsOpaque": true, - "backfaceVisibility": "hidden", - "backgroundColor": "#008000", - "transform": 1 - }, - { - "name": "LayoutImage IMG class='accelerated blended'", - "bounds": [160, 90], - "contentsOpaqueForText": true, - "transform": 1 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 8, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css3/filters/composited-layer-bounds-after-sw-blur-animation-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css3/filters/composited-layer-bounds-after-sw-blur-animation-expected.txt deleted file mode 100644 index cab371e..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css3/filters/composited-layer-bounds-after-sw-blur-animation-expected.txt +++ /dev/null
@@ -1,29 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='composited-layer' class='final-drop-shadow'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#008000", - "transform": 1 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [100, 100, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css3/filters/composited-layer-bounds-with-composited-blur-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css3/filters/composited-layer-bounds-with-composited-blur-expected.txt deleted file mode 100644 index 148840e..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css3/filters/composited-layer-bounds-with-composited-blur-expected.txt +++ /dev/null
@@ -1,29 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='composited'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#008000", - "transform": 1 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [100, 100, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css3/filters/composited-layer-promotion-after-outset-overlap-change-using-composited-shadow-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css3/filters/composited-layer-promotion-after-outset-overlap-change-using-composited-shadow-expected.txt deleted file mode 100644 index ecc9843..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css3/filters/composited-layer-promotion-after-outset-overlap-change-using-composited-shadow-expected.txt +++ /dev/null
@@ -1,63 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='composited-layer-to-overlap'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#0000FF", - "transform": 1 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [250, 250, 0, 1] - ] - } - ] -} -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='composited-layer-to-overlap'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#0000FF", - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='software-layer-to-promote' class='final-drop-shadow'", - "position": [100, 100], - "bounds": [200, 200], - "contentsOpaqueForText": true - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [250, 250, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css3/filters/composited-layer-promotion-after-outset-overlap-change-using-sw-shadow-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css3/filters/composited-layer-promotion-after-outset-overlap-change-using-sw-shadow-expected.txt deleted file mode 100644 index ecc9843..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css3/filters/composited-layer-promotion-after-outset-overlap-change-using-sw-shadow-expected.txt +++ /dev/null
@@ -1,63 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='composited-layer-to-overlap'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#0000FF", - "transform": 1 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [250, 250, 0, 1] - ] - } - ] -} -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='composited-layer-to-overlap'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#0000FF", - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='software-layer-to-promote' class='final-drop-shadow'", - "position": [100, 100], - "bounds": [200, 200], - "contentsOpaqueForText": true - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [250, 250, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css3/filters/filtered-compositing-descendant-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css3/filters/filtered-compositing-descendant-expected.txt deleted file mode 100644 index 2a1be99..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css3/filters/filtered-compositing-descendant-expected.txt +++ /dev/null
@@ -1,45 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow DIV class='filtered box'", - "position": [8, 8], - "bounds": [144, 144], - "contentsOpaqueForText": true - }, - { - "name": "LayoutBlockFlow DIV class='compositing box'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#FF0000", - "transform": 2 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [30, 30, 0, 1] - ] - }, - { - "id": 2, - "parent": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [0, 0, 1, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css3/flexbox/flexbox-baseline-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css3/flexbox/flexbox-baseline-expected.png deleted file mode 100644 index f50721c54..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css3/flexbox/flexbox-baseline-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css3/masking/clip-path-inset-corners-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css3/masking/clip-path-inset-corners-expected.png deleted file mode 100644 index 0d0df664..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css3/masking/clip-path-inset-corners-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css3/selectors3/html/css3-modsel-41-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css3/selectors3/html/css3-modsel-41-expected.png deleted file mode 100644 index 761e3a3..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css3/selectors3/html/css3-modsel-41-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css3/selectors3/html/css3-modsel-41a-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css3/selectors3/html/css3-modsel-41a-expected.png deleted file mode 100644 index 761e3a3..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css3/selectors3/html/css3-modsel-41a-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css3/selectors3/xhtml/css3-modsel-3-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css3/selectors3/xhtml/css3-modsel-3-expected.png deleted file mode 100644 index 930bbdb..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css3/selectors3/xhtml/css3-modsel-3-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css3/selectors3/xhtml/css3-modsel-41-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css3/selectors3/xhtml/css3-modsel-41-expected.png deleted file mode 100644 index 761e3a3..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css3/selectors3/xhtml/css3-modsel-41-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css3/selectors3/xhtml/css3-modsel-41a-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css3/selectors3/xhtml/css3-modsel-41a-expected.png deleted file mode 100644 index 761e3a3..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css3/selectors3/xhtml/css3-modsel-41a-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css3/selectors3/xml/css3-modsel-3-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css3/selectors3/xml/css3-modsel-3-expected.png deleted file mode 100644 index 3fa7bf6..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css3/selectors3/xml/css3-modsel-3-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css3/selectors3/xml/css3-modsel-41-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css3/selectors3/xml/css3-modsel-41-expected.png deleted file mode 100644 index d6cba76..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css3/selectors3/xml/css3-modsel-41-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css3/selectors3/xml/css3-modsel-41a-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/css3/selectors3/xml/css3-modsel-41a-expected.png deleted file mode 100644 index d6cba76..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/css3/selectors3/xml/css3-modsel-41a-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/dark-mode/colors/selection-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/dark-mode/colors/selection-expected.png deleted file mode 100644 index a871115c..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/dark-mode/colors/selection-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/caret/empty_inlines-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/caret/empty_inlines-expected.txt deleted file mode 100644 index 2952d36..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/caret/empty_inlines-expected.txt +++ /dev/null
@@ -1,23 +0,0 @@ -This is a testharness.js-based test. -PASS "ab<span></span>" -PASS "ab<span> </span>" -FAIL "ab <span></span>" assert_not_equals: got disallowed value "8,8" -FAIL "ab <span> </span>" assert_not_equals: got disallowed value "8,8" -PASS "ab<span></span> " -PASS "ab<span> </span> " -FAIL "<span></span>xy" assert_not_equals: got disallowed value "8,8" -FAIL "<span> </span>xy" assert_not_equals: got disallowed value "8,8" -FAIL " <span></span>xy" assert_not_equals: got disallowed value "8,8" -FAIL " <span> </span>xy" assert_not_equals: got disallowed value "8,8" -FAIL "<span></span> xy" assert_not_equals: got disallowed value "8,8" -FAIL "<span> </span> xy" assert_not_equals: got disallowed value "8,8" -PASS "ab<span></span>xy" -PASS "ab<span> </span>xy" -PASS "ab <span></span>xy" -FAIL "ab <span> </span>xy" assert_not_equals: got disallowed value "8,8" -PASS "ab<span></span> xy" -PASS "ab<span> </span> xy" -PASS "ab<span></span>xy" with width: 2ch; -PASS "ab<span> </span>xy" with width: 3ch; -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/deleting/5433862-1-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/deleting/5433862-1-expected.txt deleted file mode 100644 index 16194a8..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/deleting/5433862-1-expected.txt +++ /dev/null
@@ -1,7 +0,0 @@ -This tests for a crash when removing a selection ends with a fully selected table row. - -foo - - - -foo bar baz
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/deleting/delete-across-editable-content-boundaries-2-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/deleting/delete-across-editable-content-boundaries-2-expected.txt deleted file mode 100644 index 9919137..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/deleting/delete-across-editable-content-boundaries-2-expected.txt +++ /dev/null
@@ -1,7 +0,0 @@ -This is a testharness.js-based test. -FAIL This tests to see that selected non-editable nodes that are not in both the start and end editable root are preserved during a deletion. You should see "foo" and "qux" on both sides of the editable piece. <radr://problem/5026848> resources/testharness.js:2092:25) - expected <div contenteditable><table contenteditable="false"><tbody><tr><td>foo</td><td contenteditable>bar |</td><td>qux</td></tr></tbody></table>Editable <span>content</span></div>, - but got <div contenteditable><table contenteditable="false"><tbody><tr><td>foo</td><td contenteditable>bar |</td><td>qux</td></tr></tbody></table>Editable <span>content</span></div>, - sameupto <div contenteditable><table contenteditable="false"><tbody><tr><td>foo</td><td contenteditable>bar -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/deleting/delete_selection_contains_table_row-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/deleting/delete_selection_contains_table_row-expected.txt deleted file mode 100644 index a68cb4a..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/deleting/delete_selection_contains_table_row-expected.txt +++ /dev/null
@@ -1,9 +0,0 @@ -This is a testharness.js-based test. -PASS Empties the second row which should be removed -FAIL Empties the second row which should NOT be removed because contains the selection resources/testharness.js:2092:25) - expected <div contenteditable><table><tbody><tr><td>1</td><td>2</td><td>3</td></tr><tr><td>|<br></td><td></td><td><br></td></tr><tr><td>7</td><td>8</td><td>9</td></tr></tbody></table></div>, - but got <div contenteditable><table><tbody><tr><td>1</td><td>2</td><td>3</td></tr><tr><td>|<br></td><td></td><td></td></tr><tr><td>7</td><td>8</td><td>9</td></tr></tbody></table></div>, - sameupto <div contenteditable><table><tbody><tr><td>1</td><td>2</td><td>3</td></tr><tr><td>|<br></td><td></td><td>< -PASS Empties the first row which should be removed -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/deleting/delete_to_empty_row-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/deleting/delete_to_empty_row-expected.txt deleted file mode 100644 index 3e5e2ff..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/deleting/delete_to_empty_row-expected.txt +++ /dev/null
@@ -1,7 +0,0 @@ -This is a testharness.js-based test. -FAIL assertSelection(inputText, tester, expectedText, options) resources/testharness.js:2092:25) - expected <div contenteditable><table><tbody><tr><td>|<br></td><td></td><td><br></td></tr><tr><td>21</td><td>22</td><td>33</td></tr><tr><td><br></td><td><br></td><td><br></td></tr></tbody></table></div>, - but got <div contenteditable><table><tbody><tr><td>|<br></td><td></td><td></td></tr><tr><td>21</td><td>22</td><td>33</td></tr><tr><td><br></td><td><br></td><td><br></td></tr></tbody></table></div>, - sameupto <div contenteditable><table><tbody><tr><td>|<br></td><td></td><td>< -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/deleting/replace_text_in_node_preserving_markers_crash-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/deleting/replace_text_in_node_preserving_markers_crash-expected.txt deleted file mode 100644 index db36cfa..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/deleting/replace_text_in_node_preserving_markers_crash-expected.txt +++ /dev/null
@@ -1,19 +0,0 @@ -This is a testharness.js-based test. -FAIL assertSelection(inputText, tester, expectedText, options) resources/testharness.js:2092:25) - expected <div contenteditable style="width: 3px;">abcd ef| hijkl</div>, - but got <div contenteditable style="width: 3px;">abcd ef|hijkl</div>, - sameupto <div contenteditable style="width: 3px;">abcd ef| -FAIL assertSelection(inputText, tester, expectedText, options) 1 resources/testharness.js:2092:25) - expected <div contenteditable style="width: 3px;">abcd e| hijkl</div>, - but got <div contenteditable style="width: 3px;">abcd e|hijkl</div>, - sameupto <div contenteditable style="width: 3px;">abcd e| -FAIL assertSelection(inputText, tester, expectedText, options) 2 resources/testharness.js:2092:25) - expected <div contenteditable style="width: 3px;">abcd | hijkl</div>, - but got <div contenteditable style="width: 3px;">abcd |hijkl</div>, - sameupto <div contenteditable style="width: 3px;">abcd -FAIL assertSelection(inputText, tester, expectedText, options) 3 resources/testharness.js:2092:25) - expected <div contenteditable style="width: 3px;">abcd| hijkl</div>, - but got <div contenteditable style="width: 3px;">abcd|hijkl</div>, - sameupto <div contenteditable style="width: 3px;">abcd| -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/execCommand/findString-2-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/execCommand/findString-2-expected.png deleted file mode 100644 index 248db4f..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/execCommand/findString-2-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/input/linux_rtl_composition_underline-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/input/linux_rtl_composition_underline-expected.png deleted file mode 100644 index c471c97..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/input/linux_rtl_composition_underline-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/pasteboard/4947130-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/pasteboard/4947130-expected.png deleted file mode 100644 index ef0db17d..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/pasteboard/4947130-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/pasteboard/copy-standalone-image-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/pasteboard/copy-standalone-image-expected.txt deleted file mode 100644 index 9d18a82..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/pasteboard/copy-standalone-image-expected.txt +++ /dev/null
@@ -1,29 +0,0 @@ -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 - LayoutBlockFlow {P} at (0,0) size 784x20 - LayoutText {#text} at (0,0) size 354x19 - text run at (0,0) width 354: "This is an automatic test of copying an image document." - LayoutBlockFlow {P} at (0,36) size 784x40 - LayoutText {#text} at (0,0) size 757x39 - text run at (0,0) width 757: "To perform this test manually, click once in the image frame, choose Edit -> Copy then click in the red box and paste the" - text run at (0,20) width 355: "image. If the image pastes successfully the test is passed." - LayoutBlockFlow (anonymous) at (0,92) size 784x154 - LayoutText {#text} at (0,0) size 0x0 - LayoutBlockFlow {DIV} at (0,246) size 784x131 [border: (2px solid #FF0000)] - LayoutImage {IMG} at (14,14) size 76x103 - LayoutText {#text} at (0,0) size 0x0 -layer at (8,100) size 304x154 clip at (10,102) size 300x150 - LayoutIFrame {IFRAME} at (0,0) size 304x154 [border: (2px solid #0000FF)] - layer at (0,0) size 300x150 - LayoutView at (0,0) size 300x150 - layer at (0,0) size 300x150 - LayoutBlockFlow {HTML} at (0,0) size 300x150 - LayoutBlockFlow {BODY} at (0,0) size 300x150 - LayoutImage {IMG} at (0,0) size 76x103 -caret: position 1 of child 0 {IMG} of child 7 {DIV} of body
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/pasteboard/copy-standalone-oriented-image-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/pasteboard/copy-standalone-oriented-image-expected.txt deleted file mode 100644 index 20cdfffd..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/pasteboard/copy-standalone-oriented-image-expected.txt +++ /dev/null
@@ -1,29 +0,0 @@ -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 - LayoutBlockFlow {P} at (0,0) size 784x20 - LayoutText {#text} at (0,0) size 354x19 - text run at (0,0) width 354: "This is an automatic test of copying an image document." - LayoutBlockFlow {P} at (0,36) size 784x40 - LayoutText {#text} at (0,0) size 757x39 - text run at (0,0) width 757: "To perform this test manually, click once in the image frame, choose Edit -> Copy then click in the red box and paste the" - text run at (0,20) width 355: "image. If the image pastes successfully the test is passed." - LayoutBlockFlow (anonymous) at (0,92) size 784x154 - LayoutText {#text} at (0,0) size 0x0 - LayoutBlockFlow {DIV} at (0,246) size 784x128 [border: (2px solid #FF0000)] - LayoutImage {IMG} at (14,14) size 50x100 - LayoutText {#text} at (0,0) size 0x0 -layer at (8,100) size 304x154 clip at (10,102) size 300x150 - LayoutIFrame {IFRAME} at (0,0) size 304x154 [border: (2px solid #0000FF)] - layer at (0,0) size 300x150 - LayoutView at (0,0) size 300x150 - layer at (0,0) size 300x150 - LayoutBlockFlow {HTML} at (0,0) size 300x150 - LayoutBlockFlow {BODY} at (0,0) size 300x150 - LayoutImage {IMG} at (0,0) size 50x100 -caret: position 1 of child 0 {IMG} of child 7 {DIV} of body
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/selection/4402375-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/selection/4402375-expected.png deleted file mode 100644 index 30a7b54..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/selection/4402375-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/selection/4402375-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/selection/4402375-expected.txt deleted file mode 100644 index 25fb92f..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/selection/4402375-expected.txt +++ /dev/null
@@ -1,28 +0,0 @@ -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 - LayoutBlockFlow {P} at (0,0) size 784x40 - LayoutText {#text} at (0,0) size 131x19 - text run at (0,0) width 131: "This is a testcase for " - LayoutInline {A} at (131,0) size 149x19 [color=#0000EE] - LayoutText {#text} at (131,0) size 149x19 - text run at (131,0) width 149: "rdar://problem/4402375" - LayoutText {#text} at (0,0) size 761x39 - text run at (280,0) width 481: " \"REGRESSION (417.8-TOT): finding text sometimes also selects previous" - text run at (0,20) width 137: "image (5127) (6451)\"" - LayoutBlockFlow {P} at (0,74) size 784x40 - LayoutText {#text} at (0,0) size 743x39 - text run at (0,0) width 413: "This test uses a right aligned image next to some left aligned text. " - text run at (413,0) width 330: "The image should not be selected, and should not be" - text run at (0,20) width 598: "included in the selection rect (you won't see the selection rect when you run this test manually)." - LayoutBlockFlow {DIV} at (0,130) size 784x20 - LayoutImage (floating) {IMG} at (708,0) size 76x103 - LayoutText {#text} at (0,0) size 178x19 - text run at (0,0) width 178: "This text should be selected." -layer at (8,64) size 784x2 clip at (0,0) size 0x0 - LayoutBlockFlow {HR} at (0,56) size 784x2 [border: (1px inset #EEEEEE)] -selection start: position 0 of child 1 {#text} of child 6 {DIV} of body -selection end: position 29 of child 1 {#text} of child 6 {DIV} of body
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/selection/caret_at_soft_line_break-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/selection/caret_at_soft_line_break-expected.txt deleted file mode 100644 index 0974bc7..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/selection/caret_at_soft_line_break-expected.txt +++ /dev/null
@@ -1,7 +0,0 @@ -This is a testharness.js-based test. -FAIL assertSelection(inputText, tester, expectedText, options) resources/testharness.js:2092:25) - expected <div contenteditable style="width:250px;">Try to create a caret after this lin<span id="clickme">e|</span> <span></span>thisshouldbeonthesecondline</div>, - but got <div contenteditable style="width:250px;">Try to create a caret after this lin<span id="clickme">e</span> |<span></span>thisshouldbeonthesecondline</div>, - sameupto <div contenteditable style="width:250px;">Try to create a caret after this lin<span id="clickme">e -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/selection/display-table-text-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/selection/display-table-text-expected.png deleted file mode 100644 index cf169f6..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/selection/display-table-text-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/selection/display-table-text-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/selection/display-table-text-expected.txt deleted file mode 100644 index 05f84d99..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/selection/display-table-text-expected.txt +++ /dev/null
@@ -1,14 +0,0 @@ -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 - LayoutTable {DIV} at (0,0) size 348x20 - LayoutTableSection (anonymous) at (0,0) size 348x20 - LayoutTableRow (anonymous) at (0,0) size 348x20 - LayoutTableCell (anonymous) at (0,0) size 348x20 [r=0 c=0 rs=1 cs=1] - LayoutText {#text} at (0,0) size 348x19 - text run at (0,0) width 348: "Only the third word in this sentence should be selected." -selection start: position 9 of child 0 {#text} of child 1 {DIV} of body -selection end: position 14 of child 0 {#text} of child 1 {DIV} of body
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/selection/dont-select-text-overflow-ellipsis-when-wrapping-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/selection/dont-select-text-overflow-ellipsis-when-wrapping-expected.png deleted file mode 100644 index 4dcb65c..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/selection/dont-select-text-overflow-ellipsis-when-wrapping-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/selection/dont-select-text-overflow-ellipsis-when-wrapping-ltr-mixed-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/selection/dont-select-text-overflow-ellipsis-when-wrapping-ltr-mixed-expected.png deleted file mode 100644 index b674f96b..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/selection/dont-select-text-overflow-ellipsis-when-wrapping-ltr-mixed-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/selection/dont-select-text-overflow-ellipsis-when-wrapping-rtl-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/selection/dont-select-text-overflow-ellipsis-when-wrapping-rtl-expected.png deleted file mode 100644 index 508ce26..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/selection/dont-select-text-overflow-ellipsis-when-wrapping-rtl-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/selection/dont-select-text-overflow-ellipsis-when-wrapping-rtl-mixed-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/selection/dont-select-text-overflow-ellipsis-when-wrapping-rtl-mixed-expected.png deleted file mode 100644 index b0497dd2..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/selection/dont-select-text-overflow-ellipsis-when-wrapping-rtl-mixed-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/selection/drag-to-contenteditable-iframe-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/selection/drag-to-contenteditable-iframe-expected.txt deleted file mode 100644 index 5cb446d..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/selection/drag-to-contenteditable-iframe-expected.txt +++ /dev/null
@@ -1,27 +0,0 @@ -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (0,0) size 800x584 - LayoutBlockFlow (anonymous) at (0,0) size 800x213 - LayoutText {#text} at (208,193) size 4x19 - text run at (208,193) width 4: " " - LayoutImage {IMG} at (212,105) size 76x103 - LayoutText {#text} at (0,0) size 0x0 - LayoutBlockFlow {UL} at (0,229) size 800x20 - LayoutListItem {LI} at (40,0) size 760x20 - LayoutListMarker {::marker} at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 288x19 - text run at (0,0) width 288: "Abe should be outside the frame and inside it." -layer at (0,0) size 208x208 clip at (4,4) size 200x200 - LayoutIFrame {IFRAME} at (0,0) size 208x208 [border: (4px solid #000000)] - layer at (0,0) size 200x200 - LayoutView at (0,0) size 200x200 - layer at (0,0) size 200x200 - LayoutBlockFlow {HTML} at (0,0) size 200x200 - LayoutBlockFlow {BODY} at (8,8) size 184x184 [bgcolor=#FFFFE0] - LayoutImage {IMG} at (0,0) size 76x103 - LayoutText {#text} at (0,0) size 0x0
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/selection/extend/extend_selection_17_ltr_forward_lineboundary-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/selection/extend/extend_selection_17_ltr_forward_lineboundary-expected.txt deleted file mode 100644 index cb23379..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/selection/extend/extend_selection_17_ltr_forward_lineboundary-expected.txt +++ /dev/null
@@ -1,59 +0,0 @@ -This is a testharness.js-based test. -FAIL 17-0 ltr forward lineboundary resources/testharness.js:2092:25) - expected <div contenteditable dir="ltr">^car| דהו אבג.</div>, - but got <div contenteditable dir="ltr">^car דהו אבג.|</div>, - sameupto <div contenteditable dir="ltr">^car -FAIL 17-1 ltr forward lineboundary resources/testharness.js:2092:25) - expected <div contenteditable dir="ltr">^car| דהו אבג.</div>, - but got <div contenteditable dir="ltr">^car דהו אבג.|</div>, - sameupto <div contenteditable dir="ltr">^car -FAIL 17-2 ltr forward lineboundary resources/testharness.js:2092:25) - expected <div contenteditable dir="ltr">c^ar| דהו אבג.</div>, - but got <div contenteditable dir="ltr">c^ar דהו אבג.|</div>, - sameupto <div contenteditable dir="ltr">c^ar -FAIL 17-3 ltr forward lineboundary resources/testharness.js:2092:25) - expected <div contenteditable dir="ltr">ca^r| דהו אבג.</div>, - but got <div contenteditable dir="ltr">ca^r דהו אבג.|</div>, - sameupto <div contenteditable dir="ltr">ca^r -FAIL 17-4 ltr forward lineboundary resources/testharness.js:2092:25) - expected <div contenteditable dir="ltr">car| דהו אבג.</div>, - but got <div contenteditable dir="ltr">car^ דהו אבג.|</div>, - sameupto <div contenteditable dir="ltr">car -FAIL 17-5 ltr forward lineboundary resources/testharness.js:2092:25) - expected <div contenteditable dir="ltr">car| ^דהו אבג.</div>, - but got <div contenteditable dir="ltr">car ^דהו אבג.|</div>, - sameupto <div contenteditable dir="ltr">car -FAIL 17-6 ltr forward lineboundary resources/testharness.js:2092:25) - expected <div contenteditable dir="ltr">car| ד^הו אבג.</div>, - but got <div contenteditable dir="ltr">car ד^הו אבג.|</div>, - sameupto <div contenteditable dir="ltr">car -FAIL 17-7 ltr forward lineboundary resources/testharness.js:2092:25) - expected <div contenteditable dir="ltr">car| דה^ו אבג.</div>, - but got <div contenteditable dir="ltr">car דה^ו אבג.|</div>, - sameupto <div contenteditable dir="ltr">car -FAIL 17-8 ltr forward lineboundary resources/testharness.js:2092:25) - expected <div contenteditable dir="ltr">car| דהו^ אבג.</div>, - but got <div contenteditable dir="ltr">car דהו^ אבג.|</div>, - sameupto <div contenteditable dir="ltr">car -FAIL 17-9 ltr forward lineboundary resources/testharness.js:2092:25) - expected <div contenteditable dir="ltr">car| דהו ^אבג.</div>, - but got <div contenteditable dir="ltr">car דהו ^אבג.|</div>, - sameupto <div contenteditable dir="ltr">car -FAIL 17-10 ltr forward lineboundary resources/testharness.js:2092:25) - expected <div contenteditable dir="ltr">car| דהו א^בג.</div>, - but got <div contenteditable dir="ltr">car דהו א^בג.|</div>, - sameupto <div contenteditable dir="ltr">car -FAIL 17-11 ltr forward lineboundary resources/testharness.js:2092:25) - expected <div contenteditable dir="ltr">car| דהו אב^ג.</div>, - but got <div contenteditable dir="ltr">car דהו אב^ג.|</div>, - sameupto <div contenteditable dir="ltr">car -FAIL 17-12 ltr forward lineboundary resources/testharness.js:2092:25) - expected <div contenteditable dir="ltr">car| דהו אבג^.</div>, - but got <div contenteditable dir="ltr">car דהו אבג^.|</div>, - sameupto <div contenteditable dir="ltr">car -FAIL 17-13 ltr forward lineboundary resources/testharness.js:2092:25) - expected <div contenteditable dir="ltr">car| דהו אבג.^</div>, - but got <div contenteditable dir="ltr">car דהו אבג.^|</div>, - sameupto <div contenteditable dir="ltr">car -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/selection/extend/extend_selection_17_ltr_right_lineboundary-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/selection/extend/extend_selection_17_ltr_right_lineboundary-expected.txt deleted file mode 100644 index bcc6c04..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/selection/extend/extend_selection_17_ltr_right_lineboundary-expected.txt +++ /dev/null
@@ -1,59 +0,0 @@ -This is a testharness.js-based test. -FAIL 17-0 ltr right lineboundary resources/testharness.js:2092:25) - expected <div contenteditable dir="ltr">^car| דהו אבג.</div>, - but got <div contenteditable dir="ltr">^car דהו אבג.|</div>, - sameupto <div contenteditable dir="ltr">^car -FAIL 17-1 ltr right lineboundary resources/testharness.js:2092:25) - expected <div contenteditable dir="ltr">^car| דהו אבג.</div>, - but got <div contenteditable dir="ltr">^car דהו אבג.|</div>, - sameupto <div contenteditable dir="ltr">^car -FAIL 17-2 ltr right lineboundary resources/testharness.js:2092:25) - expected <div contenteditable dir="ltr">c^ar| דהו אבג.</div>, - but got <div contenteditable dir="ltr">c^ar דהו אבג.|</div>, - sameupto <div contenteditable dir="ltr">c^ar -FAIL 17-3 ltr right lineboundary resources/testharness.js:2092:25) - expected <div contenteditable dir="ltr">ca^r| דהו אבג.</div>, - but got <div contenteditable dir="ltr">ca^r דהו אבג.|</div>, - sameupto <div contenteditable dir="ltr">ca^r -FAIL 17-4 ltr right lineboundary resources/testharness.js:2092:25) - expected <div contenteditable dir="ltr">car| דהו אבג.</div>, - but got <div contenteditable dir="ltr">car^ דהו אבג.|</div>, - sameupto <div contenteditable dir="ltr">car -FAIL 17-5 ltr right lineboundary resources/testharness.js:2092:25) - expected <div contenteditable dir="ltr">car| ^דהו אבג.</div>, - but got <div contenteditable dir="ltr">car ^דהו אבג.|</div>, - sameupto <div contenteditable dir="ltr">car -FAIL 17-6 ltr right lineboundary resources/testharness.js:2092:25) - expected <div contenteditable dir="ltr">car| ד^הו אבג.</div>, - but got <div contenteditable dir="ltr">car ד^הו אבג.|</div>, - sameupto <div contenteditable dir="ltr">car -FAIL 17-7 ltr right lineboundary resources/testharness.js:2092:25) - expected <div contenteditable dir="ltr">car| דה^ו אבג.</div>, - but got <div contenteditable dir="ltr">car דה^ו אבג.|</div>, - sameupto <div contenteditable dir="ltr">car -FAIL 17-8 ltr right lineboundary resources/testharness.js:2092:25) - expected <div contenteditable dir="ltr">car| דהו^ אבג.</div>, - but got <div contenteditable dir="ltr">car דהו^ אבג.|</div>, - sameupto <div contenteditable dir="ltr">car -FAIL 17-9 ltr right lineboundary resources/testharness.js:2092:25) - expected <div contenteditable dir="ltr">car| דהו ^אבג.</div>, - but got <div contenteditable dir="ltr">car דהו ^אבג.|</div>, - sameupto <div contenteditable dir="ltr">car -FAIL 17-10 ltr right lineboundary resources/testharness.js:2092:25) - expected <div contenteditable dir="ltr">car| דהו א^בג.</div>, - but got <div contenteditable dir="ltr">car דהו א^בג.|</div>, - sameupto <div contenteditable dir="ltr">car -FAIL 17-11 ltr right lineboundary resources/testharness.js:2092:25) - expected <div contenteditable dir="ltr">car| דהו אב^ג.</div>, - but got <div contenteditable dir="ltr">car דהו אב^ג.|</div>, - sameupto <div contenteditable dir="ltr">car -FAIL 17-12 ltr right lineboundary resources/testharness.js:2092:25) - expected <div contenteditable dir="ltr">car| דהו אבג^.</div>, - but got <div contenteditable dir="ltr">car דהו אבג^.|</div>, - sameupto <div contenteditable dir="ltr">car -FAIL 17-13 ltr right lineboundary resources/testharness.js:2092:25) - expected <div contenteditable dir="ltr">car| דהו אבג.^</div>, - but got <div contenteditable dir="ltr">car דהו אבג.^|</div>, - sameupto <div contenteditable dir="ltr">car -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/selection/home-end-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/selection/home-end-expected.txt deleted file mode 100644 index 652fc06d..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/selection/home-end-expected.txt +++ /dev/null
@@ -1,177 +0,0 @@ -This is a testharness.js-based test. -PASS 1-LTR forward -PASS 1-LTR backward -PASS 1-LTR right -PASS 1-LTR left -PASS 1-RTL forward -PASS 1-RTL backward -PASS 1-RTL right -PASS 1-RTL left -PASS 2-LTR forward -PASS 2-LTR backward -PASS 2-LTR right -PASS 2-LTR left -PASS 2-RTL forward -PASS 2-RTL backward -PASS 2-RTL right -PASS 2-RTL left -PASS 3-LTR forward -PASS 3-LTR backward -PASS 3-LTR right -PASS 3-LTR left -PASS 3-RTL forward -PASS 3-RTL backward -PASS 3-RTL right -PASS 3-RTL left -PASS 4-LTR forward -PASS 4-LTR backward -PASS 4-LTR right -PASS 4-LTR left -PASS 4-RTL forward -PASS 4-RTL backward -PASS 4-RTL right -PASS 4-RTL left -PASS 5-LTR forward -PASS 5-LTR backward -PASS 5-LTR right -PASS 5-LTR left -PASS 5-RTL forward -PASS 5-RTL backward -PASS 5-RTL right -PASS 5-RTL left -PASS 6-LTR forward -PASS 6-LTR backward -PASS 6-LTR right -PASS 6-LTR left -PASS 6-RTL forward -PASS 6-RTL backward -PASS 6-RTL right -PASS 6-RTL left -PASS 7-LTR forward -PASS 7-LTR backward -PASS 7-LTR right -PASS 7-LTR left -PASS 7-RTL forward -PASS 7-RTL backward -PASS 7-RTL right -PASS 7-RTL left -PASS 8-LTR forward -PASS 8-LTR backward -PASS 8-LTR right -PASS 8-LTR left -PASS 8-RTL forward -PASS 8-RTL backward -PASS 8-RTL right -PASS 8-RTL left -PASS 9-LTR forward -PASS 9-LTR backward -PASS 9-LTR right -PASS 9-LTR left -PASS 9-RTL forward -PASS 9-RTL backward -PASS 9-RTL right -PASS 9-RTL left -PASS 10-LTR forward -PASS 10-LTR backward -PASS 10-LTR right -PASS 10-LTR left -PASS 10-RTL forward -PASS 10-RTL backward -PASS 10-RTL right -PASS 10-RTL left -PASS 11-LTR forward -PASS 11-LTR backward -PASS 11-LTR right -PASS 11-LTR left -PASS 11-RTL forward -PASS 11-RTL backward -PASS 11-RTL right -PASS 11-RTL left -PASS 12-LTR forward -PASS 12-LTR backward -PASS 12-LTR right -PASS 12-LTR left -PASS 12-RTL forward -PASS 12-RTL backward -PASS 12-RTL right -PASS 12-RTL left -PASS 13-LTR forward -PASS 13-LTR backward -PASS 13-LTR right -PASS 13-LTR left -PASS 13-RTL forward -PASS 13-RTL backward -PASS 13-RTL right -PASS 13-RTL left -PASS 14-LTR forward -PASS 14-LTR backward -PASS 14-LTR right -PASS 14-LTR left -PASS 14-RTL forward -PASS 14-RTL backward -PASS 14-RTL right -PASS 14-RTL left -PASS 15-LTR forward -PASS 15-LTR backward -PASS 15-LTR right -PASS 15-LTR left -PASS 15-RTL forward -PASS 15-RTL backward -PASS 15-RTL right -PASS 15-RTL left -FAIL 16-LTR forward resources/testharness.js:2092:25) - expected <div contenteditable style="direction:ltr">xyz| דהו אבג.</div>, - but got <div contenteditable style="direction:ltr">xyz דהו אבג.|</div>, - sameupto <div contenteditable style="direction:ltr">xyz -PASS 16-LTR backward -FAIL 16-LTR right resources/testharness.js:2092:25) - expected <div contenteditable style="direction:ltr">xyz| דהו אבג.</div>, - but got <div contenteditable style="direction:ltr">xyz דהו אבג.|</div>, - sameupto <div contenteditable style="direction:ltr">xyz -PASS 16-LTR left -PASS 16-RTL forward -PASS 16-RTL backward -PASS 16-RTL right -PASS 16-RTL left -PASS 17-LTR forward -PASS 17-LTR backward -PASS 17-LTR right -PASS 17-LTR left -PASS 17-RTL forward -PASS 17-RTL backward -PASS 17-RTL right -PASS 17-RTL left -PASS 18-LTR forward -PASS 18-LTR backward -PASS 18-LTR right -PASS 18-LTR left -PASS 18-RTL forward -PASS 18-RTL backward -PASS 18-RTL right -PASS 18-RTL left -PASS 19-LTR forward -PASS 19-LTR backward -PASS 19-LTR right -PASS 19-LTR left -PASS 19-RTL forward -PASS 19-RTL backward -PASS 19-RTL right -PASS 19-RTL left -PASS 20-LTR forward -PASS 20-LTR backward -PASS 20-LTR right -PASS 20-LTR left -PASS 20-RTL forward -PASS 20-RTL backward -PASS 20-RTL right -PASS 20-RTL left -PASS 21-LTR forward -PASS 21-LTR backward -PASS 21-LTR right -PASS 21-LTR left -PASS 21-RTL forward -PASS 21-RTL backward -PASS 21-RTL right -PASS 21-RTL left -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/selection/inline-closest-leaf-child-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/selection/inline-closest-leaf-child-expected.png deleted file mode 100644 index 88c5cc6..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/selection/inline-closest-leaf-child-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/selection/japanese-lr-selection-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/selection/japanese-lr-selection-expected.png deleted file mode 100644 index b68f06f..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/selection/japanese-lr-selection-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/selection/japanese-rl-selection-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/selection/japanese-rl-selection-expected.png deleted file mode 100644 index 1178196..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/selection/japanese-rl-selection-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/selection/line-wrap-1-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/selection/line-wrap-1-expected.png deleted file mode 100644 index 623eacf..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/selection/line-wrap-1-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/selection/line-wrap-2-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/selection/line-wrap-2-expected.png deleted file mode 100644 index 2755493..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/selection/line-wrap-2-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/selection/modify-up-on-rtl-wrapping-text-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/selection/modify-up-on-rtl-wrapping-text-expected.txt deleted file mode 100644 index 9d5101a..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/selection/modify-up-on-rtl-wrapping-text-expected.txt +++ /dev/null
@@ -1,19 +0,0 @@ -This is a testharness.js-based test. -FAIL 2 lines resources/testharness.js:2092:25) - expected <div contenteditable dir="rtl" style="font-family: monospace; width: 2ch"><bdo dir="rtl">A| BC</bdo></div>, - but got <div contenteditable dir="rtl" style="font-family: monospace; width: 2ch"><bdo dir="rtl">A |BC</bdo></div>, - sameupto <div contenteditable dir="rtl" style="font-family: monospace; width: 2ch"><bdo dir="rtl">A -FAIL 3 lines-1 resources/testharness.js:2092:25) - expected <div contenteditable dir="rtl" style="font-family: monospace; width: 2ch"><bdo dir="rtl">A BC| DE</bdo></div>, - but got <div contenteditable dir="rtl" style="font-family: monospace; width: 2ch"><bdo dir="rtl">A BC |DE</bdo></div>, - sameupto <div contenteditable dir="rtl" style="font-family: monospace; width: 2ch"><bdo dir="rtl">A BC -PASS 3 lines-2 -FAIL 5 lines-1 resources/testharness.js:2092:25) - expected <div contenteditable dir="rtl" style="font-family: monospace; width: 2ch"><bdo dir="rtl">A BC DE FG| HI</bdo></div>, - but got <div contenteditable dir="rtl" style="font-family: monospace; width: 2ch"><bdo dir="rtl">A BC DE FG |HI</bdo></div>, - sameupto <div contenteditable dir="rtl" style="font-family: monospace; width: 2ch"><bdo dir="rtl">A BC DE FG -PASS 5 lines-2 -PASS 5 lines-3 -PASS 5 lines-4 -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/selection/range-between-block-and-inline-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/selection/range-between-block-and-inline-expected.png deleted file mode 100644 index 1e308cd..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/selection/range-between-block-and-inline-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/selection/select-missing-image-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/selection/select-missing-image-expected.png deleted file mode 100644 index 3f3ebcc..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/selection/select-missing-image-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/selection/select-missing-image-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/selection/select-missing-image-expected.txt deleted file mode 100644 index fff577e0..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/selection/select-missing-image-expected.txt +++ /dev/null
@@ -1,19 +0,0 @@ -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x584 - LayoutBlockFlow {DIV} at (0,0) size 784x128 [border: (2px solid #FF0000)] - LayoutText {#text} at (0,0) size 0x0 -layer at (22,22) size 550x100 - LayoutBlockFlow {IMG} at (14,14) size 550x100 -layer at (22,22) size 550x100 clip at (23,23) size 548x98 - LayoutBlockFlow {SPAN} at (0,0) size 550x100 [border: (1px solid #C0C0C0)] - LayoutImage (floating) {IMG} at (2,2) size 16x16 - LayoutInline {SPAN} at (18,2) size 480x27 - LayoutText {#text} at (18,2) size 480x27 - text run at (18,2) width 480: "Should see selection tint over this missing image." -selection start: position 0 of child 1 {IMG} of child 1 {DIV} of body -selection end: position 1 of child 1 {IMG} of child 1 {DIV} of body
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/selection/select-text-overflow-ellipsis-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/selection/select-text-overflow-ellipsis-expected.png deleted file mode 100644 index af362f4e..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/selection/select-text-overflow-ellipsis-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/selection/select-text-overflow-ellipsis-mixed-in-ltr-2-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/selection/select-text-overflow-ellipsis-mixed-in-ltr-2-expected.png deleted file mode 100644 index 5352f45..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/selection/select-text-overflow-ellipsis-mixed-in-ltr-2-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/selection/select-text-overflow-ellipsis-mixed-in-ltr-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/selection/select-text-overflow-ellipsis-mixed-in-ltr-expected.png deleted file mode 100644 index 1a318da..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/selection/select-text-overflow-ellipsis-mixed-in-ltr-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/selection/select-text-overflow-ellipsis-mixed-in-rtl-2-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/selection/select-text-overflow-ellipsis-mixed-in-rtl-2-expected.png deleted file mode 100644 index 9b4c0d0..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/selection/select-text-overflow-ellipsis-mixed-in-rtl-2-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/selection/select-text-overflow-ellipsis-mixed-in-rtl-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/selection/select-text-overflow-ellipsis-mixed-in-rtl-expected.png deleted file mode 100644 index 2d1f1f38..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/selection/select-text-overflow-ellipsis-mixed-in-rtl-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/selection/selectNode-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/selection/selectNode-expected.txt deleted file mode 100644 index b2b672d..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/selection/selectNode-expected.txt +++ /dev/null
@@ -1,25 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x576 - LayoutBlockFlow {P} at (0,0) size 784x20 - LayoutText {#text} at (0,0) size 336x19 - text run at (0,0) width 336: "This tests Range.selectNode() of a text node and a br." - LayoutBlockFlow {DIV} at (0,36) size 784x20 - LayoutText {#text} at (0,0) size 23x19 - text run at (0,0) width 23: "one" - LayoutBlockFlow {DIV} at (0,56) size 784x40 - LayoutText {#text} at (0,0) size 24x19 - text run at (0,0) width 24: "two" - LayoutBR {BR} at (24,15) size 0x0 - LayoutText {#text} at (0,20) size 31x19 - text run at (0,20) width 31: "three" - LayoutBlockFlow {DIV} at (0,96) size 784x20 - LayoutText {#text} at (0,0) size 26x19 - text run at (0,0) width 26: "four" - LayoutBlockFlow {UL} at (0,132) size 784x20 - LayoutListItem {LI} at (40,0) size 744x20 - LayoutListMarker {::marker} at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 54x19 - text run at (0,0) width 54: "Success."
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/selection/selectNodeContents-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/selection/selectNodeContents-expected.txt deleted file mode 100644 index 792b73f6..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/selection/selectNodeContents-expected.txt +++ /dev/null
@@ -1,25 +0,0 @@ -layer at (0,0) size 800x600 - LayoutView at (0,0) size 800x600 -layer at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x600 - LayoutBlockFlow {BODY} at (8,8) size 784x576 - LayoutBlockFlow {P} at (0,0) size 784x20 - LayoutText {#text} at (0,0) size 392x19 - text run at (0,0) width 392: "This tests Range.selectNodeContents() of a text node and a br." - LayoutBlockFlow {DIV} at (0,36) size 784x20 - LayoutText {#text} at (0,0) size 23x19 - text run at (0,0) width 23: "one" - LayoutBlockFlow {DIV} at (0,56) size 784x40 - LayoutText {#text} at (0,0) size 24x19 - text run at (0,0) width 24: "two" - LayoutBR {BR} at (24,15) size 0x0 - LayoutText {#text} at (0,20) size 31x19 - text run at (0,20) width 31: "three" - LayoutBlockFlow {DIV} at (0,96) size 784x20 - LayoutText {#text} at (0,0) size 26x19 - text run at (0,0) width 26: "four" - LayoutBlockFlow {UL} at (0,132) size 784x20 - LayoutListItem {LI} at (40,0) size 744x20 - LayoutListMarker {::marker} at (-18,0) size 7x19: bullet - LayoutText {#text} at (0,0) size 54x19 - text run at (0,0) width 54: "Success."
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/selection/selection-background-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/selection/selection-background-expected.png deleted file mode 100644 index af7f74a..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/selection/selection-background-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/selection/selection-button-text-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/selection/selection-button-text-expected.png deleted file mode 100644 index 2e1f68ba..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/selection/selection-button-text-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/selection/selection-linebreaks-rtl-writing-modes-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/selection/selection-linebreaks-rtl-writing-modes-expected.png deleted file mode 100644 index 953a7c552..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/selection/selection-linebreaks-rtl-writing-modes-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/selection/transformed-selection-rects-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/selection/transformed-selection-rects-expected.png deleted file mode 100644 index f451d826..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/selection/transformed-selection-rects-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/selection/vertical-lr-replaced-selection-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/selection/vertical-lr-replaced-selection-expected.png deleted file mode 100644 index b78d440..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/selection/vertical-lr-replaced-selection-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/selection/vertical-rl-replaced-selection-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/selection/vertical-rl-replaced-selection-expected.png deleted file mode 100644 index d1b1ab5..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/editing/selection/vertical-rl-replaced-selection-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/appmanifest/display-member/display-member-media-feature-browser-manual-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/appmanifest/display-member/display-member-media-feature-browser-manual-expected.png deleted file mode 100644 index f6aa851..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/appmanifest/display-member/display-member-media-feature-browser-manual-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/appmanifest/display-member/display-member-media-feature-fullscreen-manual-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/appmanifest/display-member/display-member-media-feature-fullscreen-manual-expected.png deleted file mode 100644 index 3c25335..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/appmanifest/display-member/display-member-media-feature-fullscreen-manual-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/appmanifest/display-member/display-member-media-feature-manual-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/appmanifest/display-member/display-member-media-feature-manual-expected.png deleted file mode 100644 index 2a26ffdf..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/appmanifest/display-member/display-member-media-feature-manual-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/appmanifest/display-member/display-member-media-feature-minimal-ui-manual-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/appmanifest/display-member/display-member-media-feature-minimal-ui-manual-expected.png deleted file mode 100644 index ce93a4d..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/appmanifest/display-member/display-member-media-feature-minimal-ui-manual-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/appmanifest/display-member/display-member-media-feature-standalone-manual-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/appmanifest/display-member/display-member-media-feature-standalone-manual-expected.png deleted file mode 100644 index 867035d..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/appmanifest/display-member/display-member-media-feature-standalone-manual-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/appmanifest/icons-member/icons-member-last-matching-manual-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/appmanifest/icons-member/icons-member-last-matching-manual-expected.png deleted file mode 100644 index 4c08aadf..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/appmanifest/icons-member/icons-member-last-matching-manual-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/appmanifest/icons-member/icons-member-manual-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/appmanifest/icons-member/icons-member-manual-expected.png deleted file mode 100644 index b83fdaa..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/appmanifest/icons-member/icons-member-manual-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/appmanifest/icons-member/icons-member-next-appropriate-manual-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/appmanifest/icons-member/icons-member-next-appropriate-manual-expected.png deleted file mode 100644 index 4c08aadf..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/appmanifest/icons-member/icons-member-next-appropriate-manual-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/appmanifest/name-member/name-member-manual-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/appmanifest/name-member/name-member-manual-expected.png deleted file mode 100644 index 63e59b66..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/appmanifest/name-member/name-member-manual-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/appmanifest/orientation-member/orientation-member-landscape-manual-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/appmanifest/orientation-member/orientation-member-landscape-manual-expected.png deleted file mode 100644 index 2557525..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/appmanifest/orientation-member/orientation-member-landscape-manual-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/appmanifest/orientation-member/orientation-member-portrait-manual-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/appmanifest/orientation-member/orientation-member-portrait-manual-expected.png deleted file mode 100644 index 8b8cd08..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/appmanifest/orientation-member/orientation-member-portrait-manual-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/appmanifest/short_name-member/short_name-member-manual-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/appmanifest/short_name-member/short_name-member-manual-expected.png deleted file mode 100644 index dd771af..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/appmanifest/short_name-member/short_name-member-manual-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/appmanifest/shortcuts-member/shortcuts-member-manual-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/appmanifest/shortcuts-member/shortcuts-member-manual-expected.png deleted file mode 100644 index 006a750..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/appmanifest/shortcuts-member/shortcuts-member-manual-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/appmanifest/shortcuts-member/shortcuts-member-skip-for-invalid-url-manual-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/appmanifest/shortcuts-member/shortcuts-member-skip-for-invalid-url-manual-expected.png deleted file mode 100644 index a1cc9ca7..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/appmanifest/shortcuts-member/shortcuts-member-skip-for-invalid-url-manual-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/appmanifest/shortcuts-member/shortcuts-member-skip-for-out-of-scope-url-manual-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/appmanifest/shortcuts-member/shortcuts-member-skip-for-out-of-scope-url-manual-expected.png deleted file mode 100644 index feaa077..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/appmanifest/shortcuts-member/shortcuts-member-skip-for-out-of-scope-url-manual-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/appmanifest/shortcuts-member/shortcuts-member-skip-for-undefined-url-manual-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/appmanifest/shortcuts-member/shortcuts-member-skip-for-undefined-url-manual-expected.png deleted file mode 100644 index 245a632..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/appmanifest/shortcuts-member/shortcuts-member-skip-for-undefined-url-manual-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/appmanifest/unrecognized-member/unrecognized-member-manual-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/appmanifest/unrecognized-member/unrecognized-member-manual-expected.png deleted file mode 100644 index 9ca4e246..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/appmanifest/unrecognized-member/unrecognized-member-manual-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/CSS2/floats-clear/no-clearance-adjoining-opposite-float-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/CSS2/floats-clear/no-clearance-adjoining-opposite-float-expected.png deleted file mode 100644 index 5269d946..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/CSS2/floats-clear/no-clearance-adjoining-opposite-float-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/CSS2/floats-clear/no-clearance-due-to-large-margin-after-left-right-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/CSS2/floats-clear/no-clearance-due-to-large-margin-after-left-right-expected.png deleted file mode 100644 index 62750f9..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/CSS2/floats-clear/no-clearance-due-to-large-margin-after-left-right-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/CSS2/floats/float-nowrap-3-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/CSS2/floats/float-nowrap-3-expected.png deleted file mode 100644 index ac55025..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/CSS2/floats/float-nowrap-3-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/CSS2/floats/floats-line-wrap-shifted-001-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/CSS2/floats/floats-line-wrap-shifted-001-expected.png deleted file mode 100644 index fe67e21..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/CSS2/floats/floats-line-wrap-shifted-001-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/CSS2/floats/overhanging-float-paint-order-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/CSS2/floats/overhanging-float-paint-order-expected.png deleted file mode 100644 index 5fd2e2b..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/CSS2/floats/overhanging-float-paint-order-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/CSS2/linebox/anonymous-inline-inherit-001-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/CSS2/linebox/anonymous-inline-inherit-001-expected.png deleted file mode 100644 index df3c1b5d..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/CSS2/linebox/anonymous-inline-inherit-001-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/CSS2/linebox/inline-negative-margin-001-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/CSS2/linebox/inline-negative-margin-001-expected.txt deleted file mode 100644 index 36a5496..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/CSS2/linebox/inline-negative-margin-001-expected.txt +++ /dev/null
@@ -1,22 +0,0 @@ -This is a testharness.js-based test. -PASS [data-expected-height] 1 -FAIL [data-expected-height] 2 assert_equals: -<inline-block data-expected-height="10">123 <span style="margin-left: -8ch">123 </span></inline-block> -height expected 10 but got 20 -PASS [data-expected-height] 3 -PASS [data-expected-height] 4 -PASS [data-expected-height] 5 -FAIL [data-expected-height] 6 assert_equals: -<div class="w4" data-expected-height="10"><img class="w5"><span style="margin-left: -5ch">123</span></div> -height expected 10 but got 20 -PASS [data-expected-height] 7 -PASS [data-expected-height] 8 -PASS [data-expected-height] 9 -FAIL [data-expected-height] 10 assert_equals: -<div class="w4" data-expected-height="10"><img class="w5"><img class="w1" style="margin-left: -2ch"></div> -height expected 10 but got 20 -PASS [data-expected-height] 11 -PASS [data-expected-height] 12 -PASS [data-expected-height] 13 -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/CSS2/normal-flow/block-in-inline-empty-001-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/CSS2/normal-flow/block-in-inline-empty-001-expected.png deleted file mode 100644 index c70cd3d..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/CSS2/normal-flow/block-in-inline-empty-001-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/CSS2/normal-flow/block-in-inline-empty-004-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/CSS2/normal-flow/block-in-inline-empty-004-expected.png deleted file mode 100644 index e24e9ccb..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/CSS2/normal-flow/block-in-inline-empty-004-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/CSS2/normal-flow/block-in-inline-insert-001e-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/CSS2/normal-flow/block-in-inline-insert-001e-expected.png deleted file mode 100644 index 6be377de..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/CSS2/normal-flow/block-in-inline-insert-001e-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/CSS2/normal-flow/block-in-inline-insert-001h-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/CSS2/normal-flow/block-in-inline-insert-001h-expected.png deleted file mode 100644 index 3aabcbc..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/CSS2/normal-flow/block-in-inline-insert-001h-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/CSS2/normal-flow/block-in-inline-insert-002e-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/CSS2/normal-flow/block-in-inline-insert-002e-expected.png deleted file mode 100644 index 93407ad..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/CSS2/normal-flow/block-in-inline-insert-002e-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/CSS2/normal-flow/block-in-inline-nested-002-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/CSS2/normal-flow/block-in-inline-nested-002-expected.png deleted file mode 100644 index b8cd592..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/CSS2/normal-flow/block-in-inline-nested-002-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/CSS2/normal-flow/block-in-inline-remove-006-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/CSS2/normal-flow/block-in-inline-remove-006-expected.png deleted file mode 100644 index a9ed8b77..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/CSS2/normal-flow/block-in-inline-remove-006-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/CSS2/normal-flow/max-height-separates-margin-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/CSS2/normal-flow/max-height-separates-margin-expected.png deleted file mode 100644 index 89f5e2e8..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/CSS2/normal-flow/max-height-separates-margin-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/CSS2/normal-flow/min-height-separates-margin-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/CSS2/normal-flow/min-height-separates-margin-expected.png deleted file mode 100644 index e3fc6b59..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/CSS2/normal-flow/min-height-separates-margin-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/CSS2/text/white-space-mixed-003-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/CSS2/text/white-space-mixed-003-expected.png deleted file mode 100644 index 58f3e37..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/CSS2/text/white-space-mixed-003-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-break/hit-test-inline-fragmentation-with-border-radius-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-break/hit-test-inline-fragmentation-with-border-radius-expected.txt deleted file mode 100644 index 88899d5..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-break/hit-test-inline-fragmentation-with-border-radius-expected.txt +++ /dev/null
@@ -1,52 +0,0 @@ -This is a testharness.js-based test. -PASS Horizontal line 1, hit test outside top-left rounded corner -PASS Horizontal line 1, hit test inside top-left rounded corner -PASS Horizontal line 1, hit test outside bottom-left rounded corner -PASS Horizontal line 1, hit test inside bottom-left rounded corner -PASS Horizontal line 1, hit test inside top-right right-angled corner -PASS Horizontal line 1, hit test inside bottom-right right-angled corner -PASS Horizontal line 2, hit test outside top-right rounded corner -PASS Horizontal line 2, hit test inside top-right rounded corner -PASS Horizontal line 2, hit test outside bottom-right rounded corner -PASS Horizontal line 2, hit test inside bottom-right rounded corner -PASS Horizontal line 2, hit test inside top-left right-angled corner -PASS Horizontal line 2, hit test inside bottom-left right-angled corner -PASS Vertical LR line 1, hit test outside top-left rounded corner -PASS Vertical LR line 1, hit test inside top-left rounded corner -PASS Vertical LR line 1, hit test outside top-right rounded corner -PASS Vertical LR line 1, hit test inside top-right rounded corner -FAIL Vertical LR line 1, hit test inside bottom-left right-angled corner assert_equals: expected Element node <span id="vertical-lr" class="round">FOO<br>BAR</span> but got Element node <div style="writing-mode:vertical-lr"> -<span id="vertical... -FAIL Vertical LR line 1, hit test inside bottom-right right-angled corner assert_equals: expected Element node <span id="vertical-lr" class="round">FOO<br>BAR</span> but got Element node <div style="writing-mode:vertical-lr"> -<span id="vertical... -PASS Vertical LR line 2, hit test outside bottom-left rounded corner -FAIL Vertical LR line 2, hit test inside bottom-left rounded corner assert_equals: expected Element node <span id="vertical-lr" class="round">FOO<br>BAR</span> but got Element node <div style="writing-mode:vertical-lr"> -<span id="vertical... -PASS Vertical LR line 2, hit test outside bottom-right rounded corner -FAIL Vertical LR line 2, hit test inside bottom-right rounded corner assert_equals: expected Element node <span id="vertical-lr" class="round">FOO<br>BAR</span> but got Element node <div style="writing-mode:vertical-lr"> -<span id="vertical... -FAIL Vertical LR line 2, hit test inside top-left right-angled corner assert_equals: expected Element node <span id="vertical-lr" class="round">FOO<br>BAR</span> but got Element node <div style="writing-mode:vertical-lr"> -<span id="vertical... -FAIL Vertical LR line 2, hit test inside top-right right-angled corner assert_equals: expected Element node <span id="vertical-lr" class="round">FOO<br>BAR</span> but got Element node <div style="writing-mode:vertical-lr"> -<span id="vertical... -PASS Vertical RL line 1, hit test outside top-left rounded corner -PASS Vertical RL line 1, hit test inside top-left rounded corner -PASS Vertical RL line 1, hit test outside top-right rounded corner -FAIL Vertical RL line 1, hit test inside top-right rounded corner assert_equals: expected Element node <span id="vertical-rl" class="round">FOO<br>BAR</span> but got Element node <div style="writing-mode:vertical-rl"> -<span id="vertical... -FAIL Vertical RL line 1, hit test inside bottom-left right-angled corner assert_equals: expected Element node <span id="vertical-rl" class="round">FOO<br>BAR</span> but got Element node <div style="writing-mode:vertical-rl"> -<span id="vertical... -FAIL Vertical RL line 1, hit test inside bottom-right right-angled corner assert_equals: expected Element node <span id="vertical-rl" class="round">FOO<br>BAR</span> but got Element node <div style="writing-mode:vertical-rl"> -<span id="vertical... -PASS Vertical RL line 2, hit test outside bottom-left rounded corner -FAIL Vertical RL line 2, hit test inside bottom-left rounded corner assert_equals: expected Element node <span id="vertical-rl" class="round">FOO<br>BAR</span> but got Element node <div style="writing-mode:vertical-rl"> -<span id="vertical... -PASS Vertical RL line 2, hit test outside bottom-right rounded corner -FAIL Vertical RL line 2, hit test inside bottom-right rounded corner assert_equals: expected Element node <span id="vertical-rl" class="round">FOO<br>BAR</span> but got Element node <div style="writing-mode:vertical-rl"> -<span id="vertical... -FAIL Vertical RL line 2, hit test inside top-left right-angled corner assert_equals: expected Element node <span id="vertical-rl" class="round">FOO<br>BAR</span> but got Element node <div style="writing-mode:vertical-rl"> -<span id="vertical... -FAIL Vertical RL line 2, hit test inside top-right right-angled corner assert_equals: expected Element node <span id="vertical-rl" class="round">FOO<br>BAR</span> but got Element node <div style="writing-mode:vertical-rl"> -<span id="vertical... -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-vertWM-002-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-vertWM-002-expected.txt deleted file mode 100644 index 0e79b71..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-vertWM-002-expected.txt +++ /dev/null
@@ -1,87 +0,0 @@ -This is a testharness.js-based test. -FAIL .container > div 1 assert_equals: -<div class="container"><div style="align-self: auto" data-offset-x="10" data-offset-y="1"></div></div> -offsetLeft expected 10 but got 1 -FAIL .container > div 2 assert_equals: -<div class="container"><div style="align-self: normal" data-offset-x="10" data-offset-y="1"></div></div> -offsetLeft expected 10 but got 1 -FAIL .container > div 3 assert_equals: -<div class="container"><div style="align-self: stretch" data-offset-x="10" data-offset-y="1"></div></div> -offsetLeft expected 10 but got 1 -FAIL .container > div 4 assert_equals: -<div class="container"><div style="align-self: baseline" data-offset-x="10" data-offset-y="1"></div></div> -offsetLeft expected 10 but got 1 -FAIL .container > div 5 assert_equals: -<div class="container"><div style="align-self: last baseline" data-offset-x="2" data-offset-y="1"></div></div> -offsetLeft expected 2 but got 1 -FAIL .container > div 6 assert_equals: -<div class="container"><div style="align-self: center" data-offset-x="6" data-offset-y="1"></div></div> -offsetLeft expected 6 but got 1 -FAIL .container > div 7 assert_equals: -<div class="container"><div style="align-self: start" data-offset-x="10" data-offset-y="1"></div></div> -offsetLeft expected 10 but got 1 -FAIL .container > div 8 assert_equals: -<div class="container"><div style="align-self: end" data-offset-x="2" data-offset-y="1"></div></div> -offsetLeft expected 2 but got 1 -FAIL .container > div 9 assert_equals: -<div class="container"><div style="align-self: self-start" data-offset-x="2" data-offset-y="1"></div></div> -offsetLeft expected 2 but got 1 -FAIL .container > div 10 assert_equals: -<div class="container"><div style="align-self: self-end" data-offset-x="10" data-offset-y="1"></div></div> -offsetLeft expected 10 but got 1 -FAIL .container > div 11 assert_equals: -<div class="container"><div style="align-self: flex-start" data-offset-x="10" data-offset-y="1"></div></div> -offsetLeft expected 10 but got 1 -FAIL .container > div 12 assert_equals: -<div class="container"><div style="align-self: flex-end" data-offset-x="2" data-offset-y="1"></div></div> -offsetLeft expected 2 but got 1 -FAIL .container > div 13 assert_equals: -<div class="container"><div style="align-self: left" data-offset-x="10" data-offset-y="1"></div></div> -offsetLeft expected 10 but got 1 -FAIL .container > div 14 assert_equals: -<div class="container"><div style="align-self: right" data-offset-x="10" data-offset-y="1"></div></div> -offsetLeft expected 10 but got 1 -FAIL .container > div 15 assert_equals: -<div class="container"><div style="align-self: auto" data-offset-x="-2" data-offset-y="1"></div></div> -offsetLeft expected -2 but got 1 -FAIL .container > div 16 assert_equals: -<div class="container"><div style="align-self: normal" data-offset-x="-2" data-offset-y="1"></div></div> -offsetLeft expected -2 but got 1 -FAIL .container > div 17 assert_equals: -<div class="container"><div style="align-self: stretch" data-offset-x="-2" data-offset-y="1"></div></div> -offsetLeft expected -2 but got 1 -FAIL .container > div 18 assert_equals: -<div class="container"><div style="align-self: baseline" data-offset-x="-2" data-offset-y="1"></div></div> -offsetLeft expected -2 but got 1 -FAIL .container > div 19 assert_equals: -<div class="container"><div style="align-self: last baseline" data-offset-x="2" data-offset-y="1"></div></div> -offsetLeft expected 2 but got 1 -FAIL .container > div 20 assert_equals: -<div class="container"><div style="align-self: center" data-offset-x="0" data-offset-y="1"></div></div> -offsetLeft expected 0 but got 1 -FAIL .container > div 21 assert_equals: -<div class="container"><div style="align-self: start" data-offset-x="-2" data-offset-y="1"></div></div> -offsetLeft expected -2 but got 1 -FAIL .container > div 22 assert_equals: -<div class="container"><div style="align-self: end" data-offset-x="2" data-offset-y="1"></div></div> -offsetLeft expected 2 but got 1 -FAIL .container > div 23 assert_equals: -<div class="container"><div style="align-self: self-start" data-offset-x="2" data-offset-y="1"></div></div> -offsetLeft expected 2 but got 1 -FAIL .container > div 24 assert_equals: -<div class="container"><div style="align-self: self-end" data-offset-x="-2" data-offset-y="1"></div></div> -offsetLeft expected -2 but got 1 -FAIL .container > div 25 assert_equals: -<div class="container"><div style="align-self: flex-start" data-offset-x="-2" data-offset-y="1"></div></div> -offsetLeft expected -2 but got 1 -FAIL .container > div 26 assert_equals: -<div class="container"><div style="align-self: flex-end" data-offset-x="2" data-offset-y="1"></div></div> -offsetLeft expected 2 but got 1 -FAIL .container > div 27 assert_equals: -<div class="container"><div style="align-self: left" data-offset-x="-2" data-offset-y="1"></div></div> -offsetLeft expected -2 but got 1 -FAIL .container > div 28 assert_equals: -<div class="container"><div style="align-self: right" data-offset-x="-2" data-offset-y="1"></div></div> -offsetLeft expected -2 but got 1 -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-vertWM-004-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-vertWM-004-expected.txt deleted file mode 100644 index 7c2283a..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-flexbox/abspos/flex-abspos-staticpos-align-self-vertWM-004-expected.txt +++ /dev/null
@@ -1,75 +0,0 @@ -This is a testharness.js-based test. -FAIL .container > div 1 assert_equals: -<div class="container"><div style="align-self: auto" data-offset-x="10" data-offset-y="1"></div></div> -offsetLeft expected 10 but got 2 -FAIL .container > div 2 assert_equals: -<div class="container"><div style="align-self: normal" data-offset-x="10" data-offset-y="1"></div></div> -offsetLeft expected 10 but got 2 -FAIL .container > div 3 assert_equals: -<div class="container"><div style="align-self: stretch" data-offset-x="10" data-offset-y="1"></div></div> -offsetLeft expected 10 but got 2 -FAIL .container > div 4 assert_equals: -<div class="container"><div style="align-self: baseline" data-offset-x="10" data-offset-y="1"></div></div> -offsetLeft expected 10 but got 2 -FAIL .container > div 5 assert_equals: -<div class="container"><div style="align-self: last baseline" data-offset-x="10" data-offset-y="5"></div></div> -offsetLeft expected 10 but got 2 -FAIL .container > div 6 assert_equals: -<div class="container"><div style="align-self: center" data-offset-x="10" data-offset-y="3"></div></div> -offsetLeft expected 10 but got 2 -FAIL .container > div 7 assert_equals: -<div class="container"><div style="align-self: start" data-offset-x="10" data-offset-y="1"></div></div> -offsetLeft expected 10 but got 2 -FAIL .container > div 8 assert_equals: -<div class="container"><div style="align-self: end" data-offset-x="10" data-offset-y="5"></div></div> -offsetLeft expected 10 but got 2 -FAIL .container > div 9 assert_equals: -<div class="container"><div style="align-self: self-start" data-offset-x="10" data-offset-y="5"></div></div> -offsetLeft expected 10 but got 2 -FAIL .container > div 10 assert_equals: -<div class="container"><div style="align-self: self-end" data-offset-x="10" data-offset-y="1"></div></div> -offsetLeft expected 10 but got 2 -FAIL .container > div 11 assert_equals: -<div class="container"><div style="align-self: flex-start" data-offset-x="10" data-offset-y="1"></div></div> -offsetLeft expected 10 but got 2 -FAIL .container > div 12 assert_equals: -<div class="container"><div style="align-self: flex-end" data-offset-x="10" data-offset-y="5"></div></div> -offsetLeft expected 10 but got 2 -FAIL .container > div 13 assert_equals: -<div class="container"><div style="align-self: auto" data-offset-x="-2" data-offset-y="1"></div></div> -offsetLeft expected -2 but got 2 -FAIL .container > div 14 assert_equals: -<div class="container"><div style="align-self: normal" data-offset-x="-2" data-offset-y="1"></div></div> -offsetLeft expected -2 but got 2 -FAIL .container > div 15 assert_equals: -<div class="container"><div style="align-self: stretch" data-offset-x="-2" data-offset-y="1"></div></div> -offsetLeft expected -2 but got 2 -FAIL .container > div 16 assert_equals: -<div class="container"><div style="align-self: baseline" data-offset-x="-2" data-offset-y="1"></div></div> -offsetLeft expected -2 but got 2 -FAIL .container > div 17 assert_equals: -<div class="container"><div style="align-self: last baseline" data-offset-x="-2" data-offset-y="-3"></div></div> -offsetLeft expected -2 but got 2 -FAIL .container > div 18 assert_equals: -<div class="container"><div style="align-self: center" data-offset-x="-2" data-offset-y="-1"></div></div> -offsetLeft expected -2 but got 2 -FAIL .container > div 19 assert_equals: -<div class="container"><div style="align-self: start" data-offset-x="-2" data-offset-y="1"></div></div> -offsetLeft expected -2 but got 2 -FAIL .container > div 20 assert_equals: -<div class="container"><div style="align-self: end" data-offset-x="-2" data-offset-y="-3"></div></div> -offsetLeft expected -2 but got 2 -FAIL .container > div 21 assert_equals: -<div class="container"><div style="align-self: self-start" data-offset-x="-2" data-offset-y="-3"></div></div> -offsetLeft expected -2 but got 2 -FAIL .container > div 22 assert_equals: -<div class="container"><div style="align-self: self-end" data-offset-x="-2" data-offset-y="1"></div></div> -offsetLeft expected -2 but got 2 -FAIL .container > div 23 assert_equals: -<div class="container"><div style="align-self: flex-start" data-offset-x="-2" data-offset-y="1"></div></div> -offsetLeft expected -2 but got 2 -FAIL .container > div 24 assert_equals: -<div class="container"><div style="align-self: flex-end" data-offset-x="-2" data-offset-y="-3"></div></div> -offsetLeft expected -2 but got 2 -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-003-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-003-expected.txt deleted file mode 100644 index 994076b7..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-003-expected.txt +++ /dev/null
@@ -1,47 +0,0 @@ -This is a testharness.js-based test. -PASS .container > div 1 -FAIL .container > div 2 assert_equals: -<div class="container" style="justify-content: space-between"><div data-offset-x="2" data-offset-y="1"></div></div> -offsetLeft expected 2 but got 10 -PASS .container > div 3 -PASS .container > div 4 -PASS .container > div 5 -PASS .container > div 6 -FAIL .container > div 7 assert_equals: -<div class="container" style="justify-content: start"><div data-offset-x="2" data-offset-y="1"></div></div> -offsetLeft expected 2 but got 10 -FAIL .container > div 8 assert_equals: -<div class="container" style="justify-content: end"><div data-offset-x="10" data-offset-y="1"></div></div> -offsetLeft expected 10 but got 2 -PASS .container > div 9 -PASS .container > div 10 -FAIL .container > div 11 assert_equals: -<div class="container" style="justify-content: left"><div data-offset-x="2" data-offset-y="1"></div></div> -offsetLeft expected 2 but got 10 -FAIL .container > div 12 assert_equals: -<div class="container" style="justify-content: right"><div data-offset-x="10" data-offset-y="1"></div></div> -offsetLeft expected 10 but got 2 -PASS .container > div 13 -FAIL .container > div 14 assert_equals: -<div class="container" style="justify-content: space-between"><div data-offset-x="2" data-offset-y="1"></div></div> -offsetLeft expected 2 but got -2 -PASS .container > div 15 -PASS .container > div 16 -PASS .container > div 17 -PASS .container > div 18 -FAIL .container > div 19 assert_equals: -<div class="container" style="justify-content: start"><div data-offset-x="2" data-offset-y="1"></div></div> -offsetLeft expected 2 but got -2 -FAIL .container > div 20 assert_equals: -<div class="container" style="justify-content: end"><div data-offset-x="-2" data-offset-y="1"></div></div> -offsetLeft expected -2 but got 2 -PASS .container > div 21 -PASS .container > div 22 -FAIL .container > div 23 assert_equals: -<div class="container" style="justify-content: left"><div data-offset-x="2" data-offset-y="1"></div></div> -offsetLeft expected 2 but got -2 -FAIL .container > div 24 assert_equals: -<div class="container" style="justify-content: right"><div data-offset-x="-2" data-offset-y="1"></div></div> -offsetLeft expected -2 but got 2 -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-004-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-004-expected.txt deleted file mode 100644 index dbe1d0098..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-004-expected.txt +++ /dev/null
@@ -1,75 +0,0 @@ -This is a testharness.js-based test. -FAIL .container > div 1 assert_equals: -<div class="container" style="justify-content: normal"><div data-offset-x="10" data-offset-y="1"></div></div> -offsetTop expected 1 but got 5 -FAIL .container > div 2 assert_equals: -<div class="container" style="justify-content: space-between"><div data-offset-x="2" data-offset-y="1"></div></div> -offsetLeft expected 2 but got 10 -FAIL .container > div 3 assert_equals: -<div class="container" style="justify-content: space-around"><div data-offset-x="6" data-offset-y="1"></div></div> -offsetTop expected 1 but got 5 -FAIL .container > div 4 assert_equals: -<div class="container" style="justify-content: space-evenly"><div data-offset-x="6" data-offset-y="1"></div></div> -offsetTop expected 1 but got 5 -FAIL .container > div 5 assert_equals: -<div class="container" style="justify-content: stretch"><div data-offset-x="10" data-offset-y="1"></div></div> -offsetTop expected 1 but got 5 -FAIL .container > div 6 assert_equals: -<div class="container" style="justify-content: center"><div data-offset-x="6" data-offset-y="1"></div></div> -offsetTop expected 1 but got 5 -FAIL .container > div 7 assert_equals: -<div class="container" style="justify-content: start"><div data-offset-x="2" data-offset-y="1"></div></div> -offsetLeft expected 2 but got 10 -FAIL .container > div 8 assert_equals: -<div class="container" style="justify-content: end"><div data-offset-x="10" data-offset-y="1"></div></div> -offsetLeft expected 10 but got 2 -FAIL .container > div 9 assert_equals: -<div class="container" style="justify-content: flex-start"><div data-offset-x="10" data-offset-y="1"></div></div> -offsetTop expected 1 but got 5 -FAIL .container > div 10 assert_equals: -<div class="container" style="justify-content: flex-end"><div data-offset-x="2" data-offset-y="1"></div></div> -offsetTop expected 1 but got 5 -FAIL .container > div 11 assert_equals: -<div class="container" style="justify-content: left"><div data-offset-x="2" data-offset-y="1"></div></div> -offsetLeft expected 2 but got 10 -FAIL .container > div 12 assert_equals: -<div class="container" style="justify-content: right"><div data-offset-x="10" data-offset-y="1"></div></div> -offsetLeft expected 10 but got 2 -FAIL .container > div 13 assert_equals: -<div class="container" style="justify-content: normal"><div data-offset-x="-2" data-offset-y="1"></div></div> -offsetTop expected 1 but got -3 -FAIL .container > div 14 assert_equals: -<div class="container" style="justify-content: space-between"><div data-offset-x="2" data-offset-y="1"></div></div> -offsetLeft expected 2 but got -2 -FAIL .container > div 15 assert_equals: -<div class="container" style="justify-content: space-around"><div data-offset-x="0" data-offset-y="1"></div></div> -offsetTop expected 1 but got -3 -FAIL .container > div 16 assert_equals: -<div class="container" style="justify-content: space-evenly"><div data-offset-x="0" data-offset-y="1"></div></div> -offsetTop expected 1 but got -3 -FAIL .container > div 17 assert_equals: -<div class="container" style="justify-content: stretch"><div data-offset-x="-2" data-offset-y="1"></div></div> -offsetTop expected 1 but got -3 -FAIL .container > div 18 assert_equals: -<div class="container" style="justify-content: center"><div data-offset-x="0" data-offset-y="1"></div></div> -offsetTop expected 1 but got -3 -FAIL .container > div 19 assert_equals: -<div class="container" style="justify-content: start"><div data-offset-x="2" data-offset-y="1"></div></div> -offsetLeft expected 2 but got -2 -FAIL .container > div 20 assert_equals: -<div class="container" style="justify-content: end"><div data-offset-x="-2" data-offset-y="1"></div></div> -offsetLeft expected -2 but got 2 -FAIL .container > div 21 assert_equals: -<div class="container" style="justify-content: flex-start"><div data-offset-x="-2" data-offset-y="1"></div></div> -offsetTop expected 1 but got -3 -FAIL .container > div 22 assert_equals: -<div class="container" style="justify-content: flex-end"><div data-offset-x="2" data-offset-y="1"></div></div> -offsetTop expected 1 but got -3 -FAIL .container > div 23 assert_equals: -<div class="container" style="justify-content: left"><div data-offset-x="2" data-offset-y="1"></div></div> -offsetLeft expected 2 but got -2 -FAIL .container > div 24 assert_equals: -<div class="container" style="justify-content: right"><div data-offset-x="-2" data-offset-y="1"></div></div> -offsetLeft expected -2 but got 2 -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-007-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-007-expected.txt deleted file mode 100644 index f0d31ba2..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-flexbox/abspos/flex-abspos-staticpos-justify-content-007-expected.txt +++ /dev/null
@@ -1,47 +0,0 @@ -This is a testharness.js-based test. -PASS .container > div 1 -FAIL .container > div 2 assert_equals: -<div class="container" style="justify-content: space-between"><div data-offset-x="2" data-offset-y="1"></div></div> -offsetTop expected 1 but got 5 -PASS .container > div 3 -PASS .container > div 4 -PASS .container > div 5 -PASS .container > div 6 -FAIL .container > div 7 assert_equals: -<div class="container" style="justify-content: start"><div data-offset-x="2" data-offset-y="1"></div></div> -offsetTop expected 1 but got 5 -FAIL .container > div 8 assert_equals: -<div class="container" style="justify-content: end"><div data-offset-x="2" data-offset-y="5"></div></div> -offsetTop expected 5 but got 1 -PASS .container > div 9 -PASS .container > div 10 -FAIL .container > div 11 assert_equals: -<div class="container" style="justify-content: left"><div data-offset-x="2" data-offset-y="1"></div></div> -offsetTop expected 1 but got 5 -FAIL .container > div 12 assert_equals: -<div class="container" style="justify-content: right"><div data-offset-x="2" data-offset-y="1"></div></div> -offsetTop expected 1 but got 5 -PASS .container > div 13 -FAIL .container > div 14 assert_equals: -<div class="container" style="justify-content: space-between"><div data-offset-x="2" data-offset-y="1"></div></div> -offsetTop expected 1 but got -3 -PASS .container > div 15 -PASS .container > div 16 -PASS .container > div 17 -PASS .container > div 18 -FAIL .container > div 19 assert_equals: -<div class="container" style="justify-content: start"><div data-offset-x="2" data-offset-y="1"></div></div> -offsetTop expected 1 but got -3 -FAIL .container > div 20 assert_equals: -<div class="container" style="justify-content: end"><div data-offset-x="2" data-offset-y="-3"></div></div> -offsetTop expected -3 but got 1 -PASS .container > div 21 -PASS .container > div 22 -FAIL .container > div 23 assert_equals: -<div class="container" style="justify-content: left"><div data-offset-x="2" data-offset-y="1"></div></div> -offsetTop expected 1 but got -3 -FAIL .container > div 24 assert_equals: -<div class="container" style="justify-content: right"><div data-offset-x="2" data-offset-y="1"></div></div> -offsetTop expected 1 but got -3 -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-flexbox/abspos/position-absolute-012-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-flexbox/abspos/position-absolute-012-expected.txt deleted file mode 100644 index 3f8c003a..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-flexbox/abspos/position-absolute-012-expected.txt +++ /dev/null
@@ -1,164 +0,0 @@ -This is a testharness.js-based test. -Found 96 tests; 64 PASS, 32 FAIL, 0 TIMEOUT, 0 NOTRUN. -PASS .flexbox 1 -PASS .flexbox 2 -PASS .flexbox 3 -PASS .flexbox 4 -PASS .flexbox 5 -PASS .flexbox 6 -PASS .flexbox 7 -PASS .flexbox 8 -PASS .flexbox 9 -PASS .flexbox 10 -PASS .flexbox 11 -PASS .flexbox 12 -PASS .flexbox 13 -PASS .flexbox 14 -PASS .flexbox 15 -PASS .flexbox 16 -PASS .flexbox 17 -PASS .flexbox 18 -PASS .flexbox 19 -PASS .flexbox 20 -PASS .flexbox 21 -PASS .flexbox 22 -PASS .flexbox 23 -PASS .flexbox 24 -PASS .flexbox 25 -PASS .flexbox 26 -PASS .flexbox 27 -PASS .flexbox 28 -PASS .flexbox 29 -PASS .flexbox 30 -PASS .flexbox 31 -PASS .flexbox 32 -FAIL .flexbox 33 assert_equals: -<div class="flexbox vertical-rl ltr row justify-content-flex-start align-items-flex-start"><div class="abspos" data-offset-x="50" data-offset-y="0"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 34 assert_equals: -<div class="flexbox vertical-rl ltr row justify-content-flex-start align-items-flex-end"><div class="abspos" data-offset-x="0" data-offset-y="0"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 35 assert_equals: -<div class="flexbox vertical-rl ltr row justify-content-flex-end align-items-flex-start"><div class="abspos" data-offset-x="50" data-offset-y="50"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 36 assert_equals: -<div class="flexbox vertical-rl ltr row justify-content-flex-end align-items-flex-end"><div class="abspos" data-offset-x="0" data-offset-y="50"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 37 assert_equals: -<div class="flexbox vertical-rl rtl row justify-content-flex-start align-items-flex-start"><div class="abspos" data-offset-x="50" data-offset-y="50"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 38 assert_equals: -<div class="flexbox vertical-rl rtl row justify-content-flex-start align-items-flex-end"><div class="abspos" data-offset-x="0" data-offset-y="50"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 39 assert_equals: -<div class="flexbox vertical-rl rtl row justify-content-flex-end align-items-flex-start"><div class="abspos" data-offset-x="50" data-offset-y="0"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 40 assert_equals: -<div class="flexbox vertical-rl rtl row justify-content-flex-end align-items-flex-end"><div class="abspos" data-offset-x="0" data-offset-y="0"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 41 assert_equals: -<div class="flexbox vertical-rl ltr column justify-content-flex-start align-items-flex-start"><div class="abspos" data-offset-x="50" data-offset-y="0"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 42 assert_equals: -<div class="flexbox vertical-rl ltr column justify-content-flex-start align-items-flex-end"><div class="abspos" data-offset-x="0" data-offset-y="0"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 43 assert_equals: -<div class="flexbox vertical-rl ltr column justify-content-flex-end align-items-flex-start"><div class="abspos" data-offset-x="50" data-offset-y="50"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 44 assert_equals: -<div class="flexbox vertical-rl ltr column justify-content-flex-end align-items-flex-end"><div class="abspos" data-offset-x="0" data-offset-y="50"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 45 assert_equals: -<div class="flexbox vertical-rl rtl column justify-content-flex-start align-items-flex-start"><div class="abspos" data-offset-x="50" data-offset-y="50"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 46 assert_equals: -<div class="flexbox vertical-rl rtl column justify-content-flex-start align-items-flex-end"><div class="abspos" data-offset-x="0" data-offset-y="50"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 47 assert_equals: -<div class="flexbox vertical-rl rtl column justify-content-flex-end align-items-flex-start"><div class="abspos" data-offset-x="50" data-offset-y="0"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 48 assert_equals: -<div class="flexbox vertical-rl rtl column justify-content-flex-end align-items-flex-end"><div class="abspos" data-offset-x="0" data-offset-y="0"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 49 assert_equals: -<div class="flexbox vertical-rl ltr row-reverse justify-content-flex-start align-items-flex-start"><div class="abspos" data-offset-x="50" data-offset-y="0"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 50 assert_equals: -<div class="flexbox vertical-rl ltr row-reverse justify-content-flex-start align-items-flex-end"><div class="abspos" data-offset-x="0" data-offset-y="0"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 51 assert_equals: -<div class="flexbox vertical-rl ltr row-reverse justify-content-flex-end align-items-flex-start"><div class="abspos" data-offset-x="50" data-offset-y="50"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 52 assert_equals: -<div class="flexbox vertical-rl ltr row-reverse justify-content-flex-end align-items-flex-end"><div class="abspos" data-offset-x="0" data-offset-y="50"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 53 assert_equals: -<div class="flexbox vertical-rl rtl row-reverse justify-content-flex-start align-items-flex-start"><div class="abspos" data-offset-x="50" data-offset-y="50"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 54 assert_equals: -<div class="flexbox vertical-rl rtl row-reverse justify-content-flex-start align-items-flex-end"><div class="abspos" data-offset-x="0" data-offset-y="50"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 55 assert_equals: -<div class="flexbox vertical-rl rtl row-reverse justify-content-flex-end align-items-flex-start"><div class="abspos" data-offset-x="50" data-offset-y="0"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 56 assert_equals: -<div class="flexbox vertical-rl rtl row-reverse justify-content-flex-end align-items-flex-end"><div class="abspos" data-offset-x="0" data-offset-y="0"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 57 assert_equals: -<div class="flexbox vertical-rl ltr column-reverse justify-content-flex-start align-items-flex-start"><div class="abspos" data-offset-x="50" data-offset-y="0"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 58 assert_equals: -<div class="flexbox vertical-rl ltr column-reverse justify-content-flex-start align-items-flex-end"><div class="abspos" data-offset-x="0" data-offset-y="0"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 59 assert_equals: -<div class="flexbox vertical-rl ltr column-reverse justify-content-flex-end align-items-flex-start"><div class="abspos" data-offset-x="50" data-offset-y="50"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 60 assert_equals: -<div class="flexbox vertical-rl ltr column-reverse justify-content-flex-end align-items-flex-end"><div class="abspos" data-offset-x="0" data-offset-y="50"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 61 assert_equals: -<div class="flexbox vertical-rl rtl column-reverse justify-content-flex-start align-items-flex-start"><div class="abspos" data-offset-x="50" data-offset-y="50"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 62 assert_equals: -<div class="flexbox vertical-rl rtl column-reverse justify-content-flex-start align-items-flex-end"><div class="abspos" data-offset-x="0" data-offset-y="50"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 63 assert_equals: -<div class="flexbox vertical-rl rtl column-reverse justify-content-flex-end align-items-flex-start"><div class="abspos" data-offset-x="50" data-offset-y="0"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 64 assert_equals: -<div class="flexbox vertical-rl rtl column-reverse justify-content-flex-end align-items-flex-end"><div class="abspos" data-offset-x="0" data-offset-y="0"></div></div> -offsetLeft expected 0 but got 669 -PASS .flexbox 65 -PASS .flexbox 66 -PASS .flexbox 67 -PASS .flexbox 68 -PASS .flexbox 69 -PASS .flexbox 70 -PASS .flexbox 71 -PASS .flexbox 72 -PASS .flexbox 73 -PASS .flexbox 74 -PASS .flexbox 75 -PASS .flexbox 76 -PASS .flexbox 77 -PASS .flexbox 78 -PASS .flexbox 79 -PASS .flexbox 80 -PASS .flexbox 81 -PASS .flexbox 82 -PASS .flexbox 83 -PASS .flexbox 84 -PASS .flexbox 85 -PASS .flexbox 86 -PASS .flexbox 87 -PASS .flexbox 88 -PASS .flexbox 89 -PASS .flexbox 90 -PASS .flexbox 91 -PASS .flexbox 92 -PASS .flexbox 93 -PASS .flexbox 94 -PASS .flexbox 95 -PASS .flexbox 96 -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-flexbox/abspos/position-absolute-013-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-flexbox/abspos/position-absolute-013-expected.txt deleted file mode 100644 index fb861c95..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-flexbox/abspos/position-absolute-013-expected.txt +++ /dev/null
@@ -1,724 +0,0 @@ -This is a testharness.js-based test. -Found 432 tests; 288 PASS, 144 FAIL, 0 TIMEOUT, 0 NOTRUN. -PASS .flexbox 1 -PASS .flexbox 2 -PASS .flexbox 3 -PASS .flexbox 4 -PASS .flexbox 5 -PASS .flexbox 6 -PASS .flexbox 7 -PASS .flexbox 8 -PASS .flexbox 9 -PASS .flexbox 10 -PASS .flexbox 11 -PASS .flexbox 12 -PASS .flexbox 13 -PASS .flexbox 14 -PASS .flexbox 15 -PASS .flexbox 16 -PASS .flexbox 17 -PASS .flexbox 18 -PASS .flexbox 19 -PASS .flexbox 20 -PASS .flexbox 21 -PASS .flexbox 22 -PASS .flexbox 23 -PASS .flexbox 24 -PASS .flexbox 25 -PASS .flexbox 26 -PASS .flexbox 27 -PASS .flexbox 28 -PASS .flexbox 29 -PASS .flexbox 30 -PASS .flexbox 31 -PASS .flexbox 32 -PASS .flexbox 33 -PASS .flexbox 34 -PASS .flexbox 35 -PASS .flexbox 36 -PASS .flexbox 37 -PASS .flexbox 38 -PASS .flexbox 39 -PASS .flexbox 40 -PASS .flexbox 41 -PASS .flexbox 42 -PASS .flexbox 43 -PASS .flexbox 44 -PASS .flexbox 45 -PASS .flexbox 46 -PASS .flexbox 47 -PASS .flexbox 48 -PASS .flexbox 49 -PASS .flexbox 50 -PASS .flexbox 51 -PASS .flexbox 52 -PASS .flexbox 53 -PASS .flexbox 54 -PASS .flexbox 55 -PASS .flexbox 56 -PASS .flexbox 57 -PASS .flexbox 58 -PASS .flexbox 59 -PASS .flexbox 60 -PASS .flexbox 61 -PASS .flexbox 62 -PASS .flexbox 63 -PASS .flexbox 64 -PASS .flexbox 65 -PASS .flexbox 66 -PASS .flexbox 67 -PASS .flexbox 68 -PASS .flexbox 69 -PASS .flexbox 70 -PASS .flexbox 71 -PASS .flexbox 72 -PASS .flexbox 73 -PASS .flexbox 74 -PASS .flexbox 75 -PASS .flexbox 76 -PASS .flexbox 77 -PASS .flexbox 78 -PASS .flexbox 79 -PASS .flexbox 80 -PASS .flexbox 81 -PASS .flexbox 82 -PASS .flexbox 83 -PASS .flexbox 84 -PASS .flexbox 85 -PASS .flexbox 86 -PASS .flexbox 87 -PASS .flexbox 88 -PASS .flexbox 89 -PASS .flexbox 90 -PASS .flexbox 91 -PASS .flexbox 92 -PASS .flexbox 93 -PASS .flexbox 94 -PASS .flexbox 95 -PASS .flexbox 96 -PASS .flexbox 97 -PASS .flexbox 98 -PASS .flexbox 99 -PASS .flexbox 100 -PASS .flexbox 101 -PASS .flexbox 102 -PASS .flexbox 103 -PASS .flexbox 104 -PASS .flexbox 105 -PASS .flexbox 106 -PASS .flexbox 107 -PASS .flexbox 108 -PASS .flexbox 109 -PASS .flexbox 110 -PASS .flexbox 111 -PASS .flexbox 112 -PASS .flexbox 113 -PASS .flexbox 114 -PASS .flexbox 115 -PASS .flexbox 116 -PASS .flexbox 117 -PASS .flexbox 118 -PASS .flexbox 119 -PASS .flexbox 120 -PASS .flexbox 121 -PASS .flexbox 122 -PASS .flexbox 123 -PASS .flexbox 124 -PASS .flexbox 125 -PASS .flexbox 126 -PASS .flexbox 127 -PASS .flexbox 128 -PASS .flexbox 129 -PASS .flexbox 130 -PASS .flexbox 131 -PASS .flexbox 132 -PASS .flexbox 133 -PASS .flexbox 134 -PASS .flexbox 135 -PASS .flexbox 136 -PASS .flexbox 137 -PASS .flexbox 138 -PASS .flexbox 139 -PASS .flexbox 140 -PASS .flexbox 141 -PASS .flexbox 142 -PASS .flexbox 143 -PASS .flexbox 144 -FAIL .flexbox 145 assert_equals: -<div class="flexbox vertical-rl ltr row justify-content-flex-start align-items-flex-start nowrap"><div class="abspos" data-offset-x="50" data-offset-y="0"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 146 assert_equals: -<div class="flexbox vertical-rl ltr row justify-content-flex-start align-items-flex-end nowrap"><div class="abspos" data-offset-x="0" data-offset-y="0"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 147 assert_equals: -<div class="flexbox vertical-rl ltr row justify-content-flex-start align-items-stretch nowrap"><div class="abspos" data-offset-x="50" data-offset-y="0"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 148 assert_equals: -<div class="flexbox vertical-rl ltr row justify-content-flex-end align-items-flex-start nowrap"><div class="abspos" data-offset-x="50" data-offset-y="50"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 149 assert_equals: -<div class="flexbox vertical-rl ltr row justify-content-flex-end align-items-flex-end nowrap"><div class="abspos" data-offset-x="0" data-offset-y="50"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 150 assert_equals: -<div class="flexbox vertical-rl ltr row justify-content-flex-end align-items-stretch nowrap"><div class="abspos" data-offset-x="50" data-offset-y="50"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 151 assert_equals: -<div class="flexbox vertical-rl rtl row justify-content-flex-start align-items-flex-start nowrap"><div class="abspos" data-offset-x="50" data-offset-y="50"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 152 assert_equals: -<div class="flexbox vertical-rl rtl row justify-content-flex-start align-items-flex-end nowrap"><div class="abspos" data-offset-x="0" data-offset-y="50"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 153 assert_equals: -<div class="flexbox vertical-rl rtl row justify-content-flex-start align-items-stretch nowrap"><div class="abspos" data-offset-x="50" data-offset-y="50"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 154 assert_equals: -<div class="flexbox vertical-rl rtl row justify-content-flex-end align-items-flex-start nowrap"><div class="abspos" data-offset-x="50" data-offset-y="0"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 155 assert_equals: -<div class="flexbox vertical-rl rtl row justify-content-flex-end align-items-flex-end nowrap"><div class="abspos" data-offset-x="0" data-offset-y="0"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 156 assert_equals: -<div class="flexbox vertical-rl rtl row justify-content-flex-end align-items-stretch nowrap"><div class="abspos" data-offset-x="50" data-offset-y="0"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 157 assert_equals: -<div class="flexbox vertical-rl ltr column justify-content-flex-start align-items-flex-start nowrap"><div class="abspos" data-offset-x="50" data-offset-y="0"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 158 assert_equals: -<div class="flexbox vertical-rl ltr column justify-content-flex-start align-items-flex-end nowrap"><div class="abspos" data-offset-x="50" data-offset-y="50"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 159 assert_equals: -<div class="flexbox vertical-rl ltr column justify-content-flex-start align-items-stretch nowrap"><div class="abspos" data-offset-x="50" data-offset-y="0"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 160 assert_equals: -<div class="flexbox vertical-rl ltr column justify-content-flex-end align-items-flex-start nowrap"><div class="abspos" data-offset-x="0" data-offset-y="0"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 161 assert_equals: -<div class="flexbox vertical-rl ltr column justify-content-flex-end align-items-flex-end nowrap"><div class="abspos" data-offset-x="0" data-offset-y="50"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 162 assert_equals: -<div class="flexbox vertical-rl ltr column justify-content-flex-end align-items-stretch nowrap"><div class="abspos" data-offset-x="0" data-offset-y="0"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 163 assert_equals: -<div class="flexbox vertical-rl rtl column justify-content-flex-start align-items-flex-start nowrap"><div class="abspos" data-offset-x="50" data-offset-y="50"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 164 assert_equals: -<div class="flexbox vertical-rl rtl column justify-content-flex-start align-items-flex-end nowrap"><div class="abspos" data-offset-x="50" data-offset-y="0"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 165 assert_equals: -<div class="flexbox vertical-rl rtl column justify-content-flex-start align-items-stretch nowrap"><div class="abspos" data-offset-x="50" data-offset-y="50"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 166 assert_equals: -<div class="flexbox vertical-rl rtl column justify-content-flex-end align-items-flex-start nowrap"><div class="abspos" data-offset-x="0" data-offset-y="50"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 167 assert_equals: -<div class="flexbox vertical-rl rtl column justify-content-flex-end align-items-flex-end nowrap"><div class="abspos" data-offset-x="0" data-offset-y="0"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 168 assert_equals: -<div class="flexbox vertical-rl rtl column justify-content-flex-end align-items-stretch nowrap"><div class="abspos" data-offset-x="0" data-offset-y="50"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 169 assert_equals: -<div class="flexbox vertical-rl ltr row-reverse justify-content-flex-start align-items-flex-start nowrap"><div class="abspos" data-offset-x="50" data-offset-y="50"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 170 assert_equals: -<div class="flexbox vertical-rl ltr row-reverse justify-content-flex-start align-items-flex-end nowrap"><div class="abspos" data-offset-x="0" data-offset-y="50"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 171 assert_equals: -<div class="flexbox vertical-rl ltr row-reverse justify-content-flex-start align-items-stretch nowrap"><div class="abspos" data-offset-x="50" data-offset-y="50"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 172 assert_equals: -<div class="flexbox vertical-rl ltr row-reverse justify-content-flex-end align-items-flex-start nowrap"><div class="abspos" data-offset-x="50" data-offset-y="0"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 173 assert_equals: -<div class="flexbox vertical-rl ltr row-reverse justify-content-flex-end align-items-flex-end nowrap"><div class="abspos" data-offset-x="0" data-offset-y="0"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 174 assert_equals: -<div class="flexbox vertical-rl ltr row-reverse justify-content-flex-end align-items-stretch nowrap"><div class="abspos" data-offset-x="50" data-offset-y="0"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 175 assert_equals: -<div class="flexbox vertical-rl rtl row-reverse justify-content-flex-start align-items-flex-start nowrap"><div class="abspos" data-offset-x="50" data-offset-y="0"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 176 assert_equals: -<div class="flexbox vertical-rl rtl row-reverse justify-content-flex-start align-items-flex-end nowrap"><div class="abspos" data-offset-x="0" data-offset-y="0"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 177 assert_equals: -<div class="flexbox vertical-rl rtl row-reverse justify-content-flex-start align-items-stretch nowrap"><div class="abspos" data-offset-x="50" data-offset-y="0"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 178 assert_equals: -<div class="flexbox vertical-rl rtl row-reverse justify-content-flex-end align-items-flex-start nowrap"><div class="abspos" data-offset-x="50" data-offset-y="50"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 179 assert_equals: -<div class="flexbox vertical-rl rtl row-reverse justify-content-flex-end align-items-flex-end nowrap"><div class="abspos" data-offset-x="0" data-offset-y="50"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 180 assert_equals: -<div class="flexbox vertical-rl rtl row-reverse justify-content-flex-end align-items-stretch nowrap"><div class="abspos" data-offset-x="50" data-offset-y="50"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 181 assert_equals: -<div class="flexbox vertical-rl ltr column-reverse justify-content-flex-start align-items-flex-start nowrap"><div class="abspos" data-offset-x="0" data-offset-y="0"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 182 assert_equals: -<div class="flexbox vertical-rl ltr column-reverse justify-content-flex-start align-items-flex-end nowrap"><div class="abspos" data-offset-x="0" data-offset-y="50"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 183 assert_equals: -<div class="flexbox vertical-rl ltr column-reverse justify-content-flex-start align-items-stretch nowrap"><div class="abspos" data-offset-x="0" data-offset-y="0"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 184 assert_equals: -<div class="flexbox vertical-rl ltr column-reverse justify-content-flex-end align-items-flex-start nowrap"><div class="abspos" data-offset-x="50" data-offset-y="0"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 185 assert_equals: -<div class="flexbox vertical-rl ltr column-reverse justify-content-flex-end align-items-flex-end nowrap"><div class="abspos" data-offset-x="50" data-offset-y="50"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 186 assert_equals: -<div class="flexbox vertical-rl ltr column-reverse justify-content-flex-end align-items-stretch nowrap"><div class="abspos" data-offset-x="50" data-offset-y="0"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 187 assert_equals: -<div class="flexbox vertical-rl rtl column-reverse justify-content-flex-start align-items-flex-start nowrap"><div class="abspos" data-offset-x="0" data-offset-y="50"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 188 assert_equals: -<div class="flexbox vertical-rl rtl column-reverse justify-content-flex-start align-items-flex-end nowrap"><div class="abspos" data-offset-x="0" data-offset-y="0"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 189 assert_equals: -<div class="flexbox vertical-rl rtl column-reverse justify-content-flex-start align-items-stretch nowrap"><div class="abspos" data-offset-x="0" data-offset-y="50"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 190 assert_equals: -<div class="flexbox vertical-rl rtl column-reverse justify-content-flex-end align-items-flex-start nowrap"><div class="abspos" data-offset-x="50" data-offset-y="50"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 191 assert_equals: -<div class="flexbox vertical-rl rtl column-reverse justify-content-flex-end align-items-flex-end nowrap"><div class="abspos" data-offset-x="50" data-offset-y="0"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 192 assert_equals: -<div class="flexbox vertical-rl rtl column-reverse justify-content-flex-end align-items-stretch nowrap"><div class="abspos" data-offset-x="50" data-offset-y="50"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 193 assert_equals: -<div class="flexbox vertical-rl ltr row justify-content-flex-start align-items-flex-start wrap"><div class="abspos" data-offset-x="50" data-offset-y="0"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 194 assert_equals: -<div class="flexbox vertical-rl ltr row justify-content-flex-start align-items-flex-end wrap"><div class="abspos" data-offset-x="0" data-offset-y="0"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 195 assert_equals: -<div class="flexbox vertical-rl ltr row justify-content-flex-start align-items-stretch wrap"><div class="abspos" data-offset-x="50" data-offset-y="0"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 196 assert_equals: -<div class="flexbox vertical-rl ltr row justify-content-flex-end align-items-flex-start wrap"><div class="abspos" data-offset-x="50" data-offset-y="50"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 197 assert_equals: -<div class="flexbox vertical-rl ltr row justify-content-flex-end align-items-flex-end wrap"><div class="abspos" data-offset-x="0" data-offset-y="50"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 198 assert_equals: -<div class="flexbox vertical-rl ltr row justify-content-flex-end align-items-stretch wrap"><div class="abspos" data-offset-x="50" data-offset-y="50"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 199 assert_equals: -<div class="flexbox vertical-rl rtl row justify-content-flex-start align-items-flex-start wrap"><div class="abspos" data-offset-x="50" data-offset-y="50"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 200 assert_equals: -<div class="flexbox vertical-rl rtl row justify-content-flex-start align-items-flex-end wrap"><div class="abspos" data-offset-x="0" data-offset-y="50"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 201 assert_equals: -<div class="flexbox vertical-rl rtl row justify-content-flex-start align-items-stretch wrap"><div class="abspos" data-offset-x="50" data-offset-y="50"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 202 assert_equals: -<div class="flexbox vertical-rl rtl row justify-content-flex-end align-items-flex-start wrap"><div class="abspos" data-offset-x="50" data-offset-y="0"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 203 assert_equals: -<div class="flexbox vertical-rl rtl row justify-content-flex-end align-items-flex-end wrap"><div class="abspos" data-offset-x="0" data-offset-y="0"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 204 assert_equals: -<div class="flexbox vertical-rl rtl row justify-content-flex-end align-items-stretch wrap"><div class="abspos" data-offset-x="50" data-offset-y="0"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 205 assert_equals: -<div class="flexbox vertical-rl ltr column justify-content-flex-start align-items-flex-start wrap"><div class="abspos" data-offset-x="50" data-offset-y="0"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 206 assert_equals: -<div class="flexbox vertical-rl ltr column justify-content-flex-start align-items-flex-end wrap"><div class="abspos" data-offset-x="50" data-offset-y="50"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 207 assert_equals: -<div class="flexbox vertical-rl ltr column justify-content-flex-start align-items-stretch wrap"><div class="abspos" data-offset-x="50" data-offset-y="0"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 208 assert_equals: -<div class="flexbox vertical-rl ltr column justify-content-flex-end align-items-flex-start wrap"><div class="abspos" data-offset-x="0" data-offset-y="0"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 209 assert_equals: -<div class="flexbox vertical-rl ltr column justify-content-flex-end align-items-flex-end wrap"><div class="abspos" data-offset-x="0" data-offset-y="50"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 210 assert_equals: -<div class="flexbox vertical-rl ltr column justify-content-flex-end align-items-stretch wrap"><div class="abspos" data-offset-x="0" data-offset-y="0"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 211 assert_equals: -<div class="flexbox vertical-rl rtl column justify-content-flex-start align-items-flex-start wrap"><div class="abspos" data-offset-x="50" data-offset-y="50"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 212 assert_equals: -<div class="flexbox vertical-rl rtl column justify-content-flex-start align-items-flex-end wrap"><div class="abspos" data-offset-x="50" data-offset-y="0"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 213 assert_equals: -<div class="flexbox vertical-rl rtl column justify-content-flex-start align-items-stretch wrap"><div class="abspos" data-offset-x="50" data-offset-y="50"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 214 assert_equals: -<div class="flexbox vertical-rl rtl column justify-content-flex-end align-items-flex-start wrap"><div class="abspos" data-offset-x="0" data-offset-y="50"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 215 assert_equals: -<div class="flexbox vertical-rl rtl column justify-content-flex-end align-items-flex-end wrap"><div class="abspos" data-offset-x="0" data-offset-y="0"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 216 assert_equals: -<div class="flexbox vertical-rl rtl column justify-content-flex-end align-items-stretch wrap"><div class="abspos" data-offset-x="0" data-offset-y="50"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 217 assert_equals: -<div class="flexbox vertical-rl ltr row-reverse justify-content-flex-start align-items-flex-start wrap"><div class="abspos" data-offset-x="50" data-offset-y="50"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 218 assert_equals: -<div class="flexbox vertical-rl ltr row-reverse justify-content-flex-start align-items-flex-end wrap"><div class="abspos" data-offset-x="0" data-offset-y="50"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 219 assert_equals: -<div class="flexbox vertical-rl ltr row-reverse justify-content-flex-start align-items-stretch wrap"><div class="abspos" data-offset-x="50" data-offset-y="50"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 220 assert_equals: -<div class="flexbox vertical-rl ltr row-reverse justify-content-flex-end align-items-flex-start wrap"><div class="abspos" data-offset-x="50" data-offset-y="0"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 221 assert_equals: -<div class="flexbox vertical-rl ltr row-reverse justify-content-flex-end align-items-flex-end wrap"><div class="abspos" data-offset-x="0" data-offset-y="0"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 222 assert_equals: -<div class="flexbox vertical-rl ltr row-reverse justify-content-flex-end align-items-stretch wrap"><div class="abspos" data-offset-x="50" data-offset-y="0"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 223 assert_equals: -<div class="flexbox vertical-rl rtl row-reverse justify-content-flex-start align-items-flex-start wrap"><div class="abspos" data-offset-x="50" data-offset-y="0"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 224 assert_equals: -<div class="flexbox vertical-rl rtl row-reverse justify-content-flex-start align-items-flex-end wrap"><div class="abspos" data-offset-x="0" data-offset-y="0"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 225 assert_equals: -<div class="flexbox vertical-rl rtl row-reverse justify-content-flex-start align-items-stretch wrap"><div class="abspos" data-offset-x="50" data-offset-y="0"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 226 assert_equals: -<div class="flexbox vertical-rl rtl row-reverse justify-content-flex-end align-items-flex-start wrap"><div class="abspos" data-offset-x="50" data-offset-y="50"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 227 assert_equals: -<div class="flexbox vertical-rl rtl row-reverse justify-content-flex-end align-items-flex-end wrap"><div class="abspos" data-offset-x="0" data-offset-y="50"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 228 assert_equals: -<div class="flexbox vertical-rl rtl row-reverse justify-content-flex-end align-items-stretch wrap"><div class="abspos" data-offset-x="50" data-offset-y="50"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 229 assert_equals: -<div class="flexbox vertical-rl ltr column-reverse justify-content-flex-start align-items-flex-start wrap"><div class="abspos" data-offset-x="0" data-offset-y="0"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 230 assert_equals: -<div class="flexbox vertical-rl ltr column-reverse justify-content-flex-start align-items-flex-end wrap"><div class="abspos" data-offset-x="0" data-offset-y="50"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 231 assert_equals: -<div class="flexbox vertical-rl ltr column-reverse justify-content-flex-start align-items-stretch wrap"><div class="abspos" data-offset-x="0" data-offset-y="0"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 232 assert_equals: -<div class="flexbox vertical-rl ltr column-reverse justify-content-flex-end align-items-flex-start wrap"><div class="abspos" data-offset-x="50" data-offset-y="0"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 233 assert_equals: -<div class="flexbox vertical-rl ltr column-reverse justify-content-flex-end align-items-flex-end wrap"><div class="abspos" data-offset-x="50" data-offset-y="50"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 234 assert_equals: -<div class="flexbox vertical-rl ltr column-reverse justify-content-flex-end align-items-stretch wrap"><div class="abspos" data-offset-x="50" data-offset-y="0"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 235 assert_equals: -<div class="flexbox vertical-rl rtl column-reverse justify-content-flex-start align-items-flex-start wrap"><div class="abspos" data-offset-x="0" data-offset-y="50"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 236 assert_equals: -<div class="flexbox vertical-rl rtl column-reverse justify-content-flex-start align-items-flex-end wrap"><div class="abspos" data-offset-x="0" data-offset-y="0"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 237 assert_equals: -<div class="flexbox vertical-rl rtl column-reverse justify-content-flex-start align-items-stretch wrap"><div class="abspos" data-offset-x="0" data-offset-y="50"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 238 assert_equals: -<div class="flexbox vertical-rl rtl column-reverse justify-content-flex-end align-items-flex-start wrap"><div class="abspos" data-offset-x="50" data-offset-y="50"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 239 assert_equals: -<div class="flexbox vertical-rl rtl column-reverse justify-content-flex-end align-items-flex-end wrap"><div class="abspos" data-offset-x="50" data-offset-y="0"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 240 assert_equals: -<div class="flexbox vertical-rl rtl column-reverse justify-content-flex-end align-items-stretch wrap"><div class="abspos" data-offset-x="50" data-offset-y="50"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 241 assert_equals: -<div class="flexbox vertical-rl ltr row justify-content-flex-start align-items-flex-start wrap-reverse"><div class="abspos" data-offset-x="0" data-offset-y="0"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 242 assert_equals: -<div class="flexbox vertical-rl ltr row justify-content-flex-start align-items-flex-end wrap-reverse"><div class="abspos" data-offset-x="50" data-offset-y="0"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 243 assert_equals: -<div class="flexbox vertical-rl ltr row justify-content-flex-start align-items-stretch wrap-reverse"><div class="abspos" data-offset-x="0" data-offset-y="0"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 244 assert_equals: -<div class="flexbox vertical-rl ltr row justify-content-flex-end align-items-flex-start wrap-reverse"><div class="abspos" data-offset-x="0" data-offset-y="50"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 245 assert_equals: -<div class="flexbox vertical-rl ltr row justify-content-flex-end align-items-flex-end wrap-reverse"><div class="abspos" data-offset-x="50" data-offset-y="50"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 246 assert_equals: -<div class="flexbox vertical-rl ltr row justify-content-flex-end align-items-stretch wrap-reverse"><div class="abspos" data-offset-x="0" data-offset-y="50"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 247 assert_equals: -<div class="flexbox vertical-rl rtl row justify-content-flex-start align-items-flex-start wrap-reverse"><div class="abspos" data-offset-x="0" data-offset-y="50"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 248 assert_equals: -<div class="flexbox vertical-rl rtl row justify-content-flex-start align-items-flex-end wrap-reverse"><div class="abspos" data-offset-x="50" data-offset-y="50"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 249 assert_equals: -<div class="flexbox vertical-rl rtl row justify-content-flex-start align-items-stretch wrap-reverse"><div class="abspos" data-offset-x="0" data-offset-y="50"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 250 assert_equals: -<div class="flexbox vertical-rl rtl row justify-content-flex-end align-items-flex-start wrap-reverse"><div class="abspos" data-offset-x="0" data-offset-y="0"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 251 assert_equals: -<div class="flexbox vertical-rl rtl row justify-content-flex-end align-items-flex-end wrap-reverse"><div class="abspos" data-offset-x="50" data-offset-y="0"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 252 assert_equals: -<div class="flexbox vertical-rl rtl row justify-content-flex-end align-items-stretch wrap-reverse"><div class="abspos" data-offset-x="0" data-offset-y="0"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 253 assert_equals: -<div class="flexbox vertical-rl ltr column justify-content-flex-start align-items-flex-start wrap-reverse"><div class="abspos" data-offset-x="50" data-offset-y="50"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 254 assert_equals: -<div class="flexbox vertical-rl ltr column justify-content-flex-start align-items-flex-end wrap-reverse"><div class="abspos" data-offset-x="50" data-offset-y="0"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 255 assert_equals: -<div class="flexbox vertical-rl ltr column justify-content-flex-start align-items-stretch wrap-reverse"><div class="abspos" data-offset-x="50" data-offset-y="50"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 256 assert_equals: -<div class="flexbox vertical-rl ltr column justify-content-flex-end align-items-flex-start wrap-reverse"><div class="abspos" data-offset-x="0" data-offset-y="50"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 257 assert_equals: -<div class="flexbox vertical-rl ltr column justify-content-flex-end align-items-flex-end wrap-reverse"><div class="abspos" data-offset-x="0" data-offset-y="0"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 258 assert_equals: -<div class="flexbox vertical-rl ltr column justify-content-flex-end align-items-stretch wrap-reverse"><div class="abspos" data-offset-x="0" data-offset-y="50"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 259 assert_equals: -<div class="flexbox vertical-rl rtl column justify-content-flex-start align-items-flex-start wrap-reverse"><div class="abspos" data-offset-x="50" data-offset-y="0"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 260 assert_equals: -<div class="flexbox vertical-rl rtl column justify-content-flex-start align-items-flex-end wrap-reverse"><div class="abspos" data-offset-x="50" data-offset-y="50"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 261 assert_equals: -<div class="flexbox vertical-rl rtl column justify-content-flex-start align-items-stretch wrap-reverse"><div class="abspos" data-offset-x="50" data-offset-y="0"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 262 assert_equals: -<div class="flexbox vertical-rl rtl column justify-content-flex-end align-items-flex-start wrap-reverse"><div class="abspos" data-offset-x="0" data-offset-y="0"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 263 assert_equals: -<div class="flexbox vertical-rl rtl column justify-content-flex-end align-items-flex-end wrap-reverse"><div class="abspos" data-offset-x="0" data-offset-y="50"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 264 assert_equals: -<div class="flexbox vertical-rl rtl column justify-content-flex-end align-items-stretch wrap-reverse"><div class="abspos" data-offset-x="0" data-offset-y="0"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 265 assert_equals: -<div class="flexbox vertical-rl ltr row-reverse justify-content-flex-start align-items-flex-start wrap-reverse"><div class="abspos" data-offset-x="0" data-offset-y="50"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 266 assert_equals: -<div class="flexbox vertical-rl ltr row-reverse justify-content-flex-start align-items-flex-end wrap-reverse"><div class="abspos" data-offset-x="50" data-offset-y="50"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 267 assert_equals: -<div class="flexbox vertical-rl ltr row-reverse justify-content-flex-start align-items-stretch wrap-reverse"><div class="abspos" data-offset-x="0" data-offset-y="50"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 268 assert_equals: -<div class="flexbox vertical-rl ltr row-reverse justify-content-flex-end align-items-flex-start wrap-reverse"><div class="abspos" data-offset-x="0" data-offset-y="0"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 269 assert_equals: -<div class="flexbox vertical-rl ltr row-reverse justify-content-flex-end align-items-flex-end wrap-reverse"><div class="abspos" data-offset-x="50" data-offset-y="0"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 270 assert_equals: -<div class="flexbox vertical-rl ltr row-reverse justify-content-flex-end align-items-stretch wrap-reverse"><div class="abspos" data-offset-x="0" data-offset-y="0"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 271 assert_equals: -<div class="flexbox vertical-rl rtl row-reverse justify-content-flex-start align-items-flex-start wrap-reverse"><div class="abspos" data-offset-x="0" data-offset-y="0"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 272 assert_equals: -<div class="flexbox vertical-rl rtl row-reverse justify-content-flex-start align-items-flex-end wrap-reverse"><div class="abspos" data-offset-x="50" data-offset-y="0"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 273 assert_equals: -<div class="flexbox vertical-rl rtl row-reverse justify-content-flex-start align-items-stretch wrap-reverse"><div class="abspos" data-offset-x="0" data-offset-y="0"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 274 assert_equals: -<div class="flexbox vertical-rl rtl row-reverse justify-content-flex-end align-items-flex-start wrap-reverse"><div class="abspos" data-offset-x="0" data-offset-y="50"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 275 assert_equals: -<div class="flexbox vertical-rl rtl row-reverse justify-content-flex-end align-items-flex-end wrap-reverse"><div class="abspos" data-offset-x="50" data-offset-y="50"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 276 assert_equals: -<div class="flexbox vertical-rl rtl row-reverse justify-content-flex-end align-items-stretch wrap-reverse"><div class="abspos" data-offset-x="0" data-offset-y="50"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 277 assert_equals: -<div class="flexbox vertical-rl ltr column-reverse justify-content-flex-start align-items-flex-start wrap-reverse"><div class="abspos" data-offset-x="0" data-offset-y="50"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 278 assert_equals: -<div class="flexbox vertical-rl ltr column-reverse justify-content-flex-start align-items-flex-end wrap-reverse"><div class="abspos" data-offset-x="0" data-offset-y="0"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 279 assert_equals: -<div class="flexbox vertical-rl ltr column-reverse justify-content-flex-start align-items-stretch wrap-reverse"><div class="abspos" data-offset-x="0" data-offset-y="50"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 280 assert_equals: -<div class="flexbox vertical-rl ltr column-reverse justify-content-flex-end align-items-flex-start wrap-reverse"><div class="abspos" data-offset-x="50" data-offset-y="50"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 281 assert_equals: -<div class="flexbox vertical-rl ltr column-reverse justify-content-flex-end align-items-flex-end wrap-reverse"><div class="abspos" data-offset-x="50" data-offset-y="0"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 282 assert_equals: -<div class="flexbox vertical-rl ltr column-reverse justify-content-flex-end align-items-stretch wrap-reverse"><div class="abspos" data-offset-x="50" data-offset-y="50"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 283 assert_equals: -<div class="flexbox vertical-rl rtl column-reverse justify-content-flex-start align-items-flex-start wrap-reverse"><div class="abspos" data-offset-x="0" data-offset-y="0"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 284 assert_equals: -<div class="flexbox vertical-rl rtl column-reverse justify-content-flex-start align-items-flex-end wrap-reverse"><div class="abspos" data-offset-x="0" data-offset-y="50"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 285 assert_equals: -<div class="flexbox vertical-rl rtl column-reverse justify-content-flex-start align-items-stretch wrap-reverse"><div class="abspos" data-offset-x="0" data-offset-y="0"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 286 assert_equals: -<div class="flexbox vertical-rl rtl column-reverse justify-content-flex-end align-items-flex-start wrap-reverse"><div class="abspos" data-offset-x="50" data-offset-y="0"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 287 assert_equals: -<div class="flexbox vertical-rl rtl column-reverse justify-content-flex-end align-items-flex-end wrap-reverse"><div class="abspos" data-offset-x="50" data-offset-y="50"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 288 assert_equals: -<div class="flexbox vertical-rl rtl column-reverse justify-content-flex-end align-items-stretch wrap-reverse"><div class="abspos" data-offset-x="50" data-offset-y="0"></div></div> -offsetLeft expected 50 but got 719 -PASS .flexbox 289 -PASS .flexbox 290 -PASS .flexbox 291 -PASS .flexbox 292 -PASS .flexbox 293 -PASS .flexbox 294 -PASS .flexbox 295 -PASS .flexbox 296 -PASS .flexbox 297 -PASS .flexbox 298 -PASS .flexbox 299 -PASS .flexbox 300 -PASS .flexbox 301 -PASS .flexbox 302 -PASS .flexbox 303 -PASS .flexbox 304 -PASS .flexbox 305 -PASS .flexbox 306 -PASS .flexbox 307 -PASS .flexbox 308 -PASS .flexbox 309 -PASS .flexbox 310 -PASS .flexbox 311 -PASS .flexbox 312 -PASS .flexbox 313 -PASS .flexbox 314 -PASS .flexbox 315 -PASS .flexbox 316 -PASS .flexbox 317 -PASS .flexbox 318 -PASS .flexbox 319 -PASS .flexbox 320 -PASS .flexbox 321 -PASS .flexbox 322 -PASS .flexbox 323 -PASS .flexbox 324 -PASS .flexbox 325 -PASS .flexbox 326 -PASS .flexbox 327 -PASS .flexbox 328 -PASS .flexbox 329 -PASS .flexbox 330 -PASS .flexbox 331 -PASS .flexbox 332 -PASS .flexbox 333 -PASS .flexbox 334 -PASS .flexbox 335 -PASS .flexbox 336 -PASS .flexbox 337 -PASS .flexbox 338 -PASS .flexbox 339 -PASS .flexbox 340 -PASS .flexbox 341 -PASS .flexbox 342 -PASS .flexbox 343 -PASS .flexbox 344 -PASS .flexbox 345 -PASS .flexbox 346 -PASS .flexbox 347 -PASS .flexbox 348 -PASS .flexbox 349 -PASS .flexbox 350 -PASS .flexbox 351 -PASS .flexbox 352 -PASS .flexbox 353 -PASS .flexbox 354 -PASS .flexbox 355 -PASS .flexbox 356 -PASS .flexbox 357 -PASS .flexbox 358 -PASS .flexbox 359 -PASS .flexbox 360 -PASS .flexbox 361 -PASS .flexbox 362 -PASS .flexbox 363 -PASS .flexbox 364 -PASS .flexbox 365 -PASS .flexbox 366 -PASS .flexbox 367 -PASS .flexbox 368 -PASS .flexbox 369 -PASS .flexbox 370 -PASS .flexbox 371 -PASS .flexbox 372 -PASS .flexbox 373 -PASS .flexbox 374 -PASS .flexbox 375 -PASS .flexbox 376 -PASS .flexbox 377 -PASS .flexbox 378 -PASS .flexbox 379 -PASS .flexbox 380 -PASS .flexbox 381 -PASS .flexbox 382 -PASS .flexbox 383 -PASS .flexbox 384 -PASS .flexbox 385 -PASS .flexbox 386 -PASS .flexbox 387 -PASS .flexbox 388 -PASS .flexbox 389 -PASS .flexbox 390 -PASS .flexbox 391 -PASS .flexbox 392 -PASS .flexbox 393 -PASS .flexbox 394 -PASS .flexbox 395 -PASS .flexbox 396 -PASS .flexbox 397 -PASS .flexbox 398 -PASS .flexbox 399 -PASS .flexbox 400 -PASS .flexbox 401 -PASS .flexbox 402 -PASS .flexbox 403 -PASS .flexbox 404 -PASS .flexbox 405 -PASS .flexbox 406 -PASS .flexbox 407 -PASS .flexbox 408 -PASS .flexbox 409 -PASS .flexbox 410 -PASS .flexbox 411 -PASS .flexbox 412 -PASS .flexbox 413 -PASS .flexbox 414 -PASS .flexbox 415 -PASS .flexbox 416 -PASS .flexbox 417 -PASS .flexbox 418 -PASS .flexbox 419 -PASS .flexbox 420 -PASS .flexbox 421 -PASS .flexbox 422 -PASS .flexbox 423 -PASS .flexbox 424 -PASS .flexbox 425 -PASS .flexbox 426 -PASS .flexbox 427 -PASS .flexbox 428 -PASS .flexbox 429 -PASS .flexbox 430 -PASS .flexbox 431 -PASS .flexbox 432 -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-flexbox/column-reverse-gap-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-flexbox/column-reverse-gap-expected.txt deleted file mode 100644 index e710300..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-flexbox/column-reverse-gap-expected.txt +++ /dev/null
@@ -1,10 +0,0 @@ -This is a testharness.js-based test. -FAIL .flexbox 1 assert_equals: -<div class="flexbox" data-expected-height="40"> - <div data-offset-y="30"></div> - <div data-offset-y="15"></div> - <div data-offset-y="0"></div> -</div> -offsetTop expected 15 but got 20 -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-flexbox/flex-aspect-ratio-img-row-005-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-flexbox/flex-aspect-ratio-img-row-005-expected.txt deleted file mode 100644 index 5dfccbd00..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-flexbox/flex-aspect-ratio-img-row-005-expected.txt +++ /dev/null
@@ -1,9 +0,0 @@ -This is a testharness.js-based test. -PASS img 1 -FAIL img 2 assert_equals: -<img style="height: 150px; box-sizing: border-box;" src="support/200x200-green.png" data-expected-client-width="100" data-expected-client-height="100"> -clientWidth expected 100 but got 150 -PASS img 3 -PASS img 4 -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-flexbox/flex-aspect-ratio-img-row-013-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-flexbox/flex-aspect-ratio-img-row-013-expected.txt deleted file mode 100644 index 55ea23c..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-flexbox/flex-aspect-ratio-img-row-013-expected.txt +++ /dev/null
@@ -1,12 +0,0 @@ -This is a testharness.js-based test. -FAIL img 1 assert_equals: -<img src="support/200x200-green.png" data-expected-height="100" data-expected-width="100"> -width expected 100 but got 200 -FAIL img 2 assert_equals: -<img src="support/200x200-green.png" style="margin-bottom: 20px" data-expected-height="100" data-expected-width="100"> -width expected 100 but got 200 -FAIL img 3 assert_equals: -<img src="support/200x200-green.png" style="min-height: 100px;" data-expected-height="100" data-expected-width="100"> -width expected 100 but got 200 -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-flexbox/flex-basis-intrinsics-001-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-flexbox/flex-basis-intrinsics-001-expected.txt deleted file mode 100644 index 6abc4303..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-flexbox/flex-basis-intrinsics-001-expected.txt +++ /dev/null
@@ -1,27 +0,0 @@ -This is a testharness.js-based test. -PASS .flex-item 1 -PASS .flex-item 2 -PASS .flex-item 3 -PASS .flex-item 4 -PASS .flex-item 5 -PASS .flex-item 6 -PASS .flex-item 7 -FAIL .flex-item 8 assert_equals: -<div class="flex-item ortho-item" style="flex-basis: max-content; width: 300px;" data-expected-width="100"> - <div class="inline-block"></div><div class="inline-block"></div> - </div> -width expected 100 but got 0 -PASS .flex-item 9 -FAIL .flex-item 10 assert_equals: -<div class="flex-item ortho-item" style="flex-basis: min-content;" data-expected-height="50"> - <div class="inline-block"></div><div class="inline-block"></div> - </div> -height expected 50 but got 100 -PASS .flex-item 11 -FAIL .flex-item 12 assert_equals: -<div class="flex-item ortho-item" style="flex-basis: -moz-fit-content; flex-basis: fit-content;" data-expected-height="75"> - <div class="inline-block"></div><div class="inline-block"></div> - </div> -height expected 75 but got 100 -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-flexbox/image-as-flexitem-size-001-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-flexbox/image-as-flexitem-size-001-expected.txt deleted file mode 100644 index d78e5e72..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-flexbox/image-as-flexitem-size-001-expected.txt +++ /dev/null
@@ -1,23 +0,0 @@ -This is a testharness.js-based test. -PASS .flexbox > img 1 -PASS .flexbox > img 2 -PASS .flexbox > img 3 -FAIL .flexbox > img 4 assert_equals: -<img src="support/solidblue.png" style="flex: 0 0 30px" data-expected-width="30" data-expected-height="30"> -height expected 30 but got 16 -PASS .flexbox > img 5 -PASS .flexbox > img 6 -PASS .flexbox > img 7 -PASS .flexbox > img 8 -PASS .flexbox > img 9 -PASS .flexbox > img 10 -PASS .flexbox > img 11 -PASS .flexbox > img 12 -PASS .flexbox > img 13 -PASS .flexbox > img 14 -PASS .flexbox > img 15 -PASS .flexbox > img 16 -PASS .flexbox > img 17 -PASS .flexbox > img 18 -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-flexbox/image-as-flexitem-size-001v-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-flexbox/image-as-flexitem-size-001v-expected.txt deleted file mode 100644 index d78e5e72..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-flexbox/image-as-flexitem-size-001v-expected.txt +++ /dev/null
@@ -1,23 +0,0 @@ -This is a testharness.js-based test. -PASS .flexbox > img 1 -PASS .flexbox > img 2 -PASS .flexbox > img 3 -FAIL .flexbox > img 4 assert_equals: -<img src="support/solidblue.png" style="flex: 0 0 30px" data-expected-width="30" data-expected-height="30"> -height expected 30 but got 16 -PASS .flexbox > img 5 -PASS .flexbox > img 6 -PASS .flexbox > img 7 -PASS .flexbox > img 8 -PASS .flexbox > img 9 -PASS .flexbox > img 10 -PASS .flexbox > img 11 -PASS .flexbox > img 12 -PASS .flexbox > img 13 -PASS .flexbox > img 14 -PASS .flexbox > img 15 -PASS .flexbox > img 16 -PASS .flexbox > img 17 -PASS .flexbox > img 18 -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-flexbox/image-as-flexitem-size-002-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-flexbox/image-as-flexitem-size-002-expected.txt deleted file mode 100644 index 7bd0f239..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-flexbox/image-as-flexitem-size-002-expected.txt +++ /dev/null
@@ -1,23 +0,0 @@ -This is a testharness.js-based test. -PASS .flexbox > img 1 -PASS .flexbox > img 2 -PASS .flexbox > img 3 -FAIL .flexbox > img 4 assert_equals: -<img src="support/solidblue.png" style="flex: 0 0 30px" data-expected-width="30" data-expected-height="30"> -width expected 30 but got 16 -PASS .flexbox > img 5 -PASS .flexbox > img 6 -PASS .flexbox > img 7 -PASS .flexbox > img 8 -PASS .flexbox > img 9 -PASS .flexbox > img 10 -PASS .flexbox > img 11 -PASS .flexbox > img 12 -PASS .flexbox > img 13 -PASS .flexbox > img 14 -PASS .flexbox > img 15 -PASS .flexbox > img 16 -PASS .flexbox > img 17 -PASS .flexbox > img 18 -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-flexbox/image-as-flexitem-size-002v-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-flexbox/image-as-flexitem-size-002v-expected.txt deleted file mode 100644 index 7bd0f239..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-flexbox/image-as-flexitem-size-002v-expected.txt +++ /dev/null
@@ -1,23 +0,0 @@ -This is a testharness.js-based test. -PASS .flexbox > img 1 -PASS .flexbox > img 2 -PASS .flexbox > img 3 -FAIL .flexbox > img 4 assert_equals: -<img src="support/solidblue.png" style="flex: 0 0 30px" data-expected-width="30" data-expected-height="30"> -width expected 30 but got 16 -PASS .flexbox > img 5 -PASS .flexbox > img 6 -PASS .flexbox > img 7 -PASS .flexbox > img 8 -PASS .flexbox > img 9 -PASS .flexbox > img 10 -PASS .flexbox > img 11 -PASS .flexbox > img 12 -PASS .flexbox > img 13 -PASS .flexbox > img 14 -PASS .flexbox > img 15 -PASS .flexbox > img 16 -PASS .flexbox > img 17 -PASS .flexbox > img 18 -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-flexbox/image-as-flexitem-size-003-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-flexbox/image-as-flexitem-size-003-expected.txt deleted file mode 100644 index e69de29..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-flexbox/image-as-flexitem-size-003-expected.txt +++ /dev/null
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-flexbox/image-as-flexitem-size-003v-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-flexbox/image-as-flexitem-size-003v-expected.txt deleted file mode 100644 index e69de29..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-flexbox/image-as-flexitem-size-003v-expected.txt +++ /dev/null
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-flexbox/image-as-flexitem-size-004-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-flexbox/image-as-flexitem-size-004-expected.txt deleted file mode 100644 index e69de29..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-flexbox/image-as-flexitem-size-004-expected.txt +++ /dev/null
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-flexbox/image-as-flexitem-size-004v-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-flexbox/image-as-flexitem-size-004v-expected.txt deleted file mode 100644 index e69de29..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-flexbox/image-as-flexitem-size-004v-expected.txt +++ /dev/null
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-flexbox/image-as-flexitem-size-005-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-flexbox/image-as-flexitem-size-005-expected.txt deleted file mode 100644 index 8411504..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-flexbox/image-as-flexitem-size-005-expected.txt +++ /dev/null
@@ -1,35 +0,0 @@ -This is a testharness.js-based test. -FAIL .flexbox > img 1 assert_equals: -<img src="support/solidblue.png" data-expected-width="40" data-expected-height="40"> -height expected 40 but got 16 -PASS .flexbox > img 2 -PASS .flexbox > img 3 -FAIL .flexbox > img 4 assert_equals: -<img src="support/solidblue.png" style="flex: 1 1 30px" data-expected-width="40" data-expected-height="40"> -height expected 40 but got 16 -FAIL .flexbox > img 5 assert_equals: -<img src="support/solidblue.png" style="min-width: 34px" data-expected-width="40" data-expected-height="40"> -height expected 40 but got 34 -FAIL .flexbox > img 6 assert_equals: -<img src="support/solidblue.png" style="min-height: 34px" data-expected-width="40" data-expected-height="40"> -height expected 40 but got 34 -FAIL .flexbox > img 7 assert_equals: -<img src="support/solidblue.png" style="min-width: 30px; - min-height: 34px" data-expected-width="40" data-expected-height="40"> -height expected 40 but got 34 -FAIL .flexbox > img 8 assert_equals: -<img src="support/solidblue.png" style="min-width: 34px; - min-height: 30px" data-expected-width="40" data-expected-height="40"> -height expected 40 but got 34 -PASS .flexbox > img 9 -PASS .flexbox > img 10 -PASS .flexbox > img 11 -PASS .flexbox > img 12 -PASS .flexbox > img 13 -PASS .flexbox > img 14 -PASS .flexbox > img 15 -PASS .flexbox > img 16 -PASS .flexbox > img 17 -PASS .flexbox > img 18 -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-flexbox/image-as-flexitem-size-005v-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-flexbox/image-as-flexitem-size-005v-expected.txt deleted file mode 100644 index 6177422..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-flexbox/image-as-flexitem-size-005v-expected.txt +++ /dev/null
@@ -1,40 +0,0 @@ -This is a testharness.js-based test. -FAIL .flexbox > img 1 assert_equals: -<img src="support/solidblue.png" data-expected-width="40" data-expected-height="40"> -height expected 40 but got 16 -FAIL .flexbox > img 2 assert_equals: -<img src="support/solidblue.png" style="width: 30px" data-expected-width="40" data-expected-height="40"> -height expected 40 but got 30 -PASS .flexbox > img 3 -FAIL .flexbox > img 4 assert_equals: -<img src="support/solidblue.png" style="flex: 1 1 30px" data-expected-width="40" data-expected-height="40"> -height expected 40 but got 16 -FAIL .flexbox > img 5 assert_equals: -<img src="support/solidblue.png" style="min-width: 34px" data-expected-width="40" data-expected-height="40"> -height expected 40 but got 34 -FAIL .flexbox > img 6 assert_equals: -<img src="support/solidblue.png" style="min-height: 34px" data-expected-width="40" data-expected-height="40"> -height expected 40 but got 34 -FAIL .flexbox > img 7 assert_equals: -<img src="support/solidblue.png" style="min-width: 30px; - min-height: 34px" data-expected-width="40" data-expected-height="40"> -height expected 40 but got 34 -FAIL .flexbox > img 8 assert_equals: -<img src="support/solidblue.png" style="min-width: 34px; - min-height: 30px" data-expected-width="40" data-expected-height="40"> -height expected 40 but got 34 -PASS .flexbox > img 9 -PASS .flexbox > img 10 -PASS .flexbox > img 11 -PASS .flexbox > img 12 -PASS .flexbox > img 13 -PASS .flexbox > img 14 -PASS .flexbox > img 15 -PASS .flexbox > img 16 -PASS .flexbox > img 17 -FAIL .flexbox > img 18 assert_equals: -<img src="support/solidblue.png" style="width: 10px; - min-height: 30px" data-expected-width="40" data-expected-height="40"> -height expected 40 but got 30 -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-flexbox/image-as-flexitem-size-006-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-flexbox/image-as-flexitem-size-006-expected.txt deleted file mode 100644 index 616d545d..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-flexbox/image-as-flexitem-size-006-expected.txt +++ /dev/null
@@ -1,40 +0,0 @@ -This is a testharness.js-based test. -FAIL .flexbox > img 1 assert_equals: -<img src="support/solidblue.png" data-expected-width="40" data-expected-height="40"> -width expected 40 but got 16 -PASS .flexbox > img 2 -FAIL .flexbox > img 3 assert_equals: -<img src="support/solidblue.png" style="height: 30px" data-expected-width="40" data-expected-height="40"> -width expected 40 but got 30 -FAIL .flexbox > img 4 assert_equals: -<img src="support/solidblue.png" style="flex: 1 1 30px" data-expected-width="40" data-expected-height="40"> -width expected 40 but got 16 -FAIL .flexbox > img 5 assert_equals: -<img src="support/solidblue.png" style="min-width: 34px" data-expected-width="40" data-expected-height="40"> -width expected 40 but got 34 -FAIL .flexbox > img 6 assert_equals: -<img src="support/solidblue.png" style="min-height: 34px" data-expected-width="40" data-expected-height="40"> -width expected 40 but got 34 -FAIL .flexbox > img 7 assert_equals: -<img src="support/solidblue.png" style="min-width: 30px; - min-height: 34px" data-expected-width="40" data-expected-height="40"> -width expected 40 but got 34 -FAIL .flexbox > img 8 assert_equals: -<img src="support/solidblue.png" style="min-width: 34px; - min-height: 30px" data-expected-width="40" data-expected-height="40"> -width expected 40 but got 34 -PASS .flexbox > img 9 -PASS .flexbox > img 10 -PASS .flexbox > img 11 -PASS .flexbox > img 12 -PASS .flexbox > img 13 -PASS .flexbox > img 14 -FAIL .flexbox > img 15 assert_equals: -<img src="support/solidblue.png" style="min-width: 30px; - height: 10px" data-expected-width="40" data-expected-height="40"> -width expected 40 but got 30 -PASS .flexbox > img 16 -PASS .flexbox > img 17 -PASS .flexbox > img 18 -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-flexbox/image-as-flexitem-size-006v-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-flexbox/image-as-flexitem-size-006v-expected.txt deleted file mode 100644 index 73a9030f..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-flexbox/image-as-flexitem-size-006v-expected.txt +++ /dev/null
@@ -1,35 +0,0 @@ -This is a testharness.js-based test. -FAIL .flexbox > img 1 assert_equals: -<img src="support/solidblue.png" data-expected-width="40" data-expected-height="40"> -width expected 40 but got 16 -PASS .flexbox > img 2 -PASS .flexbox > img 3 -FAIL .flexbox > img 4 assert_equals: -<img src="support/solidblue.png" style="flex: 1 1 30px" data-expected-width="40" data-expected-height="40"> -width expected 40 but got 16 -FAIL .flexbox > img 5 assert_equals: -<img src="support/solidblue.png" style="min-width: 34px" data-expected-width="40" data-expected-height="40"> -width expected 40 but got 34 -FAIL .flexbox > img 6 assert_equals: -<img src="support/solidblue.png" style="min-height: 34px" data-expected-width="40" data-expected-height="40"> -width expected 40 but got 34 -FAIL .flexbox > img 7 assert_equals: -<img src="support/solidblue.png" style="min-width: 30px; - min-height: 34px" data-expected-width="40" data-expected-height="40"> -width expected 40 but got 34 -FAIL .flexbox > img 8 assert_equals: -<img src="support/solidblue.png" style="min-width: 34px; - min-height: 30px" data-expected-width="40" data-expected-height="40"> -width expected 40 but got 34 -PASS .flexbox > img 9 -PASS .flexbox > img 10 -PASS .flexbox > img 11 -PASS .flexbox > img 12 -PASS .flexbox > img 13 -PASS .flexbox > img 14 -PASS .flexbox > img 15 -PASS .flexbox > img 16 -PASS .flexbox > img 17 -PASS .flexbox > img 18 -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-flexbox/image-as-flexitem-size-007-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-flexbox/image-as-flexitem-size-007-expected.txt deleted file mode 100644 index 2c83ef39..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-flexbox/image-as-flexitem-size-007-expected.txt +++ /dev/null
@@ -1,25 +0,0 @@ -This is a testharness.js-based test. -PASS .flexbox > img 1 -PASS .flexbox > img 2 -FAIL .flexbox > img 3 assert_equals: -<img src="support/solidblue.png" style="height: 30px" data-expected-width="32" data-expected-height="30"> -width expected 32 but got 30 -FAIL .flexbox > img 4 assert_equals: -<img src="support/solidblue.png" style="flex: 0 0 30px" data-expected-width="30" data-expected-height="28"> -height expected 28 but got 20 -PASS .flexbox > img 5 -PASS .flexbox > img 6 -PASS .flexbox > img 7 -PASS .flexbox > img 8 -PASS .flexbox > img 9 -PASS .flexbox > img 10 -PASS .flexbox > img 11 -PASS .flexbox > img 12 -PASS .flexbox > img 13 -PASS .flexbox > img 14 -PASS .flexbox > img 15 -PASS .flexbox > img 16 -PASS .flexbox > img 17 -PASS .flexbox > img 18 -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-flexbox/image-as-flexitem-size-007v-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-flexbox/image-as-flexitem-size-007v-expected.txt deleted file mode 100644 index 2c83ef39..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-flexbox/image-as-flexitem-size-007v-expected.txt +++ /dev/null
@@ -1,25 +0,0 @@ -This is a testharness.js-based test. -PASS .flexbox > img 1 -PASS .flexbox > img 2 -FAIL .flexbox > img 3 assert_equals: -<img src="support/solidblue.png" style="height: 30px" data-expected-width="32" data-expected-height="30"> -width expected 32 but got 30 -FAIL .flexbox > img 4 assert_equals: -<img src="support/solidblue.png" style="flex: 0 0 30px" data-expected-width="30" data-expected-height="28"> -height expected 28 but got 20 -PASS .flexbox > img 5 -PASS .flexbox > img 6 -PASS .flexbox > img 7 -PASS .flexbox > img 8 -PASS .flexbox > img 9 -PASS .flexbox > img 10 -PASS .flexbox > img 11 -PASS .flexbox > img 12 -PASS .flexbox > img 13 -PASS .flexbox > img 14 -PASS .flexbox > img 15 -PASS .flexbox > img 16 -PASS .flexbox > img 17 -PASS .flexbox > img 18 -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-flexbox/position-absolute-012-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-flexbox/position-absolute-012-expected.txt deleted file mode 100644 index 3f8c003a..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-flexbox/position-absolute-012-expected.txt +++ /dev/null
@@ -1,164 +0,0 @@ -This is a testharness.js-based test. -Found 96 tests; 64 PASS, 32 FAIL, 0 TIMEOUT, 0 NOTRUN. -PASS .flexbox 1 -PASS .flexbox 2 -PASS .flexbox 3 -PASS .flexbox 4 -PASS .flexbox 5 -PASS .flexbox 6 -PASS .flexbox 7 -PASS .flexbox 8 -PASS .flexbox 9 -PASS .flexbox 10 -PASS .flexbox 11 -PASS .flexbox 12 -PASS .flexbox 13 -PASS .flexbox 14 -PASS .flexbox 15 -PASS .flexbox 16 -PASS .flexbox 17 -PASS .flexbox 18 -PASS .flexbox 19 -PASS .flexbox 20 -PASS .flexbox 21 -PASS .flexbox 22 -PASS .flexbox 23 -PASS .flexbox 24 -PASS .flexbox 25 -PASS .flexbox 26 -PASS .flexbox 27 -PASS .flexbox 28 -PASS .flexbox 29 -PASS .flexbox 30 -PASS .flexbox 31 -PASS .flexbox 32 -FAIL .flexbox 33 assert_equals: -<div class="flexbox vertical-rl ltr row justify-content-flex-start align-items-flex-start"><div class="abspos" data-offset-x="50" data-offset-y="0"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 34 assert_equals: -<div class="flexbox vertical-rl ltr row justify-content-flex-start align-items-flex-end"><div class="abspos" data-offset-x="0" data-offset-y="0"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 35 assert_equals: -<div class="flexbox vertical-rl ltr row justify-content-flex-end align-items-flex-start"><div class="abspos" data-offset-x="50" data-offset-y="50"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 36 assert_equals: -<div class="flexbox vertical-rl ltr row justify-content-flex-end align-items-flex-end"><div class="abspos" data-offset-x="0" data-offset-y="50"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 37 assert_equals: -<div class="flexbox vertical-rl rtl row justify-content-flex-start align-items-flex-start"><div class="abspos" data-offset-x="50" data-offset-y="50"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 38 assert_equals: -<div class="flexbox vertical-rl rtl row justify-content-flex-start align-items-flex-end"><div class="abspos" data-offset-x="0" data-offset-y="50"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 39 assert_equals: -<div class="flexbox vertical-rl rtl row justify-content-flex-end align-items-flex-start"><div class="abspos" data-offset-x="50" data-offset-y="0"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 40 assert_equals: -<div class="flexbox vertical-rl rtl row justify-content-flex-end align-items-flex-end"><div class="abspos" data-offset-x="0" data-offset-y="0"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 41 assert_equals: -<div class="flexbox vertical-rl ltr column justify-content-flex-start align-items-flex-start"><div class="abspos" data-offset-x="50" data-offset-y="0"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 42 assert_equals: -<div class="flexbox vertical-rl ltr column justify-content-flex-start align-items-flex-end"><div class="abspos" data-offset-x="0" data-offset-y="0"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 43 assert_equals: -<div class="flexbox vertical-rl ltr column justify-content-flex-end align-items-flex-start"><div class="abspos" data-offset-x="50" data-offset-y="50"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 44 assert_equals: -<div class="flexbox vertical-rl ltr column justify-content-flex-end align-items-flex-end"><div class="abspos" data-offset-x="0" data-offset-y="50"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 45 assert_equals: -<div class="flexbox vertical-rl rtl column justify-content-flex-start align-items-flex-start"><div class="abspos" data-offset-x="50" data-offset-y="50"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 46 assert_equals: -<div class="flexbox vertical-rl rtl column justify-content-flex-start align-items-flex-end"><div class="abspos" data-offset-x="0" data-offset-y="50"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 47 assert_equals: -<div class="flexbox vertical-rl rtl column justify-content-flex-end align-items-flex-start"><div class="abspos" data-offset-x="50" data-offset-y="0"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 48 assert_equals: -<div class="flexbox vertical-rl rtl column justify-content-flex-end align-items-flex-end"><div class="abspos" data-offset-x="0" data-offset-y="0"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 49 assert_equals: -<div class="flexbox vertical-rl ltr row-reverse justify-content-flex-start align-items-flex-start"><div class="abspos" data-offset-x="50" data-offset-y="0"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 50 assert_equals: -<div class="flexbox vertical-rl ltr row-reverse justify-content-flex-start align-items-flex-end"><div class="abspos" data-offset-x="0" data-offset-y="0"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 51 assert_equals: -<div class="flexbox vertical-rl ltr row-reverse justify-content-flex-end align-items-flex-start"><div class="abspos" data-offset-x="50" data-offset-y="50"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 52 assert_equals: -<div class="flexbox vertical-rl ltr row-reverse justify-content-flex-end align-items-flex-end"><div class="abspos" data-offset-x="0" data-offset-y="50"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 53 assert_equals: -<div class="flexbox vertical-rl rtl row-reverse justify-content-flex-start align-items-flex-start"><div class="abspos" data-offset-x="50" data-offset-y="50"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 54 assert_equals: -<div class="flexbox vertical-rl rtl row-reverse justify-content-flex-start align-items-flex-end"><div class="abspos" data-offset-x="0" data-offset-y="50"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 55 assert_equals: -<div class="flexbox vertical-rl rtl row-reverse justify-content-flex-end align-items-flex-start"><div class="abspos" data-offset-x="50" data-offset-y="0"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 56 assert_equals: -<div class="flexbox vertical-rl rtl row-reverse justify-content-flex-end align-items-flex-end"><div class="abspos" data-offset-x="0" data-offset-y="0"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 57 assert_equals: -<div class="flexbox vertical-rl ltr column-reverse justify-content-flex-start align-items-flex-start"><div class="abspos" data-offset-x="50" data-offset-y="0"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 58 assert_equals: -<div class="flexbox vertical-rl ltr column-reverse justify-content-flex-start align-items-flex-end"><div class="abspos" data-offset-x="0" data-offset-y="0"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 59 assert_equals: -<div class="flexbox vertical-rl ltr column-reverse justify-content-flex-end align-items-flex-start"><div class="abspos" data-offset-x="50" data-offset-y="50"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 60 assert_equals: -<div class="flexbox vertical-rl ltr column-reverse justify-content-flex-end align-items-flex-end"><div class="abspos" data-offset-x="0" data-offset-y="50"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 61 assert_equals: -<div class="flexbox vertical-rl rtl column-reverse justify-content-flex-start align-items-flex-start"><div class="abspos" data-offset-x="50" data-offset-y="50"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 62 assert_equals: -<div class="flexbox vertical-rl rtl column-reverse justify-content-flex-start align-items-flex-end"><div class="abspos" data-offset-x="0" data-offset-y="50"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 63 assert_equals: -<div class="flexbox vertical-rl rtl column-reverse justify-content-flex-end align-items-flex-start"><div class="abspos" data-offset-x="50" data-offset-y="0"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 64 assert_equals: -<div class="flexbox vertical-rl rtl column-reverse justify-content-flex-end align-items-flex-end"><div class="abspos" data-offset-x="0" data-offset-y="0"></div></div> -offsetLeft expected 0 but got 669 -PASS .flexbox 65 -PASS .flexbox 66 -PASS .flexbox 67 -PASS .flexbox 68 -PASS .flexbox 69 -PASS .flexbox 70 -PASS .flexbox 71 -PASS .flexbox 72 -PASS .flexbox 73 -PASS .flexbox 74 -PASS .flexbox 75 -PASS .flexbox 76 -PASS .flexbox 77 -PASS .flexbox 78 -PASS .flexbox 79 -PASS .flexbox 80 -PASS .flexbox 81 -PASS .flexbox 82 -PASS .flexbox 83 -PASS .flexbox 84 -PASS .flexbox 85 -PASS .flexbox 86 -PASS .flexbox 87 -PASS .flexbox 88 -PASS .flexbox 89 -PASS .flexbox 90 -PASS .flexbox 91 -PASS .flexbox 92 -PASS .flexbox 93 -PASS .flexbox 94 -PASS .flexbox 95 -PASS .flexbox 96 -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-flexbox/position-absolute-013-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-flexbox/position-absolute-013-expected.txt deleted file mode 100644 index fb861c95..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-flexbox/position-absolute-013-expected.txt +++ /dev/null
@@ -1,724 +0,0 @@ -This is a testharness.js-based test. -Found 432 tests; 288 PASS, 144 FAIL, 0 TIMEOUT, 0 NOTRUN. -PASS .flexbox 1 -PASS .flexbox 2 -PASS .flexbox 3 -PASS .flexbox 4 -PASS .flexbox 5 -PASS .flexbox 6 -PASS .flexbox 7 -PASS .flexbox 8 -PASS .flexbox 9 -PASS .flexbox 10 -PASS .flexbox 11 -PASS .flexbox 12 -PASS .flexbox 13 -PASS .flexbox 14 -PASS .flexbox 15 -PASS .flexbox 16 -PASS .flexbox 17 -PASS .flexbox 18 -PASS .flexbox 19 -PASS .flexbox 20 -PASS .flexbox 21 -PASS .flexbox 22 -PASS .flexbox 23 -PASS .flexbox 24 -PASS .flexbox 25 -PASS .flexbox 26 -PASS .flexbox 27 -PASS .flexbox 28 -PASS .flexbox 29 -PASS .flexbox 30 -PASS .flexbox 31 -PASS .flexbox 32 -PASS .flexbox 33 -PASS .flexbox 34 -PASS .flexbox 35 -PASS .flexbox 36 -PASS .flexbox 37 -PASS .flexbox 38 -PASS .flexbox 39 -PASS .flexbox 40 -PASS .flexbox 41 -PASS .flexbox 42 -PASS .flexbox 43 -PASS .flexbox 44 -PASS .flexbox 45 -PASS .flexbox 46 -PASS .flexbox 47 -PASS .flexbox 48 -PASS .flexbox 49 -PASS .flexbox 50 -PASS .flexbox 51 -PASS .flexbox 52 -PASS .flexbox 53 -PASS .flexbox 54 -PASS .flexbox 55 -PASS .flexbox 56 -PASS .flexbox 57 -PASS .flexbox 58 -PASS .flexbox 59 -PASS .flexbox 60 -PASS .flexbox 61 -PASS .flexbox 62 -PASS .flexbox 63 -PASS .flexbox 64 -PASS .flexbox 65 -PASS .flexbox 66 -PASS .flexbox 67 -PASS .flexbox 68 -PASS .flexbox 69 -PASS .flexbox 70 -PASS .flexbox 71 -PASS .flexbox 72 -PASS .flexbox 73 -PASS .flexbox 74 -PASS .flexbox 75 -PASS .flexbox 76 -PASS .flexbox 77 -PASS .flexbox 78 -PASS .flexbox 79 -PASS .flexbox 80 -PASS .flexbox 81 -PASS .flexbox 82 -PASS .flexbox 83 -PASS .flexbox 84 -PASS .flexbox 85 -PASS .flexbox 86 -PASS .flexbox 87 -PASS .flexbox 88 -PASS .flexbox 89 -PASS .flexbox 90 -PASS .flexbox 91 -PASS .flexbox 92 -PASS .flexbox 93 -PASS .flexbox 94 -PASS .flexbox 95 -PASS .flexbox 96 -PASS .flexbox 97 -PASS .flexbox 98 -PASS .flexbox 99 -PASS .flexbox 100 -PASS .flexbox 101 -PASS .flexbox 102 -PASS .flexbox 103 -PASS .flexbox 104 -PASS .flexbox 105 -PASS .flexbox 106 -PASS .flexbox 107 -PASS .flexbox 108 -PASS .flexbox 109 -PASS .flexbox 110 -PASS .flexbox 111 -PASS .flexbox 112 -PASS .flexbox 113 -PASS .flexbox 114 -PASS .flexbox 115 -PASS .flexbox 116 -PASS .flexbox 117 -PASS .flexbox 118 -PASS .flexbox 119 -PASS .flexbox 120 -PASS .flexbox 121 -PASS .flexbox 122 -PASS .flexbox 123 -PASS .flexbox 124 -PASS .flexbox 125 -PASS .flexbox 126 -PASS .flexbox 127 -PASS .flexbox 128 -PASS .flexbox 129 -PASS .flexbox 130 -PASS .flexbox 131 -PASS .flexbox 132 -PASS .flexbox 133 -PASS .flexbox 134 -PASS .flexbox 135 -PASS .flexbox 136 -PASS .flexbox 137 -PASS .flexbox 138 -PASS .flexbox 139 -PASS .flexbox 140 -PASS .flexbox 141 -PASS .flexbox 142 -PASS .flexbox 143 -PASS .flexbox 144 -FAIL .flexbox 145 assert_equals: -<div class="flexbox vertical-rl ltr row justify-content-flex-start align-items-flex-start nowrap"><div class="abspos" data-offset-x="50" data-offset-y="0"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 146 assert_equals: -<div class="flexbox vertical-rl ltr row justify-content-flex-start align-items-flex-end nowrap"><div class="abspos" data-offset-x="0" data-offset-y="0"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 147 assert_equals: -<div class="flexbox vertical-rl ltr row justify-content-flex-start align-items-stretch nowrap"><div class="abspos" data-offset-x="50" data-offset-y="0"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 148 assert_equals: -<div class="flexbox vertical-rl ltr row justify-content-flex-end align-items-flex-start nowrap"><div class="abspos" data-offset-x="50" data-offset-y="50"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 149 assert_equals: -<div class="flexbox vertical-rl ltr row justify-content-flex-end align-items-flex-end nowrap"><div class="abspos" data-offset-x="0" data-offset-y="50"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 150 assert_equals: -<div class="flexbox vertical-rl ltr row justify-content-flex-end align-items-stretch nowrap"><div class="abspos" data-offset-x="50" data-offset-y="50"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 151 assert_equals: -<div class="flexbox vertical-rl rtl row justify-content-flex-start align-items-flex-start nowrap"><div class="abspos" data-offset-x="50" data-offset-y="50"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 152 assert_equals: -<div class="flexbox vertical-rl rtl row justify-content-flex-start align-items-flex-end nowrap"><div class="abspos" data-offset-x="0" data-offset-y="50"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 153 assert_equals: -<div class="flexbox vertical-rl rtl row justify-content-flex-start align-items-stretch nowrap"><div class="abspos" data-offset-x="50" data-offset-y="50"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 154 assert_equals: -<div class="flexbox vertical-rl rtl row justify-content-flex-end align-items-flex-start nowrap"><div class="abspos" data-offset-x="50" data-offset-y="0"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 155 assert_equals: -<div class="flexbox vertical-rl rtl row justify-content-flex-end align-items-flex-end nowrap"><div class="abspos" data-offset-x="0" data-offset-y="0"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 156 assert_equals: -<div class="flexbox vertical-rl rtl row justify-content-flex-end align-items-stretch nowrap"><div class="abspos" data-offset-x="50" data-offset-y="0"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 157 assert_equals: -<div class="flexbox vertical-rl ltr column justify-content-flex-start align-items-flex-start nowrap"><div class="abspos" data-offset-x="50" data-offset-y="0"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 158 assert_equals: -<div class="flexbox vertical-rl ltr column justify-content-flex-start align-items-flex-end nowrap"><div class="abspos" data-offset-x="50" data-offset-y="50"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 159 assert_equals: -<div class="flexbox vertical-rl ltr column justify-content-flex-start align-items-stretch nowrap"><div class="abspos" data-offset-x="50" data-offset-y="0"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 160 assert_equals: -<div class="flexbox vertical-rl ltr column justify-content-flex-end align-items-flex-start nowrap"><div class="abspos" data-offset-x="0" data-offset-y="0"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 161 assert_equals: -<div class="flexbox vertical-rl ltr column justify-content-flex-end align-items-flex-end nowrap"><div class="abspos" data-offset-x="0" data-offset-y="50"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 162 assert_equals: -<div class="flexbox vertical-rl ltr column justify-content-flex-end align-items-stretch nowrap"><div class="abspos" data-offset-x="0" data-offset-y="0"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 163 assert_equals: -<div class="flexbox vertical-rl rtl column justify-content-flex-start align-items-flex-start nowrap"><div class="abspos" data-offset-x="50" data-offset-y="50"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 164 assert_equals: -<div class="flexbox vertical-rl rtl column justify-content-flex-start align-items-flex-end nowrap"><div class="abspos" data-offset-x="50" data-offset-y="0"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 165 assert_equals: -<div class="flexbox vertical-rl rtl column justify-content-flex-start align-items-stretch nowrap"><div class="abspos" data-offset-x="50" data-offset-y="50"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 166 assert_equals: -<div class="flexbox vertical-rl rtl column justify-content-flex-end align-items-flex-start nowrap"><div class="abspos" data-offset-x="0" data-offset-y="50"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 167 assert_equals: -<div class="flexbox vertical-rl rtl column justify-content-flex-end align-items-flex-end nowrap"><div class="abspos" data-offset-x="0" data-offset-y="0"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 168 assert_equals: -<div class="flexbox vertical-rl rtl column justify-content-flex-end align-items-stretch nowrap"><div class="abspos" data-offset-x="0" data-offset-y="50"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 169 assert_equals: -<div class="flexbox vertical-rl ltr row-reverse justify-content-flex-start align-items-flex-start nowrap"><div class="abspos" data-offset-x="50" data-offset-y="50"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 170 assert_equals: -<div class="flexbox vertical-rl ltr row-reverse justify-content-flex-start align-items-flex-end nowrap"><div class="abspos" data-offset-x="0" data-offset-y="50"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 171 assert_equals: -<div class="flexbox vertical-rl ltr row-reverse justify-content-flex-start align-items-stretch nowrap"><div class="abspos" data-offset-x="50" data-offset-y="50"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 172 assert_equals: -<div class="flexbox vertical-rl ltr row-reverse justify-content-flex-end align-items-flex-start nowrap"><div class="abspos" data-offset-x="50" data-offset-y="0"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 173 assert_equals: -<div class="flexbox vertical-rl ltr row-reverse justify-content-flex-end align-items-flex-end nowrap"><div class="abspos" data-offset-x="0" data-offset-y="0"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 174 assert_equals: -<div class="flexbox vertical-rl ltr row-reverse justify-content-flex-end align-items-stretch nowrap"><div class="abspos" data-offset-x="50" data-offset-y="0"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 175 assert_equals: -<div class="flexbox vertical-rl rtl row-reverse justify-content-flex-start align-items-flex-start nowrap"><div class="abspos" data-offset-x="50" data-offset-y="0"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 176 assert_equals: -<div class="flexbox vertical-rl rtl row-reverse justify-content-flex-start align-items-flex-end nowrap"><div class="abspos" data-offset-x="0" data-offset-y="0"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 177 assert_equals: -<div class="flexbox vertical-rl rtl row-reverse justify-content-flex-start align-items-stretch nowrap"><div class="abspos" data-offset-x="50" data-offset-y="0"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 178 assert_equals: -<div class="flexbox vertical-rl rtl row-reverse justify-content-flex-end align-items-flex-start nowrap"><div class="abspos" data-offset-x="50" data-offset-y="50"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 179 assert_equals: -<div class="flexbox vertical-rl rtl row-reverse justify-content-flex-end align-items-flex-end nowrap"><div class="abspos" data-offset-x="0" data-offset-y="50"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 180 assert_equals: -<div class="flexbox vertical-rl rtl row-reverse justify-content-flex-end align-items-stretch nowrap"><div class="abspos" data-offset-x="50" data-offset-y="50"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 181 assert_equals: -<div class="flexbox vertical-rl ltr column-reverse justify-content-flex-start align-items-flex-start nowrap"><div class="abspos" data-offset-x="0" data-offset-y="0"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 182 assert_equals: -<div class="flexbox vertical-rl ltr column-reverse justify-content-flex-start align-items-flex-end nowrap"><div class="abspos" data-offset-x="0" data-offset-y="50"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 183 assert_equals: -<div class="flexbox vertical-rl ltr column-reverse justify-content-flex-start align-items-stretch nowrap"><div class="abspos" data-offset-x="0" data-offset-y="0"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 184 assert_equals: -<div class="flexbox vertical-rl ltr column-reverse justify-content-flex-end align-items-flex-start nowrap"><div class="abspos" data-offset-x="50" data-offset-y="0"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 185 assert_equals: -<div class="flexbox vertical-rl ltr column-reverse justify-content-flex-end align-items-flex-end nowrap"><div class="abspos" data-offset-x="50" data-offset-y="50"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 186 assert_equals: -<div class="flexbox vertical-rl ltr column-reverse justify-content-flex-end align-items-stretch nowrap"><div class="abspos" data-offset-x="50" data-offset-y="0"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 187 assert_equals: -<div class="flexbox vertical-rl rtl column-reverse justify-content-flex-start align-items-flex-start nowrap"><div class="abspos" data-offset-x="0" data-offset-y="50"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 188 assert_equals: -<div class="flexbox vertical-rl rtl column-reverse justify-content-flex-start align-items-flex-end nowrap"><div class="abspos" data-offset-x="0" data-offset-y="0"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 189 assert_equals: -<div class="flexbox vertical-rl rtl column-reverse justify-content-flex-start align-items-stretch nowrap"><div class="abspos" data-offset-x="0" data-offset-y="50"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 190 assert_equals: -<div class="flexbox vertical-rl rtl column-reverse justify-content-flex-end align-items-flex-start nowrap"><div class="abspos" data-offset-x="50" data-offset-y="50"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 191 assert_equals: -<div class="flexbox vertical-rl rtl column-reverse justify-content-flex-end align-items-flex-end nowrap"><div class="abspos" data-offset-x="50" data-offset-y="0"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 192 assert_equals: -<div class="flexbox vertical-rl rtl column-reverse justify-content-flex-end align-items-stretch nowrap"><div class="abspos" data-offset-x="50" data-offset-y="50"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 193 assert_equals: -<div class="flexbox vertical-rl ltr row justify-content-flex-start align-items-flex-start wrap"><div class="abspos" data-offset-x="50" data-offset-y="0"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 194 assert_equals: -<div class="flexbox vertical-rl ltr row justify-content-flex-start align-items-flex-end wrap"><div class="abspos" data-offset-x="0" data-offset-y="0"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 195 assert_equals: -<div class="flexbox vertical-rl ltr row justify-content-flex-start align-items-stretch wrap"><div class="abspos" data-offset-x="50" data-offset-y="0"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 196 assert_equals: -<div class="flexbox vertical-rl ltr row justify-content-flex-end align-items-flex-start wrap"><div class="abspos" data-offset-x="50" data-offset-y="50"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 197 assert_equals: -<div class="flexbox vertical-rl ltr row justify-content-flex-end align-items-flex-end wrap"><div class="abspos" data-offset-x="0" data-offset-y="50"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 198 assert_equals: -<div class="flexbox vertical-rl ltr row justify-content-flex-end align-items-stretch wrap"><div class="abspos" data-offset-x="50" data-offset-y="50"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 199 assert_equals: -<div class="flexbox vertical-rl rtl row justify-content-flex-start align-items-flex-start wrap"><div class="abspos" data-offset-x="50" data-offset-y="50"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 200 assert_equals: -<div class="flexbox vertical-rl rtl row justify-content-flex-start align-items-flex-end wrap"><div class="abspos" data-offset-x="0" data-offset-y="50"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 201 assert_equals: -<div class="flexbox vertical-rl rtl row justify-content-flex-start align-items-stretch wrap"><div class="abspos" data-offset-x="50" data-offset-y="50"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 202 assert_equals: -<div class="flexbox vertical-rl rtl row justify-content-flex-end align-items-flex-start wrap"><div class="abspos" data-offset-x="50" data-offset-y="0"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 203 assert_equals: -<div class="flexbox vertical-rl rtl row justify-content-flex-end align-items-flex-end wrap"><div class="abspos" data-offset-x="0" data-offset-y="0"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 204 assert_equals: -<div class="flexbox vertical-rl rtl row justify-content-flex-end align-items-stretch wrap"><div class="abspos" data-offset-x="50" data-offset-y="0"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 205 assert_equals: -<div class="flexbox vertical-rl ltr column justify-content-flex-start align-items-flex-start wrap"><div class="abspos" data-offset-x="50" data-offset-y="0"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 206 assert_equals: -<div class="flexbox vertical-rl ltr column justify-content-flex-start align-items-flex-end wrap"><div class="abspos" data-offset-x="50" data-offset-y="50"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 207 assert_equals: -<div class="flexbox vertical-rl ltr column justify-content-flex-start align-items-stretch wrap"><div class="abspos" data-offset-x="50" data-offset-y="0"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 208 assert_equals: -<div class="flexbox vertical-rl ltr column justify-content-flex-end align-items-flex-start wrap"><div class="abspos" data-offset-x="0" data-offset-y="0"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 209 assert_equals: -<div class="flexbox vertical-rl ltr column justify-content-flex-end align-items-flex-end wrap"><div class="abspos" data-offset-x="0" data-offset-y="50"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 210 assert_equals: -<div class="flexbox vertical-rl ltr column justify-content-flex-end align-items-stretch wrap"><div class="abspos" data-offset-x="0" data-offset-y="0"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 211 assert_equals: -<div class="flexbox vertical-rl rtl column justify-content-flex-start align-items-flex-start wrap"><div class="abspos" data-offset-x="50" data-offset-y="50"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 212 assert_equals: -<div class="flexbox vertical-rl rtl column justify-content-flex-start align-items-flex-end wrap"><div class="abspos" data-offset-x="50" data-offset-y="0"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 213 assert_equals: -<div class="flexbox vertical-rl rtl column justify-content-flex-start align-items-stretch wrap"><div class="abspos" data-offset-x="50" data-offset-y="50"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 214 assert_equals: -<div class="flexbox vertical-rl rtl column justify-content-flex-end align-items-flex-start wrap"><div class="abspos" data-offset-x="0" data-offset-y="50"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 215 assert_equals: -<div class="flexbox vertical-rl rtl column justify-content-flex-end align-items-flex-end wrap"><div class="abspos" data-offset-x="0" data-offset-y="0"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 216 assert_equals: -<div class="flexbox vertical-rl rtl column justify-content-flex-end align-items-stretch wrap"><div class="abspos" data-offset-x="0" data-offset-y="50"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 217 assert_equals: -<div class="flexbox vertical-rl ltr row-reverse justify-content-flex-start align-items-flex-start wrap"><div class="abspos" data-offset-x="50" data-offset-y="50"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 218 assert_equals: -<div class="flexbox vertical-rl ltr row-reverse justify-content-flex-start align-items-flex-end wrap"><div class="abspos" data-offset-x="0" data-offset-y="50"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 219 assert_equals: -<div class="flexbox vertical-rl ltr row-reverse justify-content-flex-start align-items-stretch wrap"><div class="abspos" data-offset-x="50" data-offset-y="50"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 220 assert_equals: -<div class="flexbox vertical-rl ltr row-reverse justify-content-flex-end align-items-flex-start wrap"><div class="abspos" data-offset-x="50" data-offset-y="0"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 221 assert_equals: -<div class="flexbox vertical-rl ltr row-reverse justify-content-flex-end align-items-flex-end wrap"><div class="abspos" data-offset-x="0" data-offset-y="0"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 222 assert_equals: -<div class="flexbox vertical-rl ltr row-reverse justify-content-flex-end align-items-stretch wrap"><div class="abspos" data-offset-x="50" data-offset-y="0"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 223 assert_equals: -<div class="flexbox vertical-rl rtl row-reverse justify-content-flex-start align-items-flex-start wrap"><div class="abspos" data-offset-x="50" data-offset-y="0"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 224 assert_equals: -<div class="flexbox vertical-rl rtl row-reverse justify-content-flex-start align-items-flex-end wrap"><div class="abspos" data-offset-x="0" data-offset-y="0"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 225 assert_equals: -<div class="flexbox vertical-rl rtl row-reverse justify-content-flex-start align-items-stretch wrap"><div class="abspos" data-offset-x="50" data-offset-y="0"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 226 assert_equals: -<div class="flexbox vertical-rl rtl row-reverse justify-content-flex-end align-items-flex-start wrap"><div class="abspos" data-offset-x="50" data-offset-y="50"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 227 assert_equals: -<div class="flexbox vertical-rl rtl row-reverse justify-content-flex-end align-items-flex-end wrap"><div class="abspos" data-offset-x="0" data-offset-y="50"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 228 assert_equals: -<div class="flexbox vertical-rl rtl row-reverse justify-content-flex-end align-items-stretch wrap"><div class="abspos" data-offset-x="50" data-offset-y="50"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 229 assert_equals: -<div class="flexbox vertical-rl ltr column-reverse justify-content-flex-start align-items-flex-start wrap"><div class="abspos" data-offset-x="0" data-offset-y="0"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 230 assert_equals: -<div class="flexbox vertical-rl ltr column-reverse justify-content-flex-start align-items-flex-end wrap"><div class="abspos" data-offset-x="0" data-offset-y="50"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 231 assert_equals: -<div class="flexbox vertical-rl ltr column-reverse justify-content-flex-start align-items-stretch wrap"><div class="abspos" data-offset-x="0" data-offset-y="0"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 232 assert_equals: -<div class="flexbox vertical-rl ltr column-reverse justify-content-flex-end align-items-flex-start wrap"><div class="abspos" data-offset-x="50" data-offset-y="0"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 233 assert_equals: -<div class="flexbox vertical-rl ltr column-reverse justify-content-flex-end align-items-flex-end wrap"><div class="abspos" data-offset-x="50" data-offset-y="50"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 234 assert_equals: -<div class="flexbox vertical-rl ltr column-reverse justify-content-flex-end align-items-stretch wrap"><div class="abspos" data-offset-x="50" data-offset-y="0"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 235 assert_equals: -<div class="flexbox vertical-rl rtl column-reverse justify-content-flex-start align-items-flex-start wrap"><div class="abspos" data-offset-x="0" data-offset-y="50"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 236 assert_equals: -<div class="flexbox vertical-rl rtl column-reverse justify-content-flex-start align-items-flex-end wrap"><div class="abspos" data-offset-x="0" data-offset-y="0"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 237 assert_equals: -<div class="flexbox vertical-rl rtl column-reverse justify-content-flex-start align-items-stretch wrap"><div class="abspos" data-offset-x="0" data-offset-y="50"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 238 assert_equals: -<div class="flexbox vertical-rl rtl column-reverse justify-content-flex-end align-items-flex-start wrap"><div class="abspos" data-offset-x="50" data-offset-y="50"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 239 assert_equals: -<div class="flexbox vertical-rl rtl column-reverse justify-content-flex-end align-items-flex-end wrap"><div class="abspos" data-offset-x="50" data-offset-y="0"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 240 assert_equals: -<div class="flexbox vertical-rl rtl column-reverse justify-content-flex-end align-items-stretch wrap"><div class="abspos" data-offset-x="50" data-offset-y="50"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 241 assert_equals: -<div class="flexbox vertical-rl ltr row justify-content-flex-start align-items-flex-start wrap-reverse"><div class="abspos" data-offset-x="0" data-offset-y="0"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 242 assert_equals: -<div class="flexbox vertical-rl ltr row justify-content-flex-start align-items-flex-end wrap-reverse"><div class="abspos" data-offset-x="50" data-offset-y="0"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 243 assert_equals: -<div class="flexbox vertical-rl ltr row justify-content-flex-start align-items-stretch wrap-reverse"><div class="abspos" data-offset-x="0" data-offset-y="0"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 244 assert_equals: -<div class="flexbox vertical-rl ltr row justify-content-flex-end align-items-flex-start wrap-reverse"><div class="abspos" data-offset-x="0" data-offset-y="50"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 245 assert_equals: -<div class="flexbox vertical-rl ltr row justify-content-flex-end align-items-flex-end wrap-reverse"><div class="abspos" data-offset-x="50" data-offset-y="50"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 246 assert_equals: -<div class="flexbox vertical-rl ltr row justify-content-flex-end align-items-stretch wrap-reverse"><div class="abspos" data-offset-x="0" data-offset-y="50"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 247 assert_equals: -<div class="flexbox vertical-rl rtl row justify-content-flex-start align-items-flex-start wrap-reverse"><div class="abspos" data-offset-x="0" data-offset-y="50"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 248 assert_equals: -<div class="flexbox vertical-rl rtl row justify-content-flex-start align-items-flex-end wrap-reverse"><div class="abspos" data-offset-x="50" data-offset-y="50"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 249 assert_equals: -<div class="flexbox vertical-rl rtl row justify-content-flex-start align-items-stretch wrap-reverse"><div class="abspos" data-offset-x="0" data-offset-y="50"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 250 assert_equals: -<div class="flexbox vertical-rl rtl row justify-content-flex-end align-items-flex-start wrap-reverse"><div class="abspos" data-offset-x="0" data-offset-y="0"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 251 assert_equals: -<div class="flexbox vertical-rl rtl row justify-content-flex-end align-items-flex-end wrap-reverse"><div class="abspos" data-offset-x="50" data-offset-y="0"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 252 assert_equals: -<div class="flexbox vertical-rl rtl row justify-content-flex-end align-items-stretch wrap-reverse"><div class="abspos" data-offset-x="0" data-offset-y="0"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 253 assert_equals: -<div class="flexbox vertical-rl ltr column justify-content-flex-start align-items-flex-start wrap-reverse"><div class="abspos" data-offset-x="50" data-offset-y="50"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 254 assert_equals: -<div class="flexbox vertical-rl ltr column justify-content-flex-start align-items-flex-end wrap-reverse"><div class="abspos" data-offset-x="50" data-offset-y="0"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 255 assert_equals: -<div class="flexbox vertical-rl ltr column justify-content-flex-start align-items-stretch wrap-reverse"><div class="abspos" data-offset-x="50" data-offset-y="50"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 256 assert_equals: -<div class="flexbox vertical-rl ltr column justify-content-flex-end align-items-flex-start wrap-reverse"><div class="abspos" data-offset-x="0" data-offset-y="50"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 257 assert_equals: -<div class="flexbox vertical-rl ltr column justify-content-flex-end align-items-flex-end wrap-reverse"><div class="abspos" data-offset-x="0" data-offset-y="0"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 258 assert_equals: -<div class="flexbox vertical-rl ltr column justify-content-flex-end align-items-stretch wrap-reverse"><div class="abspos" data-offset-x="0" data-offset-y="50"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 259 assert_equals: -<div class="flexbox vertical-rl rtl column justify-content-flex-start align-items-flex-start wrap-reverse"><div class="abspos" data-offset-x="50" data-offset-y="0"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 260 assert_equals: -<div class="flexbox vertical-rl rtl column justify-content-flex-start align-items-flex-end wrap-reverse"><div class="abspos" data-offset-x="50" data-offset-y="50"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 261 assert_equals: -<div class="flexbox vertical-rl rtl column justify-content-flex-start align-items-stretch wrap-reverse"><div class="abspos" data-offset-x="50" data-offset-y="0"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 262 assert_equals: -<div class="flexbox vertical-rl rtl column justify-content-flex-end align-items-flex-start wrap-reverse"><div class="abspos" data-offset-x="0" data-offset-y="0"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 263 assert_equals: -<div class="flexbox vertical-rl rtl column justify-content-flex-end align-items-flex-end wrap-reverse"><div class="abspos" data-offset-x="0" data-offset-y="50"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 264 assert_equals: -<div class="flexbox vertical-rl rtl column justify-content-flex-end align-items-stretch wrap-reverse"><div class="abspos" data-offset-x="0" data-offset-y="0"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 265 assert_equals: -<div class="flexbox vertical-rl ltr row-reverse justify-content-flex-start align-items-flex-start wrap-reverse"><div class="abspos" data-offset-x="0" data-offset-y="50"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 266 assert_equals: -<div class="flexbox vertical-rl ltr row-reverse justify-content-flex-start align-items-flex-end wrap-reverse"><div class="abspos" data-offset-x="50" data-offset-y="50"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 267 assert_equals: -<div class="flexbox vertical-rl ltr row-reverse justify-content-flex-start align-items-stretch wrap-reverse"><div class="abspos" data-offset-x="0" data-offset-y="50"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 268 assert_equals: -<div class="flexbox vertical-rl ltr row-reverse justify-content-flex-end align-items-flex-start wrap-reverse"><div class="abspos" data-offset-x="0" data-offset-y="0"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 269 assert_equals: -<div class="flexbox vertical-rl ltr row-reverse justify-content-flex-end align-items-flex-end wrap-reverse"><div class="abspos" data-offset-x="50" data-offset-y="0"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 270 assert_equals: -<div class="flexbox vertical-rl ltr row-reverse justify-content-flex-end align-items-stretch wrap-reverse"><div class="abspos" data-offset-x="0" data-offset-y="0"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 271 assert_equals: -<div class="flexbox vertical-rl rtl row-reverse justify-content-flex-start align-items-flex-start wrap-reverse"><div class="abspos" data-offset-x="0" data-offset-y="0"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 272 assert_equals: -<div class="flexbox vertical-rl rtl row-reverse justify-content-flex-start align-items-flex-end wrap-reverse"><div class="abspos" data-offset-x="50" data-offset-y="0"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 273 assert_equals: -<div class="flexbox vertical-rl rtl row-reverse justify-content-flex-start align-items-stretch wrap-reverse"><div class="abspos" data-offset-x="0" data-offset-y="0"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 274 assert_equals: -<div class="flexbox vertical-rl rtl row-reverse justify-content-flex-end align-items-flex-start wrap-reverse"><div class="abspos" data-offset-x="0" data-offset-y="50"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 275 assert_equals: -<div class="flexbox vertical-rl rtl row-reverse justify-content-flex-end align-items-flex-end wrap-reverse"><div class="abspos" data-offset-x="50" data-offset-y="50"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 276 assert_equals: -<div class="flexbox vertical-rl rtl row-reverse justify-content-flex-end align-items-stretch wrap-reverse"><div class="abspos" data-offset-x="0" data-offset-y="50"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 277 assert_equals: -<div class="flexbox vertical-rl ltr column-reverse justify-content-flex-start align-items-flex-start wrap-reverse"><div class="abspos" data-offset-x="0" data-offset-y="50"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 278 assert_equals: -<div class="flexbox vertical-rl ltr column-reverse justify-content-flex-start align-items-flex-end wrap-reverse"><div class="abspos" data-offset-x="0" data-offset-y="0"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 279 assert_equals: -<div class="flexbox vertical-rl ltr column-reverse justify-content-flex-start align-items-stretch wrap-reverse"><div class="abspos" data-offset-x="0" data-offset-y="50"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 280 assert_equals: -<div class="flexbox vertical-rl ltr column-reverse justify-content-flex-end align-items-flex-start wrap-reverse"><div class="abspos" data-offset-x="50" data-offset-y="50"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 281 assert_equals: -<div class="flexbox vertical-rl ltr column-reverse justify-content-flex-end align-items-flex-end wrap-reverse"><div class="abspos" data-offset-x="50" data-offset-y="0"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 282 assert_equals: -<div class="flexbox vertical-rl ltr column-reverse justify-content-flex-end align-items-stretch wrap-reverse"><div class="abspos" data-offset-x="50" data-offset-y="50"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 283 assert_equals: -<div class="flexbox vertical-rl rtl column-reverse justify-content-flex-start align-items-flex-start wrap-reverse"><div class="abspos" data-offset-x="0" data-offset-y="0"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 284 assert_equals: -<div class="flexbox vertical-rl rtl column-reverse justify-content-flex-start align-items-flex-end wrap-reverse"><div class="abspos" data-offset-x="0" data-offset-y="50"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 285 assert_equals: -<div class="flexbox vertical-rl rtl column-reverse justify-content-flex-start align-items-stretch wrap-reverse"><div class="abspos" data-offset-x="0" data-offset-y="0"></div></div> -offsetLeft expected 0 but got 669 -FAIL .flexbox 286 assert_equals: -<div class="flexbox vertical-rl rtl column-reverse justify-content-flex-end align-items-flex-start wrap-reverse"><div class="abspos" data-offset-x="50" data-offset-y="0"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 287 assert_equals: -<div class="flexbox vertical-rl rtl column-reverse justify-content-flex-end align-items-flex-end wrap-reverse"><div class="abspos" data-offset-x="50" data-offset-y="50"></div></div> -offsetLeft expected 50 but got 719 -FAIL .flexbox 288 assert_equals: -<div class="flexbox vertical-rl rtl column-reverse justify-content-flex-end align-items-stretch wrap-reverse"><div class="abspos" data-offset-x="50" data-offset-y="0"></div></div> -offsetLeft expected 50 but got 719 -PASS .flexbox 289 -PASS .flexbox 290 -PASS .flexbox 291 -PASS .flexbox 292 -PASS .flexbox 293 -PASS .flexbox 294 -PASS .flexbox 295 -PASS .flexbox 296 -PASS .flexbox 297 -PASS .flexbox 298 -PASS .flexbox 299 -PASS .flexbox 300 -PASS .flexbox 301 -PASS .flexbox 302 -PASS .flexbox 303 -PASS .flexbox 304 -PASS .flexbox 305 -PASS .flexbox 306 -PASS .flexbox 307 -PASS .flexbox 308 -PASS .flexbox 309 -PASS .flexbox 310 -PASS .flexbox 311 -PASS .flexbox 312 -PASS .flexbox 313 -PASS .flexbox 314 -PASS .flexbox 315 -PASS .flexbox 316 -PASS .flexbox 317 -PASS .flexbox 318 -PASS .flexbox 319 -PASS .flexbox 320 -PASS .flexbox 321 -PASS .flexbox 322 -PASS .flexbox 323 -PASS .flexbox 324 -PASS .flexbox 325 -PASS .flexbox 326 -PASS .flexbox 327 -PASS .flexbox 328 -PASS .flexbox 329 -PASS .flexbox 330 -PASS .flexbox 331 -PASS .flexbox 332 -PASS .flexbox 333 -PASS .flexbox 334 -PASS .flexbox 335 -PASS .flexbox 336 -PASS .flexbox 337 -PASS .flexbox 338 -PASS .flexbox 339 -PASS .flexbox 340 -PASS .flexbox 341 -PASS .flexbox 342 -PASS .flexbox 343 -PASS .flexbox 344 -PASS .flexbox 345 -PASS .flexbox 346 -PASS .flexbox 347 -PASS .flexbox 348 -PASS .flexbox 349 -PASS .flexbox 350 -PASS .flexbox 351 -PASS .flexbox 352 -PASS .flexbox 353 -PASS .flexbox 354 -PASS .flexbox 355 -PASS .flexbox 356 -PASS .flexbox 357 -PASS .flexbox 358 -PASS .flexbox 359 -PASS .flexbox 360 -PASS .flexbox 361 -PASS .flexbox 362 -PASS .flexbox 363 -PASS .flexbox 364 -PASS .flexbox 365 -PASS .flexbox 366 -PASS .flexbox 367 -PASS .flexbox 368 -PASS .flexbox 369 -PASS .flexbox 370 -PASS .flexbox 371 -PASS .flexbox 372 -PASS .flexbox 373 -PASS .flexbox 374 -PASS .flexbox 375 -PASS .flexbox 376 -PASS .flexbox 377 -PASS .flexbox 378 -PASS .flexbox 379 -PASS .flexbox 380 -PASS .flexbox 381 -PASS .flexbox 382 -PASS .flexbox 383 -PASS .flexbox 384 -PASS .flexbox 385 -PASS .flexbox 386 -PASS .flexbox 387 -PASS .flexbox 388 -PASS .flexbox 389 -PASS .flexbox 390 -PASS .flexbox 391 -PASS .flexbox 392 -PASS .flexbox 393 -PASS .flexbox 394 -PASS .flexbox 395 -PASS .flexbox 396 -PASS .flexbox 397 -PASS .flexbox 398 -PASS .flexbox 399 -PASS .flexbox 400 -PASS .flexbox 401 -PASS .flexbox 402 -PASS .flexbox 403 -PASS .flexbox 404 -PASS .flexbox 405 -PASS .flexbox 406 -PASS .flexbox 407 -PASS .flexbox 408 -PASS .flexbox 409 -PASS .flexbox 410 -PASS .flexbox 411 -PASS .flexbox 412 -PASS .flexbox 413 -PASS .flexbox 414 -PASS .flexbox 415 -PASS .flexbox 416 -PASS .flexbox 417 -PASS .flexbox 418 -PASS .flexbox 419 -PASS .flexbox 420 -PASS .flexbox 421 -PASS .flexbox 422 -PASS .flexbox 423 -PASS .flexbox 424 -PASS .flexbox 425 -PASS .flexbox 426 -PASS .flexbox 427 -PASS .flexbox 428 -PASS .flexbox 429 -PASS .flexbox 430 -PASS .flexbox 431 -PASS .flexbox 432 -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-fonts/cjk-kerning-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-fonts/cjk-kerning-expected.txt deleted file mode 100644 index b746cb9..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-fonts/cjk-kerning-expected.txt +++ /dev/null
@@ -1,12 +0,0 @@ -This is a testharness.js-based test. -PASS expected match: .kernON .latin vs .paltOFFkernON .latin -PASS expected match: .kernON .latin vs .paltONkernON .latin -PASS expected match: .kernOFF .latin vs .paltONkernOFF .latin -FAIL expected match: .kernON .cjk vs .paltONkernON .cjk assert_equals: expected 324 but got 384 -PASS expected match: .default .cjk vs .kernOFF .cjk -PASS expected mismatch: .kernOFF .latin vs .kernON .latin -FAIL expected mismatch: .kernOFF .cjk vs .kernON .cjk assert_not_equals: got disallowed value 384 -PASS expected mismatch: .paltOFFkernON .cjk vs .paltONkernON .cjk -PASS .default .latin matches one of [.kernON .latin, .kernOFF .latin] -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-fonts/font-features-across-space-1-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-fonts/font-features-across-space-1-expected.png deleted file mode 100644 index dc34109..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-fonts/font-features-across-space-1-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-fonts/font-features-across-space-3-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-fonts/font-features-across-space-3-expected.png deleted file mode 100644 index dc34109..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-fonts/font-features-across-space-3-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-fonts/generic-family-keywords-001-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-fonts/generic-family-keywords-001-expected.txt deleted file mode 100644 index eb45d3d4..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-fonts/generic-family-keywords-001-expected.txt +++ /dev/null
@@ -1,16 +0,0 @@ -This is a testharness.js-based test. -PASS @font-face matching for quoted and unquoted serif -PASS @font-face matching for quoted and unquoted sans-serif -PASS @font-face matching for quoted and unquoted cursive -PASS @font-face matching for quoted and unquoted fantasy -PASS @font-face matching for quoted and unquoted monospace -FAIL @font-face matching for quoted and unquoted system-ui assert_equals: quoted system-ui matches @font-face rule expected 50 but got 30 -FAIL @font-face matching for quoted and unquoted emoji assert_equals: unquoted emoji does not match @font-face rule expected 25 but got 50 -PASS @font-face matching for quoted and unquoted math -FAIL @font-face matching for quoted and unquoted fangsong assert_equals: unquoted fangsong does not match @font-face rule expected 25 but got 50 -FAIL @font-face matching for quoted and unquoted ui-serif assert_equals: unquoted ui-serif does not match @font-face rule expected 25 but got 50 -FAIL @font-face matching for quoted and unquoted ui-sans-serif assert_equals: unquoted ui-sans-serif does not match @font-face rule expected 25 but got 50 -FAIL @font-face matching for quoted and unquoted ui-monospace assert_equals: unquoted ui-monospace does not match @font-face rule expected 25 but got 50 -FAIL @font-face matching for quoted and unquoted ui-rounded assert_equals: unquoted ui-rounded does not match @font-face rule expected 25 but got 50 -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-grid/abspos/orthogonal-positioned-grid-descendants-001-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-grid/abspos/orthogonal-positioned-grid-descendants-001-expected.txt deleted file mode 100644 index 2694dc2..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-grid/abspos/orthogonal-positioned-grid-descendants-001-expected.txt +++ /dev/null
@@ -1,304 +0,0 @@ -This is a testharness.js-based test. -Found 100 tests; 0 PASS, 100 FAIL, 0 TIMEOUT, 0 NOTRUN. -FAIL .grid 1 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="45" style="grid-area: auto / auto / 1 / 1; inset: auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="195" style="grid-area: auto / auto / 1 / 1; inset: auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 2 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="45" style="grid-area: auto / auto / 2 / 1; inset: auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="195" style="grid-area: auto / auto / 2 / 1; inset: auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 3 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="45" style="grid-area: auto / auto / 3 / 1; inset: auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="195" style="grid-area: auto / auto / 3 / 1; inset: auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 4 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="45" style="grid-area: auto / auto / auto / 1; inset: auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="195" style="grid-area: auto / auto / auto / 1; inset: auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 5 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="45" style="grid-area: 1 / auto / 2 / 1; inset: auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="195" style="grid-area: 1 / auto / 2 / 1; inset: auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 6 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="45" style="grid-area: 1 / auto / 3 / 1; inset: auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="195" style="grid-area: 1 / auto / 3 / 1; inset: auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 7 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="45" style="grid-area: 1 / auto / auto / 1; inset: auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="195" style="grid-area: 1 / auto / auto / 1; inset: auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 8 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="45" style="grid-area: 2 / auto / 3 / 1; inset: auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="195" style="grid-area: 2 / auto / 3 / 1; inset: auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 9 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="45" style="grid-area: 2 / auto / auto / 1; inset: auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="195" style="grid-area: 2 / auto / auto / 1; inset: auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 10 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="45" style="grid-area: 3 / auto / auto / 1; inset: auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="195" style="grid-area: 3 / auto / auto / 1; inset: auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 11 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="45" style="grid-area: auto / auto / 1 / 2; inset: auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="195" style="grid-area: auto / auto / 1 / 2; inset: auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 12 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="45" style="grid-area: auto / auto / 2 / 2; inset: auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="195" style="grid-area: auto / auto / 2 / 2; inset: auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 13 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="45" style="grid-area: auto / auto / 3 / 2; inset: auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="195" style="grid-area: auto / auto / 3 / 2; inset: auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 14 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="45" style="grid-area: auto / auto / auto / 2; inset: auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="195" style="grid-area: auto / auto / auto / 2; inset: auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 15 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="45" style="grid-area: 1 / auto / 2 / 2; inset: auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="195" style="grid-area: 1 / auto / 2 / 2; inset: auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 16 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="45" style="grid-area: 1 / auto / 3 / 2; inset: auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="195" style="grid-area: 1 / auto / 3 / 2; inset: auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 17 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="45" style="grid-area: 1 / auto / auto / 2; inset: auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="195" style="grid-area: 1 / auto / auto / 2; inset: auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 18 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="45" style="grid-area: 2 / auto / 3 / 2; inset: auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="195" style="grid-area: 2 / auto / 3 / 2; inset: auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 19 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="45" style="grid-area: 2 / auto / auto / 2; inset: auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="195" style="grid-area: 2 / auto / auto / 2; inset: auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 20 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="45" style="grid-area: 3 / auto / auto / 2; inset: auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="195" style="grid-area: 3 / auto / auto / 2; inset: auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 21 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="45" style="grid-area: auto / auto / 1 / 3; inset: auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="195" style="grid-area: auto / auto / 1 / 3; inset: auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 22 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="45" style="grid-area: auto / auto / 2 / 3; inset: auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="195" style="grid-area: auto / auto / 2 / 3; inset: auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 23 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="45" style="grid-area: auto / auto / 3 / 3; inset: auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="195" style="grid-area: auto / auto / 3 / 3; inset: auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 24 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="45" style="grid-area: auto / auto / auto / 3; inset: auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="195" style="grid-area: auto / auto / auto / 3; inset: auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 25 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="45" style="grid-area: 1 / auto / 2 / 3; inset: auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="195" style="grid-area: 1 / auto / 2 / 3; inset: auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 26 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="45" style="grid-area: 1 / auto / 3 / 3; inset: auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="195" style="grid-area: 1 / auto / 3 / 3; inset: auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 27 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="45" style="grid-area: 1 / auto / auto / 3; inset: auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="195" style="grid-area: 1 / auto / auto / 3; inset: auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 28 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="45" style="grid-area: 2 / auto / 3 / 3; inset: auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="195" style="grid-area: 2 / auto / 3 / 3; inset: auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 29 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="45" style="grid-area: 2 / auto / auto / 3; inset: auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="195" style="grid-area: 2 / auto / auto / 3; inset: auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 30 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="45" style="grid-area: 3 / auto / auto / 3; inset: auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="195" style="grid-area: 3 / auto / auto / 3; inset: auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 31 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="45" style="grid-area: auto / auto / 1 / auto; inset: auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="195" style="grid-area: auto / auto / 1 / auto; inset: auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 32 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="45" style="grid-area: auto / auto / 2 / auto; inset: auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="195" style="grid-area: auto / auto / 2 / auto; inset: auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 33 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="45" style="grid-area: auto / auto / 3 / auto; inset: auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="195" style="grid-area: auto / auto / 3 / auto; inset: auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 34 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="45" style="grid-area: auto / auto / auto / auto; inset: auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="195" style="grid-area: auto / auto / auto / auto; inset: auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 35 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="45" style="grid-area: 1 / auto / 2 / auto; inset: auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="195" style="grid-area: 1 / auto / 2 / auto; inset: auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 36 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="45" style="grid-area: 1 / auto / 3 / auto; inset: auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="195" style="grid-area: 1 / auto / 3 / auto; inset: auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 37 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="45" style="grid-area: 1 / auto / auto / auto; inset: auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="195" style="grid-area: 1 / auto / auto / auto; inset: auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 38 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="45" style="grid-area: 2 / auto / 3 / auto; inset: auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="195" style="grid-area: 2 / auto / 3 / auto; inset: auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 39 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="45" style="grid-area: 2 / auto / auto / auto; inset: auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="195" style="grid-area: 2 / auto / auto / auto; inset: auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 40 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="45" style="grid-area: 3 / auto / auto / auto; inset: auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="195" style="grid-area: 3 / auto / auto / auto; inset: auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 41 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="45" style="grid-area: auto / 1 / 1 / 2; inset: auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="195" style="grid-area: auto / 1 / 1 / 2; inset: auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 42 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="45" style="grid-area: auto / 1 / 2 / 2; inset: auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="195" style="grid-area: auto / 1 / 2 / 2; inset: auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 43 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="45" style="grid-area: auto / 1 / 3 / 2; inset: auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="195" style="grid-area: auto / 1 / 3 / 2; inset: auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 44 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="45" style="grid-area: auto / 1 / auto / 2; inset: auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="195" style="grid-area: auto / 1 / auto / 2; inset: auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 45 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="45" style="grid-area: 1 / 1 / 2 / 2; inset: auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="195" style="grid-area: 1 / 1 / 2 / 2; inset: auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 46 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="45" style="grid-area: 1 / 1 / 3 / 2; inset: auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="195" style="grid-area: 1 / 1 / 3 / 2; inset: auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 47 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="45" style="grid-area: 1 / 1 / auto / 2; inset: auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="195" style="grid-area: 1 / 1 / auto / 2; inset: auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 48 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="45" style="grid-area: 2 / 1 / 3 / 2; inset: auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="195" style="grid-area: 2 / 1 / 3 / 2; inset: auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 49 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="45" style="grid-area: 2 / 1 / auto / 2; inset: auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="195" style="grid-area: 2 / 1 / auto / 2; inset: auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 50 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="45" style="grid-area: 3 / 1 / auto / 2; inset: auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="195" style="grid-area: 3 / 1 / auto / 2; inset: auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 51 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="45" style="grid-area: auto / 1 / 1 / 3; inset: auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="195" style="grid-area: auto / 1 / 1 / 3; inset: auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 52 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="45" style="grid-area: auto / 1 / 2 / 3; inset: auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="195" style="grid-area: auto / 1 / 2 / 3; inset: auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 53 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="45" style="grid-area: auto / 1 / 3 / 3; inset: auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="195" style="grid-area: auto / 1 / 3 / 3; inset: auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 54 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="45" style="grid-area: auto / 1 / auto / 3; inset: auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="195" style="grid-area: auto / 1 / auto / 3; inset: auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 55 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="45" style="grid-area: 1 / 1 / 2 / 3; inset: auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="195" style="grid-area: 1 / 1 / 2 / 3; inset: auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 56 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="45" style="grid-area: 1 / 1 / 3 / 3; inset: auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="195" style="grid-area: 1 / 1 / 3 / 3; inset: auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 57 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="45" style="grid-area: 1 / 1 / auto / 3; inset: auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="195" style="grid-area: 1 / 1 / auto / 3; inset: auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 58 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="45" style="grid-area: 2 / 1 / 3 / 3; inset: auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="195" style="grid-area: 2 / 1 / 3 / 3; inset: auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 59 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="45" style="grid-area: 2 / 1 / auto / 3; inset: auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="195" style="grid-area: 2 / 1 / auto / 3; inset: auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 60 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="45" style="grid-area: 3 / 1 / auto / 3; inset: auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="195" style="grid-area: 3 / 1 / auto / 3; inset: auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 61 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="45" style="grid-area: auto / 1 / 1 / auto; inset: auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="195" style="grid-area: auto / 1 / 1 / auto; inset: auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 62 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="45" style="grid-area: auto / 1 / 2 / auto; inset: auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="195" style="grid-area: auto / 1 / 2 / auto; inset: auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 63 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="45" style="grid-area: auto / 1 / 3 / auto; inset: auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="195" style="grid-area: auto / 1 / 3 / auto; inset: auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 64 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="45" style="grid-area: auto / 1 / auto / auto; inset: auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="195" style="grid-area: auto / 1 / auto / auto; inset: auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 65 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="45" style="grid-area: 1 / 1 / 2 / auto; inset: auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="195" style="grid-area: 1 / 1 / 2 / auto; inset: auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 66 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="45" style="grid-area: 1 / 1 / 3 / auto; inset: auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="195" style="grid-area: 1 / 1 / 3 / auto; inset: auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 67 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="45" style="grid-area: 1 / 1 / auto / auto; inset: auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="195" style="grid-area: 1 / 1 / auto / auto; inset: auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 68 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="45" style="grid-area: 2 / 1 / 3 / auto; inset: auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="195" style="grid-area: 2 / 1 / 3 / auto; inset: auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 69 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="45" style="grid-area: 2 / 1 / auto / auto; inset: auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="195" style="grid-area: 2 / 1 / auto / auto; inset: auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 70 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="45" style="grid-area: 3 / 1 / auto / auto; inset: auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="195" style="grid-area: 3 / 1 / auto / auto; inset: auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 71 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="45" style="grid-area: auto / 2 / 1 / 3; inset: auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="195" style="grid-area: auto / 2 / 1 / 3; inset: auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 72 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="45" style="grid-area: auto / 2 / 2 / 3; inset: auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="195" style="grid-area: auto / 2 / 2 / 3; inset: auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 73 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="45" style="grid-area: auto / 2 / 3 / 3; inset: auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="195" style="grid-area: auto / 2 / 3 / 3; inset: auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 74 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="45" style="grid-area: auto / 2 / auto / 3; inset: auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="195" style="grid-area: auto / 2 / auto / 3; inset: auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 75 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="45" style="grid-area: 1 / 2 / 2 / 3; inset: auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="195" style="grid-area: 1 / 2 / 2 / 3; inset: auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 76 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="45" style="grid-area: 1 / 2 / 3 / 3; inset: auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="195" style="grid-area: 1 / 2 / 3 / 3; inset: auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 77 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="45" style="grid-area: 1 / 2 / auto / 3; inset: auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="195" style="grid-area: 1 / 2 / auto / 3; inset: auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 78 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="45" style="grid-area: 2 / 2 / 3 / 3; inset: auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="195" style="grid-area: 2 / 2 / 3 / 3; inset: auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 79 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="45" style="grid-area: 2 / 2 / auto / 3; inset: auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="195" style="grid-area: 2 / 2 / auto / 3; inset: auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 80 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="45" style="grid-area: 3 / 2 / auto / 3; inset: auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="195" style="grid-area: 3 / 2 / auto / 3; inset: auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 81 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="45" style="grid-area: auto / 2 / 1 / auto; inset: auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="195" style="grid-area: auto / 2 / 1 / auto; inset: auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 82 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="45" style="grid-area: auto / 2 / 2 / auto; inset: auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="195" style="grid-area: auto / 2 / 2 / auto; inset: auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 83 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="45" style="grid-area: auto / 2 / 3 / auto; inset: auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="195" style="grid-area: auto / 2 / 3 / auto; inset: auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 84 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="45" style="grid-area: auto / 2 / auto / auto; inset: auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="195" style="grid-area: auto / 2 / auto / auto; inset: auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 85 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="45" style="grid-area: 1 / 2 / 2 / auto; inset: auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="195" style="grid-area: 1 / 2 / 2 / auto; inset: auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 86 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="45" style="grid-area: 1 / 2 / 3 / auto; inset: auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="195" style="grid-area: 1 / 2 / 3 / auto; inset: auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 87 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="45" style="grid-area: 1 / 2 / auto / auto; inset: auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="195" style="grid-area: 1 / 2 / auto / auto; inset: auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 88 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="45" style="grid-area: 2 / 2 / 3 / auto; inset: auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="195" style="grid-area: 2 / 2 / 3 / auto; inset: auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 89 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="45" style="grid-area: 2 / 2 / auto / auto; inset: auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="195" style="grid-area: 2 / 2 / auto / auto; inset: auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 90 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="45" style="grid-area: 3 / 2 / auto / auto; inset: auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="195" style="grid-area: 3 / 2 / auto / auto; inset: auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 91 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="45" style="grid-area: auto / 3 / 1 / auto; inset: auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="195" style="grid-area: auto / 3 / 1 / auto; inset: auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 92 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="45" style="grid-area: auto / 3 / 2 / auto; inset: auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="195" style="grid-area: auto / 3 / 2 / auto; inset: auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 93 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="45" style="grid-area: auto / 3 / 3 / auto; inset: auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="195" style="grid-area: auto / 3 / 3 / auto; inset: auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 94 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="45" style="grid-area: auto / 3 / auto / auto; inset: auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="195" style="grid-area: auto / 3 / auto / auto; inset: auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 95 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="45" style="grid-area: 1 / 3 / 2 / auto; inset: auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="195" style="grid-area: 1 / 3 / 2 / auto; inset: auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 96 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="45" style="grid-area: 1 / 3 / 3 / auto; inset: auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="195" style="grid-area: 1 / 3 / 3 / auto; inset: auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 97 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="45" style="grid-area: 1 / 3 / auto / auto; inset: auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="195" style="grid-area: 1 / 3 / auto / auto; inset: auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 98 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="45" style="grid-area: 2 / 3 / 3 / auto; inset: auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="195" style="grid-area: 2 / 3 / 3 / auto; inset: auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 99 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="45" style="grid-area: 2 / 3 / auto / auto; inset: auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="195" style="grid-area: 2 / 3 / auto / auto; inset: auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 100 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="45" style="grid-area: 3 / 3 / auto / auto; inset: auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="195" style="grid-area: 3 / 3 / auto / auto; inset: auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-grid/abspos/orthogonal-positioned-grid-descendants-002-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-grid/abspos/orthogonal-positioned-grid-descendants-002-expected.txt deleted file mode 100644 index 890cd94..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-grid/abspos/orthogonal-positioned-grid-descendants-002-expected.txt +++ /dev/null
@@ -1,304 +0,0 @@ -This is a testharness.js-based test. -Found 100 tests; 0 PASS, 100 FAIL, 0 TIMEOUT, 0 NOTRUN. -FAIL .grid 1 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="25" data-offset-y="45" style="grid-area: auto / auto / 1 / 1; inset: auto auto auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="25" data-offset-y="195" style="grid-area: auto / auto / 1 / 1; inset: auto auto auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 2 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="25" data-offset-y="45" style="grid-area: auto / auto / 2 / 1; inset: auto auto auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="25" data-offset-y="195" style="grid-area: auto / auto / 2 / 1; inset: auto auto auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 3 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="25" data-offset-y="45" style="grid-area: auto / auto / 3 / 1; inset: auto auto auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="25" data-offset-y="195" style="grid-area: auto / auto / 3 / 1; inset: auto auto auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 4 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="25" data-offset-y="45" style="grid-area: auto / auto / auto / 1; inset: auto auto auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="25" data-offset-y="195" style="grid-area: auto / auto / auto / 1; inset: auto auto auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 5 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="25" data-offset-y="45" style="grid-area: 1 / auto / 2 / 1; inset: auto auto auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="25" data-offset-y="195" style="grid-area: 1 / auto / 2 / 1; inset: auto auto auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 6 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="25" data-offset-y="45" style="grid-area: 1 / auto / 3 / 1; inset: auto auto auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="25" data-offset-y="195" style="grid-area: 1 / auto / 3 / 1; inset: auto auto auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 7 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="25" data-offset-y="45" style="grid-area: 1 / auto / auto / 1; inset: auto auto auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="25" data-offset-y="195" style="grid-area: 1 / auto / auto / 1; inset: auto auto auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 8 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="25" data-offset-y="45" style="grid-area: 2 / auto / 3 / 1; inset: auto auto auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="25" data-offset-y="195" style="grid-area: 2 / auto / 3 / 1; inset: auto auto auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 9 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="25" data-offset-y="45" style="grid-area: 2 / auto / auto / 1; inset: auto auto auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="25" data-offset-y="195" style="grid-area: 2 / auto / auto / 1; inset: auto auto auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 10 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="25" data-offset-y="45" style="grid-area: 3 / auto / auto / 1; inset: auto auto auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="25" data-offset-y="195" style="grid-area: 3 / auto / auto / 1; inset: auto auto auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 11 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="25" data-offset-y="45" style="grid-area: auto / auto / 1 / 2; inset: auto auto auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="25" data-offset-y="195" style="grid-area: auto / auto / 1 / 2; inset: auto auto auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 12 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="25" data-offset-y="45" style="grid-area: auto / auto / 2 / 2; inset: auto auto auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="25" data-offset-y="195" style="grid-area: auto / auto / 2 / 2; inset: auto auto auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 13 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="25" data-offset-y="45" style="grid-area: auto / auto / 3 / 2; inset: auto auto auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="25" data-offset-y="195" style="grid-area: auto / auto / 3 / 2; inset: auto auto auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 14 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="25" data-offset-y="45" style="grid-area: auto / auto / auto / 2; inset: auto auto auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="25" data-offset-y="195" style="grid-area: auto / auto / auto / 2; inset: auto auto auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 15 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="25" data-offset-y="45" style="grid-area: 1 / auto / 2 / 2; inset: auto auto auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="25" data-offset-y="195" style="grid-area: 1 / auto / 2 / 2; inset: auto auto auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 16 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="25" data-offset-y="45" style="grid-area: 1 / auto / 3 / 2; inset: auto auto auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="25" data-offset-y="195" style="grid-area: 1 / auto / 3 / 2; inset: auto auto auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 17 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="25" data-offset-y="45" style="grid-area: 1 / auto / auto / 2; inset: auto auto auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="25" data-offset-y="195" style="grid-area: 1 / auto / auto / 2; inset: auto auto auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 18 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="25" data-offset-y="45" style="grid-area: 2 / auto / 3 / 2; inset: auto auto auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="25" data-offset-y="195" style="grid-area: 2 / auto / 3 / 2; inset: auto auto auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 19 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="25" data-offset-y="45" style="grid-area: 2 / auto / auto / 2; inset: auto auto auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="25" data-offset-y="195" style="grid-area: 2 / auto / auto / 2; inset: auto auto auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 20 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="25" data-offset-y="45" style="grid-area: 3 / auto / auto / 2; inset: auto auto auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="25" data-offset-y="195" style="grid-area: 3 / auto / auto / 2; inset: auto auto auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 21 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="25" data-offset-y="45" style="grid-area: auto / auto / 1 / 3; inset: auto auto auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="25" data-offset-y="195" style="grid-area: auto / auto / 1 / 3; inset: auto auto auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 22 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="25" data-offset-y="45" style="grid-area: auto / auto / 2 / 3; inset: auto auto auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="25" data-offset-y="195" style="grid-area: auto / auto / 2 / 3; inset: auto auto auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 23 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="25" data-offset-y="45" style="grid-area: auto / auto / 3 / 3; inset: auto auto auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="25" data-offset-y="195" style="grid-area: auto / auto / 3 / 3; inset: auto auto auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 24 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="25" data-offset-y="45" style="grid-area: auto / auto / auto / 3; inset: auto auto auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="25" data-offset-y="195" style="grid-area: auto / auto / auto / 3; inset: auto auto auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 25 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="25" data-offset-y="45" style="grid-area: 1 / auto / 2 / 3; inset: auto auto auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="25" data-offset-y="195" style="grid-area: 1 / auto / 2 / 3; inset: auto auto auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 26 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="25" data-offset-y="45" style="grid-area: 1 / auto / 3 / 3; inset: auto auto auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="25" data-offset-y="195" style="grid-area: 1 / auto / 3 / 3; inset: auto auto auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 27 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="25" data-offset-y="45" style="grid-area: 1 / auto / auto / 3; inset: auto auto auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="25" data-offset-y="195" style="grid-area: 1 / auto / auto / 3; inset: auto auto auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 28 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="25" data-offset-y="45" style="grid-area: 2 / auto / 3 / 3; inset: auto auto auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="25" data-offset-y="195" style="grid-area: 2 / auto / 3 / 3; inset: auto auto auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 29 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="25" data-offset-y="45" style="grid-area: 2 / auto / auto / 3; inset: auto auto auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="25" data-offset-y="195" style="grid-area: 2 / auto / auto / 3; inset: auto auto auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 30 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="25" data-offset-y="45" style="grid-area: 3 / auto / auto / 3; inset: auto auto auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="25" data-offset-y="195" style="grid-area: 3 / auto / auto / 3; inset: auto auto auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 31 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="25" data-offset-y="45" style="grid-area: auto / auto / 1 / auto; inset: auto auto auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="25" data-offset-y="195" style="grid-area: auto / auto / 1 / auto; inset: auto auto auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 32 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="25" data-offset-y="45" style="grid-area: auto / auto / 2 / auto; inset: auto auto auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="25" data-offset-y="195" style="grid-area: auto / auto / 2 / auto; inset: auto auto auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 33 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="25" data-offset-y="45" style="grid-area: auto / auto / 3 / auto; inset: auto auto auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="25" data-offset-y="195" style="grid-area: auto / auto / 3 / auto; inset: auto auto auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 34 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="25" data-offset-y="45" style="grid-area: auto / auto / auto / auto; inset: auto auto auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="25" data-offset-y="195" style="grid-area: auto / auto / auto / auto; inset: auto auto auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 35 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="25" data-offset-y="45" style="grid-area: 1 / auto / 2 / auto; inset: auto auto auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="25" data-offset-y="195" style="grid-area: 1 / auto / 2 / auto; inset: auto auto auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 36 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="25" data-offset-y="45" style="grid-area: 1 / auto / 3 / auto; inset: auto auto auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="25" data-offset-y="195" style="grid-area: 1 / auto / 3 / auto; inset: auto auto auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 37 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="25" data-offset-y="45" style="grid-area: 1 / auto / auto / auto; inset: auto auto auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="25" data-offset-y="195" style="grid-area: 1 / auto / auto / auto; inset: auto auto auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 38 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="25" data-offset-y="45" style="grid-area: 2 / auto / 3 / auto; inset: auto auto auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="25" data-offset-y="195" style="grid-area: 2 / auto / 3 / auto; inset: auto auto auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 39 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="25" data-offset-y="45" style="grid-area: 2 / auto / auto / auto; inset: auto auto auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="25" data-offset-y="195" style="grid-area: 2 / auto / auto / auto; inset: auto auto auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 40 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="25" data-offset-y="45" style="grid-area: 3 / auto / auto / auto; inset: auto auto auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="25" data-offset-y="195" style="grid-area: 3 / auto / auto / auto; inset: auto auto auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 41 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="30" data-offset-y="45" style="grid-area: auto / 1 / 1 / 2; inset: auto auto auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="30" data-offset-y="195" style="grid-area: auto / 1 / 1 / 2; inset: auto auto auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 42 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="30" data-offset-y="45" style="grid-area: auto / 1 / 2 / 2; inset: auto auto auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="30" data-offset-y="195" style="grid-area: auto / 1 / 2 / 2; inset: auto auto auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 43 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="30" data-offset-y="45" style="grid-area: auto / 1 / 3 / 2; inset: auto auto auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="30" data-offset-y="195" style="grid-area: auto / 1 / 3 / 2; inset: auto auto auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 44 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="30" data-offset-y="45" style="grid-area: auto / 1 / auto / 2; inset: auto auto auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="30" data-offset-y="195" style="grid-area: auto / 1 / auto / 2; inset: auto auto auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 45 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="30" data-offset-y="45" style="grid-area: 1 / 1 / 2 / 2; inset: auto auto auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="30" data-offset-y="195" style="grid-area: 1 / 1 / 2 / 2; inset: auto auto auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 46 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="30" data-offset-y="45" style="grid-area: 1 / 1 / 3 / 2; inset: auto auto auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="30" data-offset-y="195" style="grid-area: 1 / 1 / 3 / 2; inset: auto auto auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 47 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="30" data-offset-y="45" style="grid-area: 1 / 1 / auto / 2; inset: auto auto auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="30" data-offset-y="195" style="grid-area: 1 / 1 / auto / 2; inset: auto auto auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 48 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="30" data-offset-y="45" style="grid-area: 2 / 1 / 3 / 2; inset: auto auto auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="30" data-offset-y="195" style="grid-area: 2 / 1 / 3 / 2; inset: auto auto auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 49 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="30" data-offset-y="45" style="grid-area: 2 / 1 / auto / 2; inset: auto auto auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="30" data-offset-y="195" style="grid-area: 2 / 1 / auto / 2; inset: auto auto auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 50 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="30" data-offset-y="45" style="grid-area: 3 / 1 / auto / 2; inset: auto auto auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="30" data-offset-y="195" style="grid-area: 3 / 1 / auto / 2; inset: auto auto auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 51 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="30" data-offset-y="45" style="grid-area: auto / 1 / 1 / 3; inset: auto auto auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="30" data-offset-y="195" style="grid-area: auto / 1 / 1 / 3; inset: auto auto auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 52 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="30" data-offset-y="45" style="grid-area: auto / 1 / 2 / 3; inset: auto auto auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="30" data-offset-y="195" style="grid-area: auto / 1 / 2 / 3; inset: auto auto auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 53 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="30" data-offset-y="45" style="grid-area: auto / 1 / 3 / 3; inset: auto auto auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="30" data-offset-y="195" style="grid-area: auto / 1 / 3 / 3; inset: auto auto auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 54 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="30" data-offset-y="45" style="grid-area: auto / 1 / auto / 3; inset: auto auto auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="30" data-offset-y="195" style="grid-area: auto / 1 / auto / 3; inset: auto auto auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 55 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="30" data-offset-y="45" style="grid-area: 1 / 1 / 2 / 3; inset: auto auto auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="30" data-offset-y="195" style="grid-area: 1 / 1 / 2 / 3; inset: auto auto auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 56 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="30" data-offset-y="45" style="grid-area: 1 / 1 / 3 / 3; inset: auto auto auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="30" data-offset-y="195" style="grid-area: 1 / 1 / 3 / 3; inset: auto auto auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 57 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="30" data-offset-y="45" style="grid-area: 1 / 1 / auto / 3; inset: auto auto auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="30" data-offset-y="195" style="grid-area: 1 / 1 / auto / 3; inset: auto auto auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 58 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="30" data-offset-y="45" style="grid-area: 2 / 1 / 3 / 3; inset: auto auto auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="30" data-offset-y="195" style="grid-area: 2 / 1 / 3 / 3; inset: auto auto auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 59 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="30" data-offset-y="45" style="grid-area: 2 / 1 / auto / 3; inset: auto auto auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="30" data-offset-y="195" style="grid-area: 2 / 1 / auto / 3; inset: auto auto auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 60 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="30" data-offset-y="45" style="grid-area: 3 / 1 / auto / 3; inset: auto auto auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="30" data-offset-y="195" style="grid-area: 3 / 1 / auto / 3; inset: auto auto auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 61 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="30" data-offset-y="45" style="grid-area: auto / 1 / 1 / auto; inset: auto auto auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="30" data-offset-y="195" style="grid-area: auto / 1 / 1 / auto; inset: auto auto auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 62 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="30" data-offset-y="45" style="grid-area: auto / 1 / 2 / auto; inset: auto auto auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="30" data-offset-y="195" style="grid-area: auto / 1 / 2 / auto; inset: auto auto auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 63 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="30" data-offset-y="45" style="grid-area: auto / 1 / 3 / auto; inset: auto auto auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="30" data-offset-y="195" style="grid-area: auto / 1 / 3 / auto; inset: auto auto auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 64 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="30" data-offset-y="45" style="grid-area: auto / 1 / auto / auto; inset: auto auto auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="30" data-offset-y="195" style="grid-area: auto / 1 / auto / auto; inset: auto auto auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 65 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="30" data-offset-y="45" style="grid-area: 1 / 1 / 2 / auto; inset: auto auto auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="30" data-offset-y="195" style="grid-area: 1 / 1 / 2 / auto; inset: auto auto auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 66 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="30" data-offset-y="45" style="grid-area: 1 / 1 / 3 / auto; inset: auto auto auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="30" data-offset-y="195" style="grid-area: 1 / 1 / 3 / auto; inset: auto auto auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 67 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="30" data-offset-y="45" style="grid-area: 1 / 1 / auto / auto; inset: auto auto auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="30" data-offset-y="195" style="grid-area: 1 / 1 / auto / auto; inset: auto auto auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 68 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="30" data-offset-y="45" style="grid-area: 2 / 1 / 3 / auto; inset: auto auto auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="30" data-offset-y="195" style="grid-area: 2 / 1 / 3 / auto; inset: auto auto auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 69 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="30" data-offset-y="45" style="grid-area: 2 / 1 / auto / auto; inset: auto auto auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="30" data-offset-y="195" style="grid-area: 2 / 1 / auto / auto; inset: auto auto auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 70 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="30" data-offset-y="45" style="grid-area: 3 / 1 / auto / auto; inset: auto auto auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="30" data-offset-y="195" style="grid-area: 3 / 1 / auto / auto; inset: auto auto auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 71 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="230" data-offset-y="45" style="grid-area: auto / 2 / 1 / 3; inset: auto auto auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="230" data-offset-y="195" style="grid-area: auto / 2 / 1 / 3; inset: auto auto auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 72 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="230" data-offset-y="45" style="grid-area: auto / 2 / 2 / 3; inset: auto auto auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="230" data-offset-y="195" style="grid-area: auto / 2 / 2 / 3; inset: auto auto auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 73 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="230" data-offset-y="45" style="grid-area: auto / 2 / 3 / 3; inset: auto auto auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="230" data-offset-y="195" style="grid-area: auto / 2 / 3 / 3; inset: auto auto auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 74 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="230" data-offset-y="45" style="grid-area: auto / 2 / auto / 3; inset: auto auto auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="230" data-offset-y="195" style="grid-area: auto / 2 / auto / 3; inset: auto auto auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 75 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="230" data-offset-y="45" style="grid-area: 1 / 2 / 2 / 3; inset: auto auto auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="230" data-offset-y="195" style="grid-area: 1 / 2 / 2 / 3; inset: auto auto auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 76 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="230" data-offset-y="45" style="grid-area: 1 / 2 / 3 / 3; inset: auto auto auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="230" data-offset-y="195" style="grid-area: 1 / 2 / 3 / 3; inset: auto auto auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 77 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="230" data-offset-y="45" style="grid-area: 1 / 2 / auto / 3; inset: auto auto auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="230" data-offset-y="195" style="grid-area: 1 / 2 / auto / 3; inset: auto auto auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 78 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="230" data-offset-y="45" style="grid-area: 2 / 2 / 3 / 3; inset: auto auto auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="230" data-offset-y="195" style="grid-area: 2 / 2 / 3 / 3; inset: auto auto auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 79 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="230" data-offset-y="45" style="grid-area: 2 / 2 / auto / 3; inset: auto auto auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="230" data-offset-y="195" style="grid-area: 2 / 2 / auto / 3; inset: auto auto auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 80 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="230" data-offset-y="45" style="grid-area: 3 / 2 / auto / 3; inset: auto auto auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="230" data-offset-y="195" style="grid-area: 3 / 2 / auto / 3; inset: auto auto auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 81 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="230" data-offset-y="45" style="grid-area: auto / 2 / 1 / auto; inset: auto auto auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="230" data-offset-y="195" style="grid-area: auto / 2 / 1 / auto; inset: auto auto auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 82 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="230" data-offset-y="45" style="grid-area: auto / 2 / 2 / auto; inset: auto auto auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="230" data-offset-y="195" style="grid-area: auto / 2 / 2 / auto; inset: auto auto auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 83 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="230" data-offset-y="45" style="grid-area: auto / 2 / 3 / auto; inset: auto auto auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="230" data-offset-y="195" style="grid-area: auto / 2 / 3 / auto; inset: auto auto auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 84 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="230" data-offset-y="45" style="grid-area: auto / 2 / auto / auto; inset: auto auto auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="230" data-offset-y="195" style="grid-area: auto / 2 / auto / auto; inset: auto auto auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 85 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="230" data-offset-y="45" style="grid-area: 1 / 2 / 2 / auto; inset: auto auto auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="230" data-offset-y="195" style="grid-area: 1 / 2 / 2 / auto; inset: auto auto auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 86 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="230" data-offset-y="45" style="grid-area: 1 / 2 / 3 / auto; inset: auto auto auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="230" data-offset-y="195" style="grid-area: 1 / 2 / 3 / auto; inset: auto auto auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 87 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="230" data-offset-y="45" style="grid-area: 1 / 2 / auto / auto; inset: auto auto auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="230" data-offset-y="195" style="grid-area: 1 / 2 / auto / auto; inset: auto auto auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 88 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="230" data-offset-y="45" style="grid-area: 2 / 2 / 3 / auto; inset: auto auto auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="230" data-offset-y="195" style="grid-area: 2 / 2 / 3 / auto; inset: auto auto auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 89 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="230" data-offset-y="45" style="grid-area: 2 / 2 / auto / auto; inset: auto auto auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="230" data-offset-y="195" style="grid-area: 2 / 2 / auto / auto; inset: auto auto auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 90 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="230" data-offset-y="45" style="grid-area: 3 / 2 / auto / auto; inset: auto auto auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="230" data-offset-y="195" style="grid-area: 3 / 2 / auto / auto; inset: auto auto auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 91 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="530" data-offset-y="45" style="grid-area: auto / 3 / 1 / auto; inset: auto auto auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="530" data-offset-y="195" style="grid-area: auto / 3 / 1 / auto; inset: auto auto auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 92 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="530" data-offset-y="45" style="grid-area: auto / 3 / 2 / auto; inset: auto auto auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="530" data-offset-y="195" style="grid-area: auto / 3 / 2 / auto; inset: auto auto auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 93 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="530" data-offset-y="45" style="grid-area: auto / 3 / 3 / auto; inset: auto auto auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="530" data-offset-y="195" style="grid-area: auto / 3 / 3 / auto; inset: auto auto auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 94 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="530" data-offset-y="45" style="grid-area: auto / 3 / auto / auto; inset: auto auto auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="530" data-offset-y="195" style="grid-area: auto / 3 / auto / auto; inset: auto auto auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 95 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="530" data-offset-y="45" style="grid-area: 1 / 3 / 2 / auto; inset: auto auto auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="530" data-offset-y="195" style="grid-area: 1 / 3 / 2 / auto; inset: auto auto auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 96 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="530" data-offset-y="45" style="grid-area: 1 / 3 / 3 / auto; inset: auto auto auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="530" data-offset-y="195" style="grid-area: 1 / 3 / 3 / auto; inset: auto auto auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 97 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="530" data-offset-y="45" style="grid-area: 1 / 3 / auto / auto; inset: auto auto auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="530" data-offset-y="195" style="grid-area: 1 / 3 / auto / auto; inset: auto auto auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 98 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="530" data-offset-y="45" style="grid-area: 2 / 3 / 3 / auto; inset: auto auto auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="530" data-offset-y="195" style="grid-area: 2 / 3 / 3 / auto; inset: auto auto auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 99 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="530" data-offset-y="45" style="grid-area: 2 / 3 / auto / auto; inset: auto auto auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="530" data-offset-y="195" style="grid-area: 2 / 3 / auto / auto; inset: auto auto auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 100 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="530" data-offset-y="45" style="grid-area: 3 / 3 / auto / auto; inset: auto auto auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="530" data-offset-y="195" style="grid-area: 3 / 3 / auto / auto; inset: auto auto auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-grid/abspos/orthogonal-positioned-grid-descendants-003-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-grid/abspos/orthogonal-positioned-grid-descendants-003-expected.txt deleted file mode 100644 index aff2274..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-grid/abspos/orthogonal-positioned-grid-descendants-003-expected.txt +++ /dev/null
@@ -1,304 +0,0 @@ -This is a testharness.js-based test. -Found 100 tests; 0 PASS, 100 FAIL, 0 TIMEOUT, 0 NOTRUN. -FAIL .grid 1 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="30" style="grid-area: auto / auto / 1 / 1; inset: 30px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="30" style="grid-area: auto / auto / 1 / 1; inset: 30px auto auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 2 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="30" style="grid-area: auto / auto / 2 / 1; inset: 30px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="30" style="grid-area: auto / auto / 2 / 1; inset: 30px auto auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 3 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="30" style="grid-area: auto / auto / 3 / 1; inset: 30px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="30" style="grid-area: auto / auto / 3 / 1; inset: 30px auto auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 4 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="30" style="grid-area: auto / auto / auto / 1; inset: 30px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="30" style="grid-area: auto / auto / auto / 1; inset: 30px auto auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 5 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="50" style="grid-area: 1 / auto / 2 / 1; inset: 30px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="50" style="grid-area: 1 / auto / 2 / 1; inset: 30px auto auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 6 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="50" style="grid-area: 1 / auto / 3 / 1; inset: 30px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="50" style="grid-area: 1 / auto / 3 / 1; inset: 30px auto auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 7 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="50" style="grid-area: 1 / auto / auto / 1; inset: 30px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="50" style="grid-area: 1 / auto / auto / 1; inset: 30px auto auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 8 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="200" style="grid-area: 2 / auto / 3 / 1; inset: 30px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="200" style="grid-area: 2 / auto / 3 / 1; inset: 30px auto auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 9 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="200" style="grid-area: 2 / auto / auto / 1; inset: 30px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="200" style="grid-area: 2 / auto / auto / 1; inset: 30px auto auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 10 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="300" style="grid-area: 3 / auto / auto / 1; inset: 30px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="300" style="grid-area: 3 / auto / auto / 1; inset: 30px auto auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 11 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="30" style="grid-area: auto / auto / 1 / 2; inset: 30px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="30" style="grid-area: auto / auto / 1 / 2; inset: 30px auto auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 12 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="30" style="grid-area: auto / auto / 2 / 2; inset: 30px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="30" style="grid-area: auto / auto / 2 / 2; inset: 30px auto auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 13 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="30" style="grid-area: auto / auto / 3 / 2; inset: 30px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="30" style="grid-area: auto / auto / 3 / 2; inset: 30px auto auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 14 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="30" style="grid-area: auto / auto / auto / 2; inset: 30px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="30" style="grid-area: auto / auto / auto / 2; inset: 30px auto auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 15 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="50" style="grid-area: 1 / auto / 2 / 2; inset: 30px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="50" style="grid-area: 1 / auto / 2 / 2; inset: 30px auto auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 16 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="50" style="grid-area: 1 / auto / 3 / 2; inset: 30px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="50" style="grid-area: 1 / auto / 3 / 2; inset: 30px auto auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 17 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="50" style="grid-area: 1 / auto / auto / 2; inset: 30px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="50" style="grid-area: 1 / auto / auto / 2; inset: 30px auto auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 18 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="200" style="grid-area: 2 / auto / 3 / 2; inset: 30px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="200" style="grid-area: 2 / auto / 3 / 2; inset: 30px auto auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 19 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="200" style="grid-area: 2 / auto / auto / 2; inset: 30px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="200" style="grid-area: 2 / auto / auto / 2; inset: 30px auto auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 20 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="300" style="grid-area: 3 / auto / auto / 2; inset: 30px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="300" style="grid-area: 3 / auto / auto / 2; inset: 30px auto auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 21 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="30" style="grid-area: auto / auto / 1 / 3; inset: 30px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="30" style="grid-area: auto / auto / 1 / 3; inset: 30px auto auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 22 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="30" style="grid-area: auto / auto / 2 / 3; inset: 30px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="30" style="grid-area: auto / auto / 2 / 3; inset: 30px auto auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 23 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="30" style="grid-area: auto / auto / 3 / 3; inset: 30px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="30" style="grid-area: auto / auto / 3 / 3; inset: 30px auto auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 24 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="30" style="grid-area: auto / auto / auto / 3; inset: 30px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="30" style="grid-area: auto / auto / auto / 3; inset: 30px auto auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 25 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="50" style="grid-area: 1 / auto / 2 / 3; inset: 30px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="50" style="grid-area: 1 / auto / 2 / 3; inset: 30px auto auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 26 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="50" style="grid-area: 1 / auto / 3 / 3; inset: 30px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="50" style="grid-area: 1 / auto / 3 / 3; inset: 30px auto auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 27 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="50" style="grid-area: 1 / auto / auto / 3; inset: 30px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="50" style="grid-area: 1 / auto / auto / 3; inset: 30px auto auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 28 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="200" style="grid-area: 2 / auto / 3 / 3; inset: 30px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="200" style="grid-area: 2 / auto / 3 / 3; inset: 30px auto auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 29 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="200" style="grid-area: 2 / auto / auto / 3; inset: 30px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="200" style="grid-area: 2 / auto / auto / 3; inset: 30px auto auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 30 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="300" style="grid-area: 3 / auto / auto / 3; inset: 30px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="300" style="grid-area: 3 / auto / auto / 3; inset: 30px auto auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 31 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="30" style="grid-area: auto / auto / 1 / auto; inset: 30px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="30" style="grid-area: auto / auto / 1 / auto; inset: 30px auto auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 32 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="30" style="grid-area: auto / auto / 2 / auto; inset: 30px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="30" style="grid-area: auto / auto / 2 / auto; inset: 30px auto auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 33 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="30" style="grid-area: auto / auto / 3 / auto; inset: 30px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="30" style="grid-area: auto / auto / 3 / auto; inset: 30px auto auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 34 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="30" style="grid-area: auto / auto / auto / auto; inset: 30px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="30" style="grid-area: auto / auto / auto / auto; inset: 30px auto auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 35 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="50" style="grid-area: 1 / auto / 2 / auto; inset: 30px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="50" style="grid-area: 1 / auto / 2 / auto; inset: 30px auto auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 36 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="50" style="grid-area: 1 / auto / 3 / auto; inset: 30px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="50" style="grid-area: 1 / auto / 3 / auto; inset: 30px auto auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 37 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="50" style="grid-area: 1 / auto / auto / auto; inset: 30px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="50" style="grid-area: 1 / auto / auto / auto; inset: 30px auto auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 38 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="200" style="grid-area: 2 / auto / 3 / auto; inset: 30px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="200" style="grid-area: 2 / auto / 3 / auto; inset: 30px auto auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 39 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="200" style="grid-area: 2 / auto / auto / auto; inset: 30px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="200" style="grid-area: 2 / auto / auto / auto; inset: 30px auto auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 40 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="300" style="grid-area: 3 / auto / auto / auto; inset: 30px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="300" style="grid-area: 3 / auto / auto / auto; inset: 30px auto auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 41 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="30" style="grid-area: auto / 1 / 1 / 2; inset: 30px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="30" style="grid-area: auto / 1 / 1 / 2; inset: 30px auto auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 42 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="30" style="grid-area: auto / 1 / 2 / 2; inset: 30px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="30" style="grid-area: auto / 1 / 2 / 2; inset: 30px auto auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 43 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="30" style="grid-area: auto / 1 / 3 / 2; inset: 30px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="30" style="grid-area: auto / 1 / 3 / 2; inset: 30px auto auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 44 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="30" style="grid-area: auto / 1 / auto / 2; inset: 30px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="30" style="grid-area: auto / 1 / auto / 2; inset: 30px auto auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 45 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="50" style="grid-area: 1 / 1 / 2 / 2; inset: 30px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="50" style="grid-area: 1 / 1 / 2 / 2; inset: 30px auto auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 46 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="50" style="grid-area: 1 / 1 / 3 / 2; inset: 30px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="50" style="grid-area: 1 / 1 / 3 / 2; inset: 30px auto auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 47 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="50" style="grid-area: 1 / 1 / auto / 2; inset: 30px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="50" style="grid-area: 1 / 1 / auto / 2; inset: 30px auto auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 48 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="200" style="grid-area: 2 / 1 / 3 / 2; inset: 30px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="200" style="grid-area: 2 / 1 / 3 / 2; inset: 30px auto auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 49 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="200" style="grid-area: 2 / 1 / auto / 2; inset: 30px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="200" style="grid-area: 2 / 1 / auto / 2; inset: 30px auto auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 50 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="300" style="grid-area: 3 / 1 / auto / 2; inset: 30px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="300" style="grid-area: 3 / 1 / auto / 2; inset: 30px auto auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 51 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="30" style="grid-area: auto / 1 / 1 / 3; inset: 30px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="30" style="grid-area: auto / 1 / 1 / 3; inset: 30px auto auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 52 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="30" style="grid-area: auto / 1 / 2 / 3; inset: 30px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="30" style="grid-area: auto / 1 / 2 / 3; inset: 30px auto auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 53 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="30" style="grid-area: auto / 1 / 3 / 3; inset: 30px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="30" style="grid-area: auto / 1 / 3 / 3; inset: 30px auto auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 54 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="30" style="grid-area: auto / 1 / auto / 3; inset: 30px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="30" style="grid-area: auto / 1 / auto / 3; inset: 30px auto auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 55 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="50" style="grid-area: 1 / 1 / 2 / 3; inset: 30px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="50" style="grid-area: 1 / 1 / 2 / 3; inset: 30px auto auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 56 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="50" style="grid-area: 1 / 1 / 3 / 3; inset: 30px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="50" style="grid-area: 1 / 1 / 3 / 3; inset: 30px auto auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 57 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="50" style="grid-area: 1 / 1 / auto / 3; inset: 30px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="50" style="grid-area: 1 / 1 / auto / 3; inset: 30px auto auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 58 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="200" style="grid-area: 2 / 1 / 3 / 3; inset: 30px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="200" style="grid-area: 2 / 1 / 3 / 3; inset: 30px auto auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 59 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="200" style="grid-area: 2 / 1 / auto / 3; inset: 30px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="200" style="grid-area: 2 / 1 / auto / 3; inset: 30px auto auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 60 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="300" style="grid-area: 3 / 1 / auto / 3; inset: 30px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="300" style="grid-area: 3 / 1 / auto / 3; inset: 30px auto auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 61 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="30" style="grid-area: auto / 1 / 1 / auto; inset: 30px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="30" style="grid-area: auto / 1 / 1 / auto; inset: 30px auto auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 62 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="30" style="grid-area: auto / 1 / 2 / auto; inset: 30px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="30" style="grid-area: auto / 1 / 2 / auto; inset: 30px auto auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 63 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="30" style="grid-area: auto / 1 / 3 / auto; inset: 30px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="30" style="grid-area: auto / 1 / 3 / auto; inset: 30px auto auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 64 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="30" style="grid-area: auto / 1 / auto / auto; inset: 30px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="30" style="grid-area: auto / 1 / auto / auto; inset: 30px auto auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 65 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="50" style="grid-area: 1 / 1 / 2 / auto; inset: 30px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="50" style="grid-area: 1 / 1 / 2 / auto; inset: 30px auto auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 66 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="50" style="grid-area: 1 / 1 / 3 / auto; inset: 30px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="50" style="grid-area: 1 / 1 / 3 / auto; inset: 30px auto auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 67 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="50" style="grid-area: 1 / 1 / auto / auto; inset: 30px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="50" style="grid-area: 1 / 1 / auto / auto; inset: 30px auto auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 68 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="200" style="grid-area: 2 / 1 / 3 / auto; inset: 30px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="200" style="grid-area: 2 / 1 / 3 / auto; inset: 30px auto auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 69 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="200" style="grid-area: 2 / 1 / auto / auto; inset: 30px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="200" style="grid-area: 2 / 1 / auto / auto; inset: 30px auto auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 70 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="300" style="grid-area: 3 / 1 / auto / auto; inset: 30px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="300" style="grid-area: 3 / 1 / auto / auto; inset: 30px auto auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 71 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="30" style="grid-area: auto / 2 / 1 / 3; inset: 30px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="30" style="grid-area: auto / 2 / 1 / 3; inset: 30px auto auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 72 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="30" style="grid-area: auto / 2 / 2 / 3; inset: 30px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="30" style="grid-area: auto / 2 / 2 / 3; inset: 30px auto auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 73 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="30" style="grid-area: auto / 2 / 3 / 3; inset: 30px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="30" style="grid-area: auto / 2 / 3 / 3; inset: 30px auto auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 74 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="30" style="grid-area: auto / 2 / auto / 3; inset: 30px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="30" style="grid-area: auto / 2 / auto / 3; inset: 30px auto auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 75 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="50" style="grid-area: 1 / 2 / 2 / 3; inset: 30px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="50" style="grid-area: 1 / 2 / 2 / 3; inset: 30px auto auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 76 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="50" style="grid-area: 1 / 2 / 3 / 3; inset: 30px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="50" style="grid-area: 1 / 2 / 3 / 3; inset: 30px auto auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 77 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="50" style="grid-area: 1 / 2 / auto / 3; inset: 30px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="50" style="grid-area: 1 / 2 / auto / 3; inset: 30px auto auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 78 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="200" style="grid-area: 2 / 2 / 3 / 3; inset: 30px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="200" style="grid-area: 2 / 2 / 3 / 3; inset: 30px auto auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 79 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="200" style="grid-area: 2 / 2 / auto / 3; inset: 30px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="200" style="grid-area: 2 / 2 / auto / 3; inset: 30px auto auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 80 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="300" style="grid-area: 3 / 2 / auto / 3; inset: 30px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="300" style="grid-area: 3 / 2 / auto / 3; inset: 30px auto auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 81 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="30" style="grid-area: auto / 2 / 1 / auto; inset: 30px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="30" style="grid-area: auto / 2 / 1 / auto; inset: 30px auto auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 82 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="30" style="grid-area: auto / 2 / 2 / auto; inset: 30px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="30" style="grid-area: auto / 2 / 2 / auto; inset: 30px auto auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 83 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="30" style="grid-area: auto / 2 / 3 / auto; inset: 30px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="30" style="grid-area: auto / 2 / 3 / auto; inset: 30px auto auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 84 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="30" style="grid-area: auto / 2 / auto / auto; inset: 30px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="30" style="grid-area: auto / 2 / auto / auto; inset: 30px auto auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 85 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="50" style="grid-area: 1 / 2 / 2 / auto; inset: 30px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="50" style="grid-area: 1 / 2 / 2 / auto; inset: 30px auto auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 86 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="50" style="grid-area: 1 / 2 / 3 / auto; inset: 30px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="50" style="grid-area: 1 / 2 / 3 / auto; inset: 30px auto auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 87 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="50" style="grid-area: 1 / 2 / auto / auto; inset: 30px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="50" style="grid-area: 1 / 2 / auto / auto; inset: 30px auto auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 88 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="200" style="grid-area: 2 / 2 / 3 / auto; inset: 30px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="200" style="grid-area: 2 / 2 / 3 / auto; inset: 30px auto auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 89 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="200" style="grid-area: 2 / 2 / auto / auto; inset: 30px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="200" style="grid-area: 2 / 2 / auto / auto; inset: 30px auto auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 90 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="300" style="grid-area: 3 / 2 / auto / auto; inset: 30px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="300" style="grid-area: 3 / 2 / auto / auto; inset: 30px auto auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 91 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="30" style="grid-area: auto / 3 / 1 / auto; inset: 30px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="30" style="grid-area: auto / 3 / 1 / auto; inset: 30px auto auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 92 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="30" style="grid-area: auto / 3 / 2 / auto; inset: 30px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="30" style="grid-area: auto / 3 / 2 / auto; inset: 30px auto auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 93 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="30" style="grid-area: auto / 3 / 3 / auto; inset: 30px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="30" style="grid-area: auto / 3 / 3 / auto; inset: 30px auto auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 94 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="30" style="grid-area: auto / 3 / auto / auto; inset: 30px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="30" style="grid-area: auto / 3 / auto / auto; inset: 30px auto auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 95 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="50" style="grid-area: 1 / 3 / 2 / auto; inset: 30px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="50" style="grid-area: 1 / 3 / 2 / auto; inset: 30px auto auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 96 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="50" style="grid-area: 1 / 3 / 3 / auto; inset: 30px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="50" style="grid-area: 1 / 3 / 3 / auto; inset: 30px auto auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 97 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="50" style="grid-area: 1 / 3 / auto / auto; inset: 30px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="50" style="grid-area: 1 / 3 / auto / auto; inset: 30px auto auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 98 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="200" style="grid-area: 2 / 3 / 3 / auto; inset: 30px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="200" style="grid-area: 2 / 3 / 3 / auto; inset: 30px auto auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 99 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="200" style="grid-area: 2 / 3 / auto / auto; inset: 30px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="200" style="grid-area: 2 / 3 / auto / auto; inset: 30px auto auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 100 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="300" style="grid-area: 3 / 3 / auto / auto; inset: 30px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="300" style="grid-area: 3 / 3 / auto / auto; inset: 30px auto auto;">XX</div></div></div> -offsetLeft expected 55 but got 45 -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-grid/abspos/orthogonal-positioned-grid-descendants-004-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-grid/abspos/orthogonal-positioned-grid-descendants-004-expected.txt deleted file mode 100644 index 577ed6c..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-grid/abspos/orthogonal-positioned-grid-descendants-004-expected.txt +++ /dev/null
@@ -1,304 +0,0 @@ -This is a testharness.js-based test. -Found 100 tests; 0 PASS, 100 FAIL, 0 TIMEOUT, 0 NOTRUN. -FAIL .grid 1 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="-55" data-offset-y="45" style="grid-area: auto / auto / 1 / 1; inset: auto 35px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="-55" data-offset-y="195" style="grid-area: auto / auto / 1 / 1; inset: auto 35px auto auto;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 2 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="-55" data-offset-y="45" style="grid-area: auto / auto / 2 / 1; inset: auto 35px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="-55" data-offset-y="195" style="grid-area: auto / auto / 2 / 1; inset: auto 35px auto auto;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 3 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="-55" data-offset-y="45" style="grid-area: auto / auto / 3 / 1; inset: auto 35px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="-55" data-offset-y="195" style="grid-area: auto / auto / 3 / 1; inset: auto 35px auto auto;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 4 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="-55" data-offset-y="45" style="grid-area: auto / auto / auto / 1; inset: auto 35px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="-55" data-offset-y="195" style="grid-area: auto / auto / auto / 1; inset: auto 35px auto auto;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 5 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="-55" data-offset-y="45" style="grid-area: 1 / auto / 2 / 1; inset: auto 35px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="-55" data-offset-y="195" style="grid-area: 1 / auto / 2 / 1; inset: auto 35px auto auto;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 6 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="-55" data-offset-y="45" style="grid-area: 1 / auto / 3 / 1; inset: auto 35px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="-55" data-offset-y="195" style="grid-area: 1 / auto / 3 / 1; inset: auto 35px auto auto;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 7 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="-55" data-offset-y="45" style="grid-area: 1 / auto / auto / 1; inset: auto 35px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="-55" data-offset-y="195" style="grid-area: 1 / auto / auto / 1; inset: auto 35px auto auto;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 8 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="-55" data-offset-y="45" style="grid-area: 2 / auto / 3 / 1; inset: auto 35px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="-55" data-offset-y="195" style="grid-area: 2 / auto / 3 / 1; inset: auto 35px auto auto;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 9 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="-55" data-offset-y="45" style="grid-area: 2 / auto / auto / 1; inset: auto 35px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="-55" data-offset-y="195" style="grid-area: 2 / auto / auto / 1; inset: auto 35px auto auto;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 10 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="-55" data-offset-y="45" style="grid-area: 3 / auto / auto / 1; inset: auto 35px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="-55" data-offset-y="195" style="grid-area: 3 / auto / auto / 1; inset: auto 35px auto auto;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 11 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="145" data-offset-y="45" style="grid-area: auto / auto / 1 / 2; inset: auto 35px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="145" data-offset-y="195" style="grid-area: auto / auto / 1 / 2; inset: auto 35px auto auto;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 12 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="145" data-offset-y="45" style="grid-area: auto / auto / 2 / 2; inset: auto 35px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="145" data-offset-y="195" style="grid-area: auto / auto / 2 / 2; inset: auto 35px auto auto;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 13 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="145" data-offset-y="45" style="grid-area: auto / auto / 3 / 2; inset: auto 35px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="145" data-offset-y="195" style="grid-area: auto / auto / 3 / 2; inset: auto 35px auto auto;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 14 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="145" data-offset-y="45" style="grid-area: auto / auto / auto / 2; inset: auto 35px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="145" data-offset-y="195" style="grid-area: auto / auto / auto / 2; inset: auto 35px auto auto;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 15 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="145" data-offset-y="45" style="grid-area: 1 / auto / 2 / 2; inset: auto 35px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="145" data-offset-y="195" style="grid-area: 1 / auto / 2 / 2; inset: auto 35px auto auto;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 16 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="145" data-offset-y="45" style="grid-area: 1 / auto / 3 / 2; inset: auto 35px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="145" data-offset-y="195" style="grid-area: 1 / auto / 3 / 2; inset: auto 35px auto auto;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 17 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="145" data-offset-y="45" style="grid-area: 1 / auto / auto / 2; inset: auto 35px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="145" data-offset-y="195" style="grid-area: 1 / auto / auto / 2; inset: auto 35px auto auto;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 18 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="145" data-offset-y="45" style="grid-area: 2 / auto / 3 / 2; inset: auto 35px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="145" data-offset-y="195" style="grid-area: 2 / auto / 3 / 2; inset: auto 35px auto auto;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 19 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="145" data-offset-y="45" style="grid-area: 2 / auto / auto / 2; inset: auto 35px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="145" data-offset-y="195" style="grid-area: 2 / auto / auto / 2; inset: auto 35px auto auto;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 20 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="145" data-offset-y="45" style="grid-area: 3 / auto / auto / 2; inset: auto 35px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="145" data-offset-y="195" style="grid-area: 3 / auto / auto / 2; inset: auto 35px auto auto;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 21 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="445" data-offset-y="45" style="grid-area: auto / auto / 1 / 3; inset: auto 35px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="445" data-offset-y="195" style="grid-area: auto / auto / 1 / 3; inset: auto 35px auto auto;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 22 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="445" data-offset-y="45" style="grid-area: auto / auto / 2 / 3; inset: auto 35px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="445" data-offset-y="195" style="grid-area: auto / auto / 2 / 3; inset: auto 35px auto auto;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 23 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="445" data-offset-y="45" style="grid-area: auto / auto / 3 / 3; inset: auto 35px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="445" data-offset-y="195" style="grid-area: auto / auto / 3 / 3; inset: auto 35px auto auto;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 24 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="445" data-offset-y="45" style="grid-area: auto / auto / auto / 3; inset: auto 35px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="445" data-offset-y="195" style="grid-area: auto / auto / auto / 3; inset: auto 35px auto auto;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 25 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="445" data-offset-y="45" style="grid-area: 1 / auto / 2 / 3; inset: auto 35px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="445" data-offset-y="195" style="grid-area: 1 / auto / 2 / 3; inset: auto 35px auto auto;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 26 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="445" data-offset-y="45" style="grid-area: 1 / auto / 3 / 3; inset: auto 35px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="445" data-offset-y="195" style="grid-area: 1 / auto / 3 / 3; inset: auto 35px auto auto;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 27 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="445" data-offset-y="45" style="grid-area: 1 / auto / auto / 3; inset: auto 35px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="445" data-offset-y="195" style="grid-area: 1 / auto / auto / 3; inset: auto 35px auto auto;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 28 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="445" data-offset-y="45" style="grid-area: 2 / auto / 3 / 3; inset: auto 35px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="445" data-offset-y="195" style="grid-area: 2 / auto / 3 / 3; inset: auto 35px auto auto;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 29 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="445" data-offset-y="45" style="grid-area: 2 / auto / auto / 3; inset: auto 35px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="445" data-offset-y="195" style="grid-area: 2 / auto / auto / 3; inset: auto 35px auto auto;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 30 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="445" data-offset-y="45" style="grid-area: 3 / auto / auto / 3; inset: auto 35px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="445" data-offset-y="195" style="grid-area: 3 / auto / auto / 3; inset: auto 35px auto auto;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 31 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="510" data-offset-y="45" style="grid-area: auto / auto / 1 / auto; inset: auto 35px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="510" data-offset-y="195" style="grid-area: auto / auto / 1 / auto; inset: auto 35px auto auto;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 32 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="510" data-offset-y="45" style="grid-area: auto / auto / 2 / auto; inset: auto 35px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="510" data-offset-y="195" style="grid-area: auto / auto / 2 / auto; inset: auto 35px auto auto;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 33 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="510" data-offset-y="45" style="grid-area: auto / auto / 3 / auto; inset: auto 35px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="510" data-offset-y="195" style="grid-area: auto / auto / 3 / auto; inset: auto 35px auto auto;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 34 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="510" data-offset-y="45" style="grid-area: auto / auto / auto / auto; inset: auto 35px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="510" data-offset-y="195" style="grid-area: auto / auto / auto / auto; inset: auto 35px auto auto;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 35 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="510" data-offset-y="45" style="grid-area: 1 / auto / 2 / auto; inset: auto 35px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="510" data-offset-y="195" style="grid-area: 1 / auto / 2 / auto; inset: auto 35px auto auto;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 36 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="510" data-offset-y="45" style="grid-area: 1 / auto / 3 / auto; inset: auto 35px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="510" data-offset-y="195" style="grid-area: 1 / auto / 3 / auto; inset: auto 35px auto auto;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 37 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="510" data-offset-y="45" style="grid-area: 1 / auto / auto / auto; inset: auto 35px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="510" data-offset-y="195" style="grid-area: 1 / auto / auto / auto; inset: auto 35px auto auto;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 38 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="510" data-offset-y="45" style="grid-area: 2 / auto / 3 / auto; inset: auto 35px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="510" data-offset-y="195" style="grid-area: 2 / auto / 3 / auto; inset: auto 35px auto auto;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 39 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="510" data-offset-y="45" style="grid-area: 2 / auto / auto / auto; inset: auto 35px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="510" data-offset-y="195" style="grid-area: 2 / auto / auto / auto; inset: auto 35px auto auto;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 40 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="510" data-offset-y="45" style="grid-area: 3 / auto / auto / auto; inset: auto 35px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="510" data-offset-y="195" style="grid-area: 3 / auto / auto / auto; inset: auto 35px auto auto;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 41 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="145" data-offset-y="45" style="grid-area: auto / 1 / 1 / 2; inset: auto 35px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="145" data-offset-y="195" style="grid-area: auto / 1 / 1 / 2; inset: auto 35px auto auto;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 42 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="145" data-offset-y="45" style="grid-area: auto / 1 / 2 / 2; inset: auto 35px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="145" data-offset-y="195" style="grid-area: auto / 1 / 2 / 2; inset: auto 35px auto auto;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 43 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="145" data-offset-y="45" style="grid-area: auto / 1 / 3 / 2; inset: auto 35px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="145" data-offset-y="195" style="grid-area: auto / 1 / 3 / 2; inset: auto 35px auto auto;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 44 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="145" data-offset-y="45" style="grid-area: auto / 1 / auto / 2; inset: auto 35px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="145" data-offset-y="195" style="grid-area: auto / 1 / auto / 2; inset: auto 35px auto auto;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 45 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="145" data-offset-y="45" style="grid-area: 1 / 1 / 2 / 2; inset: auto 35px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="145" data-offset-y="195" style="grid-area: 1 / 1 / 2 / 2; inset: auto 35px auto auto;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 46 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="145" data-offset-y="45" style="grid-area: 1 / 1 / 3 / 2; inset: auto 35px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="145" data-offset-y="195" style="grid-area: 1 / 1 / 3 / 2; inset: auto 35px auto auto;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 47 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="145" data-offset-y="45" style="grid-area: 1 / 1 / auto / 2; inset: auto 35px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="145" data-offset-y="195" style="grid-area: 1 / 1 / auto / 2; inset: auto 35px auto auto;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 48 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="145" data-offset-y="45" style="grid-area: 2 / 1 / 3 / 2; inset: auto 35px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="145" data-offset-y="195" style="grid-area: 2 / 1 / 3 / 2; inset: auto 35px auto auto;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 49 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="145" data-offset-y="45" style="grid-area: 2 / 1 / auto / 2; inset: auto 35px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="145" data-offset-y="195" style="grid-area: 2 / 1 / auto / 2; inset: auto 35px auto auto;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 50 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="145" data-offset-y="45" style="grid-area: 3 / 1 / auto / 2; inset: auto 35px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="145" data-offset-y="195" style="grid-area: 3 / 1 / auto / 2; inset: auto 35px auto auto;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 51 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="445" data-offset-y="45" style="grid-area: auto / 1 / 1 / 3; inset: auto 35px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="445" data-offset-y="195" style="grid-area: auto / 1 / 1 / 3; inset: auto 35px auto auto;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 52 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="445" data-offset-y="45" style="grid-area: auto / 1 / 2 / 3; inset: auto 35px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="445" data-offset-y="195" style="grid-area: auto / 1 / 2 / 3; inset: auto 35px auto auto;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 53 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="445" data-offset-y="45" style="grid-area: auto / 1 / 3 / 3; inset: auto 35px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="445" data-offset-y="195" style="grid-area: auto / 1 / 3 / 3; inset: auto 35px auto auto;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 54 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="445" data-offset-y="45" style="grid-area: auto / 1 / auto / 3; inset: auto 35px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="445" data-offset-y="195" style="grid-area: auto / 1 / auto / 3; inset: auto 35px auto auto;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 55 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="445" data-offset-y="45" style="grid-area: 1 / 1 / 2 / 3; inset: auto 35px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="445" data-offset-y="195" style="grid-area: 1 / 1 / 2 / 3; inset: auto 35px auto auto;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 56 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="445" data-offset-y="45" style="grid-area: 1 / 1 / 3 / 3; inset: auto 35px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="445" data-offset-y="195" style="grid-area: 1 / 1 / 3 / 3; inset: auto 35px auto auto;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 57 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="445" data-offset-y="45" style="grid-area: 1 / 1 / auto / 3; inset: auto 35px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="445" data-offset-y="195" style="grid-area: 1 / 1 / auto / 3; inset: auto 35px auto auto;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 58 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="445" data-offset-y="45" style="grid-area: 2 / 1 / 3 / 3; inset: auto 35px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="445" data-offset-y="195" style="grid-area: 2 / 1 / 3 / 3; inset: auto 35px auto auto;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 59 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="445" data-offset-y="45" style="grid-area: 2 / 1 / auto / 3; inset: auto 35px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="445" data-offset-y="195" style="grid-area: 2 / 1 / auto / 3; inset: auto 35px auto auto;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 60 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="445" data-offset-y="45" style="grid-area: 3 / 1 / auto / 3; inset: auto 35px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="445" data-offset-y="195" style="grid-area: 3 / 1 / auto / 3; inset: auto 35px auto auto;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 61 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="510" data-offset-y="45" style="grid-area: auto / 1 / 1 / auto; inset: auto 35px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="510" data-offset-y="195" style="grid-area: auto / 1 / 1 / auto; inset: auto 35px auto auto;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 62 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="510" data-offset-y="45" style="grid-area: auto / 1 / 2 / auto; inset: auto 35px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="510" data-offset-y="195" style="grid-area: auto / 1 / 2 / auto; inset: auto 35px auto auto;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 63 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="510" data-offset-y="45" style="grid-area: auto / 1 / 3 / auto; inset: auto 35px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="510" data-offset-y="195" style="grid-area: auto / 1 / 3 / auto; inset: auto 35px auto auto;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 64 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="510" data-offset-y="45" style="grid-area: auto / 1 / auto / auto; inset: auto 35px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="510" data-offset-y="195" style="grid-area: auto / 1 / auto / auto; inset: auto 35px auto auto;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 65 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="510" data-offset-y="45" style="grid-area: 1 / 1 / 2 / auto; inset: auto 35px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="510" data-offset-y="195" style="grid-area: 1 / 1 / 2 / auto; inset: auto 35px auto auto;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 66 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="510" data-offset-y="45" style="grid-area: 1 / 1 / 3 / auto; inset: auto 35px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="510" data-offset-y="195" style="grid-area: 1 / 1 / 3 / auto; inset: auto 35px auto auto;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 67 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="510" data-offset-y="45" style="grid-area: 1 / 1 / auto / auto; inset: auto 35px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="510" data-offset-y="195" style="grid-area: 1 / 1 / auto / auto; inset: auto 35px auto auto;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 68 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="510" data-offset-y="45" style="grid-area: 2 / 1 / 3 / auto; inset: auto 35px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="510" data-offset-y="195" style="grid-area: 2 / 1 / 3 / auto; inset: auto 35px auto auto;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 69 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="510" data-offset-y="45" style="grid-area: 2 / 1 / auto / auto; inset: auto 35px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="510" data-offset-y="195" style="grid-area: 2 / 1 / auto / auto; inset: auto 35px auto auto;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 70 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="510" data-offset-y="45" style="grid-area: 3 / 1 / auto / auto; inset: auto 35px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="510" data-offset-y="195" style="grid-area: 3 / 1 / auto / auto; inset: auto 35px auto auto;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 71 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="445" data-offset-y="45" style="grid-area: auto / 2 / 1 / 3; inset: auto 35px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="445" data-offset-y="195" style="grid-area: auto / 2 / 1 / 3; inset: auto 35px auto auto;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 72 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="445" data-offset-y="45" style="grid-area: auto / 2 / 2 / 3; inset: auto 35px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="445" data-offset-y="195" style="grid-area: auto / 2 / 2 / 3; inset: auto 35px auto auto;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 73 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="445" data-offset-y="45" style="grid-area: auto / 2 / 3 / 3; inset: auto 35px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="445" data-offset-y="195" style="grid-area: auto / 2 / 3 / 3; inset: auto 35px auto auto;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 74 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="445" data-offset-y="45" style="grid-area: auto / 2 / auto / 3; inset: auto 35px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="445" data-offset-y="195" style="grid-area: auto / 2 / auto / 3; inset: auto 35px auto auto;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 75 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="445" data-offset-y="45" style="grid-area: 1 / 2 / 2 / 3; inset: auto 35px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="445" data-offset-y="195" style="grid-area: 1 / 2 / 2 / 3; inset: auto 35px auto auto;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 76 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="445" data-offset-y="45" style="grid-area: 1 / 2 / 3 / 3; inset: auto 35px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="445" data-offset-y="195" style="grid-area: 1 / 2 / 3 / 3; inset: auto 35px auto auto;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 77 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="445" data-offset-y="45" style="grid-area: 1 / 2 / auto / 3; inset: auto 35px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="445" data-offset-y="195" style="grid-area: 1 / 2 / auto / 3; inset: auto 35px auto auto;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 78 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="445" data-offset-y="45" style="grid-area: 2 / 2 / 3 / 3; inset: auto 35px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="445" data-offset-y="195" style="grid-area: 2 / 2 / 3 / 3; inset: auto 35px auto auto;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 79 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="445" data-offset-y="45" style="grid-area: 2 / 2 / auto / 3; inset: auto 35px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="445" data-offset-y="195" style="grid-area: 2 / 2 / auto / 3; inset: auto 35px auto auto;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 80 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="445" data-offset-y="45" style="grid-area: 3 / 2 / auto / 3; inset: auto 35px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="445" data-offset-y="195" style="grid-area: 3 / 2 / auto / 3; inset: auto 35px auto auto;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 81 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="510" data-offset-y="45" style="grid-area: auto / 2 / 1 / auto; inset: auto 35px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="510" data-offset-y="195" style="grid-area: auto / 2 / 1 / auto; inset: auto 35px auto auto;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 82 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="510" data-offset-y="45" style="grid-area: auto / 2 / 2 / auto; inset: auto 35px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="510" data-offset-y="195" style="grid-area: auto / 2 / 2 / auto; inset: auto 35px auto auto;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 83 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="510" data-offset-y="45" style="grid-area: auto / 2 / 3 / auto; inset: auto 35px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="510" data-offset-y="195" style="grid-area: auto / 2 / 3 / auto; inset: auto 35px auto auto;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 84 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="510" data-offset-y="45" style="grid-area: auto / 2 / auto / auto; inset: auto 35px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="510" data-offset-y="195" style="grid-area: auto / 2 / auto / auto; inset: auto 35px auto auto;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 85 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="510" data-offset-y="45" style="grid-area: 1 / 2 / 2 / auto; inset: auto 35px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="510" data-offset-y="195" style="grid-area: 1 / 2 / 2 / auto; inset: auto 35px auto auto;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 86 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="510" data-offset-y="45" style="grid-area: 1 / 2 / 3 / auto; inset: auto 35px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="510" data-offset-y="195" style="grid-area: 1 / 2 / 3 / auto; inset: auto 35px auto auto;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 87 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="510" data-offset-y="45" style="grid-area: 1 / 2 / auto / auto; inset: auto 35px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="510" data-offset-y="195" style="grid-area: 1 / 2 / auto / auto; inset: auto 35px auto auto;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 88 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="510" data-offset-y="45" style="grid-area: 2 / 2 / 3 / auto; inset: auto 35px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="510" data-offset-y="195" style="grid-area: 2 / 2 / 3 / auto; inset: auto 35px auto auto;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 89 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="510" data-offset-y="45" style="grid-area: 2 / 2 / auto / auto; inset: auto 35px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="510" data-offset-y="195" style="grid-area: 2 / 2 / auto / auto; inset: auto 35px auto auto;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 90 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="510" data-offset-y="45" style="grid-area: 3 / 2 / auto / auto; inset: auto 35px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="510" data-offset-y="195" style="grid-area: 3 / 2 / auto / auto; inset: auto 35px auto auto;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 91 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="510" data-offset-y="45" style="grid-area: auto / 3 / 1 / auto; inset: auto 35px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="510" data-offset-y="195" style="grid-area: auto / 3 / 1 / auto; inset: auto 35px auto auto;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 92 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="510" data-offset-y="45" style="grid-area: auto / 3 / 2 / auto; inset: auto 35px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="510" data-offset-y="195" style="grid-area: auto / 3 / 2 / auto; inset: auto 35px auto auto;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 93 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="510" data-offset-y="45" style="grid-area: auto / 3 / 3 / auto; inset: auto 35px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="510" data-offset-y="195" style="grid-area: auto / 3 / 3 / auto; inset: auto 35px auto auto;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 94 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="510" data-offset-y="45" style="grid-area: auto / 3 / auto / auto; inset: auto 35px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="510" data-offset-y="195" style="grid-area: auto / 3 / auto / auto; inset: auto 35px auto auto;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 95 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="510" data-offset-y="45" style="grid-area: 1 / 3 / 2 / auto; inset: auto 35px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="510" data-offset-y="195" style="grid-area: 1 / 3 / 2 / auto; inset: auto 35px auto auto;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 96 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="510" data-offset-y="45" style="grid-area: 1 / 3 / 3 / auto; inset: auto 35px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="510" data-offset-y="195" style="grid-area: 1 / 3 / 3 / auto; inset: auto 35px auto auto;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 97 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="510" data-offset-y="45" style="grid-area: 1 / 3 / auto / auto; inset: auto 35px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="510" data-offset-y="195" style="grid-area: 1 / 3 / auto / auto; inset: auto 35px auto auto;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 98 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="510" data-offset-y="45" style="grid-area: 2 / 3 / 3 / auto; inset: auto 35px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="510" data-offset-y="195" style="grid-area: 2 / 3 / 3 / auto; inset: auto 35px auto auto;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 99 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="510" data-offset-y="45" style="grid-area: 2 / 3 / auto / auto; inset: auto 35px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="510" data-offset-y="195" style="grid-area: 2 / 3 / auto / auto; inset: auto 35px auto auto;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 100 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="510" data-offset-y="45" style="grid-area: 3 / 3 / auto / auto; inset: auto 35px auto auto;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="510" data-offset-y="195" style="grid-area: 3 / 3 / auto / auto; inset: auto 35px auto auto;">XX</div></div></div> -offsetTop expected 45 but got 55 -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-grid/abspos/orthogonal-positioned-grid-descendants-005-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-grid/abspos/orthogonal-positioned-grid-descendants-005-expected.txt deleted file mode 100644 index bf6a2afb..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-grid/abspos/orthogonal-positioned-grid-descendants-005-expected.txt +++ /dev/null
@@ -1,304 +0,0 @@ -This is a testharness.js-based test. -Found 100 tests; 0 PASS, 100 FAIL, 0 TIMEOUT, 0 NOTRUN. -FAIL .grid 1 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="-70" style="grid-area: auto / auto / 1 / 1; inset: auto auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="-70" style="grid-area: auto / auto / 1 / 1; inset: auto auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 2 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="80" style="grid-area: auto / auto / 2 / 1; inset: auto auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="80" style="grid-area: auto / auto / 2 / 1; inset: auto auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 3 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="180" style="grid-area: auto / auto / 3 / 1; inset: auto auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="180" style="grid-area: auto / auto / 3 / 1; inset: auto auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 4 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="340" style="grid-area: auto / auto / auto / 1; inset: auto auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="340" style="grid-area: auto / auto / auto / 1; inset: auto auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 5 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="80" style="grid-area: 1 / auto / 2 / 1; inset: auto auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="80" style="grid-area: 1 / auto / 2 / 1; inset: auto auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 6 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="180" style="grid-area: 1 / auto / 3 / 1; inset: auto auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="180" style="grid-area: 1 / auto / 3 / 1; inset: auto auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 7 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="340" style="grid-area: 1 / auto / auto / 1; inset: auto auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="340" style="grid-area: 1 / auto / auto / 1; inset: auto auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 8 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="180" style="grid-area: 2 / auto / 3 / 1; inset: auto auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="180" style="grid-area: 2 / auto / 3 / 1; inset: auto auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 9 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="340" style="grid-area: 2 / auto / auto / 1; inset: auto auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="340" style="grid-area: 2 / auto / auto / 1; inset: auto auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 10 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="340" style="grid-area: 3 / auto / auto / 1; inset: auto auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="340" style="grid-area: 3 / auto / auto / 1; inset: auto auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 11 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="-70" style="grid-area: auto / auto / 1 / 2; inset: auto auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="-70" style="grid-area: auto / auto / 1 / 2; inset: auto auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 12 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="80" style="grid-area: auto / auto / 2 / 2; inset: auto auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="80" style="grid-area: auto / auto / 2 / 2; inset: auto auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 13 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="180" style="grid-area: auto / auto / 3 / 2; inset: auto auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="180" style="grid-area: auto / auto / 3 / 2; inset: auto auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 14 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="340" style="grid-area: auto / auto / auto / 2; inset: auto auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="340" style="grid-area: auto / auto / auto / 2; inset: auto auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 15 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="80" style="grid-area: 1 / auto / 2 / 2; inset: auto auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="80" style="grid-area: 1 / auto / 2 / 2; inset: auto auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 16 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="180" style="grid-area: 1 / auto / 3 / 2; inset: auto auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="180" style="grid-area: 1 / auto / 3 / 2; inset: auto auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 17 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="340" style="grid-area: 1 / auto / auto / 2; inset: auto auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="340" style="grid-area: 1 / auto / auto / 2; inset: auto auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 18 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="180" style="grid-area: 2 / auto / 3 / 2; inset: auto auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="180" style="grid-area: 2 / auto / 3 / 2; inset: auto auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 19 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="340" style="grid-area: 2 / auto / auto / 2; inset: auto auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="340" style="grid-area: 2 / auto / auto / 2; inset: auto auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 20 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="340" style="grid-area: 3 / auto / auto / 2; inset: auto auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="340" style="grid-area: 3 / auto / auto / 2; inset: auto auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 21 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="-70" style="grid-area: auto / auto / 1 / 3; inset: auto auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="-70" style="grid-area: auto / auto / 1 / 3; inset: auto auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 22 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="80" style="grid-area: auto / auto / 2 / 3; inset: auto auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="80" style="grid-area: auto / auto / 2 / 3; inset: auto auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 23 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="180" style="grid-area: auto / auto / 3 / 3; inset: auto auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="180" style="grid-area: auto / auto / 3 / 3; inset: auto auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 24 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="340" style="grid-area: auto / auto / auto / 3; inset: auto auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="340" style="grid-area: auto / auto / auto / 3; inset: auto auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 25 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="80" style="grid-area: 1 / auto / 2 / 3; inset: auto auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="80" style="grid-area: 1 / auto / 2 / 3; inset: auto auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 26 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="180" style="grid-area: 1 / auto / 3 / 3; inset: auto auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="180" style="grid-area: 1 / auto / 3 / 3; inset: auto auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 27 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="340" style="grid-area: 1 / auto / auto / 3; inset: auto auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="340" style="grid-area: 1 / auto / auto / 3; inset: auto auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 28 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="180" style="grid-area: 2 / auto / 3 / 3; inset: auto auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="180" style="grid-area: 2 / auto / 3 / 3; inset: auto auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 29 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="340" style="grid-area: 2 / auto / auto / 3; inset: auto auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="340" style="grid-area: 2 / auto / auto / 3; inset: auto auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 30 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="340" style="grid-area: 3 / auto / auto / 3; inset: auto auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="340" style="grid-area: 3 / auto / auto / 3; inset: auto auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 31 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="-70" style="grid-area: auto / auto / 1 / auto; inset: auto auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="-70" style="grid-area: auto / auto / 1 / auto; inset: auto auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 32 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="80" style="grid-area: auto / auto / 2 / auto; inset: auto auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="80" style="grid-area: auto / auto / 2 / auto; inset: auto auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 33 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="180" style="grid-area: auto / auto / 3 / auto; inset: auto auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="180" style="grid-area: auto / auto / 3 / auto; inset: auto auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 34 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="340" style="grid-area: auto / auto / auto / auto; inset: auto auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="340" style="grid-area: auto / auto / auto / auto; inset: auto auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 35 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="80" style="grid-area: 1 / auto / 2 / auto; inset: auto auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="80" style="grid-area: 1 / auto / 2 / auto; inset: auto auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 36 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="180" style="grid-area: 1 / auto / 3 / auto; inset: auto auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="180" style="grid-area: 1 / auto / 3 / auto; inset: auto auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 37 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="340" style="grid-area: 1 / auto / auto / auto; inset: auto auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="340" style="grid-area: 1 / auto / auto / auto; inset: auto auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 38 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="180" style="grid-area: 2 / auto / 3 / auto; inset: auto auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="180" style="grid-area: 2 / auto / 3 / auto; inset: auto auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 39 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="340" style="grid-area: 2 / auto / auto / auto; inset: auto auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="340" style="grid-area: 2 / auto / auto / auto; inset: auto auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 40 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="340" style="grid-area: 3 / auto / auto / auto; inset: auto auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="340" style="grid-area: 3 / auto / auto / auto; inset: auto auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 41 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="-70" style="grid-area: auto / 1 / 1 / 2; inset: auto auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="-70" style="grid-area: auto / 1 / 1 / 2; inset: auto auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 42 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="80" style="grid-area: auto / 1 / 2 / 2; inset: auto auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="80" style="grid-area: auto / 1 / 2 / 2; inset: auto auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 43 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="180" style="grid-area: auto / 1 / 3 / 2; inset: auto auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="180" style="grid-area: auto / 1 / 3 / 2; inset: auto auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 44 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="340" style="grid-area: auto / 1 / auto / 2; inset: auto auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="340" style="grid-area: auto / 1 / auto / 2; inset: auto auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 45 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="80" style="grid-area: 1 / 1 / 2 / 2; inset: auto auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="80" style="grid-area: 1 / 1 / 2 / 2; inset: auto auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 46 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="180" style="grid-area: 1 / 1 / 3 / 2; inset: auto auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="180" style="grid-area: 1 / 1 / 3 / 2; inset: auto auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 47 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="340" style="grid-area: 1 / 1 / auto / 2; inset: auto auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="340" style="grid-area: 1 / 1 / auto / 2; inset: auto auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 48 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="180" style="grid-area: 2 / 1 / 3 / 2; inset: auto auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="180" style="grid-area: 2 / 1 / 3 / 2; inset: auto auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 49 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="340" style="grid-area: 2 / 1 / auto / 2; inset: auto auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="340" style="grid-area: 2 / 1 / auto / 2; inset: auto auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 50 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="340" style="grid-area: 3 / 1 / auto / 2; inset: auto auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="340" style="grid-area: 3 / 1 / auto / 2; inset: auto auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 51 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="-70" style="grid-area: auto / 1 / 1 / 3; inset: auto auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="-70" style="grid-area: auto / 1 / 1 / 3; inset: auto auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 52 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="80" style="grid-area: auto / 1 / 2 / 3; inset: auto auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="80" style="grid-area: auto / 1 / 2 / 3; inset: auto auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 53 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="180" style="grid-area: auto / 1 / 3 / 3; inset: auto auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="180" style="grid-area: auto / 1 / 3 / 3; inset: auto auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 54 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="340" style="grid-area: auto / 1 / auto / 3; inset: auto auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="340" style="grid-area: auto / 1 / auto / 3; inset: auto auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 55 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="80" style="grid-area: 1 / 1 / 2 / 3; inset: auto auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="80" style="grid-area: 1 / 1 / 2 / 3; inset: auto auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 56 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="180" style="grid-area: 1 / 1 / 3 / 3; inset: auto auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="180" style="grid-area: 1 / 1 / 3 / 3; inset: auto auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 57 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="340" style="grid-area: 1 / 1 / auto / 3; inset: auto auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="340" style="grid-area: 1 / 1 / auto / 3; inset: auto auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 58 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="180" style="grid-area: 2 / 1 / 3 / 3; inset: auto auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="180" style="grid-area: 2 / 1 / 3 / 3; inset: auto auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 59 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="340" style="grid-area: 2 / 1 / auto / 3; inset: auto auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="340" style="grid-area: 2 / 1 / auto / 3; inset: auto auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 60 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="340" style="grid-area: 3 / 1 / auto / 3; inset: auto auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="340" style="grid-area: 3 / 1 / auto / 3; inset: auto auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 61 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="-70" style="grid-area: auto / 1 / 1 / auto; inset: auto auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="-70" style="grid-area: auto / 1 / 1 / auto; inset: auto auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 62 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="80" style="grid-area: auto / 1 / 2 / auto; inset: auto auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="80" style="grid-area: auto / 1 / 2 / auto; inset: auto auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 63 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="180" style="grid-area: auto / 1 / 3 / auto; inset: auto auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="180" style="grid-area: auto / 1 / 3 / auto; inset: auto auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 64 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="340" style="grid-area: auto / 1 / auto / auto; inset: auto auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="340" style="grid-area: auto / 1 / auto / auto; inset: auto auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 65 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="80" style="grid-area: 1 / 1 / 2 / auto; inset: auto auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="80" style="grid-area: 1 / 1 / 2 / auto; inset: auto auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 66 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="180" style="grid-area: 1 / 1 / 3 / auto; inset: auto auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="180" style="grid-area: 1 / 1 / 3 / auto; inset: auto auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 67 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="340" style="grid-area: 1 / 1 / auto / auto; inset: auto auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="340" style="grid-area: 1 / 1 / auto / auto; inset: auto auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 68 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="180" style="grid-area: 2 / 1 / 3 / auto; inset: auto auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="180" style="grid-area: 2 / 1 / 3 / auto; inset: auto auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 69 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="340" style="grid-area: 2 / 1 / auto / auto; inset: auto auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="340" style="grid-area: 2 / 1 / auto / auto; inset: auto auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 70 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="340" style="grid-area: 3 / 1 / auto / auto; inset: auto auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="340" style="grid-area: 3 / 1 / auto / auto; inset: auto auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 71 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="-70" style="grid-area: auto / 2 / 1 / 3; inset: auto auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="-70" style="grid-area: auto / 2 / 1 / 3; inset: auto auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 72 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="80" style="grid-area: auto / 2 / 2 / 3; inset: auto auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="80" style="grid-area: auto / 2 / 2 / 3; inset: auto auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 73 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="180" style="grid-area: auto / 2 / 3 / 3; inset: auto auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="180" style="grid-area: auto / 2 / 3 / 3; inset: auto auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 74 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="340" style="grid-area: auto / 2 / auto / 3; inset: auto auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="340" style="grid-area: auto / 2 / auto / 3; inset: auto auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 75 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="80" style="grid-area: 1 / 2 / 2 / 3; inset: auto auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="80" style="grid-area: 1 / 2 / 2 / 3; inset: auto auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 76 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="180" style="grid-area: 1 / 2 / 3 / 3; inset: auto auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="180" style="grid-area: 1 / 2 / 3 / 3; inset: auto auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 77 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="340" style="grid-area: 1 / 2 / auto / 3; inset: auto auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="340" style="grid-area: 1 / 2 / auto / 3; inset: auto auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 78 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="180" style="grid-area: 2 / 2 / 3 / 3; inset: auto auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="180" style="grid-area: 2 / 2 / 3 / 3; inset: auto auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 79 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="340" style="grid-area: 2 / 2 / auto / 3; inset: auto auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="340" style="grid-area: 2 / 2 / auto / 3; inset: auto auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 80 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="340" style="grid-area: 3 / 2 / auto / 3; inset: auto auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="340" style="grid-area: 3 / 2 / auto / 3; inset: auto auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 81 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="-70" style="grid-area: auto / 2 / 1 / auto; inset: auto auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="-70" style="grid-area: auto / 2 / 1 / auto; inset: auto auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 82 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="80" style="grid-area: auto / 2 / 2 / auto; inset: auto auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="80" style="grid-area: auto / 2 / 2 / auto; inset: auto auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 83 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="180" style="grid-area: auto / 2 / 3 / auto; inset: auto auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="180" style="grid-area: auto / 2 / 3 / auto; inset: auto auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 84 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="340" style="grid-area: auto / 2 / auto / auto; inset: auto auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="340" style="grid-area: auto / 2 / auto / auto; inset: auto auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 85 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="80" style="grid-area: 1 / 2 / 2 / auto; inset: auto auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="80" style="grid-area: 1 / 2 / 2 / auto; inset: auto auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 86 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="180" style="grid-area: 1 / 2 / 3 / auto; inset: auto auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="180" style="grid-area: 1 / 2 / 3 / auto; inset: auto auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 87 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="340" style="grid-area: 1 / 2 / auto / auto; inset: auto auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="340" style="grid-area: 1 / 2 / auto / auto; inset: auto auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 88 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="180" style="grid-area: 2 / 2 / 3 / auto; inset: auto auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="180" style="grid-area: 2 / 2 / 3 / auto; inset: auto auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 89 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="340" style="grid-area: 2 / 2 / auto / auto; inset: auto auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="340" style="grid-area: 2 / 2 / auto / auto; inset: auto auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 90 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="340" style="grid-area: 3 / 2 / auto / auto; inset: auto auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="340" style="grid-area: 3 / 2 / auto / auto; inset: auto auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 91 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="-70" style="grid-area: auto / 3 / 1 / auto; inset: auto auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="-70" style="grid-area: auto / 3 / 1 / auto; inset: auto auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 92 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="80" style="grid-area: auto / 3 / 2 / auto; inset: auto auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="80" style="grid-area: auto / 3 / 2 / auto; inset: auto auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 93 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="180" style="grid-area: auto / 3 / 3 / auto; inset: auto auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="180" style="grid-area: auto / 3 / 3 / auto; inset: auto auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 94 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="340" style="grid-area: auto / 3 / auto / auto; inset: auto auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="340" style="grid-area: auto / 3 / auto / auto; inset: auto auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 95 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="80" style="grid-area: 1 / 3 / 2 / auto; inset: auto auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="80" style="grid-area: 1 / 3 / 2 / auto; inset: auto auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 96 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="180" style="grid-area: 1 / 3 / 3 / auto; inset: auto auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="180" style="grid-area: 1 / 3 / 3 / auto; inset: auto auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 97 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="340" style="grid-area: 1 / 3 / auto / auto; inset: auto auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="340" style="grid-area: 1 / 3 / auto / auto; inset: auto auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 98 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="180" style="grid-area: 2 / 3 / 3 / auto; inset: auto auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="180" style="grid-area: 2 / 3 / 3 / auto; inset: auto auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 99 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="340" style="grid-area: 2 / 3 / auto / auto; inset: auto auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="340" style="grid-area: 2 / 3 / auto / auto; inset: auto auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 100 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="55" data-offset-y="340" style="grid-area: 3 / 3 / auto / auto; inset: auto auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="50" data-offset-x="255" data-offset-y="340" style="grid-area: 3 / 3 / auto / auto; inset: auto auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-grid/abspos/orthogonal-positioned-grid-descendants-007-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-grid/abspos/orthogonal-positioned-grid-descendants-007-expected.txt deleted file mode 100644 index 96172b1..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-grid/abspos/orthogonal-positioned-grid-descendants-007-expected.txt +++ /dev/null
@@ -1,304 +0,0 @@ -This is a testharness.js-based test. -Found 100 tests; 0 PASS, 100 FAIL, 0 TIMEOUT, 0 NOTRUN. -FAIL .grid 1 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="0" data-expected-height="50" data-offset-x="25" data-offset-y="45" style="grid-area: auto / auto / 1 / 1; inset: auto 35px auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="0" data-expected-height="50" data-offset-x="25" data-offset-y="195" style="grid-area: auto / auto / 1 / 1; inset: auto 35px auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 2 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="0" data-expected-height="50" data-offset-x="25" data-offset-y="45" style="grid-area: auto / auto / 2 / 1; inset: auto 35px auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="0" data-expected-height="50" data-offset-x="25" data-offset-y="195" style="grid-area: auto / auto / 2 / 1; inset: auto 35px auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 3 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="0" data-expected-height="50" data-offset-x="25" data-offset-y="45" style="grid-area: auto / auto / 3 / 1; inset: auto 35px auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="0" data-expected-height="50" data-offset-x="25" data-offset-y="195" style="grid-area: auto / auto / 3 / 1; inset: auto 35px auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 4 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="0" data-expected-height="50" data-offset-x="25" data-offset-y="45" style="grid-area: auto / auto / auto / 1; inset: auto 35px auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="0" data-expected-height="50" data-offset-x="25" data-offset-y="195" style="grid-area: auto / auto / auto / 1; inset: auto 35px auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 5 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="0" data-expected-height="50" data-offset-x="25" data-offset-y="45" style="grid-area: 1 / auto / 2 / 1; inset: auto 35px auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="0" data-expected-height="50" data-offset-x="25" data-offset-y="195" style="grid-area: 1 / auto / 2 / 1; inset: auto 35px auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 6 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="0" data-expected-height="50" data-offset-x="25" data-offset-y="45" style="grid-area: 1 / auto / 3 / 1; inset: auto 35px auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="0" data-expected-height="50" data-offset-x="25" data-offset-y="195" style="grid-area: 1 / auto / 3 / 1; inset: auto 35px auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 7 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="0" data-expected-height="50" data-offset-x="25" data-offset-y="45" style="grid-area: 1 / auto / auto / 1; inset: auto 35px auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="0" data-expected-height="50" data-offset-x="25" data-offset-y="195" style="grid-area: 1 / auto / auto / 1; inset: auto 35px auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 8 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="0" data-expected-height="50" data-offset-x="25" data-offset-y="45" style="grid-area: 2 / auto / 3 / 1; inset: auto 35px auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="0" data-expected-height="50" data-offset-x="25" data-offset-y="195" style="grid-area: 2 / auto / 3 / 1; inset: auto 35px auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 9 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="0" data-expected-height="50" data-offset-x="25" data-offset-y="45" style="grid-area: 2 / auto / auto / 1; inset: auto 35px auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="0" data-expected-height="50" data-offset-x="25" data-offset-y="195" style="grid-area: 2 / auto / auto / 1; inset: auto 35px auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 10 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="0" data-expected-height="50" data-offset-x="25" data-offset-y="45" style="grid-area: 3 / auto / auto / 1; inset: auto 35px auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="0" data-expected-height="50" data-offset-x="25" data-offset-y="195" style="grid-area: 3 / auto / auto / 1; inset: auto 35px auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 11 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="145" data-expected-height="50" data-offset-x="25" data-offset-y="45" style="grid-area: auto / auto / 1 / 2; inset: auto 35px auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="145" data-expected-height="50" data-offset-x="25" data-offset-y="195" style="grid-area: auto / auto / 1 / 2; inset: auto 35px auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 12 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="145" data-expected-height="50" data-offset-x="25" data-offset-y="45" style="grid-area: auto / auto / 2 / 2; inset: auto 35px auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="145" data-expected-height="50" data-offset-x="25" data-offset-y="195" style="grid-area: auto / auto / 2 / 2; inset: auto 35px auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 13 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="145" data-expected-height="50" data-offset-x="25" data-offset-y="45" style="grid-area: auto / auto / 3 / 2; inset: auto 35px auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="145" data-expected-height="50" data-offset-x="25" data-offset-y="195" style="grid-area: auto / auto / 3 / 2; inset: auto 35px auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 14 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="145" data-expected-height="50" data-offset-x="25" data-offset-y="45" style="grid-area: auto / auto / auto / 2; inset: auto 35px auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="145" data-expected-height="50" data-offset-x="25" data-offset-y="195" style="grid-area: auto / auto / auto / 2; inset: auto 35px auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 15 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="145" data-expected-height="50" data-offset-x="25" data-offset-y="45" style="grid-area: 1 / auto / 2 / 2; inset: auto 35px auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="145" data-expected-height="50" data-offset-x="25" data-offset-y="195" style="grid-area: 1 / auto / 2 / 2; inset: auto 35px auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 16 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="145" data-expected-height="50" data-offset-x="25" data-offset-y="45" style="grid-area: 1 / auto / 3 / 2; inset: auto 35px auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="145" data-expected-height="50" data-offset-x="25" data-offset-y="195" style="grid-area: 1 / auto / 3 / 2; inset: auto 35px auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 17 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="145" data-expected-height="50" data-offset-x="25" data-offset-y="45" style="grid-area: 1 / auto / auto / 2; inset: auto 35px auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="145" data-expected-height="50" data-offset-x="25" data-offset-y="195" style="grid-area: 1 / auto / auto / 2; inset: auto 35px auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 18 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="145" data-expected-height="50" data-offset-x="25" data-offset-y="45" style="grid-area: 2 / auto / 3 / 2; inset: auto 35px auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="145" data-expected-height="50" data-offset-x="25" data-offset-y="195" style="grid-area: 2 / auto / 3 / 2; inset: auto 35px auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 19 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="145" data-expected-height="50" data-offset-x="25" data-offset-y="45" style="grid-area: 2 / auto / auto / 2; inset: auto 35px auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="145" data-expected-height="50" data-offset-x="25" data-offset-y="195" style="grid-area: 2 / auto / auto / 2; inset: auto 35px auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 20 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="145" data-expected-height="50" data-offset-x="25" data-offset-y="45" style="grid-area: 3 / auto / auto / 2; inset: auto 35px auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="145" data-expected-height="50" data-offset-x="25" data-offset-y="195" style="grid-area: 3 / auto / auto / 2; inset: auto 35px auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 21 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="445" data-expected-height="50" data-offset-x="25" data-offset-y="45" style="grid-area: auto / auto / 1 / 3; inset: auto 35px auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="445" data-expected-height="50" data-offset-x="25" data-offset-y="195" style="grid-area: auto / auto / 1 / 3; inset: auto 35px auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 22 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="445" data-expected-height="50" data-offset-x="25" data-offset-y="45" style="grid-area: auto / auto / 2 / 3; inset: auto 35px auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="445" data-expected-height="50" data-offset-x="25" data-offset-y="195" style="grid-area: auto / auto / 2 / 3; inset: auto 35px auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 23 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="445" data-expected-height="50" data-offset-x="25" data-offset-y="45" style="grid-area: auto / auto / 3 / 3; inset: auto 35px auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="445" data-expected-height="50" data-offset-x="25" data-offset-y="195" style="grid-area: auto / auto / 3 / 3; inset: auto 35px auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 24 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="445" data-expected-height="50" data-offset-x="25" data-offset-y="45" style="grid-area: auto / auto / auto / 3; inset: auto 35px auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="445" data-expected-height="50" data-offset-x="25" data-offset-y="195" style="grid-area: auto / auto / auto / 3; inset: auto 35px auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 25 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="445" data-expected-height="50" data-offset-x="25" data-offset-y="45" style="grid-area: 1 / auto / 2 / 3; inset: auto 35px auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="445" data-expected-height="50" data-offset-x="25" data-offset-y="195" style="grid-area: 1 / auto / 2 / 3; inset: auto 35px auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 26 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="445" data-expected-height="50" data-offset-x="25" data-offset-y="45" style="grid-area: 1 / auto / 3 / 3; inset: auto 35px auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="445" data-expected-height="50" data-offset-x="25" data-offset-y="195" style="grid-area: 1 / auto / 3 / 3; inset: auto 35px auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 27 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="445" data-expected-height="50" data-offset-x="25" data-offset-y="45" style="grid-area: 1 / auto / auto / 3; inset: auto 35px auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="445" data-expected-height="50" data-offset-x="25" data-offset-y="195" style="grid-area: 1 / auto / auto / 3; inset: auto 35px auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 28 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="445" data-expected-height="50" data-offset-x="25" data-offset-y="45" style="grid-area: 2 / auto / 3 / 3; inset: auto 35px auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="445" data-expected-height="50" data-offset-x="25" data-offset-y="195" style="grid-area: 2 / auto / 3 / 3; inset: auto 35px auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 29 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="445" data-expected-height="50" data-offset-x="25" data-offset-y="45" style="grid-area: 2 / auto / auto / 3; inset: auto 35px auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="445" data-expected-height="50" data-offset-x="25" data-offset-y="195" style="grid-area: 2 / auto / auto / 3; inset: auto 35px auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 30 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="445" data-expected-height="50" data-offset-x="25" data-offset-y="45" style="grid-area: 3 / auto / auto / 3; inset: auto 35px auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="445" data-expected-height="50" data-offset-x="25" data-offset-y="195" style="grid-area: 3 / auto / auto / 3; inset: auto 35px auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 31 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="510" data-expected-height="50" data-offset-x="25" data-offset-y="45" style="grid-area: auto / auto / 1 / auto; inset: auto 35px auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="510" data-expected-height="50" data-offset-x="25" data-offset-y="195" style="grid-area: auto / auto / 1 / auto; inset: auto 35px auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 32 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="510" data-expected-height="50" data-offset-x="25" data-offset-y="45" style="grid-area: auto / auto / 2 / auto; inset: auto 35px auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="510" data-expected-height="50" data-offset-x="25" data-offset-y="195" style="grid-area: auto / auto / 2 / auto; inset: auto 35px auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 33 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="510" data-expected-height="50" data-offset-x="25" data-offset-y="45" style="grid-area: auto / auto / 3 / auto; inset: auto 35px auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="510" data-expected-height="50" data-offset-x="25" data-offset-y="195" style="grid-area: auto / auto / 3 / auto; inset: auto 35px auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 34 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="510" data-expected-height="50" data-offset-x="25" data-offset-y="45" style="grid-area: auto / auto / auto / auto; inset: auto 35px auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="510" data-expected-height="50" data-offset-x="25" data-offset-y="195" style="grid-area: auto / auto / auto / auto; inset: auto 35px auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 35 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="510" data-expected-height="50" data-offset-x="25" data-offset-y="45" style="grid-area: 1 / auto / 2 / auto; inset: auto 35px auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="510" data-expected-height="50" data-offset-x="25" data-offset-y="195" style="grid-area: 1 / auto / 2 / auto; inset: auto 35px auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 36 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="510" data-expected-height="50" data-offset-x="25" data-offset-y="45" style="grid-area: 1 / auto / 3 / auto; inset: auto 35px auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="510" data-expected-height="50" data-offset-x="25" data-offset-y="195" style="grid-area: 1 / auto / 3 / auto; inset: auto 35px auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 37 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="510" data-expected-height="50" data-offset-x="25" data-offset-y="45" style="grid-area: 1 / auto / auto / auto; inset: auto 35px auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="510" data-expected-height="50" data-offset-x="25" data-offset-y="195" style="grid-area: 1 / auto / auto / auto; inset: auto 35px auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 38 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="510" data-expected-height="50" data-offset-x="25" data-offset-y="45" style="grid-area: 2 / auto / 3 / auto; inset: auto 35px auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="510" data-expected-height="50" data-offset-x="25" data-offset-y="195" style="grid-area: 2 / auto / 3 / auto; inset: auto 35px auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 39 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="510" data-expected-height="50" data-offset-x="25" data-offset-y="45" style="grid-area: 2 / auto / auto / auto; inset: auto 35px auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="510" data-expected-height="50" data-offset-x="25" data-offset-y="195" style="grid-area: 2 / auto / auto / auto; inset: auto 35px auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 40 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="510" data-expected-height="50" data-offset-x="25" data-offset-y="45" style="grid-area: 3 / auto / auto / auto; inset: auto 35px auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="510" data-expected-height="50" data-offset-x="25" data-offset-y="195" style="grid-area: 3 / auto / auto / auto; inset: auto 35px auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 41 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="140" data-expected-height="50" data-offset-x="30" data-offset-y="45" style="grid-area: auto / 1 / 1 / 2; inset: auto 35px auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="140" data-expected-height="50" data-offset-x="30" data-offset-y="195" style="grid-area: auto / 1 / 1 / 2; inset: auto 35px auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 42 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="140" data-expected-height="50" data-offset-x="30" data-offset-y="45" style="grid-area: auto / 1 / 2 / 2; inset: auto 35px auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="140" data-expected-height="50" data-offset-x="30" data-offset-y="195" style="grid-area: auto / 1 / 2 / 2; inset: auto 35px auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 43 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="140" data-expected-height="50" data-offset-x="30" data-offset-y="45" style="grid-area: auto / 1 / 3 / 2; inset: auto 35px auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="140" data-expected-height="50" data-offset-x="30" data-offset-y="195" style="grid-area: auto / 1 / 3 / 2; inset: auto 35px auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 44 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="140" data-expected-height="50" data-offset-x="30" data-offset-y="45" style="grid-area: auto / 1 / auto / 2; inset: auto 35px auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="140" data-expected-height="50" data-offset-x="30" data-offset-y="195" style="grid-area: auto / 1 / auto / 2; inset: auto 35px auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 45 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="140" data-expected-height="50" data-offset-x="30" data-offset-y="45" style="grid-area: 1 / 1 / 2 / 2; inset: auto 35px auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="140" data-expected-height="50" data-offset-x="30" data-offset-y="195" style="grid-area: 1 / 1 / 2 / 2; inset: auto 35px auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 46 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="140" data-expected-height="50" data-offset-x="30" data-offset-y="45" style="grid-area: 1 / 1 / 3 / 2; inset: auto 35px auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="140" data-expected-height="50" data-offset-x="30" data-offset-y="195" style="grid-area: 1 / 1 / 3 / 2; inset: auto 35px auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 47 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="140" data-expected-height="50" data-offset-x="30" data-offset-y="45" style="grid-area: 1 / 1 / auto / 2; inset: auto 35px auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="140" data-expected-height="50" data-offset-x="30" data-offset-y="195" style="grid-area: 1 / 1 / auto / 2; inset: auto 35px auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 48 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="140" data-expected-height="50" data-offset-x="30" data-offset-y="45" style="grid-area: 2 / 1 / 3 / 2; inset: auto 35px auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="140" data-expected-height="50" data-offset-x="30" data-offset-y="195" style="grid-area: 2 / 1 / 3 / 2; inset: auto 35px auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 49 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="140" data-expected-height="50" data-offset-x="30" data-offset-y="45" style="grid-area: 2 / 1 / auto / 2; inset: auto 35px auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="140" data-expected-height="50" data-offset-x="30" data-offset-y="195" style="grid-area: 2 / 1 / auto / 2; inset: auto 35px auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 50 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="140" data-expected-height="50" data-offset-x="30" data-offset-y="45" style="grid-area: 3 / 1 / auto / 2; inset: auto 35px auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="140" data-expected-height="50" data-offset-x="30" data-offset-y="195" style="grid-area: 3 / 1 / auto / 2; inset: auto 35px auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 51 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="440" data-expected-height="50" data-offset-x="30" data-offset-y="45" style="grid-area: auto / 1 / 1 / 3; inset: auto 35px auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="440" data-expected-height="50" data-offset-x="30" data-offset-y="195" style="grid-area: auto / 1 / 1 / 3; inset: auto 35px auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 52 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="440" data-expected-height="50" data-offset-x="30" data-offset-y="45" style="grid-area: auto / 1 / 2 / 3; inset: auto 35px auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="440" data-expected-height="50" data-offset-x="30" data-offset-y="195" style="grid-area: auto / 1 / 2 / 3; inset: auto 35px auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 53 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="440" data-expected-height="50" data-offset-x="30" data-offset-y="45" style="grid-area: auto / 1 / 3 / 3; inset: auto 35px auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="440" data-expected-height="50" data-offset-x="30" data-offset-y="195" style="grid-area: auto / 1 / 3 / 3; inset: auto 35px auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 54 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="440" data-expected-height="50" data-offset-x="30" data-offset-y="45" style="grid-area: auto / 1 / auto / 3; inset: auto 35px auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="440" data-expected-height="50" data-offset-x="30" data-offset-y="195" style="grid-area: auto / 1 / auto / 3; inset: auto 35px auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 55 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="440" data-expected-height="50" data-offset-x="30" data-offset-y="45" style="grid-area: 1 / 1 / 2 / 3; inset: auto 35px auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="440" data-expected-height="50" data-offset-x="30" data-offset-y="195" style="grid-area: 1 / 1 / 2 / 3; inset: auto 35px auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 56 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="440" data-expected-height="50" data-offset-x="30" data-offset-y="45" style="grid-area: 1 / 1 / 3 / 3; inset: auto 35px auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="440" data-expected-height="50" data-offset-x="30" data-offset-y="195" style="grid-area: 1 / 1 / 3 / 3; inset: auto 35px auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 57 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="440" data-expected-height="50" data-offset-x="30" data-offset-y="45" style="grid-area: 1 / 1 / auto / 3; inset: auto 35px auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="440" data-expected-height="50" data-offset-x="30" data-offset-y="195" style="grid-area: 1 / 1 / auto / 3; inset: auto 35px auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 58 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="440" data-expected-height="50" data-offset-x="30" data-offset-y="45" style="grid-area: 2 / 1 / 3 / 3; inset: auto 35px auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="440" data-expected-height="50" data-offset-x="30" data-offset-y="195" style="grid-area: 2 / 1 / 3 / 3; inset: auto 35px auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 59 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="440" data-expected-height="50" data-offset-x="30" data-offset-y="45" style="grid-area: 2 / 1 / auto / 3; inset: auto 35px auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="440" data-expected-height="50" data-offset-x="30" data-offset-y="195" style="grid-area: 2 / 1 / auto / 3; inset: auto 35px auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 60 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="440" data-expected-height="50" data-offset-x="30" data-offset-y="45" style="grid-area: 3 / 1 / auto / 3; inset: auto 35px auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="440" data-expected-height="50" data-offset-x="30" data-offset-y="195" style="grid-area: 3 / 1 / auto / 3; inset: auto 35px auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 61 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="505" data-expected-height="50" data-offset-x="30" data-offset-y="45" style="grid-area: auto / 1 / 1 / auto; inset: auto 35px auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="505" data-expected-height="50" data-offset-x="30" data-offset-y="195" style="grid-area: auto / 1 / 1 / auto; inset: auto 35px auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 62 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="505" data-expected-height="50" data-offset-x="30" data-offset-y="45" style="grid-area: auto / 1 / 2 / auto; inset: auto 35px auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="505" data-expected-height="50" data-offset-x="30" data-offset-y="195" style="grid-area: auto / 1 / 2 / auto; inset: auto 35px auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 63 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="505" data-expected-height="50" data-offset-x="30" data-offset-y="45" style="grid-area: auto / 1 / 3 / auto; inset: auto 35px auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="505" data-expected-height="50" data-offset-x="30" data-offset-y="195" style="grid-area: auto / 1 / 3 / auto; inset: auto 35px auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 64 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="505" data-expected-height="50" data-offset-x="30" data-offset-y="45" style="grid-area: auto / 1 / auto / auto; inset: auto 35px auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="505" data-expected-height="50" data-offset-x="30" data-offset-y="195" style="grid-area: auto / 1 / auto / auto; inset: auto 35px auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 65 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="505" data-expected-height="50" data-offset-x="30" data-offset-y="45" style="grid-area: 1 / 1 / 2 / auto; inset: auto 35px auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="505" data-expected-height="50" data-offset-x="30" data-offset-y="195" style="grid-area: 1 / 1 / 2 / auto; inset: auto 35px auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 66 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="505" data-expected-height="50" data-offset-x="30" data-offset-y="45" style="grid-area: 1 / 1 / 3 / auto; inset: auto 35px auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="505" data-expected-height="50" data-offset-x="30" data-offset-y="195" style="grid-area: 1 / 1 / 3 / auto; inset: auto 35px auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 67 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="505" data-expected-height="50" data-offset-x="30" data-offset-y="45" style="grid-area: 1 / 1 / auto / auto; inset: auto 35px auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="505" data-expected-height="50" data-offset-x="30" data-offset-y="195" style="grid-area: 1 / 1 / auto / auto; inset: auto 35px auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 68 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="505" data-expected-height="50" data-offset-x="30" data-offset-y="45" style="grid-area: 2 / 1 / 3 / auto; inset: auto 35px auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="505" data-expected-height="50" data-offset-x="30" data-offset-y="195" style="grid-area: 2 / 1 / 3 / auto; inset: auto 35px auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 69 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="505" data-expected-height="50" data-offset-x="30" data-offset-y="45" style="grid-area: 2 / 1 / auto / auto; inset: auto 35px auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="505" data-expected-height="50" data-offset-x="30" data-offset-y="195" style="grid-area: 2 / 1 / auto / auto; inset: auto 35px auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 70 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="505" data-expected-height="50" data-offset-x="30" data-offset-y="45" style="grid-area: 3 / 1 / auto / auto; inset: auto 35px auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="505" data-expected-height="50" data-offset-x="30" data-offset-y="195" style="grid-area: 3 / 1 / auto / auto; inset: auto 35px auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 71 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="240" data-expected-height="50" data-offset-x="230" data-offset-y="45" style="grid-area: auto / 2 / 1 / 3; inset: auto 35px auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="240" data-expected-height="50" data-offset-x="230" data-offset-y="195" style="grid-area: auto / 2 / 1 / 3; inset: auto 35px auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 72 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="240" data-expected-height="50" data-offset-x="230" data-offset-y="45" style="grid-area: auto / 2 / 2 / 3; inset: auto 35px auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="240" data-expected-height="50" data-offset-x="230" data-offset-y="195" style="grid-area: auto / 2 / 2 / 3; inset: auto 35px auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 73 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="240" data-expected-height="50" data-offset-x="230" data-offset-y="45" style="grid-area: auto / 2 / 3 / 3; inset: auto 35px auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="240" data-expected-height="50" data-offset-x="230" data-offset-y="195" style="grid-area: auto / 2 / 3 / 3; inset: auto 35px auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 74 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="240" data-expected-height="50" data-offset-x="230" data-offset-y="45" style="grid-area: auto / 2 / auto / 3; inset: auto 35px auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="240" data-expected-height="50" data-offset-x="230" data-offset-y="195" style="grid-area: auto / 2 / auto / 3; inset: auto 35px auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 75 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="240" data-expected-height="50" data-offset-x="230" data-offset-y="45" style="grid-area: 1 / 2 / 2 / 3; inset: auto 35px auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="240" data-expected-height="50" data-offset-x="230" data-offset-y="195" style="grid-area: 1 / 2 / 2 / 3; inset: auto 35px auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 76 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="240" data-expected-height="50" data-offset-x="230" data-offset-y="45" style="grid-area: 1 / 2 / 3 / 3; inset: auto 35px auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="240" data-expected-height="50" data-offset-x="230" data-offset-y="195" style="grid-area: 1 / 2 / 3 / 3; inset: auto 35px auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 77 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="240" data-expected-height="50" data-offset-x="230" data-offset-y="45" style="grid-area: 1 / 2 / auto / 3; inset: auto 35px auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="240" data-expected-height="50" data-offset-x="230" data-offset-y="195" style="grid-area: 1 / 2 / auto / 3; inset: auto 35px auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 78 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="240" data-expected-height="50" data-offset-x="230" data-offset-y="45" style="grid-area: 2 / 2 / 3 / 3; inset: auto 35px auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="240" data-expected-height="50" data-offset-x="230" data-offset-y="195" style="grid-area: 2 / 2 / 3 / 3; inset: auto 35px auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 79 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="240" data-expected-height="50" data-offset-x="230" data-offset-y="45" style="grid-area: 2 / 2 / auto / 3; inset: auto 35px auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="240" data-expected-height="50" data-offset-x="230" data-offset-y="195" style="grid-area: 2 / 2 / auto / 3; inset: auto 35px auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 80 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="240" data-expected-height="50" data-offset-x="230" data-offset-y="45" style="grid-area: 3 / 2 / auto / 3; inset: auto 35px auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="240" data-expected-height="50" data-offset-x="230" data-offset-y="195" style="grid-area: 3 / 2 / auto / 3; inset: auto 35px auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 81 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="305" data-expected-height="50" data-offset-x="230" data-offset-y="45" style="grid-area: auto / 2 / 1 / auto; inset: auto 35px auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="305" data-expected-height="50" data-offset-x="230" data-offset-y="195" style="grid-area: auto / 2 / 1 / auto; inset: auto 35px auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 82 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="305" data-expected-height="50" data-offset-x="230" data-offset-y="45" style="grid-area: auto / 2 / 2 / auto; inset: auto 35px auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="305" data-expected-height="50" data-offset-x="230" data-offset-y="195" style="grid-area: auto / 2 / 2 / auto; inset: auto 35px auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 83 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="305" data-expected-height="50" data-offset-x="230" data-offset-y="45" style="grid-area: auto / 2 / 3 / auto; inset: auto 35px auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="305" data-expected-height="50" data-offset-x="230" data-offset-y="195" style="grid-area: auto / 2 / 3 / auto; inset: auto 35px auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 84 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="305" data-expected-height="50" data-offset-x="230" data-offset-y="45" style="grid-area: auto / 2 / auto / auto; inset: auto 35px auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="305" data-expected-height="50" data-offset-x="230" data-offset-y="195" style="grid-area: auto / 2 / auto / auto; inset: auto 35px auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 85 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="305" data-expected-height="50" data-offset-x="230" data-offset-y="45" style="grid-area: 1 / 2 / 2 / auto; inset: auto 35px auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="305" data-expected-height="50" data-offset-x="230" data-offset-y="195" style="grid-area: 1 / 2 / 2 / auto; inset: auto 35px auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 86 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="305" data-expected-height="50" data-offset-x="230" data-offset-y="45" style="grid-area: 1 / 2 / 3 / auto; inset: auto 35px auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="305" data-expected-height="50" data-offset-x="230" data-offset-y="195" style="grid-area: 1 / 2 / 3 / auto; inset: auto 35px auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 87 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="305" data-expected-height="50" data-offset-x="230" data-offset-y="45" style="grid-area: 1 / 2 / auto / auto; inset: auto 35px auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="305" data-expected-height="50" data-offset-x="230" data-offset-y="195" style="grid-area: 1 / 2 / auto / auto; inset: auto 35px auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 88 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="305" data-expected-height="50" data-offset-x="230" data-offset-y="45" style="grid-area: 2 / 2 / 3 / auto; inset: auto 35px auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="305" data-expected-height="50" data-offset-x="230" data-offset-y="195" style="grid-area: 2 / 2 / 3 / auto; inset: auto 35px auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 89 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="305" data-expected-height="50" data-offset-x="230" data-offset-y="45" style="grid-area: 2 / 2 / auto / auto; inset: auto 35px auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="305" data-expected-height="50" data-offset-x="230" data-offset-y="195" style="grid-area: 2 / 2 / auto / auto; inset: auto 35px auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 90 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="305" data-expected-height="50" data-offset-x="230" data-offset-y="45" style="grid-area: 3 / 2 / auto / auto; inset: auto 35px auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="305" data-expected-height="50" data-offset-x="230" data-offset-y="195" style="grid-area: 3 / 2 / auto / auto; inset: auto 35px auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 91 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="5" data-expected-height="50" data-offset-x="530" data-offset-y="45" style="grid-area: auto / 3 / 1 / auto; inset: auto 35px auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="5" data-expected-height="50" data-offset-x="530" data-offset-y="195" style="grid-area: auto / 3 / 1 / auto; inset: auto 35px auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 92 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="5" data-expected-height="50" data-offset-x="530" data-offset-y="45" style="grid-area: auto / 3 / 2 / auto; inset: auto 35px auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="5" data-expected-height="50" data-offset-x="530" data-offset-y="195" style="grid-area: auto / 3 / 2 / auto; inset: auto 35px auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 93 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="5" data-expected-height="50" data-offset-x="530" data-offset-y="45" style="grid-area: auto / 3 / 3 / auto; inset: auto 35px auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="5" data-expected-height="50" data-offset-x="530" data-offset-y="195" style="grid-area: auto / 3 / 3 / auto; inset: auto 35px auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 94 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="5" data-expected-height="50" data-offset-x="530" data-offset-y="45" style="grid-area: auto / 3 / auto / auto; inset: auto 35px auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="5" data-expected-height="50" data-offset-x="530" data-offset-y="195" style="grid-area: auto / 3 / auto / auto; inset: auto 35px auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 95 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="5" data-expected-height="50" data-offset-x="530" data-offset-y="45" style="grid-area: 1 / 3 / 2 / auto; inset: auto 35px auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="5" data-expected-height="50" data-offset-x="530" data-offset-y="195" style="grid-area: 1 / 3 / 2 / auto; inset: auto 35px auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 96 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="5" data-expected-height="50" data-offset-x="530" data-offset-y="45" style="grid-area: 1 / 3 / 3 / auto; inset: auto 35px auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="5" data-expected-height="50" data-offset-x="530" data-offset-y="195" style="grid-area: 1 / 3 / 3 / auto; inset: auto 35px auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 97 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="5" data-expected-height="50" data-offset-x="530" data-offset-y="45" style="grid-area: 1 / 3 / auto / auto; inset: auto 35px auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="5" data-expected-height="50" data-offset-x="530" data-offset-y="195" style="grid-area: 1 / 3 / auto / auto; inset: auto 35px auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 98 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="5" data-expected-height="50" data-offset-x="530" data-offset-y="45" style="grid-area: 2 / 3 / 3 / auto; inset: auto 35px auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="5" data-expected-height="50" data-offset-x="530" data-offset-y="195" style="grid-area: 2 / 3 / 3 / auto; inset: auto 35px auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 99 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="5" data-expected-height="50" data-offset-x="530" data-offset-y="45" style="grid-area: 2 / 3 / auto / auto; inset: auto 35px auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="5" data-expected-height="50" data-offset-x="530" data-offset-y="195" style="grid-area: 2 / 3 / auto / auto; inset: auto 35px auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -FAIL .grid 100 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="5" data-expected-height="50" data-offset-x="530" data-offset-y="45" style="grid-area: 3 / 3 / auto / auto; inset: auto 35px auto 25px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="5" data-expected-height="50" data-offset-x="530" data-offset-y="195" style="grid-area: 3 / 3 / auto / auto; inset: auto 35px auto 25px;">XX</div></div></div> -offsetTop expected 45 but got 55 -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-grid/abspos/orthogonal-positioned-grid-descendants-010-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-grid/abspos/orthogonal-positioned-grid-descendants-010-expected.txt deleted file mode 100644 index 10fd929..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-grid/abspos/orthogonal-positioned-grid-descendants-010-expected.txt +++ /dev/null
@@ -1,304 +0,0 @@ -This is a testharness.js-based test. -Found 100 tests; 0 PASS, 100 FAIL, 0 TIMEOUT, 0 NOTRUN. -FAIL .grid 1 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="0" data-offset-x="55" data-offset-y="30" style="grid-area: auto / auto / 1 / 1; inset: 30px auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="0" data-offset-x="255" data-offset-y="30" style="grid-area: auto / auto / 1 / 1; inset: 30px auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 2 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="100" data-offset-x="55" data-offset-y="30" style="grid-area: auto / auto / 2 / 1; inset: 30px auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="100" data-offset-x="255" data-offset-y="30" style="grid-area: auto / auto / 2 / 1; inset: 30px auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 3 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="200" data-offset-x="55" data-offset-y="30" style="grid-area: auto / auto / 3 / 1; inset: 30px auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="200" data-offset-x="255" data-offset-y="30" style="grid-area: auto / auto / 3 / 1; inset: 30px auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 4 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="360" data-offset-x="55" data-offset-y="30" style="grid-area: auto / auto / auto / 1; inset: 30px auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="360" data-offset-x="255" data-offset-y="30" style="grid-area: auto / auto / auto / 1; inset: 30px auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 5 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="80" data-offset-x="55" data-offset-y="50" style="grid-area: 1 / auto / 2 / 1; inset: 30px auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="80" data-offset-x="255" data-offset-y="50" style="grid-area: 1 / auto / 2 / 1; inset: 30px auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 6 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="180" data-offset-x="55" data-offset-y="50" style="grid-area: 1 / auto / 3 / 1; inset: 30px auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="180" data-offset-x="255" data-offset-y="50" style="grid-area: 1 / auto / 3 / 1; inset: 30px auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 7 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="340" data-offset-x="55" data-offset-y="50" style="grid-area: 1 / auto / auto / 1; inset: 30px auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="340" data-offset-x="255" data-offset-y="50" style="grid-area: 1 / auto / auto / 1; inset: 30px auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 8 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="30" data-offset-x="55" data-offset-y="200" style="grid-area: 2 / auto / 3 / 1; inset: 30px auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="30" data-offset-x="255" data-offset-y="200" style="grid-area: 2 / auto / 3 / 1; inset: 30px auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 9 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="190" data-offset-x="55" data-offset-y="200" style="grid-area: 2 / auto / auto / 1; inset: 30px auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="190" data-offset-x="255" data-offset-y="200" style="grid-area: 2 / auto / auto / 1; inset: 30px auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 10 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="90" data-offset-x="55" data-offset-y="300" style="grid-area: 3 / auto / auto / 1; inset: 30px auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="90" data-offset-x="255" data-offset-y="300" style="grid-area: 3 / auto / auto / 1; inset: 30px auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 11 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="0" data-offset-x="55" data-offset-y="30" style="grid-area: auto / auto / 1 / 2; inset: 30px auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="0" data-offset-x="255" data-offset-y="30" style="grid-area: auto / auto / 1 / 2; inset: 30px auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 12 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="100" data-offset-x="55" data-offset-y="30" style="grid-area: auto / auto / 2 / 2; inset: 30px auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="100" data-offset-x="255" data-offset-y="30" style="grid-area: auto / auto / 2 / 2; inset: 30px auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 13 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="200" data-offset-x="55" data-offset-y="30" style="grid-area: auto / auto / 3 / 2; inset: 30px auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="200" data-offset-x="255" data-offset-y="30" style="grid-area: auto / auto / 3 / 2; inset: 30px auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 14 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="360" data-offset-x="55" data-offset-y="30" style="grid-area: auto / auto / auto / 2; inset: 30px auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="360" data-offset-x="255" data-offset-y="30" style="grid-area: auto / auto / auto / 2; inset: 30px auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 15 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="80" data-offset-x="55" data-offset-y="50" style="grid-area: 1 / auto / 2 / 2; inset: 30px auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="80" data-offset-x="255" data-offset-y="50" style="grid-area: 1 / auto / 2 / 2; inset: 30px auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 16 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="180" data-offset-x="55" data-offset-y="50" style="grid-area: 1 / auto / 3 / 2; inset: 30px auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="180" data-offset-x="255" data-offset-y="50" style="grid-area: 1 / auto / 3 / 2; inset: 30px auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 17 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="340" data-offset-x="55" data-offset-y="50" style="grid-area: 1 / auto / auto / 2; inset: 30px auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="340" data-offset-x="255" data-offset-y="50" style="grid-area: 1 / auto / auto / 2; inset: 30px auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 18 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="30" data-offset-x="55" data-offset-y="200" style="grid-area: 2 / auto / 3 / 2; inset: 30px auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="30" data-offset-x="255" data-offset-y="200" style="grid-area: 2 / auto / 3 / 2; inset: 30px auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 19 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="190" data-offset-x="55" data-offset-y="200" style="grid-area: 2 / auto / auto / 2; inset: 30px auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="190" data-offset-x="255" data-offset-y="200" style="grid-area: 2 / auto / auto / 2; inset: 30px auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 20 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="90" data-offset-x="55" data-offset-y="300" style="grid-area: 3 / auto / auto / 2; inset: 30px auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="90" data-offset-x="255" data-offset-y="300" style="grid-area: 3 / auto / auto / 2; inset: 30px auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 21 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="0" data-offset-x="55" data-offset-y="30" style="grid-area: auto / auto / 1 / 3; inset: 30px auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="0" data-offset-x="255" data-offset-y="30" style="grid-area: auto / auto / 1 / 3; inset: 30px auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 22 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="100" data-offset-x="55" data-offset-y="30" style="grid-area: auto / auto / 2 / 3; inset: 30px auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="100" data-offset-x="255" data-offset-y="30" style="grid-area: auto / auto / 2 / 3; inset: 30px auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 23 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="200" data-offset-x="55" data-offset-y="30" style="grid-area: auto / auto / 3 / 3; inset: 30px auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="200" data-offset-x="255" data-offset-y="30" style="grid-area: auto / auto / 3 / 3; inset: 30px auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 24 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="360" data-offset-x="55" data-offset-y="30" style="grid-area: auto / auto / auto / 3; inset: 30px auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="360" data-offset-x="255" data-offset-y="30" style="grid-area: auto / auto / auto / 3; inset: 30px auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 25 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="80" data-offset-x="55" data-offset-y="50" style="grid-area: 1 / auto / 2 / 3; inset: 30px auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="80" data-offset-x="255" data-offset-y="50" style="grid-area: 1 / auto / 2 / 3; inset: 30px auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 26 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="180" data-offset-x="55" data-offset-y="50" style="grid-area: 1 / auto / 3 / 3; inset: 30px auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="180" data-offset-x="255" data-offset-y="50" style="grid-area: 1 / auto / 3 / 3; inset: 30px auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 27 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="340" data-offset-x="55" data-offset-y="50" style="grid-area: 1 / auto / auto / 3; inset: 30px auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="340" data-offset-x="255" data-offset-y="50" style="grid-area: 1 / auto / auto / 3; inset: 30px auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 28 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="30" data-offset-x="55" data-offset-y="200" style="grid-area: 2 / auto / 3 / 3; inset: 30px auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="30" data-offset-x="255" data-offset-y="200" style="grid-area: 2 / auto / 3 / 3; inset: 30px auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 29 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="190" data-offset-x="55" data-offset-y="200" style="grid-area: 2 / auto / auto / 3; inset: 30px auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="190" data-offset-x="255" data-offset-y="200" style="grid-area: 2 / auto / auto / 3; inset: 30px auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 30 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="90" data-offset-x="55" data-offset-y="300" style="grid-area: 3 / auto / auto / 3; inset: 30px auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="90" data-offset-x="255" data-offset-y="300" style="grid-area: 3 / auto / auto / 3; inset: 30px auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 31 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="0" data-offset-x="55" data-offset-y="30" style="grid-area: auto / auto / 1 / auto; inset: 30px auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="0" data-offset-x="255" data-offset-y="30" style="grid-area: auto / auto / 1 / auto; inset: 30px auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 32 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="100" data-offset-x="55" data-offset-y="30" style="grid-area: auto / auto / 2 / auto; inset: 30px auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="100" data-offset-x="255" data-offset-y="30" style="grid-area: auto / auto / 2 / auto; inset: 30px auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 33 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="200" data-offset-x="55" data-offset-y="30" style="grid-area: auto / auto / 3 / auto; inset: 30px auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="200" data-offset-x="255" data-offset-y="30" style="grid-area: auto / auto / 3 / auto; inset: 30px auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 34 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="360" data-offset-x="55" data-offset-y="30" style="grid-area: auto / auto / auto / auto; inset: 30px auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="360" data-offset-x="255" data-offset-y="30" style="grid-area: auto / auto / auto / auto; inset: 30px auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 35 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="80" data-offset-x="55" data-offset-y="50" style="grid-area: 1 / auto / 2 / auto; inset: 30px auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="80" data-offset-x="255" data-offset-y="50" style="grid-area: 1 / auto / 2 / auto; inset: 30px auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 36 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="180" data-offset-x="55" data-offset-y="50" style="grid-area: 1 / auto / 3 / auto; inset: 30px auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="180" data-offset-x="255" data-offset-y="50" style="grid-area: 1 / auto / 3 / auto; inset: 30px auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 37 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="340" data-offset-x="55" data-offset-y="50" style="grid-area: 1 / auto / auto / auto; inset: 30px auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="340" data-offset-x="255" data-offset-y="50" style="grid-area: 1 / auto / auto / auto; inset: 30px auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 38 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="30" data-offset-x="55" data-offset-y="200" style="grid-area: 2 / auto / 3 / auto; inset: 30px auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="30" data-offset-x="255" data-offset-y="200" style="grid-area: 2 / auto / 3 / auto; inset: 30px auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 39 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="190" data-offset-x="55" data-offset-y="200" style="grid-area: 2 / auto / auto / auto; inset: 30px auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="190" data-offset-x="255" data-offset-y="200" style="grid-area: 2 / auto / auto / auto; inset: 30px auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 40 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="90" data-offset-x="55" data-offset-y="300" style="grid-area: 3 / auto / auto / auto; inset: 30px auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="90" data-offset-x="255" data-offset-y="300" style="grid-area: 3 / auto / auto / auto; inset: 30px auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 41 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="0" data-offset-x="55" data-offset-y="30" style="grid-area: auto / 1 / 1 / 2; inset: 30px auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="0" data-offset-x="255" data-offset-y="30" style="grid-area: auto / 1 / 1 / 2; inset: 30px auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 42 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="100" data-offset-x="55" data-offset-y="30" style="grid-area: auto / 1 / 2 / 2; inset: 30px auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="100" data-offset-x="255" data-offset-y="30" style="grid-area: auto / 1 / 2 / 2; inset: 30px auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 43 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="200" data-offset-x="55" data-offset-y="30" style="grid-area: auto / 1 / 3 / 2; inset: 30px auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="200" data-offset-x="255" data-offset-y="30" style="grid-area: auto / 1 / 3 / 2; inset: 30px auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 44 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="360" data-offset-x="55" data-offset-y="30" style="grid-area: auto / 1 / auto / 2; inset: 30px auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="360" data-offset-x="255" data-offset-y="30" style="grid-area: auto / 1 / auto / 2; inset: 30px auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 45 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="80" data-offset-x="55" data-offset-y="50" style="grid-area: 1 / 1 / 2 / 2; inset: 30px auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="80" data-offset-x="255" data-offset-y="50" style="grid-area: 1 / 1 / 2 / 2; inset: 30px auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 46 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="180" data-offset-x="55" data-offset-y="50" style="grid-area: 1 / 1 / 3 / 2; inset: 30px auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="180" data-offset-x="255" data-offset-y="50" style="grid-area: 1 / 1 / 3 / 2; inset: 30px auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 47 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="340" data-offset-x="55" data-offset-y="50" style="grid-area: 1 / 1 / auto / 2; inset: 30px auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="340" data-offset-x="255" data-offset-y="50" style="grid-area: 1 / 1 / auto / 2; inset: 30px auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 48 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="30" data-offset-x="55" data-offset-y="200" style="grid-area: 2 / 1 / 3 / 2; inset: 30px auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="30" data-offset-x="255" data-offset-y="200" style="grid-area: 2 / 1 / 3 / 2; inset: 30px auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 49 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="190" data-offset-x="55" data-offset-y="200" style="grid-area: 2 / 1 / auto / 2; inset: 30px auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="190" data-offset-x="255" data-offset-y="200" style="grid-area: 2 / 1 / auto / 2; inset: 30px auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 50 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="90" data-offset-x="55" data-offset-y="300" style="grid-area: 3 / 1 / auto / 2; inset: 30px auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="90" data-offset-x="255" data-offset-y="300" style="grid-area: 3 / 1 / auto / 2; inset: 30px auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 51 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="0" data-offset-x="55" data-offset-y="30" style="grid-area: auto / 1 / 1 / 3; inset: 30px auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="0" data-offset-x="255" data-offset-y="30" style="grid-area: auto / 1 / 1 / 3; inset: 30px auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 52 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="100" data-offset-x="55" data-offset-y="30" style="grid-area: auto / 1 / 2 / 3; inset: 30px auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="100" data-offset-x="255" data-offset-y="30" style="grid-area: auto / 1 / 2 / 3; inset: 30px auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 53 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="200" data-offset-x="55" data-offset-y="30" style="grid-area: auto / 1 / 3 / 3; inset: 30px auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="200" data-offset-x="255" data-offset-y="30" style="grid-area: auto / 1 / 3 / 3; inset: 30px auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 54 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="360" data-offset-x="55" data-offset-y="30" style="grid-area: auto / 1 / auto / 3; inset: 30px auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="360" data-offset-x="255" data-offset-y="30" style="grid-area: auto / 1 / auto / 3; inset: 30px auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 55 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="80" data-offset-x="55" data-offset-y="50" style="grid-area: 1 / 1 / 2 / 3; inset: 30px auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="80" data-offset-x="255" data-offset-y="50" style="grid-area: 1 / 1 / 2 / 3; inset: 30px auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 56 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="180" data-offset-x="55" data-offset-y="50" style="grid-area: 1 / 1 / 3 / 3; inset: 30px auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="180" data-offset-x="255" data-offset-y="50" style="grid-area: 1 / 1 / 3 / 3; inset: 30px auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 57 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="340" data-offset-x="55" data-offset-y="50" style="grid-area: 1 / 1 / auto / 3; inset: 30px auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="340" data-offset-x="255" data-offset-y="50" style="grid-area: 1 / 1 / auto / 3; inset: 30px auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 58 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="30" data-offset-x="55" data-offset-y="200" style="grid-area: 2 / 1 / 3 / 3; inset: 30px auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="30" data-offset-x="255" data-offset-y="200" style="grid-area: 2 / 1 / 3 / 3; inset: 30px auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 59 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="190" data-offset-x="55" data-offset-y="200" style="grid-area: 2 / 1 / auto / 3; inset: 30px auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="190" data-offset-x="255" data-offset-y="200" style="grid-area: 2 / 1 / auto / 3; inset: 30px auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 60 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="90" data-offset-x="55" data-offset-y="300" style="grid-area: 3 / 1 / auto / 3; inset: 30px auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="90" data-offset-x="255" data-offset-y="300" style="grid-area: 3 / 1 / auto / 3; inset: 30px auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 61 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="0" data-offset-x="55" data-offset-y="30" style="grid-area: auto / 1 / 1 / auto; inset: 30px auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="0" data-offset-x="255" data-offset-y="30" style="grid-area: auto / 1 / 1 / auto; inset: 30px auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 62 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="100" data-offset-x="55" data-offset-y="30" style="grid-area: auto / 1 / 2 / auto; inset: 30px auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="100" data-offset-x="255" data-offset-y="30" style="grid-area: auto / 1 / 2 / auto; inset: 30px auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 63 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="200" data-offset-x="55" data-offset-y="30" style="grid-area: auto / 1 / 3 / auto; inset: 30px auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="200" data-offset-x="255" data-offset-y="30" style="grid-area: auto / 1 / 3 / auto; inset: 30px auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 64 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="360" data-offset-x="55" data-offset-y="30" style="grid-area: auto / 1 / auto / auto; inset: 30px auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="360" data-offset-x="255" data-offset-y="30" style="grid-area: auto / 1 / auto / auto; inset: 30px auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 65 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="80" data-offset-x="55" data-offset-y="50" style="grid-area: 1 / 1 / 2 / auto; inset: 30px auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="80" data-offset-x="255" data-offset-y="50" style="grid-area: 1 / 1 / 2 / auto; inset: 30px auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 66 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="180" data-offset-x="55" data-offset-y="50" style="grid-area: 1 / 1 / 3 / auto; inset: 30px auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="180" data-offset-x="255" data-offset-y="50" style="grid-area: 1 / 1 / 3 / auto; inset: 30px auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 67 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="340" data-offset-x="55" data-offset-y="50" style="grid-area: 1 / 1 / auto / auto; inset: 30px auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="340" data-offset-x="255" data-offset-y="50" style="grid-area: 1 / 1 / auto / auto; inset: 30px auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 68 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="30" data-offset-x="55" data-offset-y="200" style="grid-area: 2 / 1 / 3 / auto; inset: 30px auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="30" data-offset-x="255" data-offset-y="200" style="grid-area: 2 / 1 / 3 / auto; inset: 30px auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 69 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="190" data-offset-x="55" data-offset-y="200" style="grid-area: 2 / 1 / auto / auto; inset: 30px auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="190" data-offset-x="255" data-offset-y="200" style="grid-area: 2 / 1 / auto / auto; inset: 30px auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 70 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="90" data-offset-x="55" data-offset-y="300" style="grid-area: 3 / 1 / auto / auto; inset: 30px auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="90" data-offset-x="255" data-offset-y="300" style="grid-area: 3 / 1 / auto / auto; inset: 30px auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 71 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="0" data-offset-x="55" data-offset-y="30" style="grid-area: auto / 2 / 1 / 3; inset: 30px auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="0" data-offset-x="255" data-offset-y="30" style="grid-area: auto / 2 / 1 / 3; inset: 30px auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 72 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="100" data-offset-x="55" data-offset-y="30" style="grid-area: auto / 2 / 2 / 3; inset: 30px auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="100" data-offset-x="255" data-offset-y="30" style="grid-area: auto / 2 / 2 / 3; inset: 30px auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 73 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="200" data-offset-x="55" data-offset-y="30" style="grid-area: auto / 2 / 3 / 3; inset: 30px auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="200" data-offset-x="255" data-offset-y="30" style="grid-area: auto / 2 / 3 / 3; inset: 30px auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 74 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="360" data-offset-x="55" data-offset-y="30" style="grid-area: auto / 2 / auto / 3; inset: 30px auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="360" data-offset-x="255" data-offset-y="30" style="grid-area: auto / 2 / auto / 3; inset: 30px auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 75 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="80" data-offset-x="55" data-offset-y="50" style="grid-area: 1 / 2 / 2 / 3; inset: 30px auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="80" data-offset-x="255" data-offset-y="50" style="grid-area: 1 / 2 / 2 / 3; inset: 30px auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 76 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="180" data-offset-x="55" data-offset-y="50" style="grid-area: 1 / 2 / 3 / 3; inset: 30px auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="180" data-offset-x="255" data-offset-y="50" style="grid-area: 1 / 2 / 3 / 3; inset: 30px auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 77 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="340" data-offset-x="55" data-offset-y="50" style="grid-area: 1 / 2 / auto / 3; inset: 30px auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="340" data-offset-x="255" data-offset-y="50" style="grid-area: 1 / 2 / auto / 3; inset: 30px auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 78 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="30" data-offset-x="55" data-offset-y="200" style="grid-area: 2 / 2 / 3 / 3; inset: 30px auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="30" data-offset-x="255" data-offset-y="200" style="grid-area: 2 / 2 / 3 / 3; inset: 30px auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 79 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="190" data-offset-x="55" data-offset-y="200" style="grid-area: 2 / 2 / auto / 3; inset: 30px auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="190" data-offset-x="255" data-offset-y="200" style="grid-area: 2 / 2 / auto / 3; inset: 30px auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 80 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="90" data-offset-x="55" data-offset-y="300" style="grid-area: 3 / 2 / auto / 3; inset: 30px auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="90" data-offset-x="255" data-offset-y="300" style="grid-area: 3 / 2 / auto / 3; inset: 30px auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 81 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="0" data-offset-x="55" data-offset-y="30" style="grid-area: auto / 2 / 1 / auto; inset: 30px auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="0" data-offset-x="255" data-offset-y="30" style="grid-area: auto / 2 / 1 / auto; inset: 30px auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 82 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="100" data-offset-x="55" data-offset-y="30" style="grid-area: auto / 2 / 2 / auto; inset: 30px auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="100" data-offset-x="255" data-offset-y="30" style="grid-area: auto / 2 / 2 / auto; inset: 30px auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 83 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="200" data-offset-x="55" data-offset-y="30" style="grid-area: auto / 2 / 3 / auto; inset: 30px auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="200" data-offset-x="255" data-offset-y="30" style="grid-area: auto / 2 / 3 / auto; inset: 30px auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 84 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="360" data-offset-x="55" data-offset-y="30" style="grid-area: auto / 2 / auto / auto; inset: 30px auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="360" data-offset-x="255" data-offset-y="30" style="grid-area: auto / 2 / auto / auto; inset: 30px auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 85 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="80" data-offset-x="55" data-offset-y="50" style="grid-area: 1 / 2 / 2 / auto; inset: 30px auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="80" data-offset-x="255" data-offset-y="50" style="grid-area: 1 / 2 / 2 / auto; inset: 30px auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 86 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="180" data-offset-x="55" data-offset-y="50" style="grid-area: 1 / 2 / 3 / auto; inset: 30px auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="180" data-offset-x="255" data-offset-y="50" style="grid-area: 1 / 2 / 3 / auto; inset: 30px auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 87 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="340" data-offset-x="55" data-offset-y="50" style="grid-area: 1 / 2 / auto / auto; inset: 30px auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="340" data-offset-x="255" data-offset-y="50" style="grid-area: 1 / 2 / auto / auto; inset: 30px auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 88 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="30" data-offset-x="55" data-offset-y="200" style="grid-area: 2 / 2 / 3 / auto; inset: 30px auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="30" data-offset-x="255" data-offset-y="200" style="grid-area: 2 / 2 / 3 / auto; inset: 30px auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 89 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="190" data-offset-x="55" data-offset-y="200" style="grid-area: 2 / 2 / auto / auto; inset: 30px auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="190" data-offset-x="255" data-offset-y="200" style="grid-area: 2 / 2 / auto / auto; inset: 30px auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 90 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="90" data-offset-x="55" data-offset-y="300" style="grid-area: 3 / 2 / auto / auto; inset: 30px auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="90" data-offset-x="255" data-offset-y="300" style="grid-area: 3 / 2 / auto / auto; inset: 30px auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 91 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="0" data-offset-x="55" data-offset-y="30" style="grid-area: auto / 3 / 1 / auto; inset: 30px auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="0" data-offset-x="255" data-offset-y="30" style="grid-area: auto / 3 / 1 / auto; inset: 30px auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 92 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="100" data-offset-x="55" data-offset-y="30" style="grid-area: auto / 3 / 2 / auto; inset: 30px auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="100" data-offset-x="255" data-offset-y="30" style="grid-area: auto / 3 / 2 / auto; inset: 30px auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 93 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="200" data-offset-x="55" data-offset-y="30" style="grid-area: auto / 3 / 3 / auto; inset: 30px auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="200" data-offset-x="255" data-offset-y="30" style="grid-area: auto / 3 / 3 / auto; inset: 30px auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 94 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="360" data-offset-x="55" data-offset-y="30" style="grid-area: auto / 3 / auto / auto; inset: 30px auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="360" data-offset-x="255" data-offset-y="30" style="grid-area: auto / 3 / auto / auto; inset: 30px auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 95 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="80" data-offset-x="55" data-offset-y="50" style="grid-area: 1 / 3 / 2 / auto; inset: 30px auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="80" data-offset-x="255" data-offset-y="50" style="grid-area: 1 / 3 / 2 / auto; inset: 30px auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 96 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="180" data-offset-x="55" data-offset-y="50" style="grid-area: 1 / 3 / 3 / auto; inset: 30px auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="180" data-offset-x="255" data-offset-y="50" style="grid-area: 1 / 3 / 3 / auto; inset: 30px auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 97 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="340" data-offset-x="55" data-offset-y="50" style="grid-area: 1 / 3 / auto / auto; inset: 30px auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="340" data-offset-x="255" data-offset-y="50" style="grid-area: 1 / 3 / auto / auto; inset: 30px auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 98 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="30" data-offset-x="55" data-offset-y="200" style="grid-area: 2 / 3 / 3 / auto; inset: 30px auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="30" data-offset-x="255" data-offset-y="200" style="grid-area: 2 / 3 / 3 / auto; inset: 30px auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 99 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="190" data-offset-x="55" data-offset-y="200" style="grid-area: 2 / 3 / auto / auto; inset: 30px auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="190" data-offset-x="255" data-offset-y="200" style="grid-area: 2 / 3 / auto / auto; inset: 30px auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -FAIL .grid 100 assert_equals: -<div class="grid"><div style="grid-area: 1 / 1 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="90" data-offset-x="55" data-offset-y="300" style="grid-area: 3 / 3 / auto / auto; inset: 30px auto 40px;">XX</div></div><div style="grid-area: 2 / 2 / auto / auto;">X<br>XX<div class="abspos orthogonal" data-expected-width="25" data-expected-height="90" data-offset-x="255" data-offset-y="300" style="grid-area: 3 / 3 / auto / auto; inset: 30px auto 40px;">XX</div></div></div> -offsetLeft expected 55 but got 45 -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-grid/alignment/grid-self-alignment-non-static-positioned-items-009-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-grid/alignment/grid-self-alignment-non-static-positioned-items-009-expected.txt deleted file mode 100644 index 10a17be7..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-grid/alignment/grid-self-alignment-non-static-positioned-items-009-expected.txt +++ /dev/null
@@ -1,28 +0,0 @@ -This is a testharness.js-based test. -FAIL .grid 1 assert_equals: -<div class="grid"> - <div data-offset-x="5" data-offset-y="0" data-expected-width="40" data-expected-height="80" class="firstRowFirstColumn verticalLR">X XX X</div> - <div data-offset-x="180" data-offset-y="60" data-expected-width="60" data-expected-height="90" class="firstRowSecondColumn verticalRL">XX X<br>X XXX X<br>XX XXX</div> - <div data-offset-x="0" data-offset-y="160" data-expected-width="90" data-expected-height="30" class="secondRowFirstColumn RTL">X XX X</div> - <div data-offset-x="105" data-offset-y="160" data-expected-width="70" data-expected-height="80" class="secondRowSecondColumn verticalLR RTL">XX X<br>X XXX<br>X<br>XX XXX</div> -</div> -offsetLeft expected 180 but got 210 -FAIL .grid 2 assert_equals: -<div class="grid RTL"> - <div data-offset-x="155" data-offset-y="0" data-expected-width="40" data-expected-height="80" class="firstRowFirstColumn verticalLR">X XX X</div> - <div data-offset-x="80" data-offset-y="60" data-expected-width="60" data-expected-height="90" class="firstRowSecondColumn verticalRL">XX X<br>X XXX X<br>XX XXX</div> - <div data-offset-x="160" data-offset-y="160" data-expected-width="90" data-expected-height="30" class="secondRowFirstColumn LTR">X XX X</div> - <div data-offset-x="5" data-offset-y="160" data-expected-width="70" data-expected-height="80" class="secondRowSecondColumn verticalRL RTL">XX X<br>X XXX<br>X<br>XX XXX</div> -</div> -offsetLeft expected 80 but got 110 -PASS .grid 3 -FAIL .grid 4 assert_equals: -<div class="grid verticalRL"> - <div data-offset-x="105" data-offset-y="70" data-expected-width="90" data-expected-height="30" class="firstRowFirstColumn horizontal">X XX X</div> - <div data-offset-x="140" data-offset-y="150" data-expected-width="100" data-expected-height="50" class="firstRowSecondColumn horizontal">XX X<br>X XXX X<br>XX XXX</div> - <div data-offset-x="5" data-offset-y="10" data-expected-width="90" data-expected-height="30" class="secondRowFirstColumn horizontal RTL">X XX X</div> - <div data-offset-x="5" data-offset-y="110" data-expected-width="70" data-expected-height="80" class="secondRowSecondColumn verticalLR">XX X<br>X XXX<br>X<br>XX XXX</div> -</div> -offsetLeft expected 105 but got 75 -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-grid/alignment/grid-self-alignment-non-static-positioned-items-010-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-grid/alignment/grid-self-alignment-non-static-positioned-items-010-expected.txt deleted file mode 100644 index 10a17be7..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-grid/alignment/grid-self-alignment-non-static-positioned-items-010-expected.txt +++ /dev/null
@@ -1,28 +0,0 @@ -This is a testharness.js-based test. -FAIL .grid 1 assert_equals: -<div class="grid"> - <div data-offset-x="5" data-offset-y="0" data-expected-width="40" data-expected-height="80" class="firstRowFirstColumn verticalLR">X XX X</div> - <div data-offset-x="180" data-offset-y="60" data-expected-width="60" data-expected-height="90" class="firstRowSecondColumn verticalRL">XX X<br>X XXX X<br>XX XXX</div> - <div data-offset-x="0" data-offset-y="160" data-expected-width="90" data-expected-height="30" class="secondRowFirstColumn RTL">X XX X</div> - <div data-offset-x="105" data-offset-y="160" data-expected-width="70" data-expected-height="80" class="secondRowSecondColumn verticalLR RTL">XX X<br>X XXX<br>X<br>XX XXX</div> -</div> -offsetLeft expected 180 but got 210 -FAIL .grid 2 assert_equals: -<div class="grid RTL"> - <div data-offset-x="155" data-offset-y="0" data-expected-width="40" data-expected-height="80" class="firstRowFirstColumn verticalLR">X XX X</div> - <div data-offset-x="80" data-offset-y="60" data-expected-width="60" data-expected-height="90" class="firstRowSecondColumn verticalRL">XX X<br>X XXX X<br>XX XXX</div> - <div data-offset-x="160" data-offset-y="160" data-expected-width="90" data-expected-height="30" class="secondRowFirstColumn LTR">X XX X</div> - <div data-offset-x="5" data-offset-y="160" data-expected-width="70" data-expected-height="80" class="secondRowSecondColumn verticalRL RTL">XX X<br>X XXX<br>X<br>XX XXX</div> -</div> -offsetLeft expected 80 but got 110 -PASS .grid 3 -FAIL .grid 4 assert_equals: -<div class="grid verticalRL"> - <div data-offset-x="105" data-offset-y="70" data-expected-width="90" data-expected-height="30" class="firstRowFirstColumn horizontal">X XX X</div> - <div data-offset-x="140" data-offset-y="150" data-expected-width="100" data-expected-height="50" class="firstRowSecondColumn horizontal">XX X<br>X XXX X<br>XX XXX</div> - <div data-offset-x="5" data-offset-y="10" data-expected-width="90" data-expected-height="30" class="secondRowFirstColumn horizontal RTL">X XX X</div> - <div data-offset-x="5" data-offset-y="110" data-expected-width="70" data-expected-height="80" class="secondRowSecondColumn verticalLR">XX X<br>X XXX<br>X<br>XX XXX</div> -</div> -offsetLeft expected 105 but got 75 -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-grid/alignment/grid-self-alignment-non-static-positioned-items-011-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-grid/alignment/grid-self-alignment-non-static-positioned-items-011-expected.txt deleted file mode 100644 index 962bbca..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-grid/alignment/grid-self-alignment-non-static-positioned-items-011-expected.txt +++ /dev/null
@@ -1,28 +0,0 @@ -This is a testharness.js-based test. -FAIL .grid 1 assert_equals: -<div class="grid"> - <div data-offset-x="13" data-offset-y="2" data-expected-width="26" data-expected-height="70" class="firstRowFirstColumn verticalLR">X XX X</div> - <div data-offset-x="190" data-offset-y="64" data-expected-width="46" data-expected-height="80" class="firstRowSecondColumn verticalRL">XX X<br>X XXX X<br>XX XXX</div> - <div data-offset-x="8" data-offset-y="162" data-expected-width="76" data-expected-height="20" class="secondRowFirstColumn RTL">X XX X</div> - <div data-offset-x="113" data-offset-y="162" data-expected-width="56" data-expected-height="70" class="secondRowSecondColumn verticalLR RTL">XX X<br>X XXX<br>X<br>XX XXX</div> -</div> -offsetLeft expected 190 but got 206 -FAIL .grid 2 assert_equals: -<div class="grid RTL"> - <div data-offset-x="163" data-offset-y="2" data-expected-width="26" data-expected-height="70" class="firstRowFirstColumn verticalLR">X XX X</div> - <div data-offset-x="90" data-offset-y="64" data-expected-width="46" data-expected-height="80" class="firstRowSecondColumn verticalRL">XX X<br>X XXX X<br>XX XXX</div> - <div data-offset-x="170" data-offset-y="162" data-expected-width="76" data-expected-height="20" class="secondRowFirstColumn LTR">X XX X</div> - <div data-offset-x="13" data-offset-y="162" data-expected-width="56" data-expected-height="70" class="secondRowSecondColumn verticalRL RTL">XX X<br>X XXX<br>X<br>XX XXX</div> -</div> -offsetLeft expected 90 but got 106 -PASS .grid 3 -FAIL .grid 4 assert_equals: -<div class="grid verticalRL"> - <div data-offset-x="113" data-offset-y="74" data-expected-width="76" data-expected-height="20" class="firstRowFirstColumn horizontal">X XX X</div> - <div data-offset-x="150" data-offset-y="153" data-expected-width="86" data-expected-height="40" class="firstRowSecondColumn horizontal">XX X<br>X XXX X<br>XX XXX</div> - <div data-offset-x="14" data-offset-y="12" data-expected-width="76" data-expected-height="20" class="secondRowFirstColumn horizontal RTL">X XX X</div> - <div data-offset-x="13" data-offset-y="112" data-expected-width="56" data-expected-height="70" class="secondRowSecondColumn verticalLR">XX X<br>X XXX<br>X<br>XX XXX</div> -</div> -offsetLeft expected 113 but got 97 -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-initial-letter/initial-letter-computed-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-initial-letter/initial-letter-computed-expected.txt deleted file mode 100644 index 7c702a9..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-initial-letter/initial-letter-computed-expected.txt +++ /dev/null
@@ -1,11 +0,0 @@ -This is a testharness.js-based test. -FAIL Property initial-letter value 'normal' assert_true: initial-letter doesn't seem to be supported in the computed style expected true got false -FAIL Property initial-letter value '1.23' assert_true: initial-letter doesn't seem to be supported in the computed style expected true got false -FAIL Property initial-letter value '1.23 456' assert_true: initial-letter doesn't seem to be supported in the computed style expected true got false -FAIL Property initial-letter value '1.23 calc(45.6)' assert_true: initial-letter doesn't seem to be supported in the computed style expected true got false -FAIL Property initial-letter value '1.23 drop' assert_true: initial-letter doesn't seem to be supported in the computed style expected true got false -FAIL Property initial-letter value '1.23 raise' assert_true: initial-letter doesn't seem to be supported in the computed style expected true got false -FAIL Property initial-letter value 'drop 1.23' assert_true: initial-letter doesn't seem to be supported in the computed style expected true got false -FAIL Property initial-letter value 'raise 1.23' assert_true: initial-letter doesn't seem to be supported in the computed style expected true got false -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-initial-letter/initial-letter-valid-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-initial-letter/initial-letter-valid-expected.txt deleted file mode 100644 index 490e5be..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-initial-letter/initial-letter-valid-expected.txt +++ /dev/null
@@ -1,11 +0,0 @@ -This is a testharness.js-based test. -FAIL e.style['initial-letter'] = "normal" should set the property value assert_not_equals: property should be set got disallowed value "" -FAIL e.style['initial-letter'] = "1.23" should set the property value assert_not_equals: property should be set got disallowed value "" -FAIL e.style['initial-letter'] = "1.23 456" should set the property value assert_not_equals: property should be set got disallowed value "" -FAIL e.style['initial-letter'] = "1.23 calc(45.6)" should set the property value assert_not_equals: property should be set got disallowed value "" -FAIL e.style['initial-letter'] = "1.23 drop" should set the property value assert_not_equals: property should be set got disallowed value "" -FAIL e.style['initial-letter'] = "1.23 raise" should set the property value assert_not_equals: property should be set got disallowed value "" -FAIL e.style['initial-letter'] = "drop 1.23" should set the property value assert_not_equals: property should be set got disallowed value "" -FAIL e.style['initial-letter'] = "raise 1.23" should set the property value assert_not_equals: property should be set got disallowed value "" -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-overflow/scrollable-overflow-zero-one-axis-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-overflow/scrollable-overflow-zero-one-axis-expected.txt deleted file mode 100644 index b1d260a..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-overflow/scrollable-overflow-zero-one-axis-expected.txt +++ /dev/null
@@ -1,25 +0,0 @@ -This is a testharness.js-based test. -PASS .scroll 1 -FAIL .scroll 2 assert_equals: -<div class="scroll zero-w" data-expected-scroll-width="100"> - <div class="zero-h"></div> -</div> -scrollWidth expected 100 but got 0 -PASS .scroll 3 -FAIL .scroll 4 assert_equals: -<div class="scroll zero-w flex-col" data-expected-scroll-width="100"> - <div class="zero-h"></div> -</div> -scrollWidth expected 100 but got 1 -FAIL .scroll 5 assert_equals: -<div class="scroll zero-h grid" data-expected-scroll-height="100"> - <div class="zero-w"></div> -</div> -scrollHeight expected 100 but got 0 -FAIL .scroll 6 assert_equals: -<div class="scroll zero-w grid" data-expected-scroll-width="100"> - <div class="zero-h"></div> -</div> -scrollWidth expected 100 but got 1 -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-position/position-absolute-dynamic-overflow-002-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-position/position-absolute-dynamic-overflow-002-expected.png deleted file mode 100644 index 8d3bc14..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-position/position-absolute-dynamic-overflow-002-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-position/position-absolute-in-inline-001-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-position/position-absolute-in-inline-001-expected.txt deleted file mode 100644 index d1e16e3..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-position/position-absolute-in-inline-001-expected.txt +++ /dev/null
@@ -1,4 +0,0 @@ -This is a testharness.js-based test. -FAIL absolute inside inline container location should be correct. assert_equals: expected 0 but got 100 -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-position/position-absolute-in-inline-002-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-position/position-absolute-in-inline-002-expected.txt deleted file mode 100644 index d6f13b88..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-position/position-absolute-in-inline-002-expected.txt +++ /dev/null
@@ -1,4 +0,0 @@ -This is a testharness.js-based test. -FAIL absolute inside inline container location should be correct. assert_equals: left matches container expected 69 but got 0 -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-position/position-absolute-replaced-minmax-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-position/position-absolute-replaced-minmax-expected.txt deleted file mode 100644 index ef75b97e..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-position/position-absolute-replaced-minmax-expected.txt +++ /dev/null
@@ -1,44 +0,0 @@ -This is a testharness.js-based test. -PASS minmax replaced IFRAME 1 -PASS minmax replaced IFRAME 2 -PASS minmax replaced IFRAME 3 -PASS minmax replaced IFRAME 4 -PASS minmax replaced IFRAME 5 -PASS minmax replaced IFRAME 6 -PASS minmax replaced IFRAME 7 -PASS minmax replaced IFRAME 8 -PASS minmax replaced IFRAME 9 -PASS minmax replaced IFRAME 10 -PASS minmax replaced IFRAME 11 -PASS minmax replaced IMG 12 -PASS minmax replaced IMG 13 -PASS minmax replaced IMG 14 -PASS minmax replaced IMG 15 -PASS minmax replaced IMG 16 -PASS minmax replaced IMG 17 -PASS minmax replaced IMG 18 -PASS minmax replaced IMG 19 -PASS minmax replaced IMG 20 -PASS minmax replaced IMG 21 -PASS minmax replaced IMG 22 -PASS minmax replaced IMG svg 23 -PASS minmax replaced IMG svg 24 -PASS minmax replaced IMG svg 25 -PASS minmax replaced IMG svg 26 -PASS minmax replaced IMG svg 27 -PASS minmax replaced IMG svg 28 -PASS minmax replaced IMG svg 29 -PASS minmax replaced IMG svg 30 -PASS minmax replaced IMG svg 31 -PASS minmax replaced IMG svg 32 -PASS minmax replaced IMG svg 33 -PASS minmax replaced IMG 34 -FAIL minmax replaced IMG 35 assert_equals: incorrect offsetWidth expected "388" but got "426" -FAIL minmax replaced IMG 36 assert_equals: incorrect offsetWidth expected "188" but got "426" -FAIL minmax replaced IMG 37 assert_equals: incorrect offsetWidth expected "188" but got "338" -PASS minmax replaced IMG 38 -PASS minmax replaced IMG 39 -PASS minmax replaced IMG 40 -PASS minmax replaced IMG 41 -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-position/position-absolute-table-001-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-position/position-absolute-table-001-expected.txt deleted file mode 100644 index 0046c86..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-position/position-absolute-table-001-expected.txt +++ /dev/null
@@ -1,9 +0,0 @@ -This is a testharness.js-based test. -PASS table size is interpreted as border-box width by default -FAIL table size is interpreted as minimum width assert_equals: right position is 0 expected 400 but got 300 -PASS table size border-box -FAIL table size border-box interpreted as minimum width assert_equals: right position is 0 expected 400 but got 300 -FAIL table size content-box assert_equals: expected 100 but got 60 -FAIL table size content-box interpreted as minimum width assert_equals: right position is 0 expected 400 but got 300 -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-position/static-position/htb-ltr-rtl.tentative-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-position/static-position/htb-ltr-rtl.tentative-expected.png deleted file mode 100644 index 09a7a23..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-position/static-position/htb-ltr-rtl.tentative-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-position/static-position/htb-rtl-ltr.tentative-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-position/static-position/htb-rtl-ltr.tentative-expected.png deleted file mode 100644 index 6a6777a9..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-position/static-position/htb-rtl-ltr.tentative-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-position/static-position/htb-rtl-rtl-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-position/static-position/htb-rtl-rtl-expected.png deleted file mode 100644 index 85d76f7..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-position/static-position/htb-rtl-rtl-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-position/static-position/vlr-ltr-rtl.tentative-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-position/static-position/vlr-ltr-rtl.tentative-expected.png deleted file mode 100644 index dba91da0..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-position/static-position/vlr-ltr-rtl.tentative-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-position/static-position/vlr-rtl-ltr.tentative-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-position/static-position/vlr-rtl-ltr.tentative-expected.png deleted file mode 100644 index 67d04c27..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-position/static-position/vlr-rtl-ltr.tentative-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-position/static-position/vlr-rtl-rtl-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-position/static-position/vlr-rtl-rtl-expected.png deleted file mode 100644 index cbe34cfb..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-position/static-position/vlr-rtl-rtl-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-position/static-position/vrl-ltr-rtl.tentative-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-position/static-position/vrl-ltr-rtl.tentative-expected.png deleted file mode 100644 index 7b2e448..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-position/static-position/vrl-ltr-rtl.tentative-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-position/static-position/vrl-rtl-ltr.tentative-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-position/static-position/vrl-rtl-ltr.tentative-expected.png deleted file mode 100644 index be12c70..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-position/static-position/vrl-rtl-ltr.tentative-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-position/static-position/vrl-rtl-rtl-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-position/static-position/vrl-rtl-rtl-expected.png deleted file mode 100644 index af779163..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-position/static-position/vrl-rtl-rtl-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-pseudo/active-selection-051-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-pseudo/active-selection-051-expected.png deleted file mode 100644 index 4fffed63..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-pseudo/active-selection-051-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-pseudo/active-selection-052-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-pseudo/active-selection-052-expected.png deleted file mode 100644 index 4fffed63..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-pseudo/active-selection-052-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-pseudo/active-selection-053-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-pseudo/active-selection-053-expected.png deleted file mode 100644 index 4fffed63..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-pseudo/active-selection-053-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-pseudo/active-selection-054-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-pseudo/active-selection-054-expected.png deleted file mode 100644 index 4fffed63..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-pseudo/active-selection-054-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-pseudo/marker-hit-testing-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-pseudo/marker-hit-testing-expected.txt deleted file mode 100644 index d8b93ae..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-pseudo/marker-hit-testing-expected.txt +++ /dev/null
@@ -1,27 +0,0 @@ -This is a testharness.js-based test. -PASS outside image ::marker's content -FAIL outside image ::marker assert_equals: event.target expected Element node <li class="image"></li> but got Element node <ol class="outside" data-x="-65"> - <li class="image"></l... -PASS outside string ::marker's content -FAIL outside string ::marker assert_equals: event.target expected Element node <li class="string"></li> but got Element node <ol class="outside" data-x="-65"> - <li class="image"></l... -PASS outside marker ::marker's content -PASS outside marker ::marker -PASS outside nested image ::marker's content -FAIL outside nested image ::marker assert_equals: event.target expected Element node <li class="nested image"></li> but got Element node <ol class="outside" data-x="-65"> - <li class="image"></l... -PASS outside nested string ::marker's content -FAIL outside nested string ::marker assert_equals: event.target expected Element node <li class="nested string"></li> but got Element node <ol class="outside" data-x="-65"> - <li class="image"></l... -PASS inside image ::marker's content -PASS inside image ::marker -PASS inside string ::marker's content -PASS inside string ::marker -PASS inside marker ::marker's content -PASS inside marker ::marker -PASS inside nested image ::marker's content -PASS inside nested image ::marker -PASS inside nested string ::marker's content -PASS inside nested string ::marker -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-pseudo/marker-intrinsic-contribution-001-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-pseudo/marker-intrinsic-contribution-001-expected.txt deleted file mode 100644 index 2f51047..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-pseudo/marker-intrinsic-contribution-001-expected.txt +++ /dev/null
@@ -1,11 +0,0 @@ -This is a testharness.js-based test. -PASS Intrinsic contribution of outside symbol marker -PASS Intrinsic contribution of outside decimal marker -PASS Intrinsic contribution of outside string marker -PASS Intrinsic contribution of outside content marker -PASS Intrinsic contribution of inside symbol marker -PASS Intrinsic contribution of inside decimal marker -PASS Intrinsic contribution of inside string marker -PASS Intrinsic contribution of inside content marker -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-ruby/line-spacing-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-ruby/line-spacing-expected.txt deleted file mode 100644 index e9bd80c..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-ruby/line-spacing-expected.txt +++ /dev/null
@@ -1,13 +0,0 @@ -This is a testharness.js-based test. -PASS Over ruby doesn't overflow the block -PASS Over ruby + vertical-align doesn't overflow the block -PASS Under ruby doesn't overflow the block -PASS Under ruby + vertical-align doesn't overflow the block -PASS Under ruby doesn't overwrap with the next block -PASS Expand inter-lines spacing -PASS Consume half-leading of the previous line -FAIL Don't Consume half-leading of the previous line with text-emphasis assert_greater_than_equal: expected a number greater than or equal to 32 but got 24 -PASS Consume half-leading of the next line -FAIL Don't Consume half-leading of the next line with text-emphasis assert_greater_than_equal: expected a number greater than or equal to 32 but got 24 -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-scroll-snap/scroll-target-margin-005-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-scroll-snap/scroll-target-margin-005-expected.txt deleted file mode 100644 index 2ed94f70..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-scroll-snap/scroll-target-margin-005-expected.txt +++ /dev/null
@@ -1,4 +0,0 @@ -This is a testharness.js-based test. -PASS scroll-margin on input widget -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-017-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-017-expected.png deleted file mode 100644 index 922e4b4..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-017-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-sizing/clone-nowrap-intrinsic-size-bidi-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-sizing/clone-nowrap-intrinsic-size-bidi-expected.png deleted file mode 100644 index 277af99f..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-sizing/clone-nowrap-intrinsic-size-bidi-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-sizing/contain-intrinsic-size/auto-007-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-sizing/contain-intrinsic-size/auto-007-expected.txt deleted file mode 100644 index b32e8d9..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-sizing/contain-intrinsic-size/auto-007-expected.txt +++ /dev/null
@@ -1,59 +0,0 @@ -This is a testharness.js-based test. -PASS .test 1 -PASS .test 2 -PASS .test 3 -PASS .test 4 -FAIL .test 5 assert_equals: -<div class="scroll test auto-height" data-expected-client-width="0" data-expected-client-height="255"></div> -clientHeight expected 255 but got 270 -FAIL .test 6 assert_equals: -<div class="scroll test auto-both" data-expected-client-width="320" data-expected-client-height="255"></div> -clientHeight expected 255 but got 270 -FAIL .test 7 assert_equals: -<div class="columns test auto-width" data-expected-client-width="656" data-expected-client-height="0"></div> -clientWidth expected 656 but got 1328 -PASS .test 8 -FAIL .test 9 assert_equals: -<div class="columns test auto-both" data-expected-client-width="656" data-expected-client-height="120"></div> -clientWidth expected 656 but got 1328 -PASS .test 10 -PASS .test 11 -PASS .test 12 -PASS .test 13 -PASS .test 14 -PASS .test 15 -PASS .test 16 -PASS .test 17 -PASS .test 18 -PASS .test 19 -PASS .test 20 -PASS .test 21 -PASS .test 22 -PASS .test 23 -PASS .test 24 -FAIL .test 25 assert_equals: -<canvas class="test auto-width" data-expected-client-width="300" data-expected-client-height="0"></canvas> -clientWidth expected 300 but got 1 -FAIL .test 26 assert_equals: -<canvas class="test auto-height" data-expected-client-width="0" data-expected-client-height="150"></canvas> -clientHeight expected 150 but got 2 -FAIL .test 27 assert_equals: -<canvas class="test auto-both" data-expected-client-width="300" data-expected-client-height="150"></canvas> -clientWidth expected 300 but got 3 -PASS .test 28 -PASS .test 29 -PASS .test 30 -PASS .test 31 -PASS .test 32 -PASS .test 33 -PASS .test 34 -PASS .test 35 -PASS .test 36 -PASS .test 37 -PASS .test 38 -PASS .test 39 -PASS .test 40 -PASS .test 41 -PASS .test 42 -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-sizing/contain-intrinsic-size/auto-010-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-sizing/contain-intrinsic-size/auto-010-expected.txt deleted file mode 100644 index 927a190b..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-sizing/contain-intrinsic-size/auto-010-expected.txt +++ /dev/null
@@ -1,5 +0,0 @@ -This is a testharness.js-based test. -PASS Last remembered size supports multiple fragments -PASS Last remembered size is updated when 2nd fragment changes size -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-sizing/intrinsic-percent-non-replaced-004-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-sizing/intrinsic-percent-non-replaced-004-expected.png deleted file mode 100644 index 9c0a4d18..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-sizing/intrinsic-percent-non-replaced-004-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-sizing/intrinsic-percent-non-replaced-005-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-sizing/intrinsic-percent-non-replaced-005-expected.png deleted file mode 100644 index 5dda91a..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-sizing/intrinsic-percent-non-replaced-005-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-sizing/whitespace-and-break-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-sizing/whitespace-and-break-expected.png deleted file mode 100644 index 63aaec9d..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-sizing/whitespace-and-break-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-tables/bounding-box-computation-1-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-tables/bounding-box-computation-1-expected.txt deleted file mode 100644 index 7005162..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-tables/bounding-box-computation-1-expected.txt +++ /dev/null
@@ -1,15 +0,0 @@ -This is a testharness.js-based test. -PASS Control test: Table width is 120px -PASS Control test: Table height is 120px -PASS Table-cell is 100px wide -PASS Table-cell is 100px tall -FAIL Table-row is 100px wide assert_equals: expected 100 but got 120 -PASS Table-row is 100px tall -FAIL Table-row-group is 100px wide assert_equals: expected 100 but got 120 -FAIL Table-row-group is 100px tall assert_equals: expected 100 but got 120 -FAIL Table-column is 100px wide assert_equals: expected 100 but got 0 -FAIL Table-column is 100px tall assert_equals: expected 100 but got 0 -FAIL Table-column-group is 100px wide assert_equals: expected 100 but got 0 -FAIL Table-column-group is 100px tall assert_equals: expected 100 but got 0 -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-tables/bounding-box-computation-2-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-tables/bounding-box-computation-2-expected.txt deleted file mode 100644 index 1468c66e..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-tables/bounding-box-computation-2-expected.txt +++ /dev/null
@@ -1,15 +0,0 @@ -This is a testharness.js-based test. -PASS Control test: Table width is 120px -PASS Control test: Table height is 120px -PASS Table-cell is 100px wide -PASS Table-cell is 100px tall -PASS Table-row is 100px wide -PASS Table-row is 100px tall -PASS Table-row-group is 100px wide -PASS Table-row-group is 100px tall -FAIL Table-column is 100px wide assert_equals: expected 100 but got 0 -FAIL Table-column is 100px tall assert_equals: expected 100 but got 0 -FAIL Table-column-group is 100px wide assert_equals: expected 100 but got 0 -FAIL Table-column-group is 100px tall assert_equals: expected 100 but got 0 -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-tables/bounding-box-computation-3-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-tables/bounding-box-computation-3-expected.txt deleted file mode 100644 index d02228d..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-tables/bounding-box-computation-3-expected.txt +++ /dev/null
@@ -1,13 +0,0 @@ -This is a testharness.js-based test. -PASS Control test: Table width is 120px -PASS Control test: Table height is 120px -FAIL First (empty) table-row-group is 0px wide assert_equals: expected 0 but got 120 -FAIL First (empty) table-row-group is 0px tall assert_equals: expected 0 but got 10 -FAIL First (empty) table-row-group should be located at 10px left assert_equals: expected 10 but got 0 -FAIL First (empty) table-row-group should be located at 10px top assert_equals: expected 10 but got 0 -FAIL Second table-row-group is 100px wide assert_equals: expected 100 but got 120 -FAIL Second table-row-group is 100px tall assert_equals: expected 100 but got 110 -FAIL Second table-row-group should be located at 10px left assert_equals: expected 10 but got 0 -PASS Second table-row-group should be located at 10px top -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-tables/fixed-layout-2-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-tables/fixed-layout-2-expected.txt deleted file mode 100644 index 24414c3..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-tables/fixed-layout-2-expected.txt +++ /dev/null
@@ -1,8 +0,0 @@ -This is a testharness.js-based test. -PASS Table-layout:fixed is not applied when width is auto -PASS Table-layout:fixed reports fixed when width is auto -PASS Table-layout:fixed is not applied when width is max-content -PASS Table-layout:fixed reports fixed when width is max-content -FAIL Table-layout:fixed is applied when width is min-content assert_equals: expected 100 but got 0 -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-tables/fixed-layout-excess-width-distribution-001-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-tables/fixed-layout-excess-width-distribution-001-expected.txt deleted file mode 100644 index 503b52fc..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-tables/fixed-layout-excess-width-distribution-001-expected.txt +++ /dev/null
@@ -1,12 +0,0 @@ -This is a testharness.js-based test. -FAIL #theTable 1 assert_equals: -<table id="theTable"> - <tbody><tr> - <td data-expected-width="180"></td> - <td data-expected-width="90"></td> - <td data-expected-width="30"></td> - </tr> -</tbody></table> -width expected 180 but got 100 -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-tables/height-distribution/computing-row-measure-0-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-tables/height-distribution/computing-row-measure-0-expected.txt deleted file mode 100644 index f1f68cd..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-tables/height-distribution/computing-row-measure-0-expected.txt +++ /dev/null
@@ -1,7 +0,0 @@ -This is a testharness.js-based test. -PASS Checking intermediate min-content height for span 1 (1) -FAIL Checking intermediate min-content height for span 1 (2) assert_equals: expected 10 but got 1 -PASS Checking intermediate min-content height for span 1 (3) -FAIL Checking intermediate min-content height for span 1 (4) assert_equals: expected 10 but got 1 -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-tables/html5-table-formatting-1-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-tables/html5-table-formatting-1-expected.txt deleted file mode 100644 index f158fbd..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-tables/html5-table-formatting-1-expected.txt +++ /dev/null
@@ -1,9 +0,0 @@ -This is a testharness.js-based test. -PASS Empty tables can still get a lsyout -PASS Empty tables do not take table-columns into account -FAIL Empty tables do not take table-rows into account assert_equals: expected 50 but got 100 -FAIL Table-columns are taken into account after missing cells are generated (empty line) assert_equals: expected 200 but got 100 -FAIL Table-columns are taken into account after missing cells are generated (partially empty line) assert_equals: expected 200 but got 100 -PASS Table-columns are taken into account after missing cells are generated (non-empty line) -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-tables/html5-table-formatting-2-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-tables/html5-table-formatting-2-expected.txt deleted file mode 100644 index dc0a25c..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-tables/html5-table-formatting-2-expected.txt +++ /dev/null
@@ -1,15 +0,0 @@ -This is a testharness.js-based test. -FAIL Explicitely defined columns are not merged assert_equals: expected 100 but got 50 -PASS Explicitely defined rows are not merged -FAIL Border-spacing is added between any two unmerged columns (1) assert_equals: expected 175 but got 100 -PASS Border-spacing is added between any two unmerged rows (1) -PASS Border-spacing is added between any two unmerged columns (2) -PASS Border-spacing is added between any two unmerged rows (2) -PASS Border-spacing is added between any two unmerged columns (3) -PASS Border-spacing is added between any two unmerged rows (3) -PASS Border-spacing is added between any two unmerged columns (4) -PASS Border-spacing is added between any two unmerged rows (4) -FAIL Border-spacing is added between any two unmerged columns (5) assert_equals: expected 175 but got 100 -PASS Border-spacing is added between any two unmerged rows (5) -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-tables/html5-table-formatting-fixed-layout-1-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-tables/html5-table-formatting-fixed-layout-1-expected.txt deleted file mode 100644 index 6b9c17f..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-tables/html5-table-formatting-fixed-layout-1-expected.txt +++ /dev/null
@@ -1,5 +0,0 @@ -This is a testharness.js-based test. -FAIL Redundant columns of fixed-layout tables are not being merged assert_equals: expected 100 but got 50 -FAIL Redundant rows of fixed-layout tables are not being merged assert_equals: expected 50 but got 25 -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-tables/tentative/caption-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-tables/tentative/caption-expected.txt deleted file mode 100644 index 06e4dde..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-tables/tentative/caption-expected.txt +++ /dev/null
@@ -1,27 +0,0 @@ -This is a testharness.js-based test. -PASS table 1 -PASS table 2 -PASS table 3 -PASS table 4 -PASS table 5 -FAIL table 6 assert_equals: -<table style="width:200px;height:100px"> - <caption style="height:80%" data-expected-height="30"><div style="height:30px"></div></caption> - <tbody><tr><td data-expected-width="200">auto</td> -</tr></tbody></table> -height expected 30 but got 80 -PASS table 7 -PASS table 8 -PASS table 9 -PASS table 10 -PASS table 11 -FAIL table 12 assert_equals: -<table> - <caption style="writing-mode:vertical-rl;height:min-content;font:10px Ahem;color:rgba(0,0,0,0.3)" data-expected-height="100"><div style="height:100px;">vertical</div> caption bigger than table</caption> - <tbody data-offset-y="100"> - <tr><td>vertical!</td> - </tr></tbody> -</table> -offsetTop expected 100 but got 40 -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-tables/tentative/column-widths-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-tables/tentative/column-widths-expected.txt deleted file mode 100644 index b44c757..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-tables/tentative/column-widths-expected.txt +++ /dev/null
@@ -1,45 +0,0 @@ -This is a testharness.js-based test. -PASS table 1 -PASS table 2 -PASS table 3 -PASS table 4 -PASS table 5 -PASS table 6 -PASS table 7 -PASS table 8 -PASS table 9 -PASS table 10 -PASS table 11 -PASS table 12 -FAIL table 13 assert_equals: -<table data-expected-width="66"> - <tbody><tr> - <td style="width:50px" data-expected-width="50"><div style="width:20px">max</div></td> - </tr> - <tr> - <td><div style="width:40px">max</div><div style="width:40px">max</div></td> - </tr> -</tbody></table> -width expected 66 but got 96 -PASS table 14 -PASS table 15 -PASS table 16 -PASS table 17 -PASS table 18 -PASS table 19 -PASS table 20 -PASS table 21 -PASS table 22 -PASS table 23 -PASS table 24 -PASS table 25 -PASS table 26 -PASS table 27 -PASS table 28 -PASS table 29 -PASS table 30 -PASS table 31 -PASS table 32 -PASS table 33 -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-tables/tentative/table-width-redistribution-fixed-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-tables/tentative/table-width-redistribution-fixed-expected.txt deleted file mode 100644 index 3dd4e86..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-tables/tentative/table-width-redistribution-fixed-expected.txt +++ /dev/null
@@ -1,42 +0,0 @@ -This is a testharness.js-based test. -PASS table 1 -PASS table 2 -PASS table 3 -PASS table 4 -PASS table 5 -PASS table 6 -PASS table 7 -PASS table 8 -PASS table 9 -PASS table 10 -PASS table 11 -FAIL table 12 assert_equals: -<table style="width:calc(600px + 40px)" data-expected-width="640"> - <tbody><tr> - <td colspan="2" style="width:108px" data-expected-width="208">108</td> - <td colspan="2" style="width:208px" data-expected-width="408">208</td> - </tr> - <tr> - <td data-expected-width="100">1</td> - <td>1</td> - <td data-expected-width="200">1</td> - <td>1</td> - </tr> -</tbody></table> -width expected 208 but got 214 -PASS table 13 -PASS table 14 -PASS table 15 -PASS table 16 -PASS table 17 -PASS table 18 -PASS table 19 -PASS table 20 -PASS table 21 -PASS table 22 -PASS table 23 -PASS table 24 -PASS table 25 -PASS table 26 -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-tables/width-distribution/computing-column-measure-1-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-tables/width-distribution/computing-column-measure-1-expected.txt deleted file mode 100644 index 8d96bcf..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-tables/width-distribution/computing-column-measure-1-expected.txt +++ /dev/null
@@ -1,7 +0,0 @@ -This is a testharness.js-based test. -PASS Checking intermediate min-content height for span 2 (1) -FAIL Checking intermediate min-content height for span 2 (2) assert_equals: expected 10 but got 51 -PASS Checking intermediate min-content height for span 2 (3) -FAIL Checking intermediate min-content height for span 2 (4) assert_equals: expected 17 but got 10 -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/boundary-shaping/boundary-shaping-001-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/boundary-shaping/boundary-shaping-001-expected.png deleted file mode 100644 index a034a626..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/boundary-shaping/boundary-shaping-001-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/boundary-shaping/boundary-shaping-003-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/boundary-shaping/boundary-shaping-003-expected.png deleted file mode 100644 index 4f643c92..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/boundary-shaping/boundary-shaping-003-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/boundary-shaping/boundary-shaping-004-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/boundary-shaping/boundary-shaping-004-expected.png deleted file mode 100644 index 099254c1..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/boundary-shaping/boundary-shaping-004-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/boundary-shaping/boundary-shaping-005-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/boundary-shaping/boundary-shaping-005-expected.png deleted file mode 100644 index 099254c1..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/boundary-shaping/boundary-shaping-005-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/boundary-shaping/boundary-shaping-010-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/boundary-shaping/boundary-shaping-010-expected.png deleted file mode 100644 index 9fadc299..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/boundary-shaping/boundary-shaping-010-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/hyphens/hyphens-shaping-001-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/hyphens/hyphens-shaping-001-expected.png deleted file mode 100644 index 518e4bd5..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/hyphens/hyphens-shaping-001-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/line-break/line-break-shaping-001-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/line-break/line-break-shaping-001-expected.png deleted file mode 100644 index bd68ee13..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/line-break/line-break-shaping-001-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/line-breaking/line-breaking-009-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/line-breaking/line-breaking-009-expected.png deleted file mode 100644 index 2968bae..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/line-breaking/line-breaking-009-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/line-breaking/line-breaking-011-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/line-breaking/line-breaking-011-expected.png deleted file mode 100644 index 2968bae..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/line-breaking/line-breaking-011-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/line-breaking/line-breaking-015-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/line-breaking/line-breaking-015-expected.png deleted file mode 100644 index 9ea102e..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/line-breaking/line-breaking-015-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/line-breaking/line-breaking-atomic-003-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/line-breaking/line-breaking-atomic-003-expected.png deleted file mode 100644 index f14acbb8..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/line-breaking/line-breaking-atomic-003-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/line-breaking/line-breaking-atomic-004-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/line-breaking/line-breaking-atomic-004-expected.png deleted file mode 100644 index 9a6d6f3..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/line-breaking/line-breaking-atomic-004-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/line-breaking/line-breaking-atomic-005-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/line-breaking/line-breaking-atomic-005-expected.png deleted file mode 100644 index 222231f7..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/line-breaking/line-breaking-atomic-005-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/line-breaking/line-breaking-atomic-006-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/line-breaking/line-breaking-atomic-006-expected.png deleted file mode 100644 index 222231f7..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/line-breaking/line-breaking-atomic-006-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/line-breaking/line-breaking-ic-002-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/line-breaking/line-breaking-ic-002-expected.png deleted file mode 100644 index 91330ef..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/line-breaking/line-breaking-ic-002-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/line-breaking/line-breaking-ic-003-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/line-breaking/line-breaking-ic-003-expected.png deleted file mode 100644 index 91330ef..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/line-breaking/line-breaking-ic-003-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/line-breaking/line-breaking-replaced-002-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/line-breaking/line-breaking-replaced-002-expected.png deleted file mode 100644 index 142bc86..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/line-breaking/line-breaking-replaced-002-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/line-breaking/line-breaking-replaced-003-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/line-breaking/line-breaking-replaced-003-expected.png deleted file mode 100644 index 01cfe12..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/line-breaking/line-breaking-replaced-003-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/overflow-wrap/overflow-wrap-shaping-001-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/overflow-wrap/overflow-wrap-shaping-001-expected.png deleted file mode 100644 index bd68ee13..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/overflow-wrap/overflow-wrap-shaping-001-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/shaping/shaping-000-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/shaping/shaping-000-expected.png deleted file mode 100644 index af616b36..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/shaping/shaping-000-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/shaping/shaping-001-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/shaping/shaping-001-expected.png deleted file mode 100644 index 59a2bafd..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/shaping/shaping-001-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/shaping/shaping-002-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/shaping/shaping-002-expected.png deleted file mode 100644 index 05064fe..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/shaping/shaping-002-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/shaping/shaping-003-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/shaping/shaping-003-expected.png deleted file mode 100644 index 6c3caa7..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/shaping/shaping-003-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/shaping/shaping-004-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/shaping/shaping-004-expected.png deleted file mode 100644 index af616b36..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/shaping/shaping-004-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/shaping/shaping-005-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/shaping/shaping-005-expected.png deleted file mode 100644 index af616b36..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/shaping/shaping-005-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/shaping/shaping-006-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/shaping/shaping-006-expected.png deleted file mode 100644 index af616b36..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/shaping/shaping-006-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/shaping/shaping-007-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/shaping/shaping-007-expected.png deleted file mode 100644 index af616b36..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/shaping/shaping-007-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/shaping/shaping-008-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/shaping/shaping-008-expected.png deleted file mode 100644 index 11bb90d..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/shaping/shaping-008-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/shaping/shaping-014-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/shaping/shaping-014-expected.png deleted file mode 100644 index 9591b58..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/shaping/shaping-014-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/shaping/shaping-016-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/shaping/shaping-016-expected.png deleted file mode 100644 index 2cd9b30..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/shaping/shaping-016-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/shaping/shaping-017-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/shaping/shaping-017-expected.png deleted file mode 100644 index 6c3caa7..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/shaping/shaping-017-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/shaping/shaping-018-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/shaping/shaping-018-expected.png deleted file mode 100644 index 05064fe..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/shaping/shaping-018-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/shaping/shaping-020-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/shaping/shaping-020-expected.png deleted file mode 100644 index 46cd623..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/shaping/shaping-020-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/shaping/shaping-021-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/shaping/shaping-021-expected.png deleted file mode 100644 index f0df001a..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/shaping/shaping-021-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/shaping/shaping-022-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/shaping/shaping-022-expected.png deleted file mode 100644 index 679f270..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/shaping/shaping-022-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/shaping/shaping-023-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/shaping/shaping-023-expected.png deleted file mode 100644 index 5fc9387..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/shaping/shaping-023-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/shaping/shaping_lig-000-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/shaping/shaping_lig-000-expected.png deleted file mode 100644 index 7cf32e8..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/shaping/shaping_lig-000-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/text-encoding/shaping-join-003-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/text-encoding/shaping-join-003-expected.png deleted file mode 100644 index 9e983fcc..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/text-encoding/shaping-join-003-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/text-encoding/shaping-tatweel-003-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/text-encoding/shaping-tatweel-003-expected.png deleted file mode 100644 index 45c87e3..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/text-encoding/shaping-tatweel-003-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/text-transform/text-transform-shaping-001-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/text-transform/text-transform-shaping-001-expected.png deleted file mode 100644 index 320927e..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/text-transform/text-transform-shaping-001-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/text-transform/text-transform-shaping-002-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/text-transform/text-transform-shaping-002-expected.png deleted file mode 100644 index 320927e..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/text-transform/text-transform-shaping-002-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/text-transform/text-transform-shaping-003-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/text-transform/text-transform-shaping-003-expected.png deleted file mode 100644 index 320927e..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/text-transform/text-transform-shaping-003-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/white-space/control-chars-00C-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/white-space/control-chars-00C-expected.png deleted file mode 100644 index d46473fa..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/white-space/control-chars-00C-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/white-space/line-edge-white-space-collapse-002-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/white-space/line-edge-white-space-collapse-002-expected.png deleted file mode 100644 index e345e14..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/white-space/line-edge-white-space-collapse-002-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/white-space/seg-break-transformation-016-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/white-space/seg-break-transformation-016-expected.txt deleted file mode 100644 index 17be47d..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/white-space/seg-break-transformation-016-expected.txt +++ /dev/null
@@ -1,15 +0,0 @@ -This is a testharness.js-based test. -FAIL linebreak only assert_equals: expected 98 but got 105 -PASS zwsp retained 1 -FAIL spaces linebreak assert_equals: expected 98 but got 105 -PASS zwsp retained 2 -FAIL linebreak spaces assert_equals: expected 98 but got 105 -PASS zwsp retained 3 -FAIL spaces linebreak spaces assert_equals: expected 98 but got 105 -PASS zwsp retained 4 -FAIL multiple linebreaks assert_equals: expected 98 but got 105 -PASS zwsp retained 5 -FAIL multiple linebreaks + spaces assert_equals: expected 98 but got 105 -PASS zwsp retained 6 -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/white-space/seg-break-transformation-017-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/white-space/seg-break-transformation-017-expected.txt deleted file mode 100644 index 17be47d..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/white-space/seg-break-transformation-017-expected.txt +++ /dev/null
@@ -1,15 +0,0 @@ -This is a testharness.js-based test. -FAIL linebreak only assert_equals: expected 98 but got 105 -PASS zwsp retained 1 -FAIL spaces linebreak assert_equals: expected 98 but got 105 -PASS zwsp retained 2 -FAIL linebreak spaces assert_equals: expected 98 but got 105 -PASS zwsp retained 3 -FAIL spaces linebreak spaces assert_equals: expected 98 but got 105 -PASS zwsp retained 4 -FAIL multiple linebreaks assert_equals: expected 98 but got 105 -PASS zwsp retained 5 -FAIL multiple linebreaks + spaces assert_equals: expected 98 but got 105 -PASS zwsp retained 6 -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/white-space/trailing-space-before-br-001-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/white-space/trailing-space-before-br-001-expected.txt deleted file mode 100644 index 9bc72bc3d..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/white-space/trailing-space-before-br-001-expected.txt +++ /dev/null
@@ -1,11 +0,0 @@ -This is a testharness.js-based test. -PASS 1111 -PASS 1111  -PASS  1111 -PASS  1111  -PASS 1111<br> -PASS 1111<br>  -FAIL 1111 <br> assert_approx_equals: expected 20 +/- 1 but got 23 -FAIL 1111 <br>  assert_approx_equals: expected 20 +/- 1 but got 23 -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/word-break/word-break-break-all-004-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/word-break/word-break-break-all-004-expected.png deleted file mode 100644 index 51a7d56..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-text/word-break/word-break-break-all-004-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-typed-om/idlharness-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-typed-om/idlharness-expected.txt deleted file mode 100644 index 53d0394..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-typed-om/idlharness-expected.txt +++ /dev/null
@@ -1,546 +0,0 @@ -This is a testharness.js-based test. -Found 542 tests; 480 PASS, 62 FAIL, 0 TIMEOUT, 0 NOTRUN. -PASS idl_test setup -PASS idl_test validation -PASS Partial interface Element: original interface defined -PASS Partial interface Element: member names are unique -PASS Partial interface CSSStyleRule: original interface defined -PASS Partial interface CSSStyleRule: member names are unique -PASS Partial interface mixin ElementCSSInlineStyle: original interface mixin defined -PASS Partial interface mixin ElementCSSInlineStyle: member names are unique -PASS Partial namespace CSS: original namespace defined -PASS Partial namespace CSS: member names are unique -PASS HTMLElement includes ElementCSSInlineStyle: member names are unique -PASS SVGElement includes ElementCSSInlineStyle: member names are unique -PASS MathMLElement includes ElementCSSInlineStyle: member names are unique -PASS SVGElement includes GlobalEventHandlers: member names are unique -PASS SVGElement includes DocumentAndElementEventHandlers: member names are unique -PASS SVGElement includes SVGElementInstance: member names are unique -PASS SVGElement includes HTMLOrSVGElement: member names are unique -PASS HTMLElement includes GlobalEventHandlers: member names are unique -PASS HTMLElement includes DocumentAndElementEventHandlers: member names are unique -PASS HTMLElement includes ElementContentEditable: member names are unique -PASS HTMLElement includes HTMLOrSVGElement: member names are unique -PASS Element includes ParentNode: member names are unique -PASS Element includes NonDocumentTypeChildNode: member names are unique -PASS Element includes ChildNode: member names are unique -PASS Element includes Slottable: member names are unique -PASS MathMLElement includes GlobalEventHandlers: member names are unique -PASS MathMLElement includes DocumentAndElementEventHandlers: member names are unique -PASS MathMLElement includes HTMLOrSVGElement: member names are unique -PASS CSSStyleValue interface: existence and properties of interface object -PASS CSSStyleValue interface object length -PASS CSSStyleValue interface object name -PASS CSSStyleValue interface: existence and properties of interface prototype object -PASS CSSStyleValue interface: existence and properties of interface prototype object's "constructor" property -PASS CSSStyleValue interface: existence and properties of interface prototype object's @@unscopables property -PASS CSSStyleValue interface: stringifier -PASS CSSStyleValue interface: operation parse(USVString, USVString) -PASS CSSStyleValue interface: operation parseAll(USVString, USVString) -PASS StylePropertyMapReadOnly interface: existence and properties of interface object -PASS StylePropertyMapReadOnly interface object length -PASS StylePropertyMapReadOnly interface object name -PASS StylePropertyMapReadOnly interface: existence and properties of interface prototype object -PASS StylePropertyMapReadOnly interface: existence and properties of interface prototype object's "constructor" property -PASS StylePropertyMapReadOnly interface: existence and properties of interface prototype object's @@unscopables property -PASS StylePropertyMapReadOnly interface: iterable<USVString, [object Object]> -PASS StylePropertyMapReadOnly interface: operation get(USVString) -PASS StylePropertyMapReadOnly interface: operation getAll(USVString) -PASS StylePropertyMapReadOnly interface: operation has(USVString) -PASS StylePropertyMapReadOnly interface: attribute size -PASS StylePropertyMap interface: existence and properties of interface object -PASS StylePropertyMap interface object length -PASS StylePropertyMap interface object name -PASS StylePropertyMap interface: existence and properties of interface prototype object -PASS StylePropertyMap interface: existence and properties of interface prototype object's "constructor" property -PASS StylePropertyMap interface: existence and properties of interface prototype object's @@unscopables property -PASS StylePropertyMap interface: operation set(USVString, (CSSStyleValue or USVString)...) -PASS StylePropertyMap interface: operation append(USVString, (CSSStyleValue or USVString)...) -PASS StylePropertyMap interface: operation delete(USVString) -PASS StylePropertyMap interface: operation clear() -PASS StylePropertyMap must be primary interface of styleMap -PASS Stringification of styleMap -PASS StylePropertyMap interface: styleMap must inherit property "set(USVString, (CSSStyleValue or USVString)...)" with the proper type -PASS StylePropertyMap interface: calling set(USVString, (CSSStyleValue or USVString)...) on styleMap with too few arguments must throw TypeError -PASS StylePropertyMap interface: styleMap must inherit property "append(USVString, (CSSStyleValue or USVString)...)" with the proper type -PASS StylePropertyMap interface: calling append(USVString, (CSSStyleValue or USVString)...) on styleMap with too few arguments must throw TypeError -PASS StylePropertyMap interface: styleMap must inherit property "delete(USVString)" with the proper type -PASS StylePropertyMap interface: calling delete(USVString) on styleMap with too few arguments must throw TypeError -PASS StylePropertyMap interface: styleMap must inherit property "clear()" with the proper type -PASS StylePropertyMapReadOnly interface: styleMap must inherit property "get(USVString)" with the proper type -PASS StylePropertyMapReadOnly interface: calling get(USVString) on styleMap with too few arguments must throw TypeError -PASS StylePropertyMapReadOnly interface: styleMap must inherit property "getAll(USVString)" with the proper type -PASS StylePropertyMapReadOnly interface: calling getAll(USVString) on styleMap with too few arguments must throw TypeError -PASS StylePropertyMapReadOnly interface: styleMap must inherit property "has(USVString)" with the proper type -PASS StylePropertyMapReadOnly interface: calling has(USVString) on styleMap with too few arguments must throw TypeError -PASS StylePropertyMapReadOnly interface: styleMap must inherit property "size" with the proper type -PASS CSSUnparsedValue interface: existence and properties of interface object -PASS CSSUnparsedValue interface object length -PASS CSSUnparsedValue interface object name -PASS CSSUnparsedValue interface: existence and properties of interface prototype object -PASS CSSUnparsedValue interface: existence and properties of interface prototype object's "constructor" property -PASS CSSUnparsedValue interface: existence and properties of interface prototype object's @@unscopables property -PASS CSSUnparsedValue interface: iterable<CSSUnparsedSegment> -PASS CSSUnparsedValue interface: attribute length -PASS CSSVariableReferenceValue interface: existence and properties of interface object -PASS CSSVariableReferenceValue interface object length -PASS CSSVariableReferenceValue interface object name -PASS CSSVariableReferenceValue interface: existence and properties of interface prototype object -PASS CSSVariableReferenceValue interface: existence and properties of interface prototype object's "constructor" property -PASS CSSVariableReferenceValue interface: existence and properties of interface prototype object's @@unscopables property -PASS CSSVariableReferenceValue interface: attribute variable -PASS CSSVariableReferenceValue interface: attribute fallback -PASS CSSKeywordValue interface: existence and properties of interface object -PASS CSSKeywordValue interface object length -PASS CSSKeywordValue interface object name -PASS CSSKeywordValue interface: existence and properties of interface prototype object -PASS CSSKeywordValue interface: existence and properties of interface prototype object's "constructor" property -PASS CSSKeywordValue interface: existence and properties of interface prototype object's @@unscopables property -PASS CSSKeywordValue interface: attribute value -PASS CSSNumericValue interface: existence and properties of interface object -PASS CSSNumericValue interface object length -PASS CSSNumericValue interface object name -PASS CSSNumericValue interface: existence and properties of interface prototype object -PASS CSSNumericValue interface: existence and properties of interface prototype object's "constructor" property -PASS CSSNumericValue interface: existence and properties of interface prototype object's @@unscopables property -PASS CSSNumericValue interface: operation add(CSSNumberish...) -PASS CSSNumericValue interface: operation sub(CSSNumberish...) -PASS CSSNumericValue interface: operation mul(CSSNumberish...) -PASS CSSNumericValue interface: operation div(CSSNumberish...) -PASS CSSNumericValue interface: operation min(CSSNumberish...) -PASS CSSNumericValue interface: operation max(CSSNumberish...) -PASS CSSNumericValue interface: operation equals(CSSNumberish...) -PASS CSSNumericValue interface: operation to(USVString) -PASS CSSNumericValue interface: operation toSum(USVString...) -PASS CSSNumericValue interface: operation type() -PASS CSSNumericValue interface: operation parse(USVString) -PASS CSSUnitValue interface: existence and properties of interface object -PASS CSSUnitValue interface object length -PASS CSSUnitValue interface object name -PASS CSSUnitValue interface: existence and properties of interface prototype object -PASS CSSUnitValue interface: existence and properties of interface prototype object's "constructor" property -PASS CSSUnitValue interface: existence and properties of interface prototype object's @@unscopables property -PASS CSSUnitValue interface: attribute value -PASS CSSUnitValue interface: attribute unit -PASS CSSUnitValue must be primary interface of unitValue -PASS Stringification of unitValue -PASS CSSUnitValue interface: unitValue must inherit property "value" with the proper type -PASS CSSUnitValue interface: unitValue must inherit property "unit" with the proper type -PASS CSSNumericValue interface: unitValue must inherit property "add(CSSNumberish...)" with the proper type -PASS CSSNumericValue interface: calling add(CSSNumberish...) on unitValue with too few arguments must throw TypeError -PASS CSSNumericValue interface: unitValue must inherit property "sub(CSSNumberish...)" with the proper type -PASS CSSNumericValue interface: calling sub(CSSNumberish...) on unitValue with too few arguments must throw TypeError -PASS CSSNumericValue interface: unitValue must inherit property "mul(CSSNumberish...)" with the proper type -PASS CSSNumericValue interface: calling mul(CSSNumberish...) on unitValue with too few arguments must throw TypeError -PASS CSSNumericValue interface: unitValue must inherit property "div(CSSNumberish...)" with the proper type -PASS CSSNumericValue interface: calling div(CSSNumberish...) on unitValue with too few arguments must throw TypeError -PASS CSSNumericValue interface: unitValue must inherit property "min(CSSNumberish...)" with the proper type -PASS CSSNumericValue interface: calling min(CSSNumberish...) on unitValue with too few arguments must throw TypeError -PASS CSSNumericValue interface: unitValue must inherit property "max(CSSNumberish...)" with the proper type -PASS CSSNumericValue interface: calling max(CSSNumberish...) on unitValue with too few arguments must throw TypeError -PASS CSSNumericValue interface: unitValue must inherit property "equals(CSSNumberish...)" with the proper type -PASS CSSNumericValue interface: calling equals(CSSNumberish...) on unitValue with too few arguments must throw TypeError -PASS CSSNumericValue interface: unitValue must inherit property "to(USVString)" with the proper type -PASS CSSNumericValue interface: calling to(USVString) on unitValue with too few arguments must throw TypeError -PASS CSSNumericValue interface: unitValue must inherit property "toSum(USVString...)" with the proper type -PASS CSSNumericValue interface: calling toSum(USVString...) on unitValue with too few arguments must throw TypeError -PASS CSSNumericValue interface: unitValue must inherit property "type()" with the proper type -PASS CSSNumericValue interface: unitValue must inherit property "parse(USVString)" with the proper type -FAIL CSSNumericValue interface: calling parse(USVString) on unitValue with too few arguments must throw TypeError assert_own_property: interface object must have static operation as own property expected property "parse" missing -PASS CSSStyleValue interface: unitValue must inherit property "parse(USVString, USVString)" with the proper type -FAIL CSSStyleValue interface: calling parse(USVString, USVString) on unitValue with too few arguments must throw TypeError assert_own_property: interface object must have static operation as own property expected property "parse" missing -PASS CSSStyleValue interface: unitValue must inherit property "parseAll(USVString, USVString)" with the proper type -FAIL CSSStyleValue interface: calling parseAll(USVString, USVString) on unitValue with too few arguments must throw TypeError assert_own_property: interface object must have static operation as own property expected property "parseAll" missing -PASS CSSMathValue interface: existence and properties of interface object -PASS CSSMathValue interface object length -PASS CSSMathValue interface object name -PASS CSSMathValue interface: existence and properties of interface prototype object -PASS CSSMathValue interface: existence and properties of interface prototype object's "constructor" property -PASS CSSMathValue interface: existence and properties of interface prototype object's @@unscopables property -PASS CSSMathValue interface: attribute operator -PASS CSSMathSum interface: existence and properties of interface object -PASS CSSMathSum interface object length -PASS CSSMathSum interface object name -PASS CSSMathSum interface: existence and properties of interface prototype object -PASS CSSMathSum interface: existence and properties of interface prototype object's "constructor" property -PASS CSSMathSum interface: existence and properties of interface prototype object's @@unscopables property -PASS CSSMathSum interface: attribute values -PASS CSSMathSum must be primary interface of mathSum -PASS Stringification of mathSum -PASS CSSMathSum interface: mathSum must inherit property "values" with the proper type -PASS CSSMathValue interface: mathSum must inherit property "operator" with the proper type -PASS CSSNumericValue interface: mathSum must inherit property "add(CSSNumberish...)" with the proper type -PASS CSSNumericValue interface: calling add(CSSNumberish...) on mathSum with too few arguments must throw TypeError -PASS CSSNumericValue interface: mathSum must inherit property "sub(CSSNumberish...)" with the proper type -PASS CSSNumericValue interface: calling sub(CSSNumberish...) on mathSum with too few arguments must throw TypeError -PASS CSSNumericValue interface: mathSum must inherit property "mul(CSSNumberish...)" with the proper type -PASS CSSNumericValue interface: calling mul(CSSNumberish...) on mathSum with too few arguments must throw TypeError -PASS CSSNumericValue interface: mathSum must inherit property "div(CSSNumberish...)" with the proper type -PASS CSSNumericValue interface: calling div(CSSNumberish...) on mathSum with too few arguments must throw TypeError -PASS CSSNumericValue interface: mathSum must inherit property "min(CSSNumberish...)" with the proper type -PASS CSSNumericValue interface: calling min(CSSNumberish...) on mathSum with too few arguments must throw TypeError -PASS CSSNumericValue interface: mathSum must inherit property "max(CSSNumberish...)" with the proper type -PASS CSSNumericValue interface: calling max(CSSNumberish...) on mathSum with too few arguments must throw TypeError -PASS CSSNumericValue interface: mathSum must inherit property "equals(CSSNumberish...)" with the proper type -PASS CSSNumericValue interface: calling equals(CSSNumberish...) on mathSum with too few arguments must throw TypeError -PASS CSSNumericValue interface: mathSum must inherit property "to(USVString)" with the proper type -PASS CSSNumericValue interface: calling to(USVString) on mathSum with too few arguments must throw TypeError -PASS CSSNumericValue interface: mathSum must inherit property "toSum(USVString...)" with the proper type -PASS CSSNumericValue interface: calling toSum(USVString...) on mathSum with too few arguments must throw TypeError -PASS CSSNumericValue interface: mathSum must inherit property "type()" with the proper type -PASS CSSNumericValue interface: mathSum must inherit property "parse(USVString)" with the proper type -FAIL CSSNumericValue interface: calling parse(USVString) on mathSum with too few arguments must throw TypeError assert_own_property: interface object must have static operation as own property expected property "parse" missing -PASS CSSStyleValue interface: mathSum must inherit property "parse(USVString, USVString)" with the proper type -FAIL CSSStyleValue interface: calling parse(USVString, USVString) on mathSum with too few arguments must throw TypeError assert_own_property: interface object must have static operation as own property expected property "parse" missing -PASS CSSStyleValue interface: mathSum must inherit property "parseAll(USVString, USVString)" with the proper type -FAIL CSSStyleValue interface: calling parseAll(USVString, USVString) on mathSum with too few arguments must throw TypeError assert_own_property: interface object must have static operation as own property expected property "parseAll" missing -PASS CSSMathProduct interface: existence and properties of interface object -PASS CSSMathProduct interface object length -PASS CSSMathProduct interface object name -PASS CSSMathProduct interface: existence and properties of interface prototype object -PASS CSSMathProduct interface: existence and properties of interface prototype object's "constructor" property -PASS CSSMathProduct interface: existence and properties of interface prototype object's @@unscopables property -PASS CSSMathProduct interface: attribute values -PASS CSSMathNegate interface: existence and properties of interface object -PASS CSSMathNegate interface object length -PASS CSSMathNegate interface object name -PASS CSSMathNegate interface: existence and properties of interface prototype object -PASS CSSMathNegate interface: existence and properties of interface prototype object's "constructor" property -PASS CSSMathNegate interface: existence and properties of interface prototype object's @@unscopables property -PASS CSSMathNegate interface: attribute value -PASS CSSMathInvert interface: existence and properties of interface object -PASS CSSMathInvert interface object length -PASS CSSMathInvert interface object name -PASS CSSMathInvert interface: existence and properties of interface prototype object -PASS CSSMathInvert interface: existence and properties of interface prototype object's "constructor" property -PASS CSSMathInvert interface: existence and properties of interface prototype object's @@unscopables property -PASS CSSMathInvert interface: attribute value -PASS CSSMathMin interface: existence and properties of interface object -PASS CSSMathMin interface object length -PASS CSSMathMin interface object name -PASS CSSMathMin interface: existence and properties of interface prototype object -PASS CSSMathMin interface: existence and properties of interface prototype object's "constructor" property -PASS CSSMathMin interface: existence and properties of interface prototype object's @@unscopables property -PASS CSSMathMin interface: attribute values -PASS CSSMathMax interface: existence and properties of interface object -PASS CSSMathMax interface object length -PASS CSSMathMax interface object name -PASS CSSMathMax interface: existence and properties of interface prototype object -PASS CSSMathMax interface: existence and properties of interface prototype object's "constructor" property -PASS CSSMathMax interface: existence and properties of interface prototype object's @@unscopables property -PASS CSSMathMax interface: attribute values -PASS CSSMathClamp interface: existence and properties of interface object -PASS CSSMathClamp interface object length -PASS CSSMathClamp interface object name -PASS CSSMathClamp interface: existence and properties of interface prototype object -PASS CSSMathClamp interface: existence and properties of interface prototype object's "constructor" property -PASS CSSMathClamp interface: existence and properties of interface prototype object's @@unscopables property -PASS CSSMathClamp interface: attribute lower -PASS CSSMathClamp interface: attribute value -PASS CSSMathClamp interface: attribute upper -PASS CSSNumericArray interface: existence and properties of interface object -PASS CSSNumericArray interface object length -PASS CSSNumericArray interface object name -PASS CSSNumericArray interface: existence and properties of interface prototype object -PASS CSSNumericArray interface: existence and properties of interface prototype object's "constructor" property -PASS CSSNumericArray interface: existence and properties of interface prototype object's @@unscopables property -PASS CSSNumericArray interface: iterable<CSSNumericValue> -PASS CSSNumericArray interface: attribute length -PASS CSSTransformValue interface: existence and properties of interface object -PASS CSSTransformValue interface object length -PASS CSSTransformValue interface object name -PASS CSSTransformValue interface: existence and properties of interface prototype object -PASS CSSTransformValue interface: existence and properties of interface prototype object's "constructor" property -PASS CSSTransformValue interface: existence and properties of interface prototype object's @@unscopables property -PASS CSSTransformValue interface: iterable<CSSTransformComponent> -PASS CSSTransformValue interface: attribute length -PASS CSSTransformValue interface: attribute is2D -PASS CSSTransformValue interface: operation toMatrix() -PASS CSSTransformValue must be primary interface of transformValue -PASS Stringification of transformValue -PASS CSSTransformValue interface: transformValue must inherit property "length" with the proper type -PASS CSSTransformValue interface: transformValue must inherit property "is2D" with the proper type -PASS CSSTransformValue interface: transformValue must inherit property "toMatrix()" with the proper type -PASS CSSStyleValue interface: transformValue must inherit property "parse(USVString, USVString)" with the proper type -FAIL CSSStyleValue interface: calling parse(USVString, USVString) on transformValue with too few arguments must throw TypeError assert_own_property: interface object must have static operation as own property expected property "parse" missing -PASS CSSStyleValue interface: transformValue must inherit property "parseAll(USVString, USVString)" with the proper type -FAIL CSSStyleValue interface: calling parseAll(USVString, USVString) on transformValue with too few arguments must throw TypeError assert_own_property: interface object must have static operation as own property expected property "parseAll" missing -PASS CSSTransformComponent interface: existence and properties of interface object -PASS CSSTransformComponent interface object length -PASS CSSTransformComponent interface object name -PASS CSSTransformComponent interface: existence and properties of interface prototype object -PASS CSSTransformComponent interface: existence and properties of interface prototype object's "constructor" property -PASS CSSTransformComponent interface: existence and properties of interface prototype object's @@unscopables property -PASS CSSTransformComponent interface: stringifier -PASS CSSTransformComponent interface: attribute is2D -PASS CSSTransformComponent interface: operation toMatrix() -PASS CSSTranslate interface: existence and properties of interface object -PASS CSSTranslate interface object length -PASS CSSTranslate interface object name -PASS CSSTranslate interface: existence and properties of interface prototype object -PASS CSSTranslate interface: existence and properties of interface prototype object's "constructor" property -PASS CSSTranslate interface: existence and properties of interface prototype object's @@unscopables property -PASS CSSTranslate interface: attribute x -PASS CSSTranslate interface: attribute y -PASS CSSTranslate interface: attribute z -PASS CSSTranslate must be primary interface of transformValue[0] -PASS Stringification of transformValue[0] -PASS CSSTranslate interface: transformValue[0] must inherit property "x" with the proper type -PASS CSSTranslate interface: transformValue[0] must inherit property "y" with the proper type -PASS CSSTranslate interface: transformValue[0] must inherit property "z" with the proper type -PASS CSSTransformComponent interface: transformValue[0] must inherit property "is2D" with the proper type -PASS CSSTransformComponent interface: transformValue[0] must inherit property "toMatrix()" with the proper type -PASS CSSRotate interface: existence and properties of interface object -PASS CSSRotate interface object length -PASS CSSRotate interface object name -PASS CSSRotate interface: existence and properties of interface prototype object -PASS CSSRotate interface: existence and properties of interface prototype object's "constructor" property -PASS CSSRotate interface: existence and properties of interface prototype object's @@unscopables property -PASS CSSRotate interface: attribute x -PASS CSSRotate interface: attribute y -PASS CSSRotate interface: attribute z -PASS CSSRotate interface: attribute angle -PASS CSSRotate must be primary interface of rotate -PASS Stringification of rotate -PASS CSSRotate interface: rotate must inherit property "x" with the proper type -PASS CSSRotate interface: rotate must inherit property "y" with the proper type -PASS CSSRotate interface: rotate must inherit property "z" with the proper type -PASS CSSRotate interface: rotate must inherit property "angle" with the proper type -PASS CSSTransformComponent interface: rotate must inherit property "is2D" with the proper type -PASS CSSTransformComponent interface: rotate must inherit property "toMatrix()" with the proper type -PASS CSSScale interface: existence and properties of interface object -PASS CSSScale interface object length -PASS CSSScale interface object name -PASS CSSScale interface: existence and properties of interface prototype object -PASS CSSScale interface: existence and properties of interface prototype object's "constructor" property -PASS CSSScale interface: existence and properties of interface prototype object's @@unscopables property -PASS CSSScale interface: attribute x -PASS CSSScale interface: attribute y -PASS CSSScale interface: attribute z -PASS CSSScale must be primary interface of scale -PASS Stringification of scale -PASS CSSScale interface: scale must inherit property "x" with the proper type -PASS CSSScale interface: scale must inherit property "y" with the proper type -PASS CSSScale interface: scale must inherit property "z" with the proper type -PASS CSSTransformComponent interface: scale must inherit property "is2D" with the proper type -PASS CSSTransformComponent interface: scale must inherit property "toMatrix()" with the proper type -PASS CSSSkew interface: existence and properties of interface object -PASS CSSSkew interface object length -PASS CSSSkew interface object name -PASS CSSSkew interface: existence and properties of interface prototype object -PASS CSSSkew interface: existence and properties of interface prototype object's "constructor" property -PASS CSSSkew interface: existence and properties of interface prototype object's @@unscopables property -PASS CSSSkew interface: attribute ax -PASS CSSSkew interface: attribute ay -PASS CSSSkew must be primary interface of skew -PASS Stringification of skew -PASS CSSSkew interface: skew must inherit property "ax" with the proper type -PASS CSSSkew interface: skew must inherit property "ay" with the proper type -PASS CSSTransformComponent interface: skew must inherit property "is2D" with the proper type -PASS CSSTransformComponent interface: skew must inherit property "toMatrix()" with the proper type -PASS CSSSkewX interface: existence and properties of interface object -PASS CSSSkewX interface object length -PASS CSSSkewX interface object name -PASS CSSSkewX interface: existence and properties of interface prototype object -PASS CSSSkewX interface: existence and properties of interface prototype object's "constructor" property -PASS CSSSkewX interface: existence and properties of interface prototype object's @@unscopables property -PASS CSSSkewX interface: attribute ax -PASS CSSSkewX must be primary interface of skewX -PASS Stringification of skewX -PASS CSSSkewX interface: skewX must inherit property "ax" with the proper type -PASS CSSTransformComponent interface: skewX must inherit property "is2D" with the proper type -PASS CSSTransformComponent interface: skewX must inherit property "toMatrix()" with the proper type -PASS CSSSkewY interface: existence and properties of interface object -PASS CSSSkewY interface object length -PASS CSSSkewY interface object name -PASS CSSSkewY interface: existence and properties of interface prototype object -PASS CSSSkewY interface: existence and properties of interface prototype object's "constructor" property -PASS CSSSkewY interface: existence and properties of interface prototype object's @@unscopables property -PASS CSSSkewY interface: attribute ay -PASS CSSSkewY must be primary interface of skewY -PASS Stringification of skewY -PASS CSSSkewY interface: skewY must inherit property "ay" with the proper type -PASS CSSTransformComponent interface: skewY must inherit property "is2D" with the proper type -PASS CSSTransformComponent interface: skewY must inherit property "toMatrix()" with the proper type -PASS CSSPerspective interface: existence and properties of interface object -PASS CSSPerspective interface object length -PASS CSSPerspective interface object name -PASS CSSPerspective interface: existence and properties of interface prototype object -PASS CSSPerspective interface: existence and properties of interface prototype object's "constructor" property -PASS CSSPerspective interface: existence and properties of interface prototype object's @@unscopables property -PASS CSSPerspective interface: attribute length -PASS CSSPerspective must be primary interface of perspective -PASS Stringification of perspective -PASS CSSPerspective interface: perspective must inherit property "length" with the proper type -PASS CSSTransformComponent interface: perspective must inherit property "is2D" with the proper type -PASS CSSTransformComponent interface: perspective must inherit property "toMatrix()" with the proper type -PASS CSSMatrixComponent interface: existence and properties of interface object -PASS CSSMatrixComponent interface object length -PASS CSSMatrixComponent interface object name -PASS CSSMatrixComponent interface: existence and properties of interface prototype object -PASS CSSMatrixComponent interface: existence and properties of interface prototype object's "constructor" property -PASS CSSMatrixComponent interface: existence and properties of interface prototype object's @@unscopables property -PASS CSSMatrixComponent interface: attribute matrix -PASS CSSMatrixComponent must be primary interface of matrix -PASS Stringification of matrix -PASS CSSMatrixComponent interface: matrix must inherit property "matrix" with the proper type -PASS CSSTransformComponent interface: matrix must inherit property "is2D" with the proper type -PASS CSSTransformComponent interface: matrix must inherit property "toMatrix()" with the proper type -PASS CSSImageValue interface: existence and properties of interface object -PASS CSSImageValue interface object length -PASS CSSImageValue interface object name -PASS CSSImageValue interface: existence and properties of interface prototype object -PASS CSSImageValue interface: existence and properties of interface prototype object's "constructor" property -PASS CSSImageValue interface: existence and properties of interface prototype object's @@unscopables property -FAIL CSSColorValue interface: existence and properties of interface object assert_equals: prototype of CSSColorValue is not CSSStyleValue expected function "function CSSStyleValue() { [native code] }" but got function "function () { [native code] }" -PASS CSSColorValue interface object length -PASS CSSColorValue interface object name -FAIL CSSColorValue interface: existence and properties of interface prototype object assert_equals: prototype of CSSColorValue.prototype is not CSSStyleValue.prototype expected [stringifying object threw TypeError: Illegal invocation with type object] but got object "[object Object]" -PASS CSSColorValue interface: existence and properties of interface prototype object's "constructor" property -PASS CSSColorValue interface: existence and properties of interface prototype object's @@unscopables property -PASS CSSColorValue interface: operation parse(USVString) -PASS CSSRGB interface: existence and properties of interface object -PASS CSSRGB interface object length -PASS CSSRGB interface object name -PASS CSSRGB interface: existence and properties of interface prototype object -PASS CSSRGB interface: existence and properties of interface prototype object's "constructor" property -PASS CSSRGB interface: existence and properties of interface prototype object's @@unscopables property -PASS CSSRGB interface: attribute r -PASS CSSRGB interface: attribute g -PASS CSSRGB interface: attribute b -PASS CSSRGB interface: attribute alpha -PASS CSSHSL interface: existence and properties of interface object -PASS CSSHSL interface object length -PASS CSSHSL interface object name -PASS CSSHSL interface: existence and properties of interface prototype object -PASS CSSHSL interface: existence and properties of interface prototype object's "constructor" property -PASS CSSHSL interface: existence and properties of interface prototype object's @@unscopables property -PASS CSSHSL interface: attribute h -PASS CSSHSL interface: attribute s -PASS CSSHSL interface: attribute l -PASS CSSHSL interface: attribute alpha -PASS CSSHWB interface: existence and properties of interface object -PASS CSSHWB interface object length -PASS CSSHWB interface object name -PASS CSSHWB interface: existence and properties of interface prototype object -PASS CSSHWB interface: existence and properties of interface prototype object's "constructor" property -PASS CSSHWB interface: existence and properties of interface prototype object's @@unscopables property -PASS CSSHWB interface: attribute h -PASS CSSHWB interface: attribute w -PASS CSSHWB interface: attribute b -PASS CSSHWB interface: attribute alpha -FAIL CSSLab interface: existence and properties of interface object assert_own_property: self does not have own property "CSSLab" expected property "CSSLab" missing -FAIL CSSLab interface object length assert_own_property: self does not have own property "CSSLab" expected property "CSSLab" missing -FAIL CSSLab interface object name assert_own_property: self does not have own property "CSSLab" expected property "CSSLab" missing -FAIL CSSLab interface: existence and properties of interface prototype object assert_own_property: self does not have own property "CSSLab" expected property "CSSLab" missing -FAIL CSSLab interface: existence and properties of interface prototype object's "constructor" property assert_own_property: self does not have own property "CSSLab" expected property "CSSLab" missing -FAIL CSSLab interface: existence and properties of interface prototype object's @@unscopables property assert_own_property: self does not have own property "CSSLab" expected property "CSSLab" missing -FAIL CSSLab interface: attribute l assert_own_property: self does not have own property "CSSLab" expected property "CSSLab" missing -FAIL CSSLab interface: attribute a assert_own_property: self does not have own property "CSSLab" expected property "CSSLab" missing -FAIL CSSLab interface: attribute b assert_own_property: self does not have own property "CSSLab" expected property "CSSLab" missing -FAIL CSSLab interface: attribute alpha assert_own_property: self does not have own property "CSSLab" expected property "CSSLab" missing -FAIL CSSLCH interface: existence and properties of interface object assert_own_property: self does not have own property "CSSLCH" expected property "CSSLCH" missing -FAIL CSSLCH interface object length assert_own_property: self does not have own property "CSSLCH" expected property "CSSLCH" missing -FAIL CSSLCH interface object name assert_own_property: self does not have own property "CSSLCH" expected property "CSSLCH" missing -FAIL CSSLCH interface: existence and properties of interface prototype object assert_own_property: self does not have own property "CSSLCH" expected property "CSSLCH" missing -FAIL CSSLCH interface: existence and properties of interface prototype object's "constructor" property assert_own_property: self does not have own property "CSSLCH" expected property "CSSLCH" missing -FAIL CSSLCH interface: existence and properties of interface prototype object's @@unscopables property assert_own_property: self does not have own property "CSSLCH" expected property "CSSLCH" missing -FAIL CSSLCH interface: attribute l assert_own_property: self does not have own property "CSSLCH" expected property "CSSLCH" missing -FAIL CSSLCH interface: attribute c assert_own_property: self does not have own property "CSSLCH" expected property "CSSLCH" missing -FAIL CSSLCH interface: attribute h assert_own_property: self does not have own property "CSSLCH" expected property "CSSLCH" missing -FAIL CSSLCH interface: attribute alpha assert_own_property: self does not have own property "CSSLCH" expected property "CSSLCH" missing -FAIL CSSOKLab interface: existence and properties of interface object assert_own_property: self does not have own property "CSSOKLab" expected property "CSSOKLab" missing -FAIL CSSOKLab interface object length assert_own_property: self does not have own property "CSSOKLab" expected property "CSSOKLab" missing -FAIL CSSOKLab interface object name assert_own_property: self does not have own property "CSSOKLab" expected property "CSSOKLab" missing -FAIL CSSOKLab interface: existence and properties of interface prototype object assert_own_property: self does not have own property "CSSOKLab" expected property "CSSOKLab" missing -FAIL CSSOKLab interface: existence and properties of interface prototype object's "constructor" property assert_own_property: self does not have own property "CSSOKLab" expected property "CSSOKLab" missing -FAIL CSSOKLab interface: existence and properties of interface prototype object's @@unscopables property assert_own_property: self does not have own property "CSSOKLab" expected property "CSSOKLab" missing -FAIL CSSOKLab interface: attribute l assert_own_property: self does not have own property "CSSOKLab" expected property "CSSOKLab" missing -FAIL CSSOKLab interface: attribute a assert_own_property: self does not have own property "CSSOKLab" expected property "CSSOKLab" missing -FAIL CSSOKLab interface: attribute b assert_own_property: self does not have own property "CSSOKLab" expected property "CSSOKLab" missing -FAIL CSSOKLab interface: attribute alpha assert_own_property: self does not have own property "CSSOKLab" expected property "CSSOKLab" missing -FAIL CSSOKLCH interface: existence and properties of interface object assert_own_property: self does not have own property "CSSOKLCH" expected property "CSSOKLCH" missing -FAIL CSSOKLCH interface object length assert_own_property: self does not have own property "CSSOKLCH" expected property "CSSOKLCH" missing -FAIL CSSOKLCH interface object name assert_own_property: self does not have own property "CSSOKLCH" expected property "CSSOKLCH" missing -FAIL CSSOKLCH interface: existence and properties of interface prototype object assert_own_property: self does not have own property "CSSOKLCH" expected property "CSSOKLCH" missing -FAIL CSSOKLCH interface: existence and properties of interface prototype object's "constructor" property assert_own_property: self does not have own property "CSSOKLCH" expected property "CSSOKLCH" missing -FAIL CSSOKLCH interface: existence and properties of interface prototype object's @@unscopables property assert_own_property: self does not have own property "CSSOKLCH" expected property "CSSOKLCH" missing -FAIL CSSOKLCH interface: attribute l assert_own_property: self does not have own property "CSSOKLCH" expected property "CSSOKLCH" missing -FAIL CSSOKLCH interface: attribute c assert_own_property: self does not have own property "CSSOKLCH" expected property "CSSOKLCH" missing -FAIL CSSOKLCH interface: attribute h assert_own_property: self does not have own property "CSSOKLCH" expected property "CSSOKLCH" missing -FAIL CSSOKLCH interface: attribute alpha assert_own_property: self does not have own property "CSSOKLCH" expected property "CSSOKLCH" missing -FAIL CSSColor interface: existence and properties of interface object assert_own_property: self does not have own property "CSSColor" expected property "CSSColor" missing -FAIL CSSColor interface object length assert_own_property: self does not have own property "CSSColor" expected property "CSSColor" missing -FAIL CSSColor interface object name assert_own_property: self does not have own property "CSSColor" expected property "CSSColor" missing -FAIL CSSColor interface: existence and properties of interface prototype object assert_own_property: self does not have own property "CSSColor" expected property "CSSColor" missing -FAIL CSSColor interface: existence and properties of interface prototype object's "constructor" property assert_own_property: self does not have own property "CSSColor" expected property "CSSColor" missing -FAIL CSSColor interface: existence and properties of interface prototype object's @@unscopables property assert_own_property: self does not have own property "CSSColor" expected property "CSSColor" missing -FAIL CSSColor interface: attribute colorSpace assert_own_property: self does not have own property "CSSColor" expected property "CSSColor" missing -FAIL CSSColor interface: attribute channels assert_own_property: self does not have own property "CSSColor" expected property "CSSColor" missing -FAIL CSSColor interface: attribute alpha assert_own_property: self does not have own property "CSSColor" expected property "CSSColor" missing -PASS CSSStyleRule interface: attribute styleMap -PASS CSS namespace: operation escape(CSSOMString) -PASS CSS namespace: operation number(double) -PASS CSS namespace: operation percent(double) -PASS CSS namespace: operation em(double) -PASS CSS namespace: operation ex(double) -PASS CSS namespace: operation ch(double) -FAIL CSS namespace: operation ic(double) assert_own_property: namespace object missing operation "ic" expected property "ic" missing -PASS CSS namespace: operation rem(double) -FAIL CSS namespace: operation lh(double) assert_own_property: namespace object missing operation "lh" expected property "lh" missing -FAIL CSS namespace: operation rlh(double) assert_own_property: namespace object missing operation "rlh" expected property "rlh" missing -PASS CSS namespace: operation vw(double) -PASS CSS namespace: operation vh(double) -PASS CSS namespace: operation vi(double) -PASS CSS namespace: operation vb(double) -PASS CSS namespace: operation vmin(double) -PASS CSS namespace: operation vmax(double) -PASS CSS namespace: operation svw(double) -PASS CSS namespace: operation svh(double) -PASS CSS namespace: operation svi(double) -PASS CSS namespace: operation svb(double) -PASS CSS namespace: operation svmin(double) -PASS CSS namespace: operation svmax(double) -PASS CSS namespace: operation lvw(double) -PASS CSS namespace: operation lvh(double) -PASS CSS namespace: operation lvi(double) -PASS CSS namespace: operation lvb(double) -PASS CSS namespace: operation lvmin(double) -PASS CSS namespace: operation lvmax(double) -PASS CSS namespace: operation dvw(double) -PASS CSS namespace: operation dvh(double) -PASS CSS namespace: operation dvi(double) -PASS CSS namespace: operation dvb(double) -PASS CSS namespace: operation dvmin(double) -PASS CSS namespace: operation dvmax(double) -PASS CSS namespace: operation cqw(double) -PASS CSS namespace: operation cqh(double) -PASS CSS namespace: operation cqi(double) -PASS CSS namespace: operation cqb(double) -PASS CSS namespace: operation cqmin(double) -PASS CSS namespace: operation cqmax(double) -PASS CSS namespace: operation cm(double) -PASS CSS namespace: operation mm(double) -PASS CSS namespace: operation Q(double) -PASS CSS namespace: operation in(double) -PASS CSS namespace: operation pt(double) -PASS CSS namespace: operation pc(double) -PASS CSS namespace: operation px(double) -PASS CSS namespace: operation deg(double) -PASS CSS namespace: operation grad(double) -PASS CSS namespace: operation rad(double) -PASS CSS namespace: operation turn(double) -PASS CSS namespace: operation s(double) -PASS CSS namespace: operation ms(double) -PASS CSS namespace: operation Hz(double) -PASS CSS namespace: operation kHz(double) -PASS CSS namespace: operation dpi(double) -PASS CSS namespace: operation dpcm(double) -PASS CSS namespace: operation dppx(double) -PASS CSS namespace: operation fr(double) -PASS SVGElement interface: attribute attributeStyleMap -PASS HTMLElement interface: attribute attributeStyleMap -PASS Element interface: operation computedStyleMap() -PASS MathMLElement interface: attribute attributeStyleMap -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-ui/text-overflow-010-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-ui/text-overflow-010-expected.png deleted file mode 100644 index b60ee837..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-ui/text-overflow-010-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-icb-vlr-003-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-icb-vlr-003-expected.png deleted file mode 100644 index ebfd3104..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-icb-vlr-003-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-icb-vlr-005-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-icb-vlr-005-expected.png deleted file mode 100644 index 3c1ba13..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-icb-vlr-005-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-icb-vlr-011-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-icb-vlr-011-expected.png deleted file mode 100644 index ebfd3104..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-icb-vlr-011-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-icb-vlr-013-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-icb-vlr-013-expected.png deleted file mode 100644 index 3c1ba13..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-icb-vlr-013-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-icb-vlr-033-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-icb-vlr-033-expected.png deleted file mode 100644 index 09a4f1a..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-icb-vlr-033-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-icb-vrl-002-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-icb-vrl-002-expected.png deleted file mode 100644 index bf8e2ed..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-icb-vrl-002-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-icb-vrl-004-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-icb-vrl-004-expected.png deleted file mode 100644 index 3c1ba13..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-icb-vrl-004-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-icb-vrl-006-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-icb-vrl-006-expected.png deleted file mode 100644 index 105d1d7e..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-icb-vrl-006-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-icb-vrl-008-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-icb-vrl-008-expected.png deleted file mode 100644 index 073ad955..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-icb-vrl-008-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-icb-vrl-010-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-icb-vrl-010-expected.png deleted file mode 100644 index 73b0deaf..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-icb-vrl-010-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-icb-vrl-012-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-icb-vrl-012-expected.png deleted file mode 100644 index 3c1ba13..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-icb-vrl-012-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-icb-vrl-014-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-icb-vrl-014-expected.png deleted file mode 100644 index 073ad955..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-icb-vrl-014-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-icb-vrl-016-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-icb-vrl-016-expected.png deleted file mode 100644 index 073ad955..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-icb-vrl-016-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-icb-vrl-018-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-icb-vrl-018-expected.png deleted file mode 100644 index 37adf50..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-icb-vrl-018-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-icb-vrl-020-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-icb-vrl-020-expected.png deleted file mode 100644 index 37adf50..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-icb-vrl-020-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-icb-vrl-030-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-icb-vrl-030-expected.png deleted file mode 100644 index 99575fa..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-icb-vrl-030-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vlr-005-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vlr-005-expected.png deleted file mode 100644 index 91dd899..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vlr-005-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vlr-017-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vlr-017-expected.png deleted file mode 100644 index 882eacf..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vlr-017-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vlr-029-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vlr-029-expected.png deleted file mode 100644 index 91dd899..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vlr-029-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vlr-041-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vlr-041-expected.png deleted file mode 100644 index 882eacf..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vlr-041-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vlr-053-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vlr-053-expected.png deleted file mode 100644 index 3eef8726..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vlr-053-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vlr-065-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vlr-065-expected.png deleted file mode 100644 index 3eef8726..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vlr-065-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vlr-077-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vlr-077-expected.png deleted file mode 100644 index 882eacf..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vlr-077-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vlr-089-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vlr-089-expected.png deleted file mode 100644 index 3eef8726..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vlr-089-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vlr-095-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vlr-095-expected.png deleted file mode 100644 index 2379a48..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vlr-095-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vlr-105-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vlr-105-expected.png deleted file mode 100644 index 91dd899..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vlr-105-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vlr-109-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vlr-109-expected.png deleted file mode 100644 index 3e5ca74..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vlr-109-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vlr-121-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vlr-121-expected.png deleted file mode 100644 index be3b68b90..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vlr-121-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vlr-125-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vlr-125-expected.png deleted file mode 100644 index 34af7747..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vlr-125-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vlr-137-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vlr-137-expected.png deleted file mode 100644 index 91dd899..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vlr-137-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vlr-141-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vlr-141-expected.png deleted file mode 100644 index 3e5ca74..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vlr-141-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vlr-153-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vlr-153-expected.png deleted file mode 100644 index 66358d26..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vlr-153-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vlr-157-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vlr-157-expected.png deleted file mode 100644 index e924d3e4..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vlr-157-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vlr-169-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vlr-169-expected.png deleted file mode 100644 index be3b68b90..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vlr-169-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vlr-173-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vlr-173-expected.png deleted file mode 100644 index 34af7747..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vlr-173-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vlr-185-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vlr-185-expected.png deleted file mode 100644 index be3b68b90..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vlr-185-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vlr-189-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vlr-189-expected.png deleted file mode 100644 index 34af7747..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vlr-189-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vlr-201-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vlr-201-expected.png deleted file mode 100644 index 66358d26..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vlr-201-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vlr-205-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vlr-205-expected.png deleted file mode 100644 index e924d3e4..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vlr-205-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vlr-217-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vlr-217-expected.png deleted file mode 100644 index be3b68b90..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vlr-217-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vlr-221-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vlr-221-expected.png deleted file mode 100644 index e924d3e4..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vlr-221-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vlr-225-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vlr-225-expected.png deleted file mode 100644 index 34af7747..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vlr-225-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vlr-229-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vlr-229-expected.png deleted file mode 100644 index 66358d26..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vlr-229-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vrl-004-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vrl-004-expected.png deleted file mode 100644 index 3eef8726..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vrl-004-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vrl-010-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vrl-010-expected.png deleted file mode 100644 index 2379a48..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vrl-010-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vrl-016-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vrl-016-expected.png deleted file mode 100644 index 882eacf..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vrl-016-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vrl-028-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vrl-028-expected.png deleted file mode 100644 index 3eef8726..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vrl-028-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vrl-034-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vrl-034-expected.png deleted file mode 100644 index 2379a48..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vrl-034-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vrl-040-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vrl-040-expected.png deleted file mode 100644 index 882eacf..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vrl-040-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vrl-052-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vrl-052-expected.png deleted file mode 100644 index 3eef8726..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vrl-052-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vrl-064-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vrl-064-expected.png deleted file mode 100644 index 3eef8726..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vrl-064-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vrl-076-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vrl-076-expected.png deleted file mode 100644 index 882eacf..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vrl-076-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vrl-088-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vrl-088-expected.png deleted file mode 100644 index 91dd899..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vrl-088-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vrl-104-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vrl-104-expected.png deleted file mode 100644 index 3eef8726..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vrl-104-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vrl-108-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vrl-108-expected.png deleted file mode 100644 index e924d3e4..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vrl-108-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vrl-112-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vrl-112-expected.png deleted file mode 100644 index 2379a48..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vrl-112-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vrl-116-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vrl-116-expected.png deleted file mode 100644 index 66358d26..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vrl-116-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vrl-124-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vrl-124-expected.png deleted file mode 100644 index 34af7747..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vrl-124-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vrl-128-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vrl-128-expected.png deleted file mode 100644 index 2ff3c3e..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vrl-128-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vrl-136-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vrl-136-expected.png deleted file mode 100644 index 3eef8726..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vrl-136-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vrl-140-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vrl-140-expected.png deleted file mode 100644 index e924d3e4..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vrl-140-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vrl-144-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vrl-144-expected.png deleted file mode 100644 index 2379a48..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vrl-144-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vrl-148-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vrl-148-expected.png deleted file mode 100644 index 66358d26..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vrl-148-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vrl-156-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vrl-156-expected.png deleted file mode 100644 index e924d3e4..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vrl-156-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vrl-160-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vrl-160-expected.png deleted file mode 100644 index 2379a48..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vrl-160-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vrl-172-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vrl-172-expected.png deleted file mode 100644 index 34af7747..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vrl-172-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vrl-176-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vrl-176-expected.png deleted file mode 100644 index 2ff3c3e..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vrl-176-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vrl-188-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vrl-188-expected.png deleted file mode 100644 index 34af7747..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vrl-188-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vrl-192-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vrl-192-expected.png deleted file mode 100644 index 2ff3c3e..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vrl-192-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vrl-204-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vrl-204-expected.png deleted file mode 100644 index e924d3e4..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vrl-204-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vrl-208-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vrl-208-expected.png deleted file mode 100644 index 2379a48..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vrl-208-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vrl-220-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vrl-220-expected.png deleted file mode 100644 index 3e5ca74..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vrl-220-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vrl-224-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vrl-224-expected.png deleted file mode 100644 index 3e5ca74..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/abs-pos-non-replaced-vrl-224-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/available-size-002-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/available-size-002-expected.png deleted file mode 100644 index d9243a5..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/available-size-002-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/available-size-010-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/available-size-010-expected.png deleted file mode 100644 index af3f91298..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/available-size-010-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/available-size-017-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/available-size-017-expected.png deleted file mode 100644 index 9e447dcd..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/available-size-017-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/baseline-with-orthogonal-flow-001-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/baseline-with-orthogonal-flow-001-expected.png deleted file mode 100644 index 83118c65..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/baseline-with-orthogonal-flow-001-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/block-flow-direction-vrl-009-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/block-flow-direction-vrl-009-expected.png deleted file mode 100644 index ea75daa2..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/block-flow-direction-vrl-009-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/inline-box-border-vlr-001-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/inline-box-border-vlr-001-expected.png deleted file mode 100644 index 75fb6bf..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/inline-box-border-vlr-001-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/line-box-direction-vrl-009-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/line-box-direction-vrl-009-expected.png deleted file mode 100644 index fb43b54a..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/line-box-direction-vrl-009-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/line-box-height-vlr-021-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/line-box-height-vlr-021-expected.png deleted file mode 100644 index 5c92f3cd..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/line-box-height-vlr-021-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/line-box-height-vlr-023-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/line-box-height-vlr-023-expected.png deleted file mode 100644 index 5ecd445..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/line-box-height-vlr-023-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/ortho-htb-alongside-vrl-floats-006-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/ortho-htb-alongside-vrl-floats-006-expected.png deleted file mode 100644 index 92a6d5f..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/ortho-htb-alongside-vrl-floats-006-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/ortho-htb-alongside-vrl-floats-014-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/ortho-htb-alongside-vrl-floats-014-expected.png deleted file mode 100644 index 78257ce6..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/ortho-htb-alongside-vrl-floats-014-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/sizing-orthog-htb-in-vlr-001-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/sizing-orthog-htb-in-vlr-001-expected.png deleted file mode 100644 index d097b815..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/sizing-orthog-htb-in-vlr-001-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/sizing-orthog-htb-in-vlr-004-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/sizing-orthog-htb-in-vlr-004-expected.png deleted file mode 100644 index 035cd67..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/sizing-orthog-htb-in-vlr-004-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/sizing-orthog-prct-htb-in-vlr-001-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/sizing-orthog-prct-htb-in-vlr-001-expected.png deleted file mode 100644 index a6bf546..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/sizing-orthog-prct-htb-in-vlr-001-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/sizing-orthog-prct-htb-in-vlr-002-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/sizing-orthog-prct-htb-in-vlr-002-expected.png deleted file mode 100644 index eb836a5..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/sizing-orthog-prct-htb-in-vlr-002-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/sizing-orthog-prct-htb-in-vrl-001-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/sizing-orthog-prct-htb-in-vrl-001-expected.png deleted file mode 100644 index cf34608..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/sizing-orthog-prct-htb-in-vrl-001-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/sizing-orthog-prct-htb-in-vrl-002-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/sizing-orthog-prct-htb-in-vrl-002-expected.png deleted file mode 100644 index cbb8435..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/sizing-orthog-prct-htb-in-vrl-002-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/sizing-orthog-prct-vlr-in-htb-001-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/sizing-orthog-prct-vlr-in-htb-001-expected.png deleted file mode 100644 index 87cea5f6..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/sizing-orthog-prct-vlr-in-htb-001-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/sizing-orthog-prct-vlr-in-htb-002-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/sizing-orthog-prct-vlr-in-htb-002-expected.png deleted file mode 100644 index ab82d607..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/sizing-orthog-prct-vlr-in-htb-002-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/sizing-orthog-prct-vrl-in-htb-001-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/sizing-orthog-prct-vrl-in-htb-001-expected.png deleted file mode 100644 index f142458..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/sizing-orthog-prct-vrl-in-htb-001-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/sizing-orthog-prct-vrl-in-htb-002-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/sizing-orthog-prct-vrl-in-htb-002-expected.png deleted file mode 100644 index 794a279..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/sizing-orthog-prct-vrl-in-htb-002-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/sizing-orthog-vlr-in-htb-001-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/sizing-orthog-vlr-in-htb-001-expected.png deleted file mode 100644 index fd8082c9..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/sizing-orthog-vlr-in-htb-001-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/sizing-orthog-vlr-in-htb-004-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/sizing-orthog-vlr-in-htb-004-expected.png deleted file mode 100644 index 720b450..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/sizing-orthog-vlr-in-htb-004-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/sizing-orthog-vrl-in-htb-001-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/sizing-orthog-vrl-in-htb-001-expected.png deleted file mode 100644 index c645ed1..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/sizing-orthog-vrl-in-htb-001-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/sizing-orthog-vrl-in-htb-004-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/sizing-orthog-vrl-in-htb-004-expected.png deleted file mode 100644 index 6e5e4b5..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/sizing-orthog-vrl-in-htb-004-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/two-levels-of-orthogonal-flows-percentage-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/two-levels-of-orthogonal-flows-percentage-expected.png deleted file mode 100644 index e2fb8967..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/two-levels-of-orthogonal-flows-percentage-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/vertical-alignment-003-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/vertical-alignment-003-expected.png deleted file mode 100644 index e777db28..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/vertical-alignment-003-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/vertical-alignment-009-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/vertical-alignment-009-expected.png deleted file mode 100644 index 4448d19..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/css-writing-modes/vertical-alignment-009-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/cssom-view/cssom-getClientRects-002-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/cssom-view/cssom-getClientRects-002-expected.txt deleted file mode 100644 index f2b29367..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/cssom-view/cssom-getClientRects-002-expected.txt +++ /dev/null
@@ -1,4 +0,0 @@ -This is a testharness.js-based test. -FAIL CSSOM View - GetClientRects().length is the same regardless source new lines assert_equals: count2 expected 1 but got 2 -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/cssom-view/elementFromPoint-002-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/cssom-view/elementFromPoint-002-expected.txt deleted file mode 100644 index 84331f9..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/cssom-view/elementFromPoint-002-expected.txt +++ /dev/null
@@ -1,5 +0,0 @@ -This is a testharness.js-based test. -FAIL Checking whether dynamic changes to visibility interact correctly with - table anonymous boxes assert_equals: Should hit the overlay first. expected Element node <div id="overlay"><div></div></div> but got Element node <div id="target">Some text</div> -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/cssom-view/elementFromPoint-003-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/cssom-view/elementFromPoint-003-expected.txt deleted file mode 100644 index 532b2b5a..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/cssom-view/elementFromPoint-003-expected.txt +++ /dev/null
@@ -1,5 +0,0 @@ -This is a testharness.js-based test. -FAIL Checking whether dynamic changes to visibility interact correctly with - table anonymous boxes assert_equals: Should hit the overlay first. expected Element node <div id="overlay"><div></div><div></div></div> but got Element node <div id="target">Some text</div> -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/cssom-view/getBoundingClientRect-shy-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/cssom-view/getBoundingClientRect-shy-expected.txt deleted file mode 100644 index 8ead4c03..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/cssom-view/getBoundingClientRect-shy-expected.txt +++ /dev/null
@@ -1,15 +0,0 @@ -This is a testharness.js-based test. -PASS Range 0-5 should not include the hyphen. -PASS Range 1-5 should not include the hyphen. -PASS Range 0-6 should not include the hyphen. -PASS Range 1-6 should not include the hyphen. -PASS Range 0-7 should include the hyphen. -FAIL Range 1-7 should include the hyphen. assert_equals: expected 60 but got 50 -PASS Range 0-8 should include the hyphen. -PASS Range 0-8 should include only the first hyphen. -PASS Collapsed soft-hyphen should be 0 width. -FAIL Rendered soft-hyphen should have a width. assert_equals: expected 10 but got 0 -PASS Collapsed soft-hyphen in a span should be 0 width. -FAIL Rendered soft-hyphen in a span should have a width. assert_equals: expected 10 but got 0 -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/cssom-view/table-client-props-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/cssom-view/table-client-props-expected.txt deleted file mode 100644 index 426862ee..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/cssom-view/table-client-props-expected.txt +++ /dev/null
@@ -1,16 +0,0 @@ -This is a testharness.js-based test. -PASS Overall test to make sure there are no exceptions -PASS Basic table -PASS Basic caption -PASS Table and narrower caption -PASS Table and wider caption -PASS Table with padding -FAIL Table with padding and content-box sizing assert_equals: Table with padding and content-box sizing clientWidth expected 26 but got 20 -FAIL Table with separated border assert_equals: Table with separated border clientWidth expected 26 but got 20 -FAIL Table with collapsed border assert_equals: Table with collapsed border clientWidth expected 26 but got 20 -PASS Caption with padding -PASS Caption with border -FAIL Caption with margin assert_equals: Caption with margin clientWidth expected 46 but got 40 -PASS Bottom caption -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/cssom-view/table-offset-props-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/cssom-view/table-offset-props-expected.txt deleted file mode 100644 index d0c5f679..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/cssom-view/table-offset-props-expected.txt +++ /dev/null
@@ -1,16 +0,0 @@ -This is a testharness.js-based test. -PASS Overall test to make sure there are no exceptions -PASS Basic table -PASS Basic caption -PASS Table and narrower caption -PASS Table and wider caption -PASS Table with padding -FAIL Table with padding and content-box sizing assert_equals: Table with padding and content-box sizing offsetWidth expected 26 but got 20 -FAIL Table with separated border assert_equals: Table with separated border offsetWidth expected 26 but got 20 -FAIL Table with collapsed border assert_equals: Table with collapsed border offsetWidth expected 26 but got 20 -PASS Caption with padding -PASS Caption with border -FAIL Caption with margin assert_equals: Caption with margin offsetWidth expected 46 but got 40 -PASS Bottom caption -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/cssom-view/table-scroll-props-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/cssom-view/table-scroll-props-expected.txt deleted file mode 100644 index d978ada..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/cssom-view/table-scroll-props-expected.txt +++ /dev/null
@@ -1,16 +0,0 @@ -This is a testharness.js-based test. -PASS Overall test to make sure there are no exceptions -PASS Basic table -PASS Basic caption -PASS Table and narrower caption -PASS Table and wider caption -PASS Table with padding -FAIL Table with padding and content-box sizing assert_equals: Table with padding and content-box sizing scrollWidth expected 26 but got 20 -FAIL Table with separated border assert_equals: Table with separated border scrollWidth expected 26 but got 14 -FAIL Table with collapsed border assert_equals: Table with collapsed border scrollWidth expected 26 but got 14 -PASS Caption with padding -PASS Caption with border -FAIL Caption with margin assert_equals: Caption with margin scrollWidth expected 46 but got 44 -PASS Bottom caption -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/cssom/getComputedStyle-insets-absolute-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/cssom/getComputedStyle-insets-absolute-expected.txt deleted file mode 100644 index 74a91796..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/cssom/getComputedStyle-insets-absolute-expected.txt +++ /dev/null
@@ -1,328 +0,0 @@ -This is a testharness.js-based test. -Found 324 tests; 276 PASS, 48 FAIL, 0 TIMEOUT, 0 NOTRUN. -PASS horizontal-tb ltr inside horizontal-tb ltr - Pixels resolve as-is -PASS horizontal-tb ltr inside horizontal-tb ltr - Relative lengths are absolutized into pixels -PASS horizontal-tb ltr inside horizontal-tb ltr - Percentages are absolutized into pixels -PASS horizontal-tb ltr inside horizontal-tb ltr - calc() is absolutized into pixels -PASS horizontal-tb ltr inside horizontal-tb ltr - Pixels resolve as-is when overconstrained -PASS horizontal-tb ltr inside horizontal-tb ltr - Percentages absolutize the computed value when overconstrained -PASS horizontal-tb ltr inside horizontal-tb ltr - If start side is 'auto' and end side is not, 'auto' resolves to used value -PASS horizontal-tb ltr inside horizontal-tb ltr - If end side is 'auto' and start side is not, 'auto' resolves to used value -PASS horizontal-tb ltr inside horizontal-tb ltr - If opposite sides are 'auto', they resolve to used value -PASS horizontal-tb ltr inside horizontal-tb rtl - Pixels resolve as-is -PASS horizontal-tb ltr inside horizontal-tb rtl - Relative lengths are absolutized into pixels -PASS horizontal-tb ltr inside horizontal-tb rtl - Percentages are absolutized into pixels -PASS horizontal-tb ltr inside horizontal-tb rtl - calc() is absolutized into pixels -PASS horizontal-tb ltr inside horizontal-tb rtl - Pixels resolve as-is when overconstrained -PASS horizontal-tb ltr inside horizontal-tb rtl - Percentages absolutize the computed value when overconstrained -PASS horizontal-tb ltr inside horizontal-tb rtl - If start side is 'auto' and end side is not, 'auto' resolves to used value -PASS horizontal-tb ltr inside horizontal-tb rtl - If end side is 'auto' and start side is not, 'auto' resolves to used value -PASS horizontal-tb ltr inside horizontal-tb rtl - If opposite sides are 'auto', they resolve to used value -PASS horizontal-tb ltr inside vertical-lr ltr - Pixels resolve as-is -PASS horizontal-tb ltr inside vertical-lr ltr - Relative lengths are absolutized into pixels -PASS horizontal-tb ltr inside vertical-lr ltr - Percentages are absolutized into pixels -PASS horizontal-tb ltr inside vertical-lr ltr - calc() is absolutized into pixels -PASS horizontal-tb ltr inside vertical-lr ltr - Pixels resolve as-is when overconstrained -PASS horizontal-tb ltr inside vertical-lr ltr - Percentages absolutize the computed value when overconstrained -PASS horizontal-tb ltr inside vertical-lr ltr - If start side is 'auto' and end side is not, 'auto' resolves to used value -PASS horizontal-tb ltr inside vertical-lr ltr - If end side is 'auto' and start side is not, 'auto' resolves to used value -FAIL horizontal-tb ltr inside vertical-lr ltr - If opposite sides are 'auto', they resolve to used value assert_equals: 'top' expected "15px" but got "30px" -PASS horizontal-tb ltr inside vertical-lr rtl - Pixels resolve as-is -PASS horizontal-tb ltr inside vertical-lr rtl - Relative lengths are absolutized into pixels -PASS horizontal-tb ltr inside vertical-lr rtl - Percentages are absolutized into pixels -PASS horizontal-tb ltr inside vertical-lr rtl - calc() is absolutized into pixels -PASS horizontal-tb ltr inside vertical-lr rtl - Pixels resolve as-is when overconstrained -PASS horizontal-tb ltr inside vertical-lr rtl - Percentages absolutize the computed value when overconstrained -PASS horizontal-tb ltr inside vertical-lr rtl - If start side is 'auto' and end side is not, 'auto' resolves to used value -PASS horizontal-tb ltr inside vertical-lr rtl - If end side is 'auto' and start side is not, 'auto' resolves to used value -FAIL horizontal-tb ltr inside vertical-lr rtl - If opposite sides are 'auto', they resolve to used value assert_equals: 'top' expected "185px" but got "30px" -PASS horizontal-tb ltr inside vertical-rl ltr - Pixels resolve as-is -PASS horizontal-tb ltr inside vertical-rl ltr - Relative lengths are absolutized into pixels -PASS horizontal-tb ltr inside vertical-rl ltr - Percentages are absolutized into pixels -PASS horizontal-tb ltr inside vertical-rl ltr - calc() is absolutized into pixels -PASS horizontal-tb ltr inside vertical-rl ltr - Pixels resolve as-is when overconstrained -PASS horizontal-tb ltr inside vertical-rl ltr - Percentages absolutize the computed value when overconstrained -FAIL horizontal-tb ltr inside vertical-rl ltr - If start side is 'auto' and end side is not, 'auto' resolves to used value assert_equals: 'left' expected "396px" but got "4px" -FAIL horizontal-tb ltr inside vertical-rl ltr - If end side is 'auto' and start side is not, 'auto' resolves to used value assert_equals: 'right' expected "398px" but got "2px" -FAIL horizontal-tb ltr inside vertical-rl ltr - If opposite sides are 'auto', they resolve to used value assert_equals: 'top' expected "15px" but got "30px" -PASS horizontal-tb ltr inside vertical-rl rtl - Pixels resolve as-is -PASS horizontal-tb ltr inside vertical-rl rtl - Relative lengths are absolutized into pixels -PASS horizontal-tb ltr inside vertical-rl rtl - Percentages are absolutized into pixels -PASS horizontal-tb ltr inside vertical-rl rtl - calc() is absolutized into pixels -PASS horizontal-tb ltr inside vertical-rl rtl - Pixels resolve as-is when overconstrained -PASS horizontal-tb ltr inside vertical-rl rtl - Percentages absolutize the computed value when overconstrained -FAIL horizontal-tb ltr inside vertical-rl rtl - If start side is 'auto' and end side is not, 'auto' resolves to used value assert_equals: 'left' expected "396px" but got "4px" -FAIL horizontal-tb ltr inside vertical-rl rtl - If end side is 'auto' and start side is not, 'auto' resolves to used value assert_equals: 'right' expected "398px" but got "2px" -FAIL horizontal-tb ltr inside vertical-rl rtl - If opposite sides are 'auto', they resolve to used value assert_equals: 'top' expected "185px" but got "30px" -PASS horizontal-tb rtl inside horizontal-tb ltr - Pixels resolve as-is -PASS horizontal-tb rtl inside horizontal-tb ltr - Relative lengths are absolutized into pixels -PASS horizontal-tb rtl inside horizontal-tb ltr - Percentages are absolutized into pixels -PASS horizontal-tb rtl inside horizontal-tb ltr - calc() is absolutized into pixels -PASS horizontal-tb rtl inside horizontal-tb ltr - Pixels resolve as-is when overconstrained -PASS horizontal-tb rtl inside horizontal-tb ltr - Percentages absolutize the computed value when overconstrained -PASS horizontal-tb rtl inside horizontal-tb ltr - If start side is 'auto' and end side is not, 'auto' resolves to used value -PASS horizontal-tb rtl inside horizontal-tb ltr - If end side is 'auto' and start side is not, 'auto' resolves to used value -PASS horizontal-tb rtl inside horizontal-tb ltr - If opposite sides are 'auto', they resolve to used value -PASS horizontal-tb rtl inside horizontal-tb rtl - Pixels resolve as-is -PASS horizontal-tb rtl inside horizontal-tb rtl - Relative lengths are absolutized into pixels -PASS horizontal-tb rtl inside horizontal-tb rtl - Percentages are absolutized into pixels -PASS horizontal-tb rtl inside horizontal-tb rtl - calc() is absolutized into pixels -PASS horizontal-tb rtl inside horizontal-tb rtl - Pixels resolve as-is when overconstrained -PASS horizontal-tb rtl inside horizontal-tb rtl - Percentages absolutize the computed value when overconstrained -PASS horizontal-tb rtl inside horizontal-tb rtl - If start side is 'auto' and end side is not, 'auto' resolves to used value -PASS horizontal-tb rtl inside horizontal-tb rtl - If end side is 'auto' and start side is not, 'auto' resolves to used value -PASS horizontal-tb rtl inside horizontal-tb rtl - If opposite sides are 'auto', they resolve to used value -PASS horizontal-tb rtl inside vertical-lr ltr - Pixels resolve as-is -PASS horizontal-tb rtl inside vertical-lr ltr - Relative lengths are absolutized into pixels -PASS horizontal-tb rtl inside vertical-lr ltr - Percentages are absolutized into pixels -PASS horizontal-tb rtl inside vertical-lr ltr - calc() is absolutized into pixels -PASS horizontal-tb rtl inside vertical-lr ltr - Pixels resolve as-is when overconstrained -PASS horizontal-tb rtl inside vertical-lr ltr - Percentages absolutize the computed value when overconstrained -PASS horizontal-tb rtl inside vertical-lr ltr - If start side is 'auto' and end side is not, 'auto' resolves to used value -PASS horizontal-tb rtl inside vertical-lr ltr - If end side is 'auto' and start side is not, 'auto' resolves to used value -FAIL horizontal-tb rtl inside vertical-lr ltr - If opposite sides are 'auto', they resolve to used value assert_equals: 'top' expected "15px" but got "30px" -PASS horizontal-tb rtl inside vertical-lr rtl - Pixels resolve as-is -PASS horizontal-tb rtl inside vertical-lr rtl - Relative lengths are absolutized into pixels -PASS horizontal-tb rtl inside vertical-lr rtl - Percentages are absolutized into pixels -PASS horizontal-tb rtl inside vertical-lr rtl - calc() is absolutized into pixels -PASS horizontal-tb rtl inside vertical-lr rtl - Pixels resolve as-is when overconstrained -PASS horizontal-tb rtl inside vertical-lr rtl - Percentages absolutize the computed value when overconstrained -PASS horizontal-tb rtl inside vertical-lr rtl - If start side is 'auto' and end side is not, 'auto' resolves to used value -PASS horizontal-tb rtl inside vertical-lr rtl - If end side is 'auto' and start side is not, 'auto' resolves to used value -FAIL horizontal-tb rtl inside vertical-lr rtl - If opposite sides are 'auto', they resolve to used value assert_equals: 'top' expected "185px" but got "30px" -PASS horizontal-tb rtl inside vertical-rl ltr - Pixels resolve as-is -PASS horizontal-tb rtl inside vertical-rl ltr - Relative lengths are absolutized into pixels -PASS horizontal-tb rtl inside vertical-rl ltr - Percentages are absolutized into pixels -PASS horizontal-tb rtl inside vertical-rl ltr - calc() is absolutized into pixels -PASS horizontal-tb rtl inside vertical-rl ltr - Pixels resolve as-is when overconstrained -PASS horizontal-tb rtl inside vertical-rl ltr - Percentages absolutize the computed value when overconstrained -FAIL horizontal-tb rtl inside vertical-rl ltr - If start side is 'auto' and end side is not, 'auto' resolves to used value assert_equals: 'left' expected "396px" but got "4px" -FAIL horizontal-tb rtl inside vertical-rl ltr - If end side is 'auto' and start side is not, 'auto' resolves to used value assert_equals: 'right' expected "398px" but got "2px" -FAIL horizontal-tb rtl inside vertical-rl ltr - If opposite sides are 'auto', they resolve to used value assert_equals: 'top' expected "15px" but got "30px" -PASS horizontal-tb rtl inside vertical-rl rtl - Pixels resolve as-is -PASS horizontal-tb rtl inside vertical-rl rtl - Relative lengths are absolutized into pixels -PASS horizontal-tb rtl inside vertical-rl rtl - Percentages are absolutized into pixels -PASS horizontal-tb rtl inside vertical-rl rtl - calc() is absolutized into pixels -PASS horizontal-tb rtl inside vertical-rl rtl - Pixels resolve as-is when overconstrained -PASS horizontal-tb rtl inside vertical-rl rtl - Percentages absolutize the computed value when overconstrained -FAIL horizontal-tb rtl inside vertical-rl rtl - If start side is 'auto' and end side is not, 'auto' resolves to used value assert_equals: 'left' expected "396px" but got "4px" -FAIL horizontal-tb rtl inside vertical-rl rtl - If end side is 'auto' and start side is not, 'auto' resolves to used value assert_equals: 'right' expected "398px" but got "2px" -FAIL horizontal-tb rtl inside vertical-rl rtl - If opposite sides are 'auto', they resolve to used value assert_equals: 'top' expected "185px" but got "30px" -PASS vertical-lr ltr inside horizontal-tb ltr - Pixels resolve as-is -PASS vertical-lr ltr inside horizontal-tb ltr - Relative lengths are absolutized into pixels -PASS vertical-lr ltr inside horizontal-tb ltr - Percentages are absolutized into pixels -PASS vertical-lr ltr inside horizontal-tb ltr - calc() is absolutized into pixels -PASS vertical-lr ltr inside horizontal-tb ltr - Pixels resolve as-is when overconstrained -PASS vertical-lr ltr inside horizontal-tb ltr - Percentages absolutize the computed value when overconstrained -PASS vertical-lr ltr inside horizontal-tb ltr - If start side is 'auto' and end side is not, 'auto' resolves to used value -PASS vertical-lr ltr inside horizontal-tb ltr - If end side is 'auto' and start side is not, 'auto' resolves to used value -FAIL vertical-lr ltr inside horizontal-tb ltr - If opposite sides are 'auto', they resolve to used value assert_equals: 'top' expected "15px" but got "30px" -PASS vertical-lr ltr inside horizontal-tb rtl - Pixels resolve as-is -PASS vertical-lr ltr inside horizontal-tb rtl - Relative lengths are absolutized into pixels -PASS vertical-lr ltr inside horizontal-tb rtl - Percentages are absolutized into pixels -PASS vertical-lr ltr inside horizontal-tb rtl - calc() is absolutized into pixels -PASS vertical-lr ltr inside horizontal-tb rtl - Pixels resolve as-is when overconstrained -PASS vertical-lr ltr inside horizontal-tb rtl - Percentages absolutize the computed value when overconstrained -PASS vertical-lr ltr inside horizontal-tb rtl - If start side is 'auto' and end side is not, 'auto' resolves to used value -PASS vertical-lr ltr inside horizontal-tb rtl - If end side is 'auto' and start side is not, 'auto' resolves to used value -FAIL vertical-lr ltr inside horizontal-tb rtl - If opposite sides are 'auto', they resolve to used value assert_equals: 'top' expected "15px" but got "370px" -PASS vertical-lr ltr inside vertical-lr ltr - Pixels resolve as-is -PASS vertical-lr ltr inside vertical-lr ltr - Relative lengths are absolutized into pixels -PASS vertical-lr ltr inside vertical-lr ltr - Percentages are absolutized into pixels -PASS vertical-lr ltr inside vertical-lr ltr - calc() is absolutized into pixels -PASS vertical-lr ltr inside vertical-lr ltr - Pixels resolve as-is when overconstrained -PASS vertical-lr ltr inside vertical-lr ltr - Percentages absolutize the computed value when overconstrained -PASS vertical-lr ltr inside vertical-lr ltr - If start side is 'auto' and end side is not, 'auto' resolves to used value -PASS vertical-lr ltr inside vertical-lr ltr - If end side is 'auto' and start side is not, 'auto' resolves to used value -PASS vertical-lr ltr inside vertical-lr ltr - If opposite sides are 'auto', they resolve to used value -PASS vertical-lr ltr inside vertical-lr rtl - Pixels resolve as-is -PASS vertical-lr ltr inside vertical-lr rtl - Relative lengths are absolutized into pixels -PASS vertical-lr ltr inside vertical-lr rtl - Percentages are absolutized into pixels -PASS vertical-lr ltr inside vertical-lr rtl - calc() is absolutized into pixels -PASS vertical-lr ltr inside vertical-lr rtl - Pixels resolve as-is when overconstrained -PASS vertical-lr ltr inside vertical-lr rtl - Percentages absolutize the computed value when overconstrained -PASS vertical-lr ltr inside vertical-lr rtl - If start side is 'auto' and end side is not, 'auto' resolves to used value -PASS vertical-lr ltr inside vertical-lr rtl - If end side is 'auto' and start side is not, 'auto' resolves to used value -PASS vertical-lr ltr inside vertical-lr rtl - If opposite sides are 'auto', they resolve to used value -PASS vertical-lr ltr inside vertical-rl ltr - Pixels resolve as-is -PASS vertical-lr ltr inside vertical-rl ltr - Relative lengths are absolutized into pixels -PASS vertical-lr ltr inside vertical-rl ltr - Percentages are absolutized into pixels -PASS vertical-lr ltr inside vertical-rl ltr - calc() is absolutized into pixels -PASS vertical-lr ltr inside vertical-rl ltr - Pixels resolve as-is when overconstrained -PASS vertical-lr ltr inside vertical-rl ltr - Percentages absolutize the computed value when overconstrained -FAIL vertical-lr ltr inside vertical-rl ltr - If start side is 'auto' and end side is not, 'auto' resolves to used value assert_equals: 'left' expected "396px" but got "4px" -FAIL vertical-lr ltr inside vertical-rl ltr - If end side is 'auto' and start side is not, 'auto' resolves to used value assert_equals: 'right' expected "398px" but got "2px" -PASS vertical-lr ltr inside vertical-rl ltr - If opposite sides are 'auto', they resolve to used value -PASS vertical-lr ltr inside vertical-rl rtl - Pixels resolve as-is -PASS vertical-lr ltr inside vertical-rl rtl - Relative lengths are absolutized into pixels -PASS vertical-lr ltr inside vertical-rl rtl - Percentages are absolutized into pixels -PASS vertical-lr ltr inside vertical-rl rtl - calc() is absolutized into pixels -PASS vertical-lr ltr inside vertical-rl rtl - Pixels resolve as-is when overconstrained -PASS vertical-lr ltr inside vertical-rl rtl - Percentages absolutize the computed value when overconstrained -FAIL vertical-lr ltr inside vertical-rl rtl - If start side is 'auto' and end side is not, 'auto' resolves to used value assert_equals: 'left' expected "396px" but got "4px" -FAIL vertical-lr ltr inside vertical-rl rtl - If end side is 'auto' and start side is not, 'auto' resolves to used value assert_equals: 'right' expected "398px" but got "2px" -PASS vertical-lr ltr inside vertical-rl rtl - If opposite sides are 'auto', they resolve to used value -PASS vertical-lr rtl inside horizontal-tb ltr - Pixels resolve as-is -PASS vertical-lr rtl inside horizontal-tb ltr - Relative lengths are absolutized into pixels -PASS vertical-lr rtl inside horizontal-tb ltr - Percentages are absolutized into pixels -PASS vertical-lr rtl inside horizontal-tb ltr - calc() is absolutized into pixels -PASS vertical-lr rtl inside horizontal-tb ltr - Pixels resolve as-is when overconstrained -PASS vertical-lr rtl inside horizontal-tb ltr - Percentages absolutize the computed value when overconstrained -PASS vertical-lr rtl inside horizontal-tb ltr - If start side is 'auto' and end side is not, 'auto' resolves to used value -PASS vertical-lr rtl inside horizontal-tb ltr - If end side is 'auto' and start side is not, 'auto' resolves to used value -FAIL vertical-lr rtl inside horizontal-tb ltr - If opposite sides are 'auto', they resolve to used value assert_equals: 'top' expected "15px" but got "30px" -PASS vertical-lr rtl inside horizontal-tb rtl - Pixels resolve as-is -PASS vertical-lr rtl inside horizontal-tb rtl - Relative lengths are absolutized into pixels -PASS vertical-lr rtl inside horizontal-tb rtl - Percentages are absolutized into pixels -PASS vertical-lr rtl inside horizontal-tb rtl - calc() is absolutized into pixels -PASS vertical-lr rtl inside horizontal-tb rtl - Pixels resolve as-is when overconstrained -PASS vertical-lr rtl inside horizontal-tb rtl - Percentages absolutize the computed value when overconstrained -PASS vertical-lr rtl inside horizontal-tb rtl - If start side is 'auto' and end side is not, 'auto' resolves to used value -PASS vertical-lr rtl inside horizontal-tb rtl - If end side is 'auto' and start side is not, 'auto' resolves to used value -FAIL vertical-lr rtl inside horizontal-tb rtl - If opposite sides are 'auto', they resolve to used value assert_equals: 'top' expected "15px" but got "370px" -PASS vertical-lr rtl inside vertical-lr ltr - Pixels resolve as-is -PASS vertical-lr rtl inside vertical-lr ltr - Relative lengths are absolutized into pixels -PASS vertical-lr rtl inside vertical-lr ltr - Percentages are absolutized into pixels -PASS vertical-lr rtl inside vertical-lr ltr - calc() is absolutized into pixels -PASS vertical-lr rtl inside vertical-lr ltr - Pixels resolve as-is when overconstrained -PASS vertical-lr rtl inside vertical-lr ltr - Percentages absolutize the computed value when overconstrained -PASS vertical-lr rtl inside vertical-lr ltr - If start side is 'auto' and end side is not, 'auto' resolves to used value -PASS vertical-lr rtl inside vertical-lr ltr - If end side is 'auto' and start side is not, 'auto' resolves to used value -PASS vertical-lr rtl inside vertical-lr ltr - If opposite sides are 'auto', they resolve to used value -PASS vertical-lr rtl inside vertical-lr rtl - Pixels resolve as-is -PASS vertical-lr rtl inside vertical-lr rtl - Relative lengths are absolutized into pixels -PASS vertical-lr rtl inside vertical-lr rtl - Percentages are absolutized into pixels -PASS vertical-lr rtl inside vertical-lr rtl - calc() is absolutized into pixels -PASS vertical-lr rtl inside vertical-lr rtl - Pixels resolve as-is when overconstrained -PASS vertical-lr rtl inside vertical-lr rtl - Percentages absolutize the computed value when overconstrained -PASS vertical-lr rtl inside vertical-lr rtl - If start side is 'auto' and end side is not, 'auto' resolves to used value -PASS vertical-lr rtl inside vertical-lr rtl - If end side is 'auto' and start side is not, 'auto' resolves to used value -PASS vertical-lr rtl inside vertical-lr rtl - If opposite sides are 'auto', they resolve to used value -PASS vertical-lr rtl inside vertical-rl ltr - Pixels resolve as-is -PASS vertical-lr rtl inside vertical-rl ltr - Relative lengths are absolutized into pixels -PASS vertical-lr rtl inside vertical-rl ltr - Percentages are absolutized into pixels -PASS vertical-lr rtl inside vertical-rl ltr - calc() is absolutized into pixels -PASS vertical-lr rtl inside vertical-rl ltr - Pixels resolve as-is when overconstrained -PASS vertical-lr rtl inside vertical-rl ltr - Percentages absolutize the computed value when overconstrained -FAIL vertical-lr rtl inside vertical-rl ltr - If start side is 'auto' and end side is not, 'auto' resolves to used value assert_equals: 'left' expected "396px" but got "4px" -FAIL vertical-lr rtl inside vertical-rl ltr - If end side is 'auto' and start side is not, 'auto' resolves to used value assert_equals: 'right' expected "398px" but got "2px" -PASS vertical-lr rtl inside vertical-rl ltr - If opposite sides are 'auto', they resolve to used value -PASS vertical-lr rtl inside vertical-rl rtl - Pixels resolve as-is -PASS vertical-lr rtl inside vertical-rl rtl - Relative lengths are absolutized into pixels -PASS vertical-lr rtl inside vertical-rl rtl - Percentages are absolutized into pixels -PASS vertical-lr rtl inside vertical-rl rtl - calc() is absolutized into pixels -PASS vertical-lr rtl inside vertical-rl rtl - Pixels resolve as-is when overconstrained -PASS vertical-lr rtl inside vertical-rl rtl - Percentages absolutize the computed value when overconstrained -FAIL vertical-lr rtl inside vertical-rl rtl - If start side is 'auto' and end side is not, 'auto' resolves to used value assert_equals: 'left' expected "396px" but got "4px" -FAIL vertical-lr rtl inside vertical-rl rtl - If end side is 'auto' and start side is not, 'auto' resolves to used value assert_equals: 'right' expected "398px" but got "2px" -PASS vertical-lr rtl inside vertical-rl rtl - If opposite sides are 'auto', they resolve to used value -PASS vertical-rl ltr inside horizontal-tb ltr - Pixels resolve as-is -PASS vertical-rl ltr inside horizontal-tb ltr - Relative lengths are absolutized into pixels -PASS vertical-rl ltr inside horizontal-tb ltr - Percentages are absolutized into pixels -PASS vertical-rl ltr inside horizontal-tb ltr - calc() is absolutized into pixels -PASS vertical-rl ltr inside horizontal-tb ltr - Pixels resolve as-is when overconstrained -PASS vertical-rl ltr inside horizontal-tb ltr - Percentages absolutize the computed value when overconstrained -PASS vertical-rl ltr inside horizontal-tb ltr - If start side is 'auto' and end side is not, 'auto' resolves to used value -PASS vertical-rl ltr inside horizontal-tb ltr - If end side is 'auto' and start side is not, 'auto' resolves to used value -FAIL vertical-rl ltr inside horizontal-tb ltr - If opposite sides are 'auto', they resolve to used value assert_equals: 'top' expected "15px" but got "30px" -PASS vertical-rl ltr inside horizontal-tb rtl - Pixels resolve as-is -PASS vertical-rl ltr inside horizontal-tb rtl - Relative lengths are absolutized into pixels -PASS vertical-rl ltr inside horizontal-tb rtl - Percentages are absolutized into pixels -PASS vertical-rl ltr inside horizontal-tb rtl - calc() is absolutized into pixels -PASS vertical-rl ltr inside horizontal-tb rtl - Pixels resolve as-is when overconstrained -PASS vertical-rl ltr inside horizontal-tb rtl - Percentages absolutize the computed value when overconstrained -PASS vertical-rl ltr inside horizontal-tb rtl - If start side is 'auto' and end side is not, 'auto' resolves to used value -PASS vertical-rl ltr inside horizontal-tb rtl - If end side is 'auto' and start side is not, 'auto' resolves to used value -FAIL vertical-rl ltr inside horizontal-tb rtl - If opposite sides are 'auto', they resolve to used value assert_equals: 'top' expected "15px" but got "370px" -PASS vertical-rl ltr inside vertical-lr ltr - Pixels resolve as-is -PASS vertical-rl ltr inside vertical-lr ltr - Relative lengths are absolutized into pixels -PASS vertical-rl ltr inside vertical-lr ltr - Percentages are absolutized into pixels -PASS vertical-rl ltr inside vertical-lr ltr - calc() is absolutized into pixels -PASS vertical-rl ltr inside vertical-lr ltr - Pixels resolve as-is when overconstrained -PASS vertical-rl ltr inside vertical-lr ltr - Percentages absolutize the computed value when overconstrained -PASS vertical-rl ltr inside vertical-lr ltr - If start side is 'auto' and end side is not, 'auto' resolves to used value -PASS vertical-rl ltr inside vertical-lr ltr - If end side is 'auto' and start side is not, 'auto' resolves to used value -FAIL vertical-rl ltr inside vertical-lr ltr - If opposite sides are 'auto', they resolve to used value assert_equals: 'left' expected "30px" but got "370px" -PASS vertical-rl ltr inside vertical-lr rtl - Pixels resolve as-is -PASS vertical-rl ltr inside vertical-lr rtl - Relative lengths are absolutized into pixels -PASS vertical-rl ltr inside vertical-lr rtl - Percentages are absolutized into pixels -PASS vertical-rl ltr inside vertical-lr rtl - calc() is absolutized into pixels -PASS vertical-rl ltr inside vertical-lr rtl - Pixels resolve as-is when overconstrained -PASS vertical-rl ltr inside vertical-lr rtl - Percentages absolutize the computed value when overconstrained -PASS vertical-rl ltr inside vertical-lr rtl - If start side is 'auto' and end side is not, 'auto' resolves to used value -PASS vertical-rl ltr inside vertical-lr rtl - If end side is 'auto' and start side is not, 'auto' resolves to used value -FAIL vertical-rl ltr inside vertical-lr rtl - If opposite sides are 'auto', they resolve to used value assert_equals: 'left' expected "30px" but got "370px" -PASS vertical-rl ltr inside vertical-rl ltr - Pixels resolve as-is -PASS vertical-rl ltr inside vertical-rl ltr - Relative lengths are absolutized into pixels -PASS vertical-rl ltr inside vertical-rl ltr - Percentages are absolutized into pixels -PASS vertical-rl ltr inside vertical-rl ltr - calc() is absolutized into pixels -PASS vertical-rl ltr inside vertical-rl ltr - Pixels resolve as-is when overconstrained -PASS vertical-rl ltr inside vertical-rl ltr - Percentages absolutize the computed value when overconstrained -FAIL vertical-rl ltr inside vertical-rl ltr - If start side is 'auto' and end side is not, 'auto' resolves to used value assert_equals: 'left' expected "396px" but got "4px" -FAIL vertical-rl ltr inside vertical-rl ltr - If end side is 'auto' and start side is not, 'auto' resolves to used value assert_equals: 'right' expected "398px" but got "2px" -FAIL vertical-rl ltr inside vertical-rl ltr - If opposite sides are 'auto', they resolve to used value assert_equals: 'left' expected "370px" but got "30px" -PASS vertical-rl ltr inside vertical-rl rtl - Pixels resolve as-is -PASS vertical-rl ltr inside vertical-rl rtl - Relative lengths are absolutized into pixels -PASS vertical-rl ltr inside vertical-rl rtl - Percentages are absolutized into pixels -PASS vertical-rl ltr inside vertical-rl rtl - calc() is absolutized into pixels -PASS vertical-rl ltr inside vertical-rl rtl - Pixels resolve as-is when overconstrained -PASS vertical-rl ltr inside vertical-rl rtl - Percentages absolutize the computed value when overconstrained -FAIL vertical-rl ltr inside vertical-rl rtl - If start side is 'auto' and end side is not, 'auto' resolves to used value assert_equals: 'left' expected "396px" but got "4px" -FAIL vertical-rl ltr inside vertical-rl rtl - If end side is 'auto' and start side is not, 'auto' resolves to used value assert_equals: 'right' expected "398px" but got "2px" -FAIL vertical-rl ltr inside vertical-rl rtl - If opposite sides are 'auto', they resolve to used value assert_equals: 'left' expected "370px" but got "30px" -PASS vertical-rl rtl inside horizontal-tb ltr - Pixels resolve as-is -PASS vertical-rl rtl inside horizontal-tb ltr - Relative lengths are absolutized into pixels -PASS vertical-rl rtl inside horizontal-tb ltr - Percentages are absolutized into pixels -PASS vertical-rl rtl inside horizontal-tb ltr - calc() is absolutized into pixels -PASS vertical-rl rtl inside horizontal-tb ltr - Pixels resolve as-is when overconstrained -PASS vertical-rl rtl inside horizontal-tb ltr - Percentages absolutize the computed value when overconstrained -PASS vertical-rl rtl inside horizontal-tb ltr - If start side is 'auto' and end side is not, 'auto' resolves to used value -PASS vertical-rl rtl inside horizontal-tb ltr - If end side is 'auto' and start side is not, 'auto' resolves to used value -FAIL vertical-rl rtl inside horizontal-tb ltr - If opposite sides are 'auto', they resolve to used value assert_equals: 'top' expected "15px" but got "30px" -PASS vertical-rl rtl inside horizontal-tb rtl - Pixels resolve as-is -PASS vertical-rl rtl inside horizontal-tb rtl - Relative lengths are absolutized into pixels -PASS vertical-rl rtl inside horizontal-tb rtl - Percentages are absolutized into pixels -PASS vertical-rl rtl inside horizontal-tb rtl - calc() is absolutized into pixels -PASS vertical-rl rtl inside horizontal-tb rtl - Pixels resolve as-is when overconstrained -PASS vertical-rl rtl inside horizontal-tb rtl - Percentages absolutize the computed value when overconstrained -PASS vertical-rl rtl inside horizontal-tb rtl - If start side is 'auto' and end side is not, 'auto' resolves to used value -PASS vertical-rl rtl inside horizontal-tb rtl - If end side is 'auto' and start side is not, 'auto' resolves to used value -FAIL vertical-rl rtl inside horizontal-tb rtl - If opposite sides are 'auto', they resolve to used value assert_equals: 'top' expected "15px" but got "370px" -PASS vertical-rl rtl inside vertical-lr ltr - Pixels resolve as-is -PASS vertical-rl rtl inside vertical-lr ltr - Relative lengths are absolutized into pixels -PASS vertical-rl rtl inside vertical-lr ltr - Percentages are absolutized into pixels -PASS vertical-rl rtl inside vertical-lr ltr - calc() is absolutized into pixels -PASS vertical-rl rtl inside vertical-lr ltr - Pixels resolve as-is when overconstrained -PASS vertical-rl rtl inside vertical-lr ltr - Percentages absolutize the computed value when overconstrained -PASS vertical-rl rtl inside vertical-lr ltr - If start side is 'auto' and end side is not, 'auto' resolves to used value -PASS vertical-rl rtl inside vertical-lr ltr - If end side is 'auto' and start side is not, 'auto' resolves to used value -FAIL vertical-rl rtl inside vertical-lr ltr - If opposite sides are 'auto', they resolve to used value assert_equals: 'left' expected "30px" but got "370px" -PASS vertical-rl rtl inside vertical-lr rtl - Pixels resolve as-is -PASS vertical-rl rtl inside vertical-lr rtl - Relative lengths are absolutized into pixels -PASS vertical-rl rtl inside vertical-lr rtl - Percentages are absolutized into pixels -PASS vertical-rl rtl inside vertical-lr rtl - calc() is absolutized into pixels -PASS vertical-rl rtl inside vertical-lr rtl - Pixels resolve as-is when overconstrained -PASS vertical-rl rtl inside vertical-lr rtl - Percentages absolutize the computed value when overconstrained -PASS vertical-rl rtl inside vertical-lr rtl - If start side is 'auto' and end side is not, 'auto' resolves to used value -PASS vertical-rl rtl inside vertical-lr rtl - If end side is 'auto' and start side is not, 'auto' resolves to used value -FAIL vertical-rl rtl inside vertical-lr rtl - If opposite sides are 'auto', they resolve to used value assert_equals: 'left' expected "30px" but got "370px" -PASS vertical-rl rtl inside vertical-rl ltr - Pixels resolve as-is -PASS vertical-rl rtl inside vertical-rl ltr - Relative lengths are absolutized into pixels -PASS vertical-rl rtl inside vertical-rl ltr - Percentages are absolutized into pixels -PASS vertical-rl rtl inside vertical-rl ltr - calc() is absolutized into pixels -PASS vertical-rl rtl inside vertical-rl ltr - Pixels resolve as-is when overconstrained -PASS vertical-rl rtl inside vertical-rl ltr - Percentages absolutize the computed value when overconstrained -FAIL vertical-rl rtl inside vertical-rl ltr - If start side is 'auto' and end side is not, 'auto' resolves to used value assert_equals: 'left' expected "396px" but got "4px" -FAIL vertical-rl rtl inside vertical-rl ltr - If end side is 'auto' and start side is not, 'auto' resolves to used value assert_equals: 'right' expected "398px" but got "2px" -FAIL vertical-rl rtl inside vertical-rl ltr - If opposite sides are 'auto', they resolve to used value assert_equals: 'left' expected "370px" but got "30px" -PASS vertical-rl rtl inside vertical-rl rtl - Pixels resolve as-is -PASS vertical-rl rtl inside vertical-rl rtl - Relative lengths are absolutized into pixels -PASS vertical-rl rtl inside vertical-rl rtl - Percentages are absolutized into pixels -PASS vertical-rl rtl inside vertical-rl rtl - calc() is absolutized into pixels -PASS vertical-rl rtl inside vertical-rl rtl - Pixels resolve as-is when overconstrained -PASS vertical-rl rtl inside vertical-rl rtl - Percentages absolutize the computed value when overconstrained -FAIL vertical-rl rtl inside vertical-rl rtl - If start side is 'auto' and end side is not, 'auto' resolves to used value assert_equals: 'left' expected "396px" but got "4px" -FAIL vertical-rl rtl inside vertical-rl rtl - If end side is 'auto' and start side is not, 'auto' resolves to used value assert_equals: 'right' expected "398px" but got "2px" -FAIL vertical-rl rtl inside vertical-rl rtl - If opposite sides are 'auto', they resolve to used value assert_equals: 'left' expected "370px" but got "30px" -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/cssom/getComputedStyle-insets-fixed-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/cssom/getComputedStyle-insets-fixed-expected.txt deleted file mode 100644 index 921f9ae..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/cssom/getComputedStyle-insets-fixed-expected.txt +++ /dev/null
@@ -1,328 +0,0 @@ -This is a testharness.js-based test. -Found 324 tests; 276 PASS, 48 FAIL, 0 TIMEOUT, 0 NOTRUN. -PASS horizontal-tb ltr inside horizontal-tb ltr - Pixels resolve as-is -PASS horizontal-tb ltr inside horizontal-tb ltr - Relative lengths are absolutized into pixels -PASS horizontal-tb ltr inside horizontal-tb ltr - Percentages are absolutized into pixels -PASS horizontal-tb ltr inside horizontal-tb ltr - calc() is absolutized into pixels -PASS horizontal-tb ltr inside horizontal-tb ltr - Pixels resolve as-is when overconstrained -PASS horizontal-tb ltr inside horizontal-tb ltr - Percentages absolutize the computed value when overconstrained -PASS horizontal-tb ltr inside horizontal-tb ltr - If start side is 'auto' and end side is not, 'auto' resolves to used value -PASS horizontal-tb ltr inside horizontal-tb ltr - If end side is 'auto' and start side is not, 'auto' resolves to used value -PASS horizontal-tb ltr inside horizontal-tb ltr - If opposite sides are 'auto', they resolve to used value -PASS horizontal-tb ltr inside horizontal-tb rtl - Pixels resolve as-is -PASS horizontal-tb ltr inside horizontal-tb rtl - Relative lengths are absolutized into pixels -PASS horizontal-tb ltr inside horizontal-tb rtl - Percentages are absolutized into pixels -PASS horizontal-tb ltr inside horizontal-tb rtl - calc() is absolutized into pixels -PASS horizontal-tb ltr inside horizontal-tb rtl - Pixels resolve as-is when overconstrained -PASS horizontal-tb ltr inside horizontal-tb rtl - Percentages absolutize the computed value when overconstrained -PASS horizontal-tb ltr inside horizontal-tb rtl - If start side is 'auto' and end side is not, 'auto' resolves to used value -PASS horizontal-tb ltr inside horizontal-tb rtl - If end side is 'auto' and start side is not, 'auto' resolves to used value -PASS horizontal-tb ltr inside horizontal-tb rtl - If opposite sides are 'auto', they resolve to used value -PASS horizontal-tb ltr inside vertical-lr ltr - Pixels resolve as-is -PASS horizontal-tb ltr inside vertical-lr ltr - Relative lengths are absolutized into pixels -PASS horizontal-tb ltr inside vertical-lr ltr - Percentages are absolutized into pixels -PASS horizontal-tb ltr inside vertical-lr ltr - calc() is absolutized into pixels -PASS horizontal-tb ltr inside vertical-lr ltr - Pixels resolve as-is when overconstrained -PASS horizontal-tb ltr inside vertical-lr ltr - Percentages absolutize the computed value when overconstrained -PASS horizontal-tb ltr inside vertical-lr ltr - If start side is 'auto' and end side is not, 'auto' resolves to used value -PASS horizontal-tb ltr inside vertical-lr ltr - If end side is 'auto' and start side is not, 'auto' resolves to used value -FAIL horizontal-tb ltr inside vertical-lr ltr - If opposite sides are 'auto', they resolve to used value assert_equals: 'top' expected "127px" but got "254px" -PASS horizontal-tb ltr inside vertical-lr rtl - Pixels resolve as-is -PASS horizontal-tb ltr inside vertical-lr rtl - Relative lengths are absolutized into pixels -PASS horizontal-tb ltr inside vertical-lr rtl - Percentages are absolutized into pixels -PASS horizontal-tb ltr inside vertical-lr rtl - calc() is absolutized into pixels -PASS horizontal-tb ltr inside vertical-lr rtl - Pixels resolve as-is when overconstrained -PASS horizontal-tb ltr inside vertical-lr rtl - Percentages absolutize the computed value when overconstrained -PASS horizontal-tb ltr inside vertical-lr rtl - If start side is 'auto' and end side is not, 'auto' resolves to used value -PASS horizontal-tb ltr inside vertical-lr rtl - If end side is 'auto' and start side is not, 'auto' resolves to used value -FAIL horizontal-tb ltr inside vertical-lr rtl - If opposite sides are 'auto', they resolve to used value assert_equals: 'top' expected "173px" but got "254px" -PASS horizontal-tb ltr inside vertical-rl ltr - Pixels resolve as-is -PASS horizontal-tb ltr inside vertical-rl ltr - Relative lengths are absolutized into pixels -PASS horizontal-tb ltr inside vertical-rl ltr - Percentages are absolutized into pixels -PASS horizontal-tb ltr inside vertical-rl ltr - calc() is absolutized into pixels -PASS horizontal-tb ltr inside vertical-rl ltr - Pixels resolve as-is when overconstrained -PASS horizontal-tb ltr inside vertical-rl ltr - Percentages absolutize the computed value when overconstrained -FAIL horizontal-tb ltr inside vertical-rl ltr - If start side is 'auto' and end side is not, 'auto' resolves to used value assert_equals: 'left' expected "596px" but got "4px" -FAIL horizontal-tb ltr inside vertical-rl ltr - If end side is 'auto' and start side is not, 'auto' resolves to used value assert_equals: 'right' expected "598px" but got "2px" -FAIL horizontal-tb ltr inside vertical-rl ltr - If opposite sides are 'auto', they resolve to used value assert_equals: 'top' expected "127px" but got "254px" -PASS horizontal-tb ltr inside vertical-rl rtl - Pixels resolve as-is -PASS horizontal-tb ltr inside vertical-rl rtl - Relative lengths are absolutized into pixels -PASS horizontal-tb ltr inside vertical-rl rtl - Percentages are absolutized into pixels -PASS horizontal-tb ltr inside vertical-rl rtl - calc() is absolutized into pixels -PASS horizontal-tb ltr inside vertical-rl rtl - Pixels resolve as-is when overconstrained -PASS horizontal-tb ltr inside vertical-rl rtl - Percentages absolutize the computed value when overconstrained -FAIL horizontal-tb ltr inside vertical-rl rtl - If start side is 'auto' and end side is not, 'auto' resolves to used value assert_equals: 'left' expected "596px" but got "4px" -FAIL horizontal-tb ltr inside vertical-rl rtl - If end side is 'auto' and start side is not, 'auto' resolves to used value assert_equals: 'right' expected "598px" but got "2px" -FAIL horizontal-tb ltr inside vertical-rl rtl - If opposite sides are 'auto', they resolve to used value assert_equals: 'top' expected "173px" but got "254px" -PASS horizontal-tb rtl inside horizontal-tb ltr - Pixels resolve as-is -PASS horizontal-tb rtl inside horizontal-tb ltr - Relative lengths are absolutized into pixels -PASS horizontal-tb rtl inside horizontal-tb ltr - Percentages are absolutized into pixels -PASS horizontal-tb rtl inside horizontal-tb ltr - calc() is absolutized into pixels -PASS horizontal-tb rtl inside horizontal-tb ltr - Pixels resolve as-is when overconstrained -PASS horizontal-tb rtl inside horizontal-tb ltr - Percentages absolutize the computed value when overconstrained -PASS horizontal-tb rtl inside horizontal-tb ltr - If start side is 'auto' and end side is not, 'auto' resolves to used value -PASS horizontal-tb rtl inside horizontal-tb ltr - If end side is 'auto' and start side is not, 'auto' resolves to used value -PASS horizontal-tb rtl inside horizontal-tb ltr - If opposite sides are 'auto', they resolve to used value -PASS horizontal-tb rtl inside horizontal-tb rtl - Pixels resolve as-is -PASS horizontal-tb rtl inside horizontal-tb rtl - Relative lengths are absolutized into pixels -PASS horizontal-tb rtl inside horizontal-tb rtl - Percentages are absolutized into pixels -PASS horizontal-tb rtl inside horizontal-tb rtl - calc() is absolutized into pixels -PASS horizontal-tb rtl inside horizontal-tb rtl - Pixels resolve as-is when overconstrained -PASS horizontal-tb rtl inside horizontal-tb rtl - Percentages absolutize the computed value when overconstrained -PASS horizontal-tb rtl inside horizontal-tb rtl - If start side is 'auto' and end side is not, 'auto' resolves to used value -PASS horizontal-tb rtl inside horizontal-tb rtl - If end side is 'auto' and start side is not, 'auto' resolves to used value -PASS horizontal-tb rtl inside horizontal-tb rtl - If opposite sides are 'auto', they resolve to used value -PASS horizontal-tb rtl inside vertical-lr ltr - Pixels resolve as-is -PASS horizontal-tb rtl inside vertical-lr ltr - Relative lengths are absolutized into pixels -PASS horizontal-tb rtl inside vertical-lr ltr - Percentages are absolutized into pixels -PASS horizontal-tb rtl inside vertical-lr ltr - calc() is absolutized into pixels -PASS horizontal-tb rtl inside vertical-lr ltr - Pixels resolve as-is when overconstrained -PASS horizontal-tb rtl inside vertical-lr ltr - Percentages absolutize the computed value when overconstrained -PASS horizontal-tb rtl inside vertical-lr ltr - If start side is 'auto' and end side is not, 'auto' resolves to used value -PASS horizontal-tb rtl inside vertical-lr ltr - If end side is 'auto' and start side is not, 'auto' resolves to used value -FAIL horizontal-tb rtl inside vertical-lr ltr - If opposite sides are 'auto', they resolve to used value assert_equals: 'top' expected "127px" but got "254px" -PASS horizontal-tb rtl inside vertical-lr rtl - Pixels resolve as-is -PASS horizontal-tb rtl inside vertical-lr rtl - Relative lengths are absolutized into pixels -PASS horizontal-tb rtl inside vertical-lr rtl - Percentages are absolutized into pixels -PASS horizontal-tb rtl inside vertical-lr rtl - calc() is absolutized into pixels -PASS horizontal-tb rtl inside vertical-lr rtl - Pixels resolve as-is when overconstrained -PASS horizontal-tb rtl inside vertical-lr rtl - Percentages absolutize the computed value when overconstrained -PASS horizontal-tb rtl inside vertical-lr rtl - If start side is 'auto' and end side is not, 'auto' resolves to used value -PASS horizontal-tb rtl inside vertical-lr rtl - If end side is 'auto' and start side is not, 'auto' resolves to used value -FAIL horizontal-tb rtl inside vertical-lr rtl - If opposite sides are 'auto', they resolve to used value assert_equals: 'top' expected "173px" but got "254px" -PASS horizontal-tb rtl inside vertical-rl ltr - Pixels resolve as-is -PASS horizontal-tb rtl inside vertical-rl ltr - Relative lengths are absolutized into pixels -PASS horizontal-tb rtl inside vertical-rl ltr - Percentages are absolutized into pixels -PASS horizontal-tb rtl inside vertical-rl ltr - calc() is absolutized into pixels -PASS horizontal-tb rtl inside vertical-rl ltr - Pixels resolve as-is when overconstrained -PASS horizontal-tb rtl inside vertical-rl ltr - Percentages absolutize the computed value when overconstrained -FAIL horizontal-tb rtl inside vertical-rl ltr - If start side is 'auto' and end side is not, 'auto' resolves to used value assert_equals: 'left' expected "596px" but got "4px" -FAIL horizontal-tb rtl inside vertical-rl ltr - If end side is 'auto' and start side is not, 'auto' resolves to used value assert_equals: 'right' expected "598px" but got "2px" -FAIL horizontal-tb rtl inside vertical-rl ltr - If opposite sides are 'auto', they resolve to used value assert_equals: 'top' expected "127px" but got "254px" -PASS horizontal-tb rtl inside vertical-rl rtl - Pixels resolve as-is -PASS horizontal-tb rtl inside vertical-rl rtl - Relative lengths are absolutized into pixels -PASS horizontal-tb rtl inside vertical-rl rtl - Percentages are absolutized into pixels -PASS horizontal-tb rtl inside vertical-rl rtl - calc() is absolutized into pixels -PASS horizontal-tb rtl inside vertical-rl rtl - Pixels resolve as-is when overconstrained -PASS horizontal-tb rtl inside vertical-rl rtl - Percentages absolutize the computed value when overconstrained -FAIL horizontal-tb rtl inside vertical-rl rtl - If start side is 'auto' and end side is not, 'auto' resolves to used value assert_equals: 'left' expected "596px" but got "4px" -FAIL horizontal-tb rtl inside vertical-rl rtl - If end side is 'auto' and start side is not, 'auto' resolves to used value assert_equals: 'right' expected "598px" but got "2px" -FAIL horizontal-tb rtl inside vertical-rl rtl - If opposite sides are 'auto', they resolve to used value assert_equals: 'top' expected "173px" but got "254px" -PASS vertical-lr ltr inside horizontal-tb ltr - Pixels resolve as-is -PASS vertical-lr ltr inside horizontal-tb ltr - Relative lengths are absolutized into pixels -PASS vertical-lr ltr inside horizontal-tb ltr - Percentages are absolutized into pixels -PASS vertical-lr ltr inside horizontal-tb ltr - calc() is absolutized into pixels -PASS vertical-lr ltr inside horizontal-tb ltr - Pixels resolve as-is when overconstrained -PASS vertical-lr ltr inside horizontal-tb ltr - Percentages absolutize the computed value when overconstrained -PASS vertical-lr ltr inside horizontal-tb ltr - If start side is 'auto' and end side is not, 'auto' resolves to used value -PASS vertical-lr ltr inside horizontal-tb ltr - If end side is 'auto' and start side is not, 'auto' resolves to used value -FAIL vertical-lr ltr inside horizontal-tb ltr - If opposite sides are 'auto', they resolve to used value assert_equals: 'top' expected "127px" but got "254px" -PASS vertical-lr ltr inside horizontal-tb rtl - Pixels resolve as-is -PASS vertical-lr ltr inside horizontal-tb rtl - Relative lengths are absolutized into pixels -PASS vertical-lr ltr inside horizontal-tb rtl - Percentages are absolutized into pixels -PASS vertical-lr ltr inside horizontal-tb rtl - calc() is absolutized into pixels -PASS vertical-lr ltr inside horizontal-tb rtl - Pixels resolve as-is when overconstrained -PASS vertical-lr ltr inside horizontal-tb rtl - Percentages absolutize the computed value when overconstrained -PASS vertical-lr ltr inside horizontal-tb rtl - If start side is 'auto' and end side is not, 'auto' resolves to used value -PASS vertical-lr ltr inside horizontal-tb rtl - If end side is 'auto' and start side is not, 'auto' resolves to used value -FAIL vertical-lr ltr inside horizontal-tb rtl - If opposite sides are 'auto', they resolve to used value assert_equals: 'top' expected "127px" but got "346px" -PASS vertical-lr ltr inside vertical-lr ltr - Pixels resolve as-is -PASS vertical-lr ltr inside vertical-lr ltr - Relative lengths are absolutized into pixels -PASS vertical-lr ltr inside vertical-lr ltr - Percentages are absolutized into pixels -PASS vertical-lr ltr inside vertical-lr ltr - calc() is absolutized into pixels -PASS vertical-lr ltr inside vertical-lr ltr - Pixels resolve as-is when overconstrained -PASS vertical-lr ltr inside vertical-lr ltr - Percentages absolutize the computed value when overconstrained -PASS vertical-lr ltr inside vertical-lr ltr - If start side is 'auto' and end side is not, 'auto' resolves to used value -PASS vertical-lr ltr inside vertical-lr ltr - If end side is 'auto' and start side is not, 'auto' resolves to used value -PASS vertical-lr ltr inside vertical-lr ltr - If opposite sides are 'auto', they resolve to used value -PASS vertical-lr ltr inside vertical-lr rtl - Pixels resolve as-is -PASS vertical-lr ltr inside vertical-lr rtl - Relative lengths are absolutized into pixels -PASS vertical-lr ltr inside vertical-lr rtl - Percentages are absolutized into pixels -PASS vertical-lr ltr inside vertical-lr rtl - calc() is absolutized into pixels -PASS vertical-lr ltr inside vertical-lr rtl - Pixels resolve as-is when overconstrained -PASS vertical-lr ltr inside vertical-lr rtl - Percentages absolutize the computed value when overconstrained -PASS vertical-lr ltr inside vertical-lr rtl - If start side is 'auto' and end side is not, 'auto' resolves to used value -PASS vertical-lr ltr inside vertical-lr rtl - If end side is 'auto' and start side is not, 'auto' resolves to used value -PASS vertical-lr ltr inside vertical-lr rtl - If opposite sides are 'auto', they resolve to used value -PASS vertical-lr ltr inside vertical-rl ltr - Pixels resolve as-is -PASS vertical-lr ltr inside vertical-rl ltr - Relative lengths are absolutized into pixels -PASS vertical-lr ltr inside vertical-rl ltr - Percentages are absolutized into pixels -PASS vertical-lr ltr inside vertical-rl ltr - calc() is absolutized into pixels -PASS vertical-lr ltr inside vertical-rl ltr - Pixels resolve as-is when overconstrained -PASS vertical-lr ltr inside vertical-rl ltr - Percentages absolutize the computed value when overconstrained -FAIL vertical-lr ltr inside vertical-rl ltr - If start side is 'auto' and end side is not, 'auto' resolves to used value assert_equals: 'left' expected "596px" but got "4px" -FAIL vertical-lr ltr inside vertical-rl ltr - If end side is 'auto' and start side is not, 'auto' resolves to used value assert_equals: 'right' expected "598px" but got "2px" -PASS vertical-lr ltr inside vertical-rl ltr - If opposite sides are 'auto', they resolve to used value -PASS vertical-lr ltr inside vertical-rl rtl - Pixels resolve as-is -PASS vertical-lr ltr inside vertical-rl rtl - Relative lengths are absolutized into pixels -PASS vertical-lr ltr inside vertical-rl rtl - Percentages are absolutized into pixels -PASS vertical-lr ltr inside vertical-rl rtl - calc() is absolutized into pixels -PASS vertical-lr ltr inside vertical-rl rtl - Pixels resolve as-is when overconstrained -PASS vertical-lr ltr inside vertical-rl rtl - Percentages absolutize the computed value when overconstrained -FAIL vertical-lr ltr inside vertical-rl rtl - If start side is 'auto' and end side is not, 'auto' resolves to used value assert_equals: 'left' expected "596px" but got "4px" -FAIL vertical-lr ltr inside vertical-rl rtl - If end side is 'auto' and start side is not, 'auto' resolves to used value assert_equals: 'right' expected "598px" but got "2px" -PASS vertical-lr ltr inside vertical-rl rtl - If opposite sides are 'auto', they resolve to used value -PASS vertical-lr rtl inside horizontal-tb ltr - Pixels resolve as-is -PASS vertical-lr rtl inside horizontal-tb ltr - Relative lengths are absolutized into pixels -PASS vertical-lr rtl inside horizontal-tb ltr - Percentages are absolutized into pixels -PASS vertical-lr rtl inside horizontal-tb ltr - calc() is absolutized into pixels -PASS vertical-lr rtl inside horizontal-tb ltr - Pixels resolve as-is when overconstrained -PASS vertical-lr rtl inside horizontal-tb ltr - Percentages absolutize the computed value when overconstrained -PASS vertical-lr rtl inside horizontal-tb ltr - If start side is 'auto' and end side is not, 'auto' resolves to used value -PASS vertical-lr rtl inside horizontal-tb ltr - If end side is 'auto' and start side is not, 'auto' resolves to used value -FAIL vertical-lr rtl inside horizontal-tb ltr - If opposite sides are 'auto', they resolve to used value assert_equals: 'top' expected "127px" but got "254px" -PASS vertical-lr rtl inside horizontal-tb rtl - Pixels resolve as-is -PASS vertical-lr rtl inside horizontal-tb rtl - Relative lengths are absolutized into pixels -PASS vertical-lr rtl inside horizontal-tb rtl - Percentages are absolutized into pixels -PASS vertical-lr rtl inside horizontal-tb rtl - calc() is absolutized into pixels -PASS vertical-lr rtl inside horizontal-tb rtl - Pixels resolve as-is when overconstrained -PASS vertical-lr rtl inside horizontal-tb rtl - Percentages absolutize the computed value when overconstrained -PASS vertical-lr rtl inside horizontal-tb rtl - If start side is 'auto' and end side is not, 'auto' resolves to used value -PASS vertical-lr rtl inside horizontal-tb rtl - If end side is 'auto' and start side is not, 'auto' resolves to used value -FAIL vertical-lr rtl inside horizontal-tb rtl - If opposite sides are 'auto', they resolve to used value assert_equals: 'top' expected "127px" but got "346px" -PASS vertical-lr rtl inside vertical-lr ltr - Pixels resolve as-is -PASS vertical-lr rtl inside vertical-lr ltr - Relative lengths are absolutized into pixels -PASS vertical-lr rtl inside vertical-lr ltr - Percentages are absolutized into pixels -PASS vertical-lr rtl inside vertical-lr ltr - calc() is absolutized into pixels -PASS vertical-lr rtl inside vertical-lr ltr - Pixels resolve as-is when overconstrained -PASS vertical-lr rtl inside vertical-lr ltr - Percentages absolutize the computed value when overconstrained -PASS vertical-lr rtl inside vertical-lr ltr - If start side is 'auto' and end side is not, 'auto' resolves to used value -PASS vertical-lr rtl inside vertical-lr ltr - If end side is 'auto' and start side is not, 'auto' resolves to used value -PASS vertical-lr rtl inside vertical-lr ltr - If opposite sides are 'auto', they resolve to used value -PASS vertical-lr rtl inside vertical-lr rtl - Pixels resolve as-is -PASS vertical-lr rtl inside vertical-lr rtl - Relative lengths are absolutized into pixels -PASS vertical-lr rtl inside vertical-lr rtl - Percentages are absolutized into pixels -PASS vertical-lr rtl inside vertical-lr rtl - calc() is absolutized into pixels -PASS vertical-lr rtl inside vertical-lr rtl - Pixels resolve as-is when overconstrained -PASS vertical-lr rtl inside vertical-lr rtl - Percentages absolutize the computed value when overconstrained -PASS vertical-lr rtl inside vertical-lr rtl - If start side is 'auto' and end side is not, 'auto' resolves to used value -PASS vertical-lr rtl inside vertical-lr rtl - If end side is 'auto' and start side is not, 'auto' resolves to used value -PASS vertical-lr rtl inside vertical-lr rtl - If opposite sides are 'auto', they resolve to used value -PASS vertical-lr rtl inside vertical-rl ltr - Pixels resolve as-is -PASS vertical-lr rtl inside vertical-rl ltr - Relative lengths are absolutized into pixels -PASS vertical-lr rtl inside vertical-rl ltr - Percentages are absolutized into pixels -PASS vertical-lr rtl inside vertical-rl ltr - calc() is absolutized into pixels -PASS vertical-lr rtl inside vertical-rl ltr - Pixels resolve as-is when overconstrained -PASS vertical-lr rtl inside vertical-rl ltr - Percentages absolutize the computed value when overconstrained -FAIL vertical-lr rtl inside vertical-rl ltr - If start side is 'auto' and end side is not, 'auto' resolves to used value assert_equals: 'left' expected "596px" but got "4px" -FAIL vertical-lr rtl inside vertical-rl ltr - If end side is 'auto' and start side is not, 'auto' resolves to used value assert_equals: 'right' expected "598px" but got "2px" -PASS vertical-lr rtl inside vertical-rl ltr - If opposite sides are 'auto', they resolve to used value -PASS vertical-lr rtl inside vertical-rl rtl - Pixels resolve as-is -PASS vertical-lr rtl inside vertical-rl rtl - Relative lengths are absolutized into pixels -PASS vertical-lr rtl inside vertical-rl rtl - Percentages are absolutized into pixels -PASS vertical-lr rtl inside vertical-rl rtl - calc() is absolutized into pixels -PASS vertical-lr rtl inside vertical-rl rtl - Pixels resolve as-is when overconstrained -PASS vertical-lr rtl inside vertical-rl rtl - Percentages absolutize the computed value when overconstrained -FAIL vertical-lr rtl inside vertical-rl rtl - If start side is 'auto' and end side is not, 'auto' resolves to used value assert_equals: 'left' expected "596px" but got "4px" -FAIL vertical-lr rtl inside vertical-rl rtl - If end side is 'auto' and start side is not, 'auto' resolves to used value assert_equals: 'right' expected "598px" but got "2px" -PASS vertical-lr rtl inside vertical-rl rtl - If opposite sides are 'auto', they resolve to used value -PASS vertical-rl ltr inside horizontal-tb ltr - Pixels resolve as-is -PASS vertical-rl ltr inside horizontal-tb ltr - Relative lengths are absolutized into pixels -PASS vertical-rl ltr inside horizontal-tb ltr - Percentages are absolutized into pixels -PASS vertical-rl ltr inside horizontal-tb ltr - calc() is absolutized into pixels -PASS vertical-rl ltr inside horizontal-tb ltr - Pixels resolve as-is when overconstrained -PASS vertical-rl ltr inside horizontal-tb ltr - Percentages absolutize the computed value when overconstrained -PASS vertical-rl ltr inside horizontal-tb ltr - If start side is 'auto' and end side is not, 'auto' resolves to used value -PASS vertical-rl ltr inside horizontal-tb ltr - If end side is 'auto' and start side is not, 'auto' resolves to used value -FAIL vertical-rl ltr inside horizontal-tb ltr - If opposite sides are 'auto', they resolve to used value assert_equals: 'top' expected "127px" but got "254px" -PASS vertical-rl ltr inside horizontal-tb rtl - Pixels resolve as-is -PASS vertical-rl ltr inside horizontal-tb rtl - Relative lengths are absolutized into pixels -PASS vertical-rl ltr inside horizontal-tb rtl - Percentages are absolutized into pixels -PASS vertical-rl ltr inside horizontal-tb rtl - calc() is absolutized into pixels -PASS vertical-rl ltr inside horizontal-tb rtl - Pixels resolve as-is when overconstrained -PASS vertical-rl ltr inside horizontal-tb rtl - Percentages absolutize the computed value when overconstrained -PASS vertical-rl ltr inside horizontal-tb rtl - If start side is 'auto' and end side is not, 'auto' resolves to used value -PASS vertical-rl ltr inside horizontal-tb rtl - If end side is 'auto' and start side is not, 'auto' resolves to used value -FAIL vertical-rl ltr inside horizontal-tb rtl - If opposite sides are 'auto', they resolve to used value assert_equals: 'top' expected "127px" but got "346px" -PASS vertical-rl ltr inside vertical-lr ltr - Pixels resolve as-is -PASS vertical-rl ltr inside vertical-lr ltr - Relative lengths are absolutized into pixels -PASS vertical-rl ltr inside vertical-lr ltr - Percentages are absolutized into pixels -PASS vertical-rl ltr inside vertical-lr ltr - calc() is absolutized into pixels -PASS vertical-rl ltr inside vertical-lr ltr - Pixels resolve as-is when overconstrained -PASS vertical-rl ltr inside vertical-lr ltr - Percentages absolutize the computed value when overconstrained -PASS vertical-rl ltr inside vertical-lr ltr - If start side is 'auto' and end side is not, 'auto' resolves to used value -PASS vertical-rl ltr inside vertical-lr ltr - If end side is 'auto' and start side is not, 'auto' resolves to used value -FAIL vertical-rl ltr inside vertical-lr ltr - If opposite sides are 'auto', they resolve to used value assert_equals: 'left' expected "254px" but got "346px" -PASS vertical-rl ltr inside vertical-lr rtl - Pixels resolve as-is -PASS vertical-rl ltr inside vertical-lr rtl - Relative lengths are absolutized into pixels -PASS vertical-rl ltr inside vertical-lr rtl - Percentages are absolutized into pixels -PASS vertical-rl ltr inside vertical-lr rtl - calc() is absolutized into pixels -PASS vertical-rl ltr inside vertical-lr rtl - Pixels resolve as-is when overconstrained -PASS vertical-rl ltr inside vertical-lr rtl - Percentages absolutize the computed value when overconstrained -PASS vertical-rl ltr inside vertical-lr rtl - If start side is 'auto' and end side is not, 'auto' resolves to used value -PASS vertical-rl ltr inside vertical-lr rtl - If end side is 'auto' and start side is not, 'auto' resolves to used value -FAIL vertical-rl ltr inside vertical-lr rtl - If opposite sides are 'auto', they resolve to used value assert_equals: 'left' expected "254px" but got "346px" -PASS vertical-rl ltr inside vertical-rl ltr - Pixels resolve as-is -PASS vertical-rl ltr inside vertical-rl ltr - Relative lengths are absolutized into pixels -PASS vertical-rl ltr inside vertical-rl ltr - Percentages are absolutized into pixels -PASS vertical-rl ltr inside vertical-rl ltr - calc() is absolutized into pixels -PASS vertical-rl ltr inside vertical-rl ltr - Pixels resolve as-is when overconstrained -PASS vertical-rl ltr inside vertical-rl ltr - Percentages absolutize the computed value when overconstrained -FAIL vertical-rl ltr inside vertical-rl ltr - If start side is 'auto' and end side is not, 'auto' resolves to used value assert_equals: 'left' expected "596px" but got "4px" -FAIL vertical-rl ltr inside vertical-rl ltr - If end side is 'auto' and start side is not, 'auto' resolves to used value assert_equals: 'right' expected "598px" but got "2px" -FAIL vertical-rl ltr inside vertical-rl ltr - If opposite sides are 'auto', they resolve to used value assert_equals: 'left' expected "346px" but got "254px" -PASS vertical-rl ltr inside vertical-rl rtl - Pixels resolve as-is -PASS vertical-rl ltr inside vertical-rl rtl - Relative lengths are absolutized into pixels -PASS vertical-rl ltr inside vertical-rl rtl - Percentages are absolutized into pixels -PASS vertical-rl ltr inside vertical-rl rtl - calc() is absolutized into pixels -PASS vertical-rl ltr inside vertical-rl rtl - Pixels resolve as-is when overconstrained -PASS vertical-rl ltr inside vertical-rl rtl - Percentages absolutize the computed value when overconstrained -FAIL vertical-rl ltr inside vertical-rl rtl - If start side is 'auto' and end side is not, 'auto' resolves to used value assert_equals: 'left' expected "596px" but got "4px" -FAIL vertical-rl ltr inside vertical-rl rtl - If end side is 'auto' and start side is not, 'auto' resolves to used value assert_equals: 'right' expected "598px" but got "2px" -FAIL vertical-rl ltr inside vertical-rl rtl - If opposite sides are 'auto', they resolve to used value assert_equals: 'left' expected "346px" but got "254px" -PASS vertical-rl rtl inside horizontal-tb ltr - Pixels resolve as-is -PASS vertical-rl rtl inside horizontal-tb ltr - Relative lengths are absolutized into pixels -PASS vertical-rl rtl inside horizontal-tb ltr - Percentages are absolutized into pixels -PASS vertical-rl rtl inside horizontal-tb ltr - calc() is absolutized into pixels -PASS vertical-rl rtl inside horizontal-tb ltr - Pixels resolve as-is when overconstrained -PASS vertical-rl rtl inside horizontal-tb ltr - Percentages absolutize the computed value when overconstrained -PASS vertical-rl rtl inside horizontal-tb ltr - If start side is 'auto' and end side is not, 'auto' resolves to used value -PASS vertical-rl rtl inside horizontal-tb ltr - If end side is 'auto' and start side is not, 'auto' resolves to used value -FAIL vertical-rl rtl inside horizontal-tb ltr - If opposite sides are 'auto', they resolve to used value assert_equals: 'top' expected "127px" but got "254px" -PASS vertical-rl rtl inside horizontal-tb rtl - Pixels resolve as-is -PASS vertical-rl rtl inside horizontal-tb rtl - Relative lengths are absolutized into pixels -PASS vertical-rl rtl inside horizontal-tb rtl - Percentages are absolutized into pixels -PASS vertical-rl rtl inside horizontal-tb rtl - calc() is absolutized into pixels -PASS vertical-rl rtl inside horizontal-tb rtl - Pixels resolve as-is when overconstrained -PASS vertical-rl rtl inside horizontal-tb rtl - Percentages absolutize the computed value when overconstrained -PASS vertical-rl rtl inside horizontal-tb rtl - If start side is 'auto' and end side is not, 'auto' resolves to used value -PASS vertical-rl rtl inside horizontal-tb rtl - If end side is 'auto' and start side is not, 'auto' resolves to used value -FAIL vertical-rl rtl inside horizontal-tb rtl - If opposite sides are 'auto', they resolve to used value assert_equals: 'top' expected "127px" but got "346px" -PASS vertical-rl rtl inside vertical-lr ltr - Pixels resolve as-is -PASS vertical-rl rtl inside vertical-lr ltr - Relative lengths are absolutized into pixels -PASS vertical-rl rtl inside vertical-lr ltr - Percentages are absolutized into pixels -PASS vertical-rl rtl inside vertical-lr ltr - calc() is absolutized into pixels -PASS vertical-rl rtl inside vertical-lr ltr - Pixels resolve as-is when overconstrained -PASS vertical-rl rtl inside vertical-lr ltr - Percentages absolutize the computed value when overconstrained -PASS vertical-rl rtl inside vertical-lr ltr - If start side is 'auto' and end side is not, 'auto' resolves to used value -PASS vertical-rl rtl inside vertical-lr ltr - If end side is 'auto' and start side is not, 'auto' resolves to used value -FAIL vertical-rl rtl inside vertical-lr ltr - If opposite sides are 'auto', they resolve to used value assert_equals: 'left' expected "254px" but got "346px" -PASS vertical-rl rtl inside vertical-lr rtl - Pixels resolve as-is -PASS vertical-rl rtl inside vertical-lr rtl - Relative lengths are absolutized into pixels -PASS vertical-rl rtl inside vertical-lr rtl - Percentages are absolutized into pixels -PASS vertical-rl rtl inside vertical-lr rtl - calc() is absolutized into pixels -PASS vertical-rl rtl inside vertical-lr rtl - Pixels resolve as-is when overconstrained -PASS vertical-rl rtl inside vertical-lr rtl - Percentages absolutize the computed value when overconstrained -PASS vertical-rl rtl inside vertical-lr rtl - If start side is 'auto' and end side is not, 'auto' resolves to used value -PASS vertical-rl rtl inside vertical-lr rtl - If end side is 'auto' and start side is not, 'auto' resolves to used value -FAIL vertical-rl rtl inside vertical-lr rtl - If opposite sides are 'auto', they resolve to used value assert_equals: 'left' expected "254px" but got "346px" -PASS vertical-rl rtl inside vertical-rl ltr - Pixels resolve as-is -PASS vertical-rl rtl inside vertical-rl ltr - Relative lengths are absolutized into pixels -PASS vertical-rl rtl inside vertical-rl ltr - Percentages are absolutized into pixels -PASS vertical-rl rtl inside vertical-rl ltr - calc() is absolutized into pixels -PASS vertical-rl rtl inside vertical-rl ltr - Pixels resolve as-is when overconstrained -PASS vertical-rl rtl inside vertical-rl ltr - Percentages absolutize the computed value when overconstrained -FAIL vertical-rl rtl inside vertical-rl ltr - If start side is 'auto' and end side is not, 'auto' resolves to used value assert_equals: 'left' expected "596px" but got "4px" -FAIL vertical-rl rtl inside vertical-rl ltr - If end side is 'auto' and start side is not, 'auto' resolves to used value assert_equals: 'right' expected "598px" but got "2px" -FAIL vertical-rl rtl inside vertical-rl ltr - If opposite sides are 'auto', they resolve to used value assert_equals: 'left' expected "346px" but got "254px" -PASS vertical-rl rtl inside vertical-rl rtl - Pixels resolve as-is -PASS vertical-rl rtl inside vertical-rl rtl - Relative lengths are absolutized into pixels -PASS vertical-rl rtl inside vertical-rl rtl - Percentages are absolutized into pixels -PASS vertical-rl rtl inside vertical-rl rtl - calc() is absolutized into pixels -PASS vertical-rl rtl inside vertical-rl rtl - Pixels resolve as-is when overconstrained -PASS vertical-rl rtl inside vertical-rl rtl - Percentages absolutize the computed value when overconstrained -FAIL vertical-rl rtl inside vertical-rl rtl - If start side is 'auto' and end side is not, 'auto' resolves to used value assert_equals: 'left' expected "596px" but got "4px" -FAIL vertical-rl rtl inside vertical-rl rtl - If end side is 'auto' and start side is not, 'auto' resolves to used value assert_equals: 'right' expected "598px" but got "2px" -FAIL vertical-rl rtl inside vertical-rl rtl - If opposite sides are 'auto', they resolve to used value assert_equals: 'left' expected "346px" but got "254px" -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/cssom/idlharness-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/cssom/idlharness-expected.txt deleted file mode 100644 index 44af348..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/cssom/idlharness-expected.txt +++ /dev/null
@@ -1,456 +0,0 @@ -This is a testharness.js-based test. -Found 452 tests; 398 PASS, 54 FAIL, 0 TIMEOUT, 0 NOTRUN. -PASS idl_test setup -PASS idl_test validation -PASS Partial interface CSSStyleSheet: original interface defined -PASS Partial interface CSSStyleSheet: member names are unique -PASS Partial interface mixin DocumentOrShadowRoot: original interface mixin defined -PASS Partial interface mixin DocumentOrShadowRoot: member names are unique -PASS Partial interface Window: original interface defined -PASS Partial interface Window: member names are unique -PASS Partial interface mixin DocumentOrShadowRoot[2]: member names are unique -PASS Partial interface HTMLLinkElement: member names are unique -PASS Partial interface HTMLStyleElement: member names are unique -PASS Partial interface Window[2]: member names are unique -PASS ProcessingInstruction includes LinkStyle: member names are unique -PASS HTMLElement includes ElementCSSInlineStyle: member names are unique -PASS SVGElement includes ElementCSSInlineStyle: member names are unique -PASS MathMLElement includes ElementCSSInlineStyle: member names are unique -PASS SVGElement includes GlobalEventHandlers: member names are unique -PASS SVGElement includes DocumentAndElementEventHandlers: member names are unique -PASS SVGElement includes SVGElementInstance: member names are unique -PASS SVGElement includes HTMLOrSVGElement: member names are unique -PASS SVGStyleElement includes LinkStyle: member names are unique -PASS HTMLElement includes GlobalEventHandlers: member names are unique -PASS HTMLElement includes DocumentAndElementEventHandlers: member names are unique -PASS HTMLElement includes ElementContentEditable: member names are unique -PASS HTMLElement includes HTMLOrSVGElement: member names are unique -PASS HTMLLinkElement includes LinkStyle: member names are unique -PASS HTMLStyleElement includes LinkStyle: member names are unique -PASS Window includes GlobalEventHandlers: member names are unique -PASS Window includes WindowEventHandlers: member names are unique -PASS Window includes WindowOrWorkerGlobalScope: member names are unique -PASS Window includes AnimationFrameProvider: member names are unique -PASS Window includes WindowSessionStorage: member names are unique -PASS Window includes WindowLocalStorage: member names are unique -PASS Document includes NonElementParentNode: member names are unique -PASS DocumentFragment includes NonElementParentNode: member names are unique -PASS Document includes DocumentOrShadowRoot: member names are unique -PASS ShadowRoot includes DocumentOrShadowRoot: member names are unique -PASS Document includes ParentNode: member names are unique -PASS DocumentFragment includes ParentNode: member names are unique -PASS Element includes ParentNode: member names are unique -PASS Element includes NonDocumentTypeChildNode: member names are unique -PASS CharacterData includes NonDocumentTypeChildNode: member names are unique -PASS Element includes ChildNode: member names are unique -PASS CharacterData includes ChildNode: member names are unique -PASS Element includes Slottable: member names are unique -PASS Document includes XPathEvaluatorBase: member names are unique -PASS MathMLElement includes GlobalEventHandlers: member names are unique -PASS MathMLElement includes DocumentAndElementEventHandlers: member names are unique -PASS MathMLElement includes HTMLOrSVGElement: member names are unique -PASS MediaList interface: existence and properties of interface object -PASS MediaList interface object length -PASS MediaList interface object name -PASS MediaList interface: existence and properties of interface prototype object -PASS MediaList interface: existence and properties of interface prototype object's "constructor" property -PASS MediaList interface: existence and properties of interface prototype object's @@unscopables property -PASS MediaList interface: attribute mediaText -PASS MediaList interface: stringifier -PASS MediaList interface: attribute length -PASS MediaList interface: operation item(unsigned long) -PASS MediaList interface: operation appendMedium(CSSOMString) -PASS MediaList interface: operation deleteMedium(CSSOMString) -PASS MediaList must be primary interface of sheet.media -PASS Stringification of sheet.media -PASS MediaList interface: sheet.media must inherit property "mediaText" with the proper type -PASS MediaList interface: sheet.media must inherit property "length" with the proper type -PASS MediaList interface: sheet.media must inherit property "item(unsigned long)" with the proper type -PASS MediaList interface: calling item(unsigned long) on sheet.media with too few arguments must throw TypeError -PASS MediaList interface: sheet.media must inherit property "appendMedium(CSSOMString)" with the proper type -PASS MediaList interface: calling appendMedium(CSSOMString) on sheet.media with too few arguments must throw TypeError -PASS MediaList interface: sheet.media must inherit property "deleteMedium(CSSOMString)" with the proper type -PASS MediaList interface: calling deleteMedium(CSSOMString) on sheet.media with too few arguments must throw TypeError -PASS StyleSheet interface: existence and properties of interface object -PASS StyleSheet interface object length -PASS StyleSheet interface object name -PASS StyleSheet interface: existence and properties of interface prototype object -PASS StyleSheet interface: existence and properties of interface prototype object's "constructor" property -PASS StyleSheet interface: existence and properties of interface prototype object's @@unscopables property -PASS StyleSheet interface: attribute type -PASS StyleSheet interface: attribute href -PASS StyleSheet interface: attribute ownerNode -PASS StyleSheet interface: attribute parentStyleSheet -PASS StyleSheet interface: attribute title -PASS StyleSheet interface: attribute media -PASS StyleSheet interface: attribute disabled -PASS CSSStyleSheet interface: existence and properties of interface object -PASS CSSStyleSheet interface object length -PASS CSSStyleSheet interface object name -PASS CSSStyleSheet interface: existence and properties of interface prototype object -PASS CSSStyleSheet interface: existence and properties of interface prototype object's "constructor" property -PASS CSSStyleSheet interface: existence and properties of interface prototype object's @@unscopables property -PASS CSSStyleSheet interface: attribute ownerRule -PASS CSSStyleSheet interface: attribute cssRules -PASS CSSStyleSheet interface: operation insertRule(CSSOMString, optional unsigned long) -PASS CSSStyleSheet interface: operation deleteRule(unsigned long) -PASS CSSStyleSheet interface: operation replace(USVString) -PASS CSSStyleSheet interface: operation replaceSync(USVString) -PASS CSSStyleSheet interface: attribute rules -PASS CSSStyleSheet interface: operation addRule(optional DOMString, optional DOMString, optional unsigned long) -PASS CSSStyleSheet interface: operation removeRule(optional unsigned long) -PASS CSSStyleSheet must be primary interface of sheet -PASS Stringification of sheet -PASS CSSStyleSheet interface: sheet must inherit property "ownerRule" with the proper type -PASS CSSStyleSheet interface: sheet must inherit property "cssRules" with the proper type -PASS CSSStyleSheet interface: sheet must inherit property "insertRule(CSSOMString, optional unsigned long)" with the proper type -PASS CSSStyleSheet interface: calling insertRule(CSSOMString, optional unsigned long) on sheet with too few arguments must throw TypeError -PASS CSSStyleSheet interface: sheet must inherit property "deleteRule(unsigned long)" with the proper type -PASS CSSStyleSheet interface: calling deleteRule(unsigned long) on sheet with too few arguments must throw TypeError -PASS CSSStyleSheet interface: sheet must inherit property "replace(USVString)" with the proper type -PASS CSSStyleSheet interface: calling replace(USVString) on sheet with too few arguments must throw TypeError -PASS CSSStyleSheet interface: sheet must inherit property "replaceSync(USVString)" with the proper type -PASS CSSStyleSheet interface: calling replaceSync(USVString) on sheet with too few arguments must throw TypeError -PASS CSSStyleSheet interface: sheet must inherit property "rules" with the proper type -PASS CSSStyleSheet interface: sheet must inherit property "addRule(optional DOMString, optional DOMString, optional unsigned long)" with the proper type -PASS CSSStyleSheet interface: calling addRule(optional DOMString, optional DOMString, optional unsigned long) on sheet with too few arguments must throw TypeError -PASS CSSStyleSheet interface: sheet must inherit property "removeRule(optional unsigned long)" with the proper type -PASS CSSStyleSheet interface: calling removeRule(optional unsigned long) on sheet with too few arguments must throw TypeError -PASS StyleSheet interface: sheet must inherit property "type" with the proper type -PASS StyleSheet interface: sheet must inherit property "href" with the proper type -PASS StyleSheet interface: sheet must inherit property "ownerNode" with the proper type -PASS StyleSheet interface: sheet must inherit property "parentStyleSheet" with the proper type -PASS StyleSheet interface: sheet must inherit property "title" with the proper type -PASS StyleSheet interface: sheet must inherit property "media" with the proper type -PASS StyleSheet interface: sheet must inherit property "disabled" with the proper type -PASS StyleSheetList interface: existence and properties of interface object -PASS StyleSheetList interface object length -PASS StyleSheetList interface object name -PASS StyleSheetList interface: existence and properties of interface prototype object -PASS StyleSheetList interface: existence and properties of interface prototype object's "constructor" property -PASS StyleSheetList interface: existence and properties of interface prototype object's @@unscopables property -PASS StyleSheetList interface: operation item(unsigned long) -PASS StyleSheetList interface: attribute length -PASS StyleSheetList must be primary interface of document.styleSheets -PASS Stringification of document.styleSheets -PASS StyleSheetList interface: document.styleSheets must inherit property "item(unsigned long)" with the proper type -PASS StyleSheetList interface: calling item(unsigned long) on document.styleSheets with too few arguments must throw TypeError -PASS StyleSheetList interface: document.styleSheets must inherit property "length" with the proper type -PASS CSSRuleList interface: existence and properties of interface object -PASS CSSRuleList interface object length -PASS CSSRuleList interface object name -PASS CSSRuleList interface: existence and properties of interface prototype object -PASS CSSRuleList interface: existence and properties of interface prototype object's "constructor" property -PASS CSSRuleList interface: existence and properties of interface prototype object's @@unscopables property -PASS CSSRuleList interface: operation item(unsigned long) -PASS CSSRuleList interface: attribute length -PASS CSSRuleList must be primary interface of sheet.cssRules -PASS Stringification of sheet.cssRules -PASS CSSRuleList interface: sheet.cssRules must inherit property "item(unsigned long)" with the proper type -PASS CSSRuleList interface: calling item(unsigned long) on sheet.cssRules with too few arguments must throw TypeError -PASS CSSRuleList interface: sheet.cssRules must inherit property "length" with the proper type -PASS CSSRule interface: existence and properties of interface object -PASS CSSRule interface object length -PASS CSSRule interface object name -PASS CSSRule interface: existence and properties of interface prototype object -PASS CSSRule interface: existence and properties of interface prototype object's "constructor" property -PASS CSSRule interface: existence and properties of interface prototype object's @@unscopables property -PASS CSSRule interface: attribute cssText -PASS CSSRule interface: attribute parentRule -PASS CSSRule interface: attribute parentStyleSheet -PASS CSSRule interface: attribute type -PASS CSSRule interface: constant STYLE_RULE on interface object -PASS CSSRule interface: constant STYLE_RULE on interface prototype object -PASS CSSRule interface: constant CHARSET_RULE on interface object -PASS CSSRule interface: constant CHARSET_RULE on interface prototype object -PASS CSSRule interface: constant IMPORT_RULE on interface object -PASS CSSRule interface: constant IMPORT_RULE on interface prototype object -PASS CSSRule interface: constant MEDIA_RULE on interface object -PASS CSSRule interface: constant MEDIA_RULE on interface prototype object -PASS CSSRule interface: constant FONT_FACE_RULE on interface object -PASS CSSRule interface: constant FONT_FACE_RULE on interface prototype object -PASS CSSRule interface: constant PAGE_RULE on interface object -PASS CSSRule interface: constant PAGE_RULE on interface prototype object -FAIL CSSRule interface: constant MARGIN_RULE on interface object assert_own_property: expected property "MARGIN_RULE" missing -FAIL CSSRule interface: constant MARGIN_RULE on interface prototype object assert_own_property: expected property "MARGIN_RULE" missing -PASS CSSRule interface: constant NAMESPACE_RULE on interface object -PASS CSSRule interface: constant NAMESPACE_RULE on interface prototype object -PASS CSSStyleRule interface: existence and properties of interface object -PASS CSSStyleRule interface object length -PASS CSSStyleRule interface object name -PASS CSSStyleRule interface: existence and properties of interface prototype object -PASS CSSStyleRule interface: existence and properties of interface prototype object's "constructor" property -PASS CSSStyleRule interface: existence and properties of interface prototype object's @@unscopables property -PASS CSSStyleRule interface: attribute selectorText -PASS CSSStyleRule interface: attribute style -PASS CSSStyleRule must be primary interface of sheet.cssRules[4] -PASS Stringification of sheet.cssRules[4] -PASS CSSStyleRule interface: sheet.cssRules[4] must inherit property "selectorText" with the proper type -PASS CSSStyleRule interface: sheet.cssRules[4] must inherit property "style" with the proper type -PASS CSSRule interface: sheet.cssRules[4] must inherit property "cssText" with the proper type -PASS CSSRule interface: sheet.cssRules[4] must inherit property "parentRule" with the proper type -PASS CSSRule interface: sheet.cssRules[4] must inherit property "parentStyleSheet" with the proper type -PASS CSSRule interface: sheet.cssRules[4] must inherit property "type" with the proper type -PASS CSSRule interface: sheet.cssRules[4] must inherit property "STYLE_RULE" with the proper type -PASS CSSRule interface: sheet.cssRules[4] must inherit property "CHARSET_RULE" with the proper type -PASS CSSRule interface: sheet.cssRules[4] must inherit property "IMPORT_RULE" with the proper type -PASS CSSRule interface: sheet.cssRules[4] must inherit property "MEDIA_RULE" with the proper type -PASS CSSRule interface: sheet.cssRules[4] must inherit property "FONT_FACE_RULE" with the proper type -PASS CSSRule interface: sheet.cssRules[4] must inherit property "PAGE_RULE" with the proper type -FAIL CSSRule interface: sheet.cssRules[4] must inherit property "MARGIN_RULE" with the proper type assert_inherits: property "MARGIN_RULE" not found in prototype chain -PASS CSSRule interface: sheet.cssRules[4] must inherit property "NAMESPACE_RULE" with the proper type -PASS CSSImportRule interface: existence and properties of interface object -PASS CSSImportRule interface object length -PASS CSSImportRule interface object name -PASS CSSImportRule interface: existence and properties of interface prototype object -PASS CSSImportRule interface: existence and properties of interface prototype object's "constructor" property -PASS CSSImportRule interface: existence and properties of interface prototype object's @@unscopables property -PASS CSSImportRule interface: attribute href -PASS CSSImportRule interface: attribute media -PASS CSSImportRule interface: attribute styleSheet -PASS CSSImportRule must be primary interface of sheet.cssRules[0] -PASS Stringification of sheet.cssRules[0] -PASS CSSImportRule interface: sheet.cssRules[0] must inherit property "href" with the proper type -PASS CSSImportRule interface: sheet.cssRules[0] must inherit property "media" with the proper type -PASS CSSImportRule interface: sheet.cssRules[0] must inherit property "styleSheet" with the proper type -PASS CSSRule interface: sheet.cssRules[0] must inherit property "cssText" with the proper type -PASS CSSRule interface: sheet.cssRules[0] must inherit property "parentRule" with the proper type -PASS CSSRule interface: sheet.cssRules[0] must inherit property "parentStyleSheet" with the proper type -PASS CSSRule interface: sheet.cssRules[0] must inherit property "type" with the proper type -PASS CSSRule interface: sheet.cssRules[0] must inherit property "STYLE_RULE" with the proper type -PASS CSSRule interface: sheet.cssRules[0] must inherit property "CHARSET_RULE" with the proper type -PASS CSSRule interface: sheet.cssRules[0] must inherit property "IMPORT_RULE" with the proper type -PASS CSSRule interface: sheet.cssRules[0] must inherit property "MEDIA_RULE" with the proper type -PASS CSSRule interface: sheet.cssRules[0] must inherit property "FONT_FACE_RULE" with the proper type -PASS CSSRule interface: sheet.cssRules[0] must inherit property "PAGE_RULE" with the proper type -FAIL CSSRule interface: sheet.cssRules[0] must inherit property "MARGIN_RULE" with the proper type assert_inherits: property "MARGIN_RULE" not found in prototype chain -PASS CSSRule interface: sheet.cssRules[0] must inherit property "NAMESPACE_RULE" with the proper type -PASS CSSGroupingRule interface: existence and properties of interface object -PASS CSSGroupingRule interface object length -PASS CSSGroupingRule interface object name -PASS CSSGroupingRule interface: existence and properties of interface prototype object -PASS CSSGroupingRule interface: existence and properties of interface prototype object's "constructor" property -PASS CSSGroupingRule interface: existence and properties of interface prototype object's @@unscopables property -PASS CSSGroupingRule interface: attribute cssRules -FAIL CSSGroupingRule interface: operation insertRule(CSSOMString, optional unsigned long) assert_equals: property has wrong .length expected 1 but got 2 -PASS CSSGroupingRule interface: operation deleteRule(unsigned long) -FAIL CSSPageRule interface: existence and properties of interface object assert_equals: prototype of CSSPageRule is not CSSGroupingRule expected function "function CSSGroupingRule() { [native code] }" but got function "function CSSRule() { [native code] }" -PASS CSSPageRule interface object length -PASS CSSPageRule interface object name -FAIL CSSPageRule interface: existence and properties of interface prototype object assert_equals: prototype of CSSPageRule.prototype is not CSSGroupingRule.prototype expected object "[object CSSGroupingRule]" but got object "[object CSSRule]" -PASS CSSPageRule interface: existence and properties of interface prototype object's "constructor" property -PASS CSSPageRule interface: existence and properties of interface prototype object's @@unscopables property -PASS CSSPageRule interface: attribute selectorText -PASS CSSPageRule interface: attribute style -PASS CSSPageRule must be primary interface of sheet.cssRules[2] -PASS Stringification of sheet.cssRules[2] -PASS CSSPageRule interface: sheet.cssRules[2] must inherit property "selectorText" with the proper type -PASS CSSPageRule interface: sheet.cssRules[2] must inherit property "style" with the proper type -FAIL CSSGroupingRule interface: sheet.cssRules[2] must inherit property "cssRules" with the proper type assert_inherits: property "cssRules" not found in prototype chain -FAIL CSSGroupingRule interface: sheet.cssRules[2] must inherit property "insertRule(CSSOMString, optional unsigned long)" with the proper type assert_inherits: property "insertRule" not found in prototype chain -FAIL CSSGroupingRule interface: calling insertRule(CSSOMString, optional unsigned long) on sheet.cssRules[2] with too few arguments must throw TypeError assert_inherits: property "insertRule" not found in prototype chain -FAIL CSSGroupingRule interface: sheet.cssRules[2] must inherit property "deleteRule(unsigned long)" with the proper type assert_inherits: property "deleteRule" not found in prototype chain -FAIL CSSGroupingRule interface: calling deleteRule(unsigned long) on sheet.cssRules[2] with too few arguments must throw TypeError assert_inherits: property "deleteRule" not found in prototype chain -PASS CSSRule interface: sheet.cssRules[2] must inherit property "cssText" with the proper type -PASS CSSRule interface: sheet.cssRules[2] must inherit property "parentRule" with the proper type -PASS CSSRule interface: sheet.cssRules[2] must inherit property "parentStyleSheet" with the proper type -PASS CSSRule interface: sheet.cssRules[2] must inherit property "type" with the proper type -PASS CSSRule interface: sheet.cssRules[2] must inherit property "STYLE_RULE" with the proper type -PASS CSSRule interface: sheet.cssRules[2] must inherit property "CHARSET_RULE" with the proper type -PASS CSSRule interface: sheet.cssRules[2] must inherit property "IMPORT_RULE" with the proper type -PASS CSSRule interface: sheet.cssRules[2] must inherit property "MEDIA_RULE" with the proper type -PASS CSSRule interface: sheet.cssRules[2] must inherit property "FONT_FACE_RULE" with the proper type -PASS CSSRule interface: sheet.cssRules[2] must inherit property "PAGE_RULE" with the proper type -FAIL CSSRule interface: sheet.cssRules[2] must inherit property "MARGIN_RULE" with the proper type assert_inherits: property "MARGIN_RULE" not found in prototype chain -PASS CSSRule interface: sheet.cssRules[2] must inherit property "NAMESPACE_RULE" with the proper type -FAIL CSSMarginRule interface: existence and properties of interface object assert_own_property: self does not have own property "CSSMarginRule" expected property "CSSMarginRule" missing -FAIL CSSMarginRule interface object length assert_own_property: self does not have own property "CSSMarginRule" expected property "CSSMarginRule" missing -FAIL CSSMarginRule interface object name assert_own_property: self does not have own property "CSSMarginRule" expected property "CSSMarginRule" missing -FAIL CSSMarginRule interface: existence and properties of interface prototype object assert_own_property: self does not have own property "CSSMarginRule" expected property "CSSMarginRule" missing -FAIL CSSMarginRule interface: existence and properties of interface prototype object's "constructor" property assert_own_property: self does not have own property "CSSMarginRule" expected property "CSSMarginRule" missing -FAIL CSSMarginRule interface: existence and properties of interface prototype object's @@unscopables property assert_own_property: self does not have own property "CSSMarginRule" expected property "CSSMarginRule" missing -FAIL CSSMarginRule interface: attribute name assert_own_property: self does not have own property "CSSMarginRule" expected property "CSSMarginRule" missing -FAIL CSSMarginRule interface: attribute style assert_own_property: self does not have own property "CSSMarginRule" expected property "CSSMarginRule" missing -FAIL CSSMarginRule must be primary interface of sheet.cssRules[2].cssRules[0] assert_equals: Unexpected exception when evaluating object expected null but got object "TypeError: Cannot read properties of undefined (reading '0')" -FAIL Stringification of sheet.cssRules[2].cssRules[0] assert_equals: Unexpected exception when evaluating object expected null but got object "TypeError: Cannot read properties of undefined (reading '0')" -FAIL CSSMarginRule interface: sheet.cssRules[2].cssRules[0] must inherit property "name" with the proper type assert_equals: Unexpected exception when evaluating object expected null but got object "TypeError: Cannot read properties of undefined (reading '0')" -FAIL CSSMarginRule interface: sheet.cssRules[2].cssRules[0] must inherit property "style" with the proper type assert_equals: Unexpected exception when evaluating object expected null but got object "TypeError: Cannot read properties of undefined (reading '0')" -FAIL CSSRule interface: sheet.cssRules[2].cssRules[0] must inherit property "cssText" with the proper type assert_equals: Unexpected exception when evaluating object expected null but got object "TypeError: Cannot read properties of undefined (reading '0')" -FAIL CSSRule interface: sheet.cssRules[2].cssRules[0] must inherit property "parentRule" with the proper type assert_equals: Unexpected exception when evaluating object expected null but got object "TypeError: Cannot read properties of undefined (reading '0')" -FAIL CSSRule interface: sheet.cssRules[2].cssRules[0] must inherit property "parentStyleSheet" with the proper type assert_equals: Unexpected exception when evaluating object expected null but got object "TypeError: Cannot read properties of undefined (reading '0')" -FAIL CSSRule interface: sheet.cssRules[2].cssRules[0] must inherit property "type" with the proper type assert_equals: Unexpected exception when evaluating object expected null but got object "TypeError: Cannot read properties of undefined (reading '0')" -FAIL CSSRule interface: sheet.cssRules[2].cssRules[0] must inherit property "STYLE_RULE" with the proper type assert_equals: Unexpected exception when evaluating object expected null but got object "TypeError: Cannot read properties of undefined (reading '0')" -FAIL CSSRule interface: sheet.cssRules[2].cssRules[0] must inherit property "CHARSET_RULE" with the proper type assert_equals: Unexpected exception when evaluating object expected null but got object "TypeError: Cannot read properties of undefined (reading '0')" -FAIL CSSRule interface: sheet.cssRules[2].cssRules[0] must inherit property "IMPORT_RULE" with the proper type assert_equals: Unexpected exception when evaluating object expected null but got object "TypeError: Cannot read properties of undefined (reading '0')" -FAIL CSSRule interface: sheet.cssRules[2].cssRules[0] must inherit property "MEDIA_RULE" with the proper type assert_equals: Unexpected exception when evaluating object expected null but got object "TypeError: Cannot read properties of undefined (reading '0')" -FAIL CSSRule interface: sheet.cssRules[2].cssRules[0] must inherit property "FONT_FACE_RULE" with the proper type assert_equals: Unexpected exception when evaluating object expected null but got object "TypeError: Cannot read properties of undefined (reading '0')" -FAIL CSSRule interface: sheet.cssRules[2].cssRules[0] must inherit property "PAGE_RULE" with the proper type assert_equals: Unexpected exception when evaluating object expected null but got object "TypeError: Cannot read properties of undefined (reading '0')" -FAIL CSSRule interface: sheet.cssRules[2].cssRules[0] must inherit property "MARGIN_RULE" with the proper type assert_equals: Unexpected exception when evaluating object expected null but got object "TypeError: Cannot read properties of undefined (reading '0')" -FAIL CSSRule interface: sheet.cssRules[2].cssRules[0] must inherit property "NAMESPACE_RULE" with the proper type assert_equals: Unexpected exception when evaluating object expected null but got object "TypeError: Cannot read properties of undefined (reading '0')" -PASS CSSNamespaceRule interface: existence and properties of interface object -PASS CSSNamespaceRule interface object length -PASS CSSNamespaceRule interface object name -PASS CSSNamespaceRule interface: existence and properties of interface prototype object -PASS CSSNamespaceRule interface: existence and properties of interface prototype object's "constructor" property -PASS CSSNamespaceRule interface: existence and properties of interface prototype object's @@unscopables property -PASS CSSNamespaceRule interface: attribute namespaceURI -PASS CSSNamespaceRule interface: attribute prefix -PASS CSSNamespaceRule must be primary interface of sheet.cssRules[1] -PASS Stringification of sheet.cssRules[1] -PASS CSSNamespaceRule interface: sheet.cssRules[1] must inherit property "namespaceURI" with the proper type -PASS CSSNamespaceRule interface: sheet.cssRules[1] must inherit property "prefix" with the proper type -PASS CSSRule interface: sheet.cssRules[1] must inherit property "cssText" with the proper type -PASS CSSRule interface: sheet.cssRules[1] must inherit property "parentRule" with the proper type -PASS CSSRule interface: sheet.cssRules[1] must inherit property "parentStyleSheet" with the proper type -PASS CSSRule interface: sheet.cssRules[1] must inherit property "type" with the proper type -PASS CSSRule interface: sheet.cssRules[1] must inherit property "STYLE_RULE" with the proper type -PASS CSSRule interface: sheet.cssRules[1] must inherit property "CHARSET_RULE" with the proper type -PASS CSSRule interface: sheet.cssRules[1] must inherit property "IMPORT_RULE" with the proper type -PASS CSSRule interface: sheet.cssRules[1] must inherit property "MEDIA_RULE" with the proper type -PASS CSSRule interface: sheet.cssRules[1] must inherit property "FONT_FACE_RULE" with the proper type -PASS CSSRule interface: sheet.cssRules[1] must inherit property "PAGE_RULE" with the proper type -FAIL CSSRule interface: sheet.cssRules[1] must inherit property "MARGIN_RULE" with the proper type assert_inherits: property "MARGIN_RULE" not found in prototype chain -PASS CSSRule interface: sheet.cssRules[1] must inherit property "NAMESPACE_RULE" with the proper type -PASS CSSStyleDeclaration interface: existence and properties of interface object -PASS CSSStyleDeclaration interface object length -PASS CSSStyleDeclaration interface object name -PASS CSSStyleDeclaration interface: existence and properties of interface prototype object -PASS CSSStyleDeclaration interface: existence and properties of interface prototype object's "constructor" property -PASS CSSStyleDeclaration interface: existence and properties of interface prototype object's @@unscopables property -PASS CSSStyleDeclaration interface: attribute cssText -PASS CSSStyleDeclaration interface: attribute length -PASS CSSStyleDeclaration interface: operation item(unsigned long) -PASS CSSStyleDeclaration interface: operation getPropertyValue(CSSOMString) -PASS CSSStyleDeclaration interface: operation getPropertyPriority(CSSOMString) -PASS CSSStyleDeclaration interface: operation setProperty(CSSOMString, CSSOMString, optional CSSOMString) -PASS CSSStyleDeclaration interface: operation removeProperty(CSSOMString) -PASS CSSStyleDeclaration interface: attribute parentRule -PASS CSSStyleDeclaration interface: attribute cssFloat -PASS CSSStyleDeclaration must be primary interface of sheet.cssRules[4].style -PASS Stringification of sheet.cssRules[4].style -PASS CSSStyleDeclaration interface: sheet.cssRules[4].style must inherit property "cssText" with the proper type -PASS CSSStyleDeclaration interface: sheet.cssRules[4].style must inherit property "length" with the proper type -PASS CSSStyleDeclaration interface: sheet.cssRules[4].style must inherit property "item(unsigned long)" with the proper type -PASS CSSStyleDeclaration interface: calling item(unsigned long) on sheet.cssRules[4].style with too few arguments must throw TypeError -PASS CSSStyleDeclaration interface: sheet.cssRules[4].style must inherit property "getPropertyValue(CSSOMString)" with the proper type -PASS CSSStyleDeclaration interface: calling getPropertyValue(CSSOMString) on sheet.cssRules[4].style with too few arguments must throw TypeError -PASS CSSStyleDeclaration interface: sheet.cssRules[4].style must inherit property "getPropertyPriority(CSSOMString)" with the proper type -PASS CSSStyleDeclaration interface: calling getPropertyPriority(CSSOMString) on sheet.cssRules[4].style with too few arguments must throw TypeError -PASS CSSStyleDeclaration interface: sheet.cssRules[4].style must inherit property "setProperty(CSSOMString, CSSOMString, optional CSSOMString)" with the proper type -PASS CSSStyleDeclaration interface: calling setProperty(CSSOMString, CSSOMString, optional CSSOMString) on sheet.cssRules[4].style with too few arguments must throw TypeError -PASS CSSStyleDeclaration interface: sheet.cssRules[4].style must inherit property "removeProperty(CSSOMString)" with the proper type -PASS CSSStyleDeclaration interface: calling removeProperty(CSSOMString) on sheet.cssRules[4].style with too few arguments must throw TypeError -PASS CSSStyleDeclaration interface: sheet.cssRules[4].style must inherit property "parentRule" with the proper type -PASS CSSStyleDeclaration interface: sheet.cssRules[4].style must inherit property "cssFloat" with the proper type -PASS CSSStyleDeclaration must be primary interface of sheet.cssRules[2].style -PASS Stringification of sheet.cssRules[2].style -PASS CSSStyleDeclaration interface: sheet.cssRules[2].style must inherit property "cssText" with the proper type -PASS CSSStyleDeclaration interface: sheet.cssRules[2].style must inherit property "length" with the proper type -PASS CSSStyleDeclaration interface: sheet.cssRules[2].style must inherit property "item(unsigned long)" with the proper type -PASS CSSStyleDeclaration interface: calling item(unsigned long) on sheet.cssRules[2].style with too few arguments must throw TypeError -PASS CSSStyleDeclaration interface: sheet.cssRules[2].style must inherit property "getPropertyValue(CSSOMString)" with the proper type -PASS CSSStyleDeclaration interface: calling getPropertyValue(CSSOMString) on sheet.cssRules[2].style with too few arguments must throw TypeError -PASS CSSStyleDeclaration interface: sheet.cssRules[2].style must inherit property "getPropertyPriority(CSSOMString)" with the proper type -PASS CSSStyleDeclaration interface: calling getPropertyPriority(CSSOMString) on sheet.cssRules[2].style with too few arguments must throw TypeError -PASS CSSStyleDeclaration interface: sheet.cssRules[2].style must inherit property "setProperty(CSSOMString, CSSOMString, optional CSSOMString)" with the proper type -PASS CSSStyleDeclaration interface: calling setProperty(CSSOMString, CSSOMString, optional CSSOMString) on sheet.cssRules[2].style with too few arguments must throw TypeError -PASS CSSStyleDeclaration interface: sheet.cssRules[2].style must inherit property "removeProperty(CSSOMString)" with the proper type -PASS CSSStyleDeclaration interface: calling removeProperty(CSSOMString) on sheet.cssRules[2].style with too few arguments must throw TypeError -PASS CSSStyleDeclaration interface: sheet.cssRules[2].style must inherit property "parentRule" with the proper type -PASS CSSStyleDeclaration interface: sheet.cssRules[2].style must inherit property "cssFloat" with the proper type -FAIL CSSStyleDeclaration must be primary interface of sheet.cssRules[2].cssRules[0].style assert_equals: Unexpected exception when evaluating object expected null but got object "TypeError: Cannot read properties of undefined (reading '0')" -FAIL Stringification of sheet.cssRules[2].cssRules[0].style assert_equals: Unexpected exception when evaluating object expected null but got object "TypeError: Cannot read properties of undefined (reading '0')" -FAIL CSSStyleDeclaration interface: sheet.cssRules[2].cssRules[0].style must inherit property "cssText" with the proper type assert_equals: Unexpected exception when evaluating object expected null but got object "TypeError: Cannot read properties of undefined (reading '0')" -FAIL CSSStyleDeclaration interface: sheet.cssRules[2].cssRules[0].style must inherit property "length" with the proper type assert_equals: Unexpected exception when evaluating object expected null but got object "TypeError: Cannot read properties of undefined (reading '0')" -FAIL CSSStyleDeclaration interface: sheet.cssRules[2].cssRules[0].style must inherit property "item(unsigned long)" with the proper type assert_equals: Unexpected exception when evaluating object expected null but got object "TypeError: Cannot read properties of undefined (reading '0')" -FAIL CSSStyleDeclaration interface: calling item(unsigned long) on sheet.cssRules[2].cssRules[0].style with too few arguments must throw TypeError assert_equals: Unexpected exception when evaluating object expected null but got object "TypeError: Cannot read properties of undefined (reading '0')" -FAIL CSSStyleDeclaration interface: sheet.cssRules[2].cssRules[0].style must inherit property "getPropertyValue(CSSOMString)" with the proper type assert_equals: Unexpected exception when evaluating object expected null but got object "TypeError: Cannot read properties of undefined (reading '0')" -FAIL CSSStyleDeclaration interface: calling getPropertyValue(CSSOMString) on sheet.cssRules[2].cssRules[0].style with too few arguments must throw TypeError assert_equals: Unexpected exception when evaluating object expected null but got object "TypeError: Cannot read properties of undefined (reading '0')" -FAIL CSSStyleDeclaration interface: sheet.cssRules[2].cssRules[0].style must inherit property "getPropertyPriority(CSSOMString)" with the proper type assert_equals: Unexpected exception when evaluating object expected null but got object "TypeError: Cannot read properties of undefined (reading '0')" -FAIL CSSStyleDeclaration interface: calling getPropertyPriority(CSSOMString) on sheet.cssRules[2].cssRules[0].style with too few arguments must throw TypeError assert_equals: Unexpected exception when evaluating object expected null but got object "TypeError: Cannot read properties of undefined (reading '0')" -FAIL CSSStyleDeclaration interface: sheet.cssRules[2].cssRules[0].style must inherit property "setProperty(CSSOMString, CSSOMString, optional CSSOMString)" with the proper type assert_equals: Unexpected exception when evaluating object expected null but got object "TypeError: Cannot read properties of undefined (reading '0')" -FAIL CSSStyleDeclaration interface: calling setProperty(CSSOMString, CSSOMString, optional CSSOMString) on sheet.cssRules[2].cssRules[0].style with too few arguments must throw TypeError assert_equals: Unexpected exception when evaluating object expected null but got object "TypeError: Cannot read properties of undefined (reading '0')" -FAIL CSSStyleDeclaration interface: sheet.cssRules[2].cssRules[0].style must inherit property "removeProperty(CSSOMString)" with the proper type assert_equals: Unexpected exception when evaluating object expected null but got object "TypeError: Cannot read properties of undefined (reading '0')" -FAIL CSSStyleDeclaration interface: calling removeProperty(CSSOMString) on sheet.cssRules[2].cssRules[0].style with too few arguments must throw TypeError assert_equals: Unexpected exception when evaluating object expected null but got object "TypeError: Cannot read properties of undefined (reading '0')" -FAIL CSSStyleDeclaration interface: sheet.cssRules[2].cssRules[0].style must inherit property "parentRule" with the proper type assert_equals: Unexpected exception when evaluating object expected null but got object "TypeError: Cannot read properties of undefined (reading '0')" -FAIL CSSStyleDeclaration interface: sheet.cssRules[2].cssRules[0].style must inherit property "cssFloat" with the proper type assert_equals: Unexpected exception when evaluating object expected null but got object "TypeError: Cannot read properties of undefined (reading '0')" -PASS CSSStyleDeclaration must be primary interface of style_element.style -PASS Stringification of style_element.style -PASS CSSStyleDeclaration interface: style_element.style must inherit property "cssText" with the proper type -PASS CSSStyleDeclaration interface: style_element.style must inherit property "length" with the proper type -PASS CSSStyleDeclaration interface: style_element.style must inherit property "item(unsigned long)" with the proper type -PASS CSSStyleDeclaration interface: calling item(unsigned long) on style_element.style with too few arguments must throw TypeError -PASS CSSStyleDeclaration interface: style_element.style must inherit property "getPropertyValue(CSSOMString)" with the proper type -PASS CSSStyleDeclaration interface: calling getPropertyValue(CSSOMString) on style_element.style with too few arguments must throw TypeError -PASS CSSStyleDeclaration interface: style_element.style must inherit property "getPropertyPriority(CSSOMString)" with the proper type -PASS CSSStyleDeclaration interface: calling getPropertyPriority(CSSOMString) on style_element.style with too few arguments must throw TypeError -PASS CSSStyleDeclaration interface: style_element.style must inherit property "setProperty(CSSOMString, CSSOMString, optional CSSOMString)" with the proper type -PASS CSSStyleDeclaration interface: calling setProperty(CSSOMString, CSSOMString, optional CSSOMString) on style_element.style with too few arguments must throw TypeError -PASS CSSStyleDeclaration interface: style_element.style must inherit property "removeProperty(CSSOMString)" with the proper type -PASS CSSStyleDeclaration interface: calling removeProperty(CSSOMString) on style_element.style with too few arguments must throw TypeError -PASS CSSStyleDeclaration interface: style_element.style must inherit property "parentRule" with the proper type -PASS CSSStyleDeclaration interface: style_element.style must inherit property "cssFloat" with the proper type -PASS CSSStyleDeclaration must be primary interface of svg_element.style -PASS Stringification of svg_element.style -PASS CSSStyleDeclaration interface: svg_element.style must inherit property "cssText" with the proper type -PASS CSSStyleDeclaration interface: svg_element.style must inherit property "length" with the proper type -PASS CSSStyleDeclaration interface: svg_element.style must inherit property "item(unsigned long)" with the proper type -PASS CSSStyleDeclaration interface: calling item(unsigned long) on svg_element.style with too few arguments must throw TypeError -PASS CSSStyleDeclaration interface: svg_element.style must inherit property "getPropertyValue(CSSOMString)" with the proper type -PASS CSSStyleDeclaration interface: calling getPropertyValue(CSSOMString) on svg_element.style with too few arguments must throw TypeError -PASS CSSStyleDeclaration interface: svg_element.style must inherit property "getPropertyPriority(CSSOMString)" with the proper type -PASS CSSStyleDeclaration interface: calling getPropertyPriority(CSSOMString) on svg_element.style with too few arguments must throw TypeError -PASS CSSStyleDeclaration interface: svg_element.style must inherit property "setProperty(CSSOMString, CSSOMString, optional CSSOMString)" with the proper type -PASS CSSStyleDeclaration interface: calling setProperty(CSSOMString, CSSOMString, optional CSSOMString) on svg_element.style with too few arguments must throw TypeError -PASS CSSStyleDeclaration interface: svg_element.style must inherit property "removeProperty(CSSOMString)" with the proper type -PASS CSSStyleDeclaration interface: calling removeProperty(CSSOMString) on svg_element.style with too few arguments must throw TypeError -PASS CSSStyleDeclaration interface: svg_element.style must inherit property "parentRule" with the proper type -PASS CSSStyleDeclaration interface: svg_element.style must inherit property "cssFloat" with the proper type -PASS CSSStyleDeclaration must be primary interface of getComputedStyle(svg_element) -PASS Stringification of getComputedStyle(svg_element) -PASS CSSStyleDeclaration interface: getComputedStyle(svg_element) must inherit property "cssText" with the proper type -PASS CSSStyleDeclaration interface: getComputedStyle(svg_element) must inherit property "length" with the proper type -PASS CSSStyleDeclaration interface: getComputedStyle(svg_element) must inherit property "item(unsigned long)" with the proper type -PASS CSSStyleDeclaration interface: calling item(unsigned long) on getComputedStyle(svg_element) with too few arguments must throw TypeError -PASS CSSStyleDeclaration interface: getComputedStyle(svg_element) must inherit property "getPropertyValue(CSSOMString)" with the proper type -PASS CSSStyleDeclaration interface: calling getPropertyValue(CSSOMString) on getComputedStyle(svg_element) with too few arguments must throw TypeError -PASS CSSStyleDeclaration interface: getComputedStyle(svg_element) must inherit property "getPropertyPriority(CSSOMString)" with the proper type -PASS CSSStyleDeclaration interface: calling getPropertyPriority(CSSOMString) on getComputedStyle(svg_element) with too few arguments must throw TypeError -PASS CSSStyleDeclaration interface: getComputedStyle(svg_element) must inherit property "setProperty(CSSOMString, CSSOMString, optional CSSOMString)" with the proper type -PASS CSSStyleDeclaration interface: calling setProperty(CSSOMString, CSSOMString, optional CSSOMString) on getComputedStyle(svg_element) with too few arguments must throw TypeError -PASS CSSStyleDeclaration interface: getComputedStyle(svg_element) must inherit property "removeProperty(CSSOMString)" with the proper type -PASS CSSStyleDeclaration interface: calling removeProperty(CSSOMString) on getComputedStyle(svg_element) with too few arguments must throw TypeError -PASS CSSStyleDeclaration interface: getComputedStyle(svg_element) must inherit property "parentRule" with the proper type -PASS CSSStyleDeclaration interface: getComputedStyle(svg_element) must inherit property "cssFloat" with the proper type -PASS CSS namespace: extended attributes -PASS CSS namespace: property descriptor -PASS CSS namespace: [[Extensible]] is true -PASS CSS namespace: [[Prototype]] is Object.prototype -PASS CSS namespace: typeof is "object" -PASS CSS namespace: has no length property -PASS CSS namespace: has no name property -PASS CSS namespace: operation escape(CSSOMString) -PASS SVGElement interface: attribute style -PASS SVGElement interface: svg_element must inherit property "style" with the proper type -PASS SVGStyleElement interface: attribute sheet -PASS HTMLElement interface: attribute style -PASS HTMLElement interface: style_element must inherit property "style" with the proper type -PASS HTMLElement interface: document.createElement("unknownelement") must inherit property "style" with the proper type -PASS HTMLLinkElement interface: attribute sheet -PASS HTMLStyleElement interface: attribute sheet -PASS Window interface: operation getComputedStyle(Element, optional CSSOMString?) -PASS Window interface: window must inherit property "getComputedStyle(Element, optional CSSOMString?)" with the proper type -PASS Window interface: calling getComputedStyle(Element, optional CSSOMString?) on window with too few arguments must throw TypeError -PASS Document interface: attribute styleSheets -PASS Document interface: attribute adoptedStyleSheets -PASS Document interface: document must inherit property "styleSheets" with the proper type -PASS Document interface: document must inherit property "adoptedStyleSheets" with the proper type -PASS Document interface: new Document() must inherit property "styleSheets" with the proper type -PASS Document interface: new Document() must inherit property "adoptedStyleSheets" with the proper type -PASS ShadowRoot interface: attribute styleSheets -PASS ShadowRoot interface: attribute adoptedStyleSheets -PASS ProcessingInstruction interface: attribute sheet -PASS ProcessingInstruction interface: xmlss_pi must inherit property "sheet" with the proper type -PASS MathMLElement interface: attribute style -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/filter-effects/backdrop-filters-brightness-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/filter-effects/backdrop-filters-brightness-expected.png deleted file mode 100644 index e69de29..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/filter-effects/backdrop-filters-brightness-expected.png +++ /dev/null
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/filter-effects/backdrop-filters-invert-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/filter-effects/backdrop-filters-invert-expected.png deleted file mode 100644 index e69de29..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/filter-effects/backdrop-filters-invert-expected.png +++ /dev/null
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/filter-effects/filtered-inline-applies-to-float-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/filter-effects/filtered-inline-applies-to-float-expected.png deleted file mode 100644 index d6ae2743..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/filter-effects/filtered-inline-applies-to-float-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-horiz-002-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-horiz-002-expected.png deleted file mode 100644 index a2ff5d8..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-align-self-horiz-002-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/vendor-imports/mozilla/mozilla-central-reftests/ib-split/emptyspan-1-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/vendor-imports/mozilla/mozilla-central-reftests/ib-split/emptyspan-1-expected.png deleted file mode 100644 index c70cd3d..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/vendor-imports/mozilla/mozilla-central-reftests/ib-split/emptyspan-1-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/vendor-imports/mozilla/mozilla-central-reftests/ib-split/emptyspan-4-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/vendor-imports/mozilla/mozilla-central-reftests/ib-split/emptyspan-4-expected.png deleted file mode 100644 index e24e9ccb..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/vendor-imports/mozilla/mozilla-central-reftests/ib-split/emptyspan-4-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/vendor-imports/mozilla/mozilla-central-reftests/ib-split/remove-from-split-inline-6-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/vendor-imports/mozilla/mozilla-central-reftests/ib-split/remove-from-split-inline-6-expected.png deleted file mode 100644 index a9ed8b77..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/vendor-imports/mozilla/mozilla-central-reftests/ib-split/remove-from-split-inline-6-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/vendor-imports/mozilla/mozilla-central-reftests/ib-split/split-inner-inline-2-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/vendor-imports/mozilla/mozilla-central-reftests/ib-split/split-inner-inline-2-expected.png deleted file mode 100644 index b8cd592..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/vendor-imports/mozilla/mozilla-central-reftests/ib-split/split-inner-inline-2-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-003-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-003-expected.png deleted file mode 100644 index c0f0136..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-003-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-004-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-004-expected.png deleted file mode 100644 index 9e453409..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-004-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-042-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-042-expected.png deleted file mode 100644 index fb5e1a1..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-042-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-044-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-044-expected.png deleted file mode 100644 index fb5e1a1..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-044-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-050-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-050-expected.png deleted file mode 100644 index d95ce2d..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-050-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-055-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-055-expected.png deleted file mode 100644 index 1ce195e..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-055-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-content-box-border-radius-002-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-content-box-border-radius-002-expected.png deleted file mode 100644 index de4ae06..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-content-box-border-radius-002-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-038-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-038-expected.png deleted file mode 100644 index 14d80bd..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-038-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-039-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-039-expected.png deleted file mode 100644 index 012d5ca7..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-039-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-024-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-024-expected.png deleted file mode 100644 index 41ca0b55..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-024-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-003-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-003-expected.png deleted file mode 100644 index d1afd75..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-003-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-004-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-004-expected.png deleted file mode 100644 index 93ab14a..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-004-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-008-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-008-expected.png deleted file mode 100644 index c5642d9..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-008-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-padding-box-border-radius-002-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-padding-box-border-radius-002-expected.png deleted file mode 100644 index 63f2f3c..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-padding-box-border-radius-002-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/vendor-imports/mozilla/mozilla-central-reftests/sizing/block-size-with-min-or-max-content-1a-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/vendor-imports/mozilla/mozilla-central-reftests/sizing/block-size-with-min-or-max-content-1a-expected.png deleted file mode 100644 index 9683213..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/css/vendor-imports/mozilla/mozilla-central-reftests/sizing/block-size-with-min-or-max-content-1a-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/editing/other/insert-paragraph-in-void-element.tentative-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/editing/other/insert-paragraph-in-void-element.tentative-expected.txt deleted file mode 100644 index 58f84c9..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/editing/other/insert-paragraph-in-void-element.tentative-expected.txt +++ /dev/null
@@ -1,58 +0,0 @@ -This is a testharness.js-based test. -Found 54 tests; 32 PASS, 22 FAIL, 0 TIMEOUT, 0 NOTRUN. -PASS Inserting paragraph when selection is collapsed in <br> in <div> which is only child -PASS Inserting paragraph when selection is collapsed in <br> which follows a text node in <div> -PASS Inserting paragraph when selection is collapsed in <br> which is followed by a text node in <div> -FAIL Inserting paragraph when selection is collapsed in <embed> in <div> which is only child assert_in_array: The paragraph should be inserted before the <embed> element value "<div><embed></div>" not in array ["<div><br></div><div><embed></div>", "<div><br></div><div><embed><br></div>"] -FAIL Inserting paragraph when selection is collapsed in <embed> which follows a text node in <div> assert_in_array: The paragraph should be split before the <embed> element value "<div>abc<embed></div><div><br></div>" not in array ["<div>abc</div><div><embed></div>", "<div>abc<br></div><div><embed></div>", "<div>abc</div><div><embed><br></div>", "<div>abc<br></div><div><embed><br></div>"] -PASS Inserting paragraph when selection is collapsed in <embed> which is followed by a text node in <div> -FAIL Inserting paragraph when selection is collapsed in <hr> in <div> which is only child assert_in_array: The paragraph should be inserted before the <hr> element value "<div><br><hr></div>" not in array ["<div><br></div><div><hr></div>", "<div><br></div><div><hr><br></div>"] -FAIL Inserting paragraph when selection is collapsed in <hr> which follows a text node in <div> assert_in_array: The paragraph should be split before the <hr> element value "<div>abc<br><br><hr></div>" not in array ["<div>abc</div><div><hr></div>", "<div>abc<br></div><div><hr></div>", "<div>abc</div><div><hr><br></div>", "<div>abc<br></div><div><hr><br></div>"] -FAIL Inserting paragraph when selection is collapsed in <hr> which is followed by a text node in <div> assert_in_array: The paragraph should be inserted before the <hr> element value "<div><br><hr>abc</div>" not in array ["<div><br></div><div><hr>abc</div>", "<div><br></div><div><hr>abc<br></div>"] -PASS Inserting paragraph when selection is collapsed in <img> in <div> which is only child -PASS Inserting paragraph when selection is collapsed in <img> which follows a text node in <div> -PASS Inserting paragraph when selection is collapsed in <img> which is followed by a text node in <div> -PASS Inserting paragraph when selection is collapsed in <input> in <div> which is only child -PASS Inserting paragraph when selection is collapsed in <input> which follows a text node in <div> -PASS Inserting paragraph when selection is collapsed in <input> which is followed by a text node in <div> -FAIL Inserting paragraph when selection is collapsed in <wbr> in <div> which is only child assert_in_array: The paragraph should be inserted before the <wbr> element value "<div><wbr></div>" not in array ["<div><br></div><div><wbr></div>", "<div><br></div><div><wbr><br></div>"] -FAIL Inserting paragraph when selection is collapsed in <wbr> which follows a text node in <div> assert_in_array: The paragraph should be split before the <wbr> element value "<div>abc<wbr></div><div><br></div>" not in array ["<div>abc</div><div><wbr></div>", "<div>abc<br></div><div><wbr></div>", "<div>abc</div><div><wbr><br></div>", "<div>abc<br></div><div><wbr><br></div>"] -PASS Inserting paragraph when selection is collapsed in <wbr> which is followed by a text node in <div> -PASS Inserting paragraph when selection is collapsed in <br> in <h1> which is only child -PASS Inserting paragraph when selection is collapsed in <br> which follows a text node in <h1> -PASS Inserting paragraph when selection is collapsed in <br> which is followed by a text node in <h1> -FAIL Inserting paragraph when selection is collapsed in <embed> in <h1> which is only child assert_in_array: The paragraph should be inserted before the <embed> element value "<h1><embed></h1>" not in array ["<h1><br></h1><div><embed></div>", "<h1><br></h1><div><embed><br></div>"] -FAIL Inserting paragraph when selection is collapsed in <embed> which follows a text node in <h1> assert_in_array: The paragraph should be split before the <embed> element value "<h1>abc<embed></h1><div><br></div>" not in array ["<h1>abc</h1><div><embed></div>", "<h1>abc<br></h1><div><embed></div>", "<h1>abc</h1><div><embed><br></div>", "<h1>abc<br></h1><div><embed><br></div>"] -PASS Inserting paragraph when selection is collapsed in <embed> which is followed by a text node in <h1> -FAIL Inserting paragraph when selection is collapsed in <hr> in <h1> which is only child assert_in_array: The paragraph should be inserted before the <hr> element value "<h1><br><hr></h1>" not in array ["<h1><br></h1><h1><hr></h1>", "<h1><br></h1><h1><hr><br></h1>"] -FAIL Inserting paragraph when selection is collapsed in <hr> which follows a text node in <h1> assert_in_array: The paragraph should be split before the <hr> element value "<h1>abc<br><br><hr></h1>" not in array ["<h1>abc</h1><h1><hr></h1>", "<h1>abc<br></h1><h1><hr></h1>", "<h1>abc</h1><h1><hr><br></h1>", "<h1>abc<br></h1><h1><hr><br></h1>"] -FAIL Inserting paragraph when selection is collapsed in <hr> which is followed by a text node in <h1> assert_in_array: The paragraph should be inserted before the <hr> element value "<h1><br><hr>abc</h1>" not in array ["<h1><br></h1><h1><hr>abc</h1>", "<h1><br></h1><h1><hr>abc<br></h1>"] -PASS Inserting paragraph when selection is collapsed in <img> in <h1> which is only child -PASS Inserting paragraph when selection is collapsed in <img> which follows a text node in <h1> -PASS Inserting paragraph when selection is collapsed in <img> which is followed by a text node in <h1> -PASS Inserting paragraph when selection is collapsed in <input> in <h1> which is only child -PASS Inserting paragraph when selection is collapsed in <input> which follows a text node in <h1> -PASS Inserting paragraph when selection is collapsed in <input> which is followed by a text node in <h1> -FAIL Inserting paragraph when selection is collapsed in <wbr> in <h1> which is only child assert_in_array: The paragraph should be inserted before the <wbr> element value "<h1><wbr></h1>" not in array ["<h1><br></h1><div><wbr></div>", "<h1><br></h1><div><wbr><br></div>"] -FAIL Inserting paragraph when selection is collapsed in <wbr> which follows a text node in <h1> assert_in_array: The paragraph should be split before the <wbr> element value "<h1>abc<wbr></h1><div><br></div>" not in array ["<h1>abc</h1><div><wbr></div>", "<h1>abc<br></h1><div><wbr></div>", "<h1>abc</h1><div><wbr><br></div>", "<h1>abc<br></h1><div><wbr><br></div>"] -PASS Inserting paragraph when selection is collapsed in <wbr> which is followed by a text node in <h1> -FAIL Inserting paragraph when selection is collapsed in <br> in <li> which is only child assert_in_array: The paragraph should be inserted before the <br> element value "<div><br></div>" not in array "<ol><li><br></li><li><br></li></ol>" -PASS Inserting paragraph when selection is collapsed in <br> which follows a text node in <li> -PASS Inserting paragraph when selection is collapsed in <br> which is followed by a text node in <li> -FAIL Inserting paragraph when selection is collapsed in <embed> in <li> which is only child assert_in_array: The paragraph should be inserted before the <embed> element value "<div><br></div>" not in array ["<ol><li><br></li><li><embed></li></ol>", "<ol><li><br></li><li><embed><br></li></ol>"] -FAIL Inserting paragraph when selection is collapsed in <embed> which follows a text node in <li> assert_in_array: The paragraph should be split before the <embed> element value "<ol><li>abc<embed></li><li><br></li></ol>" not in array ["<ol><li>abc</li><li><embed></li></ol>", "<ol><li>abc<br></li><li><embed></li></ol>", "<ol><li>abc</li><li><embed><br></li></ol>", "<ol><li>abc<br></li><li><embed><br></li></ol>"] -PASS Inserting paragraph when selection is collapsed in <embed> which is followed by a text node in <li> -FAIL Inserting paragraph when selection is collapsed in <hr> in <li> which is only child assert_in_array: The paragraph should be inserted before the <hr> element value "<ol><li><br><hr></li></ol>" not in array ["<ol><li><br></li><li><hr></li></ol>", "<ol><li><br></li><li><hr><br></li></ol>"] -FAIL Inserting paragraph when selection is collapsed in <hr> which follows a text node in <li> assert_in_array: The paragraph should be split before the <hr> element value "<ol><li>abc<br><br><hr></li></ol>" not in array ["<ol><li>abc</li><li><hr></li></ol>", "<ol><li>abc<br></li><li><hr></li></ol>", "<ol><li>abc</li><li><hr><br></li></ol>", "<ol><li>abc<br></li><li><hr><br></li></ol>"] -FAIL Inserting paragraph when selection is collapsed in <hr> which is followed by a text node in <li> assert_in_array: The paragraph should be inserted before the <hr> element value "<ol><li><br><hr>abc</li></ol>" not in array ["<ol><li><br></li><li><hr>abc</li></ol>", "<ol><li><br></li><li><hr>abc<br></li></ol>"] -PASS Inserting paragraph when selection is collapsed in <img> in <li> which is only child -PASS Inserting paragraph when selection is collapsed in <img> which follows a text node in <li> -PASS Inserting paragraph when selection is collapsed in <img> which is followed by a text node in <li> -PASS Inserting paragraph when selection is collapsed in <input> in <li> which is only child -PASS Inserting paragraph when selection is collapsed in <input> which follows a text node in <li> -PASS Inserting paragraph when selection is collapsed in <input> which is followed by a text node in <li> -FAIL Inserting paragraph when selection is collapsed in <wbr> in <li> which is only child assert_in_array: The paragraph should be inserted before the <wbr> element value "<div><br></div>" not in array ["<ol><li><br></li><li><wbr></li></ol>", "<ol><li><br></li><li><wbr><br></li></ol>"] -FAIL Inserting paragraph when selection is collapsed in <wbr> which follows a text node in <li> assert_in_array: The paragraph should be split before the <wbr> element value "<ol><li>abc<wbr></li><li><br></li></ol>" not in array ["<ol><li>abc</li><li><wbr></li></ol>", "<ol><li>abc<br></li><li><wbr></li></ol>", "<ol><li>abc</li><li><wbr><br></li></ol>", "<ol><li>abc<br></li><li><wbr><br></li></ol>"] -PASS Inserting paragraph when selection is collapsed in <wbr> which is followed by a text node in <li> -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/editing/run/delete_5001-6000-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/editing/run/delete_5001-6000-expected.txt deleted file mode 100644 index 0a39854..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/editing/run/delete_5001-6000-expected.txt +++ /dev/null
@@ -1,1004 +0,0 @@ -This is a testharness.js-based test. -Found 1000 tests; 981 PASS, 19 FAIL, 0 TIMEOUT, 0 NOTRUN. -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p>foo[bar<div>baz]quz</div>" queryCommandState("delete") before -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p>foo[bar<div>baz]quz</div>" queryCommandValue("delete") before -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p>foo[bar<div>baz]quz</div>" queryCommandIndeterm("delete") after -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p>foo[bar<div>baz]quz</div>" queryCommandState("delete") after -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p>foo[bar<div>baz]quz</div>" queryCommandValue("delete") after -PASS [["delete",""]] "<p>foo[bar<h1>baz]quz</h1>": execCommand("delete", false, "") return value -PASS [["delete",""]] "<p>foo[bar<h1>baz]quz</h1>" checks for modifications to non-editable content -PASS [["delete",""]] "<p>foo[bar<h1>baz]quz</h1>" compare innerHTML -PASS [["delete",""]] "<p>foo[bar<h1>baz]quz</h1>" queryCommandIndeterm("delete") before -PASS [["delete",""]] "<p>foo[bar<h1>baz]quz</h1>" queryCommandState("delete") before -PASS [["delete",""]] "<p>foo[bar<h1>baz]quz</h1>" queryCommandValue("delete") before -PASS [["delete",""]] "<p>foo[bar<h1>baz]quz</h1>" queryCommandIndeterm("delete") after -PASS [["delete",""]] "<p>foo[bar<h1>baz]quz</h1>" queryCommandState("delete") after -PASS [["delete",""]] "<p>foo[bar<h1>baz]quz</h1>" queryCommandValue("delete") after -PASS [["defaultparagraphseparator","div"],["delete",""]] "<div>foo[bar</div><p>baz]quz": execCommand("defaultparagraphseparator", false, "div") return value -PASS [["defaultparagraphseparator","div"],["delete",""]] "<div>foo[bar</div><p>baz]quz": execCommand("delete", false, "") return value -PASS [["defaultparagraphseparator","div"],["delete",""]] "<div>foo[bar</div><p>baz]quz" checks for modifications to non-editable content -PASS [["defaultparagraphseparator","div"],["delete",""]] "<div>foo[bar</div><p>baz]quz" compare innerHTML -PASS [["defaultparagraphseparator","div"],["delete",""]] "<div>foo[bar</div><p>baz]quz" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["delete",""]] "<div>foo[bar</div><p>baz]quz" queryCommandState("defaultparagraphseparator") before -FAIL [["defaultparagraphseparator","div"],["delete",""]] "<div>foo[bar</div><p>baz]quz" queryCommandValue("defaultparagraphseparator") before assert_equals: Wrong result returned expected "p" but got "div" -PASS [["defaultparagraphseparator","div"],["delete",""]] "<div>foo[bar</div><p>baz]quz" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["delete",""]] "<div>foo[bar</div><p>baz]quz" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["delete",""]] "<div>foo[bar</div><p>baz]quz" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["delete",""]] "<div>foo[bar</div><p>baz]quz" queryCommandIndeterm("delete") before -PASS [["defaultparagraphseparator","div"],["delete",""]] "<div>foo[bar</div><p>baz]quz" queryCommandState("delete") before -PASS [["defaultparagraphseparator","div"],["delete",""]] "<div>foo[bar</div><p>baz]quz" queryCommandValue("delete") before -PASS [["defaultparagraphseparator","div"],["delete",""]] "<div>foo[bar</div><p>baz]quz" queryCommandIndeterm("delete") after -PASS [["defaultparagraphseparator","div"],["delete",""]] "<div>foo[bar</div><p>baz]quz" queryCommandState("delete") after -PASS [["defaultparagraphseparator","div"],["delete",""]] "<div>foo[bar</div><p>baz]quz" queryCommandValue("delete") after -PASS [["defaultparagraphseparator","p"],["delete",""]] "<div>foo[bar</div><p>baz]quz": execCommand("defaultparagraphseparator", false, "p") return value -PASS [["defaultparagraphseparator","p"],["delete",""]] "<div>foo[bar</div><p>baz]quz": execCommand("delete", false, "") return value -PASS [["defaultparagraphseparator","p"],["delete",""]] "<div>foo[bar</div><p>baz]quz" checks for modifications to non-editable content -PASS [["defaultparagraphseparator","p"],["delete",""]] "<div>foo[bar</div><p>baz]quz" compare innerHTML -PASS [["defaultparagraphseparator","p"],["delete",""]] "<div>foo[bar</div><p>baz]quz" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["delete",""]] "<div>foo[bar</div><p>baz]quz" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["delete",""]] "<div>foo[bar</div><p>baz]quz" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["delete",""]] "<div>foo[bar</div><p>baz]quz" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["delete",""]] "<div>foo[bar</div><p>baz]quz" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["delete",""]] "<div>foo[bar</div><p>baz]quz" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["delete",""]] "<div>foo[bar</div><p>baz]quz" queryCommandIndeterm("delete") before -PASS [["defaultparagraphseparator","p"],["delete",""]] "<div>foo[bar</div><p>baz]quz" queryCommandState("delete") before -PASS [["defaultparagraphseparator","p"],["delete",""]] "<div>foo[bar</div><p>baz]quz" queryCommandValue("delete") before -PASS [["defaultparagraphseparator","p"],["delete",""]] "<div>foo[bar</div><p>baz]quz" queryCommandIndeterm("delete") after -PASS [["defaultparagraphseparator","p"],["delete",""]] "<div>foo[bar</div><p>baz]quz" queryCommandState("delete") after -PASS [["defaultparagraphseparator","p"],["delete",""]] "<div>foo[bar</div><p>baz]quz" queryCommandValue("delete") after -PASS [["delete",""]] "<blockquote>foo[bar</blockquote><pre>baz]quz</pre>": execCommand("delete", false, "") return value -PASS [["delete",""]] "<blockquote>foo[bar</blockquote><pre>baz]quz</pre>" checks for modifications to non-editable content -PASS [["delete",""]] "<blockquote>foo[bar</blockquote><pre>baz]quz</pre>" compare innerHTML -PASS [["delete",""]] "<blockquote>foo[bar</blockquote><pre>baz]quz</pre>" queryCommandIndeterm("delete") before -PASS [["delete",""]] "<blockquote>foo[bar</blockquote><pre>baz]quz</pre>" queryCommandState("delete") before -PASS [["delete",""]] "<blockquote>foo[bar</blockquote><pre>baz]quz</pre>" queryCommandValue("delete") before -PASS [["delete",""]] "<blockquote>foo[bar</blockquote><pre>baz]quz</pre>" queryCommandIndeterm("delete") after -PASS [["delete",""]] "<blockquote>foo[bar</blockquote><pre>baz]quz</pre>" queryCommandState("delete") after -PASS [["delete",""]] "<blockquote>foo[bar</blockquote><pre>baz]quz</pre>" queryCommandValue("delete") after -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p><b>foo[bar</b><p>baz]quz": execCommand("defaultparagraphseparator", false, "div") return value -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p><b>foo[bar</b><p>baz]quz": execCommand("delete", false, "") return value -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p><b>foo[bar</b><p>baz]quz" checks for modifications to non-editable content -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p><b>foo[bar</b><p>baz]quz" compare innerHTML -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p><b>foo[bar</b><p>baz]quz" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p><b>foo[bar</b><p>baz]quz" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p><b>foo[bar</b><p>baz]quz" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p><b>foo[bar</b><p>baz]quz" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p><b>foo[bar</b><p>baz]quz" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p><b>foo[bar</b><p>baz]quz" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p><b>foo[bar</b><p>baz]quz" queryCommandIndeterm("delete") before -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p><b>foo[bar</b><p>baz]quz" queryCommandState("delete") before -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p><b>foo[bar</b><p>baz]quz" queryCommandValue("delete") before -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p><b>foo[bar</b><p>baz]quz" queryCommandIndeterm("delete") after -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p><b>foo[bar</b><p>baz]quz" queryCommandState("delete") after -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p><b>foo[bar</b><p>baz]quz" queryCommandValue("delete") after -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p><b>foo[bar</b><p>baz]quz": execCommand("defaultparagraphseparator", false, "p") return value -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p><b>foo[bar</b><p>baz]quz": execCommand("delete", false, "") return value -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p><b>foo[bar</b><p>baz]quz" checks for modifications to non-editable content -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p><b>foo[bar</b><p>baz]quz" compare innerHTML -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p><b>foo[bar</b><p>baz]quz" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p><b>foo[bar</b><p>baz]quz" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p><b>foo[bar</b><p>baz]quz" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p><b>foo[bar</b><p>baz]quz" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p><b>foo[bar</b><p>baz]quz" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p><b>foo[bar</b><p>baz]quz" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p><b>foo[bar</b><p>baz]quz" queryCommandIndeterm("delete") before -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p><b>foo[bar</b><p>baz]quz" queryCommandState("delete") before -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p><b>foo[bar</b><p>baz]quz" queryCommandValue("delete") before -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p><b>foo[bar</b><p>baz]quz" queryCommandIndeterm("delete") after -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p><b>foo[bar</b><p>baz]quz" queryCommandState("delete") after -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p><b>foo[bar</b><p>baz]quz" queryCommandValue("delete") after -PASS [["defaultparagraphseparator","div"],["delete",""]] "<div><p>foo[bar</div><p>baz]quz": execCommand("defaultparagraphseparator", false, "div") return value -PASS [["defaultparagraphseparator","div"],["delete",""]] "<div><p>foo[bar</div><p>baz]quz": execCommand("delete", false, "") return value -PASS [["defaultparagraphseparator","div"],["delete",""]] "<div><p>foo[bar</div><p>baz]quz" checks for modifications to non-editable content -PASS [["defaultparagraphseparator","div"],["delete",""]] "<div><p>foo[bar</div><p>baz]quz" compare innerHTML -PASS [["defaultparagraphseparator","div"],["delete",""]] "<div><p>foo[bar</div><p>baz]quz" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["delete",""]] "<div><p>foo[bar</div><p>baz]quz" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["delete",""]] "<div><p>foo[bar</div><p>baz]quz" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["delete",""]] "<div><p>foo[bar</div><p>baz]quz" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["delete",""]] "<div><p>foo[bar</div><p>baz]quz" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["delete",""]] "<div><p>foo[bar</div><p>baz]quz" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["delete",""]] "<div><p>foo[bar</div><p>baz]quz" queryCommandIndeterm("delete") before -PASS [["defaultparagraphseparator","div"],["delete",""]] "<div><p>foo[bar</div><p>baz]quz" queryCommandState("delete") before -PASS [["defaultparagraphseparator","div"],["delete",""]] "<div><p>foo[bar</div><p>baz]quz" queryCommandValue("delete") before -PASS [["defaultparagraphseparator","div"],["delete",""]] "<div><p>foo[bar</div><p>baz]quz" queryCommandIndeterm("delete") after -PASS [["defaultparagraphseparator","div"],["delete",""]] "<div><p>foo[bar</div><p>baz]quz" queryCommandState("delete") after -PASS [["defaultparagraphseparator","div"],["delete",""]] "<div><p>foo[bar</div><p>baz]quz" queryCommandValue("delete") after -PASS [["defaultparagraphseparator","p"],["delete",""]] "<div><p>foo[bar</div><p>baz]quz": execCommand("defaultparagraphseparator", false, "p") return value -PASS [["defaultparagraphseparator","p"],["delete",""]] "<div><p>foo[bar</div><p>baz]quz": execCommand("delete", false, "") return value -PASS [["defaultparagraphseparator","p"],["delete",""]] "<div><p>foo[bar</div><p>baz]quz" checks for modifications to non-editable content -PASS [["defaultparagraphseparator","p"],["delete",""]] "<div><p>foo[bar</div><p>baz]quz" compare innerHTML -PASS [["defaultparagraphseparator","p"],["delete",""]] "<div><p>foo[bar</div><p>baz]quz" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["delete",""]] "<div><p>foo[bar</div><p>baz]quz" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["delete",""]] "<div><p>foo[bar</div><p>baz]quz" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["delete",""]] "<div><p>foo[bar</div><p>baz]quz" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["delete",""]] "<div><p>foo[bar</div><p>baz]quz" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["delete",""]] "<div><p>foo[bar</div><p>baz]quz" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["delete",""]] "<div><p>foo[bar</div><p>baz]quz" queryCommandIndeterm("delete") before -PASS [["defaultparagraphseparator","p"],["delete",""]] "<div><p>foo[bar</div><p>baz]quz" queryCommandState("delete") before -PASS [["defaultparagraphseparator","p"],["delete",""]] "<div><p>foo[bar</div><p>baz]quz" queryCommandValue("delete") before -PASS [["defaultparagraphseparator","p"],["delete",""]] "<div><p>foo[bar</div><p>baz]quz" queryCommandIndeterm("delete") after -PASS [["defaultparagraphseparator","p"],["delete",""]] "<div><p>foo[bar</div><p>baz]quz" queryCommandState("delete") after -PASS [["defaultparagraphseparator","p"],["delete",""]] "<div><p>foo[bar</div><p>baz]quz" queryCommandValue("delete") after -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p>foo[bar<blockquote><p>baz]quz<p>qoz</blockquote": execCommand("defaultparagraphseparator", false, "div") return value -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p>foo[bar<blockquote><p>baz]quz<p>qoz</blockquote": execCommand("delete", false, "") return value -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p>foo[bar<blockquote><p>baz]quz<p>qoz</blockquote" checks for modifications to non-editable content -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p>foo[bar<blockquote><p>baz]quz<p>qoz</blockquote" compare innerHTML -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p>foo[bar<blockquote><p>baz]quz<p>qoz</blockquote" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p>foo[bar<blockquote><p>baz]quz<p>qoz</blockquote" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p>foo[bar<blockquote><p>baz]quz<p>qoz</blockquote" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p>foo[bar<blockquote><p>baz]quz<p>qoz</blockquote" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p>foo[bar<blockquote><p>baz]quz<p>qoz</blockquote" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p>foo[bar<blockquote><p>baz]quz<p>qoz</blockquote" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p>foo[bar<blockquote><p>baz]quz<p>qoz</blockquote" queryCommandIndeterm("delete") before -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p>foo[bar<blockquote><p>baz]quz<p>qoz</blockquote" queryCommandState("delete") before -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p>foo[bar<blockquote><p>baz]quz<p>qoz</blockquote" queryCommandValue("delete") before -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p>foo[bar<blockquote><p>baz]quz<p>qoz</blockquote" queryCommandIndeterm("delete") after -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p>foo[bar<blockquote><p>baz]quz<p>qoz</blockquote" queryCommandState("delete") after -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p>foo[bar<blockquote><p>baz]quz<p>qoz</blockquote" queryCommandValue("delete") after -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p>foo[bar<blockquote><p>baz]quz<p>qoz</blockquote": execCommand("defaultparagraphseparator", false, "p") return value -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p>foo[bar<blockquote><p>baz]quz<p>qoz</blockquote": execCommand("delete", false, "") return value -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p>foo[bar<blockquote><p>baz]quz<p>qoz</blockquote" checks for modifications to non-editable content -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p>foo[bar<blockquote><p>baz]quz<p>qoz</blockquote" compare innerHTML -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p>foo[bar<blockquote><p>baz]quz<p>qoz</blockquote" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p>foo[bar<blockquote><p>baz]quz<p>qoz</blockquote" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p>foo[bar<blockquote><p>baz]quz<p>qoz</blockquote" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p>foo[bar<blockquote><p>baz]quz<p>qoz</blockquote" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p>foo[bar<blockquote><p>baz]quz<p>qoz</blockquote" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p>foo[bar<blockquote><p>baz]quz<p>qoz</blockquote" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p>foo[bar<blockquote><p>baz]quz<p>qoz</blockquote" queryCommandIndeterm("delete") before -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p>foo[bar<blockquote><p>baz]quz<p>qoz</blockquote" queryCommandState("delete") before -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p>foo[bar<blockquote><p>baz]quz<p>qoz</blockquote" queryCommandValue("delete") before -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p>foo[bar<blockquote><p>baz]quz<p>qoz</blockquote" queryCommandIndeterm("delete") after -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p>foo[bar<blockquote><p>baz]quz<p>qoz</blockquote" queryCommandState("delete") after -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p>foo[bar<blockquote><p>baz]quz<p>qoz</blockquote" queryCommandValue("delete") after -PASS [["stylewithcss","true"],["defaultparagraphseparator","div"],["delete",""]] "<p>foo[bar<p style=color:blue>baz]quz": execCommand("stylewithcss", false, "true") return value -PASS [["stylewithcss","true"],["defaultparagraphseparator","div"],["delete",""]] "<p>foo[bar<p style=color:blue>baz]quz": execCommand("defaultparagraphseparator", false, "div") return value -PASS [["stylewithcss","true"],["defaultparagraphseparator","div"],["delete",""]] "<p>foo[bar<p style=color:blue>baz]quz": execCommand("delete", false, "") return value -PASS [["stylewithcss","true"],["defaultparagraphseparator","div"],["delete",""]] "<p>foo[bar<p style=color:blue>baz]quz" checks for modifications to non-editable content -PASS [["stylewithcss","true"],["defaultparagraphseparator","div"],["delete",""]] "<p>foo[bar<p style=color:blue>baz]quz" compare innerHTML -PASS [["stylewithcss","true"],["defaultparagraphseparator","div"],["delete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandIndeterm("stylewithcss") before -FAIL [["stylewithcss","true"],["defaultparagraphseparator","div"],["delete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandState("stylewithcss") before assert_equals: Wrong result returned expected false but got true -PASS [["stylewithcss","true"],["defaultparagraphseparator","div"],["delete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandValue("stylewithcss") before -PASS [["stylewithcss","true"],["defaultparagraphseparator","div"],["delete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandIndeterm("stylewithcss") after -PASS [["stylewithcss","true"],["defaultparagraphseparator","div"],["delete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandState("stylewithcss") after -PASS [["stylewithcss","true"],["defaultparagraphseparator","div"],["delete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandValue("stylewithcss") after -PASS [["stylewithcss","true"],["defaultparagraphseparator","div"],["delete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["stylewithcss","true"],["defaultparagraphseparator","div"],["delete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandState("defaultparagraphseparator") before -PASS [["stylewithcss","true"],["defaultparagraphseparator","div"],["delete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandValue("defaultparagraphseparator") before -PASS [["stylewithcss","true"],["defaultparagraphseparator","div"],["delete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["stylewithcss","true"],["defaultparagraphseparator","div"],["delete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandState("defaultparagraphseparator") after -PASS [["stylewithcss","true"],["defaultparagraphseparator","div"],["delete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandValue("defaultparagraphseparator") after -PASS [["stylewithcss","true"],["defaultparagraphseparator","div"],["delete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandIndeterm("delete") before -PASS [["stylewithcss","true"],["defaultparagraphseparator","div"],["delete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandState("delete") before -PASS [["stylewithcss","true"],["defaultparagraphseparator","div"],["delete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandValue("delete") before -PASS [["stylewithcss","true"],["defaultparagraphseparator","div"],["delete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandIndeterm("delete") after -PASS [["stylewithcss","true"],["defaultparagraphseparator","div"],["delete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandState("delete") after -PASS [["stylewithcss","true"],["defaultparagraphseparator","div"],["delete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandValue("delete") after -PASS [["stylewithcss","false"],["defaultparagraphseparator","div"],["delete",""]] "<p>foo[bar<p style=color:blue>baz]quz": execCommand("stylewithcss", false, "false") return value -PASS [["stylewithcss","false"],["defaultparagraphseparator","div"],["delete",""]] "<p>foo[bar<p style=color:blue>baz]quz": execCommand("defaultparagraphseparator", false, "div") return value -PASS [["stylewithcss","false"],["defaultparagraphseparator","div"],["delete",""]] "<p>foo[bar<p style=color:blue>baz]quz": execCommand("delete", false, "") return value -PASS [["stylewithcss","false"],["defaultparagraphseparator","div"],["delete",""]] "<p>foo[bar<p style=color:blue>baz]quz" checks for modifications to non-editable content -FAIL [["stylewithcss","false"],["defaultparagraphseparator","div"],["delete",""]] "<p>foo[bar<p style=color:blue>baz]quz" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<p>foo<font color=\"#0000ff\">quz</font></p>" but got "<p>foo<span style=\"color:rgb(0, 0, 255)\">quz</span></p>" -PASS [["stylewithcss","false"],["defaultparagraphseparator","div"],["delete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandIndeterm("stylewithcss") before -PASS [["stylewithcss","false"],["defaultparagraphseparator","div"],["delete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandState("stylewithcss") before -PASS [["stylewithcss","false"],["defaultparagraphseparator","div"],["delete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandValue("stylewithcss") before -PASS [["stylewithcss","false"],["defaultparagraphseparator","div"],["delete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandIndeterm("stylewithcss") after -PASS [["stylewithcss","false"],["defaultparagraphseparator","div"],["delete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandState("stylewithcss") after -PASS [["stylewithcss","false"],["defaultparagraphseparator","div"],["delete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandValue("stylewithcss") after -PASS [["stylewithcss","false"],["defaultparagraphseparator","div"],["delete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["stylewithcss","false"],["defaultparagraphseparator","div"],["delete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandState("defaultparagraphseparator") before -PASS [["stylewithcss","false"],["defaultparagraphseparator","div"],["delete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandValue("defaultparagraphseparator") before -PASS [["stylewithcss","false"],["defaultparagraphseparator","div"],["delete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["stylewithcss","false"],["defaultparagraphseparator","div"],["delete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandState("defaultparagraphseparator") after -PASS [["stylewithcss","false"],["defaultparagraphseparator","div"],["delete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandValue("defaultparagraphseparator") after -PASS [["stylewithcss","false"],["defaultparagraphseparator","div"],["delete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandIndeterm("delete") before -PASS [["stylewithcss","false"],["defaultparagraphseparator","div"],["delete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandState("delete") before -PASS [["stylewithcss","false"],["defaultparagraphseparator","div"],["delete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandValue("delete") before -PASS [["stylewithcss","false"],["defaultparagraphseparator","div"],["delete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandIndeterm("delete") after -PASS [["stylewithcss","false"],["defaultparagraphseparator","div"],["delete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandState("delete") after -PASS [["stylewithcss","false"],["defaultparagraphseparator","div"],["delete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandValue("delete") after -PASS [["stylewithcss","true"],["defaultparagraphseparator","p"],["delete",""]] "<p>foo[bar<p style=color:blue>baz]quz": execCommand("stylewithcss", false, "true") return value -PASS [["stylewithcss","true"],["defaultparagraphseparator","p"],["delete",""]] "<p>foo[bar<p style=color:blue>baz]quz": execCommand("defaultparagraphseparator", false, "p") return value -PASS [["stylewithcss","true"],["defaultparagraphseparator","p"],["delete",""]] "<p>foo[bar<p style=color:blue>baz]quz": execCommand("delete", false, "") return value -PASS [["stylewithcss","true"],["defaultparagraphseparator","p"],["delete",""]] "<p>foo[bar<p style=color:blue>baz]quz" checks for modifications to non-editable content -PASS [["stylewithcss","true"],["defaultparagraphseparator","p"],["delete",""]] "<p>foo[bar<p style=color:blue>baz]quz" compare innerHTML -PASS [["stylewithcss","true"],["defaultparagraphseparator","p"],["delete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandIndeterm("stylewithcss") before -PASS [["stylewithcss","true"],["defaultparagraphseparator","p"],["delete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandState("stylewithcss") before -PASS [["stylewithcss","true"],["defaultparagraphseparator","p"],["delete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandValue("stylewithcss") before -PASS [["stylewithcss","true"],["defaultparagraphseparator","p"],["delete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandIndeterm("stylewithcss") after -PASS [["stylewithcss","true"],["defaultparagraphseparator","p"],["delete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandState("stylewithcss") after -PASS [["stylewithcss","true"],["defaultparagraphseparator","p"],["delete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandValue("stylewithcss") after -PASS [["stylewithcss","true"],["defaultparagraphseparator","p"],["delete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["stylewithcss","true"],["defaultparagraphseparator","p"],["delete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandState("defaultparagraphseparator") before -PASS [["stylewithcss","true"],["defaultparagraphseparator","p"],["delete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandValue("defaultparagraphseparator") before -PASS [["stylewithcss","true"],["defaultparagraphseparator","p"],["delete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["stylewithcss","true"],["defaultparagraphseparator","p"],["delete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandState("defaultparagraphseparator") after -PASS [["stylewithcss","true"],["defaultparagraphseparator","p"],["delete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandValue("defaultparagraphseparator") after -PASS [["stylewithcss","true"],["defaultparagraphseparator","p"],["delete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandIndeterm("delete") before -PASS [["stylewithcss","true"],["defaultparagraphseparator","p"],["delete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandState("delete") before -PASS [["stylewithcss","true"],["defaultparagraphseparator","p"],["delete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandValue("delete") before -PASS [["stylewithcss","true"],["defaultparagraphseparator","p"],["delete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandIndeterm("delete") after -PASS [["stylewithcss","true"],["defaultparagraphseparator","p"],["delete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandState("delete") after -PASS [["stylewithcss","true"],["defaultparagraphseparator","p"],["delete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandValue("delete") after -PASS [["stylewithcss","false"],["defaultparagraphseparator","p"],["delete",""]] "<p>foo[bar<p style=color:blue>baz]quz": execCommand("stylewithcss", false, "false") return value -PASS [["stylewithcss","false"],["defaultparagraphseparator","p"],["delete",""]] "<p>foo[bar<p style=color:blue>baz]quz": execCommand("defaultparagraphseparator", false, "p") return value -PASS [["stylewithcss","false"],["defaultparagraphseparator","p"],["delete",""]] "<p>foo[bar<p style=color:blue>baz]quz": execCommand("delete", false, "") return value -PASS [["stylewithcss","false"],["defaultparagraphseparator","p"],["delete",""]] "<p>foo[bar<p style=color:blue>baz]quz" checks for modifications to non-editable content -FAIL [["stylewithcss","false"],["defaultparagraphseparator","p"],["delete",""]] "<p>foo[bar<p style=color:blue>baz]quz" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<p>foo<font color=\"#0000ff\">quz</font></p>" but got "<p>foo<span style=\"color:rgb(0, 0, 255)\">quz</span></p>" -PASS [["stylewithcss","false"],["defaultparagraphseparator","p"],["delete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandIndeterm("stylewithcss") before -PASS [["stylewithcss","false"],["defaultparagraphseparator","p"],["delete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandState("stylewithcss") before -PASS [["stylewithcss","false"],["defaultparagraphseparator","p"],["delete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandValue("stylewithcss") before -PASS [["stylewithcss","false"],["defaultparagraphseparator","p"],["delete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandIndeterm("stylewithcss") after -PASS [["stylewithcss","false"],["defaultparagraphseparator","p"],["delete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandState("stylewithcss") after -PASS [["stylewithcss","false"],["defaultparagraphseparator","p"],["delete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandValue("stylewithcss") after -PASS [["stylewithcss","false"],["defaultparagraphseparator","p"],["delete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["stylewithcss","false"],["defaultparagraphseparator","p"],["delete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandState("defaultparagraphseparator") before -PASS [["stylewithcss","false"],["defaultparagraphseparator","p"],["delete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandValue("defaultparagraphseparator") before -PASS [["stylewithcss","false"],["defaultparagraphseparator","p"],["delete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["stylewithcss","false"],["defaultparagraphseparator","p"],["delete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandState("defaultparagraphseparator") after -PASS [["stylewithcss","false"],["defaultparagraphseparator","p"],["delete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandValue("defaultparagraphseparator") after -PASS [["stylewithcss","false"],["defaultparagraphseparator","p"],["delete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandIndeterm("delete") before -PASS [["stylewithcss","false"],["defaultparagraphseparator","p"],["delete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandState("delete") before -PASS [["stylewithcss","false"],["defaultparagraphseparator","p"],["delete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandValue("delete") before -PASS [["stylewithcss","false"],["defaultparagraphseparator","p"],["delete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandIndeterm("delete") after -PASS [["stylewithcss","false"],["defaultparagraphseparator","p"],["delete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandState("delete") after -PASS [["stylewithcss","false"],["defaultparagraphseparator","p"],["delete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandValue("delete") after -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p>foo[bar<p><b>baz]quz</b>": execCommand("defaultparagraphseparator", false, "div") return value -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p>foo[bar<p><b>baz]quz</b>": execCommand("delete", false, "") return value -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p>foo[bar<p><b>baz]quz</b>" checks for modifications to non-editable content -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p>foo[bar<p><b>baz]quz</b>" compare innerHTML -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p>foo[bar<p><b>baz]quz</b>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p>foo[bar<p><b>baz]quz</b>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p>foo[bar<p><b>baz]quz</b>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p>foo[bar<p><b>baz]quz</b>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p>foo[bar<p><b>baz]quz</b>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p>foo[bar<p><b>baz]quz</b>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p>foo[bar<p><b>baz]quz</b>" queryCommandIndeterm("delete") before -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p>foo[bar<p><b>baz]quz</b>" queryCommandState("delete") before -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p>foo[bar<p><b>baz]quz</b>" queryCommandValue("delete") before -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p>foo[bar<p><b>baz]quz</b>" queryCommandIndeterm("delete") after -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p>foo[bar<p><b>baz]quz</b>" queryCommandState("delete") after -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p>foo[bar<p><b>baz]quz</b>" queryCommandValue("delete") after -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p>foo[bar<p><b>baz]quz</b>": execCommand("defaultparagraphseparator", false, "p") return value -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p>foo[bar<p><b>baz]quz</b>": execCommand("delete", false, "") return value -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p>foo[bar<p><b>baz]quz</b>" checks for modifications to non-editable content -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p>foo[bar<p><b>baz]quz</b>" compare innerHTML -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p>foo[bar<p><b>baz]quz</b>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p>foo[bar<p><b>baz]quz</b>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p>foo[bar<p><b>baz]quz</b>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p>foo[bar<p><b>baz]quz</b>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p>foo[bar<p><b>baz]quz</b>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p>foo[bar<p><b>baz]quz</b>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p>foo[bar<p><b>baz]quz</b>" queryCommandIndeterm("delete") before -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p>foo[bar<p><b>baz]quz</b>" queryCommandState("delete") before -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p>foo[bar<p><b>baz]quz</b>" queryCommandValue("delete") before -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p>foo[bar<p><b>baz]quz</b>" queryCommandIndeterm("delete") after -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p>foo[bar<p><b>baz]quz</b>" queryCommandState("delete") after -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p>foo[bar<p><b>baz]quz</b>" queryCommandValue("delete") after -PASS [["defaultparagraphseparator","div"],["delete",""]] "<div><p>foo<p>[bar<p>baz]</div>": execCommand("defaultparagraphseparator", false, "div") return value -PASS [["defaultparagraphseparator","div"],["delete",""]] "<div><p>foo<p>[bar<p>baz]</div>": execCommand("delete", false, "") return value -PASS [["defaultparagraphseparator","div"],["delete",""]] "<div><p>foo<p>[bar<p>baz]</div>" checks for modifications to non-editable content -FAIL [["defaultparagraphseparator","div"],["delete",""]] "<div><p>foo<p>[bar<p>baz]</div>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<div><p>foo</p><p><br></p></div>" but got "<p>foo</p><p><br></p>" -PASS [["defaultparagraphseparator","div"],["delete",""]] "<div><p>foo<p>[bar<p>baz]</div>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["delete",""]] "<div><p>foo<p>[bar<p>baz]</div>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["delete",""]] "<div><p>foo<p>[bar<p>baz]</div>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["delete",""]] "<div><p>foo<p>[bar<p>baz]</div>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["delete",""]] "<div><p>foo<p>[bar<p>baz]</div>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["delete",""]] "<div><p>foo<p>[bar<p>baz]</div>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["delete",""]] "<div><p>foo<p>[bar<p>baz]</div>" queryCommandIndeterm("delete") before -PASS [["defaultparagraphseparator","div"],["delete",""]] "<div><p>foo<p>[bar<p>baz]</div>" queryCommandState("delete") before -PASS [["defaultparagraphseparator","div"],["delete",""]] "<div><p>foo<p>[bar<p>baz]</div>" queryCommandValue("delete") before -PASS [["defaultparagraphseparator","div"],["delete",""]] "<div><p>foo<p>[bar<p>baz]</div>" queryCommandIndeterm("delete") after -PASS [["defaultparagraphseparator","div"],["delete",""]] "<div><p>foo<p>[bar<p>baz]</div>" queryCommandState("delete") after -PASS [["defaultparagraphseparator","div"],["delete",""]] "<div><p>foo<p>[bar<p>baz]</div>" queryCommandValue("delete") after -PASS [["defaultparagraphseparator","p"],["delete",""]] "<div><p>foo<p>[bar<p>baz]</div>": execCommand("defaultparagraphseparator", false, "p") return value -PASS [["defaultparagraphseparator","p"],["delete",""]] "<div><p>foo<p>[bar<p>baz]</div>": execCommand("delete", false, "") return value -PASS [["defaultparagraphseparator","p"],["delete",""]] "<div><p>foo<p>[bar<p>baz]</div>" checks for modifications to non-editable content -FAIL [["defaultparagraphseparator","p"],["delete",""]] "<div><p>foo<p>[bar<p>baz]</div>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<div><p>foo</p><p><br></p></div>" but got "<p>foo</p><p><br></p>" -PASS [["defaultparagraphseparator","p"],["delete",""]] "<div><p>foo<p>[bar<p>baz]</div>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["delete",""]] "<div><p>foo<p>[bar<p>baz]</div>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["delete",""]] "<div><p>foo<p>[bar<p>baz]</div>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["delete",""]] "<div><p>foo<p>[bar<p>baz]</div>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["delete",""]] "<div><p>foo<p>[bar<p>baz]</div>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["delete",""]] "<div><p>foo<p>[bar<p>baz]</div>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["delete",""]] "<div><p>foo<p>[bar<p>baz]</div>" queryCommandIndeterm("delete") before -PASS [["defaultparagraphseparator","p"],["delete",""]] "<div><p>foo<p>[bar<p>baz]</div>" queryCommandState("delete") before -PASS [["defaultparagraphseparator","p"],["delete",""]] "<div><p>foo<p>[bar<p>baz]</div>" queryCommandValue("delete") before -PASS [["defaultparagraphseparator","p"],["delete",""]] "<div><p>foo<p>[bar<p>baz]</div>" queryCommandIndeterm("delete") after -PASS [["defaultparagraphseparator","p"],["delete",""]] "<div><p>foo<p>[bar<p>baz]</div>" queryCommandState("delete") after -PASS [["defaultparagraphseparator","p"],["delete",""]] "<div><p>foo<p>[bar<p>baz]</div>" queryCommandValue("delete") after -PASS [["delete",""]] "foo[<br>]bar": execCommand("delete", false, "") return value -PASS [["delete",""]] "foo[<br>]bar" checks for modifications to non-editable content -PASS [["delete",""]] "foo[<br>]bar" compare innerHTML -PASS [["delete",""]] "foo[<br>]bar" queryCommandIndeterm("delete") before -PASS [["delete",""]] "foo[<br>]bar" queryCommandState("delete") before -PASS [["delete",""]] "foo[<br>]bar" queryCommandValue("delete") before -PASS [["delete",""]] "foo[<br>]bar" queryCommandIndeterm("delete") after -PASS [["delete",""]] "foo[<br>]bar" queryCommandState("delete") after -PASS [["delete",""]] "foo[<br>]bar" queryCommandValue("delete") after -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p>foo[</p><p>]bar</p>": execCommand("defaultparagraphseparator", false, "div") return value -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p>foo[</p><p>]bar</p>": execCommand("delete", false, "") return value -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p>foo[</p><p>]bar</p>" checks for modifications to non-editable content -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p>foo[</p><p>]bar</p>" compare innerHTML -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p>foo[</p><p>]bar</p>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p>foo[</p><p>]bar</p>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p>foo[</p><p>]bar</p>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p>foo[</p><p>]bar</p>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p>foo[</p><p>]bar</p>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p>foo[</p><p>]bar</p>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p>foo[</p><p>]bar</p>" queryCommandIndeterm("delete") before -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p>foo[</p><p>]bar</p>" queryCommandState("delete") before -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p>foo[</p><p>]bar</p>" queryCommandValue("delete") before -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p>foo[</p><p>]bar</p>" queryCommandIndeterm("delete") after -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p>foo[</p><p>]bar</p>" queryCommandState("delete") after -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p>foo[</p><p>]bar</p>" queryCommandValue("delete") after -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p>foo[</p><p>]bar</p>": execCommand("defaultparagraphseparator", false, "p") return value -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p>foo[</p><p>]bar</p>": execCommand("delete", false, "") return value -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p>foo[</p><p>]bar</p>" checks for modifications to non-editable content -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p>foo[</p><p>]bar</p>" compare innerHTML -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p>foo[</p><p>]bar</p>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p>foo[</p><p>]bar</p>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p>foo[</p><p>]bar</p>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p>foo[</p><p>]bar</p>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p>foo[</p><p>]bar</p>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p>foo[</p><p>]bar</p>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p>foo[</p><p>]bar</p>" queryCommandIndeterm("delete") before -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p>foo[</p><p>]bar</p>" queryCommandState("delete") before -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p>foo[</p><p>]bar</p>" queryCommandValue("delete") before -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p>foo[</p><p>]bar</p>" queryCommandIndeterm("delete") after -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p>foo[</p><p>]bar</p>" queryCommandState("delete") after -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p>foo[</p><p>]bar</p>" queryCommandValue("delete") after -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p>foo[</p><p>]bar<br>baz</p>": execCommand("defaultparagraphseparator", false, "div") return value -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p>foo[</p><p>]bar<br>baz</p>": execCommand("delete", false, "") return value -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p>foo[</p><p>]bar<br>baz</p>" checks for modifications to non-editable content -FAIL [["defaultparagraphseparator","div"],["delete",""]] "<p>foo[</p><p>]bar<br>baz</p>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<p>foobar<br>baz</p>" but got "<p>foobar</p><p>baz</p>" -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p>foo[</p><p>]bar<br>baz</p>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p>foo[</p><p>]bar<br>baz</p>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p>foo[</p><p>]bar<br>baz</p>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p>foo[</p><p>]bar<br>baz</p>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p>foo[</p><p>]bar<br>baz</p>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p>foo[</p><p>]bar<br>baz</p>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p>foo[</p><p>]bar<br>baz</p>" queryCommandIndeterm("delete") before -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p>foo[</p><p>]bar<br>baz</p>" queryCommandState("delete") before -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p>foo[</p><p>]bar<br>baz</p>" queryCommandValue("delete") before -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p>foo[</p><p>]bar<br>baz</p>" queryCommandIndeterm("delete") after -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p>foo[</p><p>]bar<br>baz</p>" queryCommandState("delete") after -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p>foo[</p><p>]bar<br>baz</p>" queryCommandValue("delete") after -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p>foo[</p><p>]bar<br>baz</p>": execCommand("defaultparagraphseparator", false, "p") return value -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p>foo[</p><p>]bar<br>baz</p>": execCommand("delete", false, "") return value -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p>foo[</p><p>]bar<br>baz</p>" checks for modifications to non-editable content -FAIL [["defaultparagraphseparator","p"],["delete",""]] "<p>foo[</p><p>]bar<br>baz</p>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<p>foobar<br>baz</p>" but got "<p>foobar</p><p>baz</p>" -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p>foo[</p><p>]bar<br>baz</p>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p>foo[</p><p>]bar<br>baz</p>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p>foo[</p><p>]bar<br>baz</p>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p>foo[</p><p>]bar<br>baz</p>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p>foo[</p><p>]bar<br>baz</p>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p>foo[</p><p>]bar<br>baz</p>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p>foo[</p><p>]bar<br>baz</p>" queryCommandIndeterm("delete") before -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p>foo[</p><p>]bar<br>baz</p>" queryCommandState("delete") before -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p>foo[</p><p>]bar<br>baz</p>" queryCommandValue("delete") before -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p>foo[</p><p>]bar<br>baz</p>" queryCommandIndeterm("delete") after -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p>foo[</p><p>]bar<br>baz</p>" queryCommandState("delete") after -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p>foo[</p><p>]bar<br>baz</p>" queryCommandValue("delete") after -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo[<p>]bar</p>": execCommand("defaultparagraphseparator", false, "div") return value -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo[<p>]bar</p>": execCommand("delete", false, "") return value -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo[<p>]bar</p>" checks for modifications to non-editable content -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo[<p>]bar</p>" compare innerHTML -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo[<p>]bar</p>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo[<p>]bar</p>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo[<p>]bar</p>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo[<p>]bar</p>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo[<p>]bar</p>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo[<p>]bar</p>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo[<p>]bar</p>" queryCommandIndeterm("delete") before -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo[<p>]bar</p>" queryCommandState("delete") before -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo[<p>]bar</p>" queryCommandValue("delete") before -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo[<p>]bar</p>" queryCommandIndeterm("delete") after -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo[<p>]bar</p>" queryCommandState("delete") after -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo[<p>]bar</p>" queryCommandValue("delete") after -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo[<p>]bar</p>": execCommand("defaultparagraphseparator", false, "p") return value -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo[<p>]bar</p>": execCommand("delete", false, "") return value -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo[<p>]bar</p>" checks for modifications to non-editable content -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo[<p>]bar</p>" compare innerHTML -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo[<p>]bar</p>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo[<p>]bar</p>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo[<p>]bar</p>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo[<p>]bar</p>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo[<p>]bar</p>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo[<p>]bar</p>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo[<p>]bar</p>" queryCommandIndeterm("delete") before -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo[<p>]bar</p>" queryCommandState("delete") before -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo[<p>]bar</p>" queryCommandValue("delete") before -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo[<p>]bar</p>" queryCommandIndeterm("delete") after -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo[<p>]bar</p>" queryCommandState("delete") after -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo[<p>]bar</p>" queryCommandValue("delete") after -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo{<p>}bar</p>": execCommand("defaultparagraphseparator", false, "div") return value -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo{<p>}bar</p>": execCommand("delete", false, "") return value -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo{<p>}bar</p>" checks for modifications to non-editable content -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo{<p>}bar</p>" compare innerHTML -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo{<p>}bar</p>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo{<p>}bar</p>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo{<p>}bar</p>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo{<p>}bar</p>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo{<p>}bar</p>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo{<p>}bar</p>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo{<p>}bar</p>" queryCommandIndeterm("delete") before -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo{<p>}bar</p>" queryCommandState("delete") before -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo{<p>}bar</p>" queryCommandValue("delete") before -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo{<p>}bar</p>" queryCommandIndeterm("delete") after -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo{<p>}bar</p>" queryCommandState("delete") after -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo{<p>}bar</p>" queryCommandValue("delete") after -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo{<p>}bar</p>": execCommand("defaultparagraphseparator", false, "p") return value -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo{<p>}bar</p>": execCommand("delete", false, "") return value -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo{<p>}bar</p>" checks for modifications to non-editable content -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo{<p>}bar</p>" compare innerHTML -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo{<p>}bar</p>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo{<p>}bar</p>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo{<p>}bar</p>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo{<p>}bar</p>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo{<p>}bar</p>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo{<p>}bar</p>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo{<p>}bar</p>" queryCommandIndeterm("delete") before -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo{<p>}bar</p>" queryCommandState("delete") before -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo{<p>}bar</p>" queryCommandValue("delete") before -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo{<p>}bar</p>" queryCommandIndeterm("delete") after -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo{<p>}bar</p>" queryCommandState("delete") after -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo{<p>}bar</p>" queryCommandValue("delete") after -PASS [["delete",""]] "foo[<p>]bar<br>baz</p>": execCommand("delete", false, "") return value -PASS [["delete",""]] "foo[<p>]bar<br>baz</p>" checks for modifications to non-editable content -PASS [["delete",""]] "foo[<p>]bar<br>baz</p>" compare innerHTML -PASS [["delete",""]] "foo[<p>]bar<br>baz</p>" queryCommandIndeterm("delete") before -PASS [["delete",""]] "foo[<p>]bar<br>baz</p>" queryCommandState("delete") before -PASS [["delete",""]] "foo[<p>]bar<br>baz</p>" queryCommandValue("delete") before -PASS [["delete",""]] "foo[<p>]bar<br>baz</p>" queryCommandIndeterm("delete") after -PASS [["delete",""]] "foo[<p>]bar<br>baz</p>" queryCommandState("delete") after -PASS [["delete",""]] "foo[<p>]bar<br>baz</p>" queryCommandValue("delete") after -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo[<p>]bar</p>baz": execCommand("defaultparagraphseparator", false, "div") return value -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo[<p>]bar</p>baz": execCommand("delete", false, "") return value -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo[<p>]bar</p>baz" checks for modifications to non-editable content -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo[<p>]bar</p>baz" compare innerHTML -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo[<p>]bar</p>baz" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo[<p>]bar</p>baz" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo[<p>]bar</p>baz" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo[<p>]bar</p>baz" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo[<p>]bar</p>baz" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo[<p>]bar</p>baz" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo[<p>]bar</p>baz" queryCommandIndeterm("delete") before -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo[<p>]bar</p>baz" queryCommandState("delete") before -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo[<p>]bar</p>baz" queryCommandValue("delete") before -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo[<p>]bar</p>baz" queryCommandIndeterm("delete") after -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo[<p>]bar</p>baz" queryCommandState("delete") after -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo[<p>]bar</p>baz" queryCommandValue("delete") after -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo[<p>]bar</p>baz": execCommand("defaultparagraphseparator", false, "p") return value -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo[<p>]bar</p>baz": execCommand("delete", false, "") return value -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo[<p>]bar</p>baz" checks for modifications to non-editable content -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo[<p>]bar</p>baz" compare innerHTML -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo[<p>]bar</p>baz" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo[<p>]bar</p>baz" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo[<p>]bar</p>baz" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo[<p>]bar</p>baz" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo[<p>]bar</p>baz" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo[<p>]bar</p>baz" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo[<p>]bar</p>baz" queryCommandIndeterm("delete") before -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo[<p>]bar</p>baz" queryCommandState("delete") before -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo[<p>]bar</p>baz" queryCommandValue("delete") before -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo[<p>]bar</p>baz" queryCommandIndeterm("delete") after -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo[<p>]bar</p>baz" queryCommandState("delete") after -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo[<p>]bar</p>baz" queryCommandValue("delete") after -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo{<p>bar</p>}baz": execCommand("defaultparagraphseparator", false, "div") return value -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo{<p>bar</p>}baz": execCommand("delete", false, "") return value -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo{<p>bar</p>}baz" checks for modifications to non-editable content -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo{<p>bar</p>}baz" compare innerHTML -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo{<p>bar</p>}baz" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo{<p>bar</p>}baz" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo{<p>bar</p>}baz" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo{<p>bar</p>}baz" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo{<p>bar</p>}baz" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo{<p>bar</p>}baz" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo{<p>bar</p>}baz" queryCommandIndeterm("delete") before -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo{<p>bar</p>}baz" queryCommandState("delete") before -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo{<p>bar</p>}baz" queryCommandValue("delete") before -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo{<p>bar</p>}baz" queryCommandIndeterm("delete") after -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo{<p>bar</p>}baz" queryCommandState("delete") after -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo{<p>bar</p>}baz" queryCommandValue("delete") after -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo{<p>bar</p>}baz": execCommand("defaultparagraphseparator", false, "p") return value -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo{<p>bar</p>}baz": execCommand("delete", false, "") return value -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo{<p>bar</p>}baz" checks for modifications to non-editable content -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo{<p>bar</p>}baz" compare innerHTML -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo{<p>bar</p>}baz" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo{<p>bar</p>}baz" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo{<p>bar</p>}baz" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo{<p>bar</p>}baz" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo{<p>bar</p>}baz" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo{<p>bar</p>}baz" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo{<p>bar</p>}baz" queryCommandIndeterm("delete") before -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo{<p>bar</p>}baz" queryCommandState("delete") before -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo{<p>bar</p>}baz" queryCommandValue("delete") before -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo{<p>bar</p>}baz" queryCommandIndeterm("delete") after -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo{<p>bar</p>}baz" queryCommandState("delete") after -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo{<p>bar</p>}baz" queryCommandValue("delete") after -PASS [["delete",""]] "foo<p>{bar</p>}baz": execCommand("delete", false, "") return value -PASS [["delete",""]] "foo<p>{bar</p>}baz" checks for modifications to non-editable content -FAIL [["delete",""]] "foo<p>{bar</p>}baz" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "foo<p>baz</p>" but got "foo<p>baz<br></p>" -PASS [["delete",""]] "foo<p>{bar</p>}baz" queryCommandIndeterm("delete") before -PASS [["delete",""]] "foo<p>{bar</p>}baz" queryCommandState("delete") before -PASS [["delete",""]] "foo<p>{bar</p>}baz" queryCommandValue("delete") before -PASS [["delete",""]] "foo<p>{bar</p>}baz" queryCommandIndeterm("delete") after -PASS [["delete",""]] "foo<p>{bar</p>}baz" queryCommandState("delete") after -PASS [["delete",""]] "foo<p>{bar</p>}baz" queryCommandValue("delete") after -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo{<p>bar}</p>baz": execCommand("defaultparagraphseparator", false, "div") return value -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo{<p>bar}</p>baz": execCommand("delete", false, "") return value -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo{<p>bar}</p>baz" checks for modifications to non-editable content -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo{<p>bar}</p>baz" compare innerHTML -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo{<p>bar}</p>baz" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo{<p>bar}</p>baz" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo{<p>bar}</p>baz" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo{<p>bar}</p>baz" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo{<p>bar}</p>baz" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo{<p>bar}</p>baz" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo{<p>bar}</p>baz" queryCommandIndeterm("delete") before -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo{<p>bar}</p>baz" queryCommandState("delete") before -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo{<p>bar}</p>baz" queryCommandValue("delete") before -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo{<p>bar}</p>baz" queryCommandIndeterm("delete") after -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo{<p>bar}</p>baz" queryCommandState("delete") after -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo{<p>bar}</p>baz" queryCommandValue("delete") after -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo{<p>bar}</p>baz": execCommand("defaultparagraphseparator", false, "p") return value -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo{<p>bar}</p>baz": execCommand("delete", false, "") return value -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo{<p>bar}</p>baz" checks for modifications to non-editable content -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo{<p>bar}</p>baz" compare innerHTML -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo{<p>bar}</p>baz" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo{<p>bar}</p>baz" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo{<p>bar}</p>baz" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo{<p>bar}</p>baz" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo{<p>bar}</p>baz" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo{<p>bar}</p>baz" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo{<p>bar}</p>baz" queryCommandIndeterm("delete") before -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo{<p>bar}</p>baz" queryCommandState("delete") before -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo{<p>bar}</p>baz" queryCommandValue("delete") before -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo{<p>bar}</p>baz" queryCommandIndeterm("delete") after -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo{<p>bar}</p>baz" queryCommandState("delete") after -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo{<p>bar}</p>baz" queryCommandValue("delete") after -PASS [["delete",""]] "<p>foo[</p>]bar": execCommand("delete", false, "") return value -PASS [["delete",""]] "<p>foo[</p>]bar" checks for modifications to non-editable content -PASS [["delete",""]] "<p>foo[</p>]bar" compare innerHTML -PASS [["delete",""]] "<p>foo[</p>]bar" queryCommandIndeterm("delete") before -PASS [["delete",""]] "<p>foo[</p>]bar" queryCommandState("delete") before -PASS [["delete",""]] "<p>foo[</p>]bar" queryCommandValue("delete") before -PASS [["delete",""]] "<p>foo[</p>]bar" queryCommandIndeterm("delete") after -PASS [["delete",""]] "<p>foo[</p>]bar" queryCommandState("delete") after -PASS [["delete",""]] "<p>foo[</p>]bar" queryCommandValue("delete") after -PASS [["delete",""]] "<p>foo{</p>}bar": execCommand("delete", false, "") return value -PASS [["delete",""]] "<p>foo{</p>}bar" checks for modifications to non-editable content -PASS [["delete",""]] "<p>foo{</p>}bar" compare innerHTML -PASS [["delete",""]] "<p>foo{</p>}bar" queryCommandIndeterm("delete") before -PASS [["delete",""]] "<p>foo{</p>}bar" queryCommandState("delete") before -PASS [["delete",""]] "<p>foo{</p>}bar" queryCommandValue("delete") before -PASS [["delete",""]] "<p>foo{</p>}bar" queryCommandIndeterm("delete") after -PASS [["delete",""]] "<p>foo{</p>}bar" queryCommandState("delete") after -PASS [["delete",""]] "<p>foo{</p>}bar" queryCommandValue("delete") after -PASS [["delete",""]] "<p>foo[</p>]bar<br>baz": execCommand("delete", false, "") return value -PASS [["delete",""]] "<p>foo[</p>]bar<br>baz" checks for modifications to non-editable content -PASS [["delete",""]] "<p>foo[</p>]bar<br>baz" compare innerHTML -PASS [["delete",""]] "<p>foo[</p>]bar<br>baz" queryCommandIndeterm("delete") before -PASS [["delete",""]] "<p>foo[</p>]bar<br>baz" queryCommandState("delete") before -PASS [["delete",""]] "<p>foo[</p>]bar<br>baz" queryCommandValue("delete") before -PASS [["delete",""]] "<p>foo[</p>]bar<br>baz" queryCommandIndeterm("delete") after -PASS [["delete",""]] "<p>foo[</p>]bar<br>baz" queryCommandState("delete") after -PASS [["delete",""]] "<p>foo[</p>]bar<br>baz" queryCommandValue("delete") after -PASS [["delete",""]] "<p>foo[</p>]bar<p>baz</p>": execCommand("delete", false, "") return value -PASS [["delete",""]] "<p>foo[</p>]bar<p>baz</p>" checks for modifications to non-editable content -PASS [["delete",""]] "<p>foo[</p>]bar<p>baz</p>" compare innerHTML -PASS [["delete",""]] "<p>foo[</p>]bar<p>baz</p>" queryCommandIndeterm("delete") before -PASS [["delete",""]] "<p>foo[</p>]bar<p>baz</p>" queryCommandState("delete") before -PASS [["delete",""]] "<p>foo[</p>]bar<p>baz</p>" queryCommandValue("delete") before -PASS [["delete",""]] "<p>foo[</p>]bar<p>baz</p>" queryCommandIndeterm("delete") after -PASS [["delete",""]] "<p>foo[</p>]bar<p>baz</p>" queryCommandState("delete") after -PASS [["delete",""]] "<p>foo[</p>]bar<p>baz</p>" queryCommandValue("delete") after -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo[<div><p>]bar</div>": execCommand("defaultparagraphseparator", false, "div") return value -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo[<div><p>]bar</div>": execCommand("delete", false, "") return value -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo[<div><p>]bar</div>" checks for modifications to non-editable content -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo[<div><p>]bar</div>" compare innerHTML -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo[<div><p>]bar</div>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo[<div><p>]bar</div>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo[<div><p>]bar</div>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo[<div><p>]bar</div>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo[<div><p>]bar</div>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo[<div><p>]bar</div>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo[<div><p>]bar</div>" queryCommandIndeterm("delete") before -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo[<div><p>]bar</div>" queryCommandState("delete") before -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo[<div><p>]bar</div>" queryCommandValue("delete") before -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo[<div><p>]bar</div>" queryCommandIndeterm("delete") after -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo[<div><p>]bar</div>" queryCommandState("delete") after -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo[<div><p>]bar</div>" queryCommandValue("delete") after -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo[<div><p>]bar</div>": execCommand("defaultparagraphseparator", false, "p") return value -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo[<div><p>]bar</div>": execCommand("delete", false, "") return value -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo[<div><p>]bar</div>" checks for modifications to non-editable content -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo[<div><p>]bar</div>" compare innerHTML -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo[<div><p>]bar</div>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo[<div><p>]bar</div>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo[<div><p>]bar</div>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo[<div><p>]bar</div>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo[<div><p>]bar</div>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo[<div><p>]bar</div>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo[<div><p>]bar</div>" queryCommandIndeterm("delete") before -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo[<div><p>]bar</div>" queryCommandState("delete") before -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo[<div><p>]bar</div>" queryCommandValue("delete") before -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo[<div><p>]bar</div>" queryCommandIndeterm("delete") after -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo[<div><p>]bar</div>" queryCommandState("delete") after -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo[<div><p>]bar</div>" queryCommandValue("delete") after -PASS [["delete",""]] "<div><p>foo[</p></div>]bar": execCommand("delete", false, "") return value -PASS [["delete",""]] "<div><p>foo[</p></div>]bar" checks for modifications to non-editable content -PASS [["delete",""]] "<div><p>foo[</p></div>]bar" compare innerHTML -PASS [["delete",""]] "<div><p>foo[</p></div>]bar" queryCommandIndeterm("delete") before -PASS [["delete",""]] "<div><p>foo[</p></div>]bar" queryCommandState("delete") before -PASS [["delete",""]] "<div><p>foo[</p></div>]bar" queryCommandValue("delete") before -PASS [["delete",""]] "<div><p>foo[</p></div>]bar" queryCommandIndeterm("delete") after -PASS [["delete",""]] "<div><p>foo[</p></div>]bar" queryCommandState("delete") after -PASS [["delete",""]] "<div><p>foo[</p></div>]bar" queryCommandValue("delete") after -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo[<div><p>]bar</p>baz</div>": execCommand("defaultparagraphseparator", false, "div") return value -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo[<div><p>]bar</p>baz</div>": execCommand("delete", false, "") return value -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo[<div><p>]bar</p>baz</div>" checks for modifications to non-editable content -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo[<div><p>]bar</p>baz</div>" compare innerHTML -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo[<div><p>]bar</p>baz</div>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo[<div><p>]bar</p>baz</div>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo[<div><p>]bar</p>baz</div>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo[<div><p>]bar</p>baz</div>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo[<div><p>]bar</p>baz</div>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo[<div><p>]bar</p>baz</div>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo[<div><p>]bar</p>baz</div>" queryCommandIndeterm("delete") before -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo[<div><p>]bar</p>baz</div>" queryCommandState("delete") before -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo[<div><p>]bar</p>baz</div>" queryCommandValue("delete") before -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo[<div><p>]bar</p>baz</div>" queryCommandIndeterm("delete") after -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo[<div><p>]bar</p>baz</div>" queryCommandState("delete") after -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo[<div><p>]bar</p>baz</div>" queryCommandValue("delete") after -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo[<div><p>]bar</p>baz</div>": execCommand("defaultparagraphseparator", false, "p") return value -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo[<div><p>]bar</p>baz</div>": execCommand("delete", false, "") return value -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo[<div><p>]bar</p>baz</div>" checks for modifications to non-editable content -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo[<div><p>]bar</p>baz</div>" compare innerHTML -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo[<div><p>]bar</p>baz</div>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo[<div><p>]bar</p>baz</div>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo[<div><p>]bar</p>baz</div>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo[<div><p>]bar</p>baz</div>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo[<div><p>]bar</p>baz</div>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo[<div><p>]bar</p>baz</div>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo[<div><p>]bar</p>baz</div>" queryCommandIndeterm("delete") before -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo[<div><p>]bar</p>baz</div>" queryCommandState("delete") before -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo[<div><p>]bar</p>baz</div>" queryCommandValue("delete") before -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo[<div><p>]bar</p>baz</div>" queryCommandIndeterm("delete") after -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo[<div><p>]bar</p>baz</div>" queryCommandState("delete") after -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo[<div><p>]bar</p>baz</div>" queryCommandValue("delete") after -PASS [["delete",""]] "foo[<div>]bar<p>baz</p></div>": execCommand("delete", false, "") return value -PASS [["delete",""]] "foo[<div>]bar<p>baz</p></div>" checks for modifications to non-editable content -PASS [["delete",""]] "foo[<div>]bar<p>baz</p></div>" compare innerHTML -PASS [["delete",""]] "foo[<div>]bar<p>baz</p></div>" queryCommandIndeterm("delete") before -PASS [["delete",""]] "foo[<div>]bar<p>baz</p></div>" queryCommandState("delete") before -PASS [["delete",""]] "foo[<div>]bar<p>baz</p></div>" queryCommandValue("delete") before -PASS [["delete",""]] "foo[<div>]bar<p>baz</p></div>" queryCommandIndeterm("delete") after -PASS [["delete",""]] "foo[<div>]bar<p>baz</p></div>" queryCommandState("delete") after -PASS [["delete",""]] "foo[<div>]bar<p>baz</p></div>" queryCommandValue("delete") after -PASS [["delete",""]] "<div><p>foo</p>bar[</div>]baz": execCommand("delete", false, "") return value -PASS [["delete",""]] "<div><p>foo</p>bar[</div>]baz" checks for modifications to non-editable content -PASS [["delete",""]] "<div><p>foo</p>bar[</div>]baz" compare innerHTML -PASS [["delete",""]] "<div><p>foo</p>bar[</div>]baz" queryCommandIndeterm("delete") before -PASS [["delete",""]] "<div><p>foo</p>bar[</div>]baz" queryCommandState("delete") before -PASS [["delete",""]] "<div><p>foo</p>bar[</div>]baz" queryCommandValue("delete") before -PASS [["delete",""]] "<div><p>foo</p>bar[</div>]baz" queryCommandIndeterm("delete") after -PASS [["delete",""]] "<div><p>foo</p>bar[</div>]baz" queryCommandState("delete") after -PASS [["delete",""]] "<div><p>foo</p>bar[</div>]baz" queryCommandValue("delete") after -PASS [["delete",""]] "<div>foo<p>bar[</p></div>]baz": execCommand("delete", false, "") return value -PASS [["delete",""]] "<div>foo<p>bar[</p></div>]baz" checks for modifications to non-editable content -PASS [["delete",""]] "<div>foo<p>bar[</p></div>]baz" compare innerHTML -PASS [["delete",""]] "<div>foo<p>bar[</p></div>]baz" queryCommandIndeterm("delete") before -PASS [["delete",""]] "<div>foo<p>bar[</p></div>]baz" queryCommandState("delete") before -PASS [["delete",""]] "<div>foo<p>bar[</p></div>]baz" queryCommandValue("delete") before -PASS [["delete",""]] "<div>foo<p>bar[</p></div>]baz" queryCommandIndeterm("delete") after -PASS [["delete",""]] "<div>foo<p>bar[</p></div>]baz" queryCommandState("delete") after -PASS [["delete",""]] "<div>foo<p>bar[</p></div>]baz" queryCommandValue("delete") after -PASS [["delete",""]] "<p>foo<br>{</p>]bar": execCommand("delete", false, "") return value -PASS [["delete",""]] "<p>foo<br>{</p>]bar" checks for modifications to non-editable content -PASS [["delete",""]] "<p>foo<br>{</p>]bar" compare innerHTML -PASS [["delete",""]] "<p>foo<br>{</p>]bar" queryCommandIndeterm("delete") before -PASS [["delete",""]] "<p>foo<br>{</p>]bar" queryCommandState("delete") before -PASS [["delete",""]] "<p>foo<br>{</p>]bar" queryCommandValue("delete") before -PASS [["delete",""]] "<p>foo<br>{</p>]bar" queryCommandIndeterm("delete") after -PASS [["delete",""]] "<p>foo<br>{</p>]bar" queryCommandState("delete") after -PASS [["delete",""]] "<p>foo<br>{</p>]bar" queryCommandValue("delete") after -PASS [["delete",""]] "<p>foo<br><br>{</p>]bar": execCommand("delete", false, "") return value -PASS [["delete",""]] "<p>foo<br><br>{</p>]bar" checks for modifications to non-editable content -FAIL [["delete",""]] "<p>foo<br><br>{</p>]bar" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<p>foo<br>bar</p>" but got "<p>foo<br>bar<br></p>" -PASS [["delete",""]] "<p>foo<br><br>{</p>]bar" queryCommandIndeterm("delete") before -PASS [["delete",""]] "<p>foo<br><br>{</p>]bar" queryCommandState("delete") before -PASS [["delete",""]] "<p>foo<br><br>{</p>]bar" queryCommandValue("delete") before -PASS [["delete",""]] "<p>foo<br><br>{</p>]bar" queryCommandIndeterm("delete") after -PASS [["delete",""]] "<p>foo<br><br>{</p>]bar" queryCommandState("delete") after -PASS [["delete",""]] "<p>foo<br><br>{</p>]bar" queryCommandValue("delete") after -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo<br>{<p>]bar</p>": execCommand("defaultparagraphseparator", false, "div") return value -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo<br>{<p>]bar</p>": execCommand("delete", false, "") return value -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo<br>{<p>]bar</p>" checks for modifications to non-editable content -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo<br>{<p>]bar</p>" compare innerHTML -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo<br>{<p>]bar</p>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo<br>{<p>]bar</p>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo<br>{<p>]bar</p>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo<br>{<p>]bar</p>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo<br>{<p>]bar</p>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo<br>{<p>]bar</p>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo<br>{<p>]bar</p>" queryCommandIndeterm("delete") before -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo<br>{<p>]bar</p>" queryCommandState("delete") before -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo<br>{<p>]bar</p>" queryCommandValue("delete") before -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo<br>{<p>]bar</p>" queryCommandIndeterm("delete") after -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo<br>{<p>]bar</p>" queryCommandState("delete") after -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo<br>{<p>]bar</p>" queryCommandValue("delete") after -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo<br>{<p>]bar</p>": execCommand("defaultparagraphseparator", false, "p") return value -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo<br>{<p>]bar</p>": execCommand("delete", false, "") return value -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo<br>{<p>]bar</p>" checks for modifications to non-editable content -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo<br>{<p>]bar</p>" compare innerHTML -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo<br>{<p>]bar</p>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo<br>{<p>]bar</p>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo<br>{<p>]bar</p>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo<br>{<p>]bar</p>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo<br>{<p>]bar</p>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo<br>{<p>]bar</p>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo<br>{<p>]bar</p>" queryCommandIndeterm("delete") before -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo<br>{<p>]bar</p>" queryCommandState("delete") before -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo<br>{<p>]bar</p>" queryCommandValue("delete") before -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo<br>{<p>]bar</p>" queryCommandIndeterm("delete") after -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo<br>{<p>]bar</p>" queryCommandState("delete") after -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo<br>{<p>]bar</p>" queryCommandValue("delete") after -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo<br><br>{<p>]bar</p>": execCommand("defaultparagraphseparator", false, "div") return value -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo<br><br>{<p>]bar</p>": execCommand("delete", false, "") return value -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo<br><br>{<p>]bar</p>" checks for modifications to non-editable content -FAIL [["defaultparagraphseparator","div"],["delete",""]] "foo<br><br>{<p>]bar</p>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "foo<br>bar" but got "foo<br><p>bar</p>" -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo<br><br>{<p>]bar</p>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo<br><br>{<p>]bar</p>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo<br><br>{<p>]bar</p>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo<br><br>{<p>]bar</p>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo<br><br>{<p>]bar</p>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo<br><br>{<p>]bar</p>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo<br><br>{<p>]bar</p>" queryCommandIndeterm("delete") before -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo<br><br>{<p>]bar</p>" queryCommandState("delete") before -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo<br><br>{<p>]bar</p>" queryCommandValue("delete") before -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo<br><br>{<p>]bar</p>" queryCommandIndeterm("delete") after -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo<br><br>{<p>]bar</p>" queryCommandState("delete") after -PASS [["defaultparagraphseparator","div"],["delete",""]] "foo<br><br>{<p>]bar</p>" queryCommandValue("delete") after -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo<br><br>{<p>]bar</p>": execCommand("defaultparagraphseparator", false, "p") return value -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo<br><br>{<p>]bar</p>": execCommand("delete", false, "") return value -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo<br><br>{<p>]bar</p>" checks for modifications to non-editable content -FAIL [["defaultparagraphseparator","p"],["delete",""]] "foo<br><br>{<p>]bar</p>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "foo<br>bar" but got "foo<br><p>bar</p>" -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo<br><br>{<p>]bar</p>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo<br><br>{<p>]bar</p>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo<br><br>{<p>]bar</p>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo<br><br>{<p>]bar</p>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo<br><br>{<p>]bar</p>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo<br><br>{<p>]bar</p>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo<br><br>{<p>]bar</p>" queryCommandIndeterm("delete") before -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo<br><br>{<p>]bar</p>" queryCommandState("delete") before -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo<br><br>{<p>]bar</p>" queryCommandValue("delete") before -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo<br><br>{<p>]bar</p>" queryCommandIndeterm("delete") after -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo<br><br>{<p>]bar</p>" queryCommandState("delete") after -PASS [["defaultparagraphseparator","p"],["delete",""]] "foo<br><br>{<p>]bar</p>" queryCommandValue("delete") after -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p>foo<br>{</p><p>}bar</p>": execCommand("defaultparagraphseparator", false, "div") return value -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p>foo<br>{</p><p>}bar</p>": execCommand("delete", false, "") return value -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p>foo<br>{</p><p>}bar</p>" checks for modifications to non-editable content -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p>foo<br>{</p><p>}bar</p>" compare innerHTML -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p>foo<br>{</p><p>}bar</p>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p>foo<br>{</p><p>}bar</p>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p>foo<br>{</p><p>}bar</p>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p>foo<br>{</p><p>}bar</p>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p>foo<br>{</p><p>}bar</p>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p>foo<br>{</p><p>}bar</p>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p>foo<br>{</p><p>}bar</p>" queryCommandIndeterm("delete") before -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p>foo<br>{</p><p>}bar</p>" queryCommandState("delete") before -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p>foo<br>{</p><p>}bar</p>" queryCommandValue("delete") before -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p>foo<br>{</p><p>}bar</p>" queryCommandIndeterm("delete") after -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p>foo<br>{</p><p>}bar</p>" queryCommandState("delete") after -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p>foo<br>{</p><p>}bar</p>" queryCommandValue("delete") after -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p>foo<br>{</p><p>}bar</p>": execCommand("defaultparagraphseparator", false, "p") return value -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p>foo<br>{</p><p>}bar</p>": execCommand("delete", false, "") return value -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p>foo<br>{</p><p>}bar</p>" checks for modifications to non-editable content -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p>foo<br>{</p><p>}bar</p>" compare innerHTML -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p>foo<br>{</p><p>}bar</p>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p>foo<br>{</p><p>}bar</p>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p>foo<br>{</p><p>}bar</p>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p>foo<br>{</p><p>}bar</p>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p>foo<br>{</p><p>}bar</p>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p>foo<br>{</p><p>}bar</p>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p>foo<br>{</p><p>}bar</p>" queryCommandIndeterm("delete") before -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p>foo<br>{</p><p>}bar</p>" queryCommandState("delete") before -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p>foo<br>{</p><p>}bar</p>" queryCommandValue("delete") before -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p>foo<br>{</p><p>}bar</p>" queryCommandIndeterm("delete") after -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p>foo<br>{</p><p>}bar</p>" queryCommandState("delete") after -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p>foo<br>{</p><p>}bar</p>" queryCommandValue("delete") after -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p>foo<br><br>{</p><p>}bar</p>": execCommand("defaultparagraphseparator", false, "div") return value -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p>foo<br><br>{</p><p>}bar</p>": execCommand("delete", false, "") return value -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p>foo<br><br>{</p><p>}bar</p>" checks for modifications to non-editable content -FAIL [["defaultparagraphseparator","div"],["delete",""]] "<p>foo<br><br>{</p><p>}bar</p>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<p>foo<br>bar</p>" but got "<p>foo<br>bar<br></p>" -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p>foo<br><br>{</p><p>}bar</p>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p>foo<br><br>{</p><p>}bar</p>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p>foo<br><br>{</p><p>}bar</p>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p>foo<br><br>{</p><p>}bar</p>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p>foo<br><br>{</p><p>}bar</p>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p>foo<br><br>{</p><p>}bar</p>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p>foo<br><br>{</p><p>}bar</p>" queryCommandIndeterm("delete") before -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p>foo<br><br>{</p><p>}bar</p>" queryCommandState("delete") before -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p>foo<br><br>{</p><p>}bar</p>" queryCommandValue("delete") before -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p>foo<br><br>{</p><p>}bar</p>" queryCommandIndeterm("delete") after -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p>foo<br><br>{</p><p>}bar</p>" queryCommandState("delete") after -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p>foo<br><br>{</p><p>}bar</p>" queryCommandValue("delete") after -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p>foo<br><br>{</p><p>}bar</p>": execCommand("defaultparagraphseparator", false, "p") return value -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p>foo<br><br>{</p><p>}bar</p>": execCommand("delete", false, "") return value -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p>foo<br><br>{</p><p>}bar</p>" checks for modifications to non-editable content -FAIL [["defaultparagraphseparator","p"],["delete",""]] "<p>foo<br><br>{</p><p>}bar</p>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<p>foo<br>bar</p>" but got "<p>foo<br>bar<br></p>" -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p>foo<br><br>{</p><p>}bar</p>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p>foo<br><br>{</p><p>}bar</p>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p>foo<br><br>{</p><p>}bar</p>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p>foo<br><br>{</p><p>}bar</p>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p>foo<br><br>{</p><p>}bar</p>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p>foo<br><br>{</p><p>}bar</p>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p>foo<br><br>{</p><p>}bar</p>" queryCommandIndeterm("delete") before -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p>foo<br><br>{</p><p>}bar</p>" queryCommandState("delete") before -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p>foo<br><br>{</p><p>}bar</p>" queryCommandValue("delete") before -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p>foo<br><br>{</p><p>}bar</p>" queryCommandIndeterm("delete") after -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p>foo<br><br>{</p><p>}bar</p>" queryCommandState("delete") after -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p>foo<br><br>{</p><p>}bar</p>" queryCommandValue("delete") after -PASS [["delete",""]] "<table><tbody><tr><th>foo<th>[bar]<th>baz<tr><td>quz<td>qoz<td>qiz</table>": execCommand("delete", false, "") return value -PASS [["delete",""]] "<table><tbody><tr><th>foo<th>[bar]<th>baz<tr><td>quz<td>qoz<td>qiz</table>" checks for modifications to non-editable content -PASS [["delete",""]] "<table><tbody><tr><th>foo<th>[bar]<th>baz<tr><td>quz<td>qoz<td>qiz</table>" compare innerHTML -PASS [["delete",""]] "<table><tbody><tr><th>foo<th>[bar]<th>baz<tr><td>quz<td>qoz<td>qiz</table>" queryCommandIndeterm("delete") before -PASS [["delete",""]] "<table><tbody><tr><th>foo<th>[bar]<th>baz<tr><td>quz<td>qoz<td>qiz</table>" queryCommandState("delete") before -PASS [["delete",""]] "<table><tbody><tr><th>foo<th>[bar]<th>baz<tr><td>quz<td>qoz<td>qiz</table>" queryCommandValue("delete") before -PASS [["delete",""]] "<table><tbody><tr><th>foo<th>[bar]<th>baz<tr><td>quz<td>qoz<td>qiz</table>" queryCommandIndeterm("delete") after -PASS [["delete",""]] "<table><tbody><tr><th>foo<th>[bar]<th>baz<tr><td>quz<td>qoz<td>qiz</table>" queryCommandState("delete") after -PASS [["delete",""]] "<table><tbody><tr><th>foo<th>[bar]<th>baz<tr><td>quz<td>qoz<td>qiz</table>" queryCommandValue("delete") after -PASS [["delete",""]] "<table><tbody><tr><th>foo<th>ba[r<th>b]az<tr><td>quz<td>qoz<td>qiz</table>": execCommand("delete", false, "") return value -PASS [["delete",""]] "<table><tbody><tr><th>foo<th>ba[r<th>b]az<tr><td>quz<td>qoz<td>qiz</table>" checks for modifications to non-editable content -PASS [["delete",""]] "<table><tbody><tr><th>foo<th>ba[r<th>b]az<tr><td>quz<td>qoz<td>qiz</table>" compare innerHTML -PASS [["delete",""]] "<table><tbody><tr><th>foo<th>ba[r<th>b]az<tr><td>quz<td>qoz<td>qiz</table>" queryCommandIndeterm("delete") before -PASS [["delete",""]] "<table><tbody><tr><th>foo<th>ba[r<th>b]az<tr><td>quz<td>qoz<td>qiz</table>" queryCommandState("delete") before -PASS [["delete",""]] "<table><tbody><tr><th>foo<th>ba[r<th>b]az<tr><td>quz<td>qoz<td>qiz</table>" queryCommandValue("delete") before -PASS [["delete",""]] "<table><tbody><tr><th>foo<th>ba[r<th>b]az<tr><td>quz<td>qoz<td>qiz</table>" queryCommandIndeterm("delete") after -PASS [["delete",""]] "<table><tbody><tr><th>foo<th>ba[r<th>b]az<tr><td>quz<td>qoz<td>qiz</table>" queryCommandState("delete") after -PASS [["delete",""]] "<table><tbody><tr><th>foo<th>ba[r<th>b]az<tr><td>quz<td>qoz<td>qiz</table>" queryCommandValue("delete") after -PASS [["delete",""]] "<table><tbody><tr><th>fo[o<th>bar<th>b]az<tr><td>quz<td>qoz<td>qiz</table>": execCommand("delete", false, "") return value -PASS [["delete",""]] "<table><tbody><tr><th>fo[o<th>bar<th>b]az<tr><td>quz<td>qoz<td>qiz</table>" checks for modifications to non-editable content -FAIL [["delete",""]] "<table><tbody><tr><th>fo[o<th>bar<th>b]az<tr><td>quz<td>qoz<td>qiz</table>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<table><tbody><tr><th>fo</th><th><br></th><th>az</th></tr><tr><td>quz</td><td>qoz</td><td>qiz</td></tr></tbody></table>" but got "<table><tbody><tr><th>fo</th><th></th><th>az</th></tr><tr><td>quz</td><td>qoz</td><td>qiz</td></tr></tbody></table>" -PASS [["delete",""]] "<table><tbody><tr><th>fo[o<th>bar<th>b]az<tr><td>quz<td>qoz<td>qiz</table>" queryCommandIndeterm("delete") before -PASS [["delete",""]] "<table><tbody><tr><th>fo[o<th>bar<th>b]az<tr><td>quz<td>qoz<td>qiz</table>" queryCommandState("delete") before -PASS [["delete",""]] "<table><tbody><tr><th>fo[o<th>bar<th>b]az<tr><td>quz<td>qoz<td>qiz</table>" queryCommandValue("delete") before -PASS [["delete",""]] "<table><tbody><tr><th>fo[o<th>bar<th>b]az<tr><td>quz<td>qoz<td>qiz</table>" queryCommandIndeterm("delete") after -PASS [["delete",""]] "<table><tbody><tr><th>fo[o<th>bar<th>b]az<tr><td>quz<td>qoz<td>qiz</table>" queryCommandState("delete") after -PASS [["delete",""]] "<table><tbody><tr><th>fo[o<th>bar<th>b]az<tr><td>quz<td>qoz<td>qiz</table>" queryCommandValue("delete") after -PASS [["delete",""]] "<table><tbody><tr><th>foo<th>bar<th>ba[z<tr><td>q]uz<td>qoz<td>qiz</table>": execCommand("delete", false, "") return value -PASS [["delete",""]] "<table><tbody><tr><th>foo<th>bar<th>ba[z<tr><td>q]uz<td>qoz<td>qiz</table>" checks for modifications to non-editable content -PASS [["delete",""]] "<table><tbody><tr><th>foo<th>bar<th>ba[z<tr><td>q]uz<td>qoz<td>qiz</table>" compare innerHTML -PASS [["delete",""]] "<table><tbody><tr><th>foo<th>bar<th>ba[z<tr><td>q]uz<td>qoz<td>qiz</table>" queryCommandIndeterm("delete") before -PASS [["delete",""]] "<table><tbody><tr><th>foo<th>bar<th>ba[z<tr><td>q]uz<td>qoz<td>qiz</table>" queryCommandState("delete") before -PASS [["delete",""]] "<table><tbody><tr><th>foo<th>bar<th>ba[z<tr><td>q]uz<td>qoz<td>qiz</table>" queryCommandValue("delete") before -PASS [["delete",""]] "<table><tbody><tr><th>foo<th>bar<th>ba[z<tr><td>q]uz<td>qoz<td>qiz</table>" queryCommandIndeterm("delete") after -PASS [["delete",""]] "<table><tbody><tr><th>foo<th>bar<th>ba[z<tr><td>q]uz<td>qoz<td>qiz</table>" queryCommandState("delete") after -PASS [["delete",""]] "<table><tbody><tr><th>foo<th>bar<th>ba[z<tr><td>q]uz<td>qoz<td>qiz</table>" queryCommandValue("delete") after -PASS [["delete",""]] "<table><tbody><tr><th>[foo<th>bar<th>baz]<tr><td>quz<td>qoz<td>qiz</table>": execCommand("delete", false, "") return value -PASS [["delete",""]] "<table><tbody><tr><th>[foo<th>bar<th>baz]<tr><td>quz<td>qoz<td>qiz</table>" checks for modifications to non-editable content -FAIL [["delete",""]] "<table><tbody><tr><th>[foo<th>bar<th>baz]<tr><td>quz<td>qoz<td>qiz</table>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<table><tbody><tr><th><br></th><th><br></th><th><br></th></tr><tr><td>quz</td><td>qoz</td><td>qiz</td></tr></tbody></table>" but got "<table><tbody><tr><th><br></th><th></th><th></th></tr><tr><td>quz</td><td>qoz</td><td>qiz</td></tr></tbody></table>" -PASS [["delete",""]] "<table><tbody><tr><th>[foo<th>bar<th>baz]<tr><td>quz<td>qoz<td>qiz</table>" queryCommandIndeterm("delete") before -PASS [["delete",""]] "<table><tbody><tr><th>[foo<th>bar<th>baz]<tr><td>quz<td>qoz<td>qiz</table>" queryCommandState("delete") before -PASS [["delete",""]] "<table><tbody><tr><th>[foo<th>bar<th>baz]<tr><td>quz<td>qoz<td>qiz</table>" queryCommandValue("delete") before -PASS [["delete",""]] "<table><tbody><tr><th>[foo<th>bar<th>baz]<tr><td>quz<td>qoz<td>qiz</table>" queryCommandIndeterm("delete") after -PASS [["delete",""]] "<table><tbody><tr><th>[foo<th>bar<th>baz]<tr><td>quz<td>qoz<td>qiz</table>" queryCommandState("delete") after -PASS [["delete",""]] "<table><tbody><tr><th>[foo<th>bar<th>baz]<tr><td>quz<td>qoz<td>qiz</table>" queryCommandValue("delete") after -PASS [["delete",""]] "<table><tbody><tr><th>[foo<th>bar<th>baz<tr><td>quz<td>qoz<td>qiz]</table>": execCommand("delete", false, "") return value -PASS [["delete",""]] "<table><tbody><tr><th>[foo<th>bar<th>baz<tr><td>quz<td>qoz<td>qiz]</table>" checks for modifications to non-editable content -FAIL [["delete",""]] "<table><tbody><tr><th>[foo<th>bar<th>baz<tr><td>quz<td>qoz<td>qiz]</table>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<table><tbody><tr><th><br></th><th><br></th><th><br></th></tr><tr><td><br></td><td><br></td><td><br></td></tr></tbody></table>" but got "<br>" -PASS [["delete",""]] "<table><tbody><tr><th>[foo<th>bar<th>baz<tr><td>quz<td>qoz<td>qiz]</table>" queryCommandIndeterm("delete") before -PASS [["delete",""]] "<table><tbody><tr><th>[foo<th>bar<th>baz<tr><td>quz<td>qoz<td>qiz]</table>" queryCommandState("delete") before -PASS [["delete",""]] "<table><tbody><tr><th>[foo<th>bar<th>baz<tr><td>quz<td>qoz<td>qiz]</table>" queryCommandValue("delete") before -PASS [["delete",""]] "<table><tbody><tr><th>[foo<th>bar<th>baz<tr><td>quz<td>qoz<td>qiz]</table>" queryCommandIndeterm("delete") after -PASS [["delete",""]] "<table><tbody><tr><th>[foo<th>bar<th>baz<tr><td>quz<td>qoz<td>qiz]</table>" queryCommandState("delete") after -PASS [["delete",""]] "<table><tbody><tr><th>[foo<th>bar<th>baz<tr><td>quz<td>qoz<td>qiz]</table>" queryCommandValue("delete") after -PASS [["delete",""]] "{<table><tbody><tr><th>foo<th>bar<th>baz<tr><td>quz<td>qoz<td>qiz</table>}": execCommand("delete", false, "") return value -PASS [["delete",""]] "{<table><tbody><tr><th>foo<th>bar<th>baz<tr><td>quz<td>qoz<td>qiz</table>}" checks for modifications to non-editable content -PASS [["delete",""]] "{<table><tbody><tr><th>foo<th>bar<th>baz<tr><td>quz<td>qoz<td>qiz</table>}" compare innerHTML -PASS [["delete",""]] "{<table><tbody><tr><th>foo<th>bar<th>baz<tr><td>quz<td>qoz<td>qiz</table>}" queryCommandIndeterm("delete") before -PASS [["delete",""]] "{<table><tbody><tr><th>foo<th>bar<th>baz<tr><td>quz<td>qoz<td>qiz</table>}" queryCommandState("delete") before -PASS [["delete",""]] "{<table><tbody><tr><th>foo<th>bar<th>baz<tr><td>quz<td>qoz<td>qiz</table>}" queryCommandValue("delete") before -PASS [["delete",""]] "{<table><tbody><tr><th>foo<th>bar<th>baz<tr><td>quz<td>qoz<td>qiz</table>}" queryCommandIndeterm("delete") after -PASS [["delete",""]] "{<table><tbody><tr><th>foo<th>bar<th>baz<tr><td>quz<td>qoz<td>qiz</table>}" queryCommandState("delete") after -PASS [["delete",""]] "{<table><tbody><tr><th>foo<th>bar<th>baz<tr><td>quz<td>qoz<td>qiz</table>}" queryCommandValue("delete") after -PASS [["delete",""]] "<table><tbody><tr><td>foo<td>ba[r<tr><td>baz<td>quz<tr><td>q]oz<td>qiz</table>": execCommand("delete", false, "") return value -PASS [["delete",""]] "<table><tbody><tr><td>foo<td>ba[r<tr><td>baz<td>quz<tr><td>q]oz<td>qiz</table>" checks for modifications to non-editable content -FAIL [["delete",""]] "<table><tbody><tr><td>foo<td>ba[r<tr><td>baz<td>quz<tr><td>q]oz<td>qiz</table>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<table><tbody><tr><td>foo</td><td>ba</td></tr><tr><td><br></td><td><br></td></tr><tr><td>oz</td><td>qiz</td></tr></tbody></table>" but got "<table><tbody><tr><td>foo</td><td>ba</td></tr><tr><td>oz</td><td>qiz</td></tr></tbody></table>" -PASS [["delete",""]] "<table><tbody><tr><td>foo<td>ba[r<tr><td>baz<td>quz<tr><td>q]oz<td>qiz</table>" queryCommandIndeterm("delete") before -PASS [["delete",""]] "<table><tbody><tr><td>foo<td>ba[r<tr><td>baz<td>quz<tr><td>q]oz<td>qiz</table>" queryCommandState("delete") before -PASS [["delete",""]] "<table><tbody><tr><td>foo<td>ba[r<tr><td>baz<td>quz<tr><td>q]oz<td>qiz</table>" queryCommandValue("delete") before -PASS [["delete",""]] "<table><tbody><tr><td>foo<td>ba[r<tr><td>baz<td>quz<tr><td>q]oz<td>qiz</table>" queryCommandIndeterm("delete") after -PASS [["delete",""]] "<table><tbody><tr><td>foo<td>ba[r<tr><td>baz<td>quz<tr><td>q]oz<td>qiz</table>" queryCommandState("delete") after -PASS [["delete",""]] "<table><tbody><tr><td>foo<td>ba[r<tr><td>baz<td>quz<tr><td>q]oz<td>qiz</table>" queryCommandValue("delete") after -PASS [["delete",""]] "<p>fo[o<table><tr><td>b]ar</table><p>baz": execCommand("delete", false, "") return value -PASS [["delete",""]] "<p>fo[o<table><tr><td>b]ar</table><p>baz" checks for modifications to non-editable content -PASS [["delete",""]] "<p>fo[o<table><tr><td>b]ar</table><p>baz" compare innerHTML -PASS [["delete",""]] "<p>fo[o<table><tr><td>b]ar</table><p>baz" queryCommandIndeterm("delete") before -PASS [["delete",""]] "<p>fo[o<table><tr><td>b]ar</table><p>baz" queryCommandState("delete") before -PASS [["delete",""]] "<p>fo[o<table><tr><td>b]ar</table><p>baz" queryCommandValue("delete") before -PASS [["delete",""]] "<p>fo[o<table><tr><td>b]ar</table><p>baz" queryCommandIndeterm("delete") after -PASS [["delete",""]] "<p>fo[o<table><tr><td>b]ar</table><p>baz" queryCommandState("delete") after -PASS [["delete",""]] "<p>fo[o<table><tr><td>b]ar</table><p>baz" queryCommandValue("delete") after -PASS [["delete",""]] "<p>foo<table><tr><td>ba[r</table><p>b]az": execCommand("delete", false, "") return value -PASS [["delete",""]] "<p>foo<table><tr><td>ba[r</table><p>b]az" checks for modifications to non-editable content -FAIL [["delete",""]] "<p>foo<table><tr><td>ba[r</table><p>b]az" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<p>foo</p><table><tbody><tr><td>ba</td></tr></tbody></table><p>az</p>" but got "<p>foo</p><table><tbody><tr><td>baaz</td></tr></tbody></table>" -PASS [["delete",""]] "<p>foo<table><tr><td>ba[r</table><p>b]az" queryCommandIndeterm("delete") before -PASS [["delete",""]] "<p>foo<table><tr><td>ba[r</table><p>b]az" queryCommandState("delete") before -PASS [["delete",""]] "<p>foo<table><tr><td>ba[r</table><p>b]az" queryCommandValue("delete") before -PASS [["delete",""]] "<p>foo<table><tr><td>ba[r</table><p>b]az" queryCommandIndeterm("delete") after -PASS [["delete",""]] "<p>foo<table><tr><td>ba[r</table><p>b]az" queryCommandState("delete") after -PASS [["delete",""]] "<p>foo<table><tr><td>ba[r</table><p>b]az" queryCommandValue("delete") after -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p>fo[o<table><tr><td>bar</table><p>b]az": execCommand("defaultparagraphseparator", false, "div") return value -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p>fo[o<table><tr><td>bar</table><p>b]az": execCommand("delete", false, "") return value -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p>fo[o<table><tr><td>bar</table><p>b]az" checks for modifications to non-editable content -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p>fo[o<table><tr><td>bar</table><p>b]az" compare innerHTML -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p>fo[o<table><tr><td>bar</table><p>b]az" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p>fo[o<table><tr><td>bar</table><p>b]az" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p>fo[o<table><tr><td>bar</table><p>b]az" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p>fo[o<table><tr><td>bar</table><p>b]az" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p>fo[o<table><tr><td>bar</table><p>b]az" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p>fo[o<table><tr><td>bar</table><p>b]az" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p>fo[o<table><tr><td>bar</table><p>b]az" queryCommandIndeterm("delete") before -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p>fo[o<table><tr><td>bar</table><p>b]az" queryCommandState("delete") before -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p>fo[o<table><tr><td>bar</table><p>b]az" queryCommandValue("delete") before -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p>fo[o<table><tr><td>bar</table><p>b]az" queryCommandIndeterm("delete") after -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p>fo[o<table><tr><td>bar</table><p>b]az" queryCommandState("delete") after -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p>fo[o<table><tr><td>bar</table><p>b]az" queryCommandValue("delete") after -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p>fo[o<table><tr><td>bar</table><p>b]az": execCommand("defaultparagraphseparator", false, "p") return value -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p>fo[o<table><tr><td>bar</table><p>b]az": execCommand("delete", false, "") return value -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p>fo[o<table><tr><td>bar</table><p>b]az" checks for modifications to non-editable content -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p>fo[o<table><tr><td>bar</table><p>b]az" compare innerHTML -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p>fo[o<table><tr><td>bar</table><p>b]az" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p>fo[o<table><tr><td>bar</table><p>b]az" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p>fo[o<table><tr><td>bar</table><p>b]az" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p>fo[o<table><tr><td>bar</table><p>b]az" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p>fo[o<table><tr><td>bar</table><p>b]az" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p>fo[o<table><tr><td>bar</table><p>b]az" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p>fo[o<table><tr><td>bar</table><p>b]az" queryCommandIndeterm("delete") before -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p>fo[o<table><tr><td>bar</table><p>b]az" queryCommandState("delete") before -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p>fo[o<table><tr><td>bar</table><p>b]az" queryCommandValue("delete") before -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p>fo[o<table><tr><td>bar</table><p>b]az" queryCommandIndeterm("delete") after -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p>fo[o<table><tr><td>bar</table><p>b]az" queryCommandState("delete") after -PASS [["defaultparagraphseparator","p"],["delete",""]] "<p>fo[o<table><tr><td>bar</table><p>b]az" queryCommandValue("delete") after -PASS [["delete",""]] "<p>foo<ol><li>ba[r<li>b]az</ol><p>quz": execCommand("delete", false, "") return value -PASS [["delete",""]] "<p>foo<ol><li>ba[r<li>b]az</ol><p>quz" checks for modifications to non-editable content -PASS [["delete",""]] "<p>foo<ol><li>ba[r<li>b]az</ol><p>quz" compare innerHTML -PASS [["delete",""]] "<p>foo<ol><li>ba[r<li>b]az</ol><p>quz" queryCommandIndeterm("delete") before -PASS [["delete",""]] "<p>foo<ol><li>ba[r<li>b]az</ol><p>quz" queryCommandState("delete") before -PASS [["delete",""]] "<p>foo<ol><li>ba[r<li>b]az</ol><p>quz" queryCommandValue("delete") before -PASS [["delete",""]] "<p>foo<ol><li>ba[r<li>b]az</ol><p>quz" queryCommandIndeterm("delete") after -PASS [["delete",""]] "<p>foo<ol><li>ba[r<li>b]az</ol><p>quz" queryCommandState("delete") after -PASS [["delete",""]] "<p>foo<ol><li>ba[r<li>b]az</ol><p>quz" queryCommandValue("delete") after -PASS [["delete",""]] "<p>foo<ol><li>bar<li>[baz]</ol><p>quz": execCommand("delete", false, "") return value -PASS [["delete",""]] "<p>foo<ol><li>bar<li>[baz]</ol><p>quz" checks for modifications to non-editable content -PASS [["delete",""]] "<p>foo<ol><li>bar<li>[baz]</ol><p>quz" compare innerHTML -PASS [["delete",""]] "<p>foo<ol><li>bar<li>[baz]</ol><p>quz" queryCommandIndeterm("delete") before -PASS [["delete",""]] "<p>foo<ol><li>bar<li>[baz]</ol><p>quz" queryCommandState("delete") before -PASS [["delete",""]] "<p>foo<ol><li>bar<li>[baz]</ol><p>quz" queryCommandValue("delete") before -PASS [["delete",""]] "<p>foo<ol><li>bar<li>[baz]</ol><p>quz" queryCommandIndeterm("delete") after -PASS [["delete",""]] "<p>foo<ol><li>bar<li>[baz]</ol><p>quz" queryCommandState("delete") after -PASS [["delete",""]] "<p>foo<ol><li>bar<li>[baz]</ol><p>quz" queryCommandValue("delete") after -PASS [["delete",""]] "<p>fo[o<ol><li>b]ar<li>baz</ol><p>quz": execCommand("delete", false, "") return value -PASS [["delete",""]] "<p>fo[o<ol><li>b]ar<li>baz</ol><p>quz" checks for modifications to non-editable content -PASS [["delete",""]] "<p>fo[o<ol><li>b]ar<li>baz</ol><p>quz" compare innerHTML -PASS [["delete",""]] "<p>fo[o<ol><li>b]ar<li>baz</ol><p>quz" queryCommandIndeterm("delete") before -PASS [["delete",""]] "<p>fo[o<ol><li>b]ar<li>baz</ol><p>quz" queryCommandState("delete") before -PASS [["delete",""]] "<p>fo[o<ol><li>b]ar<li>baz</ol><p>quz" queryCommandValue("delete") before -PASS [["delete",""]] "<p>fo[o<ol><li>b]ar<li>baz</ol><p>quz" queryCommandIndeterm("delete") after -PASS [["delete",""]] "<p>fo[o<ol><li>b]ar<li>baz</ol><p>quz" queryCommandState("delete") after -PASS [["delete",""]] "<p>fo[o<ol><li>b]ar<li>baz</ol><p>quz" queryCommandValue("delete") after -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p>foo<ol><li>bar<li>ba[z</ol><p>q]uz": execCommand("defaultparagraphseparator", false, "div") return value -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p>foo<ol><li>bar<li>ba[z</ol><p>q]uz": execCommand("delete", false, "") return value -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p>foo<ol><li>bar<li>ba[z</ol><p>q]uz" checks for modifications to non-editable content -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p>foo<ol><li>bar<li>ba[z</ol><p>q]uz" compare innerHTML -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p>foo<ol><li>bar<li>ba[z</ol><p>q]uz" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p>foo<ol><li>bar<li>ba[z</ol><p>q]uz" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p>foo<ol><li>bar<li>ba[z</ol><p>q]uz" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p>foo<ol><li>bar<li>ba[z</ol><p>q]uz" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p>foo<ol><li>bar<li>ba[z</ol><p>q]uz" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p>foo<ol><li>bar<li>ba[z</ol><p>q]uz" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["delete",""]] "<p>foo<ol><li>bar<li>ba[z</ol><p>q]uz" queryCommandIndeterm("delete") before -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/editing/run/forwarddelete_5001-6000-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/editing/run/forwarddelete_5001-6000-expected.txt deleted file mode 100644 index ce9671b..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/editing/run/forwarddelete_5001-6000-expected.txt +++ /dev/null
@@ -1,1004 +0,0 @@ -This is a testharness.js-based test. -Found 1000 tests; 978 PASS, 22 FAIL, 0 TIMEOUT, 0 NOTRUN. -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<div><p>foo[bar</div><p>baz]quz" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<div><p>foo[bar</div><p>baz]quz" queryCommandState("defaultparagraphseparator") before -FAIL [["defaultparagraphseparator","div"],["forwarddelete",""]] "<div><p>foo[bar</div><p>baz]quz" queryCommandValue("defaultparagraphseparator") before assert_equals: Wrong result returned expected "p" but got "div" -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<div><p>foo[bar</div><p>baz]quz" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<div><p>foo[bar</div><p>baz]quz" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<div><p>foo[bar</div><p>baz]quz" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<div><p>foo[bar</div><p>baz]quz" queryCommandIndeterm("forwarddelete") before -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<div><p>foo[bar</div><p>baz]quz" queryCommandState("forwarddelete") before -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<div><p>foo[bar</div><p>baz]quz" queryCommandValue("forwarddelete") before -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<div><p>foo[bar</div><p>baz]quz" queryCommandIndeterm("forwarddelete") after -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<div><p>foo[bar</div><p>baz]quz" queryCommandState("forwarddelete") after -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<div><p>foo[bar</div><p>baz]quz" queryCommandValue("forwarddelete") after -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<div><p>foo[bar</div><p>baz]quz": execCommand("defaultparagraphseparator", false, "p") return value -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<div><p>foo[bar</div><p>baz]quz": execCommand("forwarddelete", false, "") return value -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<div><p>foo[bar</div><p>baz]quz" checks for modifications to non-editable content -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<div><p>foo[bar</div><p>baz]quz" compare innerHTML -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<div><p>foo[bar</div><p>baz]quz" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<div><p>foo[bar</div><p>baz]quz" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<div><p>foo[bar</div><p>baz]quz" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<div><p>foo[bar</div><p>baz]quz" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<div><p>foo[bar</div><p>baz]quz" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<div><p>foo[bar</div><p>baz]quz" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<div><p>foo[bar</div><p>baz]quz" queryCommandIndeterm("forwarddelete") before -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<div><p>foo[bar</div><p>baz]quz" queryCommandState("forwarddelete") before -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<div><p>foo[bar</div><p>baz]quz" queryCommandValue("forwarddelete") before -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<div><p>foo[bar</div><p>baz]quz" queryCommandIndeterm("forwarddelete") after -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<div><p>foo[bar</div><p>baz]quz" queryCommandState("forwarddelete") after -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<div><p>foo[bar</div><p>baz]quz" queryCommandValue("forwarddelete") after -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo[bar<blockquote><p>baz]quz<p>qoz</blockquote": execCommand("defaultparagraphseparator", false, "div") return value -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo[bar<blockquote><p>baz]quz<p>qoz</blockquote": execCommand("forwarddelete", false, "") return value -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo[bar<blockquote><p>baz]quz<p>qoz</blockquote" checks for modifications to non-editable content -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo[bar<blockquote><p>baz]quz<p>qoz</blockquote" compare innerHTML -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo[bar<blockquote><p>baz]quz<p>qoz</blockquote" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo[bar<blockquote><p>baz]quz<p>qoz</blockquote" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo[bar<blockquote><p>baz]quz<p>qoz</blockquote" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo[bar<blockquote><p>baz]quz<p>qoz</blockquote" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo[bar<blockquote><p>baz]quz<p>qoz</blockquote" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo[bar<blockquote><p>baz]quz<p>qoz</blockquote" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo[bar<blockquote><p>baz]quz<p>qoz</blockquote" queryCommandIndeterm("forwarddelete") before -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo[bar<blockquote><p>baz]quz<p>qoz</blockquote" queryCommandState("forwarddelete") before -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo[bar<blockquote><p>baz]quz<p>qoz</blockquote" queryCommandValue("forwarddelete") before -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo[bar<blockquote><p>baz]quz<p>qoz</blockquote" queryCommandIndeterm("forwarddelete") after -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo[bar<blockquote><p>baz]quz<p>qoz</blockquote" queryCommandState("forwarddelete") after -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo[bar<blockquote><p>baz]quz<p>qoz</blockquote" queryCommandValue("forwarddelete") after -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo[bar<blockquote><p>baz]quz<p>qoz</blockquote": execCommand("defaultparagraphseparator", false, "p") return value -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo[bar<blockquote><p>baz]quz<p>qoz</blockquote": execCommand("forwarddelete", false, "") return value -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo[bar<blockquote><p>baz]quz<p>qoz</blockquote" checks for modifications to non-editable content -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo[bar<blockquote><p>baz]quz<p>qoz</blockquote" compare innerHTML -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo[bar<blockquote><p>baz]quz<p>qoz</blockquote" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo[bar<blockquote><p>baz]quz<p>qoz</blockquote" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo[bar<blockquote><p>baz]quz<p>qoz</blockquote" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo[bar<blockquote><p>baz]quz<p>qoz</blockquote" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo[bar<blockquote><p>baz]quz<p>qoz</blockquote" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo[bar<blockquote><p>baz]quz<p>qoz</blockquote" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo[bar<blockquote><p>baz]quz<p>qoz</blockquote" queryCommandIndeterm("forwarddelete") before -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo[bar<blockquote><p>baz]quz<p>qoz</blockquote" queryCommandState("forwarddelete") before -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo[bar<blockquote><p>baz]quz<p>qoz</blockquote" queryCommandValue("forwarddelete") before -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo[bar<blockquote><p>baz]quz<p>qoz</blockquote" queryCommandIndeterm("forwarddelete") after -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo[bar<blockquote><p>baz]quz<p>qoz</blockquote" queryCommandState("forwarddelete") after -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo[bar<blockquote><p>baz]quz<p>qoz</blockquote" queryCommandValue("forwarddelete") after -PASS [["stylewithcss","true"],["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo[bar<p style=color:blue>baz]quz": execCommand("stylewithcss", false, "true") return value -PASS [["stylewithcss","true"],["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo[bar<p style=color:blue>baz]quz": execCommand("defaultparagraphseparator", false, "div") return value -PASS [["stylewithcss","true"],["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo[bar<p style=color:blue>baz]quz": execCommand("forwarddelete", false, "") return value -PASS [["stylewithcss","true"],["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo[bar<p style=color:blue>baz]quz" checks for modifications to non-editable content -PASS [["stylewithcss","true"],["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo[bar<p style=color:blue>baz]quz" compare innerHTML -PASS [["stylewithcss","true"],["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandIndeterm("stylewithcss") before -FAIL [["stylewithcss","true"],["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandState("stylewithcss") before assert_equals: Wrong result returned expected false but got true -PASS [["stylewithcss","true"],["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandValue("stylewithcss") before -PASS [["stylewithcss","true"],["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandIndeterm("stylewithcss") after -PASS [["stylewithcss","true"],["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandState("stylewithcss") after -PASS [["stylewithcss","true"],["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandValue("stylewithcss") after -PASS [["stylewithcss","true"],["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["stylewithcss","true"],["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandState("defaultparagraphseparator") before -PASS [["stylewithcss","true"],["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandValue("defaultparagraphseparator") before -PASS [["stylewithcss","true"],["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["stylewithcss","true"],["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandState("defaultparagraphseparator") after -PASS [["stylewithcss","true"],["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandValue("defaultparagraphseparator") after -PASS [["stylewithcss","true"],["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandIndeterm("forwarddelete") before -PASS [["stylewithcss","true"],["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandState("forwarddelete") before -PASS [["stylewithcss","true"],["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandValue("forwarddelete") before -PASS [["stylewithcss","true"],["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandIndeterm("forwarddelete") after -PASS [["stylewithcss","true"],["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandState("forwarddelete") after -PASS [["stylewithcss","true"],["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandValue("forwarddelete") after -PASS [["stylewithcss","false"],["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo[bar<p style=color:blue>baz]quz": execCommand("stylewithcss", false, "false") return value -PASS [["stylewithcss","false"],["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo[bar<p style=color:blue>baz]quz": execCommand("defaultparagraphseparator", false, "div") return value -PASS [["stylewithcss","false"],["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo[bar<p style=color:blue>baz]quz": execCommand("forwarddelete", false, "") return value -PASS [["stylewithcss","false"],["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo[bar<p style=color:blue>baz]quz" checks for modifications to non-editable content -FAIL [["stylewithcss","false"],["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo[bar<p style=color:blue>baz]quz" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<p>foo<font color=\"#0000ff\">quz</font></p>" but got "<p>foo<span style=\"color:rgb(0, 0, 255)\">quz</span></p>" -PASS [["stylewithcss","false"],["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandIndeterm("stylewithcss") before -PASS [["stylewithcss","false"],["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandState("stylewithcss") before -PASS [["stylewithcss","false"],["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandValue("stylewithcss") before -PASS [["stylewithcss","false"],["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandIndeterm("stylewithcss") after -PASS [["stylewithcss","false"],["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandState("stylewithcss") after -PASS [["stylewithcss","false"],["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandValue("stylewithcss") after -PASS [["stylewithcss","false"],["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["stylewithcss","false"],["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandState("defaultparagraphseparator") before -PASS [["stylewithcss","false"],["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandValue("defaultparagraphseparator") before -PASS [["stylewithcss","false"],["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["stylewithcss","false"],["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandState("defaultparagraphseparator") after -PASS [["stylewithcss","false"],["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandValue("defaultparagraphseparator") after -PASS [["stylewithcss","false"],["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandIndeterm("forwarddelete") before -PASS [["stylewithcss","false"],["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandState("forwarddelete") before -PASS [["stylewithcss","false"],["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandValue("forwarddelete") before -PASS [["stylewithcss","false"],["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandIndeterm("forwarddelete") after -PASS [["stylewithcss","false"],["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandState("forwarddelete") after -PASS [["stylewithcss","false"],["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandValue("forwarddelete") after -PASS [["stylewithcss","true"],["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo[bar<p style=color:blue>baz]quz": execCommand("stylewithcss", false, "true") return value -PASS [["stylewithcss","true"],["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo[bar<p style=color:blue>baz]quz": execCommand("defaultparagraphseparator", false, "p") return value -PASS [["stylewithcss","true"],["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo[bar<p style=color:blue>baz]quz": execCommand("forwarddelete", false, "") return value -PASS [["stylewithcss","true"],["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo[bar<p style=color:blue>baz]quz" checks for modifications to non-editable content -PASS [["stylewithcss","true"],["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo[bar<p style=color:blue>baz]quz" compare innerHTML -PASS [["stylewithcss","true"],["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandIndeterm("stylewithcss") before -PASS [["stylewithcss","true"],["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandState("stylewithcss") before -PASS [["stylewithcss","true"],["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandValue("stylewithcss") before -PASS [["stylewithcss","true"],["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandIndeterm("stylewithcss") after -PASS [["stylewithcss","true"],["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandState("stylewithcss") after -PASS [["stylewithcss","true"],["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandValue("stylewithcss") after -PASS [["stylewithcss","true"],["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["stylewithcss","true"],["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandState("defaultparagraphseparator") before -PASS [["stylewithcss","true"],["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandValue("defaultparagraphseparator") before -PASS [["stylewithcss","true"],["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["stylewithcss","true"],["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandState("defaultparagraphseparator") after -PASS [["stylewithcss","true"],["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandValue("defaultparagraphseparator") after -PASS [["stylewithcss","true"],["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandIndeterm("forwarddelete") before -PASS [["stylewithcss","true"],["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandState("forwarddelete") before -PASS [["stylewithcss","true"],["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandValue("forwarddelete") before -PASS [["stylewithcss","true"],["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandIndeterm("forwarddelete") after -PASS [["stylewithcss","true"],["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandState("forwarddelete") after -PASS [["stylewithcss","true"],["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandValue("forwarddelete") after -PASS [["stylewithcss","false"],["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo[bar<p style=color:blue>baz]quz": execCommand("stylewithcss", false, "false") return value -PASS [["stylewithcss","false"],["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo[bar<p style=color:blue>baz]quz": execCommand("defaultparagraphseparator", false, "p") return value -PASS [["stylewithcss","false"],["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo[bar<p style=color:blue>baz]quz": execCommand("forwarddelete", false, "") return value -PASS [["stylewithcss","false"],["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo[bar<p style=color:blue>baz]quz" checks for modifications to non-editable content -FAIL [["stylewithcss","false"],["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo[bar<p style=color:blue>baz]quz" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<p>foo<font color=\"#0000ff\">quz</font></p>" but got "<p>foo<span style=\"color:rgb(0, 0, 255)\">quz</span></p>" -PASS [["stylewithcss","false"],["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandIndeterm("stylewithcss") before -PASS [["stylewithcss","false"],["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandState("stylewithcss") before -PASS [["stylewithcss","false"],["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandValue("stylewithcss") before -PASS [["stylewithcss","false"],["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandIndeterm("stylewithcss") after -PASS [["stylewithcss","false"],["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandState("stylewithcss") after -PASS [["stylewithcss","false"],["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandValue("stylewithcss") after -PASS [["stylewithcss","false"],["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["stylewithcss","false"],["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandState("defaultparagraphseparator") before -PASS [["stylewithcss","false"],["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandValue("defaultparagraphseparator") before -PASS [["stylewithcss","false"],["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["stylewithcss","false"],["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandState("defaultparagraphseparator") after -PASS [["stylewithcss","false"],["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandValue("defaultparagraphseparator") after -PASS [["stylewithcss","false"],["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandIndeterm("forwarddelete") before -PASS [["stylewithcss","false"],["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandState("forwarddelete") before -PASS [["stylewithcss","false"],["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandValue("forwarddelete") before -PASS [["stylewithcss","false"],["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandIndeterm("forwarddelete") after -PASS [["stylewithcss","false"],["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandState("forwarddelete") after -PASS [["stylewithcss","false"],["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo[bar<p style=color:blue>baz]quz" queryCommandValue("forwarddelete") after -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo[bar<p><b>baz]quz</b>": execCommand("defaultparagraphseparator", false, "div") return value -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo[bar<p><b>baz]quz</b>": execCommand("forwarddelete", false, "") return value -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo[bar<p><b>baz]quz</b>" checks for modifications to non-editable content -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo[bar<p><b>baz]quz</b>" compare innerHTML -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo[bar<p><b>baz]quz</b>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo[bar<p><b>baz]quz</b>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo[bar<p><b>baz]quz</b>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo[bar<p><b>baz]quz</b>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo[bar<p><b>baz]quz</b>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo[bar<p><b>baz]quz</b>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo[bar<p><b>baz]quz</b>" queryCommandIndeterm("forwarddelete") before -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo[bar<p><b>baz]quz</b>" queryCommandState("forwarddelete") before -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo[bar<p><b>baz]quz</b>" queryCommandValue("forwarddelete") before -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo[bar<p><b>baz]quz</b>" queryCommandIndeterm("forwarddelete") after -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo[bar<p><b>baz]quz</b>" queryCommandState("forwarddelete") after -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo[bar<p><b>baz]quz</b>" queryCommandValue("forwarddelete") after -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo[bar<p><b>baz]quz</b>": execCommand("defaultparagraphseparator", false, "p") return value -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo[bar<p><b>baz]quz</b>": execCommand("forwarddelete", false, "") return value -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo[bar<p><b>baz]quz</b>" checks for modifications to non-editable content -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo[bar<p><b>baz]quz</b>" compare innerHTML -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo[bar<p><b>baz]quz</b>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo[bar<p><b>baz]quz</b>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo[bar<p><b>baz]quz</b>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo[bar<p><b>baz]quz</b>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo[bar<p><b>baz]quz</b>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo[bar<p><b>baz]quz</b>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo[bar<p><b>baz]quz</b>" queryCommandIndeterm("forwarddelete") before -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo[bar<p><b>baz]quz</b>" queryCommandState("forwarddelete") before -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo[bar<p><b>baz]quz</b>" queryCommandValue("forwarddelete") before -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo[bar<p><b>baz]quz</b>" queryCommandIndeterm("forwarddelete") after -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo[bar<p><b>baz]quz</b>" queryCommandState("forwarddelete") after -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo[bar<p><b>baz]quz</b>" queryCommandValue("forwarddelete") after -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<div><p>foo<p>[bar<p>baz]</div>": execCommand("defaultparagraphseparator", false, "div") return value -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<div><p>foo<p>[bar<p>baz]</div>": execCommand("forwarddelete", false, "") return value -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<div><p>foo<p>[bar<p>baz]</div>" checks for modifications to non-editable content -FAIL [["defaultparagraphseparator","div"],["forwarddelete",""]] "<div><p>foo<p>[bar<p>baz]</div>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<div><p>foo</p><p><br></p></div>" but got "<p>foo</p><p><br></p>" -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<div><p>foo<p>[bar<p>baz]</div>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<div><p>foo<p>[bar<p>baz]</div>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<div><p>foo<p>[bar<p>baz]</div>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<div><p>foo<p>[bar<p>baz]</div>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<div><p>foo<p>[bar<p>baz]</div>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<div><p>foo<p>[bar<p>baz]</div>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<div><p>foo<p>[bar<p>baz]</div>" queryCommandIndeterm("forwarddelete") before -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<div><p>foo<p>[bar<p>baz]</div>" queryCommandState("forwarddelete") before -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<div><p>foo<p>[bar<p>baz]</div>" queryCommandValue("forwarddelete") before -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<div><p>foo<p>[bar<p>baz]</div>" queryCommandIndeterm("forwarddelete") after -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<div><p>foo<p>[bar<p>baz]</div>" queryCommandState("forwarddelete") after -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<div><p>foo<p>[bar<p>baz]</div>" queryCommandValue("forwarddelete") after -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<div><p>foo<p>[bar<p>baz]</div>": execCommand("defaultparagraphseparator", false, "p") return value -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<div><p>foo<p>[bar<p>baz]</div>": execCommand("forwarddelete", false, "") return value -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<div><p>foo<p>[bar<p>baz]</div>" checks for modifications to non-editable content -FAIL [["defaultparagraphseparator","p"],["forwarddelete",""]] "<div><p>foo<p>[bar<p>baz]</div>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<div><p>foo</p><p><br></p></div>" but got "<p>foo</p><p><br></p>" -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<div><p>foo<p>[bar<p>baz]</div>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<div><p>foo<p>[bar<p>baz]</div>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<div><p>foo<p>[bar<p>baz]</div>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<div><p>foo<p>[bar<p>baz]</div>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<div><p>foo<p>[bar<p>baz]</div>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<div><p>foo<p>[bar<p>baz]</div>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<div><p>foo<p>[bar<p>baz]</div>" queryCommandIndeterm("forwarddelete") before -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<div><p>foo<p>[bar<p>baz]</div>" queryCommandState("forwarddelete") before -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<div><p>foo<p>[bar<p>baz]</div>" queryCommandValue("forwarddelete") before -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<div><p>foo<p>[bar<p>baz]</div>" queryCommandIndeterm("forwarddelete") after -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<div><p>foo<p>[bar<p>baz]</div>" queryCommandState("forwarddelete") after -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<div><p>foo<p>[bar<p>baz]</div>" queryCommandValue("forwarddelete") after -PASS [["forwarddelete",""]] "foo[<br>]bar": execCommand("forwarddelete", false, "") return value -PASS [["forwarddelete",""]] "foo[<br>]bar" checks for modifications to non-editable content -PASS [["forwarddelete",""]] "foo[<br>]bar" compare innerHTML -PASS [["forwarddelete",""]] "foo[<br>]bar" queryCommandIndeterm("forwarddelete") before -PASS [["forwarddelete",""]] "foo[<br>]bar" queryCommandState("forwarddelete") before -PASS [["forwarddelete",""]] "foo[<br>]bar" queryCommandValue("forwarddelete") before -PASS [["forwarddelete",""]] "foo[<br>]bar" queryCommandIndeterm("forwarddelete") after -PASS [["forwarddelete",""]] "foo[<br>]bar" queryCommandState("forwarddelete") after -PASS [["forwarddelete",""]] "foo[<br>]bar" queryCommandValue("forwarddelete") after -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo[</p><p>]bar</p>": execCommand("defaultparagraphseparator", false, "div") return value -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo[</p><p>]bar</p>": execCommand("forwarddelete", false, "") return value -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo[</p><p>]bar</p>" checks for modifications to non-editable content -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo[</p><p>]bar</p>" compare innerHTML -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo[</p><p>]bar</p>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo[</p><p>]bar</p>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo[</p><p>]bar</p>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo[</p><p>]bar</p>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo[</p><p>]bar</p>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo[</p><p>]bar</p>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo[</p><p>]bar</p>" queryCommandIndeterm("forwarddelete") before -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo[</p><p>]bar</p>" queryCommandState("forwarddelete") before -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo[</p><p>]bar</p>" queryCommandValue("forwarddelete") before -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo[</p><p>]bar</p>" queryCommandIndeterm("forwarddelete") after -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo[</p><p>]bar</p>" queryCommandState("forwarddelete") after -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo[</p><p>]bar</p>" queryCommandValue("forwarddelete") after -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo[</p><p>]bar</p>": execCommand("defaultparagraphseparator", false, "p") return value -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo[</p><p>]bar</p>": execCommand("forwarddelete", false, "") return value -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo[</p><p>]bar</p>" checks for modifications to non-editable content -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo[</p><p>]bar</p>" compare innerHTML -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo[</p><p>]bar</p>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo[</p><p>]bar</p>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo[</p><p>]bar</p>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo[</p><p>]bar</p>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo[</p><p>]bar</p>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo[</p><p>]bar</p>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo[</p><p>]bar</p>" queryCommandIndeterm("forwarddelete") before -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo[</p><p>]bar</p>" queryCommandState("forwarddelete") before -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo[</p><p>]bar</p>" queryCommandValue("forwarddelete") before -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo[</p><p>]bar</p>" queryCommandIndeterm("forwarddelete") after -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo[</p><p>]bar</p>" queryCommandState("forwarddelete") after -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo[</p><p>]bar</p>" queryCommandValue("forwarddelete") after -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo[</p><p>]bar<br>baz</p>": execCommand("defaultparagraphseparator", false, "div") return value -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo[</p><p>]bar<br>baz</p>": execCommand("forwarddelete", false, "") return value -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo[</p><p>]bar<br>baz</p>" checks for modifications to non-editable content -FAIL [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo[</p><p>]bar<br>baz</p>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<p>foobar<br>baz</p>" but got "<p>foobar</p><p>baz</p>" -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo[</p><p>]bar<br>baz</p>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo[</p><p>]bar<br>baz</p>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo[</p><p>]bar<br>baz</p>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo[</p><p>]bar<br>baz</p>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo[</p><p>]bar<br>baz</p>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo[</p><p>]bar<br>baz</p>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo[</p><p>]bar<br>baz</p>" queryCommandIndeterm("forwarddelete") before -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo[</p><p>]bar<br>baz</p>" queryCommandState("forwarddelete") before -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo[</p><p>]bar<br>baz</p>" queryCommandValue("forwarddelete") before -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo[</p><p>]bar<br>baz</p>" queryCommandIndeterm("forwarddelete") after -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo[</p><p>]bar<br>baz</p>" queryCommandState("forwarddelete") after -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo[</p><p>]bar<br>baz</p>" queryCommandValue("forwarddelete") after -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo[</p><p>]bar<br>baz</p>": execCommand("defaultparagraphseparator", false, "p") return value -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo[</p><p>]bar<br>baz</p>": execCommand("forwarddelete", false, "") return value -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo[</p><p>]bar<br>baz</p>" checks for modifications to non-editable content -FAIL [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo[</p><p>]bar<br>baz</p>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<p>foobar<br>baz</p>" but got "<p>foobar</p><p>baz</p>" -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo[</p><p>]bar<br>baz</p>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo[</p><p>]bar<br>baz</p>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo[</p><p>]bar<br>baz</p>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo[</p><p>]bar<br>baz</p>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo[</p><p>]bar<br>baz</p>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo[</p><p>]bar<br>baz</p>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo[</p><p>]bar<br>baz</p>" queryCommandIndeterm("forwarddelete") before -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo[</p><p>]bar<br>baz</p>" queryCommandState("forwarddelete") before -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo[</p><p>]bar<br>baz</p>" queryCommandValue("forwarddelete") before -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo[</p><p>]bar<br>baz</p>" queryCommandIndeterm("forwarddelete") after -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo[</p><p>]bar<br>baz</p>" queryCommandState("forwarddelete") after -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo[</p><p>]bar<br>baz</p>" queryCommandValue("forwarddelete") after -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo[<p>]bar</p>": execCommand("defaultparagraphseparator", false, "div") return value -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo[<p>]bar</p>": execCommand("forwarddelete", false, "") return value -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo[<p>]bar</p>" checks for modifications to non-editable content -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo[<p>]bar</p>" compare innerHTML -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo[<p>]bar</p>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo[<p>]bar</p>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo[<p>]bar</p>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo[<p>]bar</p>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo[<p>]bar</p>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo[<p>]bar</p>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo[<p>]bar</p>" queryCommandIndeterm("forwarddelete") before -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo[<p>]bar</p>" queryCommandState("forwarddelete") before -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo[<p>]bar</p>" queryCommandValue("forwarddelete") before -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo[<p>]bar</p>" queryCommandIndeterm("forwarddelete") after -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo[<p>]bar</p>" queryCommandState("forwarddelete") after -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo[<p>]bar</p>" queryCommandValue("forwarddelete") after -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo[<p>]bar</p>": execCommand("defaultparagraphseparator", false, "p") return value -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo[<p>]bar</p>": execCommand("forwarddelete", false, "") return value -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo[<p>]bar</p>" checks for modifications to non-editable content -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo[<p>]bar</p>" compare innerHTML -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo[<p>]bar</p>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo[<p>]bar</p>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo[<p>]bar</p>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo[<p>]bar</p>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo[<p>]bar</p>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo[<p>]bar</p>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo[<p>]bar</p>" queryCommandIndeterm("forwarddelete") before -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo[<p>]bar</p>" queryCommandState("forwarddelete") before -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo[<p>]bar</p>" queryCommandValue("forwarddelete") before -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo[<p>]bar</p>" queryCommandIndeterm("forwarddelete") after -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo[<p>]bar</p>" queryCommandState("forwarddelete") after -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo[<p>]bar</p>" queryCommandValue("forwarddelete") after -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo{<p>}bar</p>": execCommand("defaultparagraphseparator", false, "div") return value -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo{<p>}bar</p>": execCommand("forwarddelete", false, "") return value -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo{<p>}bar</p>" checks for modifications to non-editable content -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo{<p>}bar</p>" compare innerHTML -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo{<p>}bar</p>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo{<p>}bar</p>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo{<p>}bar</p>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo{<p>}bar</p>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo{<p>}bar</p>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo{<p>}bar</p>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo{<p>}bar</p>" queryCommandIndeterm("forwarddelete") before -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo{<p>}bar</p>" queryCommandState("forwarddelete") before -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo{<p>}bar</p>" queryCommandValue("forwarddelete") before -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo{<p>}bar</p>" queryCommandIndeterm("forwarddelete") after -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo{<p>}bar</p>" queryCommandState("forwarddelete") after -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo{<p>}bar</p>" queryCommandValue("forwarddelete") after -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo{<p>}bar</p>": execCommand("defaultparagraphseparator", false, "p") return value -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo{<p>}bar</p>": execCommand("forwarddelete", false, "") return value -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo{<p>}bar</p>" checks for modifications to non-editable content -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo{<p>}bar</p>" compare innerHTML -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo{<p>}bar</p>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo{<p>}bar</p>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo{<p>}bar</p>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo{<p>}bar</p>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo{<p>}bar</p>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo{<p>}bar</p>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo{<p>}bar</p>" queryCommandIndeterm("forwarddelete") before -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo{<p>}bar</p>" queryCommandState("forwarddelete") before -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo{<p>}bar</p>" queryCommandValue("forwarddelete") before -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo{<p>}bar</p>" queryCommandIndeterm("forwarddelete") after -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo{<p>}bar</p>" queryCommandState("forwarddelete") after -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo{<p>}bar</p>" queryCommandValue("forwarddelete") after -PASS [["forwarddelete",""]] "foo[<p>]bar<br>baz</p>": execCommand("forwarddelete", false, "") return value -PASS [["forwarddelete",""]] "foo[<p>]bar<br>baz</p>" checks for modifications to non-editable content -PASS [["forwarddelete",""]] "foo[<p>]bar<br>baz</p>" compare innerHTML -PASS [["forwarddelete",""]] "foo[<p>]bar<br>baz</p>" queryCommandIndeterm("forwarddelete") before -PASS [["forwarddelete",""]] "foo[<p>]bar<br>baz</p>" queryCommandState("forwarddelete") before -PASS [["forwarddelete",""]] "foo[<p>]bar<br>baz</p>" queryCommandValue("forwarddelete") before -PASS [["forwarddelete",""]] "foo[<p>]bar<br>baz</p>" queryCommandIndeterm("forwarddelete") after -PASS [["forwarddelete",""]] "foo[<p>]bar<br>baz</p>" queryCommandState("forwarddelete") after -PASS [["forwarddelete",""]] "foo[<p>]bar<br>baz</p>" queryCommandValue("forwarddelete") after -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo[<p>]bar</p>baz": execCommand("defaultparagraphseparator", false, "div") return value -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo[<p>]bar</p>baz": execCommand("forwarddelete", false, "") return value -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo[<p>]bar</p>baz" checks for modifications to non-editable content -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo[<p>]bar</p>baz" compare innerHTML -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo[<p>]bar</p>baz" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo[<p>]bar</p>baz" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo[<p>]bar</p>baz" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo[<p>]bar</p>baz" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo[<p>]bar</p>baz" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo[<p>]bar</p>baz" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo[<p>]bar</p>baz" queryCommandIndeterm("forwarddelete") before -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo[<p>]bar</p>baz" queryCommandState("forwarddelete") before -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo[<p>]bar</p>baz" queryCommandValue("forwarddelete") before -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo[<p>]bar</p>baz" queryCommandIndeterm("forwarddelete") after -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo[<p>]bar</p>baz" queryCommandState("forwarddelete") after -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo[<p>]bar</p>baz" queryCommandValue("forwarddelete") after -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo[<p>]bar</p>baz": execCommand("defaultparagraphseparator", false, "p") return value -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo[<p>]bar</p>baz": execCommand("forwarddelete", false, "") return value -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo[<p>]bar</p>baz" checks for modifications to non-editable content -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo[<p>]bar</p>baz" compare innerHTML -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo[<p>]bar</p>baz" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo[<p>]bar</p>baz" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo[<p>]bar</p>baz" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo[<p>]bar</p>baz" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo[<p>]bar</p>baz" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo[<p>]bar</p>baz" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo[<p>]bar</p>baz" queryCommandIndeterm("forwarddelete") before -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo[<p>]bar</p>baz" queryCommandState("forwarddelete") before -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo[<p>]bar</p>baz" queryCommandValue("forwarddelete") before -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo[<p>]bar</p>baz" queryCommandIndeterm("forwarddelete") after -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo[<p>]bar</p>baz" queryCommandState("forwarddelete") after -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo[<p>]bar</p>baz" queryCommandValue("forwarddelete") after -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo{<p>bar</p>}baz": execCommand("defaultparagraphseparator", false, "div") return value -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo{<p>bar</p>}baz": execCommand("forwarddelete", false, "") return value -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo{<p>bar</p>}baz" checks for modifications to non-editable content -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo{<p>bar</p>}baz" compare innerHTML -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo{<p>bar</p>}baz" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo{<p>bar</p>}baz" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo{<p>bar</p>}baz" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo{<p>bar</p>}baz" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo{<p>bar</p>}baz" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo{<p>bar</p>}baz" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo{<p>bar</p>}baz" queryCommandIndeterm("forwarddelete") before -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo{<p>bar</p>}baz" queryCommandState("forwarddelete") before -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo{<p>bar</p>}baz" queryCommandValue("forwarddelete") before -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo{<p>bar</p>}baz" queryCommandIndeterm("forwarddelete") after -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo{<p>bar</p>}baz" queryCommandState("forwarddelete") after -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo{<p>bar</p>}baz" queryCommandValue("forwarddelete") after -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo{<p>bar</p>}baz": execCommand("defaultparagraphseparator", false, "p") return value -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo{<p>bar</p>}baz": execCommand("forwarddelete", false, "") return value -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo{<p>bar</p>}baz" checks for modifications to non-editable content -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo{<p>bar</p>}baz" compare innerHTML -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo{<p>bar</p>}baz" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo{<p>bar</p>}baz" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo{<p>bar</p>}baz" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo{<p>bar</p>}baz" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo{<p>bar</p>}baz" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo{<p>bar</p>}baz" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo{<p>bar</p>}baz" queryCommandIndeterm("forwarddelete") before -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo{<p>bar</p>}baz" queryCommandState("forwarddelete") before -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo{<p>bar</p>}baz" queryCommandValue("forwarddelete") before -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo{<p>bar</p>}baz" queryCommandIndeterm("forwarddelete") after -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo{<p>bar</p>}baz" queryCommandState("forwarddelete") after -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo{<p>bar</p>}baz" queryCommandValue("forwarddelete") after -PASS [["forwarddelete",""]] "foo<p>{bar</p>}baz": execCommand("forwarddelete", false, "") return value -PASS [["forwarddelete",""]] "foo<p>{bar</p>}baz" checks for modifications to non-editable content -FAIL [["forwarddelete",""]] "foo<p>{bar</p>}baz" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "foo<p>baz</p>" but got "foo<p>baz<br></p>" -PASS [["forwarddelete",""]] "foo<p>{bar</p>}baz" queryCommandIndeterm("forwarddelete") before -PASS [["forwarddelete",""]] "foo<p>{bar</p>}baz" queryCommandState("forwarddelete") before -PASS [["forwarddelete",""]] "foo<p>{bar</p>}baz" queryCommandValue("forwarddelete") before -PASS [["forwarddelete",""]] "foo<p>{bar</p>}baz" queryCommandIndeterm("forwarddelete") after -PASS [["forwarddelete",""]] "foo<p>{bar</p>}baz" queryCommandState("forwarddelete") after -PASS [["forwarddelete",""]] "foo<p>{bar</p>}baz" queryCommandValue("forwarddelete") after -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo{<p>bar}</p>baz": execCommand("defaultparagraphseparator", false, "div") return value -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo{<p>bar}</p>baz": execCommand("forwarddelete", false, "") return value -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo{<p>bar}</p>baz" checks for modifications to non-editable content -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo{<p>bar}</p>baz" compare innerHTML -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo{<p>bar}</p>baz" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo{<p>bar}</p>baz" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo{<p>bar}</p>baz" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo{<p>bar}</p>baz" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo{<p>bar}</p>baz" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo{<p>bar}</p>baz" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo{<p>bar}</p>baz" queryCommandIndeterm("forwarddelete") before -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo{<p>bar}</p>baz" queryCommandState("forwarddelete") before -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo{<p>bar}</p>baz" queryCommandValue("forwarddelete") before -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo{<p>bar}</p>baz" queryCommandIndeterm("forwarddelete") after -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo{<p>bar}</p>baz" queryCommandState("forwarddelete") after -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo{<p>bar}</p>baz" queryCommandValue("forwarddelete") after -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo{<p>bar}</p>baz": execCommand("defaultparagraphseparator", false, "p") return value -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo{<p>bar}</p>baz": execCommand("forwarddelete", false, "") return value -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo{<p>bar}</p>baz" checks for modifications to non-editable content -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo{<p>bar}</p>baz" compare innerHTML -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo{<p>bar}</p>baz" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo{<p>bar}</p>baz" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo{<p>bar}</p>baz" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo{<p>bar}</p>baz" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo{<p>bar}</p>baz" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo{<p>bar}</p>baz" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo{<p>bar}</p>baz" queryCommandIndeterm("forwarddelete") before -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo{<p>bar}</p>baz" queryCommandState("forwarddelete") before -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo{<p>bar}</p>baz" queryCommandValue("forwarddelete") before -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo{<p>bar}</p>baz" queryCommandIndeterm("forwarddelete") after -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo{<p>bar}</p>baz" queryCommandState("forwarddelete") after -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo{<p>bar}</p>baz" queryCommandValue("forwarddelete") after -PASS [["forwarddelete",""]] "<p>foo[</p>]bar": execCommand("forwarddelete", false, "") return value -PASS [["forwarddelete",""]] "<p>foo[</p>]bar" checks for modifications to non-editable content -PASS [["forwarddelete",""]] "<p>foo[</p>]bar" compare innerHTML -PASS [["forwarddelete",""]] "<p>foo[</p>]bar" queryCommandIndeterm("forwarddelete") before -PASS [["forwarddelete",""]] "<p>foo[</p>]bar" queryCommandState("forwarddelete") before -PASS [["forwarddelete",""]] "<p>foo[</p>]bar" queryCommandValue("forwarddelete") before -PASS [["forwarddelete",""]] "<p>foo[</p>]bar" queryCommandIndeterm("forwarddelete") after -PASS [["forwarddelete",""]] "<p>foo[</p>]bar" queryCommandState("forwarddelete") after -PASS [["forwarddelete",""]] "<p>foo[</p>]bar" queryCommandValue("forwarddelete") after -PASS [["forwarddelete",""]] "<p>foo{</p>}bar": execCommand("forwarddelete", false, "") return value -PASS [["forwarddelete",""]] "<p>foo{</p>}bar" checks for modifications to non-editable content -PASS [["forwarddelete",""]] "<p>foo{</p>}bar" compare innerHTML -PASS [["forwarddelete",""]] "<p>foo{</p>}bar" queryCommandIndeterm("forwarddelete") before -PASS [["forwarddelete",""]] "<p>foo{</p>}bar" queryCommandState("forwarddelete") before -PASS [["forwarddelete",""]] "<p>foo{</p>}bar" queryCommandValue("forwarddelete") before -PASS [["forwarddelete",""]] "<p>foo{</p>}bar" queryCommandIndeterm("forwarddelete") after -PASS [["forwarddelete",""]] "<p>foo{</p>}bar" queryCommandState("forwarddelete") after -PASS [["forwarddelete",""]] "<p>foo{</p>}bar" queryCommandValue("forwarddelete") after -PASS [["forwarddelete",""]] "<p>foo[</p>]bar<br>baz": execCommand("forwarddelete", false, "") return value -PASS [["forwarddelete",""]] "<p>foo[</p>]bar<br>baz" checks for modifications to non-editable content -PASS [["forwarddelete",""]] "<p>foo[</p>]bar<br>baz" compare innerHTML -PASS [["forwarddelete",""]] "<p>foo[</p>]bar<br>baz" queryCommandIndeterm("forwarddelete") before -PASS [["forwarddelete",""]] "<p>foo[</p>]bar<br>baz" queryCommandState("forwarddelete") before -PASS [["forwarddelete",""]] "<p>foo[</p>]bar<br>baz" queryCommandValue("forwarddelete") before -PASS [["forwarddelete",""]] "<p>foo[</p>]bar<br>baz" queryCommandIndeterm("forwarddelete") after -PASS [["forwarddelete",""]] "<p>foo[</p>]bar<br>baz" queryCommandState("forwarddelete") after -PASS [["forwarddelete",""]] "<p>foo[</p>]bar<br>baz" queryCommandValue("forwarddelete") after -PASS [["forwarddelete",""]] "<p>foo[</p>]bar<p>baz</p>": execCommand("forwarddelete", false, "") return value -PASS [["forwarddelete",""]] "<p>foo[</p>]bar<p>baz</p>" checks for modifications to non-editable content -PASS [["forwarddelete",""]] "<p>foo[</p>]bar<p>baz</p>" compare innerHTML -PASS [["forwarddelete",""]] "<p>foo[</p>]bar<p>baz</p>" queryCommandIndeterm("forwarddelete") before -PASS [["forwarddelete",""]] "<p>foo[</p>]bar<p>baz</p>" queryCommandState("forwarddelete") before -PASS [["forwarddelete",""]] "<p>foo[</p>]bar<p>baz</p>" queryCommandValue("forwarddelete") before -PASS [["forwarddelete",""]] "<p>foo[</p>]bar<p>baz</p>" queryCommandIndeterm("forwarddelete") after -PASS [["forwarddelete",""]] "<p>foo[</p>]bar<p>baz</p>" queryCommandState("forwarddelete") after -PASS [["forwarddelete",""]] "<p>foo[</p>]bar<p>baz</p>" queryCommandValue("forwarddelete") after -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo[<div><p>]bar</div>": execCommand("defaultparagraphseparator", false, "div") return value -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo[<div><p>]bar</div>": execCommand("forwarddelete", false, "") return value -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo[<div><p>]bar</div>" checks for modifications to non-editable content -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo[<div><p>]bar</div>" compare innerHTML -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo[<div><p>]bar</div>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo[<div><p>]bar</div>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo[<div><p>]bar</div>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo[<div><p>]bar</div>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo[<div><p>]bar</div>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo[<div><p>]bar</div>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo[<div><p>]bar</div>" queryCommandIndeterm("forwarddelete") before -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo[<div><p>]bar</div>" queryCommandState("forwarddelete") before -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo[<div><p>]bar</div>" queryCommandValue("forwarddelete") before -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo[<div><p>]bar</div>" queryCommandIndeterm("forwarddelete") after -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo[<div><p>]bar</div>" queryCommandState("forwarddelete") after -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo[<div><p>]bar</div>" queryCommandValue("forwarddelete") after -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo[<div><p>]bar</div>": execCommand("defaultparagraphseparator", false, "p") return value -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo[<div><p>]bar</div>": execCommand("forwarddelete", false, "") return value -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo[<div><p>]bar</div>" checks for modifications to non-editable content -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo[<div><p>]bar</div>" compare innerHTML -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo[<div><p>]bar</div>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo[<div><p>]bar</div>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo[<div><p>]bar</div>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo[<div><p>]bar</div>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo[<div><p>]bar</div>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo[<div><p>]bar</div>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo[<div><p>]bar</div>" queryCommandIndeterm("forwarddelete") before -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo[<div><p>]bar</div>" queryCommandState("forwarddelete") before -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo[<div><p>]bar</div>" queryCommandValue("forwarddelete") before -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo[<div><p>]bar</div>" queryCommandIndeterm("forwarddelete") after -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo[<div><p>]bar</div>" queryCommandState("forwarddelete") after -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo[<div><p>]bar</div>" queryCommandValue("forwarddelete") after -PASS [["forwarddelete",""]] "<div><p>foo[</p></div>]bar": execCommand("forwarddelete", false, "") return value -PASS [["forwarddelete",""]] "<div><p>foo[</p></div>]bar" checks for modifications to non-editable content -PASS [["forwarddelete",""]] "<div><p>foo[</p></div>]bar" compare innerHTML -PASS [["forwarddelete",""]] "<div><p>foo[</p></div>]bar" queryCommandIndeterm("forwarddelete") before -PASS [["forwarddelete",""]] "<div><p>foo[</p></div>]bar" queryCommandState("forwarddelete") before -PASS [["forwarddelete",""]] "<div><p>foo[</p></div>]bar" queryCommandValue("forwarddelete") before -PASS [["forwarddelete",""]] "<div><p>foo[</p></div>]bar" queryCommandIndeterm("forwarddelete") after -PASS [["forwarddelete",""]] "<div><p>foo[</p></div>]bar" queryCommandState("forwarddelete") after -PASS [["forwarddelete",""]] "<div><p>foo[</p></div>]bar" queryCommandValue("forwarddelete") after -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo[<div><p>]bar</p>baz</div>": execCommand("defaultparagraphseparator", false, "div") return value -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo[<div><p>]bar</p>baz</div>": execCommand("forwarddelete", false, "") return value -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo[<div><p>]bar</p>baz</div>" checks for modifications to non-editable content -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo[<div><p>]bar</p>baz</div>" compare innerHTML -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo[<div><p>]bar</p>baz</div>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo[<div><p>]bar</p>baz</div>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo[<div><p>]bar</p>baz</div>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo[<div><p>]bar</p>baz</div>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo[<div><p>]bar</p>baz</div>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo[<div><p>]bar</p>baz</div>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo[<div><p>]bar</p>baz</div>" queryCommandIndeterm("forwarddelete") before -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo[<div><p>]bar</p>baz</div>" queryCommandState("forwarddelete") before -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo[<div><p>]bar</p>baz</div>" queryCommandValue("forwarddelete") before -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo[<div><p>]bar</p>baz</div>" queryCommandIndeterm("forwarddelete") after -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo[<div><p>]bar</p>baz</div>" queryCommandState("forwarddelete") after -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo[<div><p>]bar</p>baz</div>" queryCommandValue("forwarddelete") after -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo[<div><p>]bar</p>baz</div>": execCommand("defaultparagraphseparator", false, "p") return value -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo[<div><p>]bar</p>baz</div>": execCommand("forwarddelete", false, "") return value -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo[<div><p>]bar</p>baz</div>" checks for modifications to non-editable content -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo[<div><p>]bar</p>baz</div>" compare innerHTML -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo[<div><p>]bar</p>baz</div>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo[<div><p>]bar</p>baz</div>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo[<div><p>]bar</p>baz</div>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo[<div><p>]bar</p>baz</div>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo[<div><p>]bar</p>baz</div>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo[<div><p>]bar</p>baz</div>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo[<div><p>]bar</p>baz</div>" queryCommandIndeterm("forwarddelete") before -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo[<div><p>]bar</p>baz</div>" queryCommandState("forwarddelete") before -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo[<div><p>]bar</p>baz</div>" queryCommandValue("forwarddelete") before -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo[<div><p>]bar</p>baz</div>" queryCommandIndeterm("forwarddelete") after -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo[<div><p>]bar</p>baz</div>" queryCommandState("forwarddelete") after -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo[<div><p>]bar</p>baz</div>" queryCommandValue("forwarddelete") after -PASS [["forwarddelete",""]] "foo[<div>]bar<p>baz</p></div>": execCommand("forwarddelete", false, "") return value -PASS [["forwarddelete",""]] "foo[<div>]bar<p>baz</p></div>" checks for modifications to non-editable content -PASS [["forwarddelete",""]] "foo[<div>]bar<p>baz</p></div>" compare innerHTML -PASS [["forwarddelete",""]] "foo[<div>]bar<p>baz</p></div>" queryCommandIndeterm("forwarddelete") before -PASS [["forwarddelete",""]] "foo[<div>]bar<p>baz</p></div>" queryCommandState("forwarddelete") before -PASS [["forwarddelete",""]] "foo[<div>]bar<p>baz</p></div>" queryCommandValue("forwarddelete") before -PASS [["forwarddelete",""]] "foo[<div>]bar<p>baz</p></div>" queryCommandIndeterm("forwarddelete") after -PASS [["forwarddelete",""]] "foo[<div>]bar<p>baz</p></div>" queryCommandState("forwarddelete") after -PASS [["forwarddelete",""]] "foo[<div>]bar<p>baz</p></div>" queryCommandValue("forwarddelete") after -PASS [["forwarddelete",""]] "<div><p>foo</p>bar[</div>]baz": execCommand("forwarddelete", false, "") return value -PASS [["forwarddelete",""]] "<div><p>foo</p>bar[</div>]baz" checks for modifications to non-editable content -PASS [["forwarddelete",""]] "<div><p>foo</p>bar[</div>]baz" compare innerHTML -PASS [["forwarddelete",""]] "<div><p>foo</p>bar[</div>]baz" queryCommandIndeterm("forwarddelete") before -PASS [["forwarddelete",""]] "<div><p>foo</p>bar[</div>]baz" queryCommandState("forwarddelete") before -PASS [["forwarddelete",""]] "<div><p>foo</p>bar[</div>]baz" queryCommandValue("forwarddelete") before -PASS [["forwarddelete",""]] "<div><p>foo</p>bar[</div>]baz" queryCommandIndeterm("forwarddelete") after -PASS [["forwarddelete",""]] "<div><p>foo</p>bar[</div>]baz" queryCommandState("forwarddelete") after -PASS [["forwarddelete",""]] "<div><p>foo</p>bar[</div>]baz" queryCommandValue("forwarddelete") after -PASS [["forwarddelete",""]] "<div>foo<p>bar[</p></div>]baz": execCommand("forwarddelete", false, "") return value -PASS [["forwarddelete",""]] "<div>foo<p>bar[</p></div>]baz" checks for modifications to non-editable content -PASS [["forwarddelete",""]] "<div>foo<p>bar[</p></div>]baz" compare innerHTML -PASS [["forwarddelete",""]] "<div>foo<p>bar[</p></div>]baz" queryCommandIndeterm("forwarddelete") before -PASS [["forwarddelete",""]] "<div>foo<p>bar[</p></div>]baz" queryCommandState("forwarddelete") before -PASS [["forwarddelete",""]] "<div>foo<p>bar[</p></div>]baz" queryCommandValue("forwarddelete") before -PASS [["forwarddelete",""]] "<div>foo<p>bar[</p></div>]baz" queryCommandIndeterm("forwarddelete") after -PASS [["forwarddelete",""]] "<div>foo<p>bar[</p></div>]baz" queryCommandState("forwarddelete") after -PASS [["forwarddelete",""]] "<div>foo<p>bar[</p></div>]baz" queryCommandValue("forwarddelete") after -PASS [["forwarddelete",""]] "<p>foo<br>{</p>]bar": execCommand("forwarddelete", false, "") return value -PASS [["forwarddelete",""]] "<p>foo<br>{</p>]bar" checks for modifications to non-editable content -PASS [["forwarddelete",""]] "<p>foo<br>{</p>]bar" compare innerHTML -PASS [["forwarddelete",""]] "<p>foo<br>{</p>]bar" queryCommandIndeterm("forwarddelete") before -PASS [["forwarddelete",""]] "<p>foo<br>{</p>]bar" queryCommandState("forwarddelete") before -PASS [["forwarddelete",""]] "<p>foo<br>{</p>]bar" queryCommandValue("forwarddelete") before -PASS [["forwarddelete",""]] "<p>foo<br>{</p>]bar" queryCommandIndeterm("forwarddelete") after -PASS [["forwarddelete",""]] "<p>foo<br>{</p>]bar" queryCommandState("forwarddelete") after -PASS [["forwarddelete",""]] "<p>foo<br>{</p>]bar" queryCommandValue("forwarddelete") after -PASS [["forwarddelete",""]] "<p>foo<br><br>{</p>]bar": execCommand("forwarddelete", false, "") return value -PASS [["forwarddelete",""]] "<p>foo<br><br>{</p>]bar" checks for modifications to non-editable content -FAIL [["forwarddelete",""]] "<p>foo<br><br>{</p>]bar" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<p>foo<br>bar</p>" but got "<p>foo<br>bar<br></p>" -PASS [["forwarddelete",""]] "<p>foo<br><br>{</p>]bar" queryCommandIndeterm("forwarddelete") before -PASS [["forwarddelete",""]] "<p>foo<br><br>{</p>]bar" queryCommandState("forwarddelete") before -PASS [["forwarddelete",""]] "<p>foo<br><br>{</p>]bar" queryCommandValue("forwarddelete") before -PASS [["forwarddelete",""]] "<p>foo<br><br>{</p>]bar" queryCommandIndeterm("forwarddelete") after -PASS [["forwarddelete",""]] "<p>foo<br><br>{</p>]bar" queryCommandState("forwarddelete") after -PASS [["forwarddelete",""]] "<p>foo<br><br>{</p>]bar" queryCommandValue("forwarddelete") after -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo<br>{<p>]bar</p>": execCommand("defaultparagraphseparator", false, "div") return value -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo<br>{<p>]bar</p>": execCommand("forwarddelete", false, "") return value -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo<br>{<p>]bar</p>" checks for modifications to non-editable content -FAIL [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo<br>{<p>]bar</p>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "foobar" but got "foo<br><p>ar</p>" -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo<br>{<p>]bar</p>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo<br>{<p>]bar</p>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo<br>{<p>]bar</p>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo<br>{<p>]bar</p>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo<br>{<p>]bar</p>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo<br>{<p>]bar</p>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo<br>{<p>]bar</p>" queryCommandIndeterm("forwarddelete") before -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo<br>{<p>]bar</p>" queryCommandState("forwarddelete") before -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo<br>{<p>]bar</p>" queryCommandValue("forwarddelete") before -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo<br>{<p>]bar</p>" queryCommandIndeterm("forwarddelete") after -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo<br>{<p>]bar</p>" queryCommandState("forwarddelete") after -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo<br>{<p>]bar</p>" queryCommandValue("forwarddelete") after -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo<br>{<p>]bar</p>": execCommand("defaultparagraphseparator", false, "p") return value -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo<br>{<p>]bar</p>": execCommand("forwarddelete", false, "") return value -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo<br>{<p>]bar</p>" checks for modifications to non-editable content -FAIL [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo<br>{<p>]bar</p>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "foobar" but got "foo<br><p>ar</p>" -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo<br>{<p>]bar</p>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo<br>{<p>]bar</p>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo<br>{<p>]bar</p>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo<br>{<p>]bar</p>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo<br>{<p>]bar</p>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo<br>{<p>]bar</p>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo<br>{<p>]bar</p>" queryCommandIndeterm("forwarddelete") before -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo<br>{<p>]bar</p>" queryCommandState("forwarddelete") before -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo<br>{<p>]bar</p>" queryCommandValue("forwarddelete") before -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo<br>{<p>]bar</p>" queryCommandIndeterm("forwarddelete") after -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo<br>{<p>]bar</p>" queryCommandState("forwarddelete") after -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo<br>{<p>]bar</p>" queryCommandValue("forwarddelete") after -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo<br><br>{<p>]bar</p>": execCommand("defaultparagraphseparator", false, "div") return value -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo<br><br>{<p>]bar</p>": execCommand("forwarddelete", false, "") return value -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo<br><br>{<p>]bar</p>" checks for modifications to non-editable content -FAIL [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo<br><br>{<p>]bar</p>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "foo<br>bar" but got "foo<br><br><p>ar</p>" -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo<br><br>{<p>]bar</p>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo<br><br>{<p>]bar</p>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo<br><br>{<p>]bar</p>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo<br><br>{<p>]bar</p>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo<br><br>{<p>]bar</p>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo<br><br>{<p>]bar</p>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo<br><br>{<p>]bar</p>" queryCommandIndeterm("forwarddelete") before -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo<br><br>{<p>]bar</p>" queryCommandState("forwarddelete") before -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo<br><br>{<p>]bar</p>" queryCommandValue("forwarddelete") before -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo<br><br>{<p>]bar</p>" queryCommandIndeterm("forwarddelete") after -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo<br><br>{<p>]bar</p>" queryCommandState("forwarddelete") after -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "foo<br><br>{<p>]bar</p>" queryCommandValue("forwarddelete") after -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo<br><br>{<p>]bar</p>": execCommand("defaultparagraphseparator", false, "p") return value -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo<br><br>{<p>]bar</p>": execCommand("forwarddelete", false, "") return value -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo<br><br>{<p>]bar</p>" checks for modifications to non-editable content -FAIL [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo<br><br>{<p>]bar</p>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "foo<br>bar" but got "foo<br><br><p>ar</p>" -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo<br><br>{<p>]bar</p>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo<br><br>{<p>]bar</p>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo<br><br>{<p>]bar</p>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo<br><br>{<p>]bar</p>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo<br><br>{<p>]bar</p>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo<br><br>{<p>]bar</p>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo<br><br>{<p>]bar</p>" queryCommandIndeterm("forwarddelete") before -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo<br><br>{<p>]bar</p>" queryCommandState("forwarddelete") before -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo<br><br>{<p>]bar</p>" queryCommandValue("forwarddelete") before -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo<br><br>{<p>]bar</p>" queryCommandIndeterm("forwarddelete") after -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo<br><br>{<p>]bar</p>" queryCommandState("forwarddelete") after -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "foo<br><br>{<p>]bar</p>" queryCommandValue("forwarddelete") after -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo<br>{</p><p>}bar</p>": execCommand("defaultparagraphseparator", false, "div") return value -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo<br>{</p><p>}bar</p>": execCommand("forwarddelete", false, "") return value -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo<br>{</p><p>}bar</p>" checks for modifications to non-editable content -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo<br>{</p><p>}bar</p>" compare innerHTML -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo<br>{</p><p>}bar</p>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo<br>{</p><p>}bar</p>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo<br>{</p><p>}bar</p>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo<br>{</p><p>}bar</p>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo<br>{</p><p>}bar</p>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo<br>{</p><p>}bar</p>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo<br>{</p><p>}bar</p>" queryCommandIndeterm("forwarddelete") before -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo<br>{</p><p>}bar</p>" queryCommandState("forwarddelete") before -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo<br>{</p><p>}bar</p>" queryCommandValue("forwarddelete") before -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo<br>{</p><p>}bar</p>" queryCommandIndeterm("forwarddelete") after -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo<br>{</p><p>}bar</p>" queryCommandState("forwarddelete") after -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo<br>{</p><p>}bar</p>" queryCommandValue("forwarddelete") after -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo<br>{</p><p>}bar</p>": execCommand("defaultparagraphseparator", false, "p") return value -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo<br>{</p><p>}bar</p>": execCommand("forwarddelete", false, "") return value -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo<br>{</p><p>}bar</p>" checks for modifications to non-editable content -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo<br>{</p><p>}bar</p>" compare innerHTML -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo<br>{</p><p>}bar</p>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo<br>{</p><p>}bar</p>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo<br>{</p><p>}bar</p>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo<br>{</p><p>}bar</p>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo<br>{</p><p>}bar</p>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo<br>{</p><p>}bar</p>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo<br>{</p><p>}bar</p>" queryCommandIndeterm("forwarddelete") before -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo<br>{</p><p>}bar</p>" queryCommandState("forwarddelete") before -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo<br>{</p><p>}bar</p>" queryCommandValue("forwarddelete") before -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo<br>{</p><p>}bar</p>" queryCommandIndeterm("forwarddelete") after -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo<br>{</p><p>}bar</p>" queryCommandState("forwarddelete") after -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo<br>{</p><p>}bar</p>" queryCommandValue("forwarddelete") after -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo<br><br>{</p><p>}bar</p>": execCommand("defaultparagraphseparator", false, "div") return value -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo<br><br>{</p><p>}bar</p>": execCommand("forwarddelete", false, "") return value -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo<br><br>{</p><p>}bar</p>" checks for modifications to non-editable content -FAIL [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo<br><br>{</p><p>}bar</p>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<p>foo<br>bar</p>" but got "<p>foo<br>bar<br></p>" -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo<br><br>{</p><p>}bar</p>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo<br><br>{</p><p>}bar</p>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo<br><br>{</p><p>}bar</p>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo<br><br>{</p><p>}bar</p>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo<br><br>{</p><p>}bar</p>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo<br><br>{</p><p>}bar</p>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo<br><br>{</p><p>}bar</p>" queryCommandIndeterm("forwarddelete") before -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo<br><br>{</p><p>}bar</p>" queryCommandState("forwarddelete") before -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo<br><br>{</p><p>}bar</p>" queryCommandValue("forwarddelete") before -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo<br><br>{</p><p>}bar</p>" queryCommandIndeterm("forwarddelete") after -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo<br><br>{</p><p>}bar</p>" queryCommandState("forwarddelete") after -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo<br><br>{</p><p>}bar</p>" queryCommandValue("forwarddelete") after -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo<br><br>{</p><p>}bar</p>": execCommand("defaultparagraphseparator", false, "p") return value -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo<br><br>{</p><p>}bar</p>": execCommand("forwarddelete", false, "") return value -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo<br><br>{</p><p>}bar</p>" checks for modifications to non-editable content -FAIL [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo<br><br>{</p><p>}bar</p>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<p>foo<br>bar</p>" but got "<p>foo<br>bar<br></p>" -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo<br><br>{</p><p>}bar</p>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo<br><br>{</p><p>}bar</p>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo<br><br>{</p><p>}bar</p>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo<br><br>{</p><p>}bar</p>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo<br><br>{</p><p>}bar</p>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo<br><br>{</p><p>}bar</p>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo<br><br>{</p><p>}bar</p>" queryCommandIndeterm("forwarddelete") before -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo<br><br>{</p><p>}bar</p>" queryCommandState("forwarddelete") before -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo<br><br>{</p><p>}bar</p>" queryCommandValue("forwarddelete") before -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo<br><br>{</p><p>}bar</p>" queryCommandIndeterm("forwarddelete") after -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo<br><br>{</p><p>}bar</p>" queryCommandState("forwarddelete") after -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo<br><br>{</p><p>}bar</p>" queryCommandValue("forwarddelete") after -PASS [["forwarddelete",""]] "<table><tbody><tr><th>foo<th>[bar]<th>baz<tr><td>quz<td>qoz<td>qiz</table>": execCommand("forwarddelete", false, "") return value -PASS [["forwarddelete",""]] "<table><tbody><tr><th>foo<th>[bar]<th>baz<tr><td>quz<td>qoz<td>qiz</table>" checks for modifications to non-editable content -PASS [["forwarddelete",""]] "<table><tbody><tr><th>foo<th>[bar]<th>baz<tr><td>quz<td>qoz<td>qiz</table>" compare innerHTML -PASS [["forwarddelete",""]] "<table><tbody><tr><th>foo<th>[bar]<th>baz<tr><td>quz<td>qoz<td>qiz</table>" queryCommandIndeterm("forwarddelete") before -PASS [["forwarddelete",""]] "<table><tbody><tr><th>foo<th>[bar]<th>baz<tr><td>quz<td>qoz<td>qiz</table>" queryCommandState("forwarddelete") before -PASS [["forwarddelete",""]] "<table><tbody><tr><th>foo<th>[bar]<th>baz<tr><td>quz<td>qoz<td>qiz</table>" queryCommandValue("forwarddelete") before -PASS [["forwarddelete",""]] "<table><tbody><tr><th>foo<th>[bar]<th>baz<tr><td>quz<td>qoz<td>qiz</table>" queryCommandIndeterm("forwarddelete") after -PASS [["forwarddelete",""]] "<table><tbody><tr><th>foo<th>[bar]<th>baz<tr><td>quz<td>qoz<td>qiz</table>" queryCommandState("forwarddelete") after -PASS [["forwarddelete",""]] "<table><tbody><tr><th>foo<th>[bar]<th>baz<tr><td>quz<td>qoz<td>qiz</table>" queryCommandValue("forwarddelete") after -PASS [["forwarddelete",""]] "<table><tbody><tr><th>foo<th>ba[r<th>b]az<tr><td>quz<td>qoz<td>qiz</table>": execCommand("forwarddelete", false, "") return value -PASS [["forwarddelete",""]] "<table><tbody><tr><th>foo<th>ba[r<th>b]az<tr><td>quz<td>qoz<td>qiz</table>" checks for modifications to non-editable content -PASS [["forwarddelete",""]] "<table><tbody><tr><th>foo<th>ba[r<th>b]az<tr><td>quz<td>qoz<td>qiz</table>" compare innerHTML -PASS [["forwarddelete",""]] "<table><tbody><tr><th>foo<th>ba[r<th>b]az<tr><td>quz<td>qoz<td>qiz</table>" queryCommandIndeterm("forwarddelete") before -PASS [["forwarddelete",""]] "<table><tbody><tr><th>foo<th>ba[r<th>b]az<tr><td>quz<td>qoz<td>qiz</table>" queryCommandState("forwarddelete") before -PASS [["forwarddelete",""]] "<table><tbody><tr><th>foo<th>ba[r<th>b]az<tr><td>quz<td>qoz<td>qiz</table>" queryCommandValue("forwarddelete") before -PASS [["forwarddelete",""]] "<table><tbody><tr><th>foo<th>ba[r<th>b]az<tr><td>quz<td>qoz<td>qiz</table>" queryCommandIndeterm("forwarddelete") after -PASS [["forwarddelete",""]] "<table><tbody><tr><th>foo<th>ba[r<th>b]az<tr><td>quz<td>qoz<td>qiz</table>" queryCommandState("forwarddelete") after -PASS [["forwarddelete",""]] "<table><tbody><tr><th>foo<th>ba[r<th>b]az<tr><td>quz<td>qoz<td>qiz</table>" queryCommandValue("forwarddelete") after -PASS [["forwarddelete",""]] "<table><tbody><tr><th>fo[o<th>bar<th>b]az<tr><td>quz<td>qoz<td>qiz</table>": execCommand("forwarddelete", false, "") return value -PASS [["forwarddelete",""]] "<table><tbody><tr><th>fo[o<th>bar<th>b]az<tr><td>quz<td>qoz<td>qiz</table>" checks for modifications to non-editable content -FAIL [["forwarddelete",""]] "<table><tbody><tr><th>fo[o<th>bar<th>b]az<tr><td>quz<td>qoz<td>qiz</table>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<table><tbody><tr><th>fo</th><th><br></th><th>az</th></tr><tr><td>quz</td><td>qoz</td><td>qiz</td></tr></tbody></table>" but got "<table><tbody><tr><th>fo</th><th></th><th>az</th></tr><tr><td>quz</td><td>qoz</td><td>qiz</td></tr></tbody></table>" -PASS [["forwarddelete",""]] "<table><tbody><tr><th>fo[o<th>bar<th>b]az<tr><td>quz<td>qoz<td>qiz</table>" queryCommandIndeterm("forwarddelete") before -PASS [["forwarddelete",""]] "<table><tbody><tr><th>fo[o<th>bar<th>b]az<tr><td>quz<td>qoz<td>qiz</table>" queryCommandState("forwarddelete") before -PASS [["forwarddelete",""]] "<table><tbody><tr><th>fo[o<th>bar<th>b]az<tr><td>quz<td>qoz<td>qiz</table>" queryCommandValue("forwarddelete") before -PASS [["forwarddelete",""]] "<table><tbody><tr><th>fo[o<th>bar<th>b]az<tr><td>quz<td>qoz<td>qiz</table>" queryCommandIndeterm("forwarddelete") after -PASS [["forwarddelete",""]] "<table><tbody><tr><th>fo[o<th>bar<th>b]az<tr><td>quz<td>qoz<td>qiz</table>" queryCommandState("forwarddelete") after -PASS [["forwarddelete",""]] "<table><tbody><tr><th>fo[o<th>bar<th>b]az<tr><td>quz<td>qoz<td>qiz</table>" queryCommandValue("forwarddelete") after -PASS [["forwarddelete",""]] "<table><tbody><tr><th>foo<th>bar<th>ba[z<tr><td>q]uz<td>qoz<td>qiz</table>": execCommand("forwarddelete", false, "") return value -PASS [["forwarddelete",""]] "<table><tbody><tr><th>foo<th>bar<th>ba[z<tr><td>q]uz<td>qoz<td>qiz</table>" checks for modifications to non-editable content -PASS [["forwarddelete",""]] "<table><tbody><tr><th>foo<th>bar<th>ba[z<tr><td>q]uz<td>qoz<td>qiz</table>" compare innerHTML -PASS [["forwarddelete",""]] "<table><tbody><tr><th>foo<th>bar<th>ba[z<tr><td>q]uz<td>qoz<td>qiz</table>" queryCommandIndeterm("forwarddelete") before -PASS [["forwarddelete",""]] "<table><tbody><tr><th>foo<th>bar<th>ba[z<tr><td>q]uz<td>qoz<td>qiz</table>" queryCommandState("forwarddelete") before -PASS [["forwarddelete",""]] "<table><tbody><tr><th>foo<th>bar<th>ba[z<tr><td>q]uz<td>qoz<td>qiz</table>" queryCommandValue("forwarddelete") before -PASS [["forwarddelete",""]] "<table><tbody><tr><th>foo<th>bar<th>ba[z<tr><td>q]uz<td>qoz<td>qiz</table>" queryCommandIndeterm("forwarddelete") after -PASS [["forwarddelete",""]] "<table><tbody><tr><th>foo<th>bar<th>ba[z<tr><td>q]uz<td>qoz<td>qiz</table>" queryCommandState("forwarddelete") after -PASS [["forwarddelete",""]] "<table><tbody><tr><th>foo<th>bar<th>ba[z<tr><td>q]uz<td>qoz<td>qiz</table>" queryCommandValue("forwarddelete") after -PASS [["forwarddelete",""]] "<table><tbody><tr><th>[foo<th>bar<th>baz]<tr><td>quz<td>qoz<td>qiz</table>": execCommand("forwarddelete", false, "") return value -PASS [["forwarddelete",""]] "<table><tbody><tr><th>[foo<th>bar<th>baz]<tr><td>quz<td>qoz<td>qiz</table>" checks for modifications to non-editable content -FAIL [["forwarddelete",""]] "<table><tbody><tr><th>[foo<th>bar<th>baz]<tr><td>quz<td>qoz<td>qiz</table>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<table><tbody><tr><th><br></th><th><br></th><th><br></th></tr><tr><td>quz</td><td>qoz</td><td>qiz</td></tr></tbody></table>" but got "<table><tbody><tr><th><br></th><th></th><th></th></tr><tr><td>quz</td><td>qoz</td><td>qiz</td></tr></tbody></table>" -PASS [["forwarddelete",""]] "<table><tbody><tr><th>[foo<th>bar<th>baz]<tr><td>quz<td>qoz<td>qiz</table>" queryCommandIndeterm("forwarddelete") before -PASS [["forwarddelete",""]] "<table><tbody><tr><th>[foo<th>bar<th>baz]<tr><td>quz<td>qoz<td>qiz</table>" queryCommandState("forwarddelete") before -PASS [["forwarddelete",""]] "<table><tbody><tr><th>[foo<th>bar<th>baz]<tr><td>quz<td>qoz<td>qiz</table>" queryCommandValue("forwarddelete") before -PASS [["forwarddelete",""]] "<table><tbody><tr><th>[foo<th>bar<th>baz]<tr><td>quz<td>qoz<td>qiz</table>" queryCommandIndeterm("forwarddelete") after -PASS [["forwarddelete",""]] "<table><tbody><tr><th>[foo<th>bar<th>baz]<tr><td>quz<td>qoz<td>qiz</table>" queryCommandState("forwarddelete") after -PASS [["forwarddelete",""]] "<table><tbody><tr><th>[foo<th>bar<th>baz]<tr><td>quz<td>qoz<td>qiz</table>" queryCommandValue("forwarddelete") after -PASS [["forwarddelete",""]] "<table><tbody><tr><th>[foo<th>bar<th>baz<tr><td>quz<td>qoz<td>qiz]</table>": execCommand("forwarddelete", false, "") return value -PASS [["forwarddelete",""]] "<table><tbody><tr><th>[foo<th>bar<th>baz<tr><td>quz<td>qoz<td>qiz]</table>" checks for modifications to non-editable content -FAIL [["forwarddelete",""]] "<table><tbody><tr><th>[foo<th>bar<th>baz<tr><td>quz<td>qoz<td>qiz]</table>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<table><tbody><tr><th><br></th><th><br></th><th><br></th></tr><tr><td><br></td><td><br></td><td><br></td></tr></tbody></table>" but got "<br>" -PASS [["forwarddelete",""]] "<table><tbody><tr><th>[foo<th>bar<th>baz<tr><td>quz<td>qoz<td>qiz]</table>" queryCommandIndeterm("forwarddelete") before -PASS [["forwarddelete",""]] "<table><tbody><tr><th>[foo<th>bar<th>baz<tr><td>quz<td>qoz<td>qiz]</table>" queryCommandState("forwarddelete") before -PASS [["forwarddelete",""]] "<table><tbody><tr><th>[foo<th>bar<th>baz<tr><td>quz<td>qoz<td>qiz]</table>" queryCommandValue("forwarddelete") before -PASS [["forwarddelete",""]] "<table><tbody><tr><th>[foo<th>bar<th>baz<tr><td>quz<td>qoz<td>qiz]</table>" queryCommandIndeterm("forwarddelete") after -PASS [["forwarddelete",""]] "<table><tbody><tr><th>[foo<th>bar<th>baz<tr><td>quz<td>qoz<td>qiz]</table>" queryCommandState("forwarddelete") after -PASS [["forwarddelete",""]] "<table><tbody><tr><th>[foo<th>bar<th>baz<tr><td>quz<td>qoz<td>qiz]</table>" queryCommandValue("forwarddelete") after -PASS [["forwarddelete",""]] "{<table><tbody><tr><th>foo<th>bar<th>baz<tr><td>quz<td>qoz<td>qiz</table>}": execCommand("forwarddelete", false, "") return value -PASS [["forwarddelete",""]] "{<table><tbody><tr><th>foo<th>bar<th>baz<tr><td>quz<td>qoz<td>qiz</table>}" checks for modifications to non-editable content -PASS [["forwarddelete",""]] "{<table><tbody><tr><th>foo<th>bar<th>baz<tr><td>quz<td>qoz<td>qiz</table>}" compare innerHTML -PASS [["forwarddelete",""]] "{<table><tbody><tr><th>foo<th>bar<th>baz<tr><td>quz<td>qoz<td>qiz</table>}" queryCommandIndeterm("forwarddelete") before -PASS [["forwarddelete",""]] "{<table><tbody><tr><th>foo<th>bar<th>baz<tr><td>quz<td>qoz<td>qiz</table>}" queryCommandState("forwarddelete") before -PASS [["forwarddelete",""]] "{<table><tbody><tr><th>foo<th>bar<th>baz<tr><td>quz<td>qoz<td>qiz</table>}" queryCommandValue("forwarddelete") before -PASS [["forwarddelete",""]] "{<table><tbody><tr><th>foo<th>bar<th>baz<tr><td>quz<td>qoz<td>qiz</table>}" queryCommandIndeterm("forwarddelete") after -PASS [["forwarddelete",""]] "{<table><tbody><tr><th>foo<th>bar<th>baz<tr><td>quz<td>qoz<td>qiz</table>}" queryCommandState("forwarddelete") after -PASS [["forwarddelete",""]] "{<table><tbody><tr><th>foo<th>bar<th>baz<tr><td>quz<td>qoz<td>qiz</table>}" queryCommandValue("forwarddelete") after -PASS [["forwarddelete",""]] "<table><tbody><tr><td>foo<td>ba[r<tr><td>baz<td>quz<tr><td>q]oz<td>qiz</table>": execCommand("forwarddelete", false, "") return value -PASS [["forwarddelete",""]] "<table><tbody><tr><td>foo<td>ba[r<tr><td>baz<td>quz<tr><td>q]oz<td>qiz</table>" checks for modifications to non-editable content -FAIL [["forwarddelete",""]] "<table><tbody><tr><td>foo<td>ba[r<tr><td>baz<td>quz<tr><td>q]oz<td>qiz</table>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<table><tbody><tr><td>foo</td><td>ba</td></tr><tr><td><br></td><td><br></td></tr><tr><td>oz</td><td>qiz</td></tr></tbody></table>" but got "<table><tbody><tr><td>foo</td><td>ba</td></tr><tr><td>oz</td><td>qiz</td></tr></tbody></table>" -PASS [["forwarddelete",""]] "<table><tbody><tr><td>foo<td>ba[r<tr><td>baz<td>quz<tr><td>q]oz<td>qiz</table>" queryCommandIndeterm("forwarddelete") before -PASS [["forwarddelete",""]] "<table><tbody><tr><td>foo<td>ba[r<tr><td>baz<td>quz<tr><td>q]oz<td>qiz</table>" queryCommandState("forwarddelete") before -PASS [["forwarddelete",""]] "<table><tbody><tr><td>foo<td>ba[r<tr><td>baz<td>quz<tr><td>q]oz<td>qiz</table>" queryCommandValue("forwarddelete") before -PASS [["forwarddelete",""]] "<table><tbody><tr><td>foo<td>ba[r<tr><td>baz<td>quz<tr><td>q]oz<td>qiz</table>" queryCommandIndeterm("forwarddelete") after -PASS [["forwarddelete",""]] "<table><tbody><tr><td>foo<td>ba[r<tr><td>baz<td>quz<tr><td>q]oz<td>qiz</table>" queryCommandState("forwarddelete") after -PASS [["forwarddelete",""]] "<table><tbody><tr><td>foo<td>ba[r<tr><td>baz<td>quz<tr><td>q]oz<td>qiz</table>" queryCommandValue("forwarddelete") after -PASS [["forwarddelete",""]] "<p>fo[o<table><tr><td>b]ar</table><p>baz": execCommand("forwarddelete", false, "") return value -PASS [["forwarddelete",""]] "<p>fo[o<table><tr><td>b]ar</table><p>baz" checks for modifications to non-editable content -PASS [["forwarddelete",""]] "<p>fo[o<table><tr><td>b]ar</table><p>baz" compare innerHTML -PASS [["forwarddelete",""]] "<p>fo[o<table><tr><td>b]ar</table><p>baz" queryCommandIndeterm("forwarddelete") before -PASS [["forwarddelete",""]] "<p>fo[o<table><tr><td>b]ar</table><p>baz" queryCommandState("forwarddelete") before -PASS [["forwarddelete",""]] "<p>fo[o<table><tr><td>b]ar</table><p>baz" queryCommandValue("forwarddelete") before -PASS [["forwarddelete",""]] "<p>fo[o<table><tr><td>b]ar</table><p>baz" queryCommandIndeterm("forwarddelete") after -PASS [["forwarddelete",""]] "<p>fo[o<table><tr><td>b]ar</table><p>baz" queryCommandState("forwarddelete") after -PASS [["forwarddelete",""]] "<p>fo[o<table><tr><td>b]ar</table><p>baz" queryCommandValue("forwarddelete") after -PASS [["forwarddelete",""]] "<p>foo<table><tr><td>ba[r</table><p>b]az": execCommand("forwarddelete", false, "") return value -PASS [["forwarddelete",""]] "<p>foo<table><tr><td>ba[r</table><p>b]az" checks for modifications to non-editable content -FAIL [["forwarddelete",""]] "<p>foo<table><tr><td>ba[r</table><p>b]az" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<p>foo</p><table><tbody><tr><td>ba</td></tr></tbody></table><p>az</p>" but got "<p>foo</p><table><tbody><tr><td>baaz</td></tr></tbody></table>" -PASS [["forwarddelete",""]] "<p>foo<table><tr><td>ba[r</table><p>b]az" queryCommandIndeterm("forwarddelete") before -PASS [["forwarddelete",""]] "<p>foo<table><tr><td>ba[r</table><p>b]az" queryCommandState("forwarddelete") before -PASS [["forwarddelete",""]] "<p>foo<table><tr><td>ba[r</table><p>b]az" queryCommandValue("forwarddelete") before -PASS [["forwarddelete",""]] "<p>foo<table><tr><td>ba[r</table><p>b]az" queryCommandIndeterm("forwarddelete") after -PASS [["forwarddelete",""]] "<p>foo<table><tr><td>ba[r</table><p>b]az" queryCommandState("forwarddelete") after -PASS [["forwarddelete",""]] "<p>foo<table><tr><td>ba[r</table><p>b]az" queryCommandValue("forwarddelete") after -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>fo[o<table><tr><td>bar</table><p>b]az": execCommand("defaultparagraphseparator", false, "div") return value -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>fo[o<table><tr><td>bar</table><p>b]az": execCommand("forwarddelete", false, "") return value -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>fo[o<table><tr><td>bar</table><p>b]az" checks for modifications to non-editable content -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>fo[o<table><tr><td>bar</table><p>b]az" compare innerHTML -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>fo[o<table><tr><td>bar</table><p>b]az" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>fo[o<table><tr><td>bar</table><p>b]az" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>fo[o<table><tr><td>bar</table><p>b]az" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>fo[o<table><tr><td>bar</table><p>b]az" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>fo[o<table><tr><td>bar</table><p>b]az" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>fo[o<table><tr><td>bar</table><p>b]az" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>fo[o<table><tr><td>bar</table><p>b]az" queryCommandIndeterm("forwarddelete") before -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>fo[o<table><tr><td>bar</table><p>b]az" queryCommandState("forwarddelete") before -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>fo[o<table><tr><td>bar</table><p>b]az" queryCommandValue("forwarddelete") before -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>fo[o<table><tr><td>bar</table><p>b]az" queryCommandIndeterm("forwarddelete") after -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>fo[o<table><tr><td>bar</table><p>b]az" queryCommandState("forwarddelete") after -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>fo[o<table><tr><td>bar</table><p>b]az" queryCommandValue("forwarddelete") after -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>fo[o<table><tr><td>bar</table><p>b]az": execCommand("defaultparagraphseparator", false, "p") return value -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>fo[o<table><tr><td>bar</table><p>b]az": execCommand("forwarddelete", false, "") return value -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>fo[o<table><tr><td>bar</table><p>b]az" checks for modifications to non-editable content -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>fo[o<table><tr><td>bar</table><p>b]az" compare innerHTML -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>fo[o<table><tr><td>bar</table><p>b]az" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>fo[o<table><tr><td>bar</table><p>b]az" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>fo[o<table><tr><td>bar</table><p>b]az" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>fo[o<table><tr><td>bar</table><p>b]az" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>fo[o<table><tr><td>bar</table><p>b]az" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>fo[o<table><tr><td>bar</table><p>b]az" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>fo[o<table><tr><td>bar</table><p>b]az" queryCommandIndeterm("forwarddelete") before -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>fo[o<table><tr><td>bar</table><p>b]az" queryCommandState("forwarddelete") before -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>fo[o<table><tr><td>bar</table><p>b]az" queryCommandValue("forwarddelete") before -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>fo[o<table><tr><td>bar</table><p>b]az" queryCommandIndeterm("forwarddelete") after -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>fo[o<table><tr><td>bar</table><p>b]az" queryCommandState("forwarddelete") after -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>fo[o<table><tr><td>bar</table><p>b]az" queryCommandValue("forwarddelete") after -PASS [["forwarddelete",""]] "<p>foo<ol><li>ba[r<li>b]az</ol><p>quz": execCommand("forwarddelete", false, "") return value -PASS [["forwarddelete",""]] "<p>foo<ol><li>ba[r<li>b]az</ol><p>quz" checks for modifications to non-editable content -PASS [["forwarddelete",""]] "<p>foo<ol><li>ba[r<li>b]az</ol><p>quz" compare innerHTML -PASS [["forwarddelete",""]] "<p>foo<ol><li>ba[r<li>b]az</ol><p>quz" queryCommandIndeterm("forwarddelete") before -PASS [["forwarddelete",""]] "<p>foo<ol><li>ba[r<li>b]az</ol><p>quz" queryCommandState("forwarddelete") before -PASS [["forwarddelete",""]] "<p>foo<ol><li>ba[r<li>b]az</ol><p>quz" queryCommandValue("forwarddelete") before -PASS [["forwarddelete",""]] "<p>foo<ol><li>ba[r<li>b]az</ol><p>quz" queryCommandIndeterm("forwarddelete") after -PASS [["forwarddelete",""]] "<p>foo<ol><li>ba[r<li>b]az</ol><p>quz" queryCommandState("forwarddelete") after -PASS [["forwarddelete",""]] "<p>foo<ol><li>ba[r<li>b]az</ol><p>quz" queryCommandValue("forwarddelete") after -PASS [["forwarddelete",""]] "<p>foo<ol><li>bar<li>[baz]</ol><p>quz": execCommand("forwarddelete", false, "") return value -PASS [["forwarddelete",""]] "<p>foo<ol><li>bar<li>[baz]</ol><p>quz" checks for modifications to non-editable content -PASS [["forwarddelete",""]] "<p>foo<ol><li>bar<li>[baz]</ol><p>quz" compare innerHTML -PASS [["forwarddelete",""]] "<p>foo<ol><li>bar<li>[baz]</ol><p>quz" queryCommandIndeterm("forwarddelete") before -PASS [["forwarddelete",""]] "<p>foo<ol><li>bar<li>[baz]</ol><p>quz" queryCommandState("forwarddelete") before -PASS [["forwarddelete",""]] "<p>foo<ol><li>bar<li>[baz]</ol><p>quz" queryCommandValue("forwarddelete") before -PASS [["forwarddelete",""]] "<p>foo<ol><li>bar<li>[baz]</ol><p>quz" queryCommandIndeterm("forwarddelete") after -PASS [["forwarddelete",""]] "<p>foo<ol><li>bar<li>[baz]</ol><p>quz" queryCommandState("forwarddelete") after -PASS [["forwarddelete",""]] "<p>foo<ol><li>bar<li>[baz]</ol><p>quz" queryCommandValue("forwarddelete") after -PASS [["forwarddelete",""]] "<p>fo[o<ol><li>b]ar<li>baz</ol><p>quz": execCommand("forwarddelete", false, "") return value -PASS [["forwarddelete",""]] "<p>fo[o<ol><li>b]ar<li>baz</ol><p>quz" checks for modifications to non-editable content -PASS [["forwarddelete",""]] "<p>fo[o<ol><li>b]ar<li>baz</ol><p>quz" compare innerHTML -PASS [["forwarddelete",""]] "<p>fo[o<ol><li>b]ar<li>baz</ol><p>quz" queryCommandIndeterm("forwarddelete") before -PASS [["forwarddelete",""]] "<p>fo[o<ol><li>b]ar<li>baz</ol><p>quz" queryCommandState("forwarddelete") before -PASS [["forwarddelete",""]] "<p>fo[o<ol><li>b]ar<li>baz</ol><p>quz" queryCommandValue("forwarddelete") before -PASS [["forwarddelete",""]] "<p>fo[o<ol><li>b]ar<li>baz</ol><p>quz" queryCommandIndeterm("forwarddelete") after -PASS [["forwarddelete",""]] "<p>fo[o<ol><li>b]ar<li>baz</ol><p>quz" queryCommandState("forwarddelete") after -PASS [["forwarddelete",""]] "<p>fo[o<ol><li>b]ar<li>baz</ol><p>quz" queryCommandValue("forwarddelete") after -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo<ol><li>bar<li>ba[z</ol><p>q]uz": execCommand("defaultparagraphseparator", false, "div") return value -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo<ol><li>bar<li>ba[z</ol><p>q]uz": execCommand("forwarddelete", false, "") return value -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo<ol><li>bar<li>ba[z</ol><p>q]uz" checks for modifications to non-editable content -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo<ol><li>bar<li>ba[z</ol><p>q]uz" compare innerHTML -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo<ol><li>bar<li>ba[z</ol><p>q]uz" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo<ol><li>bar<li>ba[z</ol><p>q]uz" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo<ol><li>bar<li>ba[z</ol><p>q]uz" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo<ol><li>bar<li>ba[z</ol><p>q]uz" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo<ol><li>bar<li>ba[z</ol><p>q]uz" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo<ol><li>bar<li>ba[z</ol><p>q]uz" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo<ol><li>bar<li>ba[z</ol><p>q]uz" queryCommandIndeterm("forwarddelete") before -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo<ol><li>bar<li>ba[z</ol><p>q]uz" queryCommandState("forwarddelete") before -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo<ol><li>bar<li>ba[z</ol><p>q]uz" queryCommandValue("forwarddelete") before -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo<ol><li>bar<li>ba[z</ol><p>q]uz" queryCommandIndeterm("forwarddelete") after -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo<ol><li>bar<li>ba[z</ol><p>q]uz" queryCommandState("forwarddelete") after -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>foo<ol><li>bar<li>ba[z</ol><p>q]uz" queryCommandValue("forwarddelete") after -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo<ol><li>bar<li>ba[z</ol><p>q]uz": execCommand("defaultparagraphseparator", false, "p") return value -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo<ol><li>bar<li>ba[z</ol><p>q]uz": execCommand("forwarddelete", false, "") return value -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo<ol><li>bar<li>ba[z</ol><p>q]uz" checks for modifications to non-editable content -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo<ol><li>bar<li>ba[z</ol><p>q]uz" compare innerHTML -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo<ol><li>bar<li>ba[z</ol><p>q]uz" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo<ol><li>bar<li>ba[z</ol><p>q]uz" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo<ol><li>bar<li>ba[z</ol><p>q]uz" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo<ol><li>bar<li>ba[z</ol><p>q]uz" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo<ol><li>bar<li>ba[z</ol><p>q]uz" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo<ol><li>bar<li>ba[z</ol><p>q]uz" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo<ol><li>bar<li>ba[z</ol><p>q]uz" queryCommandIndeterm("forwarddelete") before -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo<ol><li>bar<li>ba[z</ol><p>q]uz" queryCommandState("forwarddelete") before -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo<ol><li>bar<li>ba[z</ol><p>q]uz" queryCommandValue("forwarddelete") before -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo<ol><li>bar<li>ba[z</ol><p>q]uz" queryCommandIndeterm("forwarddelete") after -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo<ol><li>bar<li>ba[z</ol><p>q]uz" queryCommandState("forwarddelete") after -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>foo<ol><li>bar<li>ba[z</ol><p>q]uz" queryCommandValue("forwarddelete") after -PASS [["forwarddelete",""]] "<p>fo[o<ol><li>bar<li>b]az</ol><p>quz": execCommand("forwarddelete", false, "") return value -PASS [["forwarddelete",""]] "<p>fo[o<ol><li>bar<li>b]az</ol><p>quz" checks for modifications to non-editable content -PASS [["forwarddelete",""]] "<p>fo[o<ol><li>bar<li>b]az</ol><p>quz" compare innerHTML -PASS [["forwarddelete",""]] "<p>fo[o<ol><li>bar<li>b]az</ol><p>quz" queryCommandIndeterm("forwarddelete") before -PASS [["forwarddelete",""]] "<p>fo[o<ol><li>bar<li>b]az</ol><p>quz" queryCommandState("forwarddelete") before -PASS [["forwarddelete",""]] "<p>fo[o<ol><li>bar<li>b]az</ol><p>quz" queryCommandValue("forwarddelete") before -PASS [["forwarddelete",""]] "<p>fo[o<ol><li>bar<li>b]az</ol><p>quz" queryCommandIndeterm("forwarddelete") after -PASS [["forwarddelete",""]] "<p>fo[o<ol><li>bar<li>b]az</ol><p>quz" queryCommandState("forwarddelete") after -PASS [["forwarddelete",""]] "<p>fo[o<ol><li>bar<li>b]az</ol><p>quz" queryCommandValue("forwarddelete") after -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>fo[o<ol><li>bar<li>baz</ol><p>q]uz": execCommand("defaultparagraphseparator", false, "div") return value -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>fo[o<ol><li>bar<li>baz</ol><p>q]uz": execCommand("forwarddelete", false, "") return value -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>fo[o<ol><li>bar<li>baz</ol><p>q]uz" checks for modifications to non-editable content -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>fo[o<ol><li>bar<li>baz</ol><p>q]uz" compare innerHTML -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>fo[o<ol><li>bar<li>baz</ol><p>q]uz" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>fo[o<ol><li>bar<li>baz</ol><p>q]uz" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>fo[o<ol><li>bar<li>baz</ol><p>q]uz" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>fo[o<ol><li>bar<li>baz</ol><p>q]uz" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>fo[o<ol><li>bar<li>baz</ol><p>q]uz" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>fo[o<ol><li>bar<li>baz</ol><p>q]uz" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>fo[o<ol><li>bar<li>baz</ol><p>q]uz" queryCommandIndeterm("forwarddelete") before -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>fo[o<ol><li>bar<li>baz</ol><p>q]uz" queryCommandState("forwarddelete") before -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>fo[o<ol><li>bar<li>baz</ol><p>q]uz" queryCommandValue("forwarddelete") before -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>fo[o<ol><li>bar<li>baz</ol><p>q]uz" queryCommandIndeterm("forwarddelete") after -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>fo[o<ol><li>bar<li>baz</ol><p>q]uz" queryCommandState("forwarddelete") after -PASS [["defaultparagraphseparator","div"],["forwarddelete",""]] "<p>fo[o<ol><li>bar<li>baz</ol><p>q]uz" queryCommandValue("forwarddelete") after -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>fo[o<ol><li>bar<li>baz</ol><p>q]uz": execCommand("defaultparagraphseparator", false, "p") return value -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>fo[o<ol><li>bar<li>baz</ol><p>q]uz": execCommand("forwarddelete", false, "") return value -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>fo[o<ol><li>bar<li>baz</ol><p>q]uz" checks for modifications to non-editable content -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>fo[o<ol><li>bar<li>baz</ol><p>q]uz" compare innerHTML -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>fo[o<ol><li>bar<li>baz</ol><p>q]uz" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>fo[o<ol><li>bar<li>baz</ol><p>q]uz" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>fo[o<ol><li>bar<li>baz</ol><p>q]uz" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>fo[o<ol><li>bar<li>baz</ol><p>q]uz" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>fo[o<ol><li>bar<li>baz</ol><p>q]uz" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>fo[o<ol><li>bar<li>baz</ol><p>q]uz" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>fo[o<ol><li>bar<li>baz</ol><p>q]uz" queryCommandIndeterm("forwarddelete") before -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>fo[o<ol><li>bar<li>baz</ol><p>q]uz" queryCommandState("forwarddelete") before -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>fo[o<ol><li>bar<li>baz</ol><p>q]uz" queryCommandValue("forwarddelete") before -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>fo[o<ol><li>bar<li>baz</ol><p>q]uz" queryCommandIndeterm("forwarddelete") after -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>fo[o<ol><li>bar<li>baz</ol><p>q]uz" queryCommandState("forwarddelete") after -PASS [["defaultparagraphseparator","p"],["forwarddelete",""]] "<p>fo[o<ol><li>bar<li>baz</ol><p>q]uz" queryCommandValue("forwarddelete") after -PASS [["forwarddelete",""]] "<ol><li>fo[o</ol><ol><li>b]ar</ol>": execCommand("forwarddelete", false, "") return value -PASS [["forwarddelete",""]] "<ol><li>fo[o</ol><ol><li>b]ar</ol>" checks for modifications to non-editable content -FAIL [["forwarddelete",""]] "<ol><li>fo[o</ol><ol><li>b]ar</ol>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<ol><li>foar</li></ol>" but got "<ol><li>fo</li><li>ar</li></ol>" -PASS [["forwarddelete",""]] "<ol><li>fo[o</ol><ol><li>b]ar</ol>" queryCommandIndeterm("forwarddelete") before -PASS [["forwarddelete",""]] "<ol><li>fo[o</ol><ol><li>b]ar</ol>" queryCommandState("forwarddelete") before -PASS [["forwarddelete",""]] "<ol><li>fo[o</ol><ol><li>b]ar</ol>" queryCommandValue("forwarddelete") before -PASS [["forwarddelete",""]] "<ol><li>fo[o</ol><ol><li>b]ar</ol>" queryCommandIndeterm("forwarddelete") after -PASS [["forwarddelete",""]] "<ol><li>fo[o</ol><ol><li>b]ar</ol>" queryCommandState("forwarddelete") after -PASS [["forwarddelete",""]] "<ol><li>fo[o</ol><ol><li>b]ar</ol>" queryCommandValue("forwarddelete") after -PASS [["forwarddelete",""]] "<ol><li>fo[o</ol><ul><li>b]ar</ul>": execCommand("forwarddelete", false, "") return value -PASS [["forwarddelete",""]] "<ol><li>fo[o</ol><ul><li>b]ar</ul>" checks for modifications to non-editable content -PASS [["forwarddelete",""]] "<ol><li>fo[o</ol><ul><li>b]ar</ul>" compare innerHTML -PASS [["forwarddelete",""]] "<ol><li>fo[o</ol><ul><li>b]ar</ul>" queryCommandIndeterm("forwarddelete") before -PASS [["forwarddelete",""]] "<ol><li>fo[o</ol><ul><li>b]ar</ul>" queryCommandState("forwarddelete") before -PASS [["forwarddelete",""]] "<ol><li>fo[o</ol><ul><li>b]ar</ul>" queryCommandValue("forwarddelete") before -PASS [["forwarddelete",""]] "<ol><li>fo[o</ol><ul><li>b]ar</ul>" queryCommandIndeterm("forwarddelete") after -PASS [["forwarddelete",""]] "<ol><li>fo[o</ol><ul><li>b]ar</ul>" queryCommandState("forwarddelete") after -PASS [["forwarddelete",""]] "<ol><li>fo[o</ol><ul><li>b]ar</ul>" queryCommandValue("forwarddelete") after -PASS [["forwarddelete",""]] "foo[<ol><li>]bar</ol>": execCommand("forwarddelete", false, "") return value -PASS [["forwarddelete",""]] "foo[<ol><li>]bar</ol>" checks for modifications to non-editable content -PASS [["forwarddelete",""]] "foo[<ol><li>]bar</ol>" compare innerHTML -PASS [["forwarddelete",""]] "foo[<ol><li>]bar</ol>" queryCommandIndeterm("forwarddelete") before -PASS [["forwarddelete",""]] "foo[<ol><li>]bar</ol>" queryCommandState("forwarddelete") before -PASS [["forwarddelete",""]] "foo[<ol><li>]bar</ol>" queryCommandValue("forwarddelete") before -PASS [["forwarddelete",""]] "foo[<ol><li>]bar</ol>" queryCommandIndeterm("forwarddelete") after -PASS [["forwarddelete",""]] "foo[<ol><li>]bar</ol>" queryCommandState("forwarddelete") after -PASS [["forwarddelete",""]] "foo[<ol><li>]bar</ol>" queryCommandValue("forwarddelete") after -PASS [["forwarddelete",""]] "<ol><li>foo[<li>]bar</ol>": execCommand("forwarddelete", false, "") return value -PASS [["forwarddelete",""]] "<ol><li>foo[<li>]bar</ol>" checks for modifications to non-editable content -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/editing/run/insertlinebreak-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/editing/run/insertlinebreak-expected.txt deleted file mode 100644 index 388c9d39..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/editing/run/insertlinebreak-expected.txt +++ /dev/null
@@ -1,1617 +0,0 @@ -This is a testharness.js-based test. -Found 1613 tests; 1582 PASS, 31 FAIL, 0 TIMEOUT, 0 NOTRUN. -PASS [["insertlinebreak",""]] "foo[bar]baz": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "foo[bar]baz" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "foo[bar]baz" compare innerHTML -PASS [["insertlinebreak",""]] "foo[bar]baz" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "foo[bar]baz" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "foo[bar]baz" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "foo[bar]baz" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "foo[bar]baz" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "foo[bar]baz" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "fo[o<table><tr><td>b]ar</table>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "fo[o<table><tr><td>b]ar</table>" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "fo[o<table><tr><td>b]ar</table>" compare innerHTML -PASS [["insertlinebreak",""]] "fo[o<table><tr><td>b]ar</table>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "fo[o<table><tr><td>b]ar</table>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "fo[o<table><tr><td>b]ar</table>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "fo[o<table><tr><td>b]ar</table>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "fo[o<table><tr><td>b]ar</table>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "fo[o<table><tr><td>b]ar</table>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<table><tr><td>[foo<td>bar]<tr><td>baz<td>quz</table>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<table><tr><td>[foo<td>bar]<tr><td>baz<td>quz</table>" checks for modifications to non-editable content -FAIL [["insertlinebreak",""]] "<table><tr><td>[foo<td>bar]<tr><td>baz<td>quz</table>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<table><tbody><tr><td><br><br></td><td><br></td></tr><tr><td>baz</td><td>quz</td></tr></tbody></table>" but got "<table><tbody><tr><td><br><br></td><td></td></tr><tr><td>baz</td><td>quz</td></tr></tbody></table>" -PASS [["insertlinebreak",""]] "<table><tr><td>[foo<td>bar]<tr><td>baz<td>quz</table>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<table><tr><td>[foo<td>bar]<tr><td>baz<td>quz</table>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<table><tr><td>[foo<td>bar]<tr><td>baz<td>quz</table>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<table><tr><td>[foo<td>bar]<tr><td>baz<td>quz</table>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<table><tr><td>[foo<td>bar]<tr><td>baz<td>quz</table>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<table><tr><td>[foo<td>bar]<tr><td>baz<td>quz</table>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<table><tbody data-start=0 data-end=1><tr><td>foo<td>bar<tr><td>baz<td>quz</table>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<table><tbody data-start=0 data-end=1><tr><td>foo<td>bar<tr><td>baz<td>quz</table>" checks for modifications to non-editable content -FAIL [["insertlinebreak",""]] "<table><tbody data-start=0 data-end=1><tr><td>foo<td>bar<tr><td>baz<td>quz</table>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<table><tbody><tr><td><br></td><td><br></td></tr><tr><td>baz</td><td>quz</td></tr></tbody></table>" but got "<table><tbody><tr><td><br><br></td><td></td></tr><tr><td>baz</td><td>quz</td></tr></tbody></table>" -PASS [["insertlinebreak",""]] "<table><tbody data-start=0 data-end=1><tr><td>foo<td>bar<tr><td>baz<td>quz</table>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<table><tbody data-start=0 data-end=1><tr><td>foo<td>bar<tr><td>baz<td>quz</table>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<table><tbody data-start=0 data-end=1><tr><td>foo<td>bar<tr><td>baz<td>quz</table>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<table><tbody data-start=0 data-end=1><tr><td>foo<td>bar<tr><td>baz<td>quz</table>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<table><tbody data-start=0 data-end=1><tr><td>foo<td>bar<tr><td>baz<td>quz</table>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<table><tbody data-start=0 data-end=1><tr><td>foo<td>bar<tr><td>baz<td>quz</table>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<table><tr><td>fo[o</table>b]ar": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<table><tr><td>fo[o</table>b]ar" checks for modifications to non-editable content -FAIL [["insertlinebreak",""]] "<table><tr><td>fo[o</table>b]ar" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<table><tbody><tr><td>fo<br><br></td></tr></tbody></table>ar" but got "<table><tbody><tr><td>fo<br>ar</td></tr></tbody></table>" -PASS [["insertlinebreak",""]] "<table><tr><td>fo[o</table>b]ar" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<table><tr><td>fo[o</table>b]ar" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<table><tr><td>fo[o</table>b]ar" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<table><tr><td>fo[o</table>b]ar" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<table><tr><td>fo[o</table>b]ar" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<table><tr><td>fo[o</table>b]ar" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<table><tr><td>fo[o<td>b]ar<td>baz</table>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<table><tr><td>fo[o<td>b]ar<td>baz</table>" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "<table><tr><td>fo[o<td>b]ar<td>baz</table>" compare innerHTML -PASS [["insertlinebreak",""]] "<table><tr><td>fo[o<td>b]ar<td>baz</table>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<table><tr><td>fo[o<td>b]ar<td>baz</table>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<table><tr><td>fo[o<td>b]ar<td>baz</table>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<table><tr><td>fo[o<td>b]ar<td>baz</table>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<table><tr><td>fo[o<td>b]ar<td>baz</table>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<table><tr><td>fo[o<td>b]ar<td>baz</table>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "{<table><tr><td>foo</table>}": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "{<table><tr><td>foo</table>}" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "{<table><tr><td>foo</table>}" compare innerHTML -PASS [["insertlinebreak",""]] "{<table><tr><td>foo</table>}" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "{<table><tr><td>foo</table>}" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "{<table><tr><td>foo</table>}" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "{<table><tr><td>foo</table>}" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "{<table><tr><td>foo</table>}" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "{<table><tr><td>foo</table>}" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<table><tr><td>[foo]</table>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<table><tr><td>[foo]</table>" checks for modifications to non-editable content -FAIL [["insertlinebreak",""]] "<table><tr><td>[foo]</table>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<table><tbody><tr><td><br><br></td></tr></tbody></table>" but got "<br><br>" -PASS [["insertlinebreak",""]] "<table><tr><td>[foo]</table>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<table><tr><td>[foo]</table>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<table><tr><td>[foo]</table>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<table><tr><td>[foo]</table>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<table><tr><td>[foo]</table>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<table><tr><td>[foo]</table>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<ol><li>[foo]<li>bar</ol>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<ol><li>[foo]<li>bar</ol>" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "<ol><li>[foo]<li>bar</ol>" compare innerHTML -PASS [["insertlinebreak",""]] "<ol><li>[foo]<li>bar</ol>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<ol><li>[foo]<li>bar</ol>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<ol><li>[foo]<li>bar</ol>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<ol><li>[foo]<li>bar</ol>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<ol><li>[foo]<li>bar</ol>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<ol><li>[foo]<li>bar</ol>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<ol><li>f[o]o<li>bar</ol>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<ol><li>f[o]o<li>bar</ol>" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "<ol><li>f[o]o<li>bar</ol>" compare innerHTML -PASS [["insertlinebreak",""]] "<ol><li>f[o]o<li>bar</ol>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<ol><li>f[o]o<li>bar</ol>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<ol><li>f[o]o<li>bar</ol>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<ol><li>f[o]o<li>bar</ol>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<ol><li>f[o]o<li>bar</ol>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<ol><li>f[o]o<li>bar</ol>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "[]foo": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "[]foo" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "[]foo" compare innerHTML -PASS [["insertlinebreak",""]] "[]foo" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "[]foo" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "[]foo" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "[]foo" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "[]foo" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "[]foo" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "foo[]": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "foo[]" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "foo[]" compare innerHTML -PASS [["insertlinebreak",""]] "foo[]" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "foo[]" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "foo[]" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "foo[]" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "foo[]" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "foo[]" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<span>foo[]</span>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<span>foo[]</span>" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "<span>foo[]</span>" compare innerHTML -PASS [["insertlinebreak",""]] "<span>foo[]</span>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<span>foo[]</span>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<span>foo[]</span>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<span>foo[]</span>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<span>foo[]</span>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<span>foo[]</span>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "foo[]<br>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "foo[]<br>" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "foo[]<br>" compare innerHTML -PASS [["insertlinebreak",""]] "foo[]<br>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "foo[]<br>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "foo[]<br>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "foo[]<br>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "foo[]<br>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "foo[]<br>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "foo[]bar": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "foo[]bar" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "foo[]bar" compare innerHTML -PASS [["insertlinebreak",""]] "foo[]bar" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "foo[]bar" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "foo[]bar" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "foo[]bar" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "foo[]bar" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "foo[]bar" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<address>[]foo</address>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<address>[]foo</address>" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "<address>[]foo</address>" compare innerHTML -PASS [["insertlinebreak",""]] "<address>[]foo</address>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<address>[]foo</address>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<address>[]foo</address>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<address>[]foo</address>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<address>[]foo</address>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<address>[]foo</address>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<address>foo[]</address>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<address>foo[]</address>" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "<address>foo[]</address>" compare innerHTML -PASS [["insertlinebreak",""]] "<address>foo[]</address>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<address>foo[]</address>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<address>foo[]</address>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<address>foo[]</address>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<address>foo[]</address>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<address>foo[]</address>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<address>foo[]<br></address>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<address>foo[]<br></address>" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "<address>foo[]<br></address>" compare innerHTML -PASS [["insertlinebreak",""]] "<address>foo[]<br></address>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<address>foo[]<br></address>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<address>foo[]<br></address>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<address>foo[]<br></address>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<address>foo[]<br></address>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<address>foo[]<br></address>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<address>foo[]bar</address>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<address>foo[]bar</address>" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "<address>foo[]bar</address>" compare innerHTML -PASS [["insertlinebreak",""]] "<address>foo[]bar</address>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<address>foo[]bar</address>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<address>foo[]bar</address>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<address>foo[]bar</address>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<address>foo[]bar</address>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<address>foo[]bar</address>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<div>[]foo</div>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<div>[]foo</div>" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "<div>[]foo</div>" compare innerHTML -PASS [["insertlinebreak",""]] "<div>[]foo</div>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<div>[]foo</div>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<div>[]foo</div>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<div>[]foo</div>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<div>[]foo</div>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<div>[]foo</div>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<div>foo[]</div>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<div>foo[]</div>" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "<div>foo[]</div>" compare innerHTML -PASS [["insertlinebreak",""]] "<div>foo[]</div>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<div>foo[]</div>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<div>foo[]</div>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<div>foo[]</div>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<div>foo[]</div>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<div>foo[]</div>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<div>foo[]<br></div>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<div>foo[]<br></div>" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "<div>foo[]<br></div>" compare innerHTML -PASS [["insertlinebreak",""]] "<div>foo[]<br></div>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<div>foo[]<br></div>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<div>foo[]<br></div>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<div>foo[]<br></div>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<div>foo[]<br></div>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<div>foo[]<br></div>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<div>foo[]bar</div>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<div>foo[]bar</div>" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "<div>foo[]bar</div>" compare innerHTML -PASS [["insertlinebreak",""]] "<div>foo[]bar</div>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<div>foo[]bar</div>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<div>foo[]bar</div>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<div>foo[]bar</div>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<div>foo[]bar</div>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<div>foo[]bar</div>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<dl><dt>[]foo<dd>bar</dl>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<dl><dt>[]foo<dd>bar</dl>" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "<dl><dt>[]foo<dd>bar</dl>" compare innerHTML -PASS [["insertlinebreak",""]] "<dl><dt>[]foo<dd>bar</dl>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<dl><dt>[]foo<dd>bar</dl>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<dl><dt>[]foo<dd>bar</dl>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<dl><dt>[]foo<dd>bar</dl>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<dl><dt>[]foo<dd>bar</dl>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<dl><dt>[]foo<dd>bar</dl>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<dl><dt>foo[]<dd>bar</dl>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<dl><dt>foo[]<dd>bar</dl>" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "<dl><dt>foo[]<dd>bar</dl>" compare innerHTML -PASS [["insertlinebreak",""]] "<dl><dt>foo[]<dd>bar</dl>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<dl><dt>foo[]<dd>bar</dl>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<dl><dt>foo[]<dd>bar</dl>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<dl><dt>foo[]<dd>bar</dl>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<dl><dt>foo[]<dd>bar</dl>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<dl><dt>foo[]<dd>bar</dl>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<dl><dt>foo[]<br><dd>bar</dl>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<dl><dt>foo[]<br><dd>bar</dl>" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "<dl><dt>foo[]<br><dd>bar</dl>" compare innerHTML -PASS [["insertlinebreak",""]] "<dl><dt>foo[]<br><dd>bar</dl>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<dl><dt>foo[]<br><dd>bar</dl>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<dl><dt>foo[]<br><dd>bar</dl>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<dl><dt>foo[]<br><dd>bar</dl>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<dl><dt>foo[]<br><dd>bar</dl>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<dl><dt>foo[]<br><dd>bar</dl>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<dl><dt>foo[]bar<dd>baz</dl>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<dl><dt>foo[]bar<dd>baz</dl>" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "<dl><dt>foo[]bar<dd>baz</dl>" compare innerHTML -PASS [["insertlinebreak",""]] "<dl><dt>foo[]bar<dd>baz</dl>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<dl><dt>foo[]bar<dd>baz</dl>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<dl><dt>foo[]bar<dd>baz</dl>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<dl><dt>foo[]bar<dd>baz</dl>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<dl><dt>foo[]bar<dd>baz</dl>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<dl><dt>foo[]bar<dd>baz</dl>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<dl><dt>foo<dd>[]bar</dl>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<dl><dt>foo<dd>[]bar</dl>" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "<dl><dt>foo<dd>[]bar</dl>" compare innerHTML -PASS [["insertlinebreak",""]] "<dl><dt>foo<dd>[]bar</dl>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<dl><dt>foo<dd>[]bar</dl>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<dl><dt>foo<dd>[]bar</dl>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<dl><dt>foo<dd>[]bar</dl>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<dl><dt>foo<dd>[]bar</dl>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<dl><dt>foo<dd>[]bar</dl>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<dl><dt>foo<dd>bar[]</dl>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<dl><dt>foo<dd>bar[]</dl>" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "<dl><dt>foo<dd>bar[]</dl>" compare innerHTML -PASS [["insertlinebreak",""]] "<dl><dt>foo<dd>bar[]</dl>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<dl><dt>foo<dd>bar[]</dl>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<dl><dt>foo<dd>bar[]</dl>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<dl><dt>foo<dd>bar[]</dl>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<dl><dt>foo<dd>bar[]</dl>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<dl><dt>foo<dd>bar[]</dl>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<dl><dt>foo<dd>bar[]<br></dl>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<dl><dt>foo<dd>bar[]<br></dl>" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "<dl><dt>foo<dd>bar[]<br></dl>" compare innerHTML -PASS [["insertlinebreak",""]] "<dl><dt>foo<dd>bar[]<br></dl>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<dl><dt>foo<dd>bar[]<br></dl>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<dl><dt>foo<dd>bar[]<br></dl>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<dl><dt>foo<dd>bar[]<br></dl>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<dl><dt>foo<dd>bar[]<br></dl>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<dl><dt>foo<dd>bar[]<br></dl>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<dl><dt>foo<dd>bar[]baz</dl>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<dl><dt>foo<dd>bar[]baz</dl>" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "<dl><dt>foo<dd>bar[]baz</dl>" compare innerHTML -PASS [["insertlinebreak",""]] "<dl><dt>foo<dd>bar[]baz</dl>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<dl><dt>foo<dd>bar[]baz</dl>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<dl><dt>foo<dd>bar[]baz</dl>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<dl><dt>foo<dd>bar[]baz</dl>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<dl><dt>foo<dd>bar[]baz</dl>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<dl><dt>foo<dd>bar[]baz</dl>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<h1>[]foo</h1>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<h1>[]foo</h1>" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "<h1>[]foo</h1>" compare innerHTML -PASS [["insertlinebreak",""]] "<h1>[]foo</h1>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<h1>[]foo</h1>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<h1>[]foo</h1>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<h1>[]foo</h1>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<h1>[]foo</h1>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<h1>[]foo</h1>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<h1>foo[]</h1>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<h1>foo[]</h1>" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "<h1>foo[]</h1>" compare innerHTML -PASS [["insertlinebreak",""]] "<h1>foo[]</h1>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<h1>foo[]</h1>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<h1>foo[]</h1>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<h1>foo[]</h1>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<h1>foo[]</h1>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<h1>foo[]</h1>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<h1>foo[]<br></h1>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<h1>foo[]<br></h1>" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "<h1>foo[]<br></h1>" compare innerHTML -PASS [["insertlinebreak",""]] "<h1>foo[]<br></h1>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<h1>foo[]<br></h1>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<h1>foo[]<br></h1>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<h1>foo[]<br></h1>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<h1>foo[]<br></h1>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<h1>foo[]<br></h1>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<h1>foo[]bar</h1>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<h1>foo[]bar</h1>" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "<h1>foo[]bar</h1>" compare innerHTML -PASS [["insertlinebreak",""]] "<h1>foo[]bar</h1>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<h1>foo[]bar</h1>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<h1>foo[]bar</h1>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<h1>foo[]bar</h1>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<h1>foo[]bar</h1>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<h1>foo[]bar</h1>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<ol><li>[]foo</ol>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<ol><li>[]foo</ol>" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "<ol><li>[]foo</ol>" compare innerHTML -PASS [["insertlinebreak",""]] "<ol><li>[]foo</ol>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<ol><li>[]foo</ol>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<ol><li>[]foo</ol>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<ol><li>[]foo</ol>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<ol><li>[]foo</ol>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<ol><li>[]foo</ol>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<ol><li>foo[]</ol>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<ol><li>foo[]</ol>" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "<ol><li>foo[]</ol>" compare innerHTML -PASS [["insertlinebreak",""]] "<ol><li>foo[]</ol>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<ol><li>foo[]</ol>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<ol><li>foo[]</ol>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<ol><li>foo[]</ol>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<ol><li>foo[]</ol>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<ol><li>foo[]</ol>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<ol><li>foo[]<br></ol>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<ol><li>foo[]<br></ol>" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "<ol><li>foo[]<br></ol>" compare innerHTML -PASS [["insertlinebreak",""]] "<ol><li>foo[]<br></ol>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<ol><li>foo[]<br></ol>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<ol><li>foo[]<br></ol>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<ol><li>foo[]<br></ol>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<ol><li>foo[]<br></ol>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<ol><li>foo[]<br></ol>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<ol><li>foo[]bar</ol>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<ol><li>foo[]bar</ol>" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "<ol><li>foo[]bar</ol>" compare innerHTML -PASS [["insertlinebreak",""]] "<ol><li>foo[]bar</ol>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<ol><li>foo[]bar</ol>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<ol><li>foo[]bar</ol>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<ol><li>foo[]bar</ol>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<ol><li>foo[]bar</ol>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<ol><li>foo[]bar</ol>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<p>[]foo</p>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<p>[]foo</p>" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "<p>[]foo</p>" compare innerHTML -PASS [["insertlinebreak",""]] "<p>[]foo</p>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<p>[]foo</p>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<p>[]foo</p>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<p>[]foo</p>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<p>[]foo</p>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<p>[]foo</p>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<p>foo[]</p>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<p>foo[]</p>" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "<p>foo[]</p>" compare innerHTML -PASS [["insertlinebreak",""]] "<p>foo[]</p>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<p>foo[]</p>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<p>foo[]</p>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<p>foo[]</p>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<p>foo[]</p>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<p>foo[]</p>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<p>foo[]<br></p>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<p>foo[]<br></p>" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "<p>foo[]<br></p>" compare innerHTML -PASS [["insertlinebreak",""]] "<p>foo[]<br></p>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<p>foo[]<br></p>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<p>foo[]<br></p>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<p>foo[]<br></p>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<p>foo[]<br></p>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<p>foo[]<br></p>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<p>foo[]bar</p>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<p>foo[]bar</p>" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "<p>foo[]bar</p>" compare innerHTML -PASS [["insertlinebreak",""]] "<p>foo[]bar</p>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<p>foo[]bar</p>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<p>foo[]bar</p>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<p>foo[]bar</p>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<p>foo[]bar</p>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<p>foo[]bar</p>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<pre>[]foo</pre>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<pre>[]foo</pre>" checks for modifications to non-editable content -FAIL [["insertlinebreak",""]] "<pre>[]foo</pre>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<pre><br>foo</pre>" but got "<pre>\nfoo</pre>" -PASS [["insertlinebreak",""]] "<pre>[]foo</pre>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<pre>[]foo</pre>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<pre>[]foo</pre>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<pre>[]foo</pre>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<pre>[]foo</pre>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<pre>[]foo</pre>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<pre>foo[]</pre>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<pre>foo[]</pre>" checks for modifications to non-editable content -FAIL [["insertlinebreak",""]] "<pre>foo[]</pre>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<pre>foo<br><br></pre>" but got "<pre>foo\n\n</pre>" -PASS [["insertlinebreak",""]] "<pre>foo[]</pre>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<pre>foo[]</pre>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<pre>foo[]</pre>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<pre>foo[]</pre>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<pre>foo[]</pre>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<pre>foo[]</pre>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<pre>foo[]<br></pre>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<pre>foo[]<br></pre>" checks for modifications to non-editable content -FAIL [["insertlinebreak",""]] "<pre>foo[]<br></pre>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<pre>foo<br><br></pre>" but got "<pre>foo\n<br></pre>" -PASS [["insertlinebreak",""]] "<pre>foo[]<br></pre>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<pre>foo[]<br></pre>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<pre>foo[]<br></pre>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<pre>foo[]<br></pre>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<pre>foo[]<br></pre>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<pre>foo[]<br></pre>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<pre>foo[]bar</pre>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<pre>foo[]bar</pre>" checks for modifications to non-editable content -FAIL [["insertlinebreak",""]] "<pre>foo[]bar</pre>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<pre>foo<br>bar</pre>" but got "<pre>foo\nbar</pre>" -PASS [["insertlinebreak",""]] "<pre>foo[]bar</pre>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<pre>foo[]bar</pre>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<pre>foo[]bar</pre>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<pre>foo[]bar</pre>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<pre>foo[]bar</pre>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<pre>foo[]bar</pre>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<pre>foo[]<br><br></pre>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<pre>foo[]<br><br></pre>" checks for modifications to non-editable content -FAIL [["insertlinebreak",""]] "<pre>foo[]<br><br></pre>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<pre>foo<br><br><br></pre>" but got "<pre>foo\n<br><br></pre>" -PASS [["insertlinebreak",""]] "<pre>foo[]<br><br></pre>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<pre>foo[]<br><br></pre>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<pre>foo[]<br><br></pre>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<pre>foo[]<br><br></pre>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<pre>foo[]<br><br></pre>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<pre>foo[]<br><br></pre>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<pre>foo<br>{}<br></pre>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<pre>foo<br>{}<br></pre>" checks for modifications to non-editable content -FAIL [["insertlinebreak",""]] "<pre>foo<br>{}<br></pre>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<pre>foo<br><br><br></pre>" but got "<pre>foo<br>\n<br></pre>" -PASS [["insertlinebreak",""]] "<pre>foo<br>{}<br></pre>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<pre>foo<br>{}<br></pre>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<pre>foo<br>{}<br></pre>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<pre>foo<br>{}<br></pre>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<pre>foo<br>{}<br></pre>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<pre>foo<br>{}<br></pre>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<pre>foo []</pre>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<pre>foo []</pre>" checks for modifications to non-editable content -FAIL [["insertlinebreak",""]] "<pre>foo []</pre>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<pre>foo\n<br><br></pre>" but got "<pre>foo\n\n</pre>" -PASS [["insertlinebreak",""]] "<pre>foo []</pre>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<pre>foo []</pre>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<pre>foo []</pre>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<pre>foo []</pre>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<pre>foo []</pre>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<pre>foo []</pre>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<pre>foo[] </pre>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<pre>foo[] </pre>" checks for modifications to non-editable content -FAIL [["insertlinebreak",""]] "<pre>foo[] </pre>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<pre>foo<br>\n</pre>" but got "<pre>foo\n\n</pre>" -PASS [["insertlinebreak",""]] "<pre>foo[] </pre>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<pre>foo[] </pre>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<pre>foo[] </pre>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<pre>foo[] </pre>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<pre>foo[] </pre>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<pre>foo[] </pre>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<pre>foo [] </pre>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<pre>foo [] </pre>" checks for modifications to non-editable content -FAIL [["insertlinebreak",""]] "<pre>foo [] </pre>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<pre>foo\n<br>\n</pre>" but got "<pre>foo\n\n\n</pre>" -PASS [["insertlinebreak",""]] "<pre>foo [] </pre>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<pre>foo [] </pre>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<pre>foo [] </pre>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<pre>foo [] </pre>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<pre>foo [] </pre>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<pre>foo [] </pre>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<xmp>foo[]bar</xmp>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<xmp>foo[]bar</xmp>" checks for modifications to non-editable content -FAIL [["insertlinebreak",""]] "<xmp>foo[]bar</xmp>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<xmp>foobar</xmp>" but got "<xmp>foo\nbar</xmp>" -PASS [["insertlinebreak",""]] "<xmp>foo[]bar</xmp>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<xmp>foo[]bar</xmp>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<xmp>foo[]bar</xmp>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<xmp>foo[]bar</xmp>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<xmp>foo[]bar</xmp>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<xmp>foo[]bar</xmp>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<script>foo[]bar</script>baz": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<script>foo[]bar</script>baz" checks for modifications to non-editable content -FAIL [["insertlinebreak",""]] "<script>foo[]bar</script>baz" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<script>foobar</script>baz" but got "<script>foobar</script><br>baz" -PASS [["insertlinebreak",""]] "<script>foo[]bar</script>baz" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<script>foo[]bar</script>baz" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<script>foo[]bar</script>baz" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<script>foo[]bar</script>baz" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<script>foo[]bar</script>baz" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<script>foo[]bar</script>baz" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<listing>foo[]bar</listing>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<listing>foo[]bar</listing>" checks for modifications to non-editable content -FAIL [["insertlinebreak",""]] "<listing>foo[]bar</listing>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<listing>foo<br>bar</listing>" but got "<listing>foo\nbar</listing>" -PASS [["insertlinebreak",""]] "<listing>foo[]bar</listing>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<listing>foo[]bar</listing>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<listing>foo[]bar</listing>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<listing>foo[]bar</listing>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<listing>foo[]bar</listing>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<listing>foo[]bar</listing>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<ol><li>{}<br></li></ol>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<ol><li>{}<br></li></ol>" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "<ol><li>{}<br></li></ol>" compare innerHTML -PASS [["insertlinebreak",""]] "<ol><li>{}<br></li></ol>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<ol><li>{}<br></li></ol>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<ol><li>{}<br></li></ol>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<ol><li>{}<br></li></ol>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<ol><li>{}<br></li></ol>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<ol><li>{}<br></li></ol>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "foo<ol><li>{}<br></li></ol>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "foo<ol><li>{}<br></li></ol>" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "foo<ol><li>{}<br></li></ol>" compare innerHTML -PASS [["insertlinebreak",""]] "foo<ol><li>{}<br></li></ol>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "foo<ol><li>{}<br></li></ol>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "foo<ol><li>{}<br></li></ol>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "foo<ol><li>{}<br></li></ol>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "foo<ol><li>{}<br></li></ol>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "foo<ol><li>{}<br></li></ol>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<ol><li>{}<br></li></ol>foo": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<ol><li>{}<br></li></ol>foo" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "<ol><li>{}<br></li></ol>foo" compare innerHTML -PASS [["insertlinebreak",""]] "<ol><li>{}<br></li></ol>foo" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<ol><li>{}<br></li></ol>foo" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<ol><li>{}<br></li></ol>foo" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<ol><li>{}<br></li></ol>foo" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<ol><li>{}<br></li></ol>foo" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<ol><li>{}<br></li></ol>foo" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<ol><li>foo<li>{}<br></ol>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<ol><li>foo<li>{}<br></ol>" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "<ol><li>foo<li>{}<br></ol>" compare innerHTML -PASS [["insertlinebreak",""]] "<ol><li>foo<li>{}<br></ol>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<ol><li>foo<li>{}<br></ol>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<ol><li>foo<li>{}<br></ol>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<ol><li>foo<li>{}<br></ol>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<ol><li>foo<li>{}<br></ol>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<ol><li>foo<li>{}<br></ol>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<ol><li>{}<br><li>bar</ol>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<ol><li>{}<br><li>bar</ol>" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "<ol><li>{}<br><li>bar</ol>" compare innerHTML -PASS [["insertlinebreak",""]] "<ol><li>{}<br><li>bar</ol>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<ol><li>{}<br><li>bar</ol>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<ol><li>{}<br><li>bar</ol>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<ol><li>{}<br><li>bar</ol>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<ol><li>{}<br><li>bar</ol>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<ol><li>{}<br><li>bar</ol>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<ol><li>foo</li><ul><li>{}<br></ul></ol>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<ol><li>foo</li><ul><li>{}<br></ul></ol>" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "<ol><li>foo</li><ul><li>{}<br></ul></ol>" compare innerHTML -PASS [["insertlinebreak",""]] "<ol><li>foo</li><ul><li>{}<br></ul></ol>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<ol><li>foo</li><ul><li>{}<br></ul></ol>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<ol><li>foo</li><ul><li>{}<br></ul></ol>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<ol><li>foo</li><ul><li>{}<br></ul></ol>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<ol><li>foo</li><ul><li>{}<br></ul></ol>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<ol><li>foo</li><ul><li>{}<br></ul></ol>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<dl><dt>{}<br></dt></dl>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<dl><dt>{}<br></dt></dl>" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "<dl><dt>{}<br></dt></dl>" compare innerHTML -PASS [["insertlinebreak",""]] "<dl><dt>{}<br></dt></dl>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<dl><dt>{}<br></dt></dl>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<dl><dt>{}<br></dt></dl>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<dl><dt>{}<br></dt></dl>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<dl><dt>{}<br></dt></dl>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<dl><dt>{}<br></dt></dl>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<dl><dt>foo<dd>{}<br></dl>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<dl><dt>foo<dd>{}<br></dl>" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "<dl><dt>foo<dd>{}<br></dl>" compare innerHTML -PASS [["insertlinebreak",""]] "<dl><dt>foo<dd>{}<br></dl>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<dl><dt>foo<dd>{}<br></dl>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<dl><dt>foo<dd>{}<br></dl>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<dl><dt>foo<dd>{}<br></dl>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<dl><dt>foo<dd>{}<br></dl>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<dl><dt>foo<dd>{}<br></dl>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<dl><dt>{}<br><dd>bar</dl>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<dl><dt>{}<br><dd>bar</dl>" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "<dl><dt>{}<br><dd>bar</dl>" compare innerHTML -PASS [["insertlinebreak",""]] "<dl><dt>{}<br><dd>bar</dl>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<dl><dt>{}<br><dd>bar</dl>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<dl><dt>{}<br><dd>bar</dl>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<dl><dt>{}<br><dd>bar</dl>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<dl><dt>{}<br><dd>bar</dl>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<dl><dt>{}<br><dd>bar</dl>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<dl><dt>foo<dd>bar<dl><dt>{}<br><dd>baz</dl></dl>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<dl><dt>foo<dd>bar<dl><dt>{}<br><dd>baz</dl></dl>" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "<dl><dt>foo<dd>bar<dl><dt>{}<br><dd>baz</dl></dl>" compare innerHTML -PASS [["insertlinebreak",""]] "<dl><dt>foo<dd>bar<dl><dt>{}<br><dd>baz</dl></dl>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<dl><dt>foo<dd>bar<dl><dt>{}<br><dd>baz</dl></dl>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<dl><dt>foo<dd>bar<dl><dt>{}<br><dd>baz</dl></dl>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<dl><dt>foo<dd>bar<dl><dt>{}<br><dd>baz</dl></dl>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<dl><dt>foo<dd>bar<dl><dt>{}<br><dd>baz</dl></dl>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<dl><dt>foo<dd>bar<dl><dt>{}<br><dd>baz</dl></dl>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<dl><dt>foo<dd>bar<dl><dt>baz<dd>{}<br></dl></dl>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<dl><dt>foo<dd>bar<dl><dt>baz<dd>{}<br></dl></dl>" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "<dl><dt>foo<dd>bar<dl><dt>baz<dd>{}<br></dl></dl>" compare innerHTML -PASS [["insertlinebreak",""]] "<dl><dt>foo<dd>bar<dl><dt>baz<dd>{}<br></dl></dl>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<dl><dt>foo<dd>bar<dl><dt>baz<dd>{}<br></dl></dl>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<dl><dt>foo<dd>bar<dl><dt>baz<dd>{}<br></dl></dl>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<dl><dt>foo<dd>bar<dl><dt>baz<dd>{}<br></dl></dl>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<dl><dt>foo<dd>bar<dl><dt>baz<dd>{}<br></dl></dl>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<dl><dt>foo<dd>bar<dl><dt>baz<dd>{}<br></dl></dl>" queryCommandValue("insertlinebreak") after -PASS [["defaultparagraphseparator","div"],["insertlinebreak",""]] "<h1>foo[bar</h1><p>baz]quz</p>": execCommand("defaultparagraphseparator", false, "div") return value -PASS [["defaultparagraphseparator","div"],["insertlinebreak",""]] "<h1>foo[bar</h1><p>baz]quz</p>": execCommand("insertlinebreak", false, "") return value -PASS [["defaultparagraphseparator","div"],["insertlinebreak",""]] "<h1>foo[bar</h1><p>baz]quz</p>" checks for modifications to non-editable content -PASS [["defaultparagraphseparator","div"],["insertlinebreak",""]] "<h1>foo[bar</h1><p>baz]quz</p>" compare innerHTML -PASS [["defaultparagraphseparator","div"],["insertlinebreak",""]] "<h1>foo[bar</h1><p>baz]quz</p>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertlinebreak",""]] "<h1>foo[bar</h1><p>baz]quz</p>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertlinebreak",""]] "<h1>foo[bar</h1><p>baz]quz</p>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertlinebreak",""]] "<h1>foo[bar</h1><p>baz]quz</p>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertlinebreak",""]] "<h1>foo[bar</h1><p>baz]quz</p>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertlinebreak",""]] "<h1>foo[bar</h1><p>baz]quz</p>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertlinebreak",""]] "<h1>foo[bar</h1><p>baz]quz</p>" queryCommandIndeterm("insertlinebreak") before -PASS [["defaultparagraphseparator","div"],["insertlinebreak",""]] "<h1>foo[bar</h1><p>baz]quz</p>" queryCommandState("insertlinebreak") before -PASS [["defaultparagraphseparator","div"],["insertlinebreak",""]] "<h1>foo[bar</h1><p>baz]quz</p>" queryCommandValue("insertlinebreak") before -PASS [["defaultparagraphseparator","div"],["insertlinebreak",""]] "<h1>foo[bar</h1><p>baz]quz</p>" queryCommandIndeterm("insertlinebreak") after -PASS [["defaultparagraphseparator","div"],["insertlinebreak",""]] "<h1>foo[bar</h1><p>baz]quz</p>" queryCommandState("insertlinebreak") after -PASS [["defaultparagraphseparator","div"],["insertlinebreak",""]] "<h1>foo[bar</h1><p>baz]quz</p>" queryCommandValue("insertlinebreak") after -PASS [["defaultparagraphseparator","p"],["insertlinebreak",""]] "<h1>foo[bar</h1><p>baz]quz</p>": execCommand("defaultparagraphseparator", false, "p") return value -PASS [["defaultparagraphseparator","p"],["insertlinebreak",""]] "<h1>foo[bar</h1><p>baz]quz</p>": execCommand("insertlinebreak", false, "") return value -PASS [["defaultparagraphseparator","p"],["insertlinebreak",""]] "<h1>foo[bar</h1><p>baz]quz</p>" checks for modifications to non-editable content -PASS [["defaultparagraphseparator","p"],["insertlinebreak",""]] "<h1>foo[bar</h1><p>baz]quz</p>" compare innerHTML -PASS [["defaultparagraphseparator","p"],["insertlinebreak",""]] "<h1>foo[bar</h1><p>baz]quz</p>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertlinebreak",""]] "<h1>foo[bar</h1><p>baz]quz</p>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertlinebreak",""]] "<h1>foo[bar</h1><p>baz]quz</p>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertlinebreak",""]] "<h1>foo[bar</h1><p>baz]quz</p>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertlinebreak",""]] "<h1>foo[bar</h1><p>baz]quz</p>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertlinebreak",""]] "<h1>foo[bar</h1><p>baz]quz</p>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertlinebreak",""]] "<h1>foo[bar</h1><p>baz]quz</p>" queryCommandIndeterm("insertlinebreak") before -PASS [["defaultparagraphseparator","p"],["insertlinebreak",""]] "<h1>foo[bar</h1><p>baz]quz</p>" queryCommandState("insertlinebreak") before -PASS [["defaultparagraphseparator","p"],["insertlinebreak",""]] "<h1>foo[bar</h1><p>baz]quz</p>" queryCommandValue("insertlinebreak") before -PASS [["defaultparagraphseparator","p"],["insertlinebreak",""]] "<h1>foo[bar</h1><p>baz]quz</p>" queryCommandIndeterm("insertlinebreak") after -PASS [["defaultparagraphseparator","p"],["insertlinebreak",""]] "<h1>foo[bar</h1><p>baz]quz</p>" queryCommandState("insertlinebreak") after -PASS [["defaultparagraphseparator","p"],["insertlinebreak",""]] "<h1>foo[bar</h1><p>baz]quz</p>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<p>foo[bar</p><h1>baz]quz</h1>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<p>foo[bar</p><h1>baz]quz</h1>" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "<p>foo[bar</p><h1>baz]quz</h1>" compare innerHTML -PASS [["insertlinebreak",""]] "<p>foo[bar</p><h1>baz]quz</h1>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<p>foo[bar</p><h1>baz]quz</h1>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<p>foo[bar</p><h1>baz]quz</h1>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<p>foo[bar</p><h1>baz]quz</h1>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<p>foo[bar</p><h1>baz]quz</h1>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<p>foo[bar</p><h1>baz]quz</h1>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<p>foo</p>{}<br>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<p>foo</p>{}<br>" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "<p>foo</p>{}<br>" compare innerHTML -PASS [["insertlinebreak",""]] "<p>foo</p>{}<br>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<p>foo</p>{}<br>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<p>foo</p>{}<br>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<p>foo</p>{}<br>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<p>foo</p>{}<br>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<p>foo</p>{}<br>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "{}<br><p>foo</p>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "{}<br><p>foo</p>" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "{}<br><p>foo</p>" compare innerHTML -PASS [["insertlinebreak",""]] "{}<br><p>foo</p>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "{}<br><p>foo</p>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "{}<br><p>foo</p>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "{}<br><p>foo</p>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "{}<br><p>foo</p>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "{}<br><p>foo</p>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<p>foo</p>{}<br><h1>bar</h1>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<p>foo</p>{}<br><h1>bar</h1>" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "<p>foo</p>{}<br><h1>bar</h1>" compare innerHTML -PASS [["insertlinebreak",""]] "<p>foo</p>{}<br><h1>bar</h1>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<p>foo</p>{}<br><h1>bar</h1>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<p>foo</p>{}<br><h1>bar</h1>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<p>foo</p>{}<br><h1>bar</h1>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<p>foo</p>{}<br><h1>bar</h1>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<p>foo</p>{}<br><h1>bar</h1>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<h1>foo</h1>{}<br><p>bar</p>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<h1>foo</h1>{}<br><p>bar</p>" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "<h1>foo</h1>{}<br><p>bar</p>" compare innerHTML -PASS [["insertlinebreak",""]] "<h1>foo</h1>{}<br><p>bar</p>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<h1>foo</h1>{}<br><p>bar</p>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<h1>foo</h1>{}<br><p>bar</p>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<h1>foo</h1>{}<br><p>bar</p>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<h1>foo</h1>{}<br><p>bar</p>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<h1>foo</h1>{}<br><p>bar</p>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<h1>foo</h1>{}<br><h2>bar</h2>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<h1>foo</h1>{}<br><h2>bar</h2>" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "<h1>foo</h1>{}<br><h2>bar</h2>" compare innerHTML -PASS [["insertlinebreak",""]] "<h1>foo</h1>{}<br><h2>bar</h2>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<h1>foo</h1>{}<br><h2>bar</h2>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<h1>foo</h1>{}<br><h2>bar</h2>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<h1>foo</h1>{}<br><h2>bar</h2>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<h1>foo</h1>{}<br><h2>bar</h2>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<h1>foo</h1>{}<br><h2>bar</h2>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<p>foo</p><h1>[bar]</h1><p>baz</p>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<p>foo</p><h1>[bar]</h1><p>baz</p>" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "<p>foo</p><h1>[bar]</h1><p>baz</p>" compare innerHTML -PASS [["insertlinebreak",""]] "<p>foo</p><h1>[bar]</h1><p>baz</p>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<p>foo</p><h1>[bar]</h1><p>baz</p>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<p>foo</p><h1>[bar]</h1><p>baz</p>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<p>foo</p><h1>[bar]</h1><p>baz</p>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<p>foo</p><h1>[bar]</h1><p>baz</p>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<p>foo</p><h1>[bar]</h1><p>baz</p>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<p>foo</p>{<h1>bar</h1>}<p>baz</p>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<p>foo</p>{<h1>bar</h1>}<p>baz</p>" checks for modifications to non-editable content -FAIL [["insertlinebreak",""]] "<p>foo</p>{<h1>bar</h1>}<p>baz</p>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<p>foo</p><br><br><p>baz</p>" but got "<p>foo</p><h1><br>baz<br></h1>" -PASS [["insertlinebreak",""]] "<p>foo</p>{<h1>bar</h1>}<p>baz</p>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<p>foo</p>{<h1>bar</h1>}<p>baz</p>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<p>foo</p>{<h1>bar</h1>}<p>baz</p>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<p>foo</p>{<h1>bar</h1>}<p>baz</p>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<p>foo</p>{<h1>bar</h1>}<p>baz</p>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<p>foo</p>{<h1>bar</h1>}<p>baz</p>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<table><tr><td>foo[]bar</table>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<table><tr><td>foo[]bar</table>" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "<table><tr><td>foo[]bar</table>" compare innerHTML -PASS [["insertlinebreak",""]] "<table><tr><td>foo[]bar</table>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<table><tr><td>foo[]bar</table>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<table><tr><td>foo[]bar</table>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<table><tr><td>foo[]bar</table>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<table><tr><td>foo[]bar</table>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<table><tr><td>foo[]bar</table>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<table><tr><td><p>foo[]bar</table>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<table><tr><td><p>foo[]bar</table>" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "<table><tr><td><p>foo[]bar</table>" compare innerHTML -PASS [["insertlinebreak",""]] "<table><tr><td><p>foo[]bar</table>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<table><tr><td><p>foo[]bar</table>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<table><tr><td><p>foo[]bar</table>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<table><tr><td><p>foo[]bar</table>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<table><tr><td><p>foo[]bar</table>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<table><tr><td><p>foo[]bar</table>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<blockquote>[]foo</blockquote>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<blockquote>[]foo</blockquote>" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "<blockquote>[]foo</blockquote>" compare innerHTML -PASS [["insertlinebreak",""]] "<blockquote>[]foo</blockquote>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<blockquote>[]foo</blockquote>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<blockquote>[]foo</blockquote>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<blockquote>[]foo</blockquote>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<blockquote>[]foo</blockquote>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<blockquote>[]foo</blockquote>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<blockquote>foo[]</blockquote>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<blockquote>foo[]</blockquote>" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "<blockquote>foo[]</blockquote>" compare innerHTML -PASS [["insertlinebreak",""]] "<blockquote>foo[]</blockquote>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<blockquote>foo[]</blockquote>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<blockquote>foo[]</blockquote>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<blockquote>foo[]</blockquote>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<blockquote>foo[]</blockquote>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<blockquote>foo[]</blockquote>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<blockquote>foo[]<br></blockquote>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<blockquote>foo[]<br></blockquote>" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "<blockquote>foo[]<br></blockquote>" compare innerHTML -PASS [["insertlinebreak",""]] "<blockquote>foo[]<br></blockquote>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<blockquote>foo[]<br></blockquote>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<blockquote>foo[]<br></blockquote>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<blockquote>foo[]<br></blockquote>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<blockquote>foo[]<br></blockquote>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<blockquote>foo[]<br></blockquote>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<blockquote>foo[]bar</blockquote>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<blockquote>foo[]bar</blockquote>" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "<blockquote>foo[]bar</blockquote>" compare innerHTML -PASS [["insertlinebreak",""]] "<blockquote>foo[]bar</blockquote>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<blockquote>foo[]bar</blockquote>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<blockquote>foo[]bar</blockquote>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<blockquote>foo[]bar</blockquote>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<blockquote>foo[]bar</blockquote>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<blockquote>foo[]bar</blockquote>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<blockquote><p>[]foo</blockquote>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<blockquote><p>[]foo</blockquote>" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "<blockquote><p>[]foo</blockquote>" compare innerHTML -PASS [["insertlinebreak",""]] "<blockquote><p>[]foo</blockquote>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<blockquote><p>[]foo</blockquote>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<blockquote><p>[]foo</blockquote>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<blockquote><p>[]foo</blockquote>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<blockquote><p>[]foo</blockquote>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<blockquote><p>[]foo</blockquote>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<blockquote><p>foo[]</blockquote>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<blockquote><p>foo[]</blockquote>" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "<blockquote><p>foo[]</blockquote>" compare innerHTML -PASS [["insertlinebreak",""]] "<blockquote><p>foo[]</blockquote>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<blockquote><p>foo[]</blockquote>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<blockquote><p>foo[]</blockquote>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<blockquote><p>foo[]</blockquote>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<blockquote><p>foo[]</blockquote>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<blockquote><p>foo[]</blockquote>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<blockquote><p>foo[]bar</blockquote>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<blockquote><p>foo[]bar</blockquote>" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "<blockquote><p>foo[]bar</blockquote>" compare innerHTML -PASS [["insertlinebreak",""]] "<blockquote><p>foo[]bar</blockquote>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<blockquote><p>foo[]bar</blockquote>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<blockquote><p>foo[]bar</blockquote>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<blockquote><p>foo[]bar</blockquote>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<blockquote><p>foo[]bar</blockquote>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<blockquote><p>foo[]bar</blockquote>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<blockquote><p>foo[]<p>bar</blockquote>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<blockquote><p>foo[]<p>bar</blockquote>" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "<blockquote><p>foo[]<p>bar</blockquote>" compare innerHTML -PASS [["insertlinebreak",""]] "<blockquote><p>foo[]<p>bar</blockquote>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<blockquote><p>foo[]<p>bar</blockquote>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<blockquote><p>foo[]<p>bar</blockquote>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<blockquote><p>foo[]<p>bar</blockquote>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<blockquote><p>foo[]<p>bar</blockquote>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<blockquote><p>foo[]<p>bar</blockquote>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<blockquote><p>foo[]bar<p>baz</blockquote>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<blockquote><p>foo[]bar<p>baz</blockquote>" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "<blockquote><p>foo[]bar<p>baz</blockquote>" compare innerHTML -PASS [["insertlinebreak",""]] "<blockquote><p>foo[]bar<p>baz</blockquote>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<blockquote><p>foo[]bar<p>baz</blockquote>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<blockquote><p>foo[]bar<p>baz</blockquote>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<blockquote><p>foo[]bar<p>baz</blockquote>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<blockquote><p>foo[]bar<p>baz</blockquote>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<blockquote><p>foo[]bar<p>baz</blockquote>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<span>foo[]bar</span>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<span>foo[]bar</span>" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "<span>foo[]bar</span>" compare innerHTML -PASS [["insertlinebreak",""]] "<span>foo[]bar</span>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<span>foo[]bar</span>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<span>foo[]bar</span>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<span>foo[]bar</span>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<span>foo[]bar</span>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<span>foo[]bar</span>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<span>foo[]bar</span>baz": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<span>foo[]bar</span>baz" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "<span>foo[]bar</span>baz" compare innerHTML -PASS [["insertlinebreak",""]] "<span>foo[]bar</span>baz" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<span>foo[]bar</span>baz" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<span>foo[]bar</span>baz" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<span>foo[]bar</span>baz" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<span>foo[]bar</span>baz" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<span>foo[]bar</span>baz" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<b>foo[]bar</b>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<b>foo[]bar</b>" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "<b>foo[]bar</b>" compare innerHTML -PASS [["insertlinebreak",""]] "<b>foo[]bar</b>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<b>foo[]bar</b>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<b>foo[]bar</b>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<b>foo[]bar</b>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<b>foo[]bar</b>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<b>foo[]bar</b>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<b>foo[]bar</b>baz": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<b>foo[]bar</b>baz" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "<b>foo[]bar</b>baz" compare innerHTML -PASS [["insertlinebreak",""]] "<b>foo[]bar</b>baz" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<b>foo[]bar</b>baz" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<b>foo[]bar</b>baz" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<b>foo[]bar</b>baz" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<b>foo[]bar</b>baz" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<b>foo[]bar</b>baz" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<b>foo[]</b>bar": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<b>foo[]</b>bar" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "<b>foo[]</b>bar" compare innerHTML -PASS [["insertlinebreak",""]] "<b>foo[]</b>bar" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<b>foo[]</b>bar" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<b>foo[]</b>bar" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<b>foo[]</b>bar" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<b>foo[]</b>bar" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<b>foo[]</b>bar" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "foo<b>[]bar</b>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "foo<b>[]bar</b>" checks for modifications to non-editable content -FAIL [["insertlinebreak",""]] "foo<b>[]bar</b>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "foo<b><br>bar</b>" but got "foo<br><b>bar</b>" -PASS [["insertlinebreak",""]] "foo<b>[]bar</b>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "foo<b>[]bar</b>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "foo<b>[]bar</b>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "foo<b>[]bar</b>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "foo<b>[]bar</b>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "foo<b>[]bar</b>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<b>foo[]</b><i>bar</i>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<b>foo[]</b><i>bar</i>" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "<b>foo[]</b><i>bar</i>" compare innerHTML -PASS [["insertlinebreak",""]] "<b>foo[]</b><i>bar</i>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<b>foo[]</b><i>bar</i>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<b>foo[]</b><i>bar</i>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<b>foo[]</b><i>bar</i>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<b>foo[]</b><i>bar</i>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<b>foo[]</b><i>bar</i>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<b>foo</b>{}<i>bar</i>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<b>foo</b>{}<i>bar</i>" checks for modifications to non-editable content -FAIL [["insertlinebreak",""]] "<b>foo</b>{}<i>bar</i>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<b>foo</b><br><i>bar</i>" but got "<b>foo<br></b><i>bar</i>" -PASS [["insertlinebreak",""]] "<b>foo</b>{}<i>bar</i>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<b>foo</b>{}<i>bar</i>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<b>foo</b>{}<i>bar</i>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<b>foo</b>{}<i>bar</i>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<b>foo</b>{}<i>bar</i>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<b>foo</b>{}<i>bar</i>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<b id=x class=y>foo[]bar</b>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<b id=x class=y>foo[]bar</b>" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "<b id=x class=y>foo[]bar</b>" compare innerHTML -PASS [["insertlinebreak",""]] "<b id=x class=y>foo[]bar</b>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<b id=x class=y>foo[]bar</b>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<b id=x class=y>foo[]bar</b>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<b id=x class=y>foo[]bar</b>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<b id=x class=y>foo[]bar</b>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<b id=x class=y>foo[]bar</b>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<i><b>foo[]bar</b>baz</i>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<i><b>foo[]bar</b>baz</i>" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "<i><b>foo[]bar</b>baz</i>" compare innerHTML -PASS [["insertlinebreak",""]] "<i><b>foo[]bar</b>baz</i>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<i><b>foo[]bar</b>baz</i>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<i><b>foo[]bar</b>baz</i>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<i><b>foo[]bar</b>baz</i>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<i><b>foo[]bar</b>baz</i>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<i><b>foo[]bar</b>baz</i>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<p><b>foo[]bar</b></p>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<p><b>foo[]bar</b></p>" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "<p><b>foo[]bar</b></p>" compare innerHTML -PASS [["insertlinebreak",""]] "<p><b>foo[]bar</b></p>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<p><b>foo[]bar</b></p>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<p><b>foo[]bar</b></p>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<p><b>foo[]bar</b></p>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<p><b>foo[]bar</b></p>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<p><b>foo[]bar</b></p>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<p><b>[]foo</b></p>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<p><b>[]foo</b></p>" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "<p><b>[]foo</b></p>" compare innerHTML -PASS [["insertlinebreak",""]] "<p><b>[]foo</b></p>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<p><b>[]foo</b></p>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<p><b>[]foo</b></p>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<p><b>[]foo</b></p>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<p><b>[]foo</b></p>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<p><b>[]foo</b></p>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<p><b id=x class=y>foo[]bar</b></p>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<p><b id=x class=y>foo[]bar</b></p>" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "<p><b id=x class=y>foo[]bar</b></p>" compare innerHTML -PASS [["insertlinebreak",""]] "<p><b id=x class=y>foo[]bar</b></p>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<p><b id=x class=y>foo[]bar</b></p>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<p><b id=x class=y>foo[]bar</b></p>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<p><b id=x class=y>foo[]bar</b></p>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<p><b id=x class=y>foo[]bar</b></p>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<p><b id=x class=y>foo[]bar</b></p>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<div><b>foo[]bar</b></div>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<div><b>foo[]bar</b></div>" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "<div><b>foo[]bar</b></div>" compare innerHTML -PASS [["insertlinebreak",""]] "<div><b>foo[]bar</b></div>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<div><b>foo[]bar</b></div>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<div><b>foo[]bar</b></div>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<div><b>foo[]bar</b></div>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<div><b>foo[]bar</b></div>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<div><b>foo[]bar</b></div>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<a href=foo>foo[]bar</a>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<a href=foo>foo[]bar</a>" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "<a href=foo>foo[]bar</a>" compare innerHTML -PASS [["insertlinebreak",""]] "<a href=foo>foo[]bar</a>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<a href=foo>foo[]bar</a>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<a href=foo>foo[]bar</a>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<a href=foo>foo[]bar</a>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<a href=foo>foo[]bar</a>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<a href=foo>foo[]bar</a>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<a href=foo>foo[]bar</a>baz": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<a href=foo>foo[]bar</a>baz" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "<a href=foo>foo[]bar</a>baz" compare innerHTML -PASS [["insertlinebreak",""]] "<a href=foo>foo[]bar</a>baz" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<a href=foo>foo[]bar</a>baz" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<a href=foo>foo[]bar</a>baz" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<a href=foo>foo[]bar</a>baz" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<a href=foo>foo[]bar</a>baz" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<a href=foo>foo[]bar</a>baz" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<a href=foo>foo[]</a>bar": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<a href=foo>foo[]</a>bar" checks for modifications to non-editable content -FAIL [["insertlinebreak",""]] "<a href=foo>foo[]</a>bar" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<a href=\"foo\">foo<br></a>bar" but got "<a href=\"foo\">foo</a><br>bar" -PASS [["insertlinebreak",""]] "<a href=foo>foo[]</a>bar" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<a href=foo>foo[]</a>bar" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<a href=foo>foo[]</a>bar" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<a href=foo>foo[]</a>bar" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<a href=foo>foo[]</a>bar" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<a href=foo>foo[]</a>bar" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "foo<a href=foo>[]bar</a>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "foo<a href=foo>[]bar</a>" checks for modifications to non-editable content -FAIL [["insertlinebreak",""]] "foo<a href=foo>[]bar</a>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "foo<a href=\"foo\"><br>bar</a>" but got "foo<br><a href=\"foo\">bar</a>" -PASS [["insertlinebreak",""]] "foo<a href=foo>[]bar</a>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "foo<a href=foo>[]bar</a>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "foo<a href=foo>[]bar</a>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "foo<a href=foo>[]bar</a>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "foo<a href=foo>[]bar</a>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "foo<a href=foo>[]bar</a>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<p>foo[]<!--bar-->": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<p>foo[]<!--bar-->" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "<p>foo[]<!--bar-->" compare innerHTML -PASS [["insertlinebreak",""]] "<p>foo[]<!--bar-->" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<p>foo[]<!--bar-->" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<p>foo[]<!--bar-->" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<p>foo[]<!--bar-->" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<p>foo[]<!--bar-->" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<p>foo[]<!--bar-->" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<p><!--foo-->[]bar": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<p><!--foo-->[]bar" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "<p><!--foo-->[]bar" compare innerHTML -PASS [["insertlinebreak",""]] "<p><!--foo-->[]bar" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<p><!--foo-->[]bar" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<p><!--foo-->[]bar" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<p><!--foo-->[]bar" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<p><!--foo-->[]bar" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<p><!--foo-->[]bar" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<p>foo<span style=color:#aBcDeF>[bar]</span>baz": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<p>foo<span style=color:#aBcDeF>[bar]</span>baz" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "<p>foo<span style=color:#aBcDeF>[bar]</span>baz" compare innerHTML -PASS [["insertlinebreak",""]] "<p>foo<span style=color:#aBcDeF>[bar]</span>baz" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<p>foo<span style=color:#aBcDeF>[bar]</span>baz" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<p>foo<span style=color:#aBcDeF>[bar]</span>baz" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<p>foo<span style=color:#aBcDeF>[bar]</span>baz" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<p>foo<span style=color:#aBcDeF>[bar]</span>baz" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<p>foo<span style=color:#aBcDeF>[bar]</span>baz" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<p>foo<span style=color:#aBcDeF>{bar}</span>baz": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<p>foo<span style=color:#aBcDeF>{bar}</span>baz" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "<p>foo<span style=color:#aBcDeF>{bar}</span>baz" compare innerHTML -PASS [["insertlinebreak",""]] "<p>foo<span style=color:#aBcDeF>{bar}</span>baz" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<p>foo<span style=color:#aBcDeF>{bar}</span>baz" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<p>foo<span style=color:#aBcDeF>{bar}</span>baz" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<p>foo<span style=color:#aBcDeF>{bar}</span>baz" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<p>foo<span style=color:#aBcDeF>{bar}</span>baz" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<p>foo<span style=color:#aBcDeF>{bar}</span>baz" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<p>foo{<span style=color:#aBcDeF>bar</span>}baz": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<p>foo{<span style=color:#aBcDeF>bar</span>}baz" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "<p>foo{<span style=color:#aBcDeF>bar</span>}baz" compare innerHTML -PASS [["insertlinebreak",""]] "<p>foo{<span style=color:#aBcDeF>bar</span>}baz" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<p>foo{<span style=color:#aBcDeF>bar</span>}baz" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<p>foo{<span style=color:#aBcDeF>bar</span>}baz" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<p>foo{<span style=color:#aBcDeF>bar</span>}baz" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<p>foo{<span style=color:#aBcDeF>bar</span>}baz" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<p>foo{<span style=color:#aBcDeF>bar</span>}baz" queryCommandValue("insertlinebreak") after -PASS [["stylewithcss","true"],["insertlinebreak",""]] "<p>[foo<span style=color:#aBcDeF>bar]</span>baz": execCommand("stylewithcss", false, "true") return value -PASS [["stylewithcss","true"],["insertlinebreak",""]] "<p>[foo<span style=color:#aBcDeF>bar]</span>baz": execCommand("insertlinebreak", false, "") return value -PASS [["stylewithcss","true"],["insertlinebreak",""]] "<p>[foo<span style=color:#aBcDeF>bar]</span>baz" checks for modifications to non-editable content -PASS [["stylewithcss","true"],["insertlinebreak",""]] "<p>[foo<span style=color:#aBcDeF>bar]</span>baz" compare innerHTML -PASS [["stylewithcss","true"],["insertlinebreak",""]] "<p>[foo<span style=color:#aBcDeF>bar]</span>baz" queryCommandIndeterm("stylewithcss") before -FAIL [["stylewithcss","true"],["insertlinebreak",""]] "<p>[foo<span style=color:#aBcDeF>bar]</span>baz" queryCommandState("stylewithcss") before assert_equals: Wrong result returned expected false but got true -PASS [["stylewithcss","true"],["insertlinebreak",""]] "<p>[foo<span style=color:#aBcDeF>bar]</span>baz" queryCommandValue("stylewithcss") before -PASS [["stylewithcss","true"],["insertlinebreak",""]] "<p>[foo<span style=color:#aBcDeF>bar]</span>baz" queryCommandIndeterm("stylewithcss") after -PASS [["stylewithcss","true"],["insertlinebreak",""]] "<p>[foo<span style=color:#aBcDeF>bar]</span>baz" queryCommandState("stylewithcss") after -PASS [["stylewithcss","true"],["insertlinebreak",""]] "<p>[foo<span style=color:#aBcDeF>bar]</span>baz" queryCommandValue("stylewithcss") after -PASS [["stylewithcss","true"],["insertlinebreak",""]] "<p>[foo<span style=color:#aBcDeF>bar]</span>baz" queryCommandIndeterm("insertlinebreak") before -PASS [["stylewithcss","true"],["insertlinebreak",""]] "<p>[foo<span style=color:#aBcDeF>bar]</span>baz" queryCommandState("insertlinebreak") before -PASS [["stylewithcss","true"],["insertlinebreak",""]] "<p>[foo<span style=color:#aBcDeF>bar]</span>baz" queryCommandValue("insertlinebreak") before -PASS [["stylewithcss","true"],["insertlinebreak",""]] "<p>[foo<span style=color:#aBcDeF>bar]</span>baz" queryCommandIndeterm("insertlinebreak") after -PASS [["stylewithcss","true"],["insertlinebreak",""]] "<p>[foo<span style=color:#aBcDeF>bar]</span>baz" queryCommandState("insertlinebreak") after -PASS [["stylewithcss","true"],["insertlinebreak",""]] "<p>[foo<span style=color:#aBcDeF>bar]</span>baz" queryCommandValue("insertlinebreak") after -PASS [["stylewithcss","false"],["insertlinebreak",""]] "<p>[foo<span style=color:#aBcDeF>bar]</span>baz": execCommand("stylewithcss", false, "false") return value -PASS [["stylewithcss","false"],["insertlinebreak",""]] "<p>[foo<span style=color:#aBcDeF>bar]</span>baz": execCommand("insertlinebreak", false, "") return value -PASS [["stylewithcss","false"],["insertlinebreak",""]] "<p>[foo<span style=color:#aBcDeF>bar]</span>baz" checks for modifications to non-editable content -PASS [["stylewithcss","false"],["insertlinebreak",""]] "<p>[foo<span style=color:#aBcDeF>bar]</span>baz" compare innerHTML -PASS [["stylewithcss","false"],["insertlinebreak",""]] "<p>[foo<span style=color:#aBcDeF>bar]</span>baz" queryCommandIndeterm("stylewithcss") before -PASS [["stylewithcss","false"],["insertlinebreak",""]] "<p>[foo<span style=color:#aBcDeF>bar]</span>baz" queryCommandState("stylewithcss") before -PASS [["stylewithcss","false"],["insertlinebreak",""]] "<p>[foo<span style=color:#aBcDeF>bar]</span>baz" queryCommandValue("stylewithcss") before -PASS [["stylewithcss","false"],["insertlinebreak",""]] "<p>[foo<span style=color:#aBcDeF>bar]</span>baz" queryCommandIndeterm("stylewithcss") after -PASS [["stylewithcss","false"],["insertlinebreak",""]] "<p>[foo<span style=color:#aBcDeF>bar]</span>baz" queryCommandState("stylewithcss") after -PASS [["stylewithcss","false"],["insertlinebreak",""]] "<p>[foo<span style=color:#aBcDeF>bar]</span>baz" queryCommandValue("stylewithcss") after -PASS [["stylewithcss","false"],["insertlinebreak",""]] "<p>[foo<span style=color:#aBcDeF>bar]</span>baz" queryCommandIndeterm("insertlinebreak") before -PASS [["stylewithcss","false"],["insertlinebreak",""]] "<p>[foo<span style=color:#aBcDeF>bar]</span>baz" queryCommandState("insertlinebreak") before -PASS [["stylewithcss","false"],["insertlinebreak",""]] "<p>[foo<span style=color:#aBcDeF>bar]</span>baz" queryCommandValue("insertlinebreak") before -PASS [["stylewithcss","false"],["insertlinebreak",""]] "<p>[foo<span style=color:#aBcDeF>bar]</span>baz" queryCommandIndeterm("insertlinebreak") after -PASS [["stylewithcss","false"],["insertlinebreak",""]] "<p>[foo<span style=color:#aBcDeF>bar]</span>baz" queryCommandState("insertlinebreak") after -PASS [["stylewithcss","false"],["insertlinebreak",""]] "<p>[foo<span style=color:#aBcDeF>bar]</span>baz" queryCommandValue("insertlinebreak") after -PASS [["stylewithcss","true"],["insertlinebreak",""]] "<p>{foo<span style=color:#aBcDeF>bar}</span>baz": execCommand("stylewithcss", false, "true") return value -PASS [["stylewithcss","true"],["insertlinebreak",""]] "<p>{foo<span style=color:#aBcDeF>bar}</span>baz": execCommand("insertlinebreak", false, "") return value -PASS [["stylewithcss","true"],["insertlinebreak",""]] "<p>{foo<span style=color:#aBcDeF>bar}</span>baz" checks for modifications to non-editable content -PASS [["stylewithcss","true"],["insertlinebreak",""]] "<p>{foo<span style=color:#aBcDeF>bar}</span>baz" compare innerHTML -PASS [["stylewithcss","true"],["insertlinebreak",""]] "<p>{foo<span style=color:#aBcDeF>bar}</span>baz" queryCommandIndeterm("stylewithcss") before -PASS [["stylewithcss","true"],["insertlinebreak",""]] "<p>{foo<span style=color:#aBcDeF>bar}</span>baz" queryCommandState("stylewithcss") before -PASS [["stylewithcss","true"],["insertlinebreak",""]] "<p>{foo<span style=color:#aBcDeF>bar}</span>baz" queryCommandValue("stylewithcss") before -PASS [["stylewithcss","true"],["insertlinebreak",""]] "<p>{foo<span style=color:#aBcDeF>bar}</span>baz" queryCommandIndeterm("stylewithcss") after -PASS [["stylewithcss","true"],["insertlinebreak",""]] "<p>{foo<span style=color:#aBcDeF>bar}</span>baz" queryCommandState("stylewithcss") after -PASS [["stylewithcss","true"],["insertlinebreak",""]] "<p>{foo<span style=color:#aBcDeF>bar}</span>baz" queryCommandValue("stylewithcss") after -PASS [["stylewithcss","true"],["insertlinebreak",""]] "<p>{foo<span style=color:#aBcDeF>bar}</span>baz" queryCommandIndeterm("insertlinebreak") before -PASS [["stylewithcss","true"],["insertlinebreak",""]] "<p>{foo<span style=color:#aBcDeF>bar}</span>baz" queryCommandState("insertlinebreak") before -PASS [["stylewithcss","true"],["insertlinebreak",""]] "<p>{foo<span style=color:#aBcDeF>bar}</span>baz" queryCommandValue("insertlinebreak") before -PASS [["stylewithcss","true"],["insertlinebreak",""]] "<p>{foo<span style=color:#aBcDeF>bar}</span>baz" queryCommandIndeterm("insertlinebreak") after -PASS [["stylewithcss","true"],["insertlinebreak",""]] "<p>{foo<span style=color:#aBcDeF>bar}</span>baz" queryCommandState("insertlinebreak") after -PASS [["stylewithcss","true"],["insertlinebreak",""]] "<p>{foo<span style=color:#aBcDeF>bar}</span>baz" queryCommandValue("insertlinebreak") after -PASS [["stylewithcss","false"],["insertlinebreak",""]] "<p>{foo<span style=color:#aBcDeF>bar}</span>baz": execCommand("stylewithcss", false, "false") return value -PASS [["stylewithcss","false"],["insertlinebreak",""]] "<p>{foo<span style=color:#aBcDeF>bar}</span>baz": execCommand("insertlinebreak", false, "") return value -PASS [["stylewithcss","false"],["insertlinebreak",""]] "<p>{foo<span style=color:#aBcDeF>bar}</span>baz" checks for modifications to non-editable content -PASS [["stylewithcss","false"],["insertlinebreak",""]] "<p>{foo<span style=color:#aBcDeF>bar}</span>baz" compare innerHTML -PASS [["stylewithcss","false"],["insertlinebreak",""]] "<p>{foo<span style=color:#aBcDeF>bar}</span>baz" queryCommandIndeterm("stylewithcss") before -PASS [["stylewithcss","false"],["insertlinebreak",""]] "<p>{foo<span style=color:#aBcDeF>bar}</span>baz" queryCommandState("stylewithcss") before -PASS [["stylewithcss","false"],["insertlinebreak",""]] "<p>{foo<span style=color:#aBcDeF>bar}</span>baz" queryCommandValue("stylewithcss") before -PASS [["stylewithcss","false"],["insertlinebreak",""]] "<p>{foo<span style=color:#aBcDeF>bar}</span>baz" queryCommandIndeterm("stylewithcss") after -PASS [["stylewithcss","false"],["insertlinebreak",""]] "<p>{foo<span style=color:#aBcDeF>bar}</span>baz" queryCommandState("stylewithcss") after -PASS [["stylewithcss","false"],["insertlinebreak",""]] "<p>{foo<span style=color:#aBcDeF>bar}</span>baz" queryCommandValue("stylewithcss") after -PASS [["stylewithcss","false"],["insertlinebreak",""]] "<p>{foo<span style=color:#aBcDeF>bar}</span>baz" queryCommandIndeterm("insertlinebreak") before -PASS [["stylewithcss","false"],["insertlinebreak",""]] "<p>{foo<span style=color:#aBcDeF>bar}</span>baz" queryCommandState("insertlinebreak") before -PASS [["stylewithcss","false"],["insertlinebreak",""]] "<p>{foo<span style=color:#aBcDeF>bar}</span>baz" queryCommandValue("insertlinebreak") before -PASS [["stylewithcss","false"],["insertlinebreak",""]] "<p>{foo<span style=color:#aBcDeF>bar}</span>baz" queryCommandIndeterm("insertlinebreak") after -PASS [["stylewithcss","false"],["insertlinebreak",""]] "<p>{foo<span style=color:#aBcDeF>bar}</span>baz" queryCommandState("insertlinebreak") after -PASS [["stylewithcss","false"],["insertlinebreak",""]] "<p>{foo<span style=color:#aBcDeF>bar}</span>baz" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<p>foo<span style=color:#aBcDeF>[bar</span>baz]": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<p>foo<span style=color:#aBcDeF>[bar</span>baz]" checks for modifications to non-editable content -FAIL [["insertlinebreak",""]] "<p>foo<span style=color:#aBcDeF>[bar</span>baz]" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<p>foo<span style=\"color:rgb(171, 205, 239)\"><br><br></span></p>" but got "<p>foo<br><font color=\"#abcdef\"><br></font></p>" -PASS [["insertlinebreak",""]] "<p>foo<span style=color:#aBcDeF>[bar</span>baz]" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<p>foo<span style=color:#aBcDeF>[bar</span>baz]" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<p>foo<span style=color:#aBcDeF>[bar</span>baz]" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<p>foo<span style=color:#aBcDeF>[bar</span>baz]" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<p>foo<span style=color:#aBcDeF>[bar</span>baz]" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<p>foo<span style=color:#aBcDeF>[bar</span>baz]" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<p>foo<span style=color:#aBcDeF>{bar</span>baz}": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<p>foo<span style=color:#aBcDeF>{bar</span>baz}" checks for modifications to non-editable content -FAIL [["insertlinebreak",""]] "<p>foo<span style=color:#aBcDeF>{bar</span>baz}" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<p>foo<span style=\"color:rgb(171, 205, 239)\"><br><br></span></p>" but got "<p>foo<br><font color=\"#abcdef\"><br></font></p>" -PASS [["insertlinebreak",""]] "<p>foo<span style=color:#aBcDeF>{bar</span>baz}" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<p>foo<span style=color:#aBcDeF>{bar</span>baz}" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<p>foo<span style=color:#aBcDeF>{bar</span>baz}" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<p>foo<span style=color:#aBcDeF>{bar</span>baz}" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<p>foo<span style=color:#aBcDeF>{bar</span>baz}" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<p>foo<span style=color:#aBcDeF>{bar</span>baz}" queryCommandValue("insertlinebreak") after -PASS [["stylewithcss","true"],["insertlinebreak",""]] "<p>foo<span style=color:#aBcDeF>[bar</span><span style=color:#fEdCbA>baz]</span>quz": execCommand("stylewithcss", false, "true") return value -PASS [["stylewithcss","true"],["insertlinebreak",""]] "<p>foo<span style=color:#aBcDeF>[bar</span><span style=color:#fEdCbA>baz]</span>quz": execCommand("insertlinebreak", false, "") return value -PASS [["stylewithcss","true"],["insertlinebreak",""]] "<p>foo<span style=color:#aBcDeF>[bar</span><span style=color:#fEdCbA>baz]</span>quz" checks for modifications to non-editable content -PASS [["stylewithcss","true"],["insertlinebreak",""]] "<p>foo<span style=color:#aBcDeF>[bar</span><span style=color:#fEdCbA>baz]</span>quz" compare innerHTML -PASS [["stylewithcss","true"],["insertlinebreak",""]] "<p>foo<span style=color:#aBcDeF>[bar</span><span style=color:#fEdCbA>baz]</span>quz" queryCommandIndeterm("stylewithcss") before -PASS [["stylewithcss","true"],["insertlinebreak",""]] "<p>foo<span style=color:#aBcDeF>[bar</span><span style=color:#fEdCbA>baz]</span>quz" queryCommandState("stylewithcss") before -PASS [["stylewithcss","true"],["insertlinebreak",""]] "<p>foo<span style=color:#aBcDeF>[bar</span><span style=color:#fEdCbA>baz]</span>quz" queryCommandValue("stylewithcss") before -PASS [["stylewithcss","true"],["insertlinebreak",""]] "<p>foo<span style=color:#aBcDeF>[bar</span><span style=color:#fEdCbA>baz]</span>quz" queryCommandIndeterm("stylewithcss") after -PASS [["stylewithcss","true"],["insertlinebreak",""]] "<p>foo<span style=color:#aBcDeF>[bar</span><span style=color:#fEdCbA>baz]</span>quz" queryCommandState("stylewithcss") after -PASS [["stylewithcss","true"],["insertlinebreak",""]] "<p>foo<span style=color:#aBcDeF>[bar</span><span style=color:#fEdCbA>baz]</span>quz" queryCommandValue("stylewithcss") after -PASS [["stylewithcss","true"],["insertlinebreak",""]] "<p>foo<span style=color:#aBcDeF>[bar</span><span style=color:#fEdCbA>baz]</span>quz" queryCommandIndeterm("insertlinebreak") before -PASS [["stylewithcss","true"],["insertlinebreak",""]] "<p>foo<span style=color:#aBcDeF>[bar</span><span style=color:#fEdCbA>baz]</span>quz" queryCommandState("insertlinebreak") before -PASS [["stylewithcss","true"],["insertlinebreak",""]] "<p>foo<span style=color:#aBcDeF>[bar</span><span style=color:#fEdCbA>baz]</span>quz" queryCommandValue("insertlinebreak") before -PASS [["stylewithcss","true"],["insertlinebreak",""]] "<p>foo<span style=color:#aBcDeF>[bar</span><span style=color:#fEdCbA>baz]</span>quz" queryCommandIndeterm("insertlinebreak") after -PASS [["stylewithcss","true"],["insertlinebreak",""]] "<p>foo<span style=color:#aBcDeF>[bar</span><span style=color:#fEdCbA>baz]</span>quz" queryCommandState("insertlinebreak") after -PASS [["stylewithcss","true"],["insertlinebreak",""]] "<p>foo<span style=color:#aBcDeF>[bar</span><span style=color:#fEdCbA>baz]</span>quz" queryCommandValue("insertlinebreak") after -PASS [["stylewithcss","false"],["insertlinebreak",""]] "<p>foo<span style=color:#aBcDeF>[bar</span><span style=color:#fEdCbA>baz]</span>quz": execCommand("stylewithcss", false, "false") return value -PASS [["stylewithcss","false"],["insertlinebreak",""]] "<p>foo<span style=color:#aBcDeF>[bar</span><span style=color:#fEdCbA>baz]</span>quz": execCommand("insertlinebreak", false, "") return value -PASS [["stylewithcss","false"],["insertlinebreak",""]] "<p>foo<span style=color:#aBcDeF>[bar</span><span style=color:#fEdCbA>baz]</span>quz" checks for modifications to non-editable content -FAIL [["stylewithcss","false"],["insertlinebreak",""]] "<p>foo<span style=color:#aBcDeF>[bar</span><span style=color:#fEdCbA>baz]</span>quz" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<p>foo<span style=\"color:rgb(171, 205, 239)\"><br></span>quz</p>" but got "<p>foo<font color=\"#abcdef\"><br></font>quz</p>" -PASS [["stylewithcss","false"],["insertlinebreak",""]] "<p>foo<span style=color:#aBcDeF>[bar</span><span style=color:#fEdCbA>baz]</span>quz" queryCommandIndeterm("stylewithcss") before -PASS [["stylewithcss","false"],["insertlinebreak",""]] "<p>foo<span style=color:#aBcDeF>[bar</span><span style=color:#fEdCbA>baz]</span>quz" queryCommandState("stylewithcss") before -PASS [["stylewithcss","false"],["insertlinebreak",""]] "<p>foo<span style=color:#aBcDeF>[bar</span><span style=color:#fEdCbA>baz]</span>quz" queryCommandValue("stylewithcss") before -PASS [["stylewithcss","false"],["insertlinebreak",""]] "<p>foo<span style=color:#aBcDeF>[bar</span><span style=color:#fEdCbA>baz]</span>quz" queryCommandIndeterm("stylewithcss") after -PASS [["stylewithcss","false"],["insertlinebreak",""]] "<p>foo<span style=color:#aBcDeF>[bar</span><span style=color:#fEdCbA>baz]</span>quz" queryCommandState("stylewithcss") after -PASS [["stylewithcss","false"],["insertlinebreak",""]] "<p>foo<span style=color:#aBcDeF>[bar</span><span style=color:#fEdCbA>baz]</span>quz" queryCommandValue("stylewithcss") after -PASS [["stylewithcss","false"],["insertlinebreak",""]] "<p>foo<span style=color:#aBcDeF>[bar</span><span style=color:#fEdCbA>baz]</span>quz" queryCommandIndeterm("insertlinebreak") before -PASS [["stylewithcss","false"],["insertlinebreak",""]] "<p>foo<span style=color:#aBcDeF>[bar</span><span style=color:#fEdCbA>baz]</span>quz" queryCommandState("insertlinebreak") before -PASS [["stylewithcss","false"],["insertlinebreak",""]] "<p>foo<span style=color:#aBcDeF>[bar</span><span style=color:#fEdCbA>baz]</span>quz" queryCommandValue("insertlinebreak") before -PASS [["stylewithcss","false"],["insertlinebreak",""]] "<p>foo<span style=color:#aBcDeF>[bar</span><span style=color:#fEdCbA>baz]</span>quz" queryCommandIndeterm("insertlinebreak") after -PASS [["stylewithcss","false"],["insertlinebreak",""]] "<p>foo<span style=color:#aBcDeF>[bar</span><span style=color:#fEdCbA>baz]</span>quz" queryCommandState("insertlinebreak") after -PASS [["stylewithcss","false"],["insertlinebreak",""]] "<p>foo<span style=color:#aBcDeF>[bar</span><span style=color:#fEdCbA>baz]</span>quz" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<ul contenteditable><li>{}<br></ul>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<ul contenteditable><li>{}<br></ul>" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "<ul contenteditable><li>{}<br></ul>" compare innerHTML -PASS [["insertlinebreak",""]] "<ul contenteditable><li>{}<br></ul>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<ul contenteditable><li>{}<br></ul>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<ul contenteditable><li>{}<br></ul>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<ul contenteditable><li>{}<br></ul>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<ul contenteditable><li>{}<br></ul>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<ul contenteditable><li>{}<br></ul>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<ul contenteditable><li>foo[]</ul>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<ul contenteditable><li>foo[]</ul>" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "<ul contenteditable><li>foo[]</ul>" compare innerHTML -PASS [["insertlinebreak",""]] "<ul contenteditable><li>foo[]</ul>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<ul contenteditable><li>foo[]</ul>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<ul contenteditable><li>foo[]</ul>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<ul contenteditable><li>foo[]</ul>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<ul contenteditable><li>foo[]</ul>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<ul contenteditable><li>foo[]</ul>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<div contenteditable=false><ul contenteditable><li>{}<br></ul></div>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<div contenteditable=false><ul contenteditable><li>{}<br></ul></div>" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "<div contenteditable=false><ul contenteditable><li>{}<br></ul></div>" compare innerHTML -PASS [["insertlinebreak",""]] "<div contenteditable=false><ul contenteditable><li>{}<br></ul></div>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<div contenteditable=false><ul contenteditable><li>{}<br></ul></div>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<div contenteditable=false><ul contenteditable><li>{}<br></ul></div>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<div contenteditable=false><ul contenteditable><li>{}<br></ul></div>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<div contenteditable=false><ul contenteditable><li>{}<br></ul></div>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<div contenteditable=false><ul contenteditable><li>{}<br></ul></div>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<div contenteditable=false><ul contenteditable><li>foo[]</ul></div>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<div contenteditable=false><ul contenteditable><li>foo[]</ul></div>" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "<div contenteditable=false><ul contenteditable><li>foo[]</ul></div>" compare innerHTML -PASS [["insertlinebreak",""]] "<div contenteditable=false><ul contenteditable><li>foo[]</ul></div>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<div contenteditable=false><ul contenteditable><li>foo[]</ul></div>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<div contenteditable=false><ul contenteditable><li>foo[]</ul></div>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<div contenteditable=false><ul contenteditable><li>foo[]</ul></div>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<div contenteditable=false><ul contenteditable><li>foo[]</ul></div>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<div contenteditable=false><ul contenteditable><li>foo[]</ul></div>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<address><p>foo[]</address>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<address><p>foo[]</address>" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "<address><p>foo[]</address>" compare innerHTML -PASS [["insertlinebreak",""]] "<address><p>foo[]</address>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<address><p>foo[]</address>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<address><p>foo[]</address>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<address><p>foo[]</address>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<address><p>foo[]</address>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<address><p>foo[]</address>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<dl><dt><p>foo[]</dl>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<dl><dt><p>foo[]</dl>" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "<dl><dt><p>foo[]</dl>" compare innerHTML -PASS [["insertlinebreak",""]] "<dl><dt><p>foo[]</dl>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<dl><dt><p>foo[]</dl>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<dl><dt><p>foo[]</dl>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<dl><dt><p>foo[]</dl>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<dl><dt><p>foo[]</dl>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<dl><dt><p>foo[]</dl>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<dl><dd><p>foo[]</dl>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<dl><dd><p>foo[]</dl>" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "<dl><dd><p>foo[]</dl>" compare innerHTML -PASS [["insertlinebreak",""]] "<dl><dd><p>foo[]</dl>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<dl><dd><p>foo[]</dl>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<dl><dd><p>foo[]</dl>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<dl><dd><p>foo[]</dl>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<dl><dd><p>foo[]</dl>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<dl><dd><p>foo[]</dl>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<ol><li><p>foo[]</ol>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<ol><li><p>foo[]</ol>" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "<ol><li><p>foo[]</ol>" compare innerHTML -PASS [["insertlinebreak",""]] "<ol><li><p>foo[]</ol>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<ol><li><p>foo[]</ol>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<ol><li><p>foo[]</ol>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<ol><li><p>foo[]</ol>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<ol><li><p>foo[]</ol>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<ol><li><p>foo[]</ol>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<ul><li><p>foo[]</ul>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<ul><li><p>foo[]</ul>" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "<ul><li><p>foo[]</ul>" compare innerHTML -PASS [["insertlinebreak",""]] "<ul><li><p>foo[]</ul>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<ul><li><p>foo[]</ul>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<ul><li><p>foo[]</ul>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<ul><li><p>foo[]</ul>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<ul><li><p>foo[]</ul>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<ul><li><p>foo[]</ul>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<address><div>foo[]</address>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<address><div>foo[]</address>" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "<address><div>foo[]</address>" compare innerHTML -PASS [["insertlinebreak",""]] "<address><div>foo[]</address>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<address><div>foo[]</address>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<address><div>foo[]</address>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<address><div>foo[]</address>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<address><div>foo[]</address>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<address><div>foo[]</address>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<dl><dt><div>foo[]</dl>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<dl><dt><div>foo[]</dl>" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "<dl><dt><div>foo[]</dl>" compare innerHTML -PASS [["insertlinebreak",""]] "<dl><dt><div>foo[]</dl>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<dl><dt><div>foo[]</dl>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<dl><dt><div>foo[]</dl>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<dl><dt><div>foo[]</dl>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<dl><dt><div>foo[]</dl>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<dl><dt><div>foo[]</dl>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<dl><dd><div>foo[]</dl>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<dl><dd><div>foo[]</dl>" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "<dl><dd><div>foo[]</dl>" compare innerHTML -PASS [["insertlinebreak",""]] "<dl><dd><div>foo[]</dl>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<dl><dd><div>foo[]</dl>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<dl><dd><div>foo[]</dl>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<dl><dd><div>foo[]</dl>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<dl><dd><div>foo[]</dl>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<dl><dd><div>foo[]</dl>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<ol><li><div>foo[]</ol>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<ol><li><div>foo[]</ol>" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "<ol><li><div>foo[]</ol>" compare innerHTML -PASS [["insertlinebreak",""]] "<ol><li><div>foo[]</ol>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<ol><li><div>foo[]</ol>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<ol><li><div>foo[]</ol>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<ol><li><div>foo[]</ol>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<ol><li><div>foo[]</ol>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<ol><li><div>foo[]</ol>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<ul><li><div>foo[]</ul>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<ul><li><div>foo[]</ul>" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "<ul><li><div>foo[]</ul>" compare innerHTML -PASS [["insertlinebreak",""]] "<ul><li><div>foo[]</ul>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<ul><li><div>foo[]</ul>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<ul><li><div>foo[]</ul>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<ul><li><div>foo[]</ul>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<ul><li><div>foo[]</ul>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<ul><li><div>foo[]</ul>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<div><p>foo[]</div>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<div><p>foo[]</div>" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "<div><p>foo[]</div>" compare innerHTML -PASS [["insertlinebreak",""]] "<div><p>foo[]</div>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<div><p>foo[]</div>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<div><p>foo[]</div>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<div><p>foo[]</div>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<div><p>foo[]</div>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<div><p>foo[]</div>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<div><div>foo[]</div>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<div><div>foo[]</div>" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "<div><div>foo[]</div>" compare innerHTML -PASS [["insertlinebreak",""]] "<div><div>foo[]</div>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<div><div>foo[]</div>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<div><div>foo[]</div>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<div><div>foo[]</div>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<div><div>foo[]</div>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<div><div>foo[]</div>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<address><p>[]foo</address>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<address><p>[]foo</address>" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "<address><p>[]foo</address>" compare innerHTML -PASS [["insertlinebreak",""]] "<address><p>[]foo</address>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<address><p>[]foo</address>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<address><p>[]foo</address>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<address><p>[]foo</address>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<address><p>[]foo</address>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<address><p>[]foo</address>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<dl><dt><p>[]foo</dl>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<dl><dt><p>[]foo</dl>" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "<dl><dt><p>[]foo</dl>" compare innerHTML -PASS [["insertlinebreak",""]] "<dl><dt><p>[]foo</dl>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<dl><dt><p>[]foo</dl>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<dl><dt><p>[]foo</dl>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<dl><dt><p>[]foo</dl>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<dl><dt><p>[]foo</dl>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<dl><dt><p>[]foo</dl>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<dl><dd><p>[]foo</dl>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<dl><dd><p>[]foo</dl>" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "<dl><dd><p>[]foo</dl>" compare innerHTML -PASS [["insertlinebreak",""]] "<dl><dd><p>[]foo</dl>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<dl><dd><p>[]foo</dl>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<dl><dd><p>[]foo</dl>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<dl><dd><p>[]foo</dl>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<dl><dd><p>[]foo</dl>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<dl><dd><p>[]foo</dl>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<ol><li><p>[]foo</ol>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<ol><li><p>[]foo</ol>" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "<ol><li><p>[]foo</ol>" compare innerHTML -PASS [["insertlinebreak",""]] "<ol><li><p>[]foo</ol>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<ol><li><p>[]foo</ol>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<ol><li><p>[]foo</ol>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<ol><li><p>[]foo</ol>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<ol><li><p>[]foo</ol>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<ol><li><p>[]foo</ol>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<ul><li><p>[]foo</ul>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<ul><li><p>[]foo</ul>" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "<ul><li><p>[]foo</ul>" compare innerHTML -PASS [["insertlinebreak",""]] "<ul><li><p>[]foo</ul>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<ul><li><p>[]foo</ul>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<ul><li><p>[]foo</ul>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<ul><li><p>[]foo</ul>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<ul><li><p>[]foo</ul>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<ul><li><p>[]foo</ul>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<address><div>[]foo</address>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<address><div>[]foo</address>" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "<address><div>[]foo</address>" compare innerHTML -PASS [["insertlinebreak",""]] "<address><div>[]foo</address>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<address><div>[]foo</address>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<address><div>[]foo</address>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<address><div>[]foo</address>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<address><div>[]foo</address>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<address><div>[]foo</address>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<dl><dt><div>[]foo</dl>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<dl><dt><div>[]foo</dl>" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "<dl><dt><div>[]foo</dl>" compare innerHTML -PASS [["insertlinebreak",""]] "<dl><dt><div>[]foo</dl>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<dl><dt><div>[]foo</dl>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<dl><dt><div>[]foo</dl>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<dl><dt><div>[]foo</dl>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<dl><dt><div>[]foo</dl>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<dl><dt><div>[]foo</dl>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<dl><dd><div>[]foo</dl>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<dl><dd><div>[]foo</dl>" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "<dl><dd><div>[]foo</dl>" compare innerHTML -PASS [["insertlinebreak",""]] "<dl><dd><div>[]foo</dl>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<dl><dd><div>[]foo</dl>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<dl><dd><div>[]foo</dl>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<dl><dd><div>[]foo</dl>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<dl><dd><div>[]foo</dl>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<dl><dd><div>[]foo</dl>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<ol><li><div>[]foo</ol>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<ol><li><div>[]foo</ol>" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "<ol><li><div>[]foo</ol>" compare innerHTML -PASS [["insertlinebreak",""]] "<ol><li><div>[]foo</ol>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<ol><li><div>[]foo</ol>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<ol><li><div>[]foo</ol>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<ol><li><div>[]foo</ol>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<ol><li><div>[]foo</ol>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<ol><li><div>[]foo</ol>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<ul><li><div>[]foo</ul>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<ul><li><div>[]foo</ul>" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "<ul><li><div>[]foo</ul>" compare innerHTML -PASS [["insertlinebreak",""]] "<ul><li><div>[]foo</ul>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<ul><li><div>[]foo</ul>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<ul><li><div>[]foo</ul>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<ul><li><div>[]foo</ul>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<ul><li><div>[]foo</ul>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<ul><li><div>[]foo</ul>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<div><p>[]foo</div>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<div><p>[]foo</div>" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "<div><p>[]foo</div>" compare innerHTML -PASS [["insertlinebreak",""]] "<div><p>[]foo</div>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<div><p>[]foo</div>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<div><p>[]foo</div>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<div><p>[]foo</div>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<div><p>[]foo</div>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<div><p>[]foo</div>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<div><div>[]foo</div>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<div><div>[]foo</div>" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "<div><div>[]foo</div>" compare innerHTML -PASS [["insertlinebreak",""]] "<div><div>[]foo</div>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<div><div>[]foo</div>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<div><div>[]foo</div>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<div><div>[]foo</div>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<div><div>[]foo</div>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<div><div>[]foo</div>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<address><p>foo[]bar</address>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<address><p>foo[]bar</address>" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "<address><p>foo[]bar</address>" compare innerHTML -PASS [["insertlinebreak",""]] "<address><p>foo[]bar</address>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<address><p>foo[]bar</address>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<address><p>foo[]bar</address>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<address><p>foo[]bar</address>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<address><p>foo[]bar</address>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<address><p>foo[]bar</address>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<dl><dt><p>foo[]bar</dl>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<dl><dt><p>foo[]bar</dl>" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "<dl><dt><p>foo[]bar</dl>" compare innerHTML -PASS [["insertlinebreak",""]] "<dl><dt><p>foo[]bar</dl>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<dl><dt><p>foo[]bar</dl>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<dl><dt><p>foo[]bar</dl>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<dl><dt><p>foo[]bar</dl>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<dl><dt><p>foo[]bar</dl>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<dl><dt><p>foo[]bar</dl>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<dl><dd><p>foo[]bar</dl>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<dl><dd><p>foo[]bar</dl>" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "<dl><dd><p>foo[]bar</dl>" compare innerHTML -PASS [["insertlinebreak",""]] "<dl><dd><p>foo[]bar</dl>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<dl><dd><p>foo[]bar</dl>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<dl><dd><p>foo[]bar</dl>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<dl><dd><p>foo[]bar</dl>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<dl><dd><p>foo[]bar</dl>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<dl><dd><p>foo[]bar</dl>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<ol><li><p>foo[]bar</ol>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<ol><li><p>foo[]bar</ol>" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "<ol><li><p>foo[]bar</ol>" compare innerHTML -PASS [["insertlinebreak",""]] "<ol><li><p>foo[]bar</ol>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<ol><li><p>foo[]bar</ol>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<ol><li><p>foo[]bar</ol>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<ol><li><p>foo[]bar</ol>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<ol><li><p>foo[]bar</ol>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<ol><li><p>foo[]bar</ol>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<ul><li><p>foo[]bar</ul>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<ul><li><p>foo[]bar</ul>" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "<ul><li><p>foo[]bar</ul>" compare innerHTML -PASS [["insertlinebreak",""]] "<ul><li><p>foo[]bar</ul>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<ul><li><p>foo[]bar</ul>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<ul><li><p>foo[]bar</ul>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<ul><li><p>foo[]bar</ul>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<ul><li><p>foo[]bar</ul>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<ul><li><p>foo[]bar</ul>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<address><div>foo[]bar</address>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<address><div>foo[]bar</address>" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "<address><div>foo[]bar</address>" compare innerHTML -PASS [["insertlinebreak",""]] "<address><div>foo[]bar</address>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<address><div>foo[]bar</address>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<address><div>foo[]bar</address>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<address><div>foo[]bar</address>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<address><div>foo[]bar</address>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<address><div>foo[]bar</address>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<dl><dt><div>foo[]bar</dl>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<dl><dt><div>foo[]bar</dl>" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "<dl><dt><div>foo[]bar</dl>" compare innerHTML -PASS [["insertlinebreak",""]] "<dl><dt><div>foo[]bar</dl>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<dl><dt><div>foo[]bar</dl>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<dl><dt><div>foo[]bar</dl>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<dl><dt><div>foo[]bar</dl>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<dl><dt><div>foo[]bar</dl>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<dl><dt><div>foo[]bar</dl>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<dl><dd><div>foo[]bar</dl>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<dl><dd><div>foo[]bar</dl>" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "<dl><dd><div>foo[]bar</dl>" compare innerHTML -PASS [["insertlinebreak",""]] "<dl><dd><div>foo[]bar</dl>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<dl><dd><div>foo[]bar</dl>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<dl><dd><div>foo[]bar</dl>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<dl><dd><div>foo[]bar</dl>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<dl><dd><div>foo[]bar</dl>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<dl><dd><div>foo[]bar</dl>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<ol><li><div>foo[]bar</ol>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<ol><li><div>foo[]bar</ol>" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "<ol><li><div>foo[]bar</ol>" compare innerHTML -PASS [["insertlinebreak",""]] "<ol><li><div>foo[]bar</ol>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<ol><li><div>foo[]bar</ol>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<ol><li><div>foo[]bar</ol>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<ol><li><div>foo[]bar</ol>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<ol><li><div>foo[]bar</ol>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<ol><li><div>foo[]bar</ol>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<ul><li><div>foo[]bar</ul>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<ul><li><div>foo[]bar</ul>" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "<ul><li><div>foo[]bar</ul>" compare innerHTML -PASS [["insertlinebreak",""]] "<ul><li><div>foo[]bar</ul>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<ul><li><div>foo[]bar</ul>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<ul><li><div>foo[]bar</ul>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<ul><li><div>foo[]bar</ul>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<ul><li><div>foo[]bar</ul>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<ul><li><div>foo[]bar</ul>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<div><p>foo[]bar</div>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<div><p>foo[]bar</div>" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "<div><p>foo[]bar</div>" compare innerHTML -PASS [["insertlinebreak",""]] "<div><p>foo[]bar</div>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<div><p>foo[]bar</div>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<div><p>foo[]bar</div>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<div><p>foo[]bar</div>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<div><p>foo[]bar</div>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<div><p>foo[]bar</div>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<div><div>foo[]bar</div>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<div><div>foo[]bar</div>" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "<div><div>foo[]bar</div>" compare innerHTML -PASS [["insertlinebreak",""]] "<div><div>foo[]bar</div>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<div><div>foo[]bar</div>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<div><div>foo[]bar</div>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<div><div>foo[]bar</div>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<div><div>foo[]bar</div>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<div><div>foo[]bar</div>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<ol><li class=a id=x><p class=b id=y>foo[]</ol>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<ol><li class=a id=x><p class=b id=y>foo[]</ol>" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "<ol><li class=a id=x><p class=b id=y>foo[]</ol>" compare innerHTML -PASS [["insertlinebreak",""]] "<ol><li class=a id=x><p class=b id=y>foo[]</ol>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<ol><li class=a id=x><p class=b id=y>foo[]</ol>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<ol><li class=a id=x><p class=b id=y>foo[]</ol>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<ol><li class=a id=x><p class=b id=y>foo[]</ol>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<ol><li class=a id=x><p class=b id=y>foo[]</ol>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<ol><li class=a id=x><p class=b id=y>foo[]</ol>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<div class=a id=x><div class=b id=y>foo[]</div></div>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<div class=a id=x><div class=b id=y>foo[]</div></div>" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "<div class=a id=x><div class=b id=y>foo[]</div></div>" compare innerHTML -PASS [["insertlinebreak",""]] "<div class=a id=x><div class=b id=y>foo[]</div></div>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<div class=a id=x><div class=b id=y>foo[]</div></div>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<div class=a id=x><div class=b id=y>foo[]</div></div>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<div class=a id=x><div class=b id=y>foo[]</div></div>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<div class=a id=x><div class=b id=y>foo[]</div></div>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<div class=a id=x><div class=b id=y>foo[]</div></div>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<div class=a id=x><p class=b id=y>foo[]</div>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<div class=a id=x><p class=b id=y>foo[]</div>" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "<div class=a id=x><p class=b id=y>foo[]</div>" compare innerHTML -PASS [["insertlinebreak",""]] "<div class=a id=x><p class=b id=y>foo[]</div>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<div class=a id=x><p class=b id=y>foo[]</div>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<div class=a id=x><p class=b id=y>foo[]</div>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<div class=a id=x><p class=b id=y>foo[]</div>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<div class=a id=x><p class=b id=y>foo[]</div>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<div class=a id=x><p class=b id=y>foo[]</div>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<ol><li class=a id=x><p class=b id=y>[]foo</ol>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<ol><li class=a id=x><p class=b id=y>[]foo</ol>" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "<ol><li class=a id=x><p class=b id=y>[]foo</ol>" compare innerHTML -PASS [["insertlinebreak",""]] "<ol><li class=a id=x><p class=b id=y>[]foo</ol>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<ol><li class=a id=x><p class=b id=y>[]foo</ol>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<ol><li class=a id=x><p class=b id=y>[]foo</ol>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<ol><li class=a id=x><p class=b id=y>[]foo</ol>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<ol><li class=a id=x><p class=b id=y>[]foo</ol>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<ol><li class=a id=x><p class=b id=y>[]foo</ol>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<div class=a id=x><div class=b id=y>[]foo</div></div>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<div class=a id=x><div class=b id=y>[]foo</div></div>" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "<div class=a id=x><div class=b id=y>[]foo</div></div>" compare innerHTML -PASS [["insertlinebreak",""]] "<div class=a id=x><div class=b id=y>[]foo</div></div>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<div class=a id=x><div class=b id=y>[]foo</div></div>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<div class=a id=x><div class=b id=y>[]foo</div></div>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<div class=a id=x><div class=b id=y>[]foo</div></div>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<div class=a id=x><div class=b id=y>[]foo</div></div>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<div class=a id=x><div class=b id=y>[]foo</div></div>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<div class=a id=x><p class=b id=y>[]foo</div>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<div class=a id=x><p class=b id=y>[]foo</div>" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "<div class=a id=x><p class=b id=y>[]foo</div>" compare innerHTML -PASS [["insertlinebreak",""]] "<div class=a id=x><p class=b id=y>[]foo</div>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<div class=a id=x><p class=b id=y>[]foo</div>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<div class=a id=x><p class=b id=y>[]foo</div>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<div class=a id=x><p class=b id=y>[]foo</div>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<div class=a id=x><p class=b id=y>[]foo</div>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<div class=a id=x><p class=b id=y>[]foo</div>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<ol><li class=a id=x><p class=b id=y>foo[]bar</ol>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<ol><li class=a id=x><p class=b id=y>foo[]bar</ol>" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "<ol><li class=a id=x><p class=b id=y>foo[]bar</ol>" compare innerHTML -PASS [["insertlinebreak",""]] "<ol><li class=a id=x><p class=b id=y>foo[]bar</ol>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<ol><li class=a id=x><p class=b id=y>foo[]bar</ol>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<ol><li class=a id=x><p class=b id=y>foo[]bar</ol>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<ol><li class=a id=x><p class=b id=y>foo[]bar</ol>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<ol><li class=a id=x><p class=b id=y>foo[]bar</ol>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<ol><li class=a id=x><p class=b id=y>foo[]bar</ol>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<div class=a id=x><div class=b id=y>foo[]bar</div></div>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<div class=a id=x><div class=b id=y>foo[]bar</div></div>" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "<div class=a id=x><div class=b id=y>foo[]bar</div></div>" compare innerHTML -PASS [["insertlinebreak",""]] "<div class=a id=x><div class=b id=y>foo[]bar</div></div>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<div class=a id=x><div class=b id=y>foo[]bar</div></div>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<div class=a id=x><div class=b id=y>foo[]bar</div></div>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<div class=a id=x><div class=b id=y>foo[]bar</div></div>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<div class=a id=x><div class=b id=y>foo[]bar</div></div>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<div class=a id=x><div class=b id=y>foo[]bar</div></div>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<div class=a id=x><p class=b id=y>foo[]bar</div>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<div class=a id=x><p class=b id=y>foo[]bar</div>" checks for modifications to non-editable content -PASS [["insertlinebreak",""]] "<div class=a id=x><p class=b id=y>foo[]bar</div>" compare innerHTML -PASS [["insertlinebreak",""]] "<div class=a id=x><p class=b id=y>foo[]bar</div>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<div class=a id=x><p class=b id=y>foo[]bar</div>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<div class=a id=x><p class=b id=y>foo[]bar</div>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<div class=a id=x><p class=b id=y>foo[]bar</div>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<div class=a id=x><p class=b id=y>foo[]bar</div>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<div class=a id=x><p class=b id=y>foo[]bar</div>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<div>abc [] </div>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<div>abc [] </div>" checks for modifications to non-editable content -FAIL [["insertlinebreak",""]] "<div>abc [] </div>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<div>abc<br><br></div>" but got "<div>abc <br><br></div>" -PASS [["insertlinebreak",""]] "<div>abc [] </div>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<div>abc [] </div>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<div>abc [] </div>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<div>abc [] </div>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<div>abc [] </div>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<div>abc [] </div>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<div>abc[] </div>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<div>abc[] </div>" checks for modifications to non-editable content -FAIL [["insertlinebreak",""]] "<div>abc[] </div>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<div>abc<br><br></div>" but got "<div>abc <br><br></div>" -PASS [["insertlinebreak",""]] "<div>abc[] </div>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<div>abc[] </div>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<div>abc[] </div>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<div>abc[] </div>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<div>abc[] </div>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<div>abc[] </div>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<div>[] abc</div>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<div>[] abc</div>" checks for modifications to non-editable content -FAIL [["insertlinebreak",""]] "<div>[] abc</div>" compare innerHTML assert_in_array: Unexpected innerHTML (after normalizing inline style) value "<div><br> abc</div>" not in array ["<div><br>abc</div>", "<div><br> abc</div>"] -PASS [["insertlinebreak",""]] "<div>[] abc</div>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<div>[] abc</div>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<div>[] abc</div>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<div>[] abc</div>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<div>[] abc</div>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<div>[] abc</div>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<div>[] abc</div>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<div>[] abc</div>" checks for modifications to non-editable content -FAIL [["insertlinebreak",""]] "<div>[] abc</div>" compare innerHTML assert_in_array: Unexpected innerHTML (after normalizing inline style) value "<div><br> abc</div>" not in array ["<div><br>abc</div>", "<div><br> abc</div>"] -PASS [["insertlinebreak",""]] "<div>[] abc</div>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<div>[] abc</div>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<div>[] abc</div>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<div>[] abc</div>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<div>[] abc</div>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<div>[] abc</div>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<div> [] abc</div>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<div> [] abc</div>" checks for modifications to non-editable content -FAIL [["insertlinebreak",""]] "<div> [] abc</div>" compare innerHTML assert_in_array: Unexpected innerHTML (after normalizing inline style) value "<div><br> abc</div>" not in array ["<div><br>abc</div>", "<div><br> abc</div>", "<div><br> abc</div>"] -PASS [["insertlinebreak",""]] "<div> [] abc</div>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<div> [] abc</div>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<div> [] abc</div>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<div> [] abc</div>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<div> [] abc</div>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<div> [] abc</div>" queryCommandValue("insertlinebreak") after -PASS [["insertlinebreak",""]] "<div> []abc</div>": execCommand("insertlinebreak", false, "") return value -PASS [["insertlinebreak",""]] "<div> []abc</div>" checks for modifications to non-editable content -FAIL [["insertlinebreak",""]] "<div> []abc</div>" compare innerHTML assert_in_array: Unexpected innerHTML (after normalizing inline style) value "<div><br> abc</div>" not in array ["<div><br>abc</div>", "<div><br> abc</div>"] -PASS [["insertlinebreak",""]] "<div> []abc</div>" queryCommandIndeterm("insertlinebreak") before -PASS [["insertlinebreak",""]] "<div> []abc</div>" queryCommandState("insertlinebreak") before -PASS [["insertlinebreak",""]] "<div> []abc</div>" queryCommandValue("insertlinebreak") before -PASS [["insertlinebreak",""]] "<div> []abc</div>" queryCommandIndeterm("insertlinebreak") after -PASS [["insertlinebreak",""]] "<div> []abc</div>" queryCommandState("insertlinebreak") after -PASS [["insertlinebreak",""]] "<div> []abc</div>" queryCommandValue("insertlinebreak") after -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/editing/run/insertparagraph_1-1000-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/editing/run/insertparagraph_1-1000-expected.txt deleted file mode 100644 index 5ee0e5a..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/editing/run/insertparagraph_1-1000-expected.txt +++ /dev/null
@@ -1,1004 +0,0 @@ -This is a testharness.js-based test. -Found 1000 tests; 951 PASS, 49 FAIL, 0 TIMEOUT, 0 NOTRUN. -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "foo[bar]baz": execCommand("defaultparagraphseparator", false, "div") return value -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "foo[bar]baz": execCommand("insertparagraph", false, "") return value -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "foo[bar]baz" checks for modifications to non-editable content -FAIL [["defaultparagraphseparator","div"],["insertparagraph",""]] "foo[bar]baz" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<div>foo</div><div>baz</div>" but got "foo<div>baz</div>" -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "foo[bar]baz" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "foo[bar]baz" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "foo[bar]baz" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "foo[bar]baz" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "foo[bar]baz" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "foo[bar]baz" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "foo[bar]baz" queryCommandIndeterm("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "foo[bar]baz" queryCommandState("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "foo[bar]baz" queryCommandValue("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "foo[bar]baz" queryCommandIndeterm("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "foo[bar]baz" queryCommandState("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "foo[bar]baz" queryCommandValue("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "foo[bar]baz": execCommand("defaultparagraphseparator", false, "p") return value -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "foo[bar]baz": execCommand("insertparagraph", false, "") return value -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "foo[bar]baz" checks for modifications to non-editable content -FAIL [["defaultparagraphseparator","p"],["insertparagraph",""]] "foo[bar]baz" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<p>foo</p><p>baz</p>" but got "foo<p>baz</p>" -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "foo[bar]baz" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "foo[bar]baz" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "foo[bar]baz" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "foo[bar]baz" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "foo[bar]baz" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "foo[bar]baz" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "foo[bar]baz" queryCommandIndeterm("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "foo[bar]baz" queryCommandState("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "foo[bar]baz" queryCommandValue("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "foo[bar]baz" queryCommandIndeterm("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "foo[bar]baz" queryCommandState("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "foo[bar]baz" queryCommandValue("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "fo[o<table><tr><td>b]ar</table>": execCommand("defaultparagraphseparator", false, "div") return value -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "fo[o<table><tr><td>b]ar</table>": execCommand("insertparagraph", false, "") return value -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "fo[o<table><tr><td>b]ar</table>" checks for modifications to non-editable content -FAIL [["defaultparagraphseparator","div"],["insertparagraph",""]] "fo[o<table><tr><td>b]ar</table>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<div>fo</div><div><br></div><table><tbody><tr><td>ar</td></tr></tbody></table>" but got "fo<div><br><table><tbody><tr><td>ar</td></tr></tbody></table></div>" -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "fo[o<table><tr><td>b]ar</table>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "fo[o<table><tr><td>b]ar</table>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "fo[o<table><tr><td>b]ar</table>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "fo[o<table><tr><td>b]ar</table>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "fo[o<table><tr><td>b]ar</table>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "fo[o<table><tr><td>b]ar</table>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "fo[o<table><tr><td>b]ar</table>" queryCommandIndeterm("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "fo[o<table><tr><td>b]ar</table>" queryCommandState("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "fo[o<table><tr><td>b]ar</table>" queryCommandValue("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "fo[o<table><tr><td>b]ar</table>" queryCommandIndeterm("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "fo[o<table><tr><td>b]ar</table>" queryCommandState("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "fo[o<table><tr><td>b]ar</table>" queryCommandValue("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "fo[o<table><tr><td>b]ar</table>": execCommand("defaultparagraphseparator", false, "p") return value -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "fo[o<table><tr><td>b]ar</table>": execCommand("insertparagraph", false, "") return value -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "fo[o<table><tr><td>b]ar</table>" checks for modifications to non-editable content -FAIL [["defaultparagraphseparator","p"],["insertparagraph",""]] "fo[o<table><tr><td>b]ar</table>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<p>fo</p><p><br></p><table><tbody><tr><td>ar</td></tr></tbody></table>" but got "fo<p><br><table><tbody><tr><td>ar</td></tr></tbody></table></p>" -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "fo[o<table><tr><td>b]ar</table>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "fo[o<table><tr><td>b]ar</table>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "fo[o<table><tr><td>b]ar</table>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "fo[o<table><tr><td>b]ar</table>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "fo[o<table><tr><td>b]ar</table>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "fo[o<table><tr><td>b]ar</table>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "fo[o<table><tr><td>b]ar</table>" queryCommandIndeterm("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "fo[o<table><tr><td>b]ar</table>" queryCommandState("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "fo[o<table><tr><td>b]ar</table>" queryCommandValue("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "fo[o<table><tr><td>b]ar</table>" queryCommandIndeterm("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "fo[o<table><tr><td>b]ar</table>" queryCommandState("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "fo[o<table><tr><td>b]ar</table>" queryCommandValue("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<table><tr><td>[foo<td>bar]<tr><td>baz<td>quz</table>": execCommand("defaultparagraphseparator", false, "div") return value -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<table><tr><td>[foo<td>bar]<tr><td>baz<td>quz</table>": execCommand("insertparagraph", false, "") return value -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<table><tr><td>[foo<td>bar]<tr><td>baz<td>quz</table>" checks for modifications to non-editable content -FAIL [["defaultparagraphseparator","div"],["insertparagraph",""]] "<table><tr><td>[foo<td>bar]<tr><td>baz<td>quz</table>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<table><tbody><tr><td><div><br></div><div><br></div></td><td><br></td></tr><tr><td>baz</td><td>quz</td></tr></tbody></table>" but got "<table><tbody><tr><td><br><br></td><td></td></tr><tr><td>baz</td><td>quz</td></tr></tbody></table>" -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<table><tr><td>[foo<td>bar]<tr><td>baz<td>quz</table>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<table><tr><td>[foo<td>bar]<tr><td>baz<td>quz</table>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<table><tr><td>[foo<td>bar]<tr><td>baz<td>quz</table>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<table><tr><td>[foo<td>bar]<tr><td>baz<td>quz</table>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<table><tr><td>[foo<td>bar]<tr><td>baz<td>quz</table>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<table><tr><td>[foo<td>bar]<tr><td>baz<td>quz</table>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<table><tr><td>[foo<td>bar]<tr><td>baz<td>quz</table>" queryCommandIndeterm("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<table><tr><td>[foo<td>bar]<tr><td>baz<td>quz</table>" queryCommandState("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<table><tr><td>[foo<td>bar]<tr><td>baz<td>quz</table>" queryCommandValue("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<table><tr><td>[foo<td>bar]<tr><td>baz<td>quz</table>" queryCommandIndeterm("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<table><tr><td>[foo<td>bar]<tr><td>baz<td>quz</table>" queryCommandState("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<table><tr><td>[foo<td>bar]<tr><td>baz<td>quz</table>" queryCommandValue("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<table><tr><td>[foo<td>bar]<tr><td>baz<td>quz</table>": execCommand("defaultparagraphseparator", false, "p") return value -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<table><tr><td>[foo<td>bar]<tr><td>baz<td>quz</table>": execCommand("insertparagraph", false, "") return value -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<table><tr><td>[foo<td>bar]<tr><td>baz<td>quz</table>" checks for modifications to non-editable content -FAIL [["defaultparagraphseparator","p"],["insertparagraph",""]] "<table><tr><td>[foo<td>bar]<tr><td>baz<td>quz</table>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<table><tbody><tr><td><p><br></p><p><br></p></td><td><br></td></tr><tr><td>baz</td><td>quz</td></tr></tbody></table>" but got "<table><tbody><tr><td><br><br></td><td></td></tr><tr><td>baz</td><td>quz</td></tr></tbody></table>" -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<table><tr><td>[foo<td>bar]<tr><td>baz<td>quz</table>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<table><tr><td>[foo<td>bar]<tr><td>baz<td>quz</table>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<table><tr><td>[foo<td>bar]<tr><td>baz<td>quz</table>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<table><tr><td>[foo<td>bar]<tr><td>baz<td>quz</table>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<table><tr><td>[foo<td>bar]<tr><td>baz<td>quz</table>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<table><tr><td>[foo<td>bar]<tr><td>baz<td>quz</table>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<table><tr><td>[foo<td>bar]<tr><td>baz<td>quz</table>" queryCommandIndeterm("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<table><tr><td>[foo<td>bar]<tr><td>baz<td>quz</table>" queryCommandState("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<table><tr><td>[foo<td>bar]<tr><td>baz<td>quz</table>" queryCommandValue("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<table><tr><td>[foo<td>bar]<tr><td>baz<td>quz</table>" queryCommandIndeterm("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<table><tr><td>[foo<td>bar]<tr><td>baz<td>quz</table>" queryCommandState("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<table><tr><td>[foo<td>bar]<tr><td>baz<td>quz</table>" queryCommandValue("insertparagraph") after -PASS [["insertparagraph",""]] "<table><tbody data-start=0 data-end=1><tr><td>foo<td>bar<tr><td>baz<td>quz</table>": execCommand("insertparagraph", false, "") return value -PASS [["insertparagraph",""]] "<table><tbody data-start=0 data-end=1><tr><td>foo<td>bar<tr><td>baz<td>quz</table>" checks for modifications to non-editable content -FAIL [["insertparagraph",""]] "<table><tbody data-start=0 data-end=1><tr><td>foo<td>bar<tr><td>baz<td>quz</table>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<table><tbody><tr><td><br></td><td><br></td></tr><tr><td>baz</td><td>quz</td></tr></tbody></table>" but got "<table><tbody><tr><td><br><br></td><td></td></tr><tr><td>baz</td><td>quz</td></tr></tbody></table>" -PASS [["insertparagraph",""]] "<table><tbody data-start=0 data-end=1><tr><td>foo<td>bar<tr><td>baz<td>quz</table>" queryCommandIndeterm("insertparagraph") before -PASS [["insertparagraph",""]] "<table><tbody data-start=0 data-end=1><tr><td>foo<td>bar<tr><td>baz<td>quz</table>" queryCommandState("insertparagraph") before -PASS [["insertparagraph",""]] "<table><tbody data-start=0 data-end=1><tr><td>foo<td>bar<tr><td>baz<td>quz</table>" queryCommandValue("insertparagraph") before -PASS [["insertparagraph",""]] "<table><tbody data-start=0 data-end=1><tr><td>foo<td>bar<tr><td>baz<td>quz</table>" queryCommandIndeterm("insertparagraph") after -PASS [["insertparagraph",""]] "<table><tbody data-start=0 data-end=1><tr><td>foo<td>bar<tr><td>baz<td>quz</table>" queryCommandState("insertparagraph") after -PASS [["insertparagraph",""]] "<table><tbody data-start=0 data-end=1><tr><td>foo<td>bar<tr><td>baz<td>quz</table>" queryCommandValue("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<table><tr><td>fo[o</table>b]ar": execCommand("defaultparagraphseparator", false, "div") return value -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<table><tr><td>fo[o</table>b]ar": execCommand("insertparagraph", false, "") return value -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<table><tr><td>fo[o</table>b]ar" checks for modifications to non-editable content -FAIL [["defaultparagraphseparator","div"],["insertparagraph",""]] "<table><tr><td>fo[o</table>b]ar" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<table><tbody><tr><td><div>fo</div><div><br></div></td></tr></tbody></table>ar" but got "<table><tbody><tr><td>fo<br>ar</td></tr></tbody></table>" -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<table><tr><td>fo[o</table>b]ar" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<table><tr><td>fo[o</table>b]ar" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<table><tr><td>fo[o</table>b]ar" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<table><tr><td>fo[o</table>b]ar" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<table><tr><td>fo[o</table>b]ar" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<table><tr><td>fo[o</table>b]ar" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<table><tr><td>fo[o</table>b]ar" queryCommandIndeterm("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<table><tr><td>fo[o</table>b]ar" queryCommandState("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<table><tr><td>fo[o</table>b]ar" queryCommandValue("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<table><tr><td>fo[o</table>b]ar" queryCommandIndeterm("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<table><tr><td>fo[o</table>b]ar" queryCommandState("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<table><tr><td>fo[o</table>b]ar" queryCommandValue("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<table><tr><td>fo[o</table>b]ar": execCommand("defaultparagraphseparator", false, "p") return value -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<table><tr><td>fo[o</table>b]ar": execCommand("insertparagraph", false, "") return value -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<table><tr><td>fo[o</table>b]ar" checks for modifications to non-editable content -FAIL [["defaultparagraphseparator","p"],["insertparagraph",""]] "<table><tr><td>fo[o</table>b]ar" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<table><tbody><tr><td><p>fo</p><p><br></p></td></tr></tbody></table>ar" but got "<table><tbody><tr><td>fo<br>ar</td></tr></tbody></table>" -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<table><tr><td>fo[o</table>b]ar" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<table><tr><td>fo[o</table>b]ar" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<table><tr><td>fo[o</table>b]ar" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<table><tr><td>fo[o</table>b]ar" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<table><tr><td>fo[o</table>b]ar" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<table><tr><td>fo[o</table>b]ar" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<table><tr><td>fo[o</table>b]ar" queryCommandIndeterm("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<table><tr><td>fo[o</table>b]ar" queryCommandState("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<table><tr><td>fo[o</table>b]ar" queryCommandValue("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<table><tr><td>fo[o</table>b]ar" queryCommandIndeterm("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<table><tr><td>fo[o</table>b]ar" queryCommandState("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<table><tr><td>fo[o</table>b]ar" queryCommandValue("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<table><tr><td>fo[o<td>b]ar<td>baz</table>": execCommand("defaultparagraphseparator", false, "div") return value -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<table><tr><td>fo[o<td>b]ar<td>baz</table>": execCommand("insertparagraph", false, "") return value -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<table><tr><td>fo[o<td>b]ar<td>baz</table>" checks for modifications to non-editable content -FAIL [["defaultparagraphseparator","div"],["insertparagraph",""]] "<table><tr><td>fo[o<td>b]ar<td>baz</table>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<table><tbody><tr><td><div>fo</div><div><br></div></td><td>ar</td><td>baz</td></tr></tbody></table>" but got "<table><tbody><tr><td>fo<br><br></td><td>ar</td><td>baz</td></tr></tbody></table>" -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<table><tr><td>fo[o<td>b]ar<td>baz</table>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<table><tr><td>fo[o<td>b]ar<td>baz</table>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<table><tr><td>fo[o<td>b]ar<td>baz</table>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<table><tr><td>fo[o<td>b]ar<td>baz</table>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<table><tr><td>fo[o<td>b]ar<td>baz</table>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<table><tr><td>fo[o<td>b]ar<td>baz</table>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<table><tr><td>fo[o<td>b]ar<td>baz</table>" queryCommandIndeterm("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<table><tr><td>fo[o<td>b]ar<td>baz</table>" queryCommandState("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<table><tr><td>fo[o<td>b]ar<td>baz</table>" queryCommandValue("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<table><tr><td>fo[o<td>b]ar<td>baz</table>" queryCommandIndeterm("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<table><tr><td>fo[o<td>b]ar<td>baz</table>" queryCommandState("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<table><tr><td>fo[o<td>b]ar<td>baz</table>" queryCommandValue("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<table><tr><td>fo[o<td>b]ar<td>baz</table>": execCommand("defaultparagraphseparator", false, "p") return value -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<table><tr><td>fo[o<td>b]ar<td>baz</table>": execCommand("insertparagraph", false, "") return value -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<table><tr><td>fo[o<td>b]ar<td>baz</table>" checks for modifications to non-editable content -FAIL [["defaultparagraphseparator","p"],["insertparagraph",""]] "<table><tr><td>fo[o<td>b]ar<td>baz</table>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<table><tbody><tr><td><p>fo</p><p><br></p></td><td>ar</td><td>baz</td></tr></tbody></table>" but got "<table><tbody><tr><td>fo<br><br></td><td>ar</td><td>baz</td></tr></tbody></table>" -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<table><tr><td>fo[o<td>b]ar<td>baz</table>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<table><tr><td>fo[o<td>b]ar<td>baz</table>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<table><tr><td>fo[o<td>b]ar<td>baz</table>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<table><tr><td>fo[o<td>b]ar<td>baz</table>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<table><tr><td>fo[o<td>b]ar<td>baz</table>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<table><tr><td>fo[o<td>b]ar<td>baz</table>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<table><tr><td>fo[o<td>b]ar<td>baz</table>" queryCommandIndeterm("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<table><tr><td>fo[o<td>b]ar<td>baz</table>" queryCommandState("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<table><tr><td>fo[o<td>b]ar<td>baz</table>" queryCommandValue("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<table><tr><td>fo[o<td>b]ar<td>baz</table>" queryCommandIndeterm("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<table><tr><td>fo[o<td>b]ar<td>baz</table>" queryCommandState("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<table><tr><td>fo[o<td>b]ar<td>baz</table>" queryCommandValue("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "{<table><tr><td>foo</table>}": execCommand("defaultparagraphseparator", false, "div") return value -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "{<table><tr><td>foo</table>}": execCommand("insertparagraph", false, "") return value -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "{<table><tr><td>foo</table>}" checks for modifications to non-editable content -FAIL [["defaultparagraphseparator","div"],["insertparagraph",""]] "{<table><tr><td>foo</table>}" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<div><br></div><div><br></div>" but got "<br><div><br></div>" -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "{<table><tr><td>foo</table>}" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "{<table><tr><td>foo</table>}" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "{<table><tr><td>foo</table>}" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "{<table><tr><td>foo</table>}" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "{<table><tr><td>foo</table>}" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "{<table><tr><td>foo</table>}" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "{<table><tr><td>foo</table>}" queryCommandIndeterm("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "{<table><tr><td>foo</table>}" queryCommandState("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "{<table><tr><td>foo</table>}" queryCommandValue("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "{<table><tr><td>foo</table>}" queryCommandIndeterm("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "{<table><tr><td>foo</table>}" queryCommandState("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "{<table><tr><td>foo</table>}" queryCommandValue("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "{<table><tr><td>foo</table>}": execCommand("defaultparagraphseparator", false, "p") return value -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "{<table><tr><td>foo</table>}": execCommand("insertparagraph", false, "") return value -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "{<table><tr><td>foo</table>}" checks for modifications to non-editable content -FAIL [["defaultparagraphseparator","p"],["insertparagraph",""]] "{<table><tr><td>foo</table>}" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<p><br></p><p><br></p>" but got "<br><p><br></p>" -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "{<table><tr><td>foo</table>}" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "{<table><tr><td>foo</table>}" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "{<table><tr><td>foo</table>}" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "{<table><tr><td>foo</table>}" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "{<table><tr><td>foo</table>}" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "{<table><tr><td>foo</table>}" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "{<table><tr><td>foo</table>}" queryCommandIndeterm("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "{<table><tr><td>foo</table>}" queryCommandState("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "{<table><tr><td>foo</table>}" queryCommandValue("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "{<table><tr><td>foo</table>}" queryCommandIndeterm("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "{<table><tr><td>foo</table>}" queryCommandState("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "{<table><tr><td>foo</table>}" queryCommandValue("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<table><tr><td>[foo]</table>": execCommand("defaultparagraphseparator", false, "div") return value -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<table><tr><td>[foo]</table>": execCommand("insertparagraph", false, "") return value -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<table><tr><td>[foo]</table>" checks for modifications to non-editable content -FAIL [["defaultparagraphseparator","div"],["insertparagraph",""]] "<table><tr><td>[foo]</table>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<table><tbody><tr><td><div><br></div><div><br></div></td></tr></tbody></table>" but got "<br><div><br></div>" -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<table><tr><td>[foo]</table>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<table><tr><td>[foo]</table>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<table><tr><td>[foo]</table>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<table><tr><td>[foo]</table>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<table><tr><td>[foo]</table>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<table><tr><td>[foo]</table>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<table><tr><td>[foo]</table>" queryCommandIndeterm("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<table><tr><td>[foo]</table>" queryCommandState("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<table><tr><td>[foo]</table>" queryCommandValue("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<table><tr><td>[foo]</table>" queryCommandIndeterm("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<table><tr><td>[foo]</table>" queryCommandState("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<table><tr><td>[foo]</table>" queryCommandValue("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<table><tr><td>[foo]</table>": execCommand("defaultparagraphseparator", false, "p") return value -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<table><tr><td>[foo]</table>": execCommand("insertparagraph", false, "") return value -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<table><tr><td>[foo]</table>" checks for modifications to non-editable content -FAIL [["defaultparagraphseparator","p"],["insertparagraph",""]] "<table><tr><td>[foo]</table>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<table><tbody><tr><td><p><br></p><p><br></p></td></tr></tbody></table>" but got "<br><p><br></p>" -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<table><tr><td>[foo]</table>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<table><tr><td>[foo]</table>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<table><tr><td>[foo]</table>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<table><tr><td>[foo]</table>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<table><tr><td>[foo]</table>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<table><tr><td>[foo]</table>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<table><tr><td>[foo]</table>" queryCommandIndeterm("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<table><tr><td>[foo]</table>" queryCommandState("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<table><tr><td>[foo]</table>" queryCommandValue("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<table><tr><td>[foo]</table>" queryCommandIndeterm("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<table><tr><td>[foo]</table>" queryCommandState("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<table><tr><td>[foo]</table>" queryCommandValue("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<ol><li>[foo]<li>bar</ol>": execCommand("defaultparagraphseparator", false, "div") return value -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<ol><li>[foo]<li>bar</ol>": execCommand("insertparagraph", false, "") return value -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<ol><li>[foo]<li>bar</ol>" checks for modifications to non-editable content -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<ol><li>[foo]<li>bar</ol>" compare innerHTML -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<ol><li>[foo]<li>bar</ol>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<ol><li>[foo]<li>bar</ol>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<ol><li>[foo]<li>bar</ol>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<ol><li>[foo]<li>bar</ol>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<ol><li>[foo]<li>bar</ol>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<ol><li>[foo]<li>bar</ol>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<ol><li>[foo]<li>bar</ol>" queryCommandIndeterm("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<ol><li>[foo]<li>bar</ol>" queryCommandState("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<ol><li>[foo]<li>bar</ol>" queryCommandValue("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<ol><li>[foo]<li>bar</ol>" queryCommandIndeterm("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<ol><li>[foo]<li>bar</ol>" queryCommandState("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<ol><li>[foo]<li>bar</ol>" queryCommandValue("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<ol><li>[foo]<li>bar</ol>": execCommand("defaultparagraphseparator", false, "p") return value -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<ol><li>[foo]<li>bar</ol>": execCommand("insertparagraph", false, "") return value -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<ol><li>[foo]<li>bar</ol>" checks for modifications to non-editable content -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<ol><li>[foo]<li>bar</ol>" compare innerHTML -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<ol><li>[foo]<li>bar</ol>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<ol><li>[foo]<li>bar</ol>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<ol><li>[foo]<li>bar</ol>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<ol><li>[foo]<li>bar</ol>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<ol><li>[foo]<li>bar</ol>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<ol><li>[foo]<li>bar</ol>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<ol><li>[foo]<li>bar</ol>" queryCommandIndeterm("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<ol><li>[foo]<li>bar</ol>" queryCommandState("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<ol><li>[foo]<li>bar</ol>" queryCommandValue("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<ol><li>[foo]<li>bar</ol>" queryCommandIndeterm("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<ol><li>[foo]<li>bar</ol>" queryCommandState("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<ol><li>[foo]<li>bar</ol>" queryCommandValue("insertparagraph") after -PASS [["insertparagraph",""]] "<ol><li>f[o]o<li>bar</ol>": execCommand("insertparagraph", false, "") return value -PASS [["insertparagraph",""]] "<ol><li>f[o]o<li>bar</ol>" checks for modifications to non-editable content -PASS [["insertparagraph",""]] "<ol><li>f[o]o<li>bar</ol>" compare innerHTML -PASS [["insertparagraph",""]] "<ol><li>f[o]o<li>bar</ol>" queryCommandIndeterm("insertparagraph") before -PASS [["insertparagraph",""]] "<ol><li>f[o]o<li>bar</ol>" queryCommandState("insertparagraph") before -PASS [["insertparagraph",""]] "<ol><li>f[o]o<li>bar</ol>" queryCommandValue("insertparagraph") before -PASS [["insertparagraph",""]] "<ol><li>f[o]o<li>bar</ol>" queryCommandIndeterm("insertparagraph") after -PASS [["insertparagraph",""]] "<ol><li>f[o]o<li>bar</ol>" queryCommandState("insertparagraph") after -PASS [["insertparagraph",""]] "<ol><li>f[o]o<li>bar</ol>" queryCommandValue("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "[]foo": execCommand("defaultparagraphseparator", false, "div") return value -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "[]foo": execCommand("insertparagraph", false, "") return value -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "[]foo" checks for modifications to non-editable content -FAIL [["defaultparagraphseparator","div"],["insertparagraph",""]] "[]foo" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<div><br></div><div>foo</div>" but got "<div><br></div>foo" -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "[]foo" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "[]foo" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "[]foo" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "[]foo" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "[]foo" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "[]foo" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "[]foo" queryCommandIndeterm("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "[]foo" queryCommandState("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "[]foo" queryCommandValue("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "[]foo" queryCommandIndeterm("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "[]foo" queryCommandState("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "[]foo" queryCommandValue("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "[]foo": execCommand("defaultparagraphseparator", false, "p") return value -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "[]foo": execCommand("insertparagraph", false, "") return value -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "[]foo" checks for modifications to non-editable content -FAIL [["defaultparagraphseparator","p"],["insertparagraph",""]] "[]foo" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<p><br></p><p>foo</p>" but got "<p><br></p>foo" -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "[]foo" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "[]foo" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "[]foo" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "[]foo" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "[]foo" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "[]foo" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "[]foo" queryCommandIndeterm("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "[]foo" queryCommandState("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "[]foo" queryCommandValue("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "[]foo" queryCommandIndeterm("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "[]foo" queryCommandState("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "[]foo" queryCommandValue("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "foo[]": execCommand("defaultparagraphseparator", false, "div") return value -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "foo[]": execCommand("insertparagraph", false, "") return value -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "foo[]" checks for modifications to non-editable content -FAIL [["defaultparagraphseparator","div"],["insertparagraph",""]] "foo[]" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<div>foo</div><div><br></div>" but got "foo<div><br></div>" -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "foo[]" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "foo[]" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "foo[]" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "foo[]" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "foo[]" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "foo[]" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "foo[]" queryCommandIndeterm("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "foo[]" queryCommandState("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "foo[]" queryCommandValue("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "foo[]" queryCommandIndeterm("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "foo[]" queryCommandState("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "foo[]" queryCommandValue("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "foo[]": execCommand("defaultparagraphseparator", false, "p") return value -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "foo[]": execCommand("insertparagraph", false, "") return value -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "foo[]" checks for modifications to non-editable content -FAIL [["defaultparagraphseparator","p"],["insertparagraph",""]] "foo[]" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<p>foo</p><p><br></p>" but got "foo<p><br></p>" -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "foo[]" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "foo[]" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "foo[]" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "foo[]" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "foo[]" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "foo[]" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "foo[]" queryCommandIndeterm("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "foo[]" queryCommandState("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "foo[]" queryCommandValue("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "foo[]" queryCommandIndeterm("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "foo[]" queryCommandState("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "foo[]" queryCommandValue("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<span>foo[]</span>": execCommand("defaultparagraphseparator", false, "div") return value -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<span>foo[]</span>": execCommand("insertparagraph", false, "") return value -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<span>foo[]</span>" checks for modifications to non-editable content -FAIL [["defaultparagraphseparator","div"],["insertparagraph",""]] "<span>foo[]</span>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<div><span>foo</span></div><div><br></div>" but got "<span>foo</span><div><span><br></span></div>" -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<span>foo[]</span>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<span>foo[]</span>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<span>foo[]</span>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<span>foo[]</span>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<span>foo[]</span>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<span>foo[]</span>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<span>foo[]</span>" queryCommandIndeterm("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<span>foo[]</span>" queryCommandState("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<span>foo[]</span>" queryCommandValue("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<span>foo[]</span>" queryCommandIndeterm("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<span>foo[]</span>" queryCommandState("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<span>foo[]</span>" queryCommandValue("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<span>foo[]</span>": execCommand("defaultparagraphseparator", false, "p") return value -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<span>foo[]</span>": execCommand("insertparagraph", false, "") return value -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<span>foo[]</span>" checks for modifications to non-editable content -FAIL [["defaultparagraphseparator","p"],["insertparagraph",""]] "<span>foo[]</span>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<p><span>foo</span></p><p><br></p>" but got "<span>foo</span><p><span><br></span></p>" -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<span>foo[]</span>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<span>foo[]</span>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<span>foo[]</span>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<span>foo[]</span>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<span>foo[]</span>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<span>foo[]</span>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<span>foo[]</span>" queryCommandIndeterm("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<span>foo[]</span>" queryCommandState("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<span>foo[]</span>" queryCommandValue("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<span>foo[]</span>" queryCommandIndeterm("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<span>foo[]</span>" queryCommandState("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<span>foo[]</span>" queryCommandValue("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "foo[]<br>": execCommand("defaultparagraphseparator", false, "div") return value -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "foo[]<br>": execCommand("insertparagraph", false, "") return value -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "foo[]<br>" checks for modifications to non-editable content -FAIL [["defaultparagraphseparator","div"],["insertparagraph",""]] "foo[]<br>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<div>foo</div><div><br></div>" but got "foo<br><div><br></div>" -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "foo[]<br>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "foo[]<br>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "foo[]<br>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "foo[]<br>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "foo[]<br>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "foo[]<br>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "foo[]<br>" queryCommandIndeterm("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "foo[]<br>" queryCommandState("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "foo[]<br>" queryCommandValue("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "foo[]<br>" queryCommandIndeterm("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "foo[]<br>" queryCommandState("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "foo[]<br>" queryCommandValue("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "foo[]<br>": execCommand("defaultparagraphseparator", false, "p") return value -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "foo[]<br>": execCommand("insertparagraph", false, "") return value -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "foo[]<br>" checks for modifications to non-editable content -FAIL [["defaultparagraphseparator","p"],["insertparagraph",""]] "foo[]<br>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<p>foo</p><p><br></p>" but got "foo<br><p><br></p>" -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "foo[]<br>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "foo[]<br>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "foo[]<br>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "foo[]<br>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "foo[]<br>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "foo[]<br>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "foo[]<br>" queryCommandIndeterm("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "foo[]<br>" queryCommandState("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "foo[]<br>" queryCommandValue("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "foo[]<br>" queryCommandIndeterm("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "foo[]<br>" queryCommandState("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "foo[]<br>" queryCommandValue("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "foo[]bar": execCommand("defaultparagraphseparator", false, "div") return value -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "foo[]bar": execCommand("insertparagraph", false, "") return value -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "foo[]bar" checks for modifications to non-editable content -FAIL [["defaultparagraphseparator","div"],["insertparagraph",""]] "foo[]bar" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<div>foo</div><div>bar</div>" but got "foo<div>bar</div>" -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "foo[]bar" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "foo[]bar" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "foo[]bar" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "foo[]bar" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "foo[]bar" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "foo[]bar" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "foo[]bar" queryCommandIndeterm("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "foo[]bar" queryCommandState("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "foo[]bar" queryCommandValue("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "foo[]bar" queryCommandIndeterm("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "foo[]bar" queryCommandState("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "foo[]bar" queryCommandValue("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "foo[]bar": execCommand("defaultparagraphseparator", false, "p") return value -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "foo[]bar": execCommand("insertparagraph", false, "") return value -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "foo[]bar" checks for modifications to non-editable content -FAIL [["defaultparagraphseparator","p"],["insertparagraph",""]] "foo[]bar" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<p>foo</p><p>bar</p>" but got "foo<p>bar</p>" -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "foo[]bar" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "foo[]bar" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "foo[]bar" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "foo[]bar" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "foo[]bar" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "foo[]bar" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "foo[]bar" queryCommandIndeterm("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "foo[]bar" queryCommandState("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "foo[]bar" queryCommandValue("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "foo[]bar" queryCommandIndeterm("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "foo[]bar" queryCommandState("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "foo[]bar" queryCommandValue("insertparagraph") after -PASS [["insertparagraph",""]] "<address>[]foo</address>": execCommand("insertparagraph", false, "") return value -PASS [["insertparagraph",""]] "<address>[]foo</address>" checks for modifications to non-editable content -FAIL [["insertparagraph",""]] "<address>[]foo</address>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<address><br>foo</address>" but got "<address><br></address><address>foo</address>" -PASS [["insertparagraph",""]] "<address>[]foo</address>" queryCommandIndeterm("insertparagraph") before -PASS [["insertparagraph",""]] "<address>[]foo</address>" queryCommandState("insertparagraph") before -PASS [["insertparagraph",""]] "<address>[]foo</address>" queryCommandValue("insertparagraph") before -PASS [["insertparagraph",""]] "<address>[]foo</address>" queryCommandIndeterm("insertparagraph") after -PASS [["insertparagraph",""]] "<address>[]foo</address>" queryCommandState("insertparagraph") after -PASS [["insertparagraph",""]] "<address>[]foo</address>" queryCommandValue("insertparagraph") after -PASS [["insertparagraph",""]] "<address>foo[]</address>": execCommand("insertparagraph", false, "") return value -PASS [["insertparagraph",""]] "<address>foo[]</address>" checks for modifications to non-editable content -FAIL [["insertparagraph",""]] "<address>foo[]</address>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<address>foo<br><br></address>" but got "<address>foo</address><address><br></address>" -PASS [["insertparagraph",""]] "<address>foo[]</address>" queryCommandIndeterm("insertparagraph") before -PASS [["insertparagraph",""]] "<address>foo[]</address>" queryCommandState("insertparagraph") before -PASS [["insertparagraph",""]] "<address>foo[]</address>" queryCommandValue("insertparagraph") before -PASS [["insertparagraph",""]] "<address>foo[]</address>" queryCommandIndeterm("insertparagraph") after -PASS [["insertparagraph",""]] "<address>foo[]</address>" queryCommandState("insertparagraph") after -PASS [["insertparagraph",""]] "<address>foo[]</address>" queryCommandValue("insertparagraph") after -PASS [["insertparagraph",""]] "<address>foo[]<br></address>": execCommand("insertparagraph", false, "") return value -PASS [["insertparagraph",""]] "<address>foo[]<br></address>" checks for modifications to non-editable content -FAIL [["insertparagraph",""]] "<address>foo[]<br></address>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<address>foo<br><br></address>" but got "<address>foo<br></address><address><br></address>" -PASS [["insertparagraph",""]] "<address>foo[]<br></address>" queryCommandIndeterm("insertparagraph") before -PASS [["insertparagraph",""]] "<address>foo[]<br></address>" queryCommandState("insertparagraph") before -PASS [["insertparagraph",""]] "<address>foo[]<br></address>" queryCommandValue("insertparagraph") before -PASS [["insertparagraph",""]] "<address>foo[]<br></address>" queryCommandIndeterm("insertparagraph") after -PASS [["insertparagraph",""]] "<address>foo[]<br></address>" queryCommandState("insertparagraph") after -PASS [["insertparagraph",""]] "<address>foo[]<br></address>" queryCommandValue("insertparagraph") after -PASS [["insertparagraph",""]] "<address>foo[]bar</address>": execCommand("insertparagraph", false, "") return value -PASS [["insertparagraph",""]] "<address>foo[]bar</address>" checks for modifications to non-editable content -FAIL [["insertparagraph",""]] "<address>foo[]bar</address>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<address>foo<br>bar</address>" but got "<address>foo</address><address>bar</address>" -PASS [["insertparagraph",""]] "<address>foo[]bar</address>" queryCommandIndeterm("insertparagraph") before -PASS [["insertparagraph",""]] "<address>foo[]bar</address>" queryCommandState("insertparagraph") before -PASS [["insertparagraph",""]] "<address>foo[]bar</address>" queryCommandValue("insertparagraph") before -PASS [["insertparagraph",""]] "<address>foo[]bar</address>" queryCommandIndeterm("insertparagraph") after -PASS [["insertparagraph",""]] "<address>foo[]bar</address>" queryCommandState("insertparagraph") after -PASS [["insertparagraph",""]] "<address>foo[]bar</address>" queryCommandValue("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<div>[]foo</div>": execCommand("defaultparagraphseparator", false, "div") return value -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<div>[]foo</div>": execCommand("insertparagraph", false, "") return value -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<div>[]foo</div>" checks for modifications to non-editable content -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<div>[]foo</div>" compare innerHTML -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<div>[]foo</div>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<div>[]foo</div>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<div>[]foo</div>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<div>[]foo</div>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<div>[]foo</div>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<div>[]foo</div>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<div>[]foo</div>" queryCommandIndeterm("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<div>[]foo</div>" queryCommandState("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<div>[]foo</div>" queryCommandValue("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<div>[]foo</div>" queryCommandIndeterm("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<div>[]foo</div>" queryCommandState("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<div>[]foo</div>" queryCommandValue("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div>[]foo</div>": execCommand("defaultparagraphseparator", false, "p") return value -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div>[]foo</div>": execCommand("insertparagraph", false, "") return value -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div>[]foo</div>" checks for modifications to non-editable content -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div>[]foo</div>" compare innerHTML -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div>[]foo</div>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div>[]foo</div>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div>[]foo</div>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div>[]foo</div>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div>[]foo</div>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div>[]foo</div>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div>[]foo</div>" queryCommandIndeterm("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div>[]foo</div>" queryCommandState("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div>[]foo</div>" queryCommandValue("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div>[]foo</div>" queryCommandIndeterm("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div>[]foo</div>" queryCommandState("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div>[]foo</div>" queryCommandValue("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<div>foo[]</div>": execCommand("defaultparagraphseparator", false, "div") return value -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<div>foo[]</div>": execCommand("insertparagraph", false, "") return value -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<div>foo[]</div>" checks for modifications to non-editable content -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<div>foo[]</div>" compare innerHTML -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<div>foo[]</div>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<div>foo[]</div>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<div>foo[]</div>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<div>foo[]</div>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<div>foo[]</div>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<div>foo[]</div>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<div>foo[]</div>" queryCommandIndeterm("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<div>foo[]</div>" queryCommandState("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<div>foo[]</div>" queryCommandValue("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<div>foo[]</div>" queryCommandIndeterm("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<div>foo[]</div>" queryCommandState("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<div>foo[]</div>" queryCommandValue("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div>foo[]</div>": execCommand("defaultparagraphseparator", false, "p") return value -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div>foo[]</div>": execCommand("insertparagraph", false, "") return value -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div>foo[]</div>" checks for modifications to non-editable content -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div>foo[]</div>" compare innerHTML -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div>foo[]</div>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div>foo[]</div>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div>foo[]</div>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div>foo[]</div>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div>foo[]</div>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div>foo[]</div>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div>foo[]</div>" queryCommandIndeterm("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div>foo[]</div>" queryCommandState("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div>foo[]</div>" queryCommandValue("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div>foo[]</div>" queryCommandIndeterm("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div>foo[]</div>" queryCommandState("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div>foo[]</div>" queryCommandValue("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<div>foo[]<br></div>": execCommand("defaultparagraphseparator", false, "div") return value -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<div>foo[]<br></div>": execCommand("insertparagraph", false, "") return value -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<div>foo[]<br></div>" checks for modifications to non-editable content -FAIL [["defaultparagraphseparator","div"],["insertparagraph",""]] "<div>foo[]<br></div>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<div>foo</div><div><br></div>" but got "<div>foo<br></div><div><br></div>" -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<div>foo[]<br></div>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<div>foo[]<br></div>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<div>foo[]<br></div>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<div>foo[]<br></div>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<div>foo[]<br></div>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<div>foo[]<br></div>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<div>foo[]<br></div>" queryCommandIndeterm("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<div>foo[]<br></div>" queryCommandState("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<div>foo[]<br></div>" queryCommandValue("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<div>foo[]<br></div>" queryCommandIndeterm("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<div>foo[]<br></div>" queryCommandState("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<div>foo[]<br></div>" queryCommandValue("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div>foo[]<br></div>": execCommand("defaultparagraphseparator", false, "p") return value -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div>foo[]<br></div>": execCommand("insertparagraph", false, "") return value -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div>foo[]<br></div>" checks for modifications to non-editable content -FAIL [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div>foo[]<br></div>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<div>foo</div><div><br></div>" but got "<div>foo<br></div><div><br></div>" -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div>foo[]<br></div>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div>foo[]<br></div>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div>foo[]<br></div>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div>foo[]<br></div>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div>foo[]<br></div>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div>foo[]<br></div>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div>foo[]<br></div>" queryCommandIndeterm("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div>foo[]<br></div>" queryCommandState("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div>foo[]<br></div>" queryCommandValue("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div>foo[]<br></div>" queryCommandIndeterm("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div>foo[]<br></div>" queryCommandState("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div>foo[]<br></div>" queryCommandValue("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<div>foo[]bar</div>": execCommand("defaultparagraphseparator", false, "div") return value -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<div>foo[]bar</div>": execCommand("insertparagraph", false, "") return value -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<div>foo[]bar</div>" checks for modifications to non-editable content -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<div>foo[]bar</div>" compare innerHTML -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<div>foo[]bar</div>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<div>foo[]bar</div>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<div>foo[]bar</div>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<div>foo[]bar</div>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<div>foo[]bar</div>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<div>foo[]bar</div>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<div>foo[]bar</div>" queryCommandIndeterm("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<div>foo[]bar</div>" queryCommandState("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<div>foo[]bar</div>" queryCommandValue("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<div>foo[]bar</div>" queryCommandIndeterm("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<div>foo[]bar</div>" queryCommandState("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<div>foo[]bar</div>" queryCommandValue("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div>foo[]bar</div>": execCommand("defaultparagraphseparator", false, "p") return value -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div>foo[]bar</div>": execCommand("insertparagraph", false, "") return value -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div>foo[]bar</div>" checks for modifications to non-editable content -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div>foo[]bar</div>" compare innerHTML -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div>foo[]bar</div>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div>foo[]bar</div>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div>foo[]bar</div>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div>foo[]bar</div>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div>foo[]bar</div>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div>foo[]bar</div>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div>foo[]bar</div>" queryCommandIndeterm("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div>foo[]bar</div>" queryCommandState("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div>foo[]bar</div>" queryCommandValue("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div>foo[]bar</div>" queryCommandIndeterm("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div>foo[]bar</div>" queryCommandState("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div>foo[]bar</div>" queryCommandValue("insertparagraph") after -PASS [["insertparagraph",""]] "<dl><dt>[]foo<dd>bar</dl>": execCommand("insertparagraph", false, "") return value -PASS [["insertparagraph",""]] "<dl><dt>[]foo<dd>bar</dl>" checks for modifications to non-editable content -PASS [["insertparagraph",""]] "<dl><dt>[]foo<dd>bar</dl>" compare innerHTML -PASS [["insertparagraph",""]] "<dl><dt>[]foo<dd>bar</dl>" queryCommandIndeterm("insertparagraph") before -PASS [["insertparagraph",""]] "<dl><dt>[]foo<dd>bar</dl>" queryCommandState("insertparagraph") before -PASS [["insertparagraph",""]] "<dl><dt>[]foo<dd>bar</dl>" queryCommandValue("insertparagraph") before -PASS [["insertparagraph",""]] "<dl><dt>[]foo<dd>bar</dl>" queryCommandIndeterm("insertparagraph") after -PASS [["insertparagraph",""]] "<dl><dt>[]foo<dd>bar</dl>" queryCommandState("insertparagraph") after -PASS [["insertparagraph",""]] "<dl><dt>[]foo<dd>bar</dl>" queryCommandValue("insertparagraph") after -PASS [["insertparagraph",""]] "<dl><dt>foo[]<dd>bar</dl>": execCommand("insertparagraph", false, "") return value -PASS [["insertparagraph",""]] "<dl><dt>foo[]<dd>bar</dl>" checks for modifications to non-editable content -FAIL [["insertparagraph",""]] "<dl><dt>foo[]<dd>bar</dl>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<dl><dt>foo</dt><dd><br></dd><dd>bar</dd></dl>" but got "<dl><dt>foo</dt><dt><br></dt><dd>bar</dd></dl>" -PASS [["insertparagraph",""]] "<dl><dt>foo[]<dd>bar</dl>" queryCommandIndeterm("insertparagraph") before -PASS [["insertparagraph",""]] "<dl><dt>foo[]<dd>bar</dl>" queryCommandState("insertparagraph") before -PASS [["insertparagraph",""]] "<dl><dt>foo[]<dd>bar</dl>" queryCommandValue("insertparagraph") before -PASS [["insertparagraph",""]] "<dl><dt>foo[]<dd>bar</dl>" queryCommandIndeterm("insertparagraph") after -PASS [["insertparagraph",""]] "<dl><dt>foo[]<dd>bar</dl>" queryCommandState("insertparagraph") after -PASS [["insertparagraph",""]] "<dl><dt>foo[]<dd>bar</dl>" queryCommandValue("insertparagraph") after -PASS [["insertparagraph",""]] "<dl><dt>foo[]<br><dd>bar</dl>": execCommand("insertparagraph", false, "") return value -PASS [["insertparagraph",""]] "<dl><dt>foo[]<br><dd>bar</dl>" checks for modifications to non-editable content -FAIL [["insertparagraph",""]] "<dl><dt>foo[]<br><dd>bar</dl>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<dl><dt>foo</dt><dd><br></dd><dd>bar</dd></dl>" but got "<dl><dt>foo<br></dt><dt><br></dt><dd>bar</dd></dl>" -PASS [["insertparagraph",""]] "<dl><dt>foo[]<br><dd>bar</dl>" queryCommandIndeterm("insertparagraph") before -PASS [["insertparagraph",""]] "<dl><dt>foo[]<br><dd>bar</dl>" queryCommandState("insertparagraph") before -PASS [["insertparagraph",""]] "<dl><dt>foo[]<br><dd>bar</dl>" queryCommandValue("insertparagraph") before -PASS [["insertparagraph",""]] "<dl><dt>foo[]<br><dd>bar</dl>" queryCommandIndeterm("insertparagraph") after -PASS [["insertparagraph",""]] "<dl><dt>foo[]<br><dd>bar</dl>" queryCommandState("insertparagraph") after -PASS [["insertparagraph",""]] "<dl><dt>foo[]<br><dd>bar</dl>" queryCommandValue("insertparagraph") after -PASS [["insertparagraph",""]] "<dl><dt>foo[]bar<dd>baz</dl>": execCommand("insertparagraph", false, "") return value -PASS [["insertparagraph",""]] "<dl><dt>foo[]bar<dd>baz</dl>" checks for modifications to non-editable content -PASS [["insertparagraph",""]] "<dl><dt>foo[]bar<dd>baz</dl>" compare innerHTML -PASS [["insertparagraph",""]] "<dl><dt>foo[]bar<dd>baz</dl>" queryCommandIndeterm("insertparagraph") before -PASS [["insertparagraph",""]] "<dl><dt>foo[]bar<dd>baz</dl>" queryCommandState("insertparagraph") before -PASS [["insertparagraph",""]] "<dl><dt>foo[]bar<dd>baz</dl>" queryCommandValue("insertparagraph") before -PASS [["insertparagraph",""]] "<dl><dt>foo[]bar<dd>baz</dl>" queryCommandIndeterm("insertparagraph") after -PASS [["insertparagraph",""]] "<dl><dt>foo[]bar<dd>baz</dl>" queryCommandState("insertparagraph") after -PASS [["insertparagraph",""]] "<dl><dt>foo[]bar<dd>baz</dl>" queryCommandValue("insertparagraph") after -PASS [["insertparagraph",""]] "<dl><dt>foo<dd>[]bar</dl>": execCommand("insertparagraph", false, "") return value -PASS [["insertparagraph",""]] "<dl><dt>foo<dd>[]bar</dl>" checks for modifications to non-editable content -PASS [["insertparagraph",""]] "<dl><dt>foo<dd>[]bar</dl>" compare innerHTML -PASS [["insertparagraph",""]] "<dl><dt>foo<dd>[]bar</dl>" queryCommandIndeterm("insertparagraph") before -PASS [["insertparagraph",""]] "<dl><dt>foo<dd>[]bar</dl>" queryCommandState("insertparagraph") before -PASS [["insertparagraph",""]] "<dl><dt>foo<dd>[]bar</dl>" queryCommandValue("insertparagraph") before -PASS [["insertparagraph",""]] "<dl><dt>foo<dd>[]bar</dl>" queryCommandIndeterm("insertparagraph") after -PASS [["insertparagraph",""]] "<dl><dt>foo<dd>[]bar</dl>" queryCommandState("insertparagraph") after -PASS [["insertparagraph",""]] "<dl><dt>foo<dd>[]bar</dl>" queryCommandValue("insertparagraph") after -PASS [["insertparagraph",""]] "<dl><dt>foo<dd>bar[]</dl>": execCommand("insertparagraph", false, "") return value -PASS [["insertparagraph",""]] "<dl><dt>foo<dd>bar[]</dl>" checks for modifications to non-editable content -FAIL [["insertparagraph",""]] "<dl><dt>foo<dd>bar[]</dl>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<dl><dt>foo</dt><dd>bar</dd><dt><br></dt></dl>" but got "<dl><dt>foo</dt><dd>bar</dd><dd><br></dd></dl>" -PASS [["insertparagraph",""]] "<dl><dt>foo<dd>bar[]</dl>" queryCommandIndeterm("insertparagraph") before -PASS [["insertparagraph",""]] "<dl><dt>foo<dd>bar[]</dl>" queryCommandState("insertparagraph") before -PASS [["insertparagraph",""]] "<dl><dt>foo<dd>bar[]</dl>" queryCommandValue("insertparagraph") before -PASS [["insertparagraph",""]] "<dl><dt>foo<dd>bar[]</dl>" queryCommandIndeterm("insertparagraph") after -PASS [["insertparagraph",""]] "<dl><dt>foo<dd>bar[]</dl>" queryCommandState("insertparagraph") after -PASS [["insertparagraph",""]] "<dl><dt>foo<dd>bar[]</dl>" queryCommandValue("insertparagraph") after -PASS [["insertparagraph",""]] "<dl><dt>foo<dd>bar[]<br></dl>": execCommand("insertparagraph", false, "") return value -PASS [["insertparagraph",""]] "<dl><dt>foo<dd>bar[]<br></dl>" checks for modifications to non-editable content -FAIL [["insertparagraph",""]] "<dl><dt>foo<dd>bar[]<br></dl>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<dl><dt>foo</dt><dd>bar</dd><dt><br></dt></dl>" but got "<dl><dt>foo</dt><dd>bar<br></dd><dd><br></dd></dl>" -PASS [["insertparagraph",""]] "<dl><dt>foo<dd>bar[]<br></dl>" queryCommandIndeterm("insertparagraph") before -PASS [["insertparagraph",""]] "<dl><dt>foo<dd>bar[]<br></dl>" queryCommandState("insertparagraph") before -PASS [["insertparagraph",""]] "<dl><dt>foo<dd>bar[]<br></dl>" queryCommandValue("insertparagraph") before -PASS [["insertparagraph",""]] "<dl><dt>foo<dd>bar[]<br></dl>" queryCommandIndeterm("insertparagraph") after -PASS [["insertparagraph",""]] "<dl><dt>foo<dd>bar[]<br></dl>" queryCommandState("insertparagraph") after -PASS [["insertparagraph",""]] "<dl><dt>foo<dd>bar[]<br></dl>" queryCommandValue("insertparagraph") after -PASS [["insertparagraph",""]] "<dl><dt>foo<dd>bar[]baz</dl>": execCommand("insertparagraph", false, "") return value -PASS [["insertparagraph",""]] "<dl><dt>foo<dd>bar[]baz</dl>" checks for modifications to non-editable content -PASS [["insertparagraph",""]] "<dl><dt>foo<dd>bar[]baz</dl>" compare innerHTML -PASS [["insertparagraph",""]] "<dl><dt>foo<dd>bar[]baz</dl>" queryCommandIndeterm("insertparagraph") before -PASS [["insertparagraph",""]] "<dl><dt>foo<dd>bar[]baz</dl>" queryCommandState("insertparagraph") before -PASS [["insertparagraph",""]] "<dl><dt>foo<dd>bar[]baz</dl>" queryCommandValue("insertparagraph") before -PASS [["insertparagraph",""]] "<dl><dt>foo<dd>bar[]baz</dl>" queryCommandIndeterm("insertparagraph") after -PASS [["insertparagraph",""]] "<dl><dt>foo<dd>bar[]baz</dl>" queryCommandState("insertparagraph") after -PASS [["insertparagraph",""]] "<dl><dt>foo<dd>bar[]baz</dl>" queryCommandValue("insertparagraph") after -PASS [["insertparagraph",""]] "<h1>[]foo</h1>": execCommand("insertparagraph", false, "") return value -PASS [["insertparagraph",""]] "<h1>[]foo</h1>" checks for modifications to non-editable content -PASS [["insertparagraph",""]] "<h1>[]foo</h1>" compare innerHTML -PASS [["insertparagraph",""]] "<h1>[]foo</h1>" queryCommandIndeterm("insertparagraph") before -PASS [["insertparagraph",""]] "<h1>[]foo</h1>" queryCommandState("insertparagraph") before -PASS [["insertparagraph",""]] "<h1>[]foo</h1>" queryCommandValue("insertparagraph") before -PASS [["insertparagraph",""]] "<h1>[]foo</h1>" queryCommandIndeterm("insertparagraph") after -PASS [["insertparagraph",""]] "<h1>[]foo</h1>" queryCommandState("insertparagraph") after -PASS [["insertparagraph",""]] "<h1>[]foo</h1>" queryCommandValue("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<h1>foo[]</h1>": execCommand("defaultparagraphseparator", false, "div") return value -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<h1>foo[]</h1>": execCommand("insertparagraph", false, "") return value -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<h1>foo[]</h1>" checks for modifications to non-editable content -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<h1>foo[]</h1>" compare innerHTML -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<h1>foo[]</h1>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<h1>foo[]</h1>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<h1>foo[]</h1>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<h1>foo[]</h1>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<h1>foo[]</h1>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<h1>foo[]</h1>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<h1>foo[]</h1>" queryCommandIndeterm("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<h1>foo[]</h1>" queryCommandState("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<h1>foo[]</h1>" queryCommandValue("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<h1>foo[]</h1>" queryCommandIndeterm("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<h1>foo[]</h1>" queryCommandState("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<h1>foo[]</h1>" queryCommandValue("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<h1>foo[]</h1>": execCommand("defaultparagraphseparator", false, "p") return value -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<h1>foo[]</h1>": execCommand("insertparagraph", false, "") return value -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<h1>foo[]</h1>" checks for modifications to non-editable content -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<h1>foo[]</h1>" compare innerHTML -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<h1>foo[]</h1>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<h1>foo[]</h1>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<h1>foo[]</h1>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<h1>foo[]</h1>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<h1>foo[]</h1>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<h1>foo[]</h1>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<h1>foo[]</h1>" queryCommandIndeterm("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<h1>foo[]</h1>" queryCommandState("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<h1>foo[]</h1>" queryCommandValue("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<h1>foo[]</h1>" queryCommandIndeterm("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<h1>foo[]</h1>" queryCommandState("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<h1>foo[]</h1>" queryCommandValue("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<h1>foo[]<br></h1>": execCommand("defaultparagraphseparator", false, "div") return value -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<h1>foo[]<br></h1>": execCommand("insertparagraph", false, "") return value -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<h1>foo[]<br></h1>" checks for modifications to non-editable content -FAIL [["defaultparagraphseparator","div"],["insertparagraph",""]] "<h1>foo[]<br></h1>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<h1>foo</h1><div><br></div>" but got "<h1>foo<br></h1><div><br></div>" -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<h1>foo[]<br></h1>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<h1>foo[]<br></h1>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<h1>foo[]<br></h1>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<h1>foo[]<br></h1>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<h1>foo[]<br></h1>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<h1>foo[]<br></h1>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<h1>foo[]<br></h1>" queryCommandIndeterm("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<h1>foo[]<br></h1>" queryCommandState("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<h1>foo[]<br></h1>" queryCommandValue("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<h1>foo[]<br></h1>" queryCommandIndeterm("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<h1>foo[]<br></h1>" queryCommandState("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<h1>foo[]<br></h1>" queryCommandValue("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<h1>foo[]<br></h1>": execCommand("defaultparagraphseparator", false, "p") return value -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<h1>foo[]<br></h1>": execCommand("insertparagraph", false, "") return value -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<h1>foo[]<br></h1>" checks for modifications to non-editable content -FAIL [["defaultparagraphseparator","p"],["insertparagraph",""]] "<h1>foo[]<br></h1>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<h1>foo</h1><p><br></p>" but got "<h1>foo<br></h1><p><br></p>" -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<h1>foo[]<br></h1>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<h1>foo[]<br></h1>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<h1>foo[]<br></h1>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<h1>foo[]<br></h1>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<h1>foo[]<br></h1>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<h1>foo[]<br></h1>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<h1>foo[]<br></h1>" queryCommandIndeterm("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<h1>foo[]<br></h1>" queryCommandState("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<h1>foo[]<br></h1>" queryCommandValue("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<h1>foo[]<br></h1>" queryCommandIndeterm("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<h1>foo[]<br></h1>" queryCommandState("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<h1>foo[]<br></h1>" queryCommandValue("insertparagraph") after -PASS [["insertparagraph",""]] "<h1>foo[]bar</h1>": execCommand("insertparagraph", false, "") return value -PASS [["insertparagraph",""]] "<h1>foo[]bar</h1>" checks for modifications to non-editable content -PASS [["insertparagraph",""]] "<h1>foo[]bar</h1>" compare innerHTML -PASS [["insertparagraph",""]] "<h1>foo[]bar</h1>" queryCommandIndeterm("insertparagraph") before -PASS [["insertparagraph",""]] "<h1>foo[]bar</h1>" queryCommandState("insertparagraph") before -PASS [["insertparagraph",""]] "<h1>foo[]bar</h1>" queryCommandValue("insertparagraph") before -PASS [["insertparagraph",""]] "<h1>foo[]bar</h1>" queryCommandIndeterm("insertparagraph") after -PASS [["insertparagraph",""]] "<h1>foo[]bar</h1>" queryCommandState("insertparagraph") after -PASS [["insertparagraph",""]] "<h1>foo[]bar</h1>" queryCommandValue("insertparagraph") after -PASS [["insertparagraph",""]] "<ol><li>[]foo</ol>": execCommand("insertparagraph", false, "") return value -PASS [["insertparagraph",""]] "<ol><li>[]foo</ol>" checks for modifications to non-editable content -PASS [["insertparagraph",""]] "<ol><li>[]foo</ol>" compare innerHTML -PASS [["insertparagraph",""]] "<ol><li>[]foo</ol>" queryCommandIndeterm("insertparagraph") before -PASS [["insertparagraph",""]] "<ol><li>[]foo</ol>" queryCommandState("insertparagraph") before -PASS [["insertparagraph",""]] "<ol><li>[]foo</ol>" queryCommandValue("insertparagraph") before -PASS [["insertparagraph",""]] "<ol><li>[]foo</ol>" queryCommandIndeterm("insertparagraph") after -PASS [["insertparagraph",""]] "<ol><li>[]foo</ol>" queryCommandState("insertparagraph") after -PASS [["insertparagraph",""]] "<ol><li>[]foo</ol>" queryCommandValue("insertparagraph") after -PASS [["insertparagraph",""]] "<ol><li>foo[]</ol>": execCommand("insertparagraph", false, "") return value -PASS [["insertparagraph",""]] "<ol><li>foo[]</ol>" checks for modifications to non-editable content -PASS [["insertparagraph",""]] "<ol><li>foo[]</ol>" compare innerHTML -PASS [["insertparagraph",""]] "<ol><li>foo[]</ol>" queryCommandIndeterm("insertparagraph") before -PASS [["insertparagraph",""]] "<ol><li>foo[]</ol>" queryCommandState("insertparagraph") before -PASS [["insertparagraph",""]] "<ol><li>foo[]</ol>" queryCommandValue("insertparagraph") before -PASS [["insertparagraph",""]] "<ol><li>foo[]</ol>" queryCommandIndeterm("insertparagraph") after -PASS [["insertparagraph",""]] "<ol><li>foo[]</ol>" queryCommandState("insertparagraph") after -PASS [["insertparagraph",""]] "<ol><li>foo[]</ol>" queryCommandValue("insertparagraph") after -PASS [["insertparagraph",""]] "<ol><li>foo[]<br></ol>": execCommand("insertparagraph", false, "") return value -PASS [["insertparagraph",""]] "<ol><li>foo[]<br></ol>" checks for modifications to non-editable content -FAIL [["insertparagraph",""]] "<ol><li>foo[]<br></ol>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<ol><li>foo</li><li><br></li></ol>" but got "<ol><li>foo<br></li><li><br></li></ol>" -PASS [["insertparagraph",""]] "<ol><li>foo[]<br></ol>" queryCommandIndeterm("insertparagraph") before -PASS [["insertparagraph",""]] "<ol><li>foo[]<br></ol>" queryCommandState("insertparagraph") before -PASS [["insertparagraph",""]] "<ol><li>foo[]<br></ol>" queryCommandValue("insertparagraph") before -PASS [["insertparagraph",""]] "<ol><li>foo[]<br></ol>" queryCommandIndeterm("insertparagraph") after -PASS [["insertparagraph",""]] "<ol><li>foo[]<br></ol>" queryCommandState("insertparagraph") after -PASS [["insertparagraph",""]] "<ol><li>foo[]<br></ol>" queryCommandValue("insertparagraph") after -PASS [["insertparagraph",""]] "<ol><li>foo[]bar</ol>": execCommand("insertparagraph", false, "") return value -PASS [["insertparagraph",""]] "<ol><li>foo[]bar</ol>" checks for modifications to non-editable content -PASS [["insertparagraph",""]] "<ol><li>foo[]bar</ol>" compare innerHTML -PASS [["insertparagraph",""]] "<ol><li>foo[]bar</ol>" queryCommandIndeterm("insertparagraph") before -PASS [["insertparagraph",""]] "<ol><li>foo[]bar</ol>" queryCommandState("insertparagraph") before -PASS [["insertparagraph",""]] "<ol><li>foo[]bar</ol>" queryCommandValue("insertparagraph") before -PASS [["insertparagraph",""]] "<ol><li>foo[]bar</ol>" queryCommandIndeterm("insertparagraph") after -PASS [["insertparagraph",""]] "<ol><li>foo[]bar</ol>" queryCommandState("insertparagraph") after -PASS [["insertparagraph",""]] "<ol><li>foo[]bar</ol>" queryCommandValue("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p>[]foo</p>": execCommand("defaultparagraphseparator", false, "div") return value -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p>[]foo</p>": execCommand("insertparagraph", false, "") return value -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p>[]foo</p>" checks for modifications to non-editable content -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p>[]foo</p>" compare innerHTML -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p>[]foo</p>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p>[]foo</p>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p>[]foo</p>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p>[]foo</p>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p>[]foo</p>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p>[]foo</p>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p>[]foo</p>" queryCommandIndeterm("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p>[]foo</p>" queryCommandState("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p>[]foo</p>" queryCommandValue("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p>[]foo</p>" queryCommandIndeterm("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p>[]foo</p>" queryCommandState("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p>[]foo</p>" queryCommandValue("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<p>[]foo</p>": execCommand("defaultparagraphseparator", false, "p") return value -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<p>[]foo</p>": execCommand("insertparagraph", false, "") return value -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<p>[]foo</p>" checks for modifications to non-editable content -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<p>[]foo</p>" compare innerHTML -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<p>[]foo</p>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<p>[]foo</p>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<p>[]foo</p>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<p>[]foo</p>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<p>[]foo</p>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<p>[]foo</p>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<p>[]foo</p>" queryCommandIndeterm("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<p>[]foo</p>" queryCommandState("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<p>[]foo</p>" queryCommandValue("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<p>[]foo</p>" queryCommandIndeterm("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<p>[]foo</p>" queryCommandState("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<p>[]foo</p>" queryCommandValue("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p>foo[]</p>": execCommand("defaultparagraphseparator", false, "div") return value -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p>foo[]</p>": execCommand("insertparagraph", false, "") return value -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p>foo[]</p>" checks for modifications to non-editable content -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p>foo[]</p>" compare innerHTML -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p>foo[]</p>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p>foo[]</p>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p>foo[]</p>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p>foo[]</p>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p>foo[]</p>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p>foo[]</p>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p>foo[]</p>" queryCommandIndeterm("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p>foo[]</p>" queryCommandState("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p>foo[]</p>" queryCommandValue("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p>foo[]</p>" queryCommandIndeterm("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p>foo[]</p>" queryCommandState("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p>foo[]</p>" queryCommandValue("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<p>foo[]</p>": execCommand("defaultparagraphseparator", false, "p") return value -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<p>foo[]</p>": execCommand("insertparagraph", false, "") return value -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<p>foo[]</p>" checks for modifications to non-editable content -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<p>foo[]</p>" compare innerHTML -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<p>foo[]</p>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<p>foo[]</p>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<p>foo[]</p>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<p>foo[]</p>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<p>foo[]</p>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<p>foo[]</p>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<p>foo[]</p>" queryCommandIndeterm("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<p>foo[]</p>" queryCommandState("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<p>foo[]</p>" queryCommandValue("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<p>foo[]</p>" queryCommandIndeterm("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<p>foo[]</p>" queryCommandState("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<p>foo[]</p>" queryCommandValue("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p>foo[]<br></p>": execCommand("defaultparagraphseparator", false, "div") return value -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p>foo[]<br></p>": execCommand("insertparagraph", false, "") return value -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p>foo[]<br></p>" checks for modifications to non-editable content -FAIL [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p>foo[]<br></p>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<p>foo</p><p><br></p>" but got "<p>foo<br></p><p><br></p>" -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p>foo[]<br></p>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p>foo[]<br></p>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p>foo[]<br></p>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p>foo[]<br></p>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p>foo[]<br></p>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p>foo[]<br></p>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p>foo[]<br></p>" queryCommandIndeterm("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p>foo[]<br></p>" queryCommandState("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p>foo[]<br></p>" queryCommandValue("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p>foo[]<br></p>" queryCommandIndeterm("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p>foo[]<br></p>" queryCommandState("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p>foo[]<br></p>" queryCommandValue("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<p>foo[]<br></p>": execCommand("defaultparagraphseparator", false, "p") return value -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<p>foo[]<br></p>": execCommand("insertparagraph", false, "") return value -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<p>foo[]<br></p>" checks for modifications to non-editable content -FAIL [["defaultparagraphseparator","p"],["insertparagraph",""]] "<p>foo[]<br></p>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<p>foo</p><p><br></p>" but got "<p>foo<br></p><p><br></p>" -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<p>foo[]<br></p>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<p>foo[]<br></p>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<p>foo[]<br></p>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<p>foo[]<br></p>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<p>foo[]<br></p>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<p>foo[]<br></p>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<p>foo[]<br></p>" queryCommandIndeterm("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<p>foo[]<br></p>" queryCommandState("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<p>foo[]<br></p>" queryCommandValue("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<p>foo[]<br></p>" queryCommandIndeterm("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<p>foo[]<br></p>" queryCommandState("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<p>foo[]<br></p>" queryCommandValue("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p>foo[]bar</p>": execCommand("defaultparagraphseparator", false, "div") return value -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p>foo[]bar</p>": execCommand("insertparagraph", false, "") return value -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p>foo[]bar</p>" checks for modifications to non-editable content -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p>foo[]bar</p>" compare innerHTML -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p>foo[]bar</p>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p>foo[]bar</p>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p>foo[]bar</p>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p>foo[]bar</p>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p>foo[]bar</p>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p>foo[]bar</p>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p>foo[]bar</p>" queryCommandIndeterm("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p>foo[]bar</p>" queryCommandState("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p>foo[]bar</p>" queryCommandValue("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p>foo[]bar</p>" queryCommandIndeterm("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p>foo[]bar</p>" queryCommandState("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p>foo[]bar</p>" queryCommandValue("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<p>foo[]bar</p>": execCommand("defaultparagraphseparator", false, "p") return value -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<p>foo[]bar</p>": execCommand("insertparagraph", false, "") return value -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<p>foo[]bar</p>" checks for modifications to non-editable content -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<p>foo[]bar</p>" compare innerHTML -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<p>foo[]bar</p>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<p>foo[]bar</p>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<p>foo[]bar</p>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<p>foo[]bar</p>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<p>foo[]bar</p>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<p>foo[]bar</p>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<p>foo[]bar</p>" queryCommandIndeterm("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<p>foo[]bar</p>" queryCommandState("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<p>foo[]bar</p>" queryCommandValue("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<p>foo[]bar</p>" queryCommandIndeterm("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<p>foo[]bar</p>" queryCommandState("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<p>foo[]bar</p>" queryCommandValue("insertparagraph") after -PASS [["insertparagraph",""]] "<pre>[]foo</pre>": execCommand("insertparagraph", false, "") return value -PASS [["insertparagraph",""]] "<pre>[]foo</pre>" checks for modifications to non-editable content -FAIL [["insertparagraph",""]] "<pre>[]foo</pre>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<pre><br>foo</pre>" but got "<pre><br></pre><pre>foo</pre>" -PASS [["insertparagraph",""]] "<pre>[]foo</pre>" queryCommandIndeterm("insertparagraph") before -PASS [["insertparagraph",""]] "<pre>[]foo</pre>" queryCommandState("insertparagraph") before -PASS [["insertparagraph",""]] "<pre>[]foo</pre>" queryCommandValue("insertparagraph") before -PASS [["insertparagraph",""]] "<pre>[]foo</pre>" queryCommandIndeterm("insertparagraph") after -PASS [["insertparagraph",""]] "<pre>[]foo</pre>" queryCommandState("insertparagraph") after -PASS [["insertparagraph",""]] "<pre>[]foo</pre>" queryCommandValue("insertparagraph") after -PASS [["insertparagraph",""]] "<pre>foo[]</pre>": execCommand("insertparagraph", false, "") return value -PASS [["insertparagraph",""]] "<pre>foo[]</pre>" checks for modifications to non-editable content -FAIL [["insertparagraph",""]] "<pre>foo[]</pre>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<pre>foo<br><br></pre>" but got "<pre>foo</pre><pre><br></pre>" -PASS [["insertparagraph",""]] "<pre>foo[]</pre>" queryCommandIndeterm("insertparagraph") before -PASS [["insertparagraph",""]] "<pre>foo[]</pre>" queryCommandState("insertparagraph") before -PASS [["insertparagraph",""]] "<pre>foo[]</pre>" queryCommandValue("insertparagraph") before -PASS [["insertparagraph",""]] "<pre>foo[]</pre>" queryCommandIndeterm("insertparagraph") after -PASS [["insertparagraph",""]] "<pre>foo[]</pre>" queryCommandState("insertparagraph") after -PASS [["insertparagraph",""]] "<pre>foo[]</pre>" queryCommandValue("insertparagraph") after -PASS [["insertparagraph",""]] "<pre>foo[]<br></pre>": execCommand("insertparagraph", false, "") return value -PASS [["insertparagraph",""]] "<pre>foo[]<br></pre>" checks for modifications to non-editable content -FAIL [["insertparagraph",""]] "<pre>foo[]<br></pre>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<pre>foo<br><br></pre>" but got "<pre>foo<br></pre><pre><br></pre>" -PASS [["insertparagraph",""]] "<pre>foo[]<br></pre>" queryCommandIndeterm("insertparagraph") before -PASS [["insertparagraph",""]] "<pre>foo[]<br></pre>" queryCommandState("insertparagraph") before -PASS [["insertparagraph",""]] "<pre>foo[]<br></pre>" queryCommandValue("insertparagraph") before -PASS [["insertparagraph",""]] "<pre>foo[]<br></pre>" queryCommandIndeterm("insertparagraph") after -PASS [["insertparagraph",""]] "<pre>foo[]<br></pre>" queryCommandState("insertparagraph") after -PASS [["insertparagraph",""]] "<pre>foo[]<br></pre>" queryCommandValue("insertparagraph") after -PASS [["insertparagraph",""]] "<pre>foo[]bar</pre>": execCommand("insertparagraph", false, "") return value -PASS [["insertparagraph",""]] "<pre>foo[]bar</pre>" checks for modifications to non-editable content -FAIL [["insertparagraph",""]] "<pre>foo[]bar</pre>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<pre>foo<br>bar</pre>" but got "<pre>foo</pre><pre>bar</pre>" -PASS [["insertparagraph",""]] "<pre>foo[]bar</pre>" queryCommandIndeterm("insertparagraph") before -PASS [["insertparagraph",""]] "<pre>foo[]bar</pre>" queryCommandState("insertparagraph") before -PASS [["insertparagraph",""]] "<pre>foo[]bar</pre>" queryCommandValue("insertparagraph") before -PASS [["insertparagraph",""]] "<pre>foo[]bar</pre>" queryCommandIndeterm("insertparagraph") after -PASS [["insertparagraph",""]] "<pre>foo[]bar</pre>" queryCommandState("insertparagraph") after -PASS [["insertparagraph",""]] "<pre>foo[]bar</pre>" queryCommandValue("insertparagraph") after -PASS [["insertparagraph",""]] "<pre>foo[]<br><br></pre>": execCommand("insertparagraph", false, "") return value -PASS [["insertparagraph",""]] "<pre>foo[]<br><br></pre>" checks for modifications to non-editable content -FAIL [["insertparagraph",""]] "<pre>foo[]<br><br></pre>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<pre>foo<br><br><br></pre>" but got "<pre>foo</pre><pre><br><br></pre>" -PASS [["insertparagraph",""]] "<pre>foo[]<br><br></pre>" queryCommandIndeterm("insertparagraph") before -PASS [["insertparagraph",""]] "<pre>foo[]<br><br></pre>" queryCommandState("insertparagraph") before -PASS [["insertparagraph",""]] "<pre>foo[]<br><br></pre>" queryCommandValue("insertparagraph") before -PASS [["insertparagraph",""]] "<pre>foo[]<br><br></pre>" queryCommandIndeterm("insertparagraph") after -PASS [["insertparagraph",""]] "<pre>foo[]<br><br></pre>" queryCommandState("insertparagraph") after -PASS [["insertparagraph",""]] "<pre>foo[]<br><br></pre>" queryCommandValue("insertparagraph") after -PASS [["insertparagraph",""]] "<pre>foo<br>{}<br></pre>": execCommand("insertparagraph", false, "") return value -PASS [["insertparagraph",""]] "<pre>foo<br>{}<br></pre>" checks for modifications to non-editable content -FAIL [["insertparagraph",""]] "<pre>foo<br>{}<br></pre>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<pre>foo<br><br><br></pre>" but got "<pre>foo<br><br></pre><pre><br></pre>" -PASS [["insertparagraph",""]] "<pre>foo<br>{}<br></pre>" queryCommandIndeterm("insertparagraph") before -PASS [["insertparagraph",""]] "<pre>foo<br>{}<br></pre>" queryCommandState("insertparagraph") before -PASS [["insertparagraph",""]] "<pre>foo<br>{}<br></pre>" queryCommandValue("insertparagraph") before -PASS [["insertparagraph",""]] "<pre>foo<br>{}<br></pre>" queryCommandIndeterm("insertparagraph") after -PASS [["insertparagraph",""]] "<pre>foo<br>{}<br></pre>" queryCommandState("insertparagraph") after -PASS [["insertparagraph",""]] "<pre>foo<br>{}<br></pre>" queryCommandValue("insertparagraph") after -PASS [["insertparagraph",""]] "<pre>foo []</pre>": execCommand("insertparagraph", false, "") return value -PASS [["insertparagraph",""]] "<pre>foo []</pre>" checks for modifications to non-editable content -FAIL [["insertparagraph",""]] "<pre>foo []</pre>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<pre>foo\n<br><br></pre>" but got "<pre>foo\n</pre><pre><br></pre>" -PASS [["insertparagraph",""]] "<pre>foo []</pre>" queryCommandIndeterm("insertparagraph") before -PASS [["insertparagraph",""]] "<pre>foo []</pre>" queryCommandState("insertparagraph") before -PASS [["insertparagraph",""]] "<pre>foo []</pre>" queryCommandValue("insertparagraph") before -PASS [["insertparagraph",""]] "<pre>foo []</pre>" queryCommandIndeterm("insertparagraph") after -PASS [["insertparagraph",""]] "<pre>foo []</pre>" queryCommandState("insertparagraph") after -PASS [["insertparagraph",""]] "<pre>foo []</pre>" queryCommandValue("insertparagraph") after -PASS [["insertparagraph",""]] "<pre>foo[] </pre>": execCommand("insertparagraph", false, "") return value -PASS [["insertparagraph",""]] "<pre>foo[] </pre>" checks for modifications to non-editable content -FAIL [["insertparagraph",""]] "<pre>foo[] </pre>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<pre>foo<br>\n</pre>" but got "<pre>foo\n</pre><pre><br></pre>" -PASS [["insertparagraph",""]] "<pre>foo[] </pre>" queryCommandIndeterm("insertparagraph") before -PASS [["insertparagraph",""]] "<pre>foo[] </pre>" queryCommandState("insertparagraph") before -PASS [["insertparagraph",""]] "<pre>foo[] </pre>" queryCommandValue("insertparagraph") before -PASS [["insertparagraph",""]] "<pre>foo[] </pre>" queryCommandIndeterm("insertparagraph") after -PASS [["insertparagraph",""]] "<pre>foo[] </pre>" queryCommandState("insertparagraph") after -PASS [["insertparagraph",""]] "<pre>foo[] </pre>" queryCommandValue("insertparagraph") after -PASS [["insertparagraph",""]] "<pre>foo [] </pre>": execCommand("insertparagraph", false, "") return value -PASS [["insertparagraph",""]] "<pre>foo [] </pre>" checks for modifications to non-editable content -FAIL [["insertparagraph",""]] "<pre>foo [] </pre>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<pre>foo\n<br>\n</pre>" but got "<pre>foo\n\n</pre><pre><br></pre>" -PASS [["insertparagraph",""]] "<pre>foo [] </pre>" queryCommandIndeterm("insertparagraph") before -PASS [["insertparagraph",""]] "<pre>foo [] </pre>" queryCommandState("insertparagraph") before -PASS [["insertparagraph",""]] "<pre>foo [] </pre>" queryCommandValue("insertparagraph") before -PASS [["insertparagraph",""]] "<pre>foo [] </pre>" queryCommandIndeterm("insertparagraph") after -PASS [["insertparagraph",""]] "<pre>foo [] </pre>" queryCommandState("insertparagraph") after -PASS [["insertparagraph",""]] "<pre>foo [] </pre>" queryCommandValue("insertparagraph") after -PASS [["insertparagraph",""]] "<xmp>foo[]bar</xmp>": execCommand("insertparagraph", false, "") return value -PASS [["insertparagraph",""]] "<xmp>foo[]bar</xmp>" checks for modifications to non-editable content -PASS [["insertparagraph",""]] "<xmp>foo[]bar</xmp>" compare innerHTML -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/editing/run/insertparagraph_3001-4000-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/editing/run/insertparagraph_3001-4000-expected.txt deleted file mode 100644 index 96dc1bea..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/editing/run/insertparagraph_3001-4000-expected.txt +++ /dev/null
@@ -1,1004 +0,0 @@ -This is a testharness.js-based test. -Found 1000 tests; 959 PASS, 41 FAIL, 0 TIMEOUT, 0 NOTRUN. -PASS [["stylewithcss","false"],["defaultparagraphseparator","div"],["insertparagraph",""]] "<div><b>foo[]bar</b></div>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["stylewithcss","false"],["defaultparagraphseparator","div"],["insertparagraph",""]] "<div><b>foo[]bar</b></div>" queryCommandState("defaultparagraphseparator") before -PASS [["stylewithcss","false"],["defaultparagraphseparator","div"],["insertparagraph",""]] "<div><b>foo[]bar</b></div>" queryCommandValue("defaultparagraphseparator") before -PASS [["stylewithcss","false"],["defaultparagraphseparator","div"],["insertparagraph",""]] "<div><b>foo[]bar</b></div>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["stylewithcss","false"],["defaultparagraphseparator","div"],["insertparagraph",""]] "<div><b>foo[]bar</b></div>" queryCommandState("defaultparagraphseparator") after -PASS [["stylewithcss","false"],["defaultparagraphseparator","div"],["insertparagraph",""]] "<div><b>foo[]bar</b></div>" queryCommandValue("defaultparagraphseparator") after -PASS [["stylewithcss","false"],["defaultparagraphseparator","div"],["insertparagraph",""]] "<div><b>foo[]bar</b></div>" queryCommandIndeterm("insertparagraph") before -PASS [["stylewithcss","false"],["defaultparagraphseparator","div"],["insertparagraph",""]] "<div><b>foo[]bar</b></div>" queryCommandState("insertparagraph") before -PASS [["stylewithcss","false"],["defaultparagraphseparator","div"],["insertparagraph",""]] "<div><b>foo[]bar</b></div>" queryCommandValue("insertparagraph") before -PASS [["stylewithcss","false"],["defaultparagraphseparator","div"],["insertparagraph",""]] "<div><b>foo[]bar</b></div>" queryCommandIndeterm("insertparagraph") after -PASS [["stylewithcss","false"],["defaultparagraphseparator","div"],["insertparagraph",""]] "<div><b>foo[]bar</b></div>" queryCommandState("insertparagraph") after -PASS [["stylewithcss","false"],["defaultparagraphseparator","div"],["insertparagraph",""]] "<div><b>foo[]bar</b></div>" queryCommandValue("insertparagraph") after -PASS [["stylewithcss","true"],["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><b>foo[]bar</b></div>": execCommand("stylewithcss", false, "true") return value -PASS [["stylewithcss","true"],["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><b>foo[]bar</b></div>": execCommand("defaultparagraphseparator", false, "p") return value -PASS [["stylewithcss","true"],["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><b>foo[]bar</b></div>": execCommand("insertparagraph", false, "") return value -PASS [["stylewithcss","true"],["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><b>foo[]bar</b></div>" checks for modifications to non-editable content -PASS [["stylewithcss","true"],["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><b>foo[]bar</b></div>" compare innerHTML -PASS [["stylewithcss","true"],["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><b>foo[]bar</b></div>" queryCommandIndeterm("stylewithcss") before -FAIL [["stylewithcss","true"],["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><b>foo[]bar</b></div>" queryCommandState("stylewithcss") before assert_equals: Wrong result returned expected false but got true -PASS [["stylewithcss","true"],["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><b>foo[]bar</b></div>" queryCommandValue("stylewithcss") before -PASS [["stylewithcss","true"],["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><b>foo[]bar</b></div>" queryCommandIndeterm("stylewithcss") after -PASS [["stylewithcss","true"],["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><b>foo[]bar</b></div>" queryCommandState("stylewithcss") after -PASS [["stylewithcss","true"],["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><b>foo[]bar</b></div>" queryCommandValue("stylewithcss") after -PASS [["stylewithcss","true"],["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><b>foo[]bar</b></div>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["stylewithcss","true"],["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><b>foo[]bar</b></div>" queryCommandState("defaultparagraphseparator") before -PASS [["stylewithcss","true"],["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><b>foo[]bar</b></div>" queryCommandValue("defaultparagraphseparator") before -PASS [["stylewithcss","true"],["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><b>foo[]bar</b></div>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["stylewithcss","true"],["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><b>foo[]bar</b></div>" queryCommandState("defaultparagraphseparator") after -PASS [["stylewithcss","true"],["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><b>foo[]bar</b></div>" queryCommandValue("defaultparagraphseparator") after -PASS [["stylewithcss","true"],["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><b>foo[]bar</b></div>" queryCommandIndeterm("insertparagraph") before -PASS [["stylewithcss","true"],["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><b>foo[]bar</b></div>" queryCommandState("insertparagraph") before -PASS [["stylewithcss","true"],["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><b>foo[]bar</b></div>" queryCommandValue("insertparagraph") before -PASS [["stylewithcss","true"],["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><b>foo[]bar</b></div>" queryCommandIndeterm("insertparagraph") after -PASS [["stylewithcss","true"],["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><b>foo[]bar</b></div>" queryCommandState("insertparagraph") after -PASS [["stylewithcss","true"],["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><b>foo[]bar</b></div>" queryCommandValue("insertparagraph") after -PASS [["stylewithcss","false"],["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><b>foo[]bar</b></div>": execCommand("stylewithcss", false, "false") return value -PASS [["stylewithcss","false"],["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><b>foo[]bar</b></div>": execCommand("defaultparagraphseparator", false, "p") return value -PASS [["stylewithcss","false"],["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><b>foo[]bar</b></div>": execCommand("insertparagraph", false, "") return value -PASS [["stylewithcss","false"],["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><b>foo[]bar</b></div>" checks for modifications to non-editable content -PASS [["stylewithcss","false"],["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><b>foo[]bar</b></div>" compare innerHTML -PASS [["stylewithcss","false"],["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><b>foo[]bar</b></div>" queryCommandIndeterm("stylewithcss") before -PASS [["stylewithcss","false"],["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><b>foo[]bar</b></div>" queryCommandState("stylewithcss") before -PASS [["stylewithcss","false"],["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><b>foo[]bar</b></div>" queryCommandValue("stylewithcss") before -PASS [["stylewithcss","false"],["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><b>foo[]bar</b></div>" queryCommandIndeterm("stylewithcss") after -PASS [["stylewithcss","false"],["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><b>foo[]bar</b></div>" queryCommandState("stylewithcss") after -PASS [["stylewithcss","false"],["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><b>foo[]bar</b></div>" queryCommandValue("stylewithcss") after -PASS [["stylewithcss","false"],["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><b>foo[]bar</b></div>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["stylewithcss","false"],["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><b>foo[]bar</b></div>" queryCommandState("defaultparagraphseparator") before -PASS [["stylewithcss","false"],["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><b>foo[]bar</b></div>" queryCommandValue("defaultparagraphseparator") before -PASS [["stylewithcss","false"],["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><b>foo[]bar</b></div>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["stylewithcss","false"],["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><b>foo[]bar</b></div>" queryCommandState("defaultparagraphseparator") after -PASS [["stylewithcss","false"],["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><b>foo[]bar</b></div>" queryCommandValue("defaultparagraphseparator") after -PASS [["stylewithcss","false"],["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><b>foo[]bar</b></div>" queryCommandIndeterm("insertparagraph") before -PASS [["stylewithcss","false"],["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><b>foo[]bar</b></div>" queryCommandState("insertparagraph") before -PASS [["stylewithcss","false"],["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><b>foo[]bar</b></div>" queryCommandValue("insertparagraph") before -PASS [["stylewithcss","false"],["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><b>foo[]bar</b></div>" queryCommandIndeterm("insertparagraph") after -PASS [["stylewithcss","false"],["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><b>foo[]bar</b></div>" queryCommandState("insertparagraph") after -PASS [["stylewithcss","false"],["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><b>foo[]bar</b></div>" queryCommandValue("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<a href=foo>foo[]bar</a>": execCommand("defaultparagraphseparator", false, "div") return value -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<a href=foo>foo[]bar</a>": execCommand("insertparagraph", false, "") return value -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<a href=foo>foo[]bar</a>" checks for modifications to non-editable content -FAIL [["defaultparagraphseparator","div"],["insertparagraph",""]] "<a href=foo>foo[]bar</a>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<div><a href=\"foo\">foo</a></div><div><a href=\"foo\">bar</a></div>" but got "<a href=\"foo\">foo</a><div><a href=\"foo\">bar</a></div>" -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<a href=foo>foo[]bar</a>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<a href=foo>foo[]bar</a>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<a href=foo>foo[]bar</a>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<a href=foo>foo[]bar</a>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<a href=foo>foo[]bar</a>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<a href=foo>foo[]bar</a>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<a href=foo>foo[]bar</a>" queryCommandIndeterm("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<a href=foo>foo[]bar</a>" queryCommandState("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<a href=foo>foo[]bar</a>" queryCommandValue("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<a href=foo>foo[]bar</a>" queryCommandIndeterm("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<a href=foo>foo[]bar</a>" queryCommandState("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<a href=foo>foo[]bar</a>" queryCommandValue("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<a href=foo>foo[]bar</a>": execCommand("defaultparagraphseparator", false, "p") return value -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<a href=foo>foo[]bar</a>": execCommand("insertparagraph", false, "") return value -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<a href=foo>foo[]bar</a>" checks for modifications to non-editable content -FAIL [["defaultparagraphseparator","p"],["insertparagraph",""]] "<a href=foo>foo[]bar</a>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<p><a href=\"foo\">foo</a></p><p><a href=\"foo\">bar</a></p>" but got "<a href=\"foo\">foo</a><p><a href=\"foo\">bar</a></p>" -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<a href=foo>foo[]bar</a>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<a href=foo>foo[]bar</a>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<a href=foo>foo[]bar</a>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<a href=foo>foo[]bar</a>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<a href=foo>foo[]bar</a>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<a href=foo>foo[]bar</a>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<a href=foo>foo[]bar</a>" queryCommandIndeterm("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<a href=foo>foo[]bar</a>" queryCommandState("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<a href=foo>foo[]bar</a>" queryCommandValue("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<a href=foo>foo[]bar</a>" queryCommandIndeterm("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<a href=foo>foo[]bar</a>" queryCommandState("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<a href=foo>foo[]bar</a>" queryCommandValue("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<a href=foo>foo[]bar</a>baz": execCommand("defaultparagraphseparator", false, "div") return value -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<a href=foo>foo[]bar</a>baz": execCommand("insertparagraph", false, "") return value -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<a href=foo>foo[]bar</a>baz" checks for modifications to non-editable content -FAIL [["defaultparagraphseparator","div"],["insertparagraph",""]] "<a href=foo>foo[]bar</a>baz" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<div><a href=\"foo\">foo</a></div><div><a href=\"foo\">bar</a>baz</div>" but got "<a href=\"foo\">foo</a><div><a href=\"foo\">bar</a>baz</div>" -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<a href=foo>foo[]bar</a>baz" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<a href=foo>foo[]bar</a>baz" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<a href=foo>foo[]bar</a>baz" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<a href=foo>foo[]bar</a>baz" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<a href=foo>foo[]bar</a>baz" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<a href=foo>foo[]bar</a>baz" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<a href=foo>foo[]bar</a>baz" queryCommandIndeterm("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<a href=foo>foo[]bar</a>baz" queryCommandState("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<a href=foo>foo[]bar</a>baz" queryCommandValue("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<a href=foo>foo[]bar</a>baz" queryCommandIndeterm("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<a href=foo>foo[]bar</a>baz" queryCommandState("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<a href=foo>foo[]bar</a>baz" queryCommandValue("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<a href=foo>foo[]bar</a>baz": execCommand("defaultparagraphseparator", false, "p") return value -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<a href=foo>foo[]bar</a>baz": execCommand("insertparagraph", false, "") return value -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<a href=foo>foo[]bar</a>baz" checks for modifications to non-editable content -FAIL [["defaultparagraphseparator","p"],["insertparagraph",""]] "<a href=foo>foo[]bar</a>baz" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<p><a href=\"foo\">foo</a></p><p><a href=\"foo\">bar</a>baz</p>" but got "<a href=\"foo\">foo</a><p><a href=\"foo\">bar</a>baz</p>" -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<a href=foo>foo[]bar</a>baz" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<a href=foo>foo[]bar</a>baz" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<a href=foo>foo[]bar</a>baz" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<a href=foo>foo[]bar</a>baz" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<a href=foo>foo[]bar</a>baz" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<a href=foo>foo[]bar</a>baz" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<a href=foo>foo[]bar</a>baz" queryCommandIndeterm("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<a href=foo>foo[]bar</a>baz" queryCommandState("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<a href=foo>foo[]bar</a>baz" queryCommandValue("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<a href=foo>foo[]bar</a>baz" queryCommandIndeterm("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<a href=foo>foo[]bar</a>baz" queryCommandState("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<a href=foo>foo[]bar</a>baz" queryCommandValue("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo>foo[]bar</a></p>": execCommand("defaultparagraphseparator", false, "div") return value -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo>foo[]bar</a></p>": execCommand("insertparagraph", false, "") return value -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo>foo[]bar</a></p>" checks for modifications to non-editable content -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo>foo[]bar</a></p>" compare innerHTML -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo>foo[]bar</a></p>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo>foo[]bar</a></p>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo>foo[]bar</a></p>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo>foo[]bar</a></p>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo>foo[]bar</a></p>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo>foo[]bar</a></p>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo>foo[]bar</a></p>" queryCommandIndeterm("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo>foo[]bar</a></p>" queryCommandState("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo>foo[]bar</a></p>" queryCommandValue("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo>foo[]bar</a></p>" queryCommandIndeterm("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo>foo[]bar</a></p>" queryCommandState("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo>foo[]bar</a></p>" queryCommandValue("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo>foo[]bar</a></div>": execCommand("defaultparagraphseparator", false, "p") return value -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo>foo[]bar</a></div>": execCommand("insertparagraph", false, "") return value -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo>foo[]bar</a></div>" checks for modifications to non-editable content -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo>foo[]bar</a></div>" compare innerHTML -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo>foo[]bar</a></div>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo>foo[]bar</a></div>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo>foo[]bar</a></div>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo>foo[]bar</a></div>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo>foo[]bar</a></div>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo>foo[]bar</a></div>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo>foo[]bar</a></div>" queryCommandIndeterm("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo>foo[]bar</a></div>" queryCommandState("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo>foo[]bar</a></div>" queryCommandValue("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo>foo[]bar</a></div>" queryCommandIndeterm("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo>foo[]bar</a></div>" queryCommandState("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo>foo[]bar</a></div>" queryCommandValue("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>foo[]bar</b></a></p>": execCommand("defaultparagraphseparator", false, "div") return value -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>foo[]bar</b></a></p>": execCommand("insertparagraph", false, "") return value -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>foo[]bar</b></a></p>" checks for modifications to non-editable content -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>foo[]bar</b></a></p>" compare innerHTML -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>foo[]bar</b></a></p>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>foo[]bar</b></a></p>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>foo[]bar</b></a></p>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>foo[]bar</b></a></p>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>foo[]bar</b></a></p>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>foo[]bar</b></a></p>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>foo[]bar</b></a></p>" queryCommandIndeterm("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>foo[]bar</b></a></p>" queryCommandState("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>foo[]bar</b></a></p>" queryCommandValue("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>foo[]bar</b></a></p>" queryCommandIndeterm("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>foo[]bar</b></a></p>" queryCommandState("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>foo[]bar</b></a></p>" queryCommandValue("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>foo[]bar</b></a></div>": execCommand("defaultparagraphseparator", false, "p") return value -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>foo[]bar</b></a></div>": execCommand("insertparagraph", false, "") return value -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>foo[]bar</b></a></div>" checks for modifications to non-editable content -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>foo[]bar</b></a></div>" compare innerHTML -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>foo[]bar</b></a></div>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>foo[]bar</b></a></div>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>foo[]bar</b></a></div>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>foo[]bar</b></a></div>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>foo[]bar</b></a></div>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>foo[]bar</b></a></div>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>foo[]bar</b></a></div>" queryCommandIndeterm("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>foo[]bar</b></a></div>" queryCommandState("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>foo[]bar</b></a></div>" queryCommandValue("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>foo[]bar</b></a></div>" queryCommandIndeterm("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>foo[]bar</b></a></div>" queryCommandState("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>foo[]bar</b></a></div>" queryCommandValue("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><b><a href=foo>foo[]bar</a></b></p>": execCommand("defaultparagraphseparator", false, "div") return value -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><b><a href=foo>foo[]bar</a></b></p>": execCommand("insertparagraph", false, "") return value -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><b><a href=foo>foo[]bar</a></b></p>" checks for modifications to non-editable content -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><b><a href=foo>foo[]bar</a></b></p>" compare innerHTML -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><b><a href=foo>foo[]bar</a></b></p>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><b><a href=foo>foo[]bar</a></b></p>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><b><a href=foo>foo[]bar</a></b></p>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><b><a href=foo>foo[]bar</a></b></p>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><b><a href=foo>foo[]bar</a></b></p>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><b><a href=foo>foo[]bar</a></b></p>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><b><a href=foo>foo[]bar</a></b></p>" queryCommandIndeterm("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><b><a href=foo>foo[]bar</a></b></p>" queryCommandState("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><b><a href=foo>foo[]bar</a></b></p>" queryCommandValue("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><b><a href=foo>foo[]bar</a></b></p>" queryCommandIndeterm("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><b><a href=foo>foo[]bar</a></b></p>" queryCommandState("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><b><a href=foo>foo[]bar</a></b></p>" queryCommandValue("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><b><a href=foo>foo[]bar</a></b></div>": execCommand("defaultparagraphseparator", false, "p") return value -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><b><a href=foo>foo[]bar</a></b></div>": execCommand("insertparagraph", false, "") return value -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><b><a href=foo>foo[]bar</a></b></div>" checks for modifications to non-editable content -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><b><a href=foo>foo[]bar</a></b></div>" compare innerHTML -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><b><a href=foo>foo[]bar</a></b></div>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><b><a href=foo>foo[]bar</a></b></div>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><b><a href=foo>foo[]bar</a></b></div>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><b><a href=foo>foo[]bar</a></b></div>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><b><a href=foo>foo[]bar</a></b></div>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><b><a href=foo>foo[]bar</a></b></div>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><b><a href=foo>foo[]bar</a></b></div>" queryCommandIndeterm("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><b><a href=foo>foo[]bar</a></b></div>" queryCommandState("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><b><a href=foo>foo[]bar</a></b></div>" queryCommandValue("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><b><a href=foo>foo[]bar</a></b></div>" queryCommandIndeterm("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><b><a href=foo>foo[]bar</a></b></div>" queryCommandState("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><b><a href=foo>foo[]bar</a></b></div>" queryCommandValue("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<a href=foo>foo[]</a>bar": execCommand("defaultparagraphseparator", false, "div") return value -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<a href=foo>foo[]</a>bar": execCommand("insertparagraph", false, "") return value -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<a href=foo>foo[]</a>bar" checks for modifications to non-editable content -FAIL [["defaultparagraphseparator","div"],["insertparagraph",""]] "<a href=foo>foo[]</a>bar" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<div><a href=\"foo\">foo</a></div><div>bar</div>" but got "<a href=\"foo\">foo</a><div>bar</div>" -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<a href=foo>foo[]</a>bar" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<a href=foo>foo[]</a>bar" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<a href=foo>foo[]</a>bar" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<a href=foo>foo[]</a>bar" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<a href=foo>foo[]</a>bar" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<a href=foo>foo[]</a>bar" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<a href=foo>foo[]</a>bar" queryCommandIndeterm("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<a href=foo>foo[]</a>bar" queryCommandState("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<a href=foo>foo[]</a>bar" queryCommandValue("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<a href=foo>foo[]</a>bar" queryCommandIndeterm("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<a href=foo>foo[]</a>bar" queryCommandState("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<a href=foo>foo[]</a>bar" queryCommandValue("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<a href=foo>foo[]</a>bar": execCommand("defaultparagraphseparator", false, "p") return value -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<a href=foo>foo[]</a>bar": execCommand("insertparagraph", false, "") return value -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<a href=foo>foo[]</a>bar" checks for modifications to non-editable content -FAIL [["defaultparagraphseparator","p"],["insertparagraph",""]] "<a href=foo>foo[]</a>bar" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<p><a href=\"foo\">foo</a></p><p>bar</p>" but got "<a href=\"foo\">foo</a><p>bar</p>" -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<a href=foo>foo[]</a>bar" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<a href=foo>foo[]</a>bar" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<a href=foo>foo[]</a>bar" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<a href=foo>foo[]</a>bar" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<a href=foo>foo[]</a>bar" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<a href=foo>foo[]</a>bar" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<a href=foo>foo[]</a>bar" queryCommandIndeterm("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<a href=foo>foo[]</a>bar" queryCommandState("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<a href=foo>foo[]</a>bar" queryCommandValue("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<a href=foo>foo[]</a>bar" queryCommandIndeterm("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<a href=foo>foo[]</a>bar" queryCommandState("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<a href=foo>foo[]</a>bar" queryCommandValue("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "foo<a href=foo>[]bar</a>": execCommand("defaultparagraphseparator", false, "div") return value -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "foo<a href=foo>[]bar</a>": execCommand("insertparagraph", false, "") return value -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "foo<a href=foo>[]bar</a>" checks for modifications to non-editable content -FAIL [["defaultparagraphseparator","div"],["insertparagraph",""]] "foo<a href=foo>[]bar</a>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<div>foo</div><div><a href=\"foo\">bar</a></div>" but got "foo<div><a href=\"foo\">bar</a></div>" -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "foo<a href=foo>[]bar</a>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "foo<a href=foo>[]bar</a>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "foo<a href=foo>[]bar</a>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "foo<a href=foo>[]bar</a>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "foo<a href=foo>[]bar</a>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "foo<a href=foo>[]bar</a>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "foo<a href=foo>[]bar</a>" queryCommandIndeterm("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "foo<a href=foo>[]bar</a>" queryCommandState("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "foo<a href=foo>[]bar</a>" queryCommandValue("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "foo<a href=foo>[]bar</a>" queryCommandIndeterm("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "foo<a href=foo>[]bar</a>" queryCommandState("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "foo<a href=foo>[]bar</a>" queryCommandValue("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "foo<a href=foo>[]bar</a>": execCommand("defaultparagraphseparator", false, "p") return value -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "foo<a href=foo>[]bar</a>": execCommand("insertparagraph", false, "") return value -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "foo<a href=foo>[]bar</a>" checks for modifications to non-editable content -FAIL [["defaultparagraphseparator","p"],["insertparagraph",""]] "foo<a href=foo>[]bar</a>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<p>foo</p><p><a href=\"foo\">bar</a></p>" but got "foo<p><a href=\"foo\">bar</a></p>" -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "foo<a href=foo>[]bar</a>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "foo<a href=foo>[]bar</a>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "foo<a href=foo>[]bar</a>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "foo<a href=foo>[]bar</a>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "foo<a href=foo>[]bar</a>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "foo<a href=foo>[]bar</a>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "foo<a href=foo>[]bar</a>" queryCommandIndeterm("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "foo<a href=foo>[]bar</a>" queryCommandState("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "foo<a href=foo>[]bar</a>" queryCommandValue("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "foo<a href=foo>[]bar</a>" queryCommandIndeterm("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "foo<a href=foo>[]bar</a>" queryCommandState("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "foo<a href=foo>[]bar</a>" queryCommandValue("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo>foo[]</a></p>": execCommand("defaultparagraphseparator", false, "div") return value -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo>foo[]</a></p>": execCommand("insertparagraph", false, "") return value -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo>foo[]</a></p>" checks for modifications to non-editable content -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo>foo[]</a></p>" compare innerHTML -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo>foo[]</a></p>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo>foo[]</a></p>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo>foo[]</a></p>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo>foo[]</a></p>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo>foo[]</a></p>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo>foo[]</a></p>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo>foo[]</a></p>" queryCommandIndeterm("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo>foo[]</a></p>" queryCommandState("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo>foo[]</a></p>" queryCommandValue("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo>foo[]</a></p>" queryCommandIndeterm("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo>foo[]</a></p>" queryCommandState("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo>foo[]</a></p>" queryCommandValue("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo>foo[]</a></div>": execCommand("defaultparagraphseparator", false, "p") return value -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo>foo[]</a></div>": execCommand("insertparagraph", false, "") return value -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo>foo[]</a></div>" checks for modifications to non-editable content -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo>foo[]</a></div>" compare innerHTML -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo>foo[]</a></div>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo>foo[]</a></div>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo>foo[]</a></div>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo>foo[]</a></div>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo>foo[]</a></div>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo>foo[]</a></div>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo>foo[]</a></div>" queryCommandIndeterm("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo>foo[]</a></div>" queryCommandState("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo>foo[]</a></div>" queryCommandValue("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo>foo[]</a></div>" queryCommandIndeterm("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo>foo[]</a></div>" queryCommandState("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo>foo[]</a></div>" queryCommandValue("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo>[]foo</a></p>": execCommand("defaultparagraphseparator", false, "div") return value -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo>[]foo</a></p>": execCommand("insertparagraph", false, "") return value -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo>[]foo</a></p>" checks for modifications to non-editable content -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo>[]foo</a></p>" compare innerHTML -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo>[]foo</a></p>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo>[]foo</a></p>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo>[]foo</a></p>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo>[]foo</a></p>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo>[]foo</a></p>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo>[]foo</a></p>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo>[]foo</a></p>" queryCommandIndeterm("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo>[]foo</a></p>" queryCommandState("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo>[]foo</a></p>" queryCommandValue("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo>[]foo</a></p>" queryCommandIndeterm("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo>[]foo</a></p>" queryCommandState("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo>[]foo</a></p>" queryCommandValue("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo>[]foo</a></div>": execCommand("defaultparagraphseparator", false, "p") return value -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo>[]foo</a></div>": execCommand("insertparagraph", false, "") return value -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo>[]foo</a></div>" checks for modifications to non-editable content -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo>[]foo</a></div>" compare innerHTML -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo>[]foo</a></div>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo>[]foo</a></div>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo>[]foo</a></div>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo>[]foo</a></div>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo>[]foo</a></div>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo>[]foo</a></div>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo>[]foo</a></div>" queryCommandIndeterm("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo>[]foo</a></div>" queryCommandState("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo>[]foo</a></div>" queryCommandValue("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo>[]foo</a></div>" queryCommandIndeterm("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo>[]foo</a></div>" queryCommandState("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo>[]foo</a></div>" queryCommandValue("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>foo[]</b></a></p>": execCommand("defaultparagraphseparator", false, "div") return value -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>foo[]</b></a></p>": execCommand("insertparagraph", false, "") return value -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>foo[]</b></a></p>" checks for modifications to non-editable content -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>foo[]</b></a></p>" compare innerHTML -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>foo[]</b></a></p>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>foo[]</b></a></p>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>foo[]</b></a></p>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>foo[]</b></a></p>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>foo[]</b></a></p>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>foo[]</b></a></p>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>foo[]</b></a></p>" queryCommandIndeterm("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>foo[]</b></a></p>" queryCommandState("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>foo[]</b></a></p>" queryCommandValue("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>foo[]</b></a></p>" queryCommandIndeterm("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>foo[]</b></a></p>" queryCommandState("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>foo[]</b></a></p>" queryCommandValue("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>foo[]</b></a></div>": execCommand("defaultparagraphseparator", false, "p") return value -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>foo[]</b></a></div>": execCommand("insertparagraph", false, "") return value -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>foo[]</b></a></div>" checks for modifications to non-editable content -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>foo[]</b></a></div>" compare innerHTML -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>foo[]</b></a></div>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>foo[]</b></a></div>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>foo[]</b></a></div>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>foo[]</b></a></div>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>foo[]</b></a></div>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>foo[]</b></a></div>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>foo[]</b></a></div>" queryCommandIndeterm("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>foo[]</b></a></div>" queryCommandState("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>foo[]</b></a></div>" queryCommandValue("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>foo[]</b></a></div>" queryCommandIndeterm("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>foo[]</b></a></div>" queryCommandState("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>foo[]</b></a></div>" queryCommandValue("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>[]foo</b></a></p>": execCommand("defaultparagraphseparator", false, "div") return value -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>[]foo</b></a></p>": execCommand("insertparagraph", false, "") return value -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>[]foo</b></a></p>" checks for modifications to non-editable content -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>[]foo</b></a></p>" compare innerHTML -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>[]foo</b></a></p>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>[]foo</b></a></p>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>[]foo</b></a></p>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>[]foo</b></a></p>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>[]foo</b></a></p>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>[]foo</b></a></p>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>[]foo</b></a></p>" queryCommandIndeterm("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>[]foo</b></a></p>" queryCommandState("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>[]foo</b></a></p>" queryCommandValue("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>[]foo</b></a></p>" queryCommandIndeterm("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>[]foo</b></a></p>" queryCommandState("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>[]foo</b></a></p>" queryCommandValue("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>[]foo</b></a></div>": execCommand("defaultparagraphseparator", false, "p") return value -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>[]foo</b></a></div>": execCommand("insertparagraph", false, "") return value -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>[]foo</b></a></div>" checks for modifications to non-editable content -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>[]foo</b></a></div>" compare innerHTML -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>[]foo</b></a></div>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>[]foo</b></a></div>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>[]foo</b></a></div>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>[]foo</b></a></div>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>[]foo</b></a></div>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>[]foo</b></a></div>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>[]foo</b></a></div>" queryCommandIndeterm("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>[]foo</b></a></div>" queryCommandState("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>[]foo</b></a></div>" queryCommandValue("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>[]foo</b></a></div>" queryCommandIndeterm("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>[]foo</b></a></div>" queryCommandState("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>[]foo</b></a></div>" queryCommandValue("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><b><a href=foo>foo[]</a></b></p>": execCommand("defaultparagraphseparator", false, "div") return value -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><b><a href=foo>foo[]</a></b></p>": execCommand("insertparagraph", false, "") return value -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><b><a href=foo>foo[]</a></b></p>" checks for modifications to non-editable content -FAIL [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><b><a href=foo>foo[]</a></b></p>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<p><b><a href=\"foo\">foo</a></b></p><p><b><br></b></p>" but got "<p><b><a href=\"foo\">foo</a></b></p><p><br></p>" -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><b><a href=foo>foo[]</a></b></p>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><b><a href=foo>foo[]</a></b></p>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><b><a href=foo>foo[]</a></b></p>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><b><a href=foo>foo[]</a></b></p>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><b><a href=foo>foo[]</a></b></p>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><b><a href=foo>foo[]</a></b></p>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><b><a href=foo>foo[]</a></b></p>" queryCommandIndeterm("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><b><a href=foo>foo[]</a></b></p>" queryCommandState("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><b><a href=foo>foo[]</a></b></p>" queryCommandValue("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><b><a href=foo>foo[]</a></b></p>" queryCommandIndeterm("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><b><a href=foo>foo[]</a></b></p>" queryCommandState("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><b><a href=foo>foo[]</a></b></p>" queryCommandValue("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><b><a href=foo>foo[]</a></b></div>": execCommand("defaultparagraphseparator", false, "p") return value -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><b><a href=foo>foo[]</a></b></div>": execCommand("insertparagraph", false, "") return value -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><b><a href=foo>foo[]</a></b></div>" checks for modifications to non-editable content -FAIL [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><b><a href=foo>foo[]</a></b></div>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<div><b><a href=\"foo\">foo</a></b></div><div><b><br></b></div>" but got "<div><b><a href=\"foo\">foo</a></b></div><div><br></div>" -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><b><a href=foo>foo[]</a></b></div>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><b><a href=foo>foo[]</a></b></div>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><b><a href=foo>foo[]</a></b></div>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><b><a href=foo>foo[]</a></b></div>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><b><a href=foo>foo[]</a></b></div>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><b><a href=foo>foo[]</a></b></div>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><b><a href=foo>foo[]</a></b></div>" queryCommandIndeterm("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><b><a href=foo>foo[]</a></b></div>" queryCommandState("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><b><a href=foo>foo[]</a></b></div>" queryCommandValue("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><b><a href=foo>foo[]</a></b></div>" queryCommandIndeterm("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><b><a href=foo>foo[]</a></b></div>" queryCommandState("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><b><a href=foo>foo[]</a></b></div>" queryCommandValue("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><b><a href=foo>[]foo</a></b></p>": execCommand("defaultparagraphseparator", false, "div") return value -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><b><a href=foo>[]foo</a></b></p>": execCommand("insertparagraph", false, "") return value -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><b><a href=foo>[]foo</a></b></p>" checks for modifications to non-editable content -FAIL [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><b><a href=foo>[]foo</a></b></p>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<p><b><br></b></p><p><b><a href=\"foo\">foo</a></b></p>" but got "<p><br></p><p><b><a href=\"foo\">foo</a></b></p>" -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><b><a href=foo>[]foo</a></b></p>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><b><a href=foo>[]foo</a></b></p>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><b><a href=foo>[]foo</a></b></p>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><b><a href=foo>[]foo</a></b></p>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><b><a href=foo>[]foo</a></b></p>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><b><a href=foo>[]foo</a></b></p>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><b><a href=foo>[]foo</a></b></p>" queryCommandIndeterm("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><b><a href=foo>[]foo</a></b></p>" queryCommandState("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><b><a href=foo>[]foo</a></b></p>" queryCommandValue("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><b><a href=foo>[]foo</a></b></p>" queryCommandIndeterm("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><b><a href=foo>[]foo</a></b></p>" queryCommandState("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><b><a href=foo>[]foo</a></b></p>" queryCommandValue("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><b><a href=foo>[]foo</a></b></div>": execCommand("defaultparagraphseparator", false, "p") return value -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><b><a href=foo>[]foo</a></b></div>": execCommand("insertparagraph", false, "") return value -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><b><a href=foo>[]foo</a></b></div>" checks for modifications to non-editable content -FAIL [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><b><a href=foo>[]foo</a></b></div>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<div><b><br></b></div><div><b><a href=\"foo\">foo</a></b></div>" but got "<div><br></div><div><b><a href=\"foo\">foo</a></b></div>" -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><b><a href=foo>[]foo</a></b></div>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><b><a href=foo>[]foo</a></b></div>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><b><a href=foo>[]foo</a></b></div>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><b><a href=foo>[]foo</a></b></div>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><b><a href=foo>[]foo</a></b></div>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><b><a href=foo>[]foo</a></b></div>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><b><a href=foo>[]foo</a></b></div>" queryCommandIndeterm("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><b><a href=foo>[]foo</a></b></div>" queryCommandState("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><b><a href=foo>[]foo</a></b></div>" queryCommandValue("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><b><a href=foo>[]foo</a></b></div>" queryCommandIndeterm("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><b><a href=foo>[]foo</a></b></div>" queryCommandState("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><b><a href=foo>[]foo</a></b></div>" queryCommandValue("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo>foo []<br></a></p>": execCommand("defaultparagraphseparator", false, "div") return value -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo>foo []<br></a></p>": execCommand("insertparagraph", false, "") return value -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo>foo []<br></a></p>" checks for modifications to non-editable content -FAIL [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo>foo []<br></a></p>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<p><a href=\"foo\">foo <br></a></p><p><br></p>" but got "<p><a href=\"foo\">foo <br></a></p><p><a href=\"foo\"><br></a></p>" -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo>foo []<br></a></p>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo>foo []<br></a></p>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo>foo []<br></a></p>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo>foo []<br></a></p>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo>foo []<br></a></p>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo>foo []<br></a></p>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo>foo []<br></a></p>" queryCommandIndeterm("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo>foo []<br></a></p>" queryCommandState("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo>foo []<br></a></p>" queryCommandValue("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo>foo []<br></a></p>" queryCommandIndeterm("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo>foo []<br></a></p>" queryCommandState("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo>foo []<br></a></p>" queryCommandValue("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo>foo []<br></a></div>": execCommand("defaultparagraphseparator", false, "p") return value -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo>foo []<br></a></div>": execCommand("insertparagraph", false, "") return value -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo>foo []<br></a></div>" checks for modifications to non-editable content -FAIL [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo>foo []<br></a></div>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<div><a href=\"foo\">foo <br></a></div><div><br></div>" but got "<div><a href=\"foo\">foo <br></a></div><div><a href=\"foo\"><br></a></div>" -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo>foo []<br></a></div>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo>foo []<br></a></div>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo>foo []<br></a></div>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo>foo []<br></a></div>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo>foo []<br></a></div>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo>foo []<br></a></div>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo>foo []<br></a></div>" queryCommandIndeterm("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo>foo []<br></a></div>" queryCommandState("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo>foo []<br></a></div>" queryCommandValue("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo>foo []<br></a></div>" queryCommandIndeterm("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo>foo []<br></a></div>" queryCommandState("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo>foo []<br></a></div>" queryCommandValue("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>foo []<br></b></a></p>": execCommand("defaultparagraphseparator", false, "div") return value -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>foo []<br></b></a></p>": execCommand("insertparagraph", false, "") return value -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>foo []<br></b></a></p>" checks for modifications to non-editable content -FAIL [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>foo []<br></b></a></p>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<p><a href=\"foo\"><b>foo <br></b></a></p><p><br></p>" but got "<p><a href=\"foo\"><b>foo <br></b></a></p><p><a href=\"foo\"><b><br></b></a></p>" -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>foo []<br></b></a></p>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>foo []<br></b></a></p>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>foo []<br></b></a></p>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>foo []<br></b></a></p>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>foo []<br></b></a></p>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>foo []<br></b></a></p>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>foo []<br></b></a></p>" queryCommandIndeterm("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>foo []<br></b></a></p>" queryCommandState("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>foo []<br></b></a></p>" queryCommandValue("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>foo []<br></b></a></p>" queryCommandIndeterm("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>foo []<br></b></a></p>" queryCommandState("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>foo []<br></b></a></p>" queryCommandValue("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>foo []<br></b></a></div>": execCommand("defaultparagraphseparator", false, "p") return value -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>foo []<br></b></a></div>": execCommand("insertparagraph", false, "") return value -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>foo []<br></b></a></div>" checks for modifications to non-editable content -FAIL [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>foo []<br></b></a></div>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<div><a href=\"foo\"><b>foo <br></b></a></div><div><br></div>" but got "<div><a href=\"foo\"><b>foo <br></b></a></div><div><a href=\"foo\"><b><br></b></a></div>" -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>foo []<br></b></a></div>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>foo []<br></b></a></div>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>foo []<br></b></a></div>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>foo []<br></b></a></div>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>foo []<br></b></a></div>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>foo []<br></b></a></div>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>foo []<br></b></a></div>" queryCommandIndeterm("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>foo []<br></b></a></div>" queryCommandState("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>foo []<br></b></a></div>" queryCommandValue("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>foo []<br></b></a></div>" queryCommandIndeterm("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>foo []<br></b></a></div>" queryCommandState("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>foo []<br></b></a></div>" queryCommandValue("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><b><a href=foo>foo []<br></a></b></p>": execCommand("defaultparagraphseparator", false, "div") return value -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><b><a href=foo>foo []<br></a></b></p>": execCommand("insertparagraph", false, "") return value -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><b><a href=foo>foo []<br></a></b></p>" checks for modifications to non-editable content -FAIL [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><b><a href=foo>foo []<br></a></b></p>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<p><b><a href=\"foo\">foo <br></a></b></p><p><b><br></b></p>" but got "<p><b><a href=\"foo\">foo <br></a></b></p><p><b><a href=\"foo\"><br></a></b></p>" -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><b><a href=foo>foo []<br></a></b></p>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><b><a href=foo>foo []<br></a></b></p>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><b><a href=foo>foo []<br></a></b></p>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><b><a href=foo>foo []<br></a></b></p>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><b><a href=foo>foo []<br></a></b></p>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><b><a href=foo>foo []<br></a></b></p>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><b><a href=foo>foo []<br></a></b></p>" queryCommandIndeterm("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><b><a href=foo>foo []<br></a></b></p>" queryCommandState("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><b><a href=foo>foo []<br></a></b></p>" queryCommandValue("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><b><a href=foo>foo []<br></a></b></p>" queryCommandIndeterm("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><b><a href=foo>foo []<br></a></b></p>" queryCommandState("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><b><a href=foo>foo []<br></a></b></p>" queryCommandValue("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><b><a href=foo>foo []<br></a></b></div>": execCommand("defaultparagraphseparator", false, "p") return value -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><b><a href=foo>foo []<br></a></b></div>": execCommand("insertparagraph", false, "") return value -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><b><a href=foo>foo []<br></a></b></div>" checks for modifications to non-editable content -FAIL [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><b><a href=foo>foo []<br></a></b></div>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<div><b><a href=\"foo\">foo <br></a></b></div><div><b><br></b></div>" but got "<div><b><a href=\"foo\">foo <br></a></b></div><div><b><a href=\"foo\"><br></a></b></div>" -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><b><a href=foo>foo []<br></a></b></div>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><b><a href=foo>foo []<br></a></b></div>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><b><a href=foo>foo []<br></a></b></div>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><b><a href=foo>foo []<br></a></b></div>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><b><a href=foo>foo []<br></a></b></div>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><b><a href=foo>foo []<br></a></b></div>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><b><a href=foo>foo []<br></a></b></div>" queryCommandIndeterm("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><b><a href=foo>foo []<br></a></b></div>" queryCommandState("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><b><a href=foo>foo []<br></a></b></div>" queryCommandValue("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><b><a href=foo>foo []<br></a></b></div>" queryCommandIndeterm("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><b><a href=foo>foo []<br></a></b></div>" queryCommandState("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><b><a href=foo>foo []<br></a></b></div>" queryCommandValue("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo>foo {}<br></a></p>": execCommand("defaultparagraphseparator", false, "div") return value -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo>foo {}<br></a></p>": execCommand("insertparagraph", false, "") return value -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo>foo {}<br></a></p>" checks for modifications to non-editable content -FAIL [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo>foo {}<br></a></p>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<p><a href=\"foo\">foo <br></a></p><p><br></p>" but got "<p><a href=\"foo\">foo <br></a></p><p><a href=\"foo\"><br></a></p>" -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo>foo {}<br></a></p>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo>foo {}<br></a></p>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo>foo {}<br></a></p>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo>foo {}<br></a></p>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo>foo {}<br></a></p>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo>foo {}<br></a></p>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo>foo {}<br></a></p>" queryCommandIndeterm("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo>foo {}<br></a></p>" queryCommandState("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo>foo {}<br></a></p>" queryCommandValue("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo>foo {}<br></a></p>" queryCommandIndeterm("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo>foo {}<br></a></p>" queryCommandState("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo>foo {}<br></a></p>" queryCommandValue("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo>foo {}<br></a></div>": execCommand("defaultparagraphseparator", false, "p") return value -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo>foo {}<br></a></div>": execCommand("insertparagraph", false, "") return value -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo>foo {}<br></a></div>" checks for modifications to non-editable content -FAIL [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo>foo {}<br></a></div>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<div><a href=\"foo\">foo <br></a></div><div><br></div>" but got "<div><a href=\"foo\">foo <br></a></div><div><a href=\"foo\"><br></a></div>" -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo>foo {}<br></a></div>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo>foo {}<br></a></div>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo>foo {}<br></a></div>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo>foo {}<br></a></div>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo>foo {}<br></a></div>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo>foo {}<br></a></div>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo>foo {}<br></a></div>" queryCommandIndeterm("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo>foo {}<br></a></div>" queryCommandState("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo>foo {}<br></a></div>" queryCommandValue("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo>foo {}<br></a></div>" queryCommandIndeterm("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo>foo {}<br></a></div>" queryCommandState("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo>foo {}<br></a></div>" queryCommandValue("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>foo {}<br></b></a></p>": execCommand("defaultparagraphseparator", false, "div") return value -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>foo {}<br></b></a></p>": execCommand("insertparagraph", false, "") return value -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>foo {}<br></b></a></p>" checks for modifications to non-editable content -FAIL [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>foo {}<br></b></a></p>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<p><a href=\"foo\"><b>foo <br></b></a></p><p><br></p>" but got "<p><a href=\"foo\"><b>foo <br></b></a></p><p><a href=\"foo\"><b><br></b></a></p>" -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>foo {}<br></b></a></p>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>foo {}<br></b></a></p>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>foo {}<br></b></a></p>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>foo {}<br></b></a></p>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>foo {}<br></b></a></p>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>foo {}<br></b></a></p>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>foo {}<br></b></a></p>" queryCommandIndeterm("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>foo {}<br></b></a></p>" queryCommandState("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>foo {}<br></b></a></p>" queryCommandValue("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>foo {}<br></b></a></p>" queryCommandIndeterm("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>foo {}<br></b></a></p>" queryCommandState("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>foo {}<br></b></a></p>" queryCommandValue("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>foo {}<br></b></a></div>": execCommand("defaultparagraphseparator", false, "p") return value -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>foo {}<br></b></a></div>": execCommand("insertparagraph", false, "") return value -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>foo {}<br></b></a></div>" checks for modifications to non-editable content -FAIL [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>foo {}<br></b></a></div>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<div><a href=\"foo\"><b>foo <br></b></a></div><div><br></div>" but got "<div><a href=\"foo\"><b>foo <br></b></a></div><div><a href=\"foo\"><b><br></b></a></div>" -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>foo {}<br></b></a></div>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>foo {}<br></b></a></div>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>foo {}<br></b></a></div>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>foo {}<br></b></a></div>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>foo {}<br></b></a></div>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>foo {}<br></b></a></div>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>foo {}<br></b></a></div>" queryCommandIndeterm("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>foo {}<br></b></a></div>" queryCommandState("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>foo {}<br></b></a></div>" queryCommandValue("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>foo {}<br></b></a></div>" queryCommandIndeterm("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>foo {}<br></b></a></div>" queryCommandState("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>foo {}<br></b></a></div>" queryCommandValue("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><b><a href=foo>foo {}<br></a></b></p>": execCommand("defaultparagraphseparator", false, "div") return value -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><b><a href=foo>foo {}<br></a></b></p>": execCommand("insertparagraph", false, "") return value -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><b><a href=foo>foo {}<br></a></b></p>" checks for modifications to non-editable content -FAIL [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><b><a href=foo>foo {}<br></a></b></p>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<p><b><a href=\"foo\">foo <br></a></b></p><p><b><br></b></p>" but got "<p><b><a href=\"foo\">foo <br></a></b></p><p><b><a href=\"foo\"><br></a></b></p>" -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><b><a href=foo>foo {}<br></a></b></p>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><b><a href=foo>foo {}<br></a></b></p>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><b><a href=foo>foo {}<br></a></b></p>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><b><a href=foo>foo {}<br></a></b></p>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><b><a href=foo>foo {}<br></a></b></p>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><b><a href=foo>foo {}<br></a></b></p>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><b><a href=foo>foo {}<br></a></b></p>" queryCommandIndeterm("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><b><a href=foo>foo {}<br></a></b></p>" queryCommandState("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><b><a href=foo>foo {}<br></a></b></p>" queryCommandValue("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><b><a href=foo>foo {}<br></a></b></p>" queryCommandIndeterm("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><b><a href=foo>foo {}<br></a></b></p>" queryCommandState("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><b><a href=foo>foo {}<br></a></b></p>" queryCommandValue("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><b><a href=foo>foo {}<br></a></b></div>": execCommand("defaultparagraphseparator", false, "p") return value -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><b><a href=foo>foo {}<br></a></b></div>": execCommand("insertparagraph", false, "") return value -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><b><a href=foo>foo {}<br></a></b></div>" checks for modifications to non-editable content -FAIL [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><b><a href=foo>foo {}<br></a></b></div>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<div><b><a href=\"foo\">foo <br></a></b></div><div><b><br></b></div>" but got "<div><b><a href=\"foo\">foo <br></a></b></div><div><b><a href=\"foo\"><br></a></b></div>" -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><b><a href=foo>foo {}<br></a></b></div>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><b><a href=foo>foo {}<br></a></b></div>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><b><a href=foo>foo {}<br></a></b></div>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><b><a href=foo>foo {}<br></a></b></div>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><b><a href=foo>foo {}<br></a></b></div>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><b><a href=foo>foo {}<br></a></b></div>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><b><a href=foo>foo {}<br></a></b></div>" queryCommandIndeterm("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><b><a href=foo>foo {}<br></a></b></div>" queryCommandState("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><b><a href=foo>foo {}<br></a></b></div>" queryCommandValue("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><b><a href=foo>foo {}<br></a></b></div>" queryCommandIndeterm("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><b><a href=foo>foo {}<br></a></b></div>" queryCommandState("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><b><a href=foo>foo {}<br></a></b></div>" queryCommandValue("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo>foo []<br><br></a></p>": execCommand("defaultparagraphseparator", false, "div") return value -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo>foo []<br><br></a></p>": execCommand("insertparagraph", false, "") return value -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo>foo []<br><br></a></p>" checks for modifications to non-editable content -FAIL [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo>foo []<br><br></a></p>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<p><a href=\"foo\">foo <br></a></p><p><a href=\"foo\"><br><br></a></p>" but got "<p><a href=\"foo\">foo </a></p><p><a href=\"foo\"><br><br></a></p>" -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo>foo []<br><br></a></p>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo>foo []<br><br></a></p>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo>foo []<br><br></a></p>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo>foo []<br><br></a></p>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo>foo []<br><br></a></p>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo>foo []<br><br></a></p>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo>foo []<br><br></a></p>" queryCommandIndeterm("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo>foo []<br><br></a></p>" queryCommandState("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo>foo []<br><br></a></p>" queryCommandValue("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo>foo []<br><br></a></p>" queryCommandIndeterm("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo>foo []<br><br></a></p>" queryCommandState("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo>foo []<br><br></a></p>" queryCommandValue("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo>foo []<br><br></a></div>": execCommand("defaultparagraphseparator", false, "p") return value -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo>foo []<br><br></a></div>": execCommand("insertparagraph", false, "") return value -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo>foo []<br><br></a></div>" checks for modifications to non-editable content -FAIL [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo>foo []<br><br></a></div>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<div><a href=\"foo\">foo <br></a></div><div><a href=\"foo\"><br><br></a></div>" but got "<div><a href=\"foo\">foo </a></div><div><a href=\"foo\"><br><br></a></div>" -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo>foo []<br><br></a></div>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo>foo []<br><br></a></div>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo>foo []<br><br></a></div>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo>foo []<br><br></a></div>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo>foo []<br><br></a></div>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo>foo []<br><br></a></div>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo>foo []<br><br></a></div>" queryCommandIndeterm("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo>foo []<br><br></a></div>" queryCommandState("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo>foo []<br><br></a></div>" queryCommandValue("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo>foo []<br><br></a></div>" queryCommandIndeterm("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo>foo []<br><br></a></div>" queryCommandState("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo>foo []<br><br></a></div>" queryCommandValue("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>foo []<br><br></b></a></p>": execCommand("defaultparagraphseparator", false, "div") return value -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>foo []<br><br></b></a></p>": execCommand("insertparagraph", false, "") return value -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>foo []<br><br></b></a></p>" checks for modifications to non-editable content -FAIL [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>foo []<br><br></b></a></p>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<p><a href=\"foo\"><b>foo <br></b></a></p><p><a href=\"foo\"><b><br><br></b></a></p>" but got "<p><a href=\"foo\"><b>foo </b></a></p><p><a href=\"foo\"><b><br><br></b></a></p>" -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>foo []<br><br></b></a></p>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>foo []<br><br></b></a></p>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>foo []<br><br></b></a></p>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>foo []<br><br></b></a></p>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>foo []<br><br></b></a></p>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>foo []<br><br></b></a></p>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>foo []<br><br></b></a></p>" queryCommandIndeterm("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>foo []<br><br></b></a></p>" queryCommandState("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>foo []<br><br></b></a></p>" queryCommandValue("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>foo []<br><br></b></a></p>" queryCommandIndeterm("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>foo []<br><br></b></a></p>" queryCommandState("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>foo []<br><br></b></a></p>" queryCommandValue("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>foo []<br><br></b></a></div>": execCommand("defaultparagraphseparator", false, "p") return value -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>foo []<br><br></b></a></div>": execCommand("insertparagraph", false, "") return value -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>foo []<br><br></b></a></div>" checks for modifications to non-editable content -FAIL [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>foo []<br><br></b></a></div>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<div><a href=\"foo\"><b>foo <br></b><br></a></div><div><a href=\"foo\"><b><br><br></b></a></div>" but got "<div><a href=\"foo\"><b>foo </b></a></div><div><a href=\"foo\"><b><br><br></b></a></div>" -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>foo []<br><br></b></a></div>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>foo []<br><br></b></a></div>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>foo []<br><br></b></a></div>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>foo []<br><br></b></a></div>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>foo []<br><br></b></a></div>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>foo []<br><br></b></a></div>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>foo []<br><br></b></a></div>" queryCommandIndeterm("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>foo []<br><br></b></a></div>" queryCommandState("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>foo []<br><br></b></a></div>" queryCommandValue("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>foo []<br><br></b></a></div>" queryCommandIndeterm("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>foo []<br><br></b></a></div>" queryCommandState("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>foo []<br><br></b></a></div>" queryCommandValue("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>foo []<br></b><br></a></p>": execCommand("defaultparagraphseparator", false, "div") return value -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>foo []<br></b><br></a></p>": execCommand("insertparagraph", false, "") return value -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>foo []<br></b><br></a></p>" checks for modifications to non-editable content -FAIL [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>foo []<br></b><br></a></p>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<p><a href=\"foo\"><b>foo <br></b></a></p><p><a href=\"foo\"><b><br></b><br></a></p>" but got "<p><a href=\"foo\"><b>foo </b></a></p><p><a href=\"foo\"><b><br></b><br></a></p>" -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>foo []<br></b><br></a></p>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>foo []<br></b><br></a></p>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>foo []<br></b><br></a></p>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>foo []<br></b><br></a></p>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>foo []<br></b><br></a></p>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>foo []<br></b><br></a></p>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>foo []<br></b><br></a></p>" queryCommandIndeterm("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>foo []<br></b><br></a></p>" queryCommandState("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>foo []<br></b><br></a></p>" queryCommandValue("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>foo []<br></b><br></a></p>" queryCommandIndeterm("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>foo []<br></b><br></a></p>" queryCommandState("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>foo []<br></b><br></a></p>" queryCommandValue("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>foo []<br></b><br></a></div>": execCommand("defaultparagraphseparator", false, "p") return value -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>foo []<br></b><br></a></div>": execCommand("insertparagraph", false, "") return value -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>foo []<br></b><br></a></div>" checks for modifications to non-editable content -FAIL [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>foo []<br></b><br></a></div>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<div><a href=\"foo\"><b>foo <br></b></a></div><div><a href=\"foo\"><b><br></b><br></a></div>" but got "<div><a href=\"foo\"><b>foo </b></a></div><div><a href=\"foo\"><b><br></b><br></a></div>" -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>foo []<br></b><br></a></div>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>foo []<br></b><br></a></div>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>foo []<br></b><br></a></div>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>foo []<br></b><br></a></div>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>foo []<br></b><br></a></div>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>foo []<br></b><br></a></div>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>foo []<br></b><br></a></div>" queryCommandIndeterm("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>foo []<br></b><br></a></div>" queryCommandState("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>foo []<br></b><br></a></div>" queryCommandValue("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>foo []<br></b><br></a></div>" queryCommandIndeterm("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>foo []<br></b><br></a></div>" queryCommandState("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>foo []<br></b><br></a></div>" queryCommandValue("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo>foo {}<br><br></a></p>": execCommand("defaultparagraphseparator", false, "div") return value -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo>foo {}<br><br></a></p>": execCommand("insertparagraph", false, "") return value -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo>foo {}<br><br></a></p>" checks for modifications to non-editable content -FAIL [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo>foo {}<br><br></a></p>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<p><a href=\"foo\">foo <br><br></a></p><p><a href=\"foo\"><br></a></p>" but got "<p><a href=\"foo\">foo </a></p><p><a href=\"foo\"><br><br></a></p>" -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo>foo {}<br><br></a></p>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo>foo {}<br><br></a></p>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo>foo {}<br><br></a></p>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo>foo {}<br><br></a></p>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo>foo {}<br><br></a></p>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo>foo {}<br><br></a></p>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo>foo {}<br><br></a></p>" queryCommandIndeterm("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo>foo {}<br><br></a></p>" queryCommandState("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo>foo {}<br><br></a></p>" queryCommandValue("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo>foo {}<br><br></a></p>" queryCommandIndeterm("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo>foo {}<br><br></a></p>" queryCommandState("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo>foo {}<br><br></a></p>" queryCommandValue("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo>foo {}<br><br></a></div>": execCommand("defaultparagraphseparator", false, "p") return value -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo>foo {}<br><br></a></div>": execCommand("insertparagraph", false, "") return value -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo>foo {}<br><br></a></div>" checks for modifications to non-editable content -FAIL [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo>foo {}<br><br></a></div>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<div><a href=\"foo\">foo <br></a></div><div><a href=\"foo\"><br></a></div>" but got "<div><a href=\"foo\">foo </a></div><div><a href=\"foo\"><br><br></a></div>" -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo>foo {}<br><br></a></div>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo>foo {}<br><br></a></div>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo>foo {}<br><br></a></div>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo>foo {}<br><br></a></div>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo>foo {}<br><br></a></div>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo>foo {}<br><br></a></div>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo>foo {}<br><br></a></div>" queryCommandIndeterm("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo>foo {}<br><br></a></div>" queryCommandState("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo>foo {}<br><br></a></div>" queryCommandValue("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo>foo {}<br><br></a></div>" queryCommandIndeterm("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo>foo {}<br><br></a></div>" queryCommandState("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo>foo {}<br><br></a></div>" queryCommandValue("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>foo {}<br><br></b></a></p>": execCommand("defaultparagraphseparator", false, "div") return value -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>foo {}<br><br></b></a></p>": execCommand("insertparagraph", false, "") return value -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>foo {}<br><br></b></a></p>" checks for modifications to non-editable content -FAIL [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>foo {}<br><br></b></a></p>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<p><a href=\"foo\"><b>foo <br></b><br></a></p><p><a href=\"foo\"><b><br><br></b></a></p>" but got "<p><a href=\"foo\"><b>foo </b></a></p><p><a href=\"foo\"><b><br><br></b></a></p>" -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>foo {}<br><br></b></a></p>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>foo {}<br><br></b></a></p>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>foo {}<br><br></b></a></p>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>foo {}<br><br></b></a></p>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>foo {}<br><br></b></a></p>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>foo {}<br><br></b></a></p>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>foo {}<br><br></b></a></p>" queryCommandIndeterm("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>foo {}<br><br></b></a></p>" queryCommandState("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>foo {}<br><br></b></a></p>" queryCommandValue("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>foo {}<br><br></b></a></p>" queryCommandIndeterm("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>foo {}<br><br></b></a></p>" queryCommandState("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>foo {}<br><br></b></a></p>" queryCommandValue("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>foo {}<br><br></b></a></div>": execCommand("defaultparagraphseparator", false, "p") return value -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>foo {}<br><br></b></a></div>": execCommand("insertparagraph", false, "") return value -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>foo {}<br><br></b></a></div>" checks for modifications to non-editable content -FAIL [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>foo {}<br><br></b></a></div>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<div><a href=\"foo\"><b>foo <br></b><br></a></div><div><a href=\"foo\"><b><br><br></b></a></div>" but got "<div><a href=\"foo\"><b>foo </b></a></div><div><a href=\"foo\"><b><br><br></b></a></div>" -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>foo {}<br><br></b></a></div>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>foo {}<br><br></b></a></div>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>foo {}<br><br></b></a></div>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>foo {}<br><br></b></a></div>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>foo {}<br><br></b></a></div>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>foo {}<br><br></b></a></div>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>foo {}<br><br></b></a></div>" queryCommandIndeterm("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>foo {}<br><br></b></a></div>" queryCommandState("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>foo {}<br><br></b></a></div>" queryCommandValue("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>foo {}<br><br></b></a></div>" queryCommandIndeterm("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>foo {}<br><br></b></a></div>" queryCommandState("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>foo {}<br><br></b></a></div>" queryCommandValue("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>foo {}<br></b><br></a></p>": execCommand("defaultparagraphseparator", false, "div") return value -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>foo {}<br></b><br></a></p>": execCommand("insertparagraph", false, "") return value -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>foo {}<br></b><br></a></p>" checks for modifications to non-editable content -FAIL [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>foo {}<br></b><br></a></p>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<p><a href=\"foo\"><b>foo <br></b></a></p><p><a href=\"foo\"><b><br></b><br></a></p>" but got "<p><a href=\"foo\"><b>foo </b></a></p><p><a href=\"foo\"><b><br></b><br></a></p>" -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>foo {}<br></b><br></a></p>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>foo {}<br></b><br></a></p>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>foo {}<br></b><br></a></p>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>foo {}<br></b><br></a></p>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>foo {}<br></b><br></a></p>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>foo {}<br></b><br></a></p>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>foo {}<br></b><br></a></p>" queryCommandIndeterm("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>foo {}<br></b><br></a></p>" queryCommandState("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>foo {}<br></b><br></a></p>" queryCommandValue("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>foo {}<br></b><br></a></p>" queryCommandIndeterm("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>foo {}<br></b><br></a></p>" queryCommandState("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><a href=foo><b>foo {}<br></b><br></a></p>" queryCommandValue("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>foo {}<br></b><br></a></div>": execCommand("defaultparagraphseparator", false, "p") return value -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>foo {}<br></b><br></a></div>": execCommand("insertparagraph", false, "") return value -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>foo {}<br></b><br></a></div>" checks for modifications to non-editable content -FAIL [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>foo {}<br></b><br></a></div>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<div><a href=\"foo\"><b>foo <br></b></a></div><div><a href=\"foo\"><b><br></b><br></a></div>" but got "<div><a href=\"foo\"><b>foo </b></a></div><div><a href=\"foo\"><b><br></b><br></a></div>" -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>foo {}<br></b><br></a></div>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>foo {}<br></b><br></a></div>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>foo {}<br></b><br></a></div>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>foo {}<br></b><br></a></div>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>foo {}<br></b><br></a></div>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>foo {}<br></b><br></a></div>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>foo {}<br></b><br></a></div>" queryCommandIndeterm("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>foo {}<br></b><br></a></div>" queryCommandState("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>foo {}<br></b><br></a></div>" queryCommandValue("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>foo {}<br></b><br></a></div>" queryCommandIndeterm("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>foo {}<br></b><br></a></div>" queryCommandState("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<div><a href=foo><b>foo {}<br></b><br></a></div>" queryCommandValue("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p>foo[]<!--bar-->": execCommand("defaultparagraphseparator", false, "div") return value -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p>foo[]<!--bar-->": execCommand("insertparagraph", false, "") return value -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p>foo[]<!--bar-->" checks for modifications to non-editable content -FAIL [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p>foo[]<!--bar-->" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<p>foo</p><p><!--bar--><br></p>" but got "<p>foo<!--bar--></p><p><br></p>" -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p>foo[]<!--bar-->" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p>foo[]<!--bar-->" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p>foo[]<!--bar-->" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p>foo[]<!--bar-->" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p>foo[]<!--bar-->" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p>foo[]<!--bar-->" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p>foo[]<!--bar-->" queryCommandIndeterm("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p>foo[]<!--bar-->" queryCommandState("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p>foo[]<!--bar-->" queryCommandValue("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p>foo[]<!--bar-->" queryCommandIndeterm("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p>foo[]<!--bar-->" queryCommandState("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p>foo[]<!--bar-->" queryCommandValue("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<p>foo[]<!--bar-->": execCommand("defaultparagraphseparator", false, "p") return value -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<p>foo[]<!--bar-->": execCommand("insertparagraph", false, "") return value -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<p>foo[]<!--bar-->" checks for modifications to non-editable content -FAIL [["defaultparagraphseparator","p"],["insertparagraph",""]] "<p>foo[]<!--bar-->" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<p>foo</p><p><!--bar--><br></p>" but got "<p>foo<!--bar--></p><p><br></p>" -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<p>foo[]<!--bar-->" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<p>foo[]<!--bar-->" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<p>foo[]<!--bar-->" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<p>foo[]<!--bar-->" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<p>foo[]<!--bar-->" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<p>foo[]<!--bar-->" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<p>foo[]<!--bar-->" queryCommandIndeterm("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<p>foo[]<!--bar-->" queryCommandState("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<p>foo[]<!--bar-->" queryCommandValue("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<p>foo[]<!--bar-->" queryCommandIndeterm("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<p>foo[]<!--bar-->" queryCommandState("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<p>foo[]<!--bar-->" queryCommandValue("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><!--foo-->[]bar": execCommand("defaultparagraphseparator", false, "div") return value -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><!--foo-->[]bar": execCommand("insertparagraph", false, "") return value -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><!--foo-->[]bar" checks for modifications to non-editable content -FAIL [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><!--foo-->[]bar" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<p><!--foo--><br></p><p>bar</p>" but got "<p><br></p><p><!--foo-->bar</p>" -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><!--foo-->[]bar" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><!--foo-->[]bar" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><!--foo-->[]bar" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><!--foo-->[]bar" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><!--foo-->[]bar" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><!--foo-->[]bar" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><!--foo-->[]bar" queryCommandIndeterm("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><!--foo-->[]bar" queryCommandState("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><!--foo-->[]bar" queryCommandValue("insertparagraph") before -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><!--foo-->[]bar" queryCommandIndeterm("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><!--foo-->[]bar" queryCommandState("insertparagraph") after -PASS [["defaultparagraphseparator","div"],["insertparagraph",""]] "<p><!--foo-->[]bar" queryCommandValue("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<p><!--foo-->[]bar": execCommand("defaultparagraphseparator", false, "p") return value -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<p><!--foo-->[]bar": execCommand("insertparagraph", false, "") return value -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<p><!--foo-->[]bar" checks for modifications to non-editable content -FAIL [["defaultparagraphseparator","p"],["insertparagraph",""]] "<p><!--foo-->[]bar" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<p><!--foo--><br></p><p>bar</p>" but got "<p><br></p><p><!--foo-->bar</p>" -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<p><!--foo-->[]bar" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<p><!--foo-->[]bar" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<p><!--foo-->[]bar" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<p><!--foo-->[]bar" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<p><!--foo-->[]bar" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<p><!--foo-->[]bar" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<p><!--foo-->[]bar" queryCommandIndeterm("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<p><!--foo-->[]bar" queryCommandState("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<p><!--foo-->[]bar" queryCommandValue("insertparagraph") before -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<p><!--foo-->[]bar" queryCommandIndeterm("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<p><!--foo-->[]bar" queryCommandState("insertparagraph") after -PASS [["defaultparagraphseparator","p"],["insertparagraph",""]] "<p><!--foo-->[]bar" queryCommandValue("insertparagraph") after -PASS [["stylewithcss","true"],["defaultparagraphseparator","div"],["insertparagraph",""]] "<p>foo<span style=color:#aBcDeF>[bar]</span>baz": execCommand("stylewithcss", false, "true") return value -PASS [["stylewithcss","true"],["defaultparagraphseparator","div"],["insertparagraph",""]] "<p>foo<span style=color:#aBcDeF>[bar]</span>baz": execCommand("defaultparagraphseparator", false, "div") return value -PASS [["stylewithcss","true"],["defaultparagraphseparator","div"],["insertparagraph",""]] "<p>foo<span style=color:#aBcDeF>[bar]</span>baz": execCommand("insertparagraph", false, "") return value -PASS [["stylewithcss","true"],["defaultparagraphseparator","div"],["insertparagraph",""]] "<p>foo<span style=color:#aBcDeF>[bar]</span>baz" checks for modifications to non-editable content -PASS [["stylewithcss","true"],["defaultparagraphseparator","div"],["insertparagraph",""]] "<p>foo<span style=color:#aBcDeF>[bar]</span>baz" compare innerHTML -PASS [["stylewithcss","true"],["defaultparagraphseparator","div"],["insertparagraph",""]] "<p>foo<span style=color:#aBcDeF>[bar]</span>baz" queryCommandIndeterm("stylewithcss") before -PASS [["stylewithcss","true"],["defaultparagraphseparator","div"],["insertparagraph",""]] "<p>foo<span style=color:#aBcDeF>[bar]</span>baz" queryCommandState("stylewithcss") before -PASS [["stylewithcss","true"],["defaultparagraphseparator","div"],["insertparagraph",""]] "<p>foo<span style=color:#aBcDeF>[bar]</span>baz" queryCommandValue("stylewithcss") before -PASS [["stylewithcss","true"],["defaultparagraphseparator","div"],["insertparagraph",""]] "<p>foo<span style=color:#aBcDeF>[bar]</span>baz" queryCommandIndeterm("stylewithcss") after -PASS [["stylewithcss","true"],["defaultparagraphseparator","div"],["insertparagraph",""]] "<p>foo<span style=color:#aBcDeF>[bar]</span>baz" queryCommandState("stylewithcss") after -PASS [["stylewithcss","true"],["defaultparagraphseparator","div"],["insertparagraph",""]] "<p>foo<span style=color:#aBcDeF>[bar]</span>baz" queryCommandValue("stylewithcss") after -PASS [["stylewithcss","true"],["defaultparagraphseparator","div"],["insertparagraph",""]] "<p>foo<span style=color:#aBcDeF>[bar]</span>baz" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["stylewithcss","true"],["defaultparagraphseparator","div"],["insertparagraph",""]] "<p>foo<span style=color:#aBcDeF>[bar]</span>baz" queryCommandState("defaultparagraphseparator") before -PASS [["stylewithcss","true"],["defaultparagraphseparator","div"],["insertparagraph",""]] "<p>foo<span style=color:#aBcDeF>[bar]</span>baz" queryCommandValue("defaultparagraphseparator") before -PASS [["stylewithcss","true"],["defaultparagraphseparator","div"],["insertparagraph",""]] "<p>foo<span style=color:#aBcDeF>[bar]</span>baz" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["stylewithcss","true"],["defaultparagraphseparator","div"],["insertparagraph",""]] "<p>foo<span style=color:#aBcDeF>[bar]</span>baz" queryCommandState("defaultparagraphseparator") after -PASS [["stylewithcss","true"],["defaultparagraphseparator","div"],["insertparagraph",""]] "<p>foo<span style=color:#aBcDeF>[bar]</span>baz" queryCommandValue("defaultparagraphseparator") after -PASS [["stylewithcss","true"],["defaultparagraphseparator","div"],["insertparagraph",""]] "<p>foo<span style=color:#aBcDeF>[bar]</span>baz" queryCommandIndeterm("insertparagraph") before -PASS [["stylewithcss","true"],["defaultparagraphseparator","div"],["insertparagraph",""]] "<p>foo<span style=color:#aBcDeF>[bar]</span>baz" queryCommandState("insertparagraph") before -PASS [["stylewithcss","true"],["defaultparagraphseparator","div"],["insertparagraph",""]] "<p>foo<span style=color:#aBcDeF>[bar]</span>baz" queryCommandValue("insertparagraph") before -PASS [["stylewithcss","true"],["defaultparagraphseparator","div"],["insertparagraph",""]] "<p>foo<span style=color:#aBcDeF>[bar]</span>baz" queryCommandIndeterm("insertparagraph") after -PASS [["stylewithcss","true"],["defaultparagraphseparator","div"],["insertparagraph",""]] "<p>foo<span style=color:#aBcDeF>[bar]</span>baz" queryCommandState("insertparagraph") after -PASS [["stylewithcss","true"],["defaultparagraphseparator","div"],["insertparagraph",""]] "<p>foo<span style=color:#aBcDeF>[bar]</span>baz" queryCommandValue("insertparagraph") after -PASS [["stylewithcss","false"],["defaultparagraphseparator","div"],["insertparagraph",""]] "<p>foo<span style=color:#aBcDeF>[bar]</span>baz": execCommand("stylewithcss", false, "false") return value -PASS [["stylewithcss","false"],["defaultparagraphseparator","div"],["insertparagraph",""]] "<p>foo<span style=color:#aBcDeF>[bar]</span>baz": execCommand("defaultparagraphseparator", false, "div") return value -PASS [["stylewithcss","false"],["defaultparagraphseparator","div"],["insertparagraph",""]] "<p>foo<span style=color:#aBcDeF>[bar]</span>baz": execCommand("insertparagraph", false, "") return value -PASS [["stylewithcss","false"],["defaultparagraphseparator","div"],["insertparagraph",""]] "<p>foo<span style=color:#aBcDeF>[bar]</span>baz" checks for modifications to non-editable content -PASS [["stylewithcss","false"],["defaultparagraphseparator","div"],["insertparagraph",""]] "<p>foo<span style=color:#aBcDeF>[bar]</span>baz" compare innerHTML -PASS [["stylewithcss","false"],["defaultparagraphseparator","div"],["insertparagraph",""]] "<p>foo<span style=color:#aBcDeF>[bar]</span>baz" queryCommandIndeterm("stylewithcss") before -PASS [["stylewithcss","false"],["defaultparagraphseparator","div"],["insertparagraph",""]] "<p>foo<span style=color:#aBcDeF>[bar]</span>baz" queryCommandState("stylewithcss") before -PASS [["stylewithcss","false"],["defaultparagraphseparator","div"],["insertparagraph",""]] "<p>foo<span style=color:#aBcDeF>[bar]</span>baz" queryCommandValue("stylewithcss") before -PASS [["stylewithcss","false"],["defaultparagraphseparator","div"],["insertparagraph",""]] "<p>foo<span style=color:#aBcDeF>[bar]</span>baz" queryCommandIndeterm("stylewithcss") after -PASS [["stylewithcss","false"],["defaultparagraphseparator","div"],["insertparagraph",""]] "<p>foo<span style=color:#aBcDeF>[bar]</span>baz" queryCommandState("stylewithcss") after -PASS [["stylewithcss","false"],["defaultparagraphseparator","div"],["insertparagraph",""]] "<p>foo<span style=color:#aBcDeF>[bar]</span>baz" queryCommandValue("stylewithcss") after -PASS [["stylewithcss","false"],["defaultparagraphseparator","div"],["insertparagraph",""]] "<p>foo<span style=color:#aBcDeF>[bar]</span>baz" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["stylewithcss","false"],["defaultparagraphseparator","div"],["insertparagraph",""]] "<p>foo<span style=color:#aBcDeF>[bar]</span>baz" queryCommandState("defaultparagraphseparator") before -PASS [["stylewithcss","false"],["defaultparagraphseparator","div"],["insertparagraph",""]] "<p>foo<span style=color:#aBcDeF>[bar]</span>baz" queryCommandValue("defaultparagraphseparator") before -PASS [["stylewithcss","false"],["defaultparagraphseparator","div"],["insertparagraph",""]] "<p>foo<span style=color:#aBcDeF>[bar]</span>baz" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["stylewithcss","false"],["defaultparagraphseparator","div"],["insertparagraph",""]] "<p>foo<span style=color:#aBcDeF>[bar]</span>baz" queryCommandState("defaultparagraphseparator") after -PASS [["stylewithcss","false"],["defaultparagraphseparator","div"],["insertparagraph",""]] "<p>foo<span style=color:#aBcDeF>[bar]</span>baz" queryCommandValue("defaultparagraphseparator") after -PASS [["stylewithcss","false"],["defaultparagraphseparator","div"],["insertparagraph",""]] "<p>foo<span style=color:#aBcDeF>[bar]</span>baz" queryCommandIndeterm("insertparagraph") before -PASS [["stylewithcss","false"],["defaultparagraphseparator","div"],["insertparagraph",""]] "<p>foo<span style=color:#aBcDeF>[bar]</span>baz" queryCommandState("insertparagraph") before -PASS [["stylewithcss","false"],["defaultparagraphseparator","div"],["insertparagraph",""]] "<p>foo<span style=color:#aBcDeF>[bar]</span>baz" queryCommandValue("insertparagraph") before -PASS [["stylewithcss","false"],["defaultparagraphseparator","div"],["insertparagraph",""]] "<p>foo<span style=color:#aBcDeF>[bar]</span>baz" queryCommandIndeterm("insertparagraph") after -PASS [["stylewithcss","false"],["defaultparagraphseparator","div"],["insertparagraph",""]] "<p>foo<span style=color:#aBcDeF>[bar]</span>baz" queryCommandState("insertparagraph") after -PASS [["stylewithcss","false"],["defaultparagraphseparator","div"],["insertparagraph",""]] "<p>foo<span style=color:#aBcDeF>[bar]</span>baz" queryCommandValue("insertparagraph") after -PASS [["stylewithcss","true"],["defaultparagraphseparator","p"],["insertparagraph",""]] "<p>foo<span style=color:#aBcDeF>[bar]</span>baz": execCommand("stylewithcss", false, "true") return value -PASS [["stylewithcss","true"],["defaultparagraphseparator","p"],["insertparagraph",""]] "<p>foo<span style=color:#aBcDeF>[bar]</span>baz": execCommand("defaultparagraphseparator", false, "p") return value -PASS [["stylewithcss","true"],["defaultparagraphseparator","p"],["insertparagraph",""]] "<p>foo<span style=color:#aBcDeF>[bar]</span>baz": execCommand("insertparagraph", false, "") return value -PASS [["stylewithcss","true"],["defaultparagraphseparator","p"],["insertparagraph",""]] "<p>foo<span style=color:#aBcDeF>[bar]</span>baz" checks for modifications to non-editable content -PASS [["stylewithcss","true"],["defaultparagraphseparator","p"],["insertparagraph",""]] "<p>foo<span style=color:#aBcDeF>[bar]</span>baz" compare innerHTML -PASS [["stylewithcss","true"],["defaultparagraphseparator","p"],["insertparagraph",""]] "<p>foo<span style=color:#aBcDeF>[bar]</span>baz" queryCommandIndeterm("stylewithcss") before -PASS [["stylewithcss","true"],["defaultparagraphseparator","p"],["insertparagraph",""]] "<p>foo<span style=color:#aBcDeF>[bar]</span>baz" queryCommandState("stylewithcss") before -PASS [["stylewithcss","true"],["defaultparagraphseparator","p"],["insertparagraph",""]] "<p>foo<span style=color:#aBcDeF>[bar]</span>baz" queryCommandValue("stylewithcss") before -PASS [["stylewithcss","true"],["defaultparagraphseparator","p"],["insertparagraph",""]] "<p>foo<span style=color:#aBcDeF>[bar]</span>baz" queryCommandIndeterm("stylewithcss") after -PASS [["stylewithcss","true"],["defaultparagraphseparator","p"],["insertparagraph",""]] "<p>foo<span style=color:#aBcDeF>[bar]</span>baz" queryCommandState("stylewithcss") after -PASS [["stylewithcss","true"],["defaultparagraphseparator","p"],["insertparagraph",""]] "<p>foo<span style=color:#aBcDeF>[bar]</span>baz" queryCommandValue("stylewithcss") after -PASS [["stylewithcss","true"],["defaultparagraphseparator","p"],["insertparagraph",""]] "<p>foo<span style=color:#aBcDeF>[bar]</span>baz" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["stylewithcss","true"],["defaultparagraphseparator","p"],["insertparagraph",""]] "<p>foo<span style=color:#aBcDeF>[bar]</span>baz" queryCommandState("defaultparagraphseparator") before -PASS [["stylewithcss","true"],["defaultparagraphseparator","p"],["insertparagraph",""]] "<p>foo<span style=color:#aBcDeF>[bar]</span>baz" queryCommandValue("defaultparagraphseparator") before -PASS [["stylewithcss","true"],["defaultparagraphseparator","p"],["insertparagraph",""]] "<p>foo<span style=color:#aBcDeF>[bar]</span>baz" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["stylewithcss","true"],["defaultparagraphseparator","p"],["insertparagraph",""]] "<p>foo<span style=color:#aBcDeF>[bar]</span>baz" queryCommandState("defaultparagraphseparator") after -PASS [["stylewithcss","true"],["defaultparagraphseparator","p"],["insertparagraph",""]] "<p>foo<span style=color:#aBcDeF>[bar]</span>baz" queryCommandValue("defaultparagraphseparator") after -PASS [["stylewithcss","true"],["defaultparagraphseparator","p"],["insertparagraph",""]] "<p>foo<span style=color:#aBcDeF>[bar]</span>baz" queryCommandIndeterm("insertparagraph") before -PASS [["stylewithcss","true"],["defaultparagraphseparator","p"],["insertparagraph",""]] "<p>foo<span style=color:#aBcDeF>[bar]</span>baz" queryCommandState("insertparagraph") before -PASS [["stylewithcss","true"],["defaultparagraphseparator","p"],["insertparagraph",""]] "<p>foo<span style=color:#aBcDeF>[bar]</span>baz" queryCommandValue("insertparagraph") before -PASS [["stylewithcss","true"],["defaultparagraphseparator","p"],["insertparagraph",""]] "<p>foo<span style=color:#aBcDeF>[bar]</span>baz" queryCommandIndeterm("insertparagraph") after -PASS [["stylewithcss","true"],["defaultparagraphseparator","p"],["insertparagraph",""]] "<p>foo<span style=color:#aBcDeF>[bar]</span>baz" queryCommandState("insertparagraph") after -PASS [["stylewithcss","true"],["defaultparagraphseparator","p"],["insertparagraph",""]] "<p>foo<span style=color:#aBcDeF>[bar]</span>baz" queryCommandValue("insertparagraph") after -PASS [["stylewithcss","false"],["defaultparagraphseparator","p"],["insertparagraph",""]] "<p>foo<span style=color:#aBcDeF>[bar]</span>baz": execCommand("stylewithcss", false, "false") return value -PASS [["stylewithcss","false"],["defaultparagraphseparator","p"],["insertparagraph",""]] "<p>foo<span style=color:#aBcDeF>[bar]</span>baz": execCommand("defaultparagraphseparator", false, "p") return value -PASS [["stylewithcss","false"],["defaultparagraphseparator","p"],["insertparagraph",""]] "<p>foo<span style=color:#aBcDeF>[bar]</span>baz": execCommand("insertparagraph", false, "") return value -PASS [["stylewithcss","false"],["defaultparagraphseparator","p"],["insertparagraph",""]] "<p>foo<span style=color:#aBcDeF>[bar]</span>baz" checks for modifications to non-editable content -PASS [["stylewithcss","false"],["defaultparagraphseparator","p"],["insertparagraph",""]] "<p>foo<span style=color:#aBcDeF>[bar]</span>baz" compare innerHTML -PASS [["stylewithcss","false"],["defaultparagraphseparator","p"],["insertparagraph",""]] "<p>foo<span style=color:#aBcDeF>[bar]</span>baz" queryCommandIndeterm("stylewithcss") before -PASS [["stylewithcss","false"],["defaultparagraphseparator","p"],["insertparagraph",""]] "<p>foo<span style=color:#aBcDeF>[bar]</span>baz" queryCommandState("stylewithcss") before -PASS [["stylewithcss","false"],["defaultparagraphseparator","p"],["insertparagraph",""]] "<p>foo<span style=color:#aBcDeF>[bar]</span>baz" queryCommandValue("stylewithcss") before -PASS [["stylewithcss","false"],["defaultparagraphseparator","p"],["insertparagraph",""]] "<p>foo<span style=color:#aBcDeF>[bar]</span>baz" queryCommandIndeterm("stylewithcss") after -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/editing/run/outdent_2001-last-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/editing/run/outdent_2001-last-expected.txt deleted file mode 100644 index bc71d64..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/editing/run/outdent_2001-last-expected.txt +++ /dev/null
@@ -1,554 +0,0 @@ -This is a testharness.js-based test. -Found 550 tests; 513 PASS, 37 FAIL, 0 TIMEOUT, 0 NOTRUN. -PASS [["outdent",""]] "<blockquote>foo<ol><li>[bar]</ol>baz</blockquote><p>extra" queryCommandIndeterm("outdent") after -PASS [["outdent",""]] "<blockquote>foo<ol><li>[bar]</ol>baz</blockquote><p>extra" queryCommandState("outdent") after -PASS [["outdent",""]] "<blockquote>foo<ol><li>[bar]</ol>baz</blockquote><p>extra" queryCommandValue("outdent") after -PASS [["outdent",""]] "<blockquote><ol><li>foo</li><ol><li>[bar]</ol><li>baz</ol></blockquote><p>extra": execCommand("outdent", false, "") return value -PASS [["outdent",""]] "<blockquote><ol><li>foo</li><ol><li>[bar]</ol><li>baz</ol></blockquote><p>extra" checks for modifications to non-editable content -FAIL [["outdent",""]] "<blockquote><ol><li>foo</li><ol><li>[bar]</ol><li>baz</ol></blockquote><p>extra" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<blockquote><ol><li>foo</li><li>bar</li><li>baz</li></ol></blockquote><p>extra</p>" but got "<blockquote><ol><li>foo</li><li>bar<br></li><li>baz</li></ol></blockquote><p>extra</p>" -PASS [["outdent",""]] "<blockquote><ol><li>foo</li><ol><li>[bar]</ol><li>baz</ol></blockquote><p>extra" queryCommandIndeterm("outdent") before -PASS [["outdent",""]] "<blockquote><ol><li>foo</li><ol><li>[bar]</ol><li>baz</ol></blockquote><p>extra" queryCommandState("outdent") before -PASS [["outdent",""]] "<blockquote><ol><li>foo</li><ol><li>[bar]</ol><li>baz</ol></blockquote><p>extra" queryCommandValue("outdent") before -PASS [["outdent",""]] "<blockquote><ol><li>foo</li><ol><li>[bar]</ol><li>baz</ol></blockquote><p>extra" queryCommandIndeterm("outdent") after -PASS [["outdent",""]] "<blockquote><ol><li>foo</li><ol><li>[bar]</ol><li>baz</ol></blockquote><p>extra" queryCommandState("outdent") after -PASS [["outdent",""]] "<blockquote><ol><li>foo</li><ol><li>[bar]</ol><li>baz</ol></blockquote><p>extra" queryCommandValue("outdent") after -PASS [["outdent",""]] "<ol><li><h1>[foo]</h1></ol>": execCommand("outdent", false, "") return value -PASS [["outdent",""]] "<ol><li><h1>[foo]</h1></ol>" checks for modifications to non-editable content -FAIL [["outdent",""]] "<ol><li><h1>[foo]</h1></ol>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<h1>foo</h1>" but got "foo<br>" -PASS [["outdent",""]] "<ol><li><h1>[foo]</h1></ol>" queryCommandIndeterm("outdent") before -PASS [["outdent",""]] "<ol><li><h1>[foo]</h1></ol>" queryCommandState("outdent") before -PASS [["outdent",""]] "<ol><li><h1>[foo]</h1></ol>" queryCommandValue("outdent") before -PASS [["outdent",""]] "<ol><li><h1>[foo]</h1></ol>" queryCommandIndeterm("outdent") after -PASS [["outdent",""]] "<ol><li><h1>[foo]</h1></ol>" queryCommandState("outdent") after -PASS [["outdent",""]] "<ol><li><h1>[foo]</h1></ol>" queryCommandValue("outdent") after -PASS [["outdent",""]] "<ol><li><xmp>[foo]</xmp></li></ol>": execCommand("outdent", false, "") return value -PASS [["outdent",""]] "<ol><li><xmp>[foo]</xmp></li></ol>" checks for modifications to non-editable content -FAIL [["outdent",""]] "<ol><li><xmp>[foo]</xmp></li></ol>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<xmp>foo</xmp>" but got "foo<br>" -PASS [["outdent",""]] "<ol><li><xmp>[foo]</xmp></li></ol>" queryCommandIndeterm("outdent") before -PASS [["outdent",""]] "<ol><li><xmp>[foo]</xmp></li></ol>" queryCommandState("outdent") before -PASS [["outdent",""]] "<ol><li><xmp>[foo]</xmp></li></ol>" queryCommandValue("outdent") before -PASS [["outdent",""]] "<ol><li><xmp>[foo]</xmp></li></ol>" queryCommandIndeterm("outdent") after -PASS [["outdent",""]] "<ol><li><xmp>[foo]</xmp></li></ol>" queryCommandState("outdent") after -PASS [["outdent",""]] "<ol><li><xmp>[foo]</xmp></li></ol>" queryCommandValue("outdent") after -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<blockquote><ol><li>foo<div><ol><li>[bar]</ol></div><li>baz</ol></blockquote>": execCommand("defaultparagraphseparator", false, "div") return value -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<blockquote><ol><li>foo<div><ol><li>[bar]</ol></div><li>baz</ol></blockquote>": execCommand("outdent", false, "") return value -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<blockquote><ol><li>foo<div><ol><li>[bar]</ol></div><li>baz</ol></blockquote>" checks for modifications to non-editable content -FAIL [["defaultparagraphseparator","div"],["outdent",""]] "<blockquote><ol><li>foo<div><ol><li>[bar]</ol></div><li>baz</ol></blockquote>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<blockquote><ol><li>foo</li><li>bar</li><li>baz</li></ol></blockquote>" but got "<blockquote><ol><li>foo<div><li>bar<br></li></div></li><li>baz</li></ol></blockquote>" -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<blockquote><ol><li>foo<div><ol><li>[bar]</ol></div><li>baz</ol></blockquote>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<blockquote><ol><li>foo<div><ol><li>[bar]</ol></div><li>baz</ol></blockquote>" queryCommandState("defaultparagraphseparator") before -FAIL [["defaultparagraphseparator","div"],["outdent",""]] "<blockquote><ol><li>foo<div><ol><li>[bar]</ol></div><li>baz</ol></blockquote>" queryCommandValue("defaultparagraphseparator") before assert_equals: Wrong result returned expected "p" but got "div" -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<blockquote><ol><li>foo<div><ol><li>[bar]</ol></div><li>baz</ol></blockquote>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<blockquote><ol><li>foo<div><ol><li>[bar]</ol></div><li>baz</ol></blockquote>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<blockquote><ol><li>foo<div><ol><li>[bar]</ol></div><li>baz</ol></blockquote>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<blockquote><ol><li>foo<div><ol><li>[bar]</ol></div><li>baz</ol></blockquote>" queryCommandIndeterm("outdent") before -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<blockquote><ol><li>foo<div><ol><li>[bar]</ol></div><li>baz</ol></blockquote>" queryCommandState("outdent") before -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<blockquote><ol><li>foo<div><ol><li>[bar]</ol></div><li>baz</ol></blockquote>" queryCommandValue("outdent") before -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<blockquote><ol><li>foo<div><ol><li>[bar]</ol></div><li>baz</ol></blockquote>" queryCommandIndeterm("outdent") after -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<blockquote><ol><li>foo<div><ol><li>[bar]</ol></div><li>baz</ol></blockquote>" queryCommandState("outdent") after -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<blockquote><ol><li>foo<div><ol><li>[bar]</ol></div><li>baz</ol></blockquote>" queryCommandValue("outdent") after -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<blockquote><ol><li>foo<div><ol><li>[bar]</ol></div><li>baz</ol></blockquote>": execCommand("defaultparagraphseparator", false, "p") return value -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<blockquote><ol><li>foo<div><ol><li>[bar]</ol></div><li>baz</ol></blockquote>": execCommand("outdent", false, "") return value -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<blockquote><ol><li>foo<div><ol><li>[bar]</ol></div><li>baz</ol></blockquote>" checks for modifications to non-editable content -FAIL [["defaultparagraphseparator","p"],["outdent",""]] "<blockquote><ol><li>foo<div><ol><li>[bar]</ol></div><li>baz</ol></blockquote>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<blockquote><ol><li>foo</li><li>bar</li><li>baz</li></ol></blockquote>" but got "<blockquote><ol><li>foo<div><li>bar<br></li></div></li><li>baz</li></ol></blockquote>" -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<blockquote><ol><li>foo<div><ol><li>[bar]</ol></div><li>baz</ol></blockquote>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<blockquote><ol><li>foo<div><ol><li>[bar]</ol></div><li>baz</ol></blockquote>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<blockquote><ol><li>foo<div><ol><li>[bar]</ol></div><li>baz</ol></blockquote>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<blockquote><ol><li>foo<div><ol><li>[bar]</ol></div><li>baz</ol></blockquote>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<blockquote><ol><li>foo<div><ol><li>[bar]</ol></div><li>baz</ol></blockquote>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<blockquote><ol><li>foo<div><ol><li>[bar]</ol></div><li>baz</ol></blockquote>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<blockquote><ol><li>foo<div><ol><li>[bar]</ol></div><li>baz</ol></blockquote>" queryCommandIndeterm("outdent") before -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<blockquote><ol><li>foo<div><ol><li>[bar]</ol></div><li>baz</ol></blockquote>" queryCommandState("outdent") before -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<blockquote><ol><li>foo<div><ol><li>[bar]</ol></div><li>baz</ol></blockquote>" queryCommandValue("outdent") before -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<blockquote><ol><li>foo<div><ol><li>[bar]</ol></div><li>baz</ol></blockquote>" queryCommandIndeterm("outdent") after -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<blockquote><ol><li>foo<div><ol><li>[bar]</ol></div><li>baz</ol></blockquote>" queryCommandState("outdent") after -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<blockquote><ol><li>foo<div><ol><li>[bar]</ol></div><li>baz</ol></blockquote>" queryCommandValue("outdent") after -PASS [["outdent",""]] "<blockquote> <p>[foo]</p></blockquote>": execCommand("outdent", false, "") return value -PASS [["outdent",""]] "<blockquote> <p>[foo]</p></blockquote>" checks for modifications to non-editable content -PASS [["outdent",""]] "<blockquote> <p>[foo]</p></blockquote>" compare innerHTML -PASS [["outdent",""]] "<blockquote> <p>[foo]</p></blockquote>" queryCommandIndeterm("outdent") before -PASS [["outdent",""]] "<blockquote> <p>[foo]</p></blockquote>" queryCommandState("outdent") before -PASS [["outdent",""]] "<blockquote> <p>[foo]</p></blockquote>" queryCommandValue("outdent") before -PASS [["outdent",""]] "<blockquote> <p>[foo]</p></blockquote>" queryCommandIndeterm("outdent") after -PASS [["outdent",""]] "<blockquote> <p>[foo]</p></blockquote>" queryCommandState("outdent") after -PASS [["outdent",""]] "<blockquote> <p>[foo]</p></blockquote>" queryCommandValue("outdent") after -PASS [["outdent",""]] "<blockquote><p>[foo]</p> </blockquote>": execCommand("outdent", false, "") return value -PASS [["outdent",""]] "<blockquote><p>[foo]</p> </blockquote>" checks for modifications to non-editable content -PASS [["outdent",""]] "<blockquote><p>[foo]</p> </blockquote>" compare innerHTML -PASS [["outdent",""]] "<blockquote><p>[foo]</p> </blockquote>" queryCommandIndeterm("outdent") before -PASS [["outdent",""]] "<blockquote><p>[foo]</p> </blockquote>" queryCommandState("outdent") before -PASS [["outdent",""]] "<blockquote><p>[foo]</p> </blockquote>" queryCommandValue("outdent") before -PASS [["outdent",""]] "<blockquote><p>[foo]</p> </blockquote>" queryCommandIndeterm("outdent") after -PASS [["outdent",""]] "<blockquote><p>[foo]</p> </blockquote>" queryCommandState("outdent") after -PASS [["outdent",""]] "<blockquote><p>[foo]</p> </blockquote>" queryCommandValue("outdent") after -PASS [["outdent",""]] "<blockquote> <p>[foo]</p> </blockquote>": execCommand("outdent", false, "") return value -PASS [["outdent",""]] "<blockquote> <p>[foo]</p> </blockquote>" checks for modifications to non-editable content -PASS [["outdent",""]] "<blockquote> <p>[foo]</p> </blockquote>" compare innerHTML -PASS [["outdent",""]] "<blockquote> <p>[foo]</p> </blockquote>" queryCommandIndeterm("outdent") before -PASS [["outdent",""]] "<blockquote> <p>[foo]</p> </blockquote>" queryCommandState("outdent") before -PASS [["outdent",""]] "<blockquote> <p>[foo]</p> </blockquote>" queryCommandValue("outdent") before -PASS [["outdent",""]] "<blockquote> <p>[foo]</p> </blockquote>" queryCommandIndeterm("outdent") after -PASS [["outdent",""]] "<blockquote> <p>[foo]</p> </blockquote>" queryCommandState("outdent") after -PASS [["outdent",""]] "<blockquote> <p>[foo]</p> </blockquote>" queryCommandValue("outdent") after -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ol> <li>[foo]</li></ol>": execCommand("defaultparagraphseparator", false, "div") return value -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ol> <li>[foo]</li></ol>": execCommand("outdent", false, "") return value -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ol> <li>[foo]</li></ol>" checks for modifications to non-editable content -FAIL [["defaultparagraphseparator","div"],["outdent",""]] "<ol> <li>[foo]</li></ol>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected " <div>foo</div>" but got "foo<br>" -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ol> <li>[foo]</li></ol>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ol> <li>[foo]</li></ol>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ol> <li>[foo]</li></ol>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ol> <li>[foo]</li></ol>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ol> <li>[foo]</li></ol>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ol> <li>[foo]</li></ol>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ol> <li>[foo]</li></ol>" queryCommandIndeterm("outdent") before -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ol> <li>[foo]</li></ol>" queryCommandState("outdent") before -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ol> <li>[foo]</li></ol>" queryCommandValue("outdent") before -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ol> <li>[foo]</li></ol>" queryCommandIndeterm("outdent") after -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ol> <li>[foo]</li></ol>" queryCommandState("outdent") after -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ol> <li>[foo]</li></ol>" queryCommandValue("outdent") after -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ol> <li>[foo]</li></ol>": execCommand("defaultparagraphseparator", false, "p") return value -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ol> <li>[foo]</li></ol>": execCommand("outdent", false, "") return value -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ol> <li>[foo]</li></ol>" checks for modifications to non-editable content -FAIL [["defaultparagraphseparator","p"],["outdent",""]] "<ol> <li>[foo]</li></ol>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected " <p>foo</p>" but got "foo<br>" -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ol> <li>[foo]</li></ol>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ol> <li>[foo]</li></ol>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ol> <li>[foo]</li></ol>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ol> <li>[foo]</li></ol>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ol> <li>[foo]</li></ol>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ol> <li>[foo]</li></ol>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ol> <li>[foo]</li></ol>" queryCommandIndeterm("outdent") before -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ol> <li>[foo]</li></ol>" queryCommandState("outdent") before -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ol> <li>[foo]</li></ol>" queryCommandValue("outdent") before -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ol> <li>[foo]</li></ol>" queryCommandIndeterm("outdent") after -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ol> <li>[foo]</li></ol>" queryCommandState("outdent") after -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ol> <li>[foo]</li></ol>" queryCommandValue("outdent") after -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ol><li>[foo]</li> </ol>": execCommand("defaultparagraphseparator", false, "div") return value -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ol><li>[foo]</li> </ol>": execCommand("outdent", false, "") return value -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ol><li>[foo]</li> </ol>" checks for modifications to non-editable content -FAIL [["defaultparagraphseparator","div"],["outdent",""]] "<ol><li>[foo]</li> </ol>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<div>foo</div> " but got "foo<br>" -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ol><li>[foo]</li> </ol>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ol><li>[foo]</li> </ol>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ol><li>[foo]</li> </ol>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ol><li>[foo]</li> </ol>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ol><li>[foo]</li> </ol>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ol><li>[foo]</li> </ol>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ol><li>[foo]</li> </ol>" queryCommandIndeterm("outdent") before -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ol><li>[foo]</li> </ol>" queryCommandState("outdent") before -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ol><li>[foo]</li> </ol>" queryCommandValue("outdent") before -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ol><li>[foo]</li> </ol>" queryCommandIndeterm("outdent") after -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ol><li>[foo]</li> </ol>" queryCommandState("outdent") after -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ol><li>[foo]</li> </ol>" queryCommandValue("outdent") after -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ol><li>[foo]</li> </ol>": execCommand("defaultparagraphseparator", false, "p") return value -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ol><li>[foo]</li> </ol>": execCommand("outdent", false, "") return value -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ol><li>[foo]</li> </ol>" checks for modifications to non-editable content -FAIL [["defaultparagraphseparator","p"],["outdent",""]] "<ol><li>[foo]</li> </ol>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<p>foo</p> " but got "foo<br>" -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ol><li>[foo]</li> </ol>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ol><li>[foo]</li> </ol>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ol><li>[foo]</li> </ol>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ol><li>[foo]</li> </ol>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ol><li>[foo]</li> </ol>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ol><li>[foo]</li> </ol>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ol><li>[foo]</li> </ol>" queryCommandIndeterm("outdent") before -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ol><li>[foo]</li> </ol>" queryCommandState("outdent") before -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ol><li>[foo]</li> </ol>" queryCommandValue("outdent") before -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ol><li>[foo]</li> </ol>" queryCommandIndeterm("outdent") after -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ol><li>[foo]</li> </ol>" queryCommandState("outdent") after -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ol><li>[foo]</li> </ol>" queryCommandValue("outdent") after -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ol> <li>[foo]</li> </ol>": execCommand("defaultparagraphseparator", false, "div") return value -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ol> <li>[foo]</li> </ol>": execCommand("outdent", false, "") return value -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ol> <li>[foo]</li> </ol>" checks for modifications to non-editable content -FAIL [["defaultparagraphseparator","div"],["outdent",""]] "<ol> <li>[foo]</li> </ol>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected " <div>foo</div> " but got "foo<br><ol> </ol>" -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ol> <li>[foo]</li> </ol>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ol> <li>[foo]</li> </ol>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ol> <li>[foo]</li> </ol>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ol> <li>[foo]</li> </ol>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ol> <li>[foo]</li> </ol>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ol> <li>[foo]</li> </ol>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ol> <li>[foo]</li> </ol>" queryCommandIndeterm("outdent") before -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ol> <li>[foo]</li> </ol>" queryCommandState("outdent") before -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ol> <li>[foo]</li> </ol>" queryCommandValue("outdent") before -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ol> <li>[foo]</li> </ol>" queryCommandIndeterm("outdent") after -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ol> <li>[foo]</li> </ol>" queryCommandState("outdent") after -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ol> <li>[foo]</li> </ol>" queryCommandValue("outdent") after -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ol> <li>[foo]</li> </ol>": execCommand("defaultparagraphseparator", false, "p") return value -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ol> <li>[foo]</li> </ol>": execCommand("outdent", false, "") return value -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ol> <li>[foo]</li> </ol>" checks for modifications to non-editable content -FAIL [["defaultparagraphseparator","p"],["outdent",""]] "<ol> <li>[foo]</li> </ol>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected " <p>foo</p> " but got "foo<br><ol> </ol>" -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ol> <li>[foo]</li> </ol>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ol> <li>[foo]</li> </ol>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ol> <li>[foo]</li> </ol>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ol> <li>[foo]</li> </ol>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ol> <li>[foo]</li> </ol>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ol> <li>[foo]</li> </ol>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ol> <li>[foo]</li> </ol>" queryCommandIndeterm("outdent") before -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ol> <li>[foo]</li> </ol>" queryCommandState("outdent") before -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ol> <li>[foo]</li> </ol>" queryCommandValue("outdent") before -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ol> <li>[foo]</li> </ol>" queryCommandIndeterm("outdent") after -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ol> <li>[foo]</li> </ol>" queryCommandState("outdent") after -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ol> <li>[foo]</li> </ol>" queryCommandValue("outdent") after -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ul> <li>[foo]</li></ul>": execCommand("defaultparagraphseparator", false, "div") return value -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ul> <li>[foo]</li></ul>": execCommand("outdent", false, "") return value -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ul> <li>[foo]</li></ul>" checks for modifications to non-editable content -FAIL [["defaultparagraphseparator","div"],["outdent",""]] "<ul> <li>[foo]</li></ul>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected " <div>foo</div>" but got "foo<br>" -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ul> <li>[foo]</li></ul>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ul> <li>[foo]</li></ul>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ul> <li>[foo]</li></ul>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ul> <li>[foo]</li></ul>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ul> <li>[foo]</li></ul>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ul> <li>[foo]</li></ul>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ul> <li>[foo]</li></ul>" queryCommandIndeterm("outdent") before -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ul> <li>[foo]</li></ul>" queryCommandState("outdent") before -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ul> <li>[foo]</li></ul>" queryCommandValue("outdent") before -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ul> <li>[foo]</li></ul>" queryCommandIndeterm("outdent") after -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ul> <li>[foo]</li></ul>" queryCommandState("outdent") after -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ul> <li>[foo]</li></ul>" queryCommandValue("outdent") after -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ul> <li>[foo]</li></ul>": execCommand("defaultparagraphseparator", false, "p") return value -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ul> <li>[foo]</li></ul>": execCommand("outdent", false, "") return value -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ul> <li>[foo]</li></ul>" checks for modifications to non-editable content -FAIL [["defaultparagraphseparator","p"],["outdent",""]] "<ul> <li>[foo]</li></ul>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected " <p>foo</p>" but got "foo<br>" -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ul> <li>[foo]</li></ul>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ul> <li>[foo]</li></ul>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ul> <li>[foo]</li></ul>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ul> <li>[foo]</li></ul>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ul> <li>[foo]</li></ul>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ul> <li>[foo]</li></ul>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ul> <li>[foo]</li></ul>" queryCommandIndeterm("outdent") before -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ul> <li>[foo]</li></ul>" queryCommandState("outdent") before -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ul> <li>[foo]</li></ul>" queryCommandValue("outdent") before -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ul> <li>[foo]</li></ul>" queryCommandIndeterm("outdent") after -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ul> <li>[foo]</li></ul>" queryCommandState("outdent") after -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ul> <li>[foo]</li></ul>" queryCommandValue("outdent") after -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ul><li>[foo]</li> </ul>": execCommand("defaultparagraphseparator", false, "div") return value -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ul><li>[foo]</li> </ul>": execCommand("outdent", false, "") return value -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ul><li>[foo]</li> </ul>" checks for modifications to non-editable content -FAIL [["defaultparagraphseparator","div"],["outdent",""]] "<ul><li>[foo]</li> </ul>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<div>foo</div> " but got "foo<br>" -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ul><li>[foo]</li> </ul>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ul><li>[foo]</li> </ul>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ul><li>[foo]</li> </ul>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ul><li>[foo]</li> </ul>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ul><li>[foo]</li> </ul>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ul><li>[foo]</li> </ul>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ul><li>[foo]</li> </ul>" queryCommandIndeterm("outdent") before -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ul><li>[foo]</li> </ul>" queryCommandState("outdent") before -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ul><li>[foo]</li> </ul>" queryCommandValue("outdent") before -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ul><li>[foo]</li> </ul>" queryCommandIndeterm("outdent") after -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ul><li>[foo]</li> </ul>" queryCommandState("outdent") after -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ul><li>[foo]</li> </ul>" queryCommandValue("outdent") after -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ul><li>[foo]</li> </ul>": execCommand("defaultparagraphseparator", false, "p") return value -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ul><li>[foo]</li> </ul>": execCommand("outdent", false, "") return value -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ul><li>[foo]</li> </ul>" checks for modifications to non-editable content -FAIL [["defaultparagraphseparator","p"],["outdent",""]] "<ul><li>[foo]</li> </ul>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<p>foo</p> " but got "foo<br>" -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ul><li>[foo]</li> </ul>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ul><li>[foo]</li> </ul>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ul><li>[foo]</li> </ul>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ul><li>[foo]</li> </ul>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ul><li>[foo]</li> </ul>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ul><li>[foo]</li> </ul>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ul><li>[foo]</li> </ul>" queryCommandIndeterm("outdent") before -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ul><li>[foo]</li> </ul>" queryCommandState("outdent") before -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ul><li>[foo]</li> </ul>" queryCommandValue("outdent") before -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ul><li>[foo]</li> </ul>" queryCommandIndeterm("outdent") after -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ul><li>[foo]</li> </ul>" queryCommandState("outdent") after -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ul><li>[foo]</li> </ul>" queryCommandValue("outdent") after -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ul> <li>[foo]</li> </ul>": execCommand("defaultparagraphseparator", false, "div") return value -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ul> <li>[foo]</li> </ul>": execCommand("outdent", false, "") return value -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ul> <li>[foo]</li> </ul>" checks for modifications to non-editable content -FAIL [["defaultparagraphseparator","div"],["outdent",""]] "<ul> <li>[foo]</li> </ul>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected " <div>foo</div> " but got "foo<br><ul> </ul>" -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ul> <li>[foo]</li> </ul>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ul> <li>[foo]</li> </ul>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ul> <li>[foo]</li> </ul>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ul> <li>[foo]</li> </ul>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ul> <li>[foo]</li> </ul>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ul> <li>[foo]</li> </ul>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ul> <li>[foo]</li> </ul>" queryCommandIndeterm("outdent") before -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ul> <li>[foo]</li> </ul>" queryCommandState("outdent") before -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ul> <li>[foo]</li> </ul>" queryCommandValue("outdent") before -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ul> <li>[foo]</li> </ul>" queryCommandIndeterm("outdent") after -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ul> <li>[foo]</li> </ul>" queryCommandState("outdent") after -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ul> <li>[foo]</li> </ul>" queryCommandValue("outdent") after -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ul> <li>[foo]</li> </ul>": execCommand("defaultparagraphseparator", false, "p") return value -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ul> <li>[foo]</li> </ul>": execCommand("outdent", false, "") return value -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ul> <li>[foo]</li> </ul>" checks for modifications to non-editable content -FAIL [["defaultparagraphseparator","p"],["outdent",""]] "<ul> <li>[foo]</li> </ul>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected " <p>foo</p> " but got "foo<br><ul> </ul>" -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ul> <li>[foo]</li> </ul>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ul> <li>[foo]</li> </ul>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ul> <li>[foo]</li> </ul>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ul> <li>[foo]</li> </ul>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ul> <li>[foo]</li> </ul>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ul> <li>[foo]</li> </ul>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ul> <li>[foo]</li> </ul>" queryCommandIndeterm("outdent") before -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ul> <li>[foo]</li> </ul>" queryCommandState("outdent") before -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ul> <li>[foo]</li> </ul>" queryCommandValue("outdent") before -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ul> <li>[foo]</li> </ul>" queryCommandIndeterm("outdent") after -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ul> <li>[foo]</li> </ul>" queryCommandState("outdent") after -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ul> <li>[foo]</li> </ul>" queryCommandValue("outdent") after -PASS [["outdent",""]] "<blockquote> <p>[foo]</p> <p>bar</p> <p>baz</p></blockquote>": execCommand("outdent", false, "") return value -PASS [["outdent",""]] "<blockquote> <p>[foo]</p> <p>bar</p> <p>baz</p></blockquote>" checks for modifications to non-editable content -FAIL [["outdent",""]] "<blockquote> <p>[foo]</p> <p>bar</p> <p>baz</p></blockquote>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected " <p>foo</p><blockquote> <p>bar</p> <p>baz</p></blockquote>" but got "foo<br><blockquote> <p>bar</p> <p>baz</p></blockquote>" -PASS [["outdent",""]] "<blockquote> <p>[foo]</p> <p>bar</p> <p>baz</p></blockquote>" queryCommandIndeterm("outdent") before -PASS [["outdent",""]] "<blockquote> <p>[foo]</p> <p>bar</p> <p>baz</p></blockquote>" queryCommandState("outdent") before -PASS [["outdent",""]] "<blockquote> <p>[foo]</p> <p>bar</p> <p>baz</p></blockquote>" queryCommandValue("outdent") before -PASS [["outdent",""]] "<blockquote> <p>[foo]</p> <p>bar</p> <p>baz</p></blockquote>" queryCommandIndeterm("outdent") after -PASS [["outdent",""]] "<blockquote> <p>[foo]</p> <p>bar</p> <p>baz</p></blockquote>" queryCommandState("outdent") after -PASS [["outdent",""]] "<blockquote> <p>[foo]</p> <p>bar</p> <p>baz</p></blockquote>" queryCommandValue("outdent") after -PASS [["outdent",""]] "<blockquote> <p>foo</p> <p>[bar]</p> <p>baz</p></blockquote>": execCommand("outdent", false, "") return value -PASS [["outdent",""]] "<blockquote> <p>foo</p> <p>[bar]</p> <p>baz</p></blockquote>" checks for modifications to non-editable content -FAIL [["outdent",""]] "<blockquote> <p>foo</p> <p>[bar]</p> <p>baz</p></blockquote>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<blockquote> <p>foo</p> </blockquote><p>bar</p><blockquote> <p>baz</p></blockquote>" but got "<blockquote> <p>foo</p> </blockquote>bar<br><blockquote> <p>baz</p></blockquote>" -PASS [["outdent",""]] "<blockquote> <p>foo</p> <p>[bar]</p> <p>baz</p></blockquote>" queryCommandIndeterm("outdent") before -PASS [["outdent",""]] "<blockquote> <p>foo</p> <p>[bar]</p> <p>baz</p></blockquote>" queryCommandState("outdent") before -PASS [["outdent",""]] "<blockquote> <p>foo</p> <p>[bar]</p> <p>baz</p></blockquote>" queryCommandValue("outdent") before -PASS [["outdent",""]] "<blockquote> <p>foo</p> <p>[bar]</p> <p>baz</p></blockquote>" queryCommandIndeterm("outdent") after -PASS [["outdent",""]] "<blockquote> <p>foo</p> <p>[bar]</p> <p>baz</p></blockquote>" queryCommandState("outdent") after -PASS [["outdent",""]] "<blockquote> <p>foo</p> <p>[bar]</p> <p>baz</p></blockquote>" queryCommandValue("outdent") after -PASS [["outdent",""]] "<blockquote> <p>foo</p> <p>bar</p> <p>[baz]</p></blockquote>": execCommand("outdent", false, "") return value -PASS [["outdent",""]] "<blockquote> <p>foo</p> <p>bar</p> <p>[baz]</p></blockquote>" checks for modifications to non-editable content -FAIL [["outdent",""]] "<blockquote> <p>foo</p> <p>bar</p> <p>[baz]</p></blockquote>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<blockquote> <p>foo</p> <p>bar</p> </blockquote><p>baz</p>" but got "<blockquote> <p>foo</p> <p>bar</p> </blockquote>baz<br>" -PASS [["outdent",""]] "<blockquote> <p>foo</p> <p>bar</p> <p>[baz]</p></blockquote>" queryCommandIndeterm("outdent") before -PASS [["outdent",""]] "<blockquote> <p>foo</p> <p>bar</p> <p>[baz]</p></blockquote>" queryCommandState("outdent") before -PASS [["outdent",""]] "<blockquote> <p>foo</p> <p>bar</p> <p>[baz]</p></blockquote>" queryCommandValue("outdent") before -PASS [["outdent",""]] "<blockquote> <p>foo</p> <p>bar</p> <p>[baz]</p></blockquote>" queryCommandIndeterm("outdent") after -PASS [["outdent",""]] "<blockquote> <p>foo</p> <p>bar</p> <p>[baz]</p></blockquote>" queryCommandState("outdent") after -PASS [["outdent",""]] "<blockquote> <p>foo</p> <p>bar</p> <p>[baz]</p></blockquote>" queryCommandValue("outdent") after -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ol> <li>[foo]</li> <li>bar</li> <li>baz</li></ol>": execCommand("defaultparagraphseparator", false, "div") return value -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ol> <li>[foo]</li> <li>bar</li> <li>baz</li></ol>": execCommand("outdent", false, "") return value -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ol> <li>[foo]</li> <li>bar</li> <li>baz</li></ol>" checks for modifications to non-editable content -FAIL [["defaultparagraphseparator","div"],["outdent",""]] "<ol> <li>[foo]</li> <li>bar</li> <li>baz</li></ol>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected " <div>foo</div> <ol><li>bar</li> <li>baz</li></ol>" but got "foo<br><ol> <li>bar</li> <li>baz</li></ol>" -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ol> <li>[foo]</li> <li>bar</li> <li>baz</li></ol>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ol> <li>[foo]</li> <li>bar</li> <li>baz</li></ol>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ol> <li>[foo]</li> <li>bar</li> <li>baz</li></ol>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ol> <li>[foo]</li> <li>bar</li> <li>baz</li></ol>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ol> <li>[foo]</li> <li>bar</li> <li>baz</li></ol>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ol> <li>[foo]</li> <li>bar</li> <li>baz</li></ol>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ol> <li>[foo]</li> <li>bar</li> <li>baz</li></ol>" queryCommandIndeterm("outdent") before -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ol> <li>[foo]</li> <li>bar</li> <li>baz</li></ol>" queryCommandState("outdent") before -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ol> <li>[foo]</li> <li>bar</li> <li>baz</li></ol>" queryCommandValue("outdent") before -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ol> <li>[foo]</li> <li>bar</li> <li>baz</li></ol>" queryCommandIndeterm("outdent") after -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ol> <li>[foo]</li> <li>bar</li> <li>baz</li></ol>" queryCommandState("outdent") after -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ol> <li>[foo]</li> <li>bar</li> <li>baz</li></ol>" queryCommandValue("outdent") after -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ol> <li>[foo]</li> <li>bar</li> <li>baz</li></ol>": execCommand("defaultparagraphseparator", false, "p") return value -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ol> <li>[foo]</li> <li>bar</li> <li>baz</li></ol>": execCommand("outdent", false, "") return value -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ol> <li>[foo]</li> <li>bar</li> <li>baz</li></ol>" checks for modifications to non-editable content -FAIL [["defaultparagraphseparator","p"],["outdent",""]] "<ol> <li>[foo]</li> <li>bar</li> <li>baz</li></ol>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected " <p>foo</p> <ol><li>bar</li> <li>baz</li></ol>" but got "foo<br><ol> <li>bar</li> <li>baz</li></ol>" -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ol> <li>[foo]</li> <li>bar</li> <li>baz</li></ol>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ol> <li>[foo]</li> <li>bar</li> <li>baz</li></ol>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ol> <li>[foo]</li> <li>bar</li> <li>baz</li></ol>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ol> <li>[foo]</li> <li>bar</li> <li>baz</li></ol>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ol> <li>[foo]</li> <li>bar</li> <li>baz</li></ol>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ol> <li>[foo]</li> <li>bar</li> <li>baz</li></ol>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ol> <li>[foo]</li> <li>bar</li> <li>baz</li></ol>" queryCommandIndeterm("outdent") before -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ol> <li>[foo]</li> <li>bar</li> <li>baz</li></ol>" queryCommandState("outdent") before -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ol> <li>[foo]</li> <li>bar</li> <li>baz</li></ol>" queryCommandValue("outdent") before -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ol> <li>[foo]</li> <li>bar</li> <li>baz</li></ol>" queryCommandIndeterm("outdent") after -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ol> <li>[foo]</li> <li>bar</li> <li>baz</li></ol>" queryCommandState("outdent") after -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ol> <li>[foo]</li> <li>bar</li> <li>baz</li></ol>" queryCommandValue("outdent") after -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ol> <li>foo</li> <li>[bar]</li> <li>baz</li></ol>": execCommand("defaultparagraphseparator", false, "div") return value -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ol> <li>foo</li> <li>[bar]</li> <li>baz</li></ol>": execCommand("outdent", false, "") return value -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ol> <li>foo</li> <li>[bar]</li> <li>baz</li></ol>" checks for modifications to non-editable content -FAIL [["defaultparagraphseparator","div"],["outdent",""]] "<ol> <li>foo</li> <li>[bar]</li> <li>baz</li></ol>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<ol> <li>foo</li></ol> <div>bar</div> <ol><li>baz</li></ol>" but got "<ol> <li>foo</li> </ol>bar<br><ol> <li>baz</li></ol>" -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ol> <li>foo</li> <li>[bar]</li> <li>baz</li></ol>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ol> <li>foo</li> <li>[bar]</li> <li>baz</li></ol>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ol> <li>foo</li> <li>[bar]</li> <li>baz</li></ol>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ol> <li>foo</li> <li>[bar]</li> <li>baz</li></ol>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ol> <li>foo</li> <li>[bar]</li> <li>baz</li></ol>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ol> <li>foo</li> <li>[bar]</li> <li>baz</li></ol>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ol> <li>foo</li> <li>[bar]</li> <li>baz</li></ol>" queryCommandIndeterm("outdent") before -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ol> <li>foo</li> <li>[bar]</li> <li>baz</li></ol>" queryCommandState("outdent") before -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ol> <li>foo</li> <li>[bar]</li> <li>baz</li></ol>" queryCommandValue("outdent") before -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ol> <li>foo</li> <li>[bar]</li> <li>baz</li></ol>" queryCommandIndeterm("outdent") after -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ol> <li>foo</li> <li>[bar]</li> <li>baz</li></ol>" queryCommandState("outdent") after -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ol> <li>foo</li> <li>[bar]</li> <li>baz</li></ol>" queryCommandValue("outdent") after -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ol> <li>foo</li> <li>[bar]</li> <li>baz</li></ol>": execCommand("defaultparagraphseparator", false, "p") return value -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ol> <li>foo</li> <li>[bar]</li> <li>baz</li></ol>": execCommand("outdent", false, "") return value -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ol> <li>foo</li> <li>[bar]</li> <li>baz</li></ol>" checks for modifications to non-editable content -FAIL [["defaultparagraphseparator","p"],["outdent",""]] "<ol> <li>foo</li> <li>[bar]</li> <li>baz</li></ol>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<ol> <li>foo</li></ol> <p>bar</p> <ol><li>baz</li></ol>" but got "<ol> <li>foo</li> </ol>bar<br><ol> <li>baz</li></ol>" -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ol> <li>foo</li> <li>[bar]</li> <li>baz</li></ol>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ol> <li>foo</li> <li>[bar]</li> <li>baz</li></ol>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ol> <li>foo</li> <li>[bar]</li> <li>baz</li></ol>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ol> <li>foo</li> <li>[bar]</li> <li>baz</li></ol>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ol> <li>foo</li> <li>[bar]</li> <li>baz</li></ol>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ol> <li>foo</li> <li>[bar]</li> <li>baz</li></ol>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ol> <li>foo</li> <li>[bar]</li> <li>baz</li></ol>" queryCommandIndeterm("outdent") before -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ol> <li>foo</li> <li>[bar]</li> <li>baz</li></ol>" queryCommandState("outdent") before -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ol> <li>foo</li> <li>[bar]</li> <li>baz</li></ol>" queryCommandValue("outdent") before -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ol> <li>foo</li> <li>[bar]</li> <li>baz</li></ol>" queryCommandIndeterm("outdent") after -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ol> <li>foo</li> <li>[bar]</li> <li>baz</li></ol>" queryCommandState("outdent") after -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ol> <li>foo</li> <li>[bar]</li> <li>baz</li></ol>" queryCommandValue("outdent") after -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ol> <li>foo</li> <li>bar</li> <li>[baz]</li></ol>": execCommand("defaultparagraphseparator", false, "div") return value -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ol> <li>foo</li> <li>bar</li> <li>[baz]</li></ol>": execCommand("outdent", false, "") return value -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ol> <li>foo</li> <li>bar</li> <li>[baz]</li></ol>" checks for modifications to non-editable content -FAIL [["defaultparagraphseparator","div"],["outdent",""]] "<ol> <li>foo</li> <li>bar</li> <li>[baz]</li></ol>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<ol> <li>foo</li> <li>bar</li></ol> <div>baz</div>" but got "<ol> <li>foo</li> <li>bar</li> </ol>baz<br>" -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ol> <li>foo</li> <li>bar</li> <li>[baz]</li></ol>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ol> <li>foo</li> <li>bar</li> <li>[baz]</li></ol>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ol> <li>foo</li> <li>bar</li> <li>[baz]</li></ol>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ol> <li>foo</li> <li>bar</li> <li>[baz]</li></ol>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ol> <li>foo</li> <li>bar</li> <li>[baz]</li></ol>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ol> <li>foo</li> <li>bar</li> <li>[baz]</li></ol>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ol> <li>foo</li> <li>bar</li> <li>[baz]</li></ol>" queryCommandIndeterm("outdent") before -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ol> <li>foo</li> <li>bar</li> <li>[baz]</li></ol>" queryCommandState("outdent") before -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ol> <li>foo</li> <li>bar</li> <li>[baz]</li></ol>" queryCommandValue("outdent") before -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ol> <li>foo</li> <li>bar</li> <li>[baz]</li></ol>" queryCommandIndeterm("outdent") after -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ol> <li>foo</li> <li>bar</li> <li>[baz]</li></ol>" queryCommandState("outdent") after -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ol> <li>foo</li> <li>bar</li> <li>[baz]</li></ol>" queryCommandValue("outdent") after -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ol> <li>foo</li> <li>bar</li> <li>[baz]</li></ol>": execCommand("defaultparagraphseparator", false, "p") return value -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ol> <li>foo</li> <li>bar</li> <li>[baz]</li></ol>": execCommand("outdent", false, "") return value -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ol> <li>foo</li> <li>bar</li> <li>[baz]</li></ol>" checks for modifications to non-editable content -FAIL [["defaultparagraphseparator","p"],["outdent",""]] "<ol> <li>foo</li> <li>bar</li> <li>[baz]</li></ol>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<ol> <li>foo</li> <li>bar</li></ol> <p>baz</p>" but got "<ol> <li>foo</li> <li>bar</li> </ol>baz<br>" -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ol> <li>foo</li> <li>bar</li> <li>[baz]</li></ol>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ol> <li>foo</li> <li>bar</li> <li>[baz]</li></ol>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ol> <li>foo</li> <li>bar</li> <li>[baz]</li></ol>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ol> <li>foo</li> <li>bar</li> <li>[baz]</li></ol>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ol> <li>foo</li> <li>bar</li> <li>[baz]</li></ol>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ol> <li>foo</li> <li>bar</li> <li>[baz]</li></ol>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ol> <li>foo</li> <li>bar</li> <li>[baz]</li></ol>" queryCommandIndeterm("outdent") before -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ol> <li>foo</li> <li>bar</li> <li>[baz]</li></ol>" queryCommandState("outdent") before -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ol> <li>foo</li> <li>bar</li> <li>[baz]</li></ol>" queryCommandValue("outdent") before -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ol> <li>foo</li> <li>bar</li> <li>[baz]</li></ol>" queryCommandIndeterm("outdent") after -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ol> <li>foo</li> <li>bar</li> <li>[baz]</li></ol>" queryCommandState("outdent") after -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ol> <li>foo</li> <li>bar</li> <li>[baz]</li></ol>" queryCommandValue("outdent") after -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ul> <li>[foo]</li> <li>bar</li> <li>baz</li></ul>": execCommand("defaultparagraphseparator", false, "div") return value -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ul> <li>[foo]</li> <li>bar</li> <li>baz</li></ul>": execCommand("outdent", false, "") return value -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ul> <li>[foo]</li> <li>bar</li> <li>baz</li></ul>" checks for modifications to non-editable content -FAIL [["defaultparagraphseparator","div"],["outdent",""]] "<ul> <li>[foo]</li> <li>bar</li> <li>baz</li></ul>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected " <div>foo</div> <ul><li>bar</li> <li>baz</li></ul>" but got "foo<br><ul> <li>bar</li> <li>baz</li></ul>" -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ul> <li>[foo]</li> <li>bar</li> <li>baz</li></ul>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ul> <li>[foo]</li> <li>bar</li> <li>baz</li></ul>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ul> <li>[foo]</li> <li>bar</li> <li>baz</li></ul>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ul> <li>[foo]</li> <li>bar</li> <li>baz</li></ul>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ul> <li>[foo]</li> <li>bar</li> <li>baz</li></ul>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ul> <li>[foo]</li> <li>bar</li> <li>baz</li></ul>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ul> <li>[foo]</li> <li>bar</li> <li>baz</li></ul>" queryCommandIndeterm("outdent") before -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ul> <li>[foo]</li> <li>bar</li> <li>baz</li></ul>" queryCommandState("outdent") before -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ul> <li>[foo]</li> <li>bar</li> <li>baz</li></ul>" queryCommandValue("outdent") before -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ul> <li>[foo]</li> <li>bar</li> <li>baz</li></ul>" queryCommandIndeterm("outdent") after -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ul> <li>[foo]</li> <li>bar</li> <li>baz</li></ul>" queryCommandState("outdent") after -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ul> <li>[foo]</li> <li>bar</li> <li>baz</li></ul>" queryCommandValue("outdent") after -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ul> <li>[foo]</li> <li>bar</li> <li>baz</li></ul>": execCommand("defaultparagraphseparator", false, "p") return value -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ul> <li>[foo]</li> <li>bar</li> <li>baz</li></ul>": execCommand("outdent", false, "") return value -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ul> <li>[foo]</li> <li>bar</li> <li>baz</li></ul>" checks for modifications to non-editable content -FAIL [["defaultparagraphseparator","p"],["outdent",""]] "<ul> <li>[foo]</li> <li>bar</li> <li>baz</li></ul>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected " <p>foo</p> <ul><li>bar</li> <li>baz</li></ul>" but got "foo<br><ul> <li>bar</li> <li>baz</li></ul>" -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ul> <li>[foo]</li> <li>bar</li> <li>baz</li></ul>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ul> <li>[foo]</li> <li>bar</li> <li>baz</li></ul>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ul> <li>[foo]</li> <li>bar</li> <li>baz</li></ul>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ul> <li>[foo]</li> <li>bar</li> <li>baz</li></ul>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ul> <li>[foo]</li> <li>bar</li> <li>baz</li></ul>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ul> <li>[foo]</li> <li>bar</li> <li>baz</li></ul>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ul> <li>[foo]</li> <li>bar</li> <li>baz</li></ul>" queryCommandIndeterm("outdent") before -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ul> <li>[foo]</li> <li>bar</li> <li>baz</li></ul>" queryCommandState("outdent") before -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ul> <li>[foo]</li> <li>bar</li> <li>baz</li></ul>" queryCommandValue("outdent") before -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ul> <li>[foo]</li> <li>bar</li> <li>baz</li></ul>" queryCommandIndeterm("outdent") after -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ul> <li>[foo]</li> <li>bar</li> <li>baz</li></ul>" queryCommandState("outdent") after -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ul> <li>[foo]</li> <li>bar</li> <li>baz</li></ul>" queryCommandValue("outdent") after -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ul> <li>foo</li> <li>[bar]</li> <li>baz</li></ul>": execCommand("defaultparagraphseparator", false, "div") return value -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ul> <li>foo</li> <li>[bar]</li> <li>baz</li></ul>": execCommand("outdent", false, "") return value -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ul> <li>foo</li> <li>[bar]</li> <li>baz</li></ul>" checks for modifications to non-editable content -FAIL [["defaultparagraphseparator","div"],["outdent",""]] "<ul> <li>foo</li> <li>[bar]</li> <li>baz</li></ul>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<ul> <li>foo</li></ul> <div>bar</div> <ul><li>baz</li></ul>" but got "<ul> <li>foo</li> </ul>bar<br><ul> <li>baz</li></ul>" -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ul> <li>foo</li> <li>[bar]</li> <li>baz</li></ul>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ul> <li>foo</li> <li>[bar]</li> <li>baz</li></ul>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ul> <li>foo</li> <li>[bar]</li> <li>baz</li></ul>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ul> <li>foo</li> <li>[bar]</li> <li>baz</li></ul>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ul> <li>foo</li> <li>[bar]</li> <li>baz</li></ul>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ul> <li>foo</li> <li>[bar]</li> <li>baz</li></ul>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ul> <li>foo</li> <li>[bar]</li> <li>baz</li></ul>" queryCommandIndeterm("outdent") before -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ul> <li>foo</li> <li>[bar]</li> <li>baz</li></ul>" queryCommandState("outdent") before -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ul> <li>foo</li> <li>[bar]</li> <li>baz</li></ul>" queryCommandValue("outdent") before -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ul> <li>foo</li> <li>[bar]</li> <li>baz</li></ul>" queryCommandIndeterm("outdent") after -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ul> <li>foo</li> <li>[bar]</li> <li>baz</li></ul>" queryCommandState("outdent") after -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ul> <li>foo</li> <li>[bar]</li> <li>baz</li></ul>" queryCommandValue("outdent") after -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ul> <li>foo</li> <li>[bar]</li> <li>baz</li></ul>": execCommand("defaultparagraphseparator", false, "p") return value -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ul> <li>foo</li> <li>[bar]</li> <li>baz</li></ul>": execCommand("outdent", false, "") return value -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ul> <li>foo</li> <li>[bar]</li> <li>baz</li></ul>" checks for modifications to non-editable content -FAIL [["defaultparagraphseparator","p"],["outdent",""]] "<ul> <li>foo</li> <li>[bar]</li> <li>baz</li></ul>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<ul> <li>foo</li></ul> <p>bar</p> <ul><li>baz</li></ul>" but got "<ul> <li>foo</li> </ul>bar<br><ul> <li>baz</li></ul>" -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ul> <li>foo</li> <li>[bar]</li> <li>baz</li></ul>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ul> <li>foo</li> <li>[bar]</li> <li>baz</li></ul>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ul> <li>foo</li> <li>[bar]</li> <li>baz</li></ul>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ul> <li>foo</li> <li>[bar]</li> <li>baz</li></ul>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ul> <li>foo</li> <li>[bar]</li> <li>baz</li></ul>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ul> <li>foo</li> <li>[bar]</li> <li>baz</li></ul>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ul> <li>foo</li> <li>[bar]</li> <li>baz</li></ul>" queryCommandIndeterm("outdent") before -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ul> <li>foo</li> <li>[bar]</li> <li>baz</li></ul>" queryCommandState("outdent") before -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ul> <li>foo</li> <li>[bar]</li> <li>baz</li></ul>" queryCommandValue("outdent") before -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ul> <li>foo</li> <li>[bar]</li> <li>baz</li></ul>" queryCommandIndeterm("outdent") after -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ul> <li>foo</li> <li>[bar]</li> <li>baz</li></ul>" queryCommandState("outdent") after -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ul> <li>foo</li> <li>[bar]</li> <li>baz</li></ul>" queryCommandValue("outdent") after -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ul> <li>foo</li> <li>bar</li> <li>[baz]</li></ul>": execCommand("defaultparagraphseparator", false, "div") return value -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ul> <li>foo</li> <li>bar</li> <li>[baz]</li></ul>": execCommand("outdent", false, "") return value -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ul> <li>foo</li> <li>bar</li> <li>[baz]</li></ul>" checks for modifications to non-editable content -FAIL [["defaultparagraphseparator","div"],["outdent",""]] "<ul> <li>foo</li> <li>bar</li> <li>[baz]</li></ul>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<ul> <li>foo</li> <li>bar</li></ul> <div>baz</div>" but got "<ul> <li>foo</li> <li>bar</li> </ul>baz<br>" -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ul> <li>foo</li> <li>bar</li> <li>[baz]</li></ul>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ul> <li>foo</li> <li>bar</li> <li>[baz]</li></ul>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ul> <li>foo</li> <li>bar</li> <li>[baz]</li></ul>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ul> <li>foo</li> <li>bar</li> <li>[baz]</li></ul>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ul> <li>foo</li> <li>bar</li> <li>[baz]</li></ul>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ul> <li>foo</li> <li>bar</li> <li>[baz]</li></ul>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ul> <li>foo</li> <li>bar</li> <li>[baz]</li></ul>" queryCommandIndeterm("outdent") before -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ul> <li>foo</li> <li>bar</li> <li>[baz]</li></ul>" queryCommandState("outdent") before -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ul> <li>foo</li> <li>bar</li> <li>[baz]</li></ul>" queryCommandValue("outdent") before -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ul> <li>foo</li> <li>bar</li> <li>[baz]</li></ul>" queryCommandIndeterm("outdent") after -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ul> <li>foo</li> <li>bar</li> <li>[baz]</li></ul>" queryCommandState("outdent") after -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ul> <li>foo</li> <li>bar</li> <li>[baz]</li></ul>" queryCommandValue("outdent") after -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ul> <li>foo</li> <li>bar</li> <li>[baz]</li></ul>": execCommand("defaultparagraphseparator", false, "p") return value -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ul> <li>foo</li> <li>bar</li> <li>[baz]</li></ul>": execCommand("outdent", false, "") return value -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ul> <li>foo</li> <li>bar</li> <li>[baz]</li></ul>" checks for modifications to non-editable content -FAIL [["defaultparagraphseparator","p"],["outdent",""]] "<ul> <li>foo</li> <li>bar</li> <li>[baz]</li></ul>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<ul> <li>foo</li> <li>bar</li></ul> <p>baz</p>" but got "<ul> <li>foo</li> <li>bar</li> </ul>baz<br>" -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ul> <li>foo</li> <li>bar</li> <li>[baz]</li></ul>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ul> <li>foo</li> <li>bar</li> <li>[baz]</li></ul>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ul> <li>foo</li> <li>bar</li> <li>[baz]</li></ul>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ul> <li>foo</li> <li>bar</li> <li>[baz]</li></ul>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ul> <li>foo</li> <li>bar</li> <li>[baz]</li></ul>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ul> <li>foo</li> <li>bar</li> <li>[baz]</li></ul>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ul> <li>foo</li> <li>bar</li> <li>[baz]</li></ul>" queryCommandIndeterm("outdent") before -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ul> <li>foo</li> <li>bar</li> <li>[baz]</li></ul>" queryCommandState("outdent") before -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ul> <li>foo</li> <li>bar</li> <li>[baz]</li></ul>" queryCommandValue("outdent") before -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ul> <li>foo</li> <li>bar</li> <li>[baz]</li></ul>" queryCommandIndeterm("outdent") after -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ul> <li>foo</li> <li>bar</li> <li>[baz]</li></ul>" queryCommandState("outdent") after -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ul> <li>foo</li> <li>bar</li> <li>[baz]</li></ul>" queryCommandValue("outdent") after -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ol><li>[]a<table><tr><td><br></table></ol>": execCommand("defaultparagraphseparator", false, "div") return value -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ol><li>[]a<table><tr><td><br></table></ol>": execCommand("outdent", false, "") return value -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ol><li>[]a<table><tr><td><br></table></ol>" checks for modifications to non-editable content -FAIL [["defaultparagraphseparator","div"],["outdent",""]] "<ol><li>[]a<table><tr><td><br></table></ol>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<div>a</div><table><tbody><tr><td><br></td></tr></tbody></table>" but got "<ol><li><table><tbody><tr><td></td></tr></tbody></table></li></ol>a<table><tbody><tr><td><br></td></tr></tbody></table>" -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ol><li>[]a<table><tr><td><br></table></ol>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ol><li>[]a<table><tr><td><br></table></ol>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ol><li>[]a<table><tr><td><br></table></ol>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ol><li>[]a<table><tr><td><br></table></ol>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ol><li>[]a<table><tr><td><br></table></ol>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ol><li>[]a<table><tr><td><br></table></ol>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ol><li>[]a<table><tr><td><br></table></ol>" queryCommandIndeterm("outdent") before -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ol><li>[]a<table><tr><td><br></table></ol>" queryCommandState("outdent") before -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ol><li>[]a<table><tr><td><br></table></ol>" queryCommandValue("outdent") before -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ol><li>[]a<table><tr><td><br></table></ol>" queryCommandIndeterm("outdent") after -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ol><li>[]a<table><tr><td><br></table></ol>" queryCommandState("outdent") after -PASS [["defaultparagraphseparator","div"],["outdent",""]] "<ol><li>[]a<table><tr><td><br></table></ol>" queryCommandValue("outdent") after -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ol><li>[]a<table><tr><td><br></table></ol>": execCommand("defaultparagraphseparator", false, "p") return value -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ol><li>[]a<table><tr><td><br></table></ol>": execCommand("outdent", false, "") return value -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ol><li>[]a<table><tr><td><br></table></ol>" checks for modifications to non-editable content -FAIL [["defaultparagraphseparator","p"],["outdent",""]] "<ol><li>[]a<table><tr><td><br></table></ol>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<p>a</p><table><tbody><tr><td><br></td></tr></tbody></table>" but got "<ol><li><table><tbody><tr><td></td></tr></tbody></table></li></ol>a<table><tbody><tr><td><br></td></tr></tbody></table>" -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ol><li>[]a<table><tr><td><br></table></ol>" queryCommandIndeterm("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ol><li>[]a<table><tr><td><br></table></ol>" queryCommandState("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ol><li>[]a<table><tr><td><br></table></ol>" queryCommandValue("defaultparagraphseparator") before -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ol><li>[]a<table><tr><td><br></table></ol>" queryCommandIndeterm("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ol><li>[]a<table><tr><td><br></table></ol>" queryCommandState("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ol><li>[]a<table><tr><td><br></table></ol>" queryCommandValue("defaultparagraphseparator") after -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ol><li>[]a<table><tr><td><br></table></ol>" queryCommandIndeterm("outdent") before -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ol><li>[]a<table><tr><td><br></table></ol>" queryCommandState("outdent") before -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ol><li>[]a<table><tr><td><br></table></ol>" queryCommandValue("outdent") before -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ol><li>[]a<table><tr><td><br></table></ol>" queryCommandIndeterm("outdent") after -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ol><li>[]a<table><tr><td><br></table></ol>" queryCommandState("outdent") after -PASS [["defaultparagraphseparator","p"],["outdent",""]] "<ol><li>[]a<table><tr><td><br></table></ol>" queryCommandValue("outdent") after -PASS [["outdent",""]] "<blockquote><span>foo<br>[bar]</span></blockquote>": execCommand("outdent", false, "") return value -PASS [["outdent",""]] "<blockquote><span>foo<br>[bar]</span></blockquote>" checks for modifications to non-editable content -FAIL [["outdent",""]] "<blockquote><span>foo<br>[bar]</span></blockquote>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<blockquote>foo</blockquote><span>bar</span>" but got "<blockquote></blockquote>bar<br><blockquote><span>foo<br></span></blockquote>" -PASS [["outdent",""]] "<blockquote><span>foo<br>[bar]</span></blockquote>" queryCommandIndeterm("outdent") before -PASS [["outdent",""]] "<blockquote><span>foo<br>[bar]</span></blockquote>" queryCommandState("outdent") before -PASS [["outdent",""]] "<blockquote><span>foo<br>[bar]</span></blockquote>" queryCommandValue("outdent") before -PASS [["outdent",""]] "<blockquote><span>foo<br>[bar]</span></blockquote>" queryCommandIndeterm("outdent") after -PASS [["outdent",""]] "<blockquote><span>foo<br>[bar]</span></blockquote>" queryCommandState("outdent") after -PASS [["outdent",""]] "<blockquote><span>foo<br>[bar]</span></blockquote>" queryCommandValue("outdent") after -PASS [["outdent",""]] "<ul><ul><li><span style=\"color:rgb(255, 0, 0)\">[]foo</span></li></ul></ul>": execCommand("outdent", false, "") return value -PASS [["outdent",""]] "<ul><ul><li><span style=\"color:rgb(255, 0, 0)\">[]foo</span></li></ul></ul>" checks for modifications to non-editable content -FAIL [["outdent",""]] "<ul><ul><li><span style=\"color:rgb(255, 0, 0)\">[]foo</span></li></ul></ul>" compare innerHTML assert_equals: Unexpected innerHTML (after normalizing inline style) expected "<ul><li><span style=\"color:rgb(255, 0, 0)\">foo</span></li></ul>" but got "<ul><li><span style=\"color:rgb(255, 0, 0)\">foo</span><br></li></ul>" -PASS [["outdent",""]] "<ul><ul><li><span style=\"color:rgb(255, 0, 0)\">[]foo</span></li></ul></ul>" queryCommandIndeterm("outdent") before -PASS [["outdent",""]] "<ul><ul><li><span style=\"color:rgb(255, 0, 0)\">[]foo</span></li></ul></ul>" queryCommandState("outdent") before -PASS [["outdent",""]] "<ul><ul><li><span style=\"color:rgb(255, 0, 0)\">[]foo</span></li></ul></ul>" queryCommandValue("outdent") before -PASS [["outdent",""]] "<ul><ul><li><span style=\"color:rgb(255, 0, 0)\">[]foo</span></li></ul></ul>" queryCommandIndeterm("outdent") after -PASS [["outdent",""]] "<ul><ul><li><span style=\"color:rgb(255, 0, 0)\">[]foo</span></li></ul></ul>" queryCommandState("outdent") after -PASS [["outdent",""]] "<ul><ul><li><span style=\"color:rgb(255, 0, 0)\">[]foo</span></li></ul></ul>" queryCommandValue("outdent") after -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/html/browsers/history/the-history-interface/history_properties_only_fully_active-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/html/browsers/history/the-history-interface/history_properties_only_fully_active-expected.txt deleted file mode 100644 index 6d0cf67..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/html/browsers/history/the-history-interface/history_properties_only_fully_active-expected.txt +++ /dev/null
@@ -1,4 +0,0 @@ -This is a testharness.js-based test. -PASS history properties should throw SecurityError when not in a fully active Document -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-flexbox-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-flexbox-expected.txt deleted file mode 100644 index 5978c26..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-flexbox-expected.txt +++ /dev/null
@@ -1,6 +0,0 @@ -This is a testharness.js-based test. -FAIL Flex assert_equals: height expected "20px" but got "180px" -FAIL Inline flex assert_equals: height expected "20px" but got "180px" -FAIL Dynamic change of flex-direction assert_equals: expected 48 but got 28 -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-grid-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-grid-expected.txt deleted file mode 100644 index 9e3c2ec..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-grid-expected.txt +++ /dev/null
@@ -1,5 +0,0 @@ -This is a testharness.js-based test. -FAIL Grid assert_equals: height expected "90px" but got "180px" -FAIL Inline grid assert_equals: height expected "90px" but got "180px" -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-multicol-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-multicol-expected.txt deleted file mode 100644 index 2951014..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-multicol-expected.txt +++ /dev/null
@@ -1,4 +0,0 @@ -This is a testharness.js-based test. -FAIL fieldset multicol assert_equals: expected "20px" but got "100px" -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-overflow-cssomview-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-overflow-cssomview-expected.txt deleted file mode 100644 index 318cc52..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-overflow-cssomview-expected.txt +++ /dev/null
@@ -1,4 +0,0 @@ -This is a testharness.js-based test. -FAIL Test cssom-view API for FIELDSET assert_equals: expected 400 but got 418 -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-percentage-block-size-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-percentage-block-size-expected.txt deleted file mode 100644 index 963f1b1..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-percentage-block-size-expected.txt +++ /dev/null
@@ -1,13 +0,0 @@ -This is a testharness.js-based test. -PASS rendered legend (writing-mode: horizontal-tb) -FAIL second legend (writing-mode: horizontal-tb) assert_equals: expected "30px" but got "100px" -FAIL div (writing-mode: horizontal-tb) assert_equals: expected "30px" but got "100px" -PASS rendered legend (writing-mode: vertical-lr) -FAIL second legend (writing-mode: vertical-lr) assert_equals: expected "30px" but got "100px" -FAIL div (writing-mode: vertical-lr) assert_equals: expected "30px" but got "100px" -PASS rendered legend (writing-mode: vertical-rl) -FAIL second legend (writing-mode: vertical-rl) assert_equals: expected "30px" but got "100px" -FAIL div (writing-mode: vertical-rl) assert_equals: expected "30px" but got "100px" -PASS Fieldset with a percentage height should not increase the height on every reflow. -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-align-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-align-expected.txt deleted file mode 100644 index 780bc66..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-align-expected.txt +++ /dev/null
@@ -1,13 +0,0 @@ -This is a testharness.js-based test. -PASS div[align=left] legend -FAIL div[align=center] legend assert_equals: expected legend[align=left] expected 24 but got 394 -FAIL div[align=right] legend assert_equals: expected legend[align=left] expected 24 but got 764 -PASS div[align=justify] legend -FAIL div[style="text-align: center"] legend assert_equals: expected legend[align=left] expected 24 but got 394 -FAIL div[style="text-align: center"][align=center] legend assert_equals: expected legend[align=left] expected 24 but got 394 -PASS legend[style="margin: 0 auto"] -PASS legend[style="margin: 0 0 0 auto"] -PASS fieldset[dir=rtl] legend -FAIL fieldset[dir=rtl] legend[style="text-align: left"] assert_equals: expected legend[align=right] expected 764 but got 24 -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/html/rendering/widgets/button-layout/abspos-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/html/rendering/widgets/button-layout/abspos-expected.txt deleted file mode 100644 index 5ba48ab..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/html/rendering/widgets/button-layout/abspos-expected.txt +++ /dev/null
@@ -1,5 +0,0 @@ -This is a testharness.js-based test. -FAIL abspos button with auto width, non-auto left/right (rtl) assert_equals: offsetLeft expected 662 but got 100 -PASS abspos button with auto width, non-auto left/right (ltr) -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/html/semantics/forms/the-selectmenu-element/selectmenu-many-options.tentative-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/html/semantics/forms/the-selectmenu-element/selectmenu-many-options.tentative-expected.txt deleted file mode 100644 index 522e2c46..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/html/semantics/forms/the-selectmenu-element/selectmenu-many-options.tentative-expected.txt +++ /dev/null
@@ -1,4 +0,0 @@ -This is a testharness.js-based test. -FAIL The popover should be bottom left positioned assert_equals: expected 36 but got 20 -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/html/semantics/forms/the-selectmenu-element/selectmenu-popup-position-with-zoom.tentative-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/html/semantics/forms/the-selectmenu-element/selectmenu-popup-position-with-zoom.tentative-expected.txt deleted file mode 100644 index 3577e72..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/html/semantics/forms/the-selectmenu-element/selectmenu-popup-position-with-zoom.tentative-expected.txt +++ /dev/null
@@ -1,7 +0,0 @@ -This is a testharness.js-based test. -PASS The popover should be bottom left positioned -FAIL The popover should be top left positioned assert_equals: expected 0 but got 216 -FAIL The popover should be bottom right positioned assert_equals: expected 0 but got 7 -FAIL The popover should be top right positioned assert_equals: expected 0 but got 17 -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/html/semantics/forms/the-selectmenu-element/selectmenu-popup-position.tentative-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/html/semantics/forms/the-selectmenu-element/selectmenu-popup-position.tentative-expected.txt deleted file mode 100644 index 378967e2..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/html/semantics/forms/the-selectmenu-element/selectmenu-popup-position.tentative-expected.txt +++ /dev/null
@@ -1,7 +0,0 @@ -This is a testharness.js-based test. -FAIL The popover should be bottom left positioned assert_equals: expected 0 but got 16 -FAIL The popover should be top left positioned assert_equals: expected 0 but got 467 -FAIL The popover should be bottom right positioned assert_equals: expected 0 but got 16 -FAIL The popover should be top right positioned assert_equals: expected 0 but got 467 -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/html/webappapis/scripting/events/event-handler-attributes-windowless-body-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/html/webappapis/scripting/events/event-handler-attributes-windowless-body-expected.txt deleted file mode 100644 index ccd97c1..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/html/webappapis/scripting/events/event-handler-attributes-windowless-body-expected.txt +++ /dev/null
@@ -1,227 +0,0 @@ -This is a testharness.js-based test. -PASS Return null when getting the blur event handler of a windowless body -PASS Ignore setting of blur window event handlers on windowless body -PASS Return null when getting the error event handler of a windowless body -PASS Ignore setting of error window event handlers on windowless body -PASS Return null when getting the focus event handler of a windowless body -PASS Ignore setting of focus window event handlers on windowless body -PASS Return null when getting the load event handler of a windowless body -PASS Ignore setting of load window event handlers on windowless body -PASS Return null when getting the resize event handler of a windowless body -PASS Ignore setting of resize window event handlers on windowless body -PASS Return null when getting the scroll event handler of a windowless body -PASS Ignore setting of scroll window event handlers on windowless body -PASS Return null when getting the afterprint event handler of a windowless body -PASS Ignore setting of afterprint window event handlers on windowless body -PASS Return null when getting the beforeprint event handler of a windowless body -PASS Ignore setting of beforeprint window event handlers on windowless body -PASS Return null when getting the beforeunload event handler of a windowless body -PASS Ignore setting of beforeunload window event handlers on windowless body -PASS Return null when getting the hashchange event handler of a windowless body -PASS Ignore setting of hashchange window event handlers on windowless body -PASS Return null when getting the languagechange event handler of a windowless body -PASS Ignore setting of languagechange window event handlers on windowless body -PASS Return null when getting the message event handler of a windowless body -PASS Ignore setting of message window event handlers on windowless body -PASS Return null when getting the messageerror event handler of a windowless body -PASS Ignore setting of messageerror window event handlers on windowless body -PASS Return null when getting the offline event handler of a windowless body -PASS Ignore setting of offline window event handlers on windowless body -PASS Return null when getting the online event handler of a windowless body -PASS Ignore setting of online window event handlers on windowless body -PASS Return null when getting the pagehide event handler of a windowless body -PASS Ignore setting of pagehide window event handlers on windowless body -PASS Return null when getting the pageshow event handler of a windowless body -PASS Ignore setting of pageshow window event handlers on windowless body -PASS Return null when getting the popstate event handler of a windowless body -PASS Ignore setting of popstate window event handlers on windowless body -PASS Return null when getting the rejectionhandled event handler of a windowless body -PASS Ignore setting of rejectionhandled window event handlers on windowless body -PASS Return null when getting the storage event handler of a windowless body -PASS Ignore setting of storage window event handlers on windowless body -PASS Return null when getting the unhandledrejection event handler of a windowless body -PASS Ignore setting of unhandledrejection window event handlers on windowless body -PASS Return null when getting the unload event handler of a windowless body -PASS Ignore setting of unload window event handlers on windowless body -PASS abort is unaffected on a windowless body -PASS auxclick is unaffected on a windowless body -PASS beforeinput is unaffected on a windowless body -PASS beforematch is unaffected on a windowless body -PASS cancel is unaffected on a windowless body -PASS canplay is unaffected on a windowless body -PASS canplaythrough is unaffected on a windowless body -PASS change is unaffected on a windowless body -PASS click is unaffected on a windowless body -PASS close is unaffected on a windowless body -PASS contextlost is unaffected on a windowless body -PASS contextmenu is unaffected on a windowless body -PASS contextrestored is unaffected on a windowless body -PASS copy is unaffected on a windowless body -PASS cuechange is unaffected on a windowless body -PASS cut is unaffected on a windowless body -PASS dblclick is unaffected on a windowless body -PASS drag is unaffected on a windowless body -PASS dragend is unaffected on a windowless body -PASS dragenter is unaffected on a windowless body -PASS dragleave is unaffected on a windowless body -PASS dragover is unaffected on a windowless body -PASS dragstart is unaffected on a windowless body -PASS drop is unaffected on a windowless body -PASS durationchange is unaffected on a windowless body -PASS emptied is unaffected on a windowless body -PASS ended is unaffected on a windowless body -PASS formdata is unaffected on a windowless body -PASS input is unaffected on a windowless body -PASS invalid is unaffected on a windowless body -PASS keydown is unaffected on a windowless body -PASS keypress is unaffected on a windowless body -PASS keyup is unaffected on a windowless body -PASS loadeddata is unaffected on a windowless body -PASS loadedmetadata is unaffected on a windowless body -PASS loadstart is unaffected on a windowless body -PASS mousedown is unaffected on a windowless body -PASS mouseenter is unaffected on a windowless body -PASS mouseleave is unaffected on a windowless body -PASS mousemove is unaffected on a windowless body -PASS mouseout is unaffected on a windowless body -PASS mouseover is unaffected on a windowless body -PASS mouseup is unaffected on a windowless body -PASS paste is unaffected on a windowless body -PASS pause is unaffected on a windowless body -PASS play is unaffected on a windowless body -PASS playing is unaffected on a windowless body -PASS progress is unaffected on a windowless body -PASS ratechange is unaffected on a windowless body -PASS reset is unaffected on a windowless body -PASS scrollend is unaffected on a windowless body -PASS securitypolicyviolation is unaffected on a windowless body -PASS seeked is unaffected on a windowless body -PASS seeking is unaffected on a windowless body -PASS select is unaffected on a windowless body -PASS slotchange is unaffected on a windowless body -PASS stalled is unaffected on a windowless body -PASS submit is unaffected on a windowless body -PASS suspend is unaffected on a windowless body -PASS timeupdate is unaffected on a windowless body -PASS toggle is unaffected on a windowless body -PASS volumechange is unaffected on a windowless body -PASS waiting is unaffected on a windowless body -PASS webkitanimationend is unaffected on a windowless body -PASS webkitanimationiteration is unaffected on a windowless body -PASS webkitanimationstart is unaffected on a windowless body -PASS webkittransitionend is unaffected on a windowless body -PASS wheel is unaffected on a windowless body -PASS Return null when getting the blur event handler of a windowless frameset -PASS Ignore setting of blur window event handlers on windowless frameset -PASS Return null when getting the error event handler of a windowless frameset -PASS Ignore setting of error window event handlers on windowless frameset -PASS Return null when getting the focus event handler of a windowless frameset -PASS Ignore setting of focus window event handlers on windowless frameset -PASS Return null when getting the load event handler of a windowless frameset -PASS Ignore setting of load window event handlers on windowless frameset -PASS Return null when getting the resize event handler of a windowless frameset -PASS Ignore setting of resize window event handlers on windowless frameset -PASS Return null when getting the scroll event handler of a windowless frameset -PASS Ignore setting of scroll window event handlers on windowless frameset -PASS Return null when getting the afterprint event handler of a windowless frameset -PASS Ignore setting of afterprint window event handlers on windowless frameset -PASS Return null when getting the beforeprint event handler of a windowless frameset -PASS Ignore setting of beforeprint window event handlers on windowless frameset -PASS Return null when getting the beforeunload event handler of a windowless frameset -PASS Ignore setting of beforeunload window event handlers on windowless frameset -PASS Return null when getting the hashchange event handler of a windowless frameset -PASS Ignore setting of hashchange window event handlers on windowless frameset -PASS Return null when getting the languagechange event handler of a windowless frameset -PASS Ignore setting of languagechange window event handlers on windowless frameset -PASS Return null when getting the message event handler of a windowless frameset -PASS Ignore setting of message window event handlers on windowless frameset -PASS Return null when getting the messageerror event handler of a windowless frameset -PASS Ignore setting of messageerror window event handlers on windowless frameset -PASS Return null when getting the offline event handler of a windowless frameset -PASS Ignore setting of offline window event handlers on windowless frameset -PASS Return null when getting the online event handler of a windowless frameset -PASS Ignore setting of online window event handlers on windowless frameset -PASS Return null when getting the pagehide event handler of a windowless frameset -PASS Ignore setting of pagehide window event handlers on windowless frameset -PASS Return null when getting the pageshow event handler of a windowless frameset -PASS Ignore setting of pageshow window event handlers on windowless frameset -PASS Return null when getting the popstate event handler of a windowless frameset -PASS Ignore setting of popstate window event handlers on windowless frameset -PASS Return null when getting the rejectionhandled event handler of a windowless frameset -PASS Ignore setting of rejectionhandled window event handlers on windowless frameset -PASS Return null when getting the storage event handler of a windowless frameset -PASS Ignore setting of storage window event handlers on windowless frameset -PASS Return null when getting the unhandledrejection event handler of a windowless frameset -PASS Ignore setting of unhandledrejection window event handlers on windowless frameset -PASS Return null when getting the unload event handler of a windowless frameset -PASS Ignore setting of unload window event handlers on windowless frameset -PASS abort is unaffected on a windowless frameset -PASS auxclick is unaffected on a windowless frameset -PASS beforeinput is unaffected on a windowless frameset -PASS beforematch is unaffected on a windowless frameset -PASS cancel is unaffected on a windowless frameset -PASS canplay is unaffected on a windowless frameset -PASS canplaythrough is unaffected on a windowless frameset -PASS change is unaffected on a windowless frameset -PASS click is unaffected on a windowless frameset -PASS close is unaffected on a windowless frameset -PASS contextlost is unaffected on a windowless frameset -PASS contextmenu is unaffected on a windowless frameset -PASS contextrestored is unaffected on a windowless frameset -PASS copy is unaffected on a windowless frameset -PASS cuechange is unaffected on a windowless frameset -PASS cut is unaffected on a windowless frameset -PASS dblclick is unaffected on a windowless frameset -PASS drag is unaffected on a windowless frameset -PASS dragend is unaffected on a windowless frameset -PASS dragenter is unaffected on a windowless frameset -PASS dragleave is unaffected on a windowless frameset -PASS dragover is unaffected on a windowless frameset -PASS dragstart is unaffected on a windowless frameset -PASS drop is unaffected on a windowless frameset -PASS durationchange is unaffected on a windowless frameset -PASS emptied is unaffected on a windowless frameset -PASS ended is unaffected on a windowless frameset -PASS formdata is unaffected on a windowless frameset -PASS input is unaffected on a windowless frameset -PASS invalid is unaffected on a windowless frameset -PASS keydown is unaffected on a windowless frameset -PASS keypress is unaffected on a windowless frameset -PASS keyup is unaffected on a windowless frameset -PASS loadeddata is unaffected on a windowless frameset -PASS loadedmetadata is unaffected on a windowless frameset -PASS loadstart is unaffected on a windowless frameset -PASS mousedown is unaffected on a windowless frameset -PASS mouseenter is unaffected on a windowless frameset -PASS mouseleave is unaffected on a windowless frameset -PASS mousemove is unaffected on a windowless frameset -PASS mouseout is unaffected on a windowless frameset -PASS mouseover is unaffected on a windowless frameset -PASS mouseup is unaffected on a windowless frameset -PASS paste is unaffected on a windowless frameset -PASS pause is unaffected on a windowless frameset -PASS play is unaffected on a windowless frameset -PASS playing is unaffected on a windowless frameset -PASS progress is unaffected on a windowless frameset -PASS ratechange is unaffected on a windowless frameset -PASS reset is unaffected on a windowless frameset -PASS scrollend is unaffected on a windowless frameset -PASS securitypolicyviolation is unaffected on a windowless frameset -PASS seeked is unaffected on a windowless frameset -PASS seeking is unaffected on a windowless frameset -PASS select is unaffected on a windowless frameset -PASS slotchange is unaffected on a windowless frameset -PASS stalled is unaffected on a windowless frameset -PASS submit is unaffected on a windowless frameset -PASS suspend is unaffected on a windowless frameset -PASS timeupdate is unaffected on a windowless frameset -PASS toggle is unaffected on a windowless frameset -PASS volumechange is unaffected on a windowless frameset -PASS waiting is unaffected on a windowless frameset -PASS webkitanimationend is unaffected on a windowless frameset -PASS webkitanimationiteration is unaffected on a windowless frameset -PASS webkitanimationstart is unaffected on a windowless frameset -PASS webkittransitionend is unaffected on a windowless frameset -PASS wheel is unaffected on a windowless frameset -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/paint-timing/with-first-paint/sibling-painting-first-image-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/paint-timing/with-first-paint/sibling-painting-first-image-expected.txt deleted file mode 100644 index 34806f7..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/paint-timing/with-first-paint/sibling-painting-first-image-expected.txt +++ /dev/null
@@ -1,4 +0,0 @@ -This is a testharness.js-based test. -PASS Frame ignores paint-timing events fired from sibling frame. -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/quirks/line-height-trailing-collapsable-whitespace-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/quirks/line-height-trailing-collapsable-whitespace-expected.png deleted file mode 100644 index c6a9ee7..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/quirks/line-height-trailing-collapsable-whitespace-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/quirks/table-cell-nowrap-minimum-width-calculation-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/quirks/table-cell-nowrap-minimum-width-calculation-expected.txt deleted file mode 100644 index 057781c..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/quirks/table-cell-nowrap-minimum-width-calculation-expected.txt +++ /dev/null
@@ -1,4 +0,0 @@ -This is a testharness.js-based test. -FAIL The table cell nowrap minimum width calculation quirk, basic assert_equals: quirks mode expected "10px" but got "2px" -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/screen-orientation/lock-sandboxed-iframe-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/screen-orientation/lock-sandboxed-iframe-expected.txt deleted file mode 100644 index 91dac44..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/screen-orientation/lock-sandboxed-iframe-expected.txt +++ /dev/null
@@ -1,5 +0,0 @@ -This is a testharness.js-based test. -PASS Test without 'allow-orientation-lock' sandboxing directive -PASS Test with 'allow-orientation-lock' sandboxing directive -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/service-workers/service-worker/fetch-canvas-tainting-video-with-range-request.https-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/service-workers/service-worker/fetch-canvas-tainting-video-with-range-request.https-expected.txt deleted file mode 100644 index 7801f387..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/service-workers/service-worker/fetch-canvas-tainting-video-with-range-request.https-expected.txt +++ /dev/null
@@ -1,6 +0,0 @@ -This is a testharness.js-based test. -PASS range responses from single origin (same-origin) -PASS range responses from multiple origins (cross-origin first) -PASS range responses from single origin with both opaque and non-opaque responses -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/shape-detection/detection-ImageDataUint16StorageFormat.https.window-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/shape-detection/detection-ImageDataUint16StorageFormat.https.window-expected.txt deleted file mode 100644 index c06afed..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/shape-detection/detection-ImageDataUint16StorageFormat.https.window-expected.txt +++ /dev/null
@@ -1,6 +0,0 @@ -This is a testharness.js-based test. -PASS FaceDetector.detect() can process uint16 storage format ImageData -PASS BarcodeDetector.detect() can process uint16 storage format ImageData -PASS TextDetector.detect() can process uint16 storage format ImageData -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/svg/coordinate-systems/svgtransformlist-replaceitem-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/svg/coordinate-systems/svgtransformlist-replaceitem-expected.txt deleted file mode 100644 index dd27674..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/svg/coordinate-systems/svgtransformlist-replaceitem-expected.txt +++ /dev/null
@@ -1,4 +0,0 @@ -This is a testharness.js-based test. -FAIL Dynamic update of transform; replaceItem() assert_equals: expected 185.640625 but got 185 -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/svg/text/scripted/getrotationofchar-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/svg/text/scripted/getrotationofchar-expected.txt deleted file mode 100644 index 334221a..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/svg/text/scripted/getrotationofchar-expected.txt +++ /dev/null
@@ -1,28 +0,0 @@ -This is a testharness.js-based test. -PASS 'text-orientation: mixed' - horizontal-tb -PASS 'text-orientation: upright' - horizontal-tb -PASS 'text-orientation: sideways' - horizontal-tb -FAIL Rotation attribute - horizontal-tb assert_equals: c expected 0 but got 360 -PASS <textPath> - horizontal-tb -FAIL 'text-orientation: mixed' - vertical-rl assert_equals: 月 expected 0 but got 90 -FAIL 'text-orientation: upright' - vertical-rl assert_equals: T expected 0 but got 90 -PASS 'text-orientation: sideways' - vertical-rl -FAIL Rotation attribute - vertical-rl assert_equals: 木 expected 180.5 but got 270.5 -FAIL <textPath> - vertical-rl assert_equals: 金 expected 315 but got 45 -FAIL 'text-orientation: mixed' - vertical-lr assert_equals: 月 expected 0 but got 90 -FAIL 'text-orientation: upright' - vertical-lr assert_equals: T expected 0 but got 90 -PASS 'text-orientation: sideways' - vertical-lr -FAIL Rotation attribute - vertical-lr assert_equals: 木 expected 180.5 but got 270.5 -FAIL <textPath> - vertical-lr assert_equals: 金 expected 315 but got 45 -PASS 'text-orientation: mixed' - sideways-rl -PASS 'text-orientation: upright' - sideways-rl -PASS 'text-orientation: sideways' - sideways-rl -PASS Rotation attribute - sideways-rl -PASS <textPath> - sideways-rl -FAIL 'text-orientation: mixed' - sideways-lr assert_equals: M expected -90 but got 90 -FAIL 'text-orientation: upright' - sideways-lr assert_equals: T expected -90 but got 90 -FAIL 'text-orientation: sideways' - sideways-lr assert_equals: W expected -90 but got 90 -FAIL Rotation attribute - sideways-lr assert_equals: t expected 270 but got 90 -FAIL <textPath> - sideways-lr assert_equals: F expected 225 but got 45 -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/svg/text/scripted/lengthadjust-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/svg/text/scripted/lengthadjust-expected.txt deleted file mode 100644 index 81f17d78..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/svg/text/scripted/lengthadjust-expected.txt +++ /dev/null
@@ -1,5 +0,0 @@ -This is a testharness.js-based test. -FAIL Tests dynamic updates of the "lengthAdjust" content attribute assert_greater_than: expected a number greater than 86 but got 86 -FAIL Tests dynamic updates of the "lengthAdjust" IDL attribute assert_greater_than: expected a number greater than 86 but got 86 -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/svg/text/scripted/transform-dynamic-update-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/svg/text/scripted/transform-dynamic-update-expected.txt deleted file mode 100644 index b328ee7..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/svg/text/scripted/transform-dynamic-update-expected.txt +++ /dev/null
@@ -1,4 +0,0 @@ -This is a testharness.js-based test. -FAIL Dynamic update of transform CSS property assert_approx_equals: expected 17.90625 +/- 0.8 but got 19 -Harness: the test ran to completion. -
diff --git "a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/url/url-setters-a-area.window_exclude=\050file_javascript_mailto\051-expected.txt" "b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/url/url-setters-a-area.window_exclude=\050file_javascript_mailto\051-expected.txt" deleted file mode 100644 index e0c1e6a..0000000 --- "a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/url/url-setters-a-area.window_exclude=\050file_javascript_mailto\051-expected.txt" +++ /dev/null
@@ -1,389 +0,0 @@ -This is a testharness.js-based test. -Found 371 tests; 231 PASS, 140 FAIL, 0 TIMEOUT, 0 NOTRUN. -PASS Loading data… -PASS <a>: Setting <a://example.net>.protocol = '' The empty string is not a valid scheme. Setter leaves the URL unchanged. -PASS <area>: Setting <a://example.net>.protocol = '' The empty string is not a valid scheme. Setter leaves the URL unchanged. -PASS <a>: Setting <a://example.net>.protocol = 'b' -PASS <area>: Setting <a://example.net>.protocol = 'b' -PASS <a>: Setting <a://example.net>.protocol = 'B' Upper-case ASCII is lower-cased -PASS <area>: Setting <a://example.net>.protocol = 'B' Upper-case ASCII is lower-cased -PASS <a>: Setting <a://example.net>.protocol = 'é' Non-ASCII is rejected -PASS <area>: Setting <a://example.net>.protocol = 'é' Non-ASCII is rejected -PASS <a>: Setting <a://example.net>.protocol = '0b' No leading digit -PASS <area>: Setting <a://example.net>.protocol = '0b' No leading digit -PASS <a>: Setting <a://example.net>.protocol = '+b' No leading punctuation -PASS <area>: Setting <a://example.net>.protocol = '+b' No leading punctuation -PASS <a>: Setting <a://example.net>.protocol = 'bC0+-.' -PASS <area>: Setting <a://example.net>.protocol = 'bC0+-.' -PASS <a>: Setting <a://example.net>.protocol = 'b,c' Only some punctuation is acceptable -PASS <area>: Setting <a://example.net>.protocol = 'b,c' Only some punctuation is acceptable -PASS <a>: Setting <a://example.net>.protocol = 'bé' Non-ASCII is rejected -PASS <area>: Setting <a://example.net>.protocol = 'bé' Non-ASCII is rejected -PASS <a>: Setting <http://test@example.net>.protocol = 'file' Can’t switch from URL containing username/password/port to file -PASS <area>: Setting <http://test@example.net>.protocol = 'file' Can’t switch from URL containing username/password/port to file -PASS <a>: Setting <https://example.net:1234>.protocol = 'file' -PASS <area>: Setting <https://example.net:1234>.protocol = 'file' -PASS <a>: Setting <wss://x:x@example.net:1234>.protocol = 'file' -PASS <area>: Setting <wss://x:x@example.net:1234>.protocol = 'file' -FAIL <a>: Setting <http://example.net>.protocol = 'b' Can’t switch from special scheme to non-special assert_equals: expected "http://example.net/" but got "b://example.net/" -FAIL <area>: Setting <http://example.net>.protocol = 'b' Can’t switch from special scheme to non-special assert_equals: expected "http://example.net/" but got "b://example.net/" -FAIL <a>: Setting <https://example.net>.protocol = 's' assert_equals: expected "https://example.net/" but got "s://example.net/" -FAIL <area>: Setting <https://example.net>.protocol = 's' assert_equals: expected "https://example.net/" but got "s://example.net/" -FAIL <a>: Setting <ftp://example.net>.protocol = 'test' assert_equals: expected "ftp://example.net/" but got "test://example.net/" -FAIL <area>: Setting <ftp://example.net>.protocol = 'test' assert_equals: expected "ftp://example.net/" but got "test://example.net/" -FAIL <a>: Setting <ssh://me@example.net>.protocol = 'http' Can’t switch from non-special scheme to special assert_equals: expected "ssh://me@example.net" but got "http://me@example.net/" -FAIL <area>: Setting <ssh://me@example.net>.protocol = 'http' Can’t switch from non-special scheme to special assert_equals: expected "ssh://me@example.net" but got "http://me@example.net/" -FAIL <a>: Setting <ssh://me@example.net>.protocol = 'https' assert_equals: expected "ssh://me@example.net" but got "https://me@example.net/" -FAIL <area>: Setting <ssh://me@example.net>.protocol = 'https' assert_equals: expected "ssh://me@example.net" but got "https://me@example.net/" -FAIL <a>: Setting <ssh://me@example.net>.protocol = 'file' assert_equals: expected "ssh://me@example.net" but got "file://me%40example.net/" -FAIL <area>: Setting <ssh://me@example.net>.protocol = 'file' assert_equals: expected "ssh://me@example.net" but got "file://me%40example.net/" -FAIL <a>: Setting <ssh://example.net>.protocol = 'file' assert_equals: expected "ssh://example.net" but got "file://example.net/" -FAIL <area>: Setting <ssh://example.net>.protocol = 'file' assert_equals: expected "ssh://example.net" but got "file://example.net/" -FAIL <a>: Setting <nonsense:///test>.protocol = 'https' assert_equals: expected "nonsense:///test" but got "https://test/" -FAIL <area>: Setting <nonsense:///test>.protocol = 'https' assert_equals: expected "nonsense:///test" but got "https://test/" -PASS <a>: Setting <http://example.net>.protocol = 'https:foo : bar' Stuff after the first ':' is ignored -PASS <area>: Setting <http://example.net>.protocol = 'https:foo : bar' Stuff after the first ':' is ignored -PASS <a>: Setting <data:text/html,<p>Test>.protocol = 'view-source+data:foo : bar' Stuff after the first ':' is ignored -PASS <area>: Setting <data:text/html,<p>Test>.protocol = 'view-source+data:foo : bar' Stuff after the first ':' is ignored -PASS <a>: Setting <http://foo.com:443/>.protocol = 'https' Port is set to null if it is the default for new scheme. -PASS <area>: Setting <http://foo.com:443/>.protocol = 'https' Port is set to null if it is the default for new scheme. -PASS <a>: Setting <unix:/run/foo.socket>.username = 'me' No host means no username -PASS <area>: Setting <unix:/run/foo.socket>.username = 'me' No host means no username -PASS <a>: Setting <http://example.net>.username = 'me' -PASS <area>: Setting <http://example.net>.username = 'me' -PASS <a>: Setting <http://:secret@example.net>.username = 'me' -PASS <area>: Setting <http://:secret@example.net>.username = 'me' -PASS <a>: Setting <http://me@example.net>.username = '' -PASS <area>: Setting <http://me@example.net>.username = '' -PASS <a>: Setting <http://me:secret@example.net>.username = '' -PASS <area>: Setting <http://me:secret@example.net>.username = '' -FAIL <a>: Setting <http://example.net>.username = '\0 -\r !"#$%&'()*+,-./09:;<=>?@AZ[\]^_`az{|}~Éé' UTF-8 percent encoding with the userinfo encode set. assert_equals: expected "http://%00%01%09%0A%0D%1F%20!%22%23$%&'()*+,-.%2F09%3A%3B%3C%3D%3E%3F%40AZ%5B%5C%5D%5E_%60az%7B%7C%7D~%7F%C2%80%C2%81%C3%89%C3%A9@example.net/" but got "http://%00%01%09%0A%0D%1F%20!%22%23$%&%27()*+,-.%2F09%3A%3B%3C%3D%3E%3F%40AZ%5B%5C%5D%5E_%60az%7B%7C%7D~%7F%C2%80%C2%81%C3%89%C3%A9@example.net/" -FAIL <area>: Setting <http://example.net>.username = '\0 -\r !"#$%&'()*+,-./09:;<=>?@AZ[\]^_`az{|}~Éé' UTF-8 percent encoding with the userinfo encode set. assert_equals: expected "http://%00%01%09%0A%0D%1F%20!%22%23$%&'()*+,-.%2F09%3A%3B%3C%3D%3E%3F%40AZ%5B%5C%5D%5E_%60az%7B%7C%7D~%7F%C2%80%C2%81%C3%89%C3%A9@example.net/" but got "http://%00%01%09%0A%0D%1F%20!%22%23$%&%27()*+,-.%2F09%3A%3B%3C%3D%3E%3F%40AZ%5B%5C%5D%5E_%60az%7B%7C%7D~%7F%C2%80%C2%81%C3%89%C3%A9@example.net/" -PASS <a>: Setting <http://example.net>.username = '%c3%89té' Bytes already percent-encoded are left as-is. -PASS <area>: Setting <http://example.net>.username = '%c3%89té' Bytes already percent-encoded are left as-is. -PASS <a>: Setting <sc:///>.username = 'x' -PASS <area>: Setting <sc:///>.username = 'x' -PASS <a>: Setting <unix:/run/foo.socket>.password = 'secret' No host means no password -PASS <area>: Setting <unix:/run/foo.socket>.password = 'secret' No host means no password -PASS <a>: Setting <http://example.net>.password = 'secret' -PASS <area>: Setting <http://example.net>.password = 'secret' -PASS <a>: Setting <http://me@example.net>.password = 'secret' -PASS <area>: Setting <http://me@example.net>.password = 'secret' -PASS <a>: Setting <http://:secret@example.net>.password = '' -PASS <area>: Setting <http://:secret@example.net>.password = '' -PASS <a>: Setting <http://me:secret@example.net>.password = '' -PASS <area>: Setting <http://me:secret@example.net>.password = '' -FAIL <a>: Setting <http://example.net>.password = '\0 -\r !"#$%&'()*+,-./09:;<=>?@AZ[\]^_`az{|}~Éé' UTF-8 percent encoding with the userinfo encode set. assert_equals: expected "http://:%00%01%09%0A%0D%1F%20!%22%23$%&'()*+,-.%2F09%3A%3B%3C%3D%3E%3F%40AZ%5B%5C%5D%5E_%60az%7B%7C%7D~%7F%C2%80%C2%81%C3%89%C3%A9@example.net/" but got "http://:%00%01%09%0A%0D%1F%20!%22%23$%&%27()*+,-.%2F09%3A%3B%3C%3D%3E%3F%40AZ%5B%5C%5D%5E_%60az%7B%7C%7D~%7F%C2%80%C2%81%C3%89%C3%A9@example.net/" -FAIL <area>: Setting <http://example.net>.password = '\0 -\r !"#$%&'()*+,-./09:;<=>?@AZ[\]^_`az{|}~Éé' UTF-8 percent encoding with the userinfo encode set. assert_equals: expected "http://:%00%01%09%0A%0D%1F%20!%22%23$%&'()*+,-.%2F09%3A%3B%3C%3D%3E%3F%40AZ%5B%5C%5D%5E_%60az%7B%7C%7D~%7F%C2%80%C2%81%C3%89%C3%A9@example.net/" but got "http://:%00%01%09%0A%0D%1F%20!%22%23$%&%27()*+,-.%2F09%3A%3B%3C%3D%3E%3F%40AZ%5B%5C%5D%5E_%60az%7B%7C%7D~%7F%C2%80%C2%81%C3%89%C3%A9@example.net/" -PASS <a>: Setting <http://example.net>.password = '%c3%89té' Bytes already percent-encoded are left as-is. -PASS <area>: Setting <http://example.net>.password = '%c3%89té' Bytes already percent-encoded are left as-is. -PASS <a>: Setting <sc:///>.password = 'x' -PASS <area>: Setting <sc:///>.password = 'x' -FAIL <a>: Setting <sc://x/>.host = '\0' Non-special scheme assert_equals: expected "x" but got "" -FAIL <area>: Setting <sc://x/>.host = '\0' Non-special scheme assert_equals: expected "x" but got "" -FAIL <a>: Setting <sc://x/>.host = ' ' assert_equals: expected "sc:///" but got "sc://x/" -FAIL <area>: Setting <sc://x/>.host = ' ' assert_equals: expected "sc:///" but got "sc://x/" -FAIL <a>: Setting <sc://x/>.host = ' -' assert_equals: expected "sc:///" but got "sc://x/" -FAIL <area>: Setting <sc://x/>.host = ' -' assert_equals: expected "sc:///" but got "sc://x/" -FAIL <a>: Setting <sc://x/>.host = '\r' assert_equals: expected "sc:///" but got "sc://x/" -FAIL <area>: Setting <sc://x/>.host = '\r' assert_equals: expected "sc:///" but got "sc://x/" -FAIL <a>: Setting <sc://x/>.host = ' ' assert_equals: expected "x" but got "" -FAIL <area>: Setting <sc://x/>.host = ' ' assert_equals: expected "x" but got "" -FAIL <a>: Setting <sc://x/>.host = '#' assert_equals: expected "sc:///" but got "sc://x/" -FAIL <area>: Setting <sc://x/>.host = '#' assert_equals: expected "sc:///" but got "sc://x/" -FAIL <a>: Setting <sc://x/>.host = '/' assert_equals: expected "sc:///" but got "sc://x/" -FAIL <area>: Setting <sc://x/>.host = '/' assert_equals: expected "sc:///" but got "sc://x/" -FAIL <a>: Setting <sc://x/>.host = '?' assert_equals: expected "sc:///" but got "sc://x/" -FAIL <area>: Setting <sc://x/>.host = '?' assert_equals: expected "sc:///" but got "sc://x/" -FAIL <a>: Setting <sc://x/>.host = '@' assert_equals: expected "x" but got "" -FAIL <area>: Setting <sc://x/>.host = '@' assert_equals: expected "x" but got "" -FAIL <a>: Setting <sc://x/>.host = 'ß' assert_equals: expected "sc://%C3%9F/" but got "sc://x/" -FAIL <area>: Setting <sc://x/>.host = 'ß' assert_equals: expected "sc://%C3%9F/" but got "sc://x/" -PASS <a>: Setting <https://x/>.host = 'ß' IDNA Nontransitional_Processing -PASS <area>: Setting <https://x/>.host = 'ß' IDNA Nontransitional_Processing -PASS <a>: Setting <data:text/plain,Stuff>.host = 'example.net' Cannot-be-a-base means no host -PASS <area>: Setting <data:text/plain,Stuff>.host = 'example.net' Cannot-be-a-base means no host -PASS <a>: Setting <http://example.net>.host = 'example.com:8080' -PASS <area>: Setting <http://example.net>.host = 'example.com:8080' -PASS <a>: Setting <http://example.net:8080>.host = 'example.com' Port number is unchanged if not specified in the new value -PASS <area>: Setting <http://example.net:8080>.host = 'example.com' Port number is unchanged if not specified in the new value -PASS <a>: Setting <http://example.net:8080>.host = 'example.com:' Port number is unchanged if not specified -PASS <area>: Setting <http://example.net:8080>.host = 'example.com:' Port number is unchanged if not specified -PASS <a>: Setting <http://example.net>.host = '' The empty host is not valid for special schemes -PASS <area>: Setting <http://example.net>.host = '' The empty host is not valid for special schemes -FAIL <a>: Setting <view-source+http://example.net/foo>.host = '' The empty host is OK for non-special schemes assert_equals: expected "view-source+http:///foo" but got "view-source+http://example.net/foo" -FAIL <area>: Setting <view-source+http://example.net/foo>.host = '' The empty host is OK for non-special schemes assert_equals: expected "view-source+http:///foo" but got "view-source+http://example.net/foo" -FAIL <a>: Setting <a:/foo>.host = 'example.net' Path-only URLs can gain a host assert_equals: expected "a://example.net/foo" but got "a:/foo" -FAIL <area>: Setting <a:/foo>.host = 'example.net' Path-only URLs can gain a host assert_equals: expected "a://example.net/foo" but got "a:/foo" -PASS <a>: Setting <http://example.net>.host = '0x7F000001:8080' IPv4 address syntax is normalized -PASS <area>: Setting <http://example.net>.host = '0x7F000001:8080' IPv4 address syntax is normalized -PASS <a>: Setting <http://example.net>.host = '[::0:01]:2' IPv6 address syntax is normalized -PASS <area>: Setting <http://example.net>.host = '[::0:01]:2' IPv6 address syntax is normalized -PASS <a>: Setting <http://example.net>.host = '[2001:db8::2]:4002' IPv6 literal address with port, crbug.com/1012416 -PASS <area>: Setting <http://example.net>.host = '[2001:db8::2]:4002' IPv6 literal address with port, crbug.com/1012416 -PASS <a>: Setting <http://example.net>.host = 'example.com:80' Default port number is removed -PASS <area>: Setting <http://example.net>.host = 'example.com:80' Default port number is removed -PASS <a>: Setting <https://example.net>.host = 'example.com:443' Default port number is removed -PASS <area>: Setting <https://example.net>.host = 'example.com:443' Default port number is removed -PASS <a>: Setting <https://example.net>.host = 'example.com:80' Default port number is only removed for the relevant scheme -PASS <area>: Setting <https://example.net>.host = 'example.com:80' Default port number is only removed for the relevant scheme -PASS <a>: Setting <http://example.net:8080>.host = 'example.com:80' Port number is removed if new port is scheme default and existing URL has a non-default port -PASS <area>: Setting <http://example.net:8080>.host = 'example.com:80' Port number is removed if new port is scheme default and existing URL has a non-default port -PASS <a>: Setting <http://example.net/path>.host = 'example.com/stuff' Stuff after a / delimiter is ignored -PASS <area>: Setting <http://example.net/path>.host = 'example.com/stuff' Stuff after a / delimiter is ignored -PASS <a>: Setting <http://example.net/path>.host = 'example.com:8080/stuff' Stuff after a / delimiter is ignored -PASS <area>: Setting <http://example.net/path>.host = 'example.com:8080/stuff' Stuff after a / delimiter is ignored -PASS <a>: Setting <http://example.net/path>.host = 'example.com?stuff' Stuff after a ? delimiter is ignored -PASS <area>: Setting <http://example.net/path>.host = 'example.com?stuff' Stuff after a ? delimiter is ignored -PASS <a>: Setting <http://example.net/path>.host = 'example.com:8080?stuff' Stuff after a ? delimiter is ignored -PASS <area>: Setting <http://example.net/path>.host = 'example.com:8080?stuff' Stuff after a ? delimiter is ignored -PASS <a>: Setting <http://example.net/path>.host = 'example.com#stuff' Stuff after a # delimiter is ignored -PASS <area>: Setting <http://example.net/path>.host = 'example.com#stuff' Stuff after a # delimiter is ignored -PASS <a>: Setting <http://example.net/path>.host = 'example.com:8080#stuff' Stuff after a # delimiter is ignored -PASS <area>: Setting <http://example.net/path>.host = 'example.com:8080#stuff' Stuff after a # delimiter is ignored -PASS <a>: Setting <http://example.net/path>.host = 'example.com\stuff' Stuff after a \ delimiter is ignored for special schemes -PASS <area>: Setting <http://example.net/path>.host = 'example.com\stuff' Stuff after a \ delimiter is ignored for special schemes -PASS <a>: Setting <http://example.net/path>.host = 'example.com:8080\stuff' Stuff after a \ delimiter is ignored for special schemes -PASS <area>: Setting <http://example.net/path>.host = 'example.com:8080\stuff' Stuff after a \ delimiter is ignored for special schemes -FAIL <a>: Setting <view-source+http://example.net/path>.host = 'example.com\stuff' \ is not a delimiter for non-special schemes, but still forbidden in hosts assert_equals: expected "example.net" but got "" -FAIL <area>: Setting <view-source+http://example.net/path>.host = 'example.com\stuff' \ is not a delimiter for non-special schemes, but still forbidden in hosts assert_equals: expected "example.net" but got "" -FAIL <a>: Setting <view-source+http://example.net/path>.host = 'example.com:8080stuff2' Anything other than ASCII digit stops the port parser in a setter but is not an error assert_equals: expected "view-source+http://example.com:8080/path" but got "view-source+http://example.net/path" -FAIL <area>: Setting <view-source+http://example.net/path>.host = 'example.com:8080stuff2' Anything other than ASCII digit stops the port parser in a setter but is not an error assert_equals: expected "view-source+http://example.com:8080/path" but got "view-source+http://example.net/path" -PASS <a>: Setting <http://example.net/path>.host = 'example.com:8080stuff2' Anything other than ASCII digit stops the port parser in a setter but is not an error -PASS <area>: Setting <http://example.net/path>.host = 'example.com:8080stuff2' Anything other than ASCII digit stops the port parser in a setter but is not an error -PASS <a>: Setting <http://example.net/path>.host = 'example.com:8080+2' Anything other than ASCII digit stops the port parser in a setter but is not an error -PASS <area>: Setting <http://example.net/path>.host = 'example.com:8080+2' Anything other than ASCII digit stops the port parser in a setter but is not an error -PASS <a>: Setting <http://example.net/path>.host = 'example.com:65535' Port numbers are 16 bit integers -PASS <area>: Setting <http://example.net/path>.host = 'example.com:65535' Port numbers are 16 bit integers -PASS <a>: Setting <http://example.net/path>.host = 'example.com:65536' Port numbers are 16 bit integers, overflowing is an error. Hostname is still set, though. -PASS <area>: Setting <http://example.net/path>.host = 'example.com:65536' Port numbers are 16 bit integers, overflowing is an error. Hostname is still set, though. -PASS <a>: Setting <http://example.net/>.host = '[google.com]' Broken IPv6 -PASS <area>: Setting <http://example.net/>.host = '[google.com]' Broken IPv6 -PASS <a>: Setting <http://example.net/>.host = '[::1.2.3.4x]' -PASS <area>: Setting <http://example.net/>.host = '[::1.2.3.4x]' -FAIL <a>: Setting <http://example.net/>.host = '[::1.2.3.]' assert_equals: expected "http://example.net/" but got "http://[::102:3]/" -FAIL <area>: Setting <http://example.net/>.host = '[::1.2.3.]' assert_equals: expected "http://example.net/" but got "http://[::102:3]/" -FAIL <a>: Setting <http://example.net/>.host = '[::1.2.]' assert_equals: expected "http://example.net/" but got "http://[::100:2]/" -FAIL <area>: Setting <http://example.net/>.host = '[::1.2.]' assert_equals: expected "http://example.net/" but got "http://[::100:2]/" -FAIL <a>: Setting <http://example.net/>.host = '[::1.]' assert_equals: expected "http://example.net/" but got "http://[::1]/" -FAIL <area>: Setting <http://example.net/>.host = '[::1.]' assert_equals: expected "http://example.net/" but got "http://[::1]/" -FAIL <a>: Setting <sc://test@test/>.host = '' assert_equals: expected "test" but got "" -FAIL <area>: Setting <sc://test@test/>.host = '' assert_equals: expected "test" but got "" -FAIL <a>: Setting <sc://test:12/>.host = '' assert_equals: expected "test:12" but got "" -FAIL <area>: Setting <sc://test:12/>.host = '' assert_equals: expected "test:12" but got "" -PASS <a>: Setting <http://example.com/>.host = '///bad.com' Leading / is not stripped -PASS <area>: Setting <http://example.com/>.host = '///bad.com' Leading / is not stripped -FAIL <a>: Setting <sc://example.com/>.host = '///bad.com' Leading / is not stripped assert_equals: expected "sc:///" but got "sc://example.com/" -FAIL <area>: Setting <sc://example.com/>.host = '///bad.com' Leading / is not stripped assert_equals: expected "sc:///" but got "sc://example.com/" -FAIL <a>: Setting <sc://x/>.hostname = '\0' Non-special scheme assert_equals: expected "x" but got "" -FAIL <area>: Setting <sc://x/>.hostname = '\0' Non-special scheme assert_equals: expected "x" but got "" -FAIL <a>: Setting <sc://x/>.hostname = ' ' assert_equals: expected "sc:///" but got "sc://x/" -FAIL <area>: Setting <sc://x/>.hostname = ' ' assert_equals: expected "sc:///" but got "sc://x/" -FAIL <a>: Setting <sc://x/>.hostname = ' -' assert_equals: expected "sc:///" but got "sc://x/" -FAIL <area>: Setting <sc://x/>.hostname = ' -' assert_equals: expected "sc:///" but got "sc://x/" -FAIL <a>: Setting <sc://x/>.hostname = '\r' assert_equals: expected "sc:///" but got "sc://x/" -FAIL <area>: Setting <sc://x/>.hostname = '\r' assert_equals: expected "sc:///" but got "sc://x/" -FAIL <a>: Setting <sc://x/>.hostname = ' ' assert_equals: expected "x" but got "" -FAIL <area>: Setting <sc://x/>.hostname = ' ' assert_equals: expected "x" but got "" -FAIL <a>: Setting <sc://x/>.hostname = '#' assert_equals: expected "sc:///" but got "sc://x/" -FAIL <area>: Setting <sc://x/>.hostname = '#' assert_equals: expected "sc:///" but got "sc://x/" -FAIL <a>: Setting <sc://x/>.hostname = '/' assert_equals: expected "sc:///" but got "sc://x/" -FAIL <area>: Setting <sc://x/>.hostname = '/' assert_equals: expected "sc:///" but got "sc://x/" -FAIL <a>: Setting <sc://x/>.hostname = '?' assert_equals: expected "sc:///" but got "sc://x/" -FAIL <area>: Setting <sc://x/>.hostname = '?' assert_equals: expected "sc:///" but got "sc://x/" -FAIL <a>: Setting <sc://x/>.hostname = '@' assert_equals: expected "x" but got "" -FAIL <area>: Setting <sc://x/>.hostname = '@' assert_equals: expected "x" but got "" -PASS <a>: Setting <data:text/plain,Stuff>.hostname = 'example.net' Cannot-be-a-base means no host -PASS <area>: Setting <data:text/plain,Stuff>.hostname = 'example.net' Cannot-be-a-base means no host -PASS <a>: Setting <http://example.net:8080>.hostname = 'example.com' -PASS <area>: Setting <http://example.net:8080>.hostname = 'example.com' -PASS <a>: Setting <http://example.net>.hostname = '' The empty host is not valid for special schemes -PASS <area>: Setting <http://example.net>.hostname = '' The empty host is not valid for special schemes -FAIL <a>: Setting <view-source+http://example.net/foo>.hostname = '' The empty host is OK for non-special schemes assert_equals: expected "view-source+http:///foo" but got "view-source+http://example.net/foo" -FAIL <area>: Setting <view-source+http://example.net/foo>.hostname = '' The empty host is OK for non-special schemes assert_equals: expected "view-source+http:///foo" but got "view-source+http://example.net/foo" -FAIL <a>: Setting <a:/foo>.hostname = 'example.net' Path-only URLs can gain a host assert_equals: expected "a://example.net/foo" but got "a:/foo" -FAIL <area>: Setting <a:/foo>.hostname = 'example.net' Path-only URLs can gain a host assert_equals: expected "a://example.net/foo" but got "a:/foo" -PASS <a>: Setting <http://example.net:8080>.hostname = '0x7F000001' IPv4 address syntax is normalized -PASS <area>: Setting <http://example.net:8080>.hostname = '0x7F000001' IPv4 address syntax is normalized -PASS <a>: Setting <http://example.net>.hostname = '[::0:01]' IPv6 address syntax is normalized -PASS <area>: Setting <http://example.net>.hostname = '[::0:01]' IPv6 address syntax is normalized -PASS <a>: Setting <http://example.net/path>.hostname = 'example.com:8080' : delimiter invalidates entire value -PASS <area>: Setting <http://example.net/path>.hostname = 'example.com:8080' : delimiter invalidates entire value -PASS <a>: Setting <http://example.net:8080/path>.hostname = 'example.com:' : delimiter invalidates entire value -PASS <area>: Setting <http://example.net:8080/path>.hostname = 'example.com:' : delimiter invalidates entire value -PASS <a>: Setting <http://example.net/path>.hostname = 'example.com/stuff' Stuff after a / delimiter is ignored -PASS <area>: Setting <http://example.net/path>.hostname = 'example.com/stuff' Stuff after a / delimiter is ignored -PASS <a>: Setting <http://example.net/path>.hostname = 'example.com?stuff' Stuff after a ? delimiter is ignored -PASS <area>: Setting <http://example.net/path>.hostname = 'example.com?stuff' Stuff after a ? delimiter is ignored -PASS <a>: Setting <http://example.net/path>.hostname = 'example.com#stuff' Stuff after a # delimiter is ignored -PASS <area>: Setting <http://example.net/path>.hostname = 'example.com#stuff' Stuff after a # delimiter is ignored -PASS <a>: Setting <http://example.net/path>.hostname = 'example.com\stuff' Stuff after a \ delimiter is ignored for special schemes -PASS <area>: Setting <http://example.net/path>.hostname = 'example.com\stuff' Stuff after a \ delimiter is ignored for special schemes -FAIL <a>: Setting <view-source+http://example.net/path>.hostname = 'example.com\stuff' \ is not a delimiter for non-special schemes, but still forbidden in hosts assert_equals: expected "example.net" but got "" -FAIL <area>: Setting <view-source+http://example.net/path>.hostname = 'example.com\stuff' \ is not a delimiter for non-special schemes, but still forbidden in hosts assert_equals: expected "example.net" but got "" -PASS <a>: Setting <http://example.net/>.hostname = '[google.com]' Broken IPv6 -PASS <area>: Setting <http://example.net/>.hostname = '[google.com]' Broken IPv6 -PASS <a>: Setting <http://example.net/>.hostname = '[::1.2.3.4x]' -PASS <area>: Setting <http://example.net/>.hostname = '[::1.2.3.4x]' -FAIL <a>: Setting <http://example.net/>.hostname = '[::1.2.3.]' assert_equals: expected "http://example.net/" but got "http://[::102:3]/" -FAIL <area>: Setting <http://example.net/>.hostname = '[::1.2.3.]' assert_equals: expected "http://example.net/" but got "http://[::102:3]/" -FAIL <a>: Setting <http://example.net/>.hostname = '[::1.2.]' assert_equals: expected "http://example.net/" but got "http://[::100:2]/" -FAIL <area>: Setting <http://example.net/>.hostname = '[::1.2.]' assert_equals: expected "http://example.net/" but got "http://[::100:2]/" -FAIL <a>: Setting <http://example.net/>.hostname = '[::1.]' assert_equals: expected "http://example.net/" but got "http://[::1]/" -FAIL <area>: Setting <http://example.net/>.hostname = '[::1.]' assert_equals: expected "http://example.net/" but got "http://[::1]/" -FAIL <a>: Setting <sc://test@test/>.hostname = '' assert_equals: expected "test" but got "" -FAIL <area>: Setting <sc://test@test/>.hostname = '' assert_equals: expected "test" but got "" -FAIL <a>: Setting <sc://test:12/>.hostname = '' assert_equals: expected "test:12" but got "" -FAIL <area>: Setting <sc://test:12/>.hostname = '' assert_equals: expected "test:12" but got "" -FAIL <a>: Setting <non-spec:/.//p>.hostname = 'h' Drop /. from path assert_equals: expected "non-spec://h//p" but got "non-spec:/.//p" -FAIL <area>: Setting <non-spec:/.//p>.hostname = 'h' Drop /. from path assert_equals: expected "non-spec://h//p" but got "non-spec:/.//p" -FAIL <a>: Setting <non-spec:/.//p>.hostname = '' assert_equals: expected "non-spec:////p" but got "non-spec:/.//p" -FAIL <area>: Setting <non-spec:/.//p>.hostname = '' assert_equals: expected "non-spec:////p" but got "non-spec:/.//p" -PASS <a>: Setting <http://example.com/>.hostname = '///bad.com' Leading / is not stripped -PASS <area>: Setting <http://example.com/>.hostname = '///bad.com' Leading / is not stripped -FAIL <a>: Setting <sc://example.com/>.hostname = '///bad.com' Leading / is not stripped assert_equals: expected "sc:///" but got "sc://example.com/" -FAIL <area>: Setting <sc://example.com/>.hostname = '///bad.com' Leading / is not stripped assert_equals: expected "sc:///" but got "sc://example.com/" -PASS <a>: Setting <http://example.net>.port = '8080' -PASS <area>: Setting <http://example.net>.port = '8080' -PASS <a>: Setting <http://example.net:8080>.port = '' Port number is removed if empty is the new value -PASS <area>: Setting <http://example.net:8080>.port = '' Port number is removed if empty is the new value -PASS <a>: Setting <http://example.net:8080>.port = '80' Default port number is removed -PASS <area>: Setting <http://example.net:8080>.port = '80' Default port number is removed -PASS <a>: Setting <https://example.net:4433>.port = '443' Default port number is removed -PASS <area>: Setting <https://example.net:4433>.port = '443' Default port number is removed -PASS <a>: Setting <https://example.net>.port = '80' Default port number is only removed for the relevant scheme -PASS <area>: Setting <https://example.net>.port = '80' Default port number is only removed for the relevant scheme -PASS <a>: Setting <http://example.net/path>.port = '8080/stuff' Stuff after a / delimiter is ignored -PASS <area>: Setting <http://example.net/path>.port = '8080/stuff' Stuff after a / delimiter is ignored -PASS <a>: Setting <http://example.net/path>.port = '8080?stuff' Stuff after a ? delimiter is ignored -PASS <area>: Setting <http://example.net/path>.port = '8080?stuff' Stuff after a ? delimiter is ignored -PASS <a>: Setting <http://example.net/path>.port = '8080#stuff' Stuff after a # delimiter is ignored -PASS <area>: Setting <http://example.net/path>.port = '8080#stuff' Stuff after a # delimiter is ignored -PASS <a>: Setting <http://example.net/path>.port = '8080\stuff' Stuff after a \ delimiter is ignored for special schemes -PASS <area>: Setting <http://example.net/path>.port = '8080\stuff' Stuff after a \ delimiter is ignored for special schemes -FAIL <a>: Setting <view-source+http://example.net/path>.port = '8080stuff2' Anything other than ASCII digit stops the port parser in a setter but is not an error assert_equals: expected "view-source+http://example.net:8080/path" but got "view-source+http://example.net/path" -FAIL <area>: Setting <view-source+http://example.net/path>.port = '8080stuff2' Anything other than ASCII digit stops the port parser in a setter but is not an error assert_equals: expected "view-source+http://example.net:8080/path" but got "view-source+http://example.net/path" -PASS <a>: Setting <http://example.net/path>.port = '8080stuff2' Anything other than ASCII digit stops the port parser in a setter but is not an error -PASS <area>: Setting <http://example.net/path>.port = '8080stuff2' Anything other than ASCII digit stops the port parser in a setter but is not an error -PASS <a>: Setting <http://example.net/path>.port = '8080+2' Anything other than ASCII digit stops the port parser in a setter but is not an error -PASS <area>: Setting <http://example.net/path>.port = '8080+2' Anything other than ASCII digit stops the port parser in a setter but is not an error -PASS <a>: Setting <http://example.net/path>.port = '65535' Port numbers are 16 bit integers -PASS <area>: Setting <http://example.net/path>.port = '65535' Port numbers are 16 bit integers -FAIL <a>: Setting <http://example.net:8080/path>.port = '65536' Port numbers are 16 bit integers, overflowing is an error assert_equals: expected "http://example.net:8080/path" but got "http://example.net:0/path" -FAIL <area>: Setting <http://example.net:8080/path>.port = '65536' Port numbers are 16 bit integers, overflowing is an error assert_equals: expected "http://example.net:8080/path" but got "http://example.net:0/path" -FAIL <a>: Setting <non-special://example.net:8080/path>.port = '65536' Port numbers are 16 bit integers, overflowing is an error assert_equals: expected "example.net:8080" but got "" -FAIL <area>: Setting <non-special://example.net:8080/path>.port = '65536' Port numbers are 16 bit integers, overflowing is an error assert_equals: expected "example.net:8080" but got "" -PASS <a>: Setting <non-base:value>.port = '12' -PASS <area>: Setting <non-base:value>.port = '12' -PASS <a>: Setting <sc:///>.port = '12' -PASS <area>: Setting <sc:///>.port = '12' -FAIL <a>: Setting <sc://x/>.port = '12' assert_equals: expected "sc://x:12/" but got "sc://x/" -FAIL <area>: Setting <sc://x/>.port = '12' assert_equals: expected "sc://x:12/" but got "sc://x/" -FAIL <a>: Setting <foo://somehost/some/path>.pathname = '' Non-special URLs can have their paths erased assert_equals: expected "foo://somehost" but got "foo://somehost/some/path" -FAIL <area>: Setting <foo://somehost/some/path>.pathname = '' Non-special URLs can have their paths erased assert_equals: expected "foo://somehost" but got "foo://somehost/some/path" -FAIL <a>: Setting <foo:///some/path>.pathname = '' Non-special URLs with an empty host can have their paths erased assert_equals: expected "foo://" but got "foo:///some/path" -FAIL <area>: Setting <foo:///some/path>.pathname = '' Non-special URLs with an empty host can have their paths erased assert_equals: expected "foo://" but got "foo:///some/path" -FAIL <a>: Setting <foo:/some/path>.pathname = '' Path-only URLs cannot have their paths erased assert_equals: expected "foo:/" but got "foo:/some/path" -FAIL <area>: Setting <foo:/some/path>.pathname = '' Path-only URLs cannot have their paths erased assert_equals: expected "foo:/" but got "foo:/some/path" -FAIL <a>: Setting <foo:/some/path>.pathname = 'test' Path-only URLs always have an initial slash assert_equals: expected "foo:/test" but got "foo:/some/path" -FAIL <area>: Setting <foo:/some/path>.pathname = 'test' Path-only URLs always have an initial slash assert_equals: expected "foo:/test" but got "foo:/some/path" -FAIL <a>: Setting <unix:/run/foo.socket?timeout=10>.pathname = '/var/log/../run/bar.socket' assert_equals: expected "unix:/var/run/bar.socket?timeout=10" but got "unix:/run/foo.socket?timeout=10" -FAIL <area>: Setting <unix:/run/foo.socket?timeout=10>.pathname = '/var/log/../run/bar.socket' assert_equals: expected "unix:/var/run/bar.socket?timeout=10" but got "unix:/run/foo.socket?timeout=10" -PASS <a>: Setting <https://example.net#nav>.pathname = 'home' -PASS <area>: Setting <https://example.net#nav>.pathname = 'home' -PASS <a>: Setting <https://example.net#nav>.pathname = '../home' -PASS <area>: Setting <https://example.net#nav>.pathname = '../home' -PASS <a>: Setting <http://example.net/home?lang=fr#nav>.pathname = '\a\%2E\b\%2e.\c' \ is a segment delimiter for 'special' URLs -PASS <area>: Setting <http://example.net/home?lang=fr#nav>.pathname = '\a\%2E\b\%2e.\c' \ is a segment delimiter for 'special' URLs -FAIL <a>: Setting <view-source+http://example.net/home?lang=fr#nav>.pathname = '\a\%2E\b\%2e.\c' \ is *not* a segment delimiter for non-'special' URLs assert_equals: expected "view-source+http://example.net/\\a\\%2E\\b\\%2e.\\c?lang=fr#nav" but got "view-source+http://example.net/home?lang=fr#nav" -FAIL <area>: Setting <view-source+http://example.net/home?lang=fr#nav>.pathname = '\a\%2E\b\%2e.\c' \ is *not* a segment delimiter for non-'special' URLs assert_equals: expected "view-source+http://example.net/\\a\\%2E\\b\\%2e.\\c?lang=fr#nav" but got "view-source+http://example.net/home?lang=fr#nav" -FAIL <a>: Setting <a:/>.pathname = '\0 -\r !"#$%&'()*+,-./09:;<=>?@AZ[\]^_`az{|}~Éé' UTF-8 percent encoding with the default encode set. Tabs and newlines are removed. assert_equals: expected "a:/%00%01%1F%20!%22%23$%&'()*+,-./09:;%3C=%3E%3F@AZ[\\]^_%60az%7B|%7D~%7F%C2%80%C2%81%C3%89%C3%A9" but got "a:/" -FAIL <area>: Setting <a:/>.pathname = '\0 -\r !"#$%&'()*+,-./09:;<=>?@AZ[\]^_`az{|}~Éé' UTF-8 percent encoding with the default encode set. Tabs and newlines are removed. assert_equals: expected "a:/%00%01%1F%20!%22%23$%&'()*+,-./09:;%3C=%3E%3F@AZ[\\]^_%60az%7B|%7D~%7F%C2%80%C2%81%C3%89%C3%A9" but got "a:/" -FAIL <a>: Setting <http://example.net>.pathname = '%2e%2E%c3%89té' Bytes already percent-encoded are left as-is, including %2E outside dotted segments. assert_equals: expected "http://example.net/%2e%2E%c3%89t%C3%A9" but got "http://example.net/..%c3%89t%C3%A9" -FAIL <area>: Setting <http://example.net>.pathname = '%2e%2E%c3%89té' Bytes already percent-encoded are left as-is, including %2E outside dotted segments. assert_equals: expected "http://example.net/%2e%2E%c3%89t%C3%A9" but got "http://example.net/..%c3%89t%C3%A9" -PASS <a>: Setting <http://example.net>.pathname = '?' ? needs to be encoded -PASS <area>: Setting <http://example.net>.pathname = '?' ? needs to be encoded -PASS <a>: Setting <http://example.net>.pathname = '#' # needs to be encoded -PASS <area>: Setting <http://example.net>.pathname = '#' # needs to be encoded -FAIL <a>: Setting <sc://example.net>.pathname = '?' ? needs to be encoded, non-special scheme assert_equals: expected "sc://example.net/%3F" but got "sc://example.net" -FAIL <area>: Setting <sc://example.net>.pathname = '?' ? needs to be encoded, non-special scheme assert_equals: expected "sc://example.net/%3F" but got "sc://example.net" -FAIL <a>: Setting <sc://example.net>.pathname = '#' # needs to be encoded, non-special scheme assert_equals: expected "sc://example.net/%23" but got "sc://example.net" -FAIL <area>: Setting <sc://example.net>.pathname = '#' # needs to be encoded, non-special scheme assert_equals: expected "sc://example.net/%23" but got "sc://example.net" -PASS <a>: Setting <http://example.net>.pathname = '/?é' ? doesn't mess up encoding -PASS <area>: Setting <http://example.net>.pathname = '/?é' ? doesn't mess up encoding -PASS <a>: Setting <http://example.net>.pathname = '/#é' # doesn't mess up encoding -PASS <area>: Setting <http://example.net>.pathname = '/#é' # doesn't mess up encoding -FAIL <a>: Setting <non-spec:/>.pathname = '/.//p' Serialize /. in path assert_equals: expected "non-spec:/.//p" but got "non-spec:/" -FAIL <area>: Setting <non-spec:/>.pathname = '/.//p' Serialize /. in path assert_equals: expected "non-spec:/.//p" but got "non-spec:/" -FAIL <a>: Setting <non-spec:/>.pathname = '/..//p' assert_equals: expected "non-spec:/.//p" but got "non-spec:/" -FAIL <area>: Setting <non-spec:/>.pathname = '/..//p' assert_equals: expected "non-spec:/.//p" but got "non-spec:/" -FAIL <a>: Setting <non-spec:/>.pathname = '//p' assert_equals: expected "non-spec:/.//p" but got "non-spec:/" -FAIL <area>: Setting <non-spec:/>.pathname = '//p' assert_equals: expected "non-spec:/.//p" but got "non-spec:/" -FAIL <a>: Setting <non-spec:/.//>.pathname = 'p' Drop /. from path assert_equals: expected "non-spec:/p" but got "non-spec:/.//" -FAIL <area>: Setting <non-spec:/.//>.pathname = 'p' Drop /. from path assert_equals: expected "non-spec:/p" but got "non-spec:/.//" -PASS <a>: Setting <https://example.net#nav>.search = 'lang=fr' -PASS <area>: Setting <https://example.net#nav>.search = 'lang=fr' -PASS <a>: Setting <https://example.net?lang=en-US#nav>.search = 'lang=fr' -PASS <area>: Setting <https://example.net?lang=en-US#nav>.search = 'lang=fr' -PASS <a>: Setting <https://example.net?lang=en-US#nav>.search = '?lang=fr' -PASS <area>: Setting <https://example.net?lang=en-US#nav>.search = '?lang=fr' -PASS <a>: Setting <https://example.net?lang=en-US#nav>.search = '??lang=fr' -PASS <area>: Setting <https://example.net?lang=en-US#nav>.search = '??lang=fr' -FAIL <a>: Setting <https://example.net?lang=en-US#nav>.search = '?' assert_equals: expected "https://example.net/?#nav" but got "https://example.net/#nav" -FAIL <area>: Setting <https://example.net?lang=en-US#nav>.search = '?' assert_equals: expected "https://example.net/?#nav" but got "https://example.net/#nav" -PASS <a>: Setting <https://example.net?lang=en-US#nav>.search = '' -PASS <area>: Setting <https://example.net?lang=en-US#nav>.search = '' -PASS <a>: Setting <https://example.net?lang=en-US>.search = '' -PASS <area>: Setting <https://example.net?lang=en-US>.search = '' -PASS <a>: Setting <https://example.net>.search = '' -PASS <area>: Setting <https://example.net>.search = '' -FAIL <a>: Setting <a:/>.search = '\0 -\r !"#$%&'()*+,-./09:;<=>?@AZ[\]^_`az{|}~Éé' UTF-8 percent encoding with the query encode set. Tabs and newlines are removed. assert_equals: expected "a:/?%00%01%1F%20!%22%23$%&'()*+,-./09:;%3C=%3E?@AZ[\\]^_`az{|}~%7F%C2%80%C2%81%C3%89%C3%A9" but got "a:/?%00%01%1F%20!%22%23$%&%27()*+,-./09:;%3C=%3E?@AZ[\\]^_`az{|}~%7F%C2%80%C2%81%C3%89%C3%A9" -FAIL <area>: Setting <a:/>.search = '\0 -\r !"#$%&'()*+,-./09:;<=>?@AZ[\]^_`az{|}~Éé' UTF-8 percent encoding with the query encode set. Tabs and newlines are removed. assert_equals: expected "a:/?%00%01%1F%20!%22%23$%&'()*+,-./09:;%3C=%3E?@AZ[\\]^_`az{|}~%7F%C2%80%C2%81%C3%89%C3%A9" but got "a:/?%00%01%1F%20!%22%23$%&%27()*+,-./09:;%3C=%3E?@AZ[\\]^_`az{|}~%7F%C2%80%C2%81%C3%89%C3%A9" -PASS <a>: Setting <http://example.net>.search = '%c3%89té' Bytes already percent-encoded are left as-is -PASS <area>: Setting <http://example.net>.search = '%c3%89té' Bytes already percent-encoded are left as-is -PASS <a>: Setting <https://example.net>.hash = 'main' -PASS <area>: Setting <https://example.net>.hash = 'main' -PASS <a>: Setting <https://example.net#nav>.hash = 'main' -PASS <area>: Setting <https://example.net#nav>.hash = 'main' -PASS <a>: Setting <https://example.net?lang=en-US>.hash = '##nav' -PASS <area>: Setting <https://example.net?lang=en-US>.hash = '##nav' -PASS <a>: Setting <https://example.net?lang=en-US#nav>.hash = '#main' -PASS <area>: Setting <https://example.net?lang=en-US#nav>.hash = '#main' -PASS <a>: Setting <https://example.net?lang=en-US#nav>.hash = '#' -PASS <area>: Setting <https://example.net?lang=en-US#nav>.hash = '#' -PASS <a>: Setting <https://example.net?lang=en-US#nav>.hash = '' -PASS <area>: Setting <https://example.net?lang=en-US#nav>.hash = '' -PASS <a>: Setting <http://example.net>.hash = '#foo bar' -PASS <area>: Setting <http://example.net>.hash = '#foo bar' -PASS <a>: Setting <http://example.net>.hash = '#foo"bar' -PASS <area>: Setting <http://example.net>.hash = '#foo"bar' -PASS <a>: Setting <http://example.net>.hash = '#foo<bar' -PASS <area>: Setting <http://example.net>.hash = '#foo<bar' -PASS <a>: Setting <http://example.net>.hash = '#foo>bar' -PASS <area>: Setting <http://example.net>.hash = '#foo>bar' -PASS <a>: Setting <http://example.net>.hash = '#foo`bar' -PASS <area>: Setting <http://example.net>.hash = '#foo`bar' -PASS <a>: Setting <a:/>.hash = '\0 -\r !"#$%&'()*+,-./09:;<=>?@AZ[\]^_`az{|}~Éé' Simple percent-encoding; tabs and newlines are removed -PASS <area>: Setting <a:/>.hash = '\0 -\r !"#$%&'()*+,-./09:;<=>?@AZ[\]^_`az{|}~Éé' Simple percent-encoding; tabs and newlines are removed -PASS <a>: Setting <http://example.net>.hash = 'a\0b' Percent-encode NULLs in fragment -PASS <area>: Setting <http://example.net>.hash = 'a\0b' Percent-encode NULLs in fragment -PASS <a>: Setting <non-spec:/>.hash = 'a\0b' Percent-encode NULLs in fragment -PASS <area>: Setting <non-spec:/>.hash = 'a\0b' Percent-encode NULLs in fragment -PASS <a>: Setting <http://example.net>.hash = '%c3%89té' Bytes already percent-encoded are left as-is -PASS <area>: Setting <http://example.net>.hash = '%c3%89té' Bytes already percent-encoded are left as-is -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/web-animations/animation-model/animation-types/accumulation-per-property-001-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/web-animations/animation-model/animation-types/accumulation-per-property-001-expected.txt deleted file mode 100644 index 0c185ed..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/web-animations/animation-model/animation-types/accumulation-per-property-001-expected.txt +++ /dev/null
@@ -1,314 +0,0 @@ -This is a testharness.js-based test. -Found 310 tests; 308 PASS, 2 FAIL, 0 TIMEOUT, 0 NOTRUN. -PASS Setup -PASS align-content (type: discrete) has testAccumulation function -PASS align-content: "flex-end" onto "flex-start" -PASS align-content: "flex-start" onto "flex-end" -PASS align-items (type: discrete) has testAccumulation function -PASS align-items: "flex-end" onto "flex-start" -PASS align-items: "flex-start" onto "flex-end" -PASS align-self (type: discrete) has testAccumulation function -PASS align-self: "flex-end" onto "flex-start" -PASS align-self: "flex-start" onto "flex-end" -PASS backface-visibility (type: discrete) has testAccumulation function -PASS backface-visibility: "hidden" onto "visible" -PASS backface-visibility: "visible" onto "hidden" -PASS background-attachment (type: discrete) has testAccumulation function -PASS background-attachment: "local" onto "fixed" -PASS background-attachment: "fixed" onto "local" -PASS background-color (type: color) has testAccumulation function -PASS background-color supports animating as color of rgb() with overflowed from and to values -PASS background-color supports animating as color of #RGB -PASS background-color supports animating as color of hsl() -PASS background-color supports animating as color of #RGBa -PASS background-color supports animating as color of rgba() -PASS background-color supports animating as color of hsla() -PASS background-blend-mode (type: discrete) has testAccumulation function -PASS background-blend-mode: "screen" onto "multiply" -PASS background-blend-mode: "multiply" onto "screen" -PASS background-clip (type: discrete) has testAccumulation function -PASS background-clip: "content-box" onto "padding-box" -PASS background-clip: "padding-box" onto "content-box" -PASS background-image (type: discrete) has testAccumulation function -PASS background-image: "url("http://localhost/test-2")" onto "url("http://localhost/test-1")" -PASS background-image: "url("http://localhost/test-1")" onto "url("http://localhost/test-2")" -PASS background-origin (type: discrete) has testAccumulation function -PASS background-origin: "content-box" onto "padding-box" -PASS background-origin: "padding-box" onto "content-box" -PASS background-repeat (type: discrete) has testAccumulation function -PASS background-repeat: "round" onto "space" -PASS background-repeat: "space" onto "round" -PASS border-bottom-color (type: color) has testAccumulation function -PASS border-bottom-color supports animating as color of rgb() with overflowed from and to values -PASS border-bottom-color supports animating as color of #RGB -PASS border-bottom-color supports animating as color of hsl() -PASS border-bottom-color supports animating as color of #RGBa -PASS border-bottom-color supports animating as color of rgba() -PASS border-bottom-color supports animating as color of hsla() -PASS border-bottom-style (type: discrete) has testAccumulation function -PASS border-bottom-style: "solid" onto "dotted" -PASS border-bottom-style: "dotted" onto "solid" -PASS border-bottom-width (type: length) has testAccumulation function -PASS border-bottom-width: length -PASS border-bottom-width: length of rem -PASS border-collapse (type: discrete) has testAccumulation function -PASS border-collapse: "separate" onto "collapse" -PASS border-collapse: "collapse" onto "separate" -PASS border-image-repeat (type: discrete) has testAccumulation function -PASS border-image-repeat: "round space" onto "stretch repeat" -PASS border-image-repeat: "stretch repeat" onto "round space" -PASS border-image-source (type: discrete) has testAccumulation function -PASS border-image-source: "url("http://localhost/test-2")" onto "url("http://localhost/test-1")" -PASS border-image-source: "url("http://localhost/test-1")" onto "url("http://localhost/test-2")" -PASS border-left-color (type: color) has testAccumulation function -PASS border-left-color supports animating as color of rgb() with overflowed from and to values -PASS border-left-color supports animating as color of #RGB -PASS border-left-color supports animating as color of hsl() -PASS border-left-color supports animating as color of #RGBa -PASS border-left-color supports animating as color of rgba() -PASS border-left-color supports animating as color of hsla() -PASS border-left-style (type: discrete) has testAccumulation function -PASS border-left-style: "solid" onto "dotted" -PASS border-left-style: "dotted" onto "solid" -PASS border-left-width (type: length) has testAccumulation function -PASS border-left-width: length -PASS border-left-width: length of rem -PASS border-right-color (type: color) has testAccumulation function -PASS border-right-color supports animating as color of rgb() with overflowed from and to values -PASS border-right-color supports animating as color of #RGB -PASS border-right-color supports animating as color of hsl() -PASS border-right-color supports animating as color of #RGBa -PASS border-right-color supports animating as color of rgba() -PASS border-right-color supports animating as color of hsla() -PASS border-right-style (type: discrete) has testAccumulation function -PASS border-right-style: "solid" onto "dotted" -PASS border-right-style: "dotted" onto "solid" -PASS border-right-width (type: length) has testAccumulation function -PASS border-right-width: length -PASS border-right-width: length of rem -PASS border-spacing (type: lengthPair) has testAccumulation function -PASS border-spacing: length pair -PASS border-spacing: length pair of rem -PASS border-top-color (type: color) has testAccumulation function -PASS border-top-color supports animating as color of rgb() with overflowed from and to values -PASS border-top-color supports animating as color of #RGB -PASS border-top-color supports animating as color of hsl() -PASS border-top-color supports animating as color of #RGBa -PASS border-top-color supports animating as color of rgba() -PASS border-top-color supports animating as color of hsla() -PASS border-top-style (type: discrete) has testAccumulation function -PASS border-top-style: "solid" onto "dotted" -PASS border-top-style: "dotted" onto "solid" -PASS border-top-width (type: length) has testAccumulation function -PASS border-top-width: length -PASS border-top-width: length of rem -PASS box-shadow (type: boxShadowList) has testAccumulation function -PASS box-shadow: shadow -PASS box-sizing (type: discrete) has testAccumulation function -PASS box-sizing: "border-box" onto "content-box" -PASS box-sizing: "content-box" onto "border-box" -PASS caption-side (type: discrete) has testAccumulation function -PASS caption-side: "bottom" onto "top" -PASS caption-side: "top" onto "bottom" -PASS caret-color (type: color) has testAccumulation function -PASS caret-color supports animating as color of rgb() with overflowed from and to values -PASS caret-color supports animating as color of #RGB -PASS caret-color supports animating as color of hsl() -PASS caret-color supports animating as color of #RGBa -PASS caret-color supports animating as color of rgba() -PASS caret-color supports animating as color of hsla() -PASS clear (type: discrete) has testAccumulation function -PASS clear: "right" onto "left" -PASS clear: "left" onto "right" -PASS clip (type: rect) has testAccumulation function -PASS clip: rect -PASS clip (type: discrete) has testAccumulation function -PASS clip: "auto" onto "rect(10px, 10px, 10px, 10px)" -PASS clip: "rect(10px, 10px, 10px, 10px)" onto "auto" -PASS clip: "rect(10px, 10px, 10px, auto)" onto "rect(10px, 10px, 10px, 10px)" -PASS clip: "rect(10px, 10px, 10px, 10px)" onto "rect(10px, 10px, 10px, auto)" -PASS clip-rule (type: discrete) has testAccumulation function -PASS clip-rule: "nonzero" onto "evenodd" -PASS clip-rule: "evenodd" onto "nonzero" -PASS color (type: color) has testAccumulation function -PASS color supports animating as color of rgb() with overflowed from and to values -PASS color supports animating as color of #RGB -PASS color supports animating as color of hsl() -PASS color supports animating as color of #RGBa -PASS color supports animating as color of rgba() -PASS color supports animating as color of hsla() -PASS color-interpolation (type: discrete) has testAccumulation function -PASS color-interpolation: "auto" onto "linearrgb" -PASS color-interpolation: "linearrgb" onto "auto" -PASS color-interpolation-filters (type: discrete) has testAccumulation function -PASS color-interpolation-filters: "linearrgb" onto "srgb" -PASS color-interpolation-filters: "srgb" onto "linearrgb" -PASS column-count (type: positiveInteger) has testAccumulation function -PASS column-count: positive integer -PASS column-count (type: discrete) has testAccumulation function -PASS column-count: "10" onto "auto" -PASS column-count: "auto" onto "10" -PASS column-gap (type: length) has testAccumulation function -PASS column-gap: length -PASS column-gap: length of rem -PASS column-gap (type: discrete) has testAccumulation function -PASS column-gap: "200px" onto "normal" -PASS column-gap: "normal" onto "200px" -PASS column-rule-color (type: color) has testAccumulation function -PASS column-rule-color supports animating as color of rgb() with overflowed from and to values -PASS column-rule-color supports animating as color of #RGB -PASS column-rule-color supports animating as color of hsl() -PASS column-rule-color supports animating as color of #RGBa -PASS column-rule-color supports animating as color of rgba() -PASS column-rule-color supports animating as color of hsla() -PASS column-fill (type: discrete) has testAccumulation function -PASS column-fill: "balance" onto "auto" -PASS column-fill: "auto" onto "balance" -PASS column-rule-style (type: discrete) has testAccumulation function -PASS column-rule-style: "dotted" onto "none" -PASS column-rule-style: "none" onto "dotted" -PASS column-rule-width (type: length) has testAccumulation function -PASS column-rule-width: length -PASS column-rule-width: length of rem -PASS column-width (type: length) has testAccumulation function -PASS column-width: length -PASS column-width: length of rem -PASS column-width (type: discrete) has testAccumulation function -PASS column-width: "1px" onto "auto" -PASS column-width: "auto" onto "1px" -PASS counter-increment (type: discrete) has testAccumulation function -PASS counter-increment: "ident-2 2" onto "ident-1 1" -PASS counter-increment: "ident-1 1" onto "ident-2 2" -PASS counter-reset (type: discrete) has testAccumulation function -PASS counter-reset: "ident-2 2" onto "ident-1 1" -PASS counter-reset: "ident-1 1" onto "ident-2 2" -PASS cursor (type: discrete) has testAccumulation function -PASS cursor: "wait" onto "pointer" -PASS cursor: "pointer" onto "wait" -PASS dominant-baseline (type: discrete) has testAccumulation function -PASS dominant-baseline: "alphabetic" onto "ideographic" -PASS dominant-baseline: "ideographic" onto "alphabetic" -PASS empty-cells (type: discrete) has testAccumulation function -PASS empty-cells: "hide" onto "show" -PASS empty-cells: "show" onto "hide" -PASS fill-opacity (type: opacity) has testAccumulation function -PASS fill-opacity: [0, 1] number -PASS fill-opacity: [0, 1] number (clamped) -PASS fill-rule (type: discrete) has testAccumulation function -PASS fill-rule: "nonzero" onto "evenodd" -PASS fill-rule: "evenodd" onto "nonzero" -PASS filter (type: filterList) has testAccumulation function -PASS filter: same ordered filter functions -PASS filter: mismatched ordered filter functions -PASS flex-basis (type: lengthPercentageOrCalc) has testAccumulation function -PASS flex-basis: length -PASS flex-basis: length of rem -PASS flex-basis: percentage -PASS flex-basis: units "%" onto "px" -PASS flex-basis: units "px" onto "%" -PASS flex-basis: units "rem" onto "%" -PASS flex-basis: units "%" onto "rem" -PASS flex-basis: units "rem" onto "em" -PASS flex-basis: units "em" onto "rem" -PASS flex-basis: units "calc" onto "px" -PASS flex-basis: calc -PASS flex-basis (type: discrete) has testAccumulation function -PASS flex-basis: "10px" onto "auto" -PASS flex-basis: "auto" onto "10px" -PASS flex-direction (type: discrete) has testAccumulation function -PASS flex-direction: "row-reverse" onto "row" -PASS flex-direction: "row" onto "row-reverse" -PASS flex-grow (type: positiveNumber) has testAccumulation function -PASS flex-grow: positive number -PASS flex-shrink (type: positiveNumber) has testAccumulation function -PASS flex-shrink: positive number -PASS flex-wrap (type: discrete) has testAccumulation function -PASS flex-wrap: "wrap" onto "nowrap" -PASS flex-wrap: "nowrap" onto "wrap" -PASS flood-color (type: color) has testAccumulation function -PASS flood-color supports animating as color of rgb() with overflowed from and to values -PASS flood-color supports animating as color of #RGB -PASS flood-color supports animating as color of hsl() -PASS flood-color supports animating as color of #RGBa -PASS flood-color supports animating as color of rgba() -PASS flood-color supports animating as color of hsla() -PASS flood-opacity (type: opacity) has testAccumulation function -PASS flood-opacity: [0, 1] number -PASS flood-opacity: [0, 1] number (clamped) -PASS font-stretch (type: percentage) has testAccumulation function -PASS font-stretch: percentage -PASS font-style (type: discrete) has testAccumulation function -FAIL font-style: "oblique" onto "italic" assert_equals: The value should be oblique at 0ms expected "oblique" but got "italic" -PASS font-style: "italic" onto "oblique" -PASS float (type: discrete) has testAccumulation function -PASS float: "right" onto "left" -PASS float: "left" onto "right" -PASS font-family (type: discrete) has testAccumulation function -PASS font-family: "verdana" onto "helvetica" -PASS font-family: "helvetica" onto "verdana" -PASS font-feature-settings (type: discrete) has testAccumulation function -PASS font-feature-settings: "normal" onto ""liga" 5" -PASS font-feature-settings: ""liga" 5" onto "normal" -PASS font-kerning (type: discrete) has testAccumulation function -PASS font-kerning: "normal" onto "auto" -PASS font-kerning: "auto" onto "normal" -PASS font-synthesis (type: discrete) has testAccumulation function -PASS font-synthesis: "weight style" onto "none" -PASS font-synthesis: "none" onto "weight style" -PASS font-variant-alternates (type: discrete) has testAccumulation function -PASS font-variant-alternates: "stylistic(unknown)" onto "swash(unknown)" -PASS font-variant-alternates: "swash(unknown)" onto "stylistic(unknown)" -PASS font-variant-caps (type: discrete) has testAccumulation function -PASS font-variant-caps: "unicase" onto "small-caps" -PASS font-variant-caps: "small-caps" onto "unicase" -PASS font-variant-east-asian (type: discrete) has testAccumulation function -PASS font-variant-east-asian: "proportional-width" onto "full-width" -PASS font-variant-east-asian: "full-width" onto "proportional-width" -PASS font-variant-ligatures (type: discrete) has testAccumulation function -PASS font-variant-ligatures: "no-common-ligatures" onto "common-ligatures" -PASS font-variant-ligatures: "common-ligatures" onto "no-common-ligatures" -PASS font-variant-numeric (type: discrete) has testAccumulation function -PASS font-variant-numeric: "oldstyle-nums" onto "lining-nums" -PASS font-variant-numeric: "lining-nums" onto "oldstyle-nums" -PASS font-variant-position (type: discrete) has testAccumulation function -PASS font-variant-position: "super" onto "sub" -PASS font-variant-position: "sub" onto "super" -PASS font-variation-settings (type: fontVariationSettings) has testAccumulation function -PASS font-variation-settings with composite type accumulate -PASS font-variation-settings (type: discrete) has testAccumulation function -PASS font-variation-settings: ""wdth" 5" onto ""wdth" 1, "wght" 1.1" -PASS font-variation-settings: ""wdth" 1, "wght" 1.1" onto ""wdth" 5" -PASS font-variation-settings: "normal" onto ""wdth" 5" -PASS font-variation-settings: ""wdth" 5" onto "normal" -PASS grid-auto-columns (type: discrete) has testAccumulation function -PASS grid-auto-columns: "5px" onto "1px" -PASS grid-auto-columns: "1px" onto "5px" -PASS grid-auto-flow (type: discrete) has testAccumulation function -PASS grid-auto-flow: "column" onto "row" -PASS grid-auto-flow: "row" onto "column" -PASS grid-auto-rows (type: discrete) has testAccumulation function -PASS grid-auto-rows: "5px" onto "1px" -PASS grid-auto-rows: "1px" onto "5px" -PASS grid-column-end (type: discrete) has testAccumulation function -PASS grid-column-end: "5" onto "1" -PASS grid-column-end: "1" onto "5" -PASS grid-column-start (type: discrete) has testAccumulation function -PASS grid-column-start: "5" onto "1" -PASS grid-column-start: "1" onto "5" -PASS grid-row-end (type: discrete) has testAccumulation function -PASS grid-row-end: "5" onto "1" -PASS grid-row-end: "1" onto "5" -PASS grid-row-start (type: discrete) has testAccumulation function -PASS grid-row-start: "5" onto "1" -PASS grid-row-start: "1" onto "5" -PASS grid-template-areas (type: discrete) has testAccumulation function -PASS grid-template-areas: "none" onto "". . a b" ". .a b"" -FAIL grid-template-areas: "". . a b" ". .a b"" onto "none" assert_equals: The value should be ". . a b" ". .a b" at 0ms expected "\". . a b\" \". .a b\"" but got "\". . a b\" \". . a b\"" -PASS hyphens (type: discrete) has testAccumulation function -PASS hyphens: "none" onto "manual" -PASS hyphens: "manual" onto "none" -PASS image-orientation (type: discrete) has testAccumulation function -PASS image-orientation: "from-image" onto "none" -PASS image-orientation: "none" onto "from-image" -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/web-animations/animation-model/animation-types/addition-per-property-001-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/web-animations/animation-model/animation-types/addition-per-property-001-expected.txt deleted file mode 100644 index 12c932a..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/web-animations/animation-model/animation-types/addition-per-property-001-expected.txt +++ /dev/null
@@ -1,314 +0,0 @@ -This is a testharness.js-based test. -Found 310 tests; 308 PASS, 2 FAIL, 0 TIMEOUT, 0 NOTRUN. -PASS Setup -PASS align-content (type: discrete) has testAddition function -PASS align-content: "flex-end" onto "flex-start" -PASS align-content: "flex-start" onto "flex-end" -PASS align-items (type: discrete) has testAddition function -PASS align-items: "flex-end" onto "flex-start" -PASS align-items: "flex-start" onto "flex-end" -PASS align-self (type: discrete) has testAddition function -PASS align-self: "flex-end" onto "flex-start" -PASS align-self: "flex-start" onto "flex-end" -PASS backface-visibility (type: discrete) has testAddition function -PASS backface-visibility: "hidden" onto "visible" -PASS backface-visibility: "visible" onto "hidden" -PASS background-attachment (type: discrete) has testAddition function -PASS background-attachment: "local" onto "fixed" -PASS background-attachment: "fixed" onto "local" -PASS background-color (type: color) has testAddition function -PASS background-color supports animating as color of rgb() with overflowed from and to values -PASS background-color supports animating as color of #RGB -PASS background-color supports animating as color of hsl() -PASS background-color supports animating as color of #RGBa -PASS background-color supports animating as color of rgba() -PASS background-color supports animating as color of hsla() -PASS background-blend-mode (type: discrete) has testAddition function -PASS background-blend-mode: "screen" onto "multiply" -PASS background-blend-mode: "multiply" onto "screen" -PASS background-clip (type: discrete) has testAddition function -PASS background-clip: "content-box" onto "padding-box" -PASS background-clip: "padding-box" onto "content-box" -PASS background-image (type: discrete) has testAddition function -PASS background-image: "url("http://localhost/test-2")" onto "url("http://localhost/test-1")" -PASS background-image: "url("http://localhost/test-1")" onto "url("http://localhost/test-2")" -PASS background-origin (type: discrete) has testAddition function -PASS background-origin: "content-box" onto "padding-box" -PASS background-origin: "padding-box" onto "content-box" -PASS background-repeat (type: discrete) has testAddition function -PASS background-repeat: "round" onto "space" -PASS background-repeat: "space" onto "round" -PASS border-bottom-color (type: color) has testAddition function -PASS border-bottom-color supports animating as color of rgb() with overflowed from and to values -PASS border-bottom-color supports animating as color of #RGB -PASS border-bottom-color supports animating as color of hsl() -PASS border-bottom-color supports animating as color of #RGBa -PASS border-bottom-color supports animating as color of rgba() -PASS border-bottom-color supports animating as color of hsla() -PASS border-bottom-style (type: discrete) has testAddition function -PASS border-bottom-style: "solid" onto "dotted" -PASS border-bottom-style: "dotted" onto "solid" -PASS border-bottom-width (type: length) has testAddition function -PASS border-bottom-width: length -PASS border-bottom-width: length of rem -PASS border-collapse (type: discrete) has testAddition function -PASS border-collapse: "separate" onto "collapse" -PASS border-collapse: "collapse" onto "separate" -PASS border-image-repeat (type: discrete) has testAddition function -PASS border-image-repeat: "round space" onto "stretch repeat" -PASS border-image-repeat: "stretch repeat" onto "round space" -PASS border-image-source (type: discrete) has testAddition function -PASS border-image-source: "url("http://localhost/test-2")" onto "url("http://localhost/test-1")" -PASS border-image-source: "url("http://localhost/test-1")" onto "url("http://localhost/test-2")" -PASS border-left-color (type: color) has testAddition function -PASS border-left-color supports animating as color of rgb() with overflowed from and to values -PASS border-left-color supports animating as color of #RGB -PASS border-left-color supports animating as color of hsl() -PASS border-left-color supports animating as color of #RGBa -PASS border-left-color supports animating as color of rgba() -PASS border-left-color supports animating as color of hsla() -PASS border-left-style (type: discrete) has testAddition function -PASS border-left-style: "solid" onto "dotted" -PASS border-left-style: "dotted" onto "solid" -PASS border-left-width (type: length) has testAddition function -PASS border-left-width: length -PASS border-left-width: length of rem -PASS border-right-color (type: color) has testAddition function -PASS border-right-color supports animating as color of rgb() with overflowed from and to values -PASS border-right-color supports animating as color of #RGB -PASS border-right-color supports animating as color of hsl() -PASS border-right-color supports animating as color of #RGBa -PASS border-right-color supports animating as color of rgba() -PASS border-right-color supports animating as color of hsla() -PASS border-right-style (type: discrete) has testAddition function -PASS border-right-style: "solid" onto "dotted" -PASS border-right-style: "dotted" onto "solid" -PASS border-right-width (type: length) has testAddition function -PASS border-right-width: length -PASS border-right-width: length of rem -PASS border-spacing (type: lengthPair) has testAddition function -PASS border-spacing: length pair -PASS border-spacing: length pair of rem -PASS border-top-color (type: color) has testAddition function -PASS border-top-color supports animating as color of rgb() with overflowed from and to values -PASS border-top-color supports animating as color of #RGB -PASS border-top-color supports animating as color of hsl() -PASS border-top-color supports animating as color of #RGBa -PASS border-top-color supports animating as color of rgba() -PASS border-top-color supports animating as color of hsla() -PASS border-top-style (type: discrete) has testAddition function -PASS border-top-style: "solid" onto "dotted" -PASS border-top-style: "dotted" onto "solid" -PASS border-top-width (type: length) has testAddition function -PASS border-top-width: length -PASS border-top-width: length of rem -PASS box-shadow (type: boxShadowList) has testAddition function -PASS box-shadow: shadow -PASS box-sizing (type: discrete) has testAddition function -PASS box-sizing: "border-box" onto "content-box" -PASS box-sizing: "content-box" onto "border-box" -PASS caption-side (type: discrete) has testAddition function -PASS caption-side: "bottom" onto "top" -PASS caption-side: "top" onto "bottom" -PASS caret-color (type: color) has testAddition function -PASS caret-color supports animating as color of rgb() with overflowed from and to values -PASS caret-color supports animating as color of #RGB -PASS caret-color supports animating as color of hsl() -PASS caret-color supports animating as color of #RGBa -PASS caret-color supports animating as color of rgba() -PASS caret-color supports animating as color of hsla() -PASS clear (type: discrete) has testAddition function -PASS clear: "right" onto "left" -PASS clear: "left" onto "right" -PASS clip (type: rect) has testAddition function -PASS clip: rect -PASS clip (type: discrete) has testAddition function -PASS clip: "auto" onto "rect(10px, 10px, 10px, 10px)" -PASS clip: "rect(10px, 10px, 10px, 10px)" onto "auto" -PASS clip: "rect(10px, 10px, 10px, auto)" onto "rect(10px, 10px, 10px, 10px)" -PASS clip: "rect(10px, 10px, 10px, 10px)" onto "rect(10px, 10px, 10px, auto)" -PASS clip-rule (type: discrete) has testAddition function -PASS clip-rule: "nonzero" onto "evenodd" -PASS clip-rule: "evenodd" onto "nonzero" -PASS color (type: color) has testAddition function -PASS color supports animating as color of rgb() with overflowed from and to values -PASS color supports animating as color of #RGB -PASS color supports animating as color of hsl() -PASS color supports animating as color of #RGBa -PASS color supports animating as color of rgba() -PASS color supports animating as color of hsla() -PASS color-interpolation (type: discrete) has testAddition function -PASS color-interpolation: "auto" onto "linearrgb" -PASS color-interpolation: "linearrgb" onto "auto" -PASS color-interpolation-filters (type: discrete) has testAddition function -PASS color-interpolation-filters: "linearrgb" onto "srgb" -PASS color-interpolation-filters: "srgb" onto "linearrgb" -PASS column-count (type: positiveInteger) has testAddition function -PASS column-count: positive integer -PASS column-count (type: discrete) has testAddition function -PASS column-count: "10" onto "auto" -PASS column-count: "auto" onto "10" -PASS column-gap (type: length) has testAddition function -PASS column-gap: length -PASS column-gap: length of rem -PASS column-gap (type: discrete) has testAddition function -PASS column-gap: "200px" onto "normal" -PASS column-gap: "normal" onto "200px" -PASS column-rule-color (type: color) has testAddition function -PASS column-rule-color supports animating as color of rgb() with overflowed from and to values -PASS column-rule-color supports animating as color of #RGB -PASS column-rule-color supports animating as color of hsl() -PASS column-rule-color supports animating as color of #RGBa -PASS column-rule-color supports animating as color of rgba() -PASS column-rule-color supports animating as color of hsla() -PASS column-fill (type: discrete) has testAddition function -PASS column-fill: "balance" onto "auto" -PASS column-fill: "auto" onto "balance" -PASS column-rule-style (type: discrete) has testAddition function -PASS column-rule-style: "dotted" onto "none" -PASS column-rule-style: "none" onto "dotted" -PASS column-rule-width (type: length) has testAddition function -PASS column-rule-width: length -PASS column-rule-width: length of rem -PASS column-width (type: length) has testAddition function -PASS column-width: length -PASS column-width: length of rem -PASS column-width (type: discrete) has testAddition function -PASS column-width: "1px" onto "auto" -PASS column-width: "auto" onto "1px" -PASS counter-increment (type: discrete) has testAddition function -PASS counter-increment: "ident-2 2" onto "ident-1 1" -PASS counter-increment: "ident-1 1" onto "ident-2 2" -PASS counter-reset (type: discrete) has testAddition function -PASS counter-reset: "ident-2 2" onto "ident-1 1" -PASS counter-reset: "ident-1 1" onto "ident-2 2" -PASS cursor (type: discrete) has testAddition function -PASS cursor: "wait" onto "pointer" -PASS cursor: "pointer" onto "wait" -PASS dominant-baseline (type: discrete) has testAddition function -PASS dominant-baseline: "alphabetic" onto "ideographic" -PASS dominant-baseline: "ideographic" onto "alphabetic" -PASS empty-cells (type: discrete) has testAddition function -PASS empty-cells: "hide" onto "show" -PASS empty-cells: "show" onto "hide" -PASS fill-opacity (type: opacity) has testAddition function -PASS fill-opacity: [0, 1] number -PASS fill-opacity: [0, 1] number (clamped) -PASS fill-rule (type: discrete) has testAddition function -PASS fill-rule: "nonzero" onto "evenodd" -PASS fill-rule: "evenodd" onto "nonzero" -PASS filter (type: filterList) has testAddition function -PASS filter: blur on blur -PASS filter: different filter functions -PASS flex-basis (type: lengthPercentageOrCalc) has testAddition function -PASS flex-basis: length -PASS flex-basis: length of rem -PASS flex-basis: percentage -PASS flex-basis: units "%" onto "px" -PASS flex-basis: units "px" onto "%" -PASS flex-basis: units "rem" onto "%" -PASS flex-basis: units "%" onto "rem" -PASS flex-basis: units "rem" onto "em" -PASS flex-basis: units "em" onto "rem" -PASS flex-basis: units "calc" onto "px" -PASS flex-basis: calc -PASS flex-basis (type: discrete) has testAddition function -PASS flex-basis: "10px" onto "auto" -PASS flex-basis: "auto" onto "10px" -PASS flex-direction (type: discrete) has testAddition function -PASS flex-direction: "row-reverse" onto "row" -PASS flex-direction: "row" onto "row-reverse" -PASS flex-grow (type: positiveNumber) has testAddition function -PASS flex-grow: positive number -PASS flex-shrink (type: positiveNumber) has testAddition function -PASS flex-shrink: positive number -PASS flex-wrap (type: discrete) has testAddition function -PASS flex-wrap: "wrap" onto "nowrap" -PASS flex-wrap: "nowrap" onto "wrap" -PASS flood-color (type: color) has testAddition function -PASS flood-color supports animating as color of rgb() with overflowed from and to values -PASS flood-color supports animating as color of #RGB -PASS flood-color supports animating as color of hsl() -PASS flood-color supports animating as color of #RGBa -PASS flood-color supports animating as color of rgba() -PASS flood-color supports animating as color of hsla() -PASS flood-opacity (type: opacity) has testAddition function -PASS flood-opacity: [0, 1] number -PASS flood-opacity: [0, 1] number (clamped) -PASS font-stretch (type: percentage) has testAddition function -PASS font-stretch: percentage -PASS font-style (type: discrete) has testAddition function -FAIL font-style: "oblique" onto "italic" assert_equals: The value should be oblique at 0ms expected "oblique" but got "italic" -PASS font-style: "italic" onto "oblique" -PASS float (type: discrete) has testAddition function -PASS float: "right" onto "left" -PASS float: "left" onto "right" -PASS font-family (type: discrete) has testAddition function -PASS font-family: "verdana" onto "helvetica" -PASS font-family: "helvetica" onto "verdana" -PASS font-feature-settings (type: discrete) has testAddition function -PASS font-feature-settings: "normal" onto ""liga" 5" -PASS font-feature-settings: ""liga" 5" onto "normal" -PASS font-kerning (type: discrete) has testAddition function -PASS font-kerning: "normal" onto "auto" -PASS font-kerning: "auto" onto "normal" -PASS font-synthesis (type: discrete) has testAddition function -PASS font-synthesis: "weight style" onto "none" -PASS font-synthesis: "none" onto "weight style" -PASS font-variant-alternates (type: discrete) has testAddition function -PASS font-variant-alternates: "stylistic(unknown)" onto "swash(unknown)" -PASS font-variant-alternates: "swash(unknown)" onto "stylistic(unknown)" -PASS font-variant-caps (type: discrete) has testAddition function -PASS font-variant-caps: "unicase" onto "small-caps" -PASS font-variant-caps: "small-caps" onto "unicase" -PASS font-variant-east-asian (type: discrete) has testAddition function -PASS font-variant-east-asian: "proportional-width" onto "full-width" -PASS font-variant-east-asian: "full-width" onto "proportional-width" -PASS font-variant-ligatures (type: discrete) has testAddition function -PASS font-variant-ligatures: "no-common-ligatures" onto "common-ligatures" -PASS font-variant-ligatures: "common-ligatures" onto "no-common-ligatures" -PASS font-variant-numeric (type: discrete) has testAddition function -PASS font-variant-numeric: "oldstyle-nums" onto "lining-nums" -PASS font-variant-numeric: "lining-nums" onto "oldstyle-nums" -PASS font-variant-position (type: discrete) has testAddition function -PASS font-variant-position: "super" onto "sub" -PASS font-variant-position: "sub" onto "super" -PASS font-variation-settings (type: fontVariationSettings) has testAddition function -PASS font-variation-settings with composite type add -PASS font-variation-settings (type: discrete) has testAddition function -PASS font-variation-settings: ""wdth" 5" onto ""wdth" 1, "wght" 1.1" -PASS font-variation-settings: ""wdth" 1, "wght" 1.1" onto ""wdth" 5" -PASS font-variation-settings: "normal" onto ""wdth" 5" -PASS font-variation-settings: ""wdth" 5" onto "normal" -PASS grid-auto-columns (type: discrete) has testAddition function -PASS grid-auto-columns: "5px" onto "1px" -PASS grid-auto-columns: "1px" onto "5px" -PASS grid-auto-flow (type: discrete) has testAddition function -PASS grid-auto-flow: "column" onto "row" -PASS grid-auto-flow: "row" onto "column" -PASS grid-auto-rows (type: discrete) has testAddition function -PASS grid-auto-rows: "5px" onto "1px" -PASS grid-auto-rows: "1px" onto "5px" -PASS grid-column-end (type: discrete) has testAddition function -PASS grid-column-end: "5" onto "1" -PASS grid-column-end: "1" onto "5" -PASS grid-column-start (type: discrete) has testAddition function -PASS grid-column-start: "5" onto "1" -PASS grid-column-start: "1" onto "5" -PASS grid-row-end (type: discrete) has testAddition function -PASS grid-row-end: "5" onto "1" -PASS grid-row-end: "1" onto "5" -PASS grid-row-start (type: discrete) has testAddition function -PASS grid-row-start: "5" onto "1" -PASS grid-row-start: "1" onto "5" -PASS grid-template-areas (type: discrete) has testAddition function -PASS grid-template-areas: "none" onto "". . a b" ". .a b"" -FAIL grid-template-areas: "". . a b" ". .a b"" onto "none" assert_equals: The value should be ". . a b" ". .a b" at 0ms expected "\". . a b\" \". .a b\"" but got "\". . a b\" \". . a b\"" -PASS hyphens (type: discrete) has testAddition function -PASS hyphens: "none" onto "manual" -PASS hyphens: "manual" onto "none" -PASS image-orientation (type: discrete) has testAddition function -PASS image-orientation: "from-image" onto "none" -PASS image-orientation: "none" onto "from-image" -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/web-animations/animation-model/animation-types/interpolation-per-property-001-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/web-animations/animation-model/animation-types/interpolation-per-property-001-expected.txt deleted file mode 100644 index 4a57389..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/web-animations/animation-model/animation-types/interpolation-per-property-001-expected.txt +++ /dev/null
@@ -1,389 +0,0 @@ -This is a testharness.js-based test. -Found 385 tests; 373 PASS, 12 FAIL, 0 TIMEOUT, 0 NOTRUN. -PASS Setup -PASS align-content (type: discrete) has testInterpolation function -PASS align-content uses discrete animation when animating between "flex-start" and "flex-end" with linear easing -PASS align-content uses discrete animation when animating between "flex-start" and "flex-end" with effect easing -PASS align-content uses discrete animation when animating between "flex-start" and "flex-end" with keyframe easing -PASS align-items (type: discrete) has testInterpolation function -PASS align-items uses discrete animation when animating between "flex-start" and "flex-end" with linear easing -PASS align-items uses discrete animation when animating between "flex-start" and "flex-end" with effect easing -PASS align-items uses discrete animation when animating between "flex-start" and "flex-end" with keyframe easing -PASS align-self (type: discrete) has testInterpolation function -PASS align-self uses discrete animation when animating between "flex-start" and "flex-end" with linear easing -PASS align-self uses discrete animation when animating between "flex-start" and "flex-end" with effect easing -PASS align-self uses discrete animation when animating between "flex-start" and "flex-end" with keyframe easing -PASS backface-visibility (type: discrete) has testInterpolation function -PASS backface-visibility uses discrete animation when animating between "visible" and "hidden" with linear easing -PASS backface-visibility uses discrete animation when animating between "visible" and "hidden" with effect easing -PASS backface-visibility uses discrete animation when animating between "visible" and "hidden" with keyframe easing -PASS background-attachment (type: discrete) has testInterpolation function -PASS background-attachment uses discrete animation when animating between "fixed" and "local" with linear easing -PASS background-attachment uses discrete animation when animating between "fixed" and "local" with effect easing -PASS background-attachment uses discrete animation when animating between "fixed" and "local" with keyframe easing -PASS background-color (type: color) has testInterpolation function -PASS background-color supports animating as color of rgb() -PASS background-color supports animating as color of #RGB -PASS background-color supports animating as color of hsl() -PASS background-color supports animating as color of #RGBa -PASS background-color supports animating as color of rgba() -PASS background-color supports animating as color of hsla() -PASS background-blend-mode (type: discrete) has testInterpolation function -PASS background-blend-mode uses discrete animation when animating between "multiply" and "screen" with linear easing -PASS background-blend-mode uses discrete animation when animating between "multiply" and "screen" with effect easing -PASS background-blend-mode uses discrete animation when animating between "multiply" and "screen" with keyframe easing -PASS background-clip (type: discrete) has testInterpolation function -PASS background-clip uses discrete animation when animating between "padding-box" and "content-box" with linear easing -PASS background-clip uses discrete animation when animating between "padding-box" and "content-box" with effect easing -PASS background-clip uses discrete animation when animating between "padding-box" and "content-box" with keyframe easing -PASS background-image (type: discrete) has testInterpolation function -FAIL background-image uses discrete animation when animating between "url("http://localhost/test-1")" and "url("http://localhost/test-2")" with linear easing assert_equals: The value should be url("http://localhost/test-1") at 499ms expected "url(\"http://localhost/test-1\")" but got "-webkit-cross-fade(url(\"http://localhost/test-1\"), url(\"http://localhost/test-2\"), 0.499)" -FAIL background-image uses discrete animation when animating between "url("http://localhost/test-1")" and "url("http://localhost/test-2")" with effect easing assert_equals: The value should be url("http://localhost/test-1") at 940ms expected "url(\"http://localhost/test-1\")" but got "-webkit-cross-fade(url(\"http://localhost/test-1\"), url(\"http://localhost/test-2\"), 0.428259)" -FAIL background-image uses discrete animation when animating between "url("http://localhost/test-1")" and "url("http://localhost/test-2")" with keyframe easing assert_equals: The value should be url("http://localhost/test-1") at 940ms expected "url(\"http://localhost/test-1\")" but got "-webkit-cross-fade(url(\"http://localhost/test-1\"), url(\"http://localhost/test-2\"), 0.428259)" -PASS background-origin (type: discrete) has testInterpolation function -PASS background-origin uses discrete animation when animating between "padding-box" and "content-box" with linear easing -PASS background-origin uses discrete animation when animating between "padding-box" and "content-box" with effect easing -PASS background-origin uses discrete animation when animating between "padding-box" and "content-box" with keyframe easing -PASS background-repeat (type: discrete) has testInterpolation function -PASS background-repeat uses discrete animation when animating between "space" and "round" with linear easing -PASS background-repeat uses discrete animation when animating between "space" and "round" with effect easing -PASS background-repeat uses discrete animation when animating between "space" and "round" with keyframe easing -PASS border-bottom-color (type: color) has testInterpolation function -PASS border-bottom-color supports animating as color of rgb() -PASS border-bottom-color supports animating as color of #RGB -PASS border-bottom-color supports animating as color of hsl() -PASS border-bottom-color supports animating as color of #RGBa -PASS border-bottom-color supports animating as color of rgba() -PASS border-bottom-color supports animating as color of hsla() -PASS border-bottom-style (type: discrete) has testInterpolation function -PASS border-bottom-style uses discrete animation when animating between "dotted" and "solid" with linear easing -PASS border-bottom-style uses discrete animation when animating between "dotted" and "solid" with effect easing -PASS border-bottom-style uses discrete animation when animating between "dotted" and "solid" with keyframe easing -PASS border-bottom-width (type: length) has testInterpolation function -PASS border-bottom-width supports animating as a length -PASS border-bottom-width supports animating as a length of rem -PASS border-collapse (type: discrete) has testInterpolation function -PASS border-collapse uses discrete animation when animating between "collapse" and "separate" with linear easing -PASS border-collapse uses discrete animation when animating between "collapse" and "separate" with effect easing -PASS border-collapse uses discrete animation when animating between "collapse" and "separate" with keyframe easing -PASS border-image-repeat (type: discrete) has testInterpolation function -PASS border-image-repeat uses discrete animation when animating between "stretch repeat" and "round space" with linear easing -PASS border-image-repeat uses discrete animation when animating between "stretch repeat" and "round space" with effect easing -PASS border-image-repeat uses discrete animation when animating between "stretch repeat" and "round space" with keyframe easing -PASS border-image-source (type: discrete) has testInterpolation function -FAIL border-image-source uses discrete animation when animating between "url("http://localhost/test-1")" and "url("http://localhost/test-2")" with linear easing assert_equals: The value should be url("http://localhost/test-1") at 499ms expected "url(\"http://localhost/test-1\")" but got "-webkit-cross-fade(url(\"http://localhost/test-1\"), url(\"http://localhost/test-2\"), 0.499)" -FAIL border-image-source uses discrete animation when animating between "url("http://localhost/test-1")" and "url("http://localhost/test-2")" with effect easing assert_equals: The value should be url("http://localhost/test-1") at 940ms expected "url(\"http://localhost/test-1\")" but got "-webkit-cross-fade(url(\"http://localhost/test-1\"), url(\"http://localhost/test-2\"), 0.428259)" -FAIL border-image-source uses discrete animation when animating between "url("http://localhost/test-1")" and "url("http://localhost/test-2")" with keyframe easing assert_equals: The value should be url("http://localhost/test-1") at 940ms expected "url(\"http://localhost/test-1\")" but got "-webkit-cross-fade(url(\"http://localhost/test-1\"), url(\"http://localhost/test-2\"), 0.428259)" -PASS border-left-color (type: color) has testInterpolation function -PASS border-left-color supports animating as color of rgb() -PASS border-left-color supports animating as color of #RGB -PASS border-left-color supports animating as color of hsl() -PASS border-left-color supports animating as color of #RGBa -PASS border-left-color supports animating as color of rgba() -PASS border-left-color supports animating as color of hsla() -PASS border-left-style (type: discrete) has testInterpolation function -PASS border-left-style uses discrete animation when animating between "dotted" and "solid" with linear easing -PASS border-left-style uses discrete animation when animating between "dotted" and "solid" with effect easing -PASS border-left-style uses discrete animation when animating between "dotted" and "solid" with keyframe easing -PASS border-left-width (type: length) has testInterpolation function -PASS border-left-width supports animating as a length -PASS border-left-width supports animating as a length of rem -PASS border-right-color (type: color) has testInterpolation function -PASS border-right-color supports animating as color of rgb() -PASS border-right-color supports animating as color of #RGB -PASS border-right-color supports animating as color of hsl() -PASS border-right-color supports animating as color of #RGBa -PASS border-right-color supports animating as color of rgba() -PASS border-right-color supports animating as color of hsla() -PASS border-right-style (type: discrete) has testInterpolation function -PASS border-right-style uses discrete animation when animating between "dotted" and "solid" with linear easing -PASS border-right-style uses discrete animation when animating between "dotted" and "solid" with effect easing -PASS border-right-style uses discrete animation when animating between "dotted" and "solid" with keyframe easing -PASS border-right-width (type: length) has testInterpolation function -PASS border-right-width supports animating as a length -PASS border-right-width supports animating as a length of rem -PASS border-spacing (type: lengthPair) has testInterpolation function -PASS border-spacing supports animating as a length pair -PASS border-spacing supports animating as a length pair of rem -PASS border-top-color (type: color) has testInterpolation function -PASS border-top-color supports animating as color of rgb() -PASS border-top-color supports animating as color of #RGB -PASS border-top-color supports animating as color of hsl() -PASS border-top-color supports animating as color of #RGBa -PASS border-top-color supports animating as color of rgba() -PASS border-top-color supports animating as color of hsla() -PASS border-top-style (type: discrete) has testInterpolation function -PASS border-top-style uses discrete animation when animating between "dotted" and "solid" with linear easing -PASS border-top-style uses discrete animation when animating between "dotted" and "solid" with effect easing -PASS border-top-style uses discrete animation when animating between "dotted" and "solid" with keyframe easing -PASS border-top-width (type: length) has testInterpolation function -PASS border-top-width supports animating as a length -PASS border-top-width supports animating as a length of rem -PASS box-shadow (type: boxShadowList) has testInterpolation function -PASS box-shadow: from none to other -PASS box-shadow: from other to none -PASS box-shadow: single shadow -PASS box-shadow: shadow list -PASS box-shadow: mismatched list length (from shorter to longer) -PASS box-shadow: mismatched list length (from longer to shorter) -PASS box-shadow: with currentcolor -PASS box-sizing (type: discrete) has testInterpolation function -PASS box-sizing uses discrete animation when animating between "content-box" and "border-box" with linear easing -PASS box-sizing uses discrete animation when animating between "content-box" and "border-box" with effect easing -PASS box-sizing uses discrete animation when animating between "content-box" and "border-box" with keyframe easing -PASS caption-side (type: discrete) has testInterpolation function -PASS caption-side uses discrete animation when animating between "top" and "bottom" with linear easing -PASS caption-side uses discrete animation when animating between "top" and "bottom" with effect easing -PASS caption-side uses discrete animation when animating between "top" and "bottom" with keyframe easing -PASS caret-color (type: color) has testInterpolation function -PASS caret-color supports animating as color of rgb() -PASS caret-color supports animating as color of #RGB -PASS caret-color supports animating as color of hsl() -PASS caret-color supports animating as color of #RGBa -PASS caret-color supports animating as color of rgba() -PASS caret-color supports animating as color of hsla() -PASS clear (type: discrete) has testInterpolation function -PASS clear uses discrete animation when animating between "left" and "right" with linear easing -PASS clear uses discrete animation when animating between "left" and "right" with effect easing -PASS clear uses discrete animation when animating between "left" and "right" with keyframe easing -PASS clip (type: rect) has testInterpolation function -PASS clip supports animating as a rect -PASS clip (type: discrete) has testInterpolation function -PASS clip uses discrete animation when animating between "rect(10px, 10px, 10px, 10px)" and "auto" with linear easing -PASS clip uses discrete animation when animating between "rect(10px, 10px, 10px, 10px)" and "auto" with effect easing -PASS clip uses discrete animation when animating between "rect(10px, 10px, 10px, 10px)" and "auto" with keyframe easing -PASS clip uses discrete animation when animating between "rect(10px, 10px, 10px, 10px)" and "rect(10px, 10px, 10px, auto)" with linear easing -PASS clip uses discrete animation when animating between "rect(10px, 10px, 10px, 10px)" and "rect(10px, 10px, 10px, auto)" with effect easing -PASS clip uses discrete animation when animating between "rect(10px, 10px, 10px, 10px)" and "rect(10px, 10px, 10px, auto)" with keyframe easing -PASS clip-rule (type: discrete) has testInterpolation function -PASS clip-rule uses discrete animation when animating between "evenodd" and "nonzero" with linear easing -PASS clip-rule uses discrete animation when animating between "evenodd" and "nonzero" with effect easing -PASS clip-rule uses discrete animation when animating between "evenodd" and "nonzero" with keyframe easing -PASS color (type: color) has testInterpolation function -PASS color supports animating as color of rgb() -PASS color supports animating as color of #RGB -PASS color supports animating as color of hsl() -PASS color supports animating as color of #RGBa -PASS color supports animating as color of rgba() -PASS color supports animating as color of hsla() -PASS color-interpolation (type: discrete) has testInterpolation function -PASS color-interpolation uses discrete animation when animating between "linearrgb" and "auto" with linear easing -PASS color-interpolation uses discrete animation when animating between "linearrgb" and "auto" with effect easing -PASS color-interpolation uses discrete animation when animating between "linearrgb" and "auto" with keyframe easing -PASS color-interpolation-filters (type: discrete) has testInterpolation function -PASS color-interpolation-filters uses discrete animation when animating between "srgb" and "linearrgb" with linear easing -PASS color-interpolation-filters uses discrete animation when animating between "srgb" and "linearrgb" with effect easing -PASS color-interpolation-filters uses discrete animation when animating between "srgb" and "linearrgb" with keyframe easing -PASS column-count (type: positiveInteger) has testInterpolation function -PASS column-count supports animating as a positive integer -PASS column-count (type: discrete) has testInterpolation function -PASS column-count uses discrete animation when animating between "auto" and "10" with linear easing -PASS column-count uses discrete animation when animating between "auto" and "10" with effect easing -PASS column-count uses discrete animation when animating between "auto" and "10" with keyframe easing -PASS column-gap (type: length) has testInterpolation function -PASS column-gap supports animating as a length -PASS column-gap supports animating as a length of rem -PASS column-gap (type: discrete) has testInterpolation function -PASS column-gap uses discrete animation when animating between "normal" and "200px" with linear easing -PASS column-gap uses discrete animation when animating between "normal" and "200px" with effect easing -PASS column-gap uses discrete animation when animating between "normal" and "200px" with keyframe easing -PASS column-rule-color (type: color) has testInterpolation function -PASS column-rule-color supports animating as color of rgb() -PASS column-rule-color supports animating as color of #RGB -PASS column-rule-color supports animating as color of hsl() -PASS column-rule-color supports animating as color of #RGBa -PASS column-rule-color supports animating as color of rgba() -PASS column-rule-color supports animating as color of hsla() -PASS column-fill (type: discrete) has testInterpolation function -PASS column-fill uses discrete animation when animating between "auto" and "balance" with linear easing -PASS column-fill uses discrete animation when animating between "auto" and "balance" with effect easing -PASS column-fill uses discrete animation when animating between "auto" and "balance" with keyframe easing -PASS column-rule-style (type: discrete) has testInterpolation function -PASS column-rule-style uses discrete animation when animating between "none" and "dotted" with linear easing -PASS column-rule-style uses discrete animation when animating between "none" and "dotted" with effect easing -PASS column-rule-style uses discrete animation when animating between "none" and "dotted" with keyframe easing -PASS column-rule-width (type: length) has testInterpolation function -PASS column-rule-width supports animating as a length -PASS column-rule-width supports animating as a length of rem -PASS column-width (type: length) has testInterpolation function -PASS column-width supports animating as a length -PASS column-width supports animating as a length of rem -PASS column-width (type: discrete) has testInterpolation function -PASS column-width uses discrete animation when animating between "auto" and "1px" with linear easing -PASS column-width uses discrete animation when animating between "auto" and "1px" with effect easing -PASS column-width uses discrete animation when animating between "auto" and "1px" with keyframe easing -PASS counter-increment (type: discrete) has testInterpolation function -PASS counter-increment uses discrete animation when animating between "ident-1 1" and "ident-2 2" with linear easing -PASS counter-increment uses discrete animation when animating between "ident-1 1" and "ident-2 2" with effect easing -PASS counter-increment uses discrete animation when animating between "ident-1 1" and "ident-2 2" with keyframe easing -PASS counter-reset (type: discrete) has testInterpolation function -PASS counter-reset uses discrete animation when animating between "ident-1 1" and "ident-2 2" with linear easing -PASS counter-reset uses discrete animation when animating between "ident-1 1" and "ident-2 2" with effect easing -PASS counter-reset uses discrete animation when animating between "ident-1 1" and "ident-2 2" with keyframe easing -PASS cursor (type: discrete) has testInterpolation function -PASS cursor uses discrete animation when animating between "pointer" and "wait" with linear easing -PASS cursor uses discrete animation when animating between "pointer" and "wait" with effect easing -PASS cursor uses discrete animation when animating between "pointer" and "wait" with keyframe easing -PASS dominant-baseline (type: discrete) has testInterpolation function -PASS dominant-baseline uses discrete animation when animating between "ideographic" and "alphabetic" with linear easing -PASS dominant-baseline uses discrete animation when animating between "ideographic" and "alphabetic" with effect easing -PASS dominant-baseline uses discrete animation when animating between "ideographic" and "alphabetic" with keyframe easing -PASS empty-cells (type: discrete) has testInterpolation function -PASS empty-cells uses discrete animation when animating between "show" and "hide" with linear easing -PASS empty-cells uses discrete animation when animating between "show" and "hide" with effect easing -PASS empty-cells uses discrete animation when animating between "show" and "hide" with keyframe easing -PASS fill-opacity (type: opacity) has testInterpolation function -PASS fill-opacity supports animating as a [0, 1] number -PASS fill-rule (type: discrete) has testInterpolation function -PASS fill-rule uses discrete animation when animating between "evenodd" and "nonzero" with linear easing -PASS fill-rule uses discrete animation when animating between "evenodd" and "nonzero" with effect easing -PASS fill-rule uses discrete animation when animating between "evenodd" and "nonzero" with keyframe easing -PASS filter (type: filterList) has testInterpolation function -PASS filter: blur function -PASS filter: hue-rotate function with same unit(deg) -PASS filter: hue-rotate function with different unit(deg -> rad) -PASS filter: drop-shadow function -PASS filter: percentage or numeric-specifiable functions (number value) -PASS filter: percentage or numeric-specifiable functions (percentage value) -PASS filter: interpolate different length of filter-function-list with function which lacuna value is 1 -PASS filter: interpolate different length of filter-function-list with function which lacuna value is 0 -PASS filter: interpolate different length of filter-function-list with drop-shadow function -PASS filter: interpolate from none -PASS filter: url function (interpoalte as discrete) -PASS flex-basis (type: lengthPercentageOrCalc) has testInterpolation function -PASS flex-basis supports animating as a length -PASS flex-basis supports animating as a length of rem -PASS flex-basis supports animating as a percentage -PASS flex-basis supports animating as combination units "px" and "%" -PASS flex-basis supports animating as combination units "%" and "em" -PASS flex-basis supports animating as combination units "em" and "rem" -PASS flex-basis supports animating as combination units "px" and "calc" -PASS flex-basis supports animating as a calc -PASS flex-basis (type: discrete) has testInterpolation function -PASS flex-basis uses discrete animation when animating between "auto" and "10px" with linear easing -PASS flex-basis uses discrete animation when animating between "auto" and "10px" with effect easing -PASS flex-basis uses discrete animation when animating between "auto" and "10px" with keyframe easing -PASS flex-direction (type: discrete) has testInterpolation function -PASS flex-direction uses discrete animation when animating between "row" and "row-reverse" with linear easing -PASS flex-direction uses discrete animation when animating between "row" and "row-reverse" with effect easing -PASS flex-direction uses discrete animation when animating between "row" and "row-reverse" with keyframe easing -PASS flex-grow (type: positiveNumber) has testInterpolation function -PASS flex-grow supports animating as a positive number -PASS flex-shrink (type: positiveNumber) has testInterpolation function -PASS flex-shrink supports animating as a positive number -PASS flex-wrap (type: discrete) has testInterpolation function -PASS flex-wrap uses discrete animation when animating between "nowrap" and "wrap" with linear easing -PASS flex-wrap uses discrete animation when animating between "nowrap" and "wrap" with effect easing -PASS flex-wrap uses discrete animation when animating between "nowrap" and "wrap" with keyframe easing -PASS flood-color (type: color) has testInterpolation function -PASS flood-color supports animating as color of rgb() -PASS flood-color supports animating as color of #RGB -PASS flood-color supports animating as color of hsl() -PASS flood-color supports animating as color of #RGBa -PASS flood-color supports animating as color of rgba() -PASS flood-color supports animating as color of hsla() -PASS flood-opacity (type: opacity) has testInterpolation function -PASS flood-opacity supports animating as a [0, 1] number -PASS font-stretch (type: percentage) has testInterpolation function -PASS font-stretch supports animating as a percentage -PASS font-style (type: discrete) has testInterpolation function -FAIL font-style uses discrete animation when animating between "italic" and "oblique" with linear easing assert_equals: The value should be oblique at 500ms expected "oblique" but got "italic" -FAIL font-style uses discrete animation when animating between "italic" and "oblique" with effect easing assert_equals: The value should be oblique at 960ms expected "oblique" but got "italic" -FAIL font-style uses discrete animation when animating between "italic" and "oblique" with keyframe easing assert_equals: The value should be oblique at 960ms expected "oblique" but got "italic" -PASS float (type: discrete) has testInterpolation function -PASS float uses discrete animation when animating between "left" and "right" with linear easing -PASS float uses discrete animation when animating between "left" and "right" with effect easing -PASS float uses discrete animation when animating between "left" and "right" with keyframe easing -PASS font-family (type: discrete) has testInterpolation function -PASS font-family uses discrete animation when animating between "helvetica" and "verdana" with linear easing -PASS font-family uses discrete animation when animating between "helvetica" and "verdana" with effect easing -PASS font-family uses discrete animation when animating between "helvetica" and "verdana" with keyframe easing -PASS font-feature-settings (type: discrete) has testInterpolation function -PASS font-feature-settings uses discrete animation when animating between ""liga" 5" and "normal" with linear easing -PASS font-feature-settings uses discrete animation when animating between ""liga" 5" and "normal" with effect easing -PASS font-feature-settings uses discrete animation when animating between ""liga" 5" and "normal" with keyframe easing -PASS font-kerning (type: discrete) has testInterpolation function -PASS font-kerning uses discrete animation when animating between "auto" and "normal" with linear easing -PASS font-kerning uses discrete animation when animating between "auto" and "normal" with effect easing -PASS font-kerning uses discrete animation when animating between "auto" and "normal" with keyframe easing -PASS font-synthesis (type: discrete) has testInterpolation function -PASS font-synthesis uses discrete animation when animating between "none" and "weight style" with linear easing -PASS font-synthesis uses discrete animation when animating between "none" and "weight style" with effect easing -PASS font-synthesis uses discrete animation when animating between "none" and "weight style" with keyframe easing -PASS font-variant-alternates (type: discrete) has testInterpolation function -PASS font-variant-alternates uses discrete animation when animating between "swash(unknown)" and "stylistic(unknown)" with linear easing -PASS font-variant-alternates uses discrete animation when animating between "swash(unknown)" and "stylistic(unknown)" with effect easing -PASS font-variant-alternates uses discrete animation when animating between "swash(unknown)" and "stylistic(unknown)" with keyframe easing -PASS font-variant-caps (type: discrete) has testInterpolation function -PASS font-variant-caps uses discrete animation when animating between "small-caps" and "unicase" with linear easing -PASS font-variant-caps uses discrete animation when animating between "small-caps" and "unicase" with effect easing -PASS font-variant-caps uses discrete animation when animating between "small-caps" and "unicase" with keyframe easing -PASS font-variant-east-asian (type: discrete) has testInterpolation function -PASS font-variant-east-asian uses discrete animation when animating between "full-width" and "proportional-width" with linear easing -PASS font-variant-east-asian uses discrete animation when animating between "full-width" and "proportional-width" with effect easing -PASS font-variant-east-asian uses discrete animation when animating between "full-width" and "proportional-width" with keyframe easing -PASS font-variant-ligatures (type: discrete) has testInterpolation function -PASS font-variant-ligatures uses discrete animation when animating between "common-ligatures" and "no-common-ligatures" with linear easing -PASS font-variant-ligatures uses discrete animation when animating between "common-ligatures" and "no-common-ligatures" with effect easing -PASS font-variant-ligatures uses discrete animation when animating between "common-ligatures" and "no-common-ligatures" with keyframe easing -PASS font-variant-numeric (type: discrete) has testInterpolation function -PASS font-variant-numeric uses discrete animation when animating between "lining-nums" and "oldstyle-nums" with linear easing -PASS font-variant-numeric uses discrete animation when animating between "lining-nums" and "oldstyle-nums" with effect easing -PASS font-variant-numeric uses discrete animation when animating between "lining-nums" and "oldstyle-nums" with keyframe easing -PASS font-variant-position (type: discrete) has testInterpolation function -PASS font-variant-position uses discrete animation when animating between "sub" and "super" with linear easing -PASS font-variant-position uses discrete animation when animating between "sub" and "super" with effect easing -PASS font-variant-position uses discrete animation when animating between "sub" and "super" with keyframe easing -PASS font-variation-settings (type: fontVariationSettings) has testInterpolation function -PASS font-variation-settings supports animation as float -PASS font-variation-settings supports animation as float with multiple tags -PASS font-variation-settings supports animation as float with multiple duplicate tags -PASS font-variation-settings (type: discrete) has testInterpolation function -PASS font-variation-settings uses discrete animation when animating between ""wdth" 1, "wght" 1.1" and ""wdth" 5" with linear easing -PASS font-variation-settings uses discrete animation when animating between ""wdth" 1, "wght" 1.1" and ""wdth" 5" with effect easing -PASS font-variation-settings uses discrete animation when animating between ""wdth" 1, "wght" 1.1" and ""wdth" 5" with keyframe easing -PASS font-variation-settings uses discrete animation when animating between ""wdth" 5" and "normal" with linear easing -PASS font-variation-settings uses discrete animation when animating between ""wdth" 5" and "normal" with effect easing -PASS font-variation-settings uses discrete animation when animating between ""wdth" 5" and "normal" with keyframe easing -PASS grid-auto-columns (type: discrete) has testInterpolation function -PASS grid-auto-columns uses discrete animation when animating between "1px" and "5px" with linear easing -PASS grid-auto-columns uses discrete animation when animating between "1px" and "5px" with effect easing -PASS grid-auto-columns uses discrete animation when animating between "1px" and "5px" with keyframe easing -PASS grid-auto-flow (type: discrete) has testInterpolation function -PASS grid-auto-flow uses discrete animation when animating between "row" and "column" with linear easing -PASS grid-auto-flow uses discrete animation when animating between "row" and "column" with effect easing -PASS grid-auto-flow uses discrete animation when animating between "row" and "column" with keyframe easing -PASS grid-auto-rows (type: discrete) has testInterpolation function -PASS grid-auto-rows uses discrete animation when animating between "1px" and "5px" with linear easing -PASS grid-auto-rows uses discrete animation when animating between "1px" and "5px" with effect easing -PASS grid-auto-rows uses discrete animation when animating between "1px" and "5px" with keyframe easing -PASS grid-column-end (type: discrete) has testInterpolation function -PASS grid-column-end uses discrete animation when animating between "1" and "5" with linear easing -PASS grid-column-end uses discrete animation when animating between "1" and "5" with effect easing -PASS grid-column-end uses discrete animation when animating between "1" and "5" with keyframe easing -PASS grid-column-start (type: discrete) has testInterpolation function -PASS grid-column-start uses discrete animation when animating between "1" and "5" with linear easing -PASS grid-column-start uses discrete animation when animating between "1" and "5" with effect easing -PASS grid-column-start uses discrete animation when animating between "1" and "5" with keyframe easing -PASS grid-row-end (type: discrete) has testInterpolation function -PASS grid-row-end uses discrete animation when animating between "1" and "5" with linear easing -PASS grid-row-end uses discrete animation when animating between "1" and "5" with effect easing -PASS grid-row-end uses discrete animation when animating between "1" and "5" with keyframe easing -PASS grid-row-start (type: discrete) has testInterpolation function -PASS grid-row-start uses discrete animation when animating between "1" and "5" with linear easing -PASS grid-row-start uses discrete animation when animating between "1" and "5" with effect easing -PASS grid-row-start uses discrete animation when animating between "1" and "5" with keyframe easing -PASS grid-template-areas (type: discrete) has testInterpolation function -FAIL grid-template-areas uses discrete animation when animating between "". . a b" ". .a b"" and "none" with linear easing assert_equals: The value should be ". . a b" ". .a b" at 0ms expected "\". . a b\" \". .a b\"" but got "\". . a b\" \". . a b\"" -FAIL grid-template-areas uses discrete animation when animating between "". . a b" ". .a b"" and "none" with effect easing assert_equals: The value should be ". . a b" ". .a b" at 0ms expected "\". . a b\" \". .a b\"" but got "\". . a b\" \". . a b\"" -FAIL grid-template-areas uses discrete animation when animating between "". . a b" ". .a b"" and "none" with keyframe easing assert_equals: The value should be ". . a b" ". .a b" at 0ms expected "\". . a b\" \". .a b\"" but got "\". . a b\" \". . a b\"" -PASS hyphens (type: discrete) has testInterpolation function -PASS hyphens uses discrete animation when animating between "manual" and "none" with linear easing -PASS hyphens uses discrete animation when animating between "manual" and "none" with effect easing -PASS hyphens uses discrete animation when animating between "manual" and "none" with keyframe easing -PASS image-orientation (type: discrete) has testInterpolation function -PASS image-orientation uses discrete animation when animating between "none" and "from-image" with linear easing -PASS image-orientation uses discrete animation when animating between "none" and "from-image" with effect easing -PASS image-orientation uses discrete animation when animating between "none" and "from-image" with keyframe easing -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/webcodecs/full-cycle-test.https.any.worker_h264_annexb-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/webcodecs/full-cycle-test.https.any.worker_h264_annexb-expected.txt deleted file mode 100644 index 51e58ed7e..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/webcodecs/full-cycle-test.https.any.worker_h264_annexb-expected.txt +++ /dev/null
@@ -1,5 +0,0 @@ -This is a testharness.js-based test. -NOTRUN Encoding and decoding cycle Unsupported config: {"codec":"avc1.42001E","avc":{"format":"annexb"},"hasEmbeddedColorSpace":true,"hardwareAcceleration":"prefer-software","width":320,"height":200,"bitrate":1000000,"bitrateMode":"constant","framerate":30} -NOTRUN Encoding and decoding cycle w/ stripped color space Unsupported config: {"codec":"avc1.42001E","avc":{"format":"annexb"},"hasEmbeddedColorSpace":true,"hardwareAcceleration":"prefer-software","width":320,"height":200,"bitrate":1000000,"bitrateMode":"constant","framerate":30} -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/webcodecs/full-cycle-test.https.any.worker_h264_avc-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/webcodecs/full-cycle-test.https.any.worker_h264_avc-expected.txt deleted file mode 100644 index 4885b9f7..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/webcodecs/full-cycle-test.https.any.worker_h264_avc-expected.txt +++ /dev/null
@@ -1,5 +0,0 @@ -This is a testharness.js-based test. -NOTRUN Encoding and decoding cycle Unsupported config: {"codec":"avc1.42001E","avc":{"format":"avc"},"hasEmbeddedColorSpace":true,"hardwareAcceleration":"prefer-software","width":320,"height":200,"bitrate":1000000,"bitrateMode":"constant","framerate":30} -NOTRUN Encoding and decoding cycle w/ stripped color space Unsupported config: {"codec":"avc1.42001E","avc":{"format":"avc"},"hasEmbeddedColorSpace":true,"hardwareAcceleration":"prefer-software","width":320,"height":200,"bitrate":1000000,"bitrateMode":"constant","framerate":30} -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/webcodecs/full-cycle-test.https.any_h264_annexb-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/webcodecs/full-cycle-test.https.any_h264_annexb-expected.txt deleted file mode 100644 index 51e58ed7e..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/webcodecs/full-cycle-test.https.any_h264_annexb-expected.txt +++ /dev/null
@@ -1,5 +0,0 @@ -This is a testharness.js-based test. -NOTRUN Encoding and decoding cycle Unsupported config: {"codec":"avc1.42001E","avc":{"format":"annexb"},"hasEmbeddedColorSpace":true,"hardwareAcceleration":"prefer-software","width":320,"height":200,"bitrate":1000000,"bitrateMode":"constant","framerate":30} -NOTRUN Encoding and decoding cycle w/ stripped color space Unsupported config: {"codec":"avc1.42001E","avc":{"format":"annexb"},"hasEmbeddedColorSpace":true,"hardwareAcceleration":"prefer-software","width":320,"height":200,"bitrate":1000000,"bitrateMode":"constant","framerate":30} -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/webcodecs/full-cycle-test.https.any_h264_avc-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/webcodecs/full-cycle-test.https.any_h264_avc-expected.txt deleted file mode 100644 index 4885b9f7..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/webcodecs/full-cycle-test.https.any_h264_avc-expected.txt +++ /dev/null
@@ -1,5 +0,0 @@ -This is a testharness.js-based test. -NOTRUN Encoding and decoding cycle Unsupported config: {"codec":"avc1.42001E","avc":{"format":"avc"},"hasEmbeddedColorSpace":true,"hardwareAcceleration":"prefer-software","width":320,"height":200,"bitrate":1000000,"bitrateMode":"constant","framerate":30} -NOTRUN Encoding and decoding cycle w/ stripped color space Unsupported config: {"codec":"avc1.42001E","avc":{"format":"avc"},"hasEmbeddedColorSpace":true,"hardwareAcceleration":"prefer-software","width":320,"height":200,"bitrate":1000000,"bitrateMode":"constant","framerate":30} -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/webcodecs/temporal-svc-encoding.https.any.worker_h264-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/webcodecs/temporal-svc-encoding.https.any.worker_h264-expected.txt deleted file mode 100644 index 3440fb50..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/webcodecs/temporal-svc-encoding.https.any.worker_h264-expected.txt +++ /dev/null
@@ -1,5 +0,0 @@ -This is a testharness.js-based test. -NOTRUN SVC L1T2 Unsupported config: {"codec":"avc1.42001E","avc":{"format":"annexb"},"hardwareAcceleration":"prefer-software","width":320,"height":200,"bitrate":1000000,"bitrateMode":"constant","framerate":30,"scalabilityMode":"L1T2"} -NOTRUN SVC L1T3 Unsupported config: {"codec":"avc1.42001E","avc":{"format":"annexb"},"hardwareAcceleration":"prefer-software","width":320,"height":200,"bitrate":1000000,"bitrateMode":"constant","framerate":30,"scalabilityMode":"L1T3"} -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/webcodecs/temporal-svc-encoding.https.any_h264-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/webcodecs/temporal-svc-encoding.https.any_h264-expected.txt deleted file mode 100644 index 3440fb50..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/external/wpt/webcodecs/temporal-svc-encoding.https.any_h264-expected.txt +++ /dev/null
@@ -1,5 +0,0 @@ -This is a testharness.js-based test. -NOTRUN SVC L1T2 Unsupported config: {"codec":"avc1.42001E","avc":{"format":"annexb"},"hardwareAcceleration":"prefer-software","width":320,"height":200,"bitrate":1000000,"bitrateMode":"constant","framerate":30,"scalabilityMode":"L1T2"} -NOTRUN SVC L1T3 Unsupported config: {"codec":"avc1.42001E","avc":{"format":"annexb"},"hardwareAcceleration":"prefer-software","width":320,"height":200,"bitrate":1000000,"bitrateMode":"constant","framerate":30,"scalabilityMode":"L1T3"} -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/backgrounds/background-inherit-color-bug-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/backgrounds/background-inherit-color-bug-expected.png deleted file mode 100644 index b155b24..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/backgrounds/background-inherit-color-bug-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/backgrounds/background-leakage-transforms-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/backgrounds/background-leakage-transforms-expected.png deleted file mode 100644 index 7bf7ac5b..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/backgrounds/background-leakage-transforms-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/backgrounds/background-origin-root-element-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/backgrounds/background-origin-root-element-expected.png deleted file mode 100644 index 0aa150b..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/backgrounds/background-origin-root-element-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/backgrounds/selection-background-color-of-image-list-style-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/backgrounds/selection-background-color-of-image-list-style-expected.png deleted file mode 100644 index 39e4b5c0..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/backgrounds/selection-background-color-of-image-list-style-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/backgrounds/selection-background-color-of-list-style-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/backgrounds/selection-background-color-of-list-style-expected.png deleted file mode 100644 index 5dbc627..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/backgrounds/selection-background-color-of-list-style-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/block/basic/011-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/block/basic/011-expected.png deleted file mode 100644 index 749cdf7..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/block/basic/011-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/block/basic/015-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/block/basic/015-expected.png deleted file mode 100644 index c8cc1b6..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/block/basic/015-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/block/basic/020-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/block/basic/020-expected.png deleted file mode 100644 index 65b15896..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/block/basic/020-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/block/basic/align-attribute-ltr-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/block/basic/align-attribute-ltr-expected.png deleted file mode 100644 index 57787cc3..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/block/basic/align-attribute-ltr-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/block/basic/align-attribute-rtl-cell-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/block/basic/align-attribute-rtl-cell-expected.png deleted file mode 100644 index 60e36ee..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/block/basic/align-attribute-rtl-cell-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/block/basic/align-attribute-rtl-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/block/basic/align-attribute-rtl-expected.png deleted file mode 100644 index 5ed171c..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/block/basic/align-attribute-rtl-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/block/basic/minheight-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/block/basic/minheight-expected.png deleted file mode 100644 index 641dd9e..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/block/basic/minheight-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/block/float/016-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/block/float/016-expected.png deleted file mode 100644 index 559224b..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/block/float/016-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/block/float/centered-float-avoidance-complexity-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/block/float/centered-float-avoidance-complexity-expected.png deleted file mode 100644 index 8403002..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/block/float/centered-float-avoidance-complexity-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/block/float/float-avoidance-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/block/float/float-avoidance-expected.png deleted file mode 100644 index dd359a0d..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/block/float/float-avoidance-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/block/float/float-in-float-painting-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/block/float/float-in-float-painting-expected.png deleted file mode 100644 index a0c6ee88..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/block/float/float-in-float-painting-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/block/float/independent-align-positioning-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/block/float/independent-align-positioning-expected.png deleted file mode 100644 index 02e26bf..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/block/float/independent-align-positioning-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/block/float/nopaint-after-layer-destruction2-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/block/float/nopaint-after-layer-destruction2-expected.png deleted file mode 100644 index 928ca53..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/block/float/nopaint-after-layer-destruction2-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/block/float/overhanging-float-remove-from-fixed-position-block-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/block/float/overhanging-float-remove-from-fixed-position-block-expected.png deleted file mode 100644 index eda146c..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/block/float/overhanging-float-remove-from-fixed-position-block-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/block/float/overhanging-float-remove-from-fixed-position-block2-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/block/float/overhanging-float-remove-from-fixed-position-block2-expected.png deleted file mode 100644 index eda146c..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/block/float/overhanging-float-remove-from-fixed-position-block2-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/block/float/shrink-to-avoid-float-complexity-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/block/float/shrink-to-avoid-float-complexity-expected.png deleted file mode 100644 index f831fc0..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/block/float/shrink-to-avoid-float-complexity-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/block/positioning/absolute-in-inline-rtl-2-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/block/positioning/absolute-in-inline-rtl-2-expected.png deleted file mode 100644 index cc88862b..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/block/positioning/absolute-in-inline-rtl-2-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/block/positioning/absolute-in-inline-rtl-3-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/block/positioning/absolute-in-inline-rtl-3-expected.png deleted file mode 100644 index f9532a93..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/block/positioning/absolute-in-inline-rtl-3-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/block/positioning/absolute-in-inline-rtl-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/block/positioning/absolute-in-inline-rtl-expected.png deleted file mode 100644 index a3a4b76d..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/block/positioning/absolute-in-inline-rtl-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/block/positioning/absolute-in-inline-short-rtl-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/block/positioning/absolute-in-inline-short-rtl-expected.png deleted file mode 100644 index 231fec9..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/block/positioning/absolute-in-inline-short-rtl-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/block/positioning/auto/vertical-lr/001-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/block/positioning/auto/vertical-lr/001-expected.png deleted file mode 100644 index 72cd2037..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/block/positioning/auto/vertical-lr/001-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/block/positioning/auto/vertical-lr/002-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/block/positioning/auto/vertical-lr/002-expected.png deleted file mode 100644 index 2f7dc9a..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/block/positioning/auto/vertical-lr/002-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/block/positioning/auto/vertical-lr/003-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/block/positioning/auto/vertical-lr/003-expected.png deleted file mode 100644 index 2f7dc9a..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/block/positioning/auto/vertical-lr/003-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/block/positioning/auto/vertical-lr/004-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/block/positioning/auto/vertical-lr/004-expected.png deleted file mode 100644 index 2f7dc9a..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/block/positioning/auto/vertical-lr/004-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/block/positioning/auto/vertical-lr/005-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/block/positioning/auto/vertical-lr/005-expected.png deleted file mode 100644 index 83ef3a1..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/block/positioning/auto/vertical-lr/005-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/block/positioning/auto/vertical-lr/006-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/block/positioning/auto/vertical-lr/006-expected.png deleted file mode 100644 index 92acf3e1..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/block/positioning/auto/vertical-lr/006-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/block/positioning/auto/vertical-lr/007-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/block/positioning/auto/vertical-lr/007-expected.png deleted file mode 100644 index beed5472..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/block/positioning/auto/vertical-lr/007-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/block/positioning/auto/vertical-rl/007-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/block/positioning/auto/vertical-rl/007-expected.png deleted file mode 100644 index 88473d46..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/block/positioning/auto/vertical-rl/007-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/block/positioning/vertical-lr/001-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/block/positioning/vertical-lr/001-expected.png deleted file mode 100644 index 7827f1b..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/block/positioning/vertical-lr/001-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/block/positioning/vertical-rl/001-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/block/positioning/vertical-rl/001-expected.png deleted file mode 100644 index 0171687..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/block/positioning/vertical-rl/001-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/block/skip-cleaning-up-anonymous-wrappers-when-subtree-being-destroyed-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/block/skip-cleaning-up-anonymous-wrappers-when-subtree-being-destroyed-expected.txt deleted file mode 100644 index 751acb4..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/block/skip-cleaning-up-anonymous-wrappers-when-subtree-being-destroyed-expected.txt +++ /dev/null
@@ -1,3 +0,0 @@ -PASS -PASSPASSPASS -PASS PASS
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/borders/bidi-012-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/borders/bidi-012-expected.png deleted file mode 100644 index 1a1e2ef..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/borders/bidi-012-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/borders/border-antialiasing-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/borders/border-antialiasing-expected.png deleted file mode 100644 index 8640f331..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/borders/border-antialiasing-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/borders/fieldsetBorderRadius-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/borders/fieldsetBorderRadius-expected.png deleted file mode 100644 index e65a841..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/borders/fieldsetBorderRadius-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/borders/inline-mask-overlay-image-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/borders/inline-mask-overlay-image-expected.png deleted file mode 100644 index d6d76eb..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/borders/inline-mask-overlay-image-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/borders/inline-mask-overlay-image-outset-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/borders/inline-mask-overlay-image-outset-expected.png deleted file mode 100644 index 53200595..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/borders/inline-mask-overlay-image-outset-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/borders/overflow-hidden-border-radius-force-backing-store-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/borders/overflow-hidden-border-radius-force-backing-store-expected.txt deleted file mode 100644 index 81f04838..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/borders/overflow-hidden-border-radius-force-backing-store-expected.txt +++ /dev/null
@@ -1,28 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow DIV id='content'", - "bounds": [285, 1000], - "contentsOpaqueForText": true, - "transform": 1 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [50, 50, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/borders/rtl-border-02-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/borders/rtl-border-02-expected.png deleted file mode 100644 index 8d9b5e6..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/borders/rtl-border-02-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/box-shadow/basic-shadows-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/box-shadow/basic-shadows-expected.png deleted file mode 100644 index 1b9e2af..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/box-shadow/basic-shadows-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/box-shadow/box-shadow-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/box-shadow/box-shadow-expected.png deleted file mode 100644 index 96870e7..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/box-shadow/box-shadow-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/canvas/canvas-composite-video-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/canvas/canvas-composite-video-expected.png deleted file mode 100644 index 42a91d00..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/canvas/canvas-composite-video-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/canvas/canvas-composite-video-shadow-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/canvas/canvas-composite-video-shadow-expected.png deleted file mode 100644 index 195c1f3..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/canvas/canvas-composite-video-shadow-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/canvas/image-object-in-canvas-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/canvas/image-object-in-canvas-expected.png deleted file mode 100644 index bfab2c2..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/canvas/image-object-in-canvas-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/canvas/patternfill-repeat-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/canvas/patternfill-repeat-expected.png deleted file mode 100644 index 640fddc..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/canvas/patternfill-repeat-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/clip/overflow-border-radius-fixed-position-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/clip/overflow-border-radius-fixed-position-expected.png deleted file mode 100644 index 5a9afca2..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/clip/overflow-border-radius-fixed-position-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css-generated-content/012-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css-generated-content/012-expected.png deleted file mode 100644 index c2920fb..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css-generated-content/012-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css-generated-content/013-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css-generated-content/013-expected.png deleted file mode 100644 index c1723b3..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css-generated-content/013-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css-generated-content/table-before-after-child-add-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css-generated-content/table-before-after-child-add-expected.png deleted file mode 100644 index 2f653a37..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css-generated-content/table-before-after-child-add-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css-generated-content/table-cell-before-after-child-add-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css-generated-content/table-cell-before-after-child-add-expected.png deleted file mode 100644 index 0e129d46..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css-generated-content/table-cell-before-after-child-add-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css-generated-content/table-row-before-after-child-add-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css-generated-content/table-row-before-after-child-add-expected.png deleted file mode 100644 index 2f653a37..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css-generated-content/table-row-before-after-child-add-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css-generated-content/table-table-before-after-child-add-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css-generated-content/table-table-before-after-child-add-expected.png deleted file mode 100644 index 2f653a37..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css-generated-content/table-table-before-after-child-add-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css-grid-layout/grid-align-baseline-vertical-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css-grid-layout/grid-align-baseline-vertical-expected.txt deleted file mode 100644 index 434973e..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css-grid-layout/grid-align-baseline-vertical-expected.txt +++ /dev/null
@@ -1,16 +0,0 @@ -This is a testharness.js-based test. -PASS .grid 1 -PASS .grid 2 -PASS .grid 3 -FAIL .grid 4 assert_equals: -<div class="grid" style="-webkit-writing-mode: vertical-lr"> - <div id="baseline6" data-offset-x="18" class="firstRowFirstColumn alignSelfBaseline">ahem</div> - <div id="baseline7" data-offset-x="18" class="firstRowSecondColumn alignSelfBaseline"><img src="../../fast/replaced/resources/1x1-blue.png" style="width: 50px;"></div> - <div data-expected-width="50" data-offset-x="25" class="firstRowThirdColumn alignSelfCenter"><img src="../../fast/replaced/resources/1x1-blue.png" style="width: 50px; vertical-align: middle"></div> - <div data-expected-width="50" data-offset-x="0" class="firstRowFourthColumn alignSelfBaseline"><img src="../../fast/replaced/resources/1x1-blue.png" style="width: 50px; vertical-align: middle"></div> - <div data-expected-width="100" data-offset-x="0" class="firstRowFifthColumn" style="width: 100px;"></div> -</div> -offsetLeft expected 18 but got 17 -PASS .grid 5 -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/002-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/002-expected.png deleted file mode 100644 index c798092c..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/002-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/004-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/004-expected.png deleted file mode 100644 index 68441ad5..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/004-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/005-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/005-expected.png deleted file mode 100644 index 8ad8eab7..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/005-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/ZeroOpacityLayers-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/ZeroOpacityLayers-expected.png deleted file mode 100644 index 37d821d..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/ZeroOpacityLayers-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/ZeroOpacityLayers2-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/ZeroOpacityLayers2-expected.png deleted file mode 100644 index 3c8b88c8..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/ZeroOpacityLayers2-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/absolute-inline-alignment-2-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/absolute-inline-alignment-2-expected.png deleted file mode 100644 index e61542f7..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/absolute-inline-alignment-2-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/caption-width-absolute-position-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/caption-width-absolute-position-expected.png deleted file mode 100644 index 3f6af4a..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/caption-width-absolute-position-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/caption-width-absolute-position-offset-top-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/caption-width-absolute-position-offset-top-expected.png deleted file mode 100644 index 46577274..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/caption-width-absolute-position-offset-top-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/caption-width-fixed-position-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/caption-width-fixed-position-expected.png deleted file mode 100644 index 3f6af4a..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/caption-width-fixed-position-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/caption-width-fixed-position-offset-top-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/caption-width-fixed-position-offset-top-expected.png deleted file mode 100644 index 46577274..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/caption-width-fixed-position-offset-top-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/clip-zooming-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/clip-zooming-expected.png deleted file mode 100644 index f0615b0..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/clip-zooming-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/color-correction-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/color-correction-expected.png deleted file mode 100644 index 4daf4815..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/color-correction-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/content/content-quotes-01-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/content/content-quotes-01-expected.txt deleted file mode 100644 index aa4e2d11..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/content/content-quotes-01-expected.txt +++ /dev/null
@@ -1,13 +0,0 @@ -The texts between the markers should be identical. - -========Marker1======== - -ab 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 - -========Marker2======== - -WWaWWbWWWWWWWW 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 - -========Marker3======== - -FAILED: testWidth=195px; expected 194px
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/content/content-quotes-05-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/content/content-quotes-05-expected.txt deleted file mode 100644 index 77f6c55d..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/content/content-quotes-05-expected.txt +++ /dev/null
@@ -1,11 +0,0 @@ -========Marker1======== - -abc 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 - -========Marker2======== - -WWaWWWbWWWWWcWWWW 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 - -========Marker3======== - -FAILED: testWidth=232px; expected 231px
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/counters/counter-predefined-symbol-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/counters/counter-predefined-symbol-expected.png deleted file mode 100644 index 03fcff7..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/counters/counter-predefined-symbol-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/css1_forward_compatible_parsing-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/css1_forward_compatible_parsing-expected.png deleted file mode 100644 index 789003e..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/css1_forward_compatible_parsing-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/css3-nth-child-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/css3-nth-child-expected.png deleted file mode 100644 index 37249b0..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/css3-nth-child-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/css3-space-in-nth-and-lang-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/css3-space-in-nth-and-lang-expected.png deleted file mode 100644 index 6d869e5..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/css3-space-in-nth-and-lang-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/first-child-pseudo-class-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/first-child-pseudo-class-expected.png deleted file mode 100644 index 631928c..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/first-child-pseudo-class-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/first-letter-detach-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/first-letter-detach-expected.png deleted file mode 100644 index 03b0429..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/first-letter-detach-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/first-line-text-decoration-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/first-line-text-decoration-expected.png deleted file mode 100644 index cb996c7..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/first-line-text-decoration-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/first-line-text-decoration-inherited-from-parent-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/first-line-text-decoration-inherited-from-parent-expected.png deleted file mode 100644 index 367aafb..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/first-line-text-decoration-inherited-from-parent-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/first-of-type-pseudo-class-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/first-of-type-pseudo-class-expected.png deleted file mode 100644 index 6c7270d..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/first-of-type-pseudo-class-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/focus-ring-detached-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/focus-ring-detached-expected.png deleted file mode 100644 index 61466809..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/focus-ring-detached-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/font-face-opentype-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/font-face-opentype-expected.png deleted file mode 100644 index 1751b306..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/font-face-opentype-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/font_property_normal-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/font_property_normal-expected.png deleted file mode 100644 index 12a754c..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/font_property_normal-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/getComputedStyle/computed-style-listing-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/getComputedStyle/computed-style-listing-expected.txt deleted file mode 100644 index 324dcaf..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/getComputedStyle/computed-style-listing-expected.txt +++ /dev/null
@@ -1,381 +0,0 @@ -This test documents all computed styles on a div element. - -On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". - --webkit-border-horizontal-spacing: 0px --webkit-border-image: none --webkit-border-vertical-spacing: 0px --webkit-box-align: stretch --webkit-box-decoration-break: slice --webkit-box-direction: normal --webkit-box-flex: 0 --webkit-box-ordinal-group: 1 --webkit-box-orient: horizontal --webkit-box-pack: start --webkit-box-reflect: none --webkit-font-smoothing: auto --webkit-highlight: none --webkit-line-break: auto --webkit-line-clamp: none --webkit-locale: auto --webkit-mask-box-image: none --webkit-mask-box-image-outset: 0 --webkit-mask-box-image-repeat: stretch --webkit-mask-box-image-slice: 0 fill --webkit-mask-box-image-source: none --webkit-mask-box-image-width: auto --webkit-mask-clip: border-box --webkit-mask-composite: source-over --webkit-mask-image: none --webkit-mask-origin: border-box --webkit-mask-position: 0% 0% --webkit-mask-position-x: 0% --webkit-mask-position-y: 0% --webkit-mask-repeat: repeat --webkit-mask-size: auto --webkit-print-color-adjust: economy --webkit-rtl-ordering: logical --webkit-text-combine: none --webkit-text-decorations-in-effect: none --webkit-text-fill-color: rgb(0, 0, 0) --webkit-text-orientation: vertical-right --webkit-text-security: none --webkit-text-stroke-color: rgb(0, 0, 0) --webkit-text-stroke-width: 0px --webkit-user-drag: auto --webkit-user-modify: read-only --webkit-writing-mode: horizontal-tb -accent-color: auto -align-content: normal -align-items: normal -align-self: auto -alignment-baseline: auto -anchor-name: none -anchor-scroll: none -animation-delay-end: 0s -animation-delay-start: 0s -animation-direction: normal -animation-duration: 0s -animation-fill-mode: none -animation-iteration-count: 1 -animation-name: none -animation-play-state: running -animation-timeline: auto -animation-timing-function: ease -app-region: none -appearance: none -backdrop-filter: none -backface-visibility: visible -background-attachment: scroll -background-blend-mode: normal -background-clip: border-box -background-color: rgba(0, 0, 0, 0) -background-image: none -background-origin: padding-box -background-position: 0% 0% -background-position-x: 0% -background-position-y: 0% -background-repeat: repeat -background-size: auto -baseline-shift: 0px -baseline-source: auto -block-size: 0px -border-block-end-color: rgb(0, 0, 0) -border-block-end-style: none -border-block-end-width: 0px -border-block-start-color: rgb(0, 0, 0) -border-block-start-style: none -border-block-start-width: 0px -border-bottom-color: rgb(0, 0, 0) -border-bottom-left-radius: 0px -border-bottom-right-radius: 0px -border-bottom-style: none -border-bottom-width: 0px -border-collapse: separate -border-end-end-radius: 0px -border-end-start-radius: 0px -border-image-outset: 0 -border-image-repeat: stretch -border-image-slice: 100% -border-image-source: none -border-image-width: 1 -border-inline-end-color: rgb(0, 0, 0) -border-inline-end-style: none -border-inline-end-width: 0px -border-inline-start-color: rgb(0, 0, 0) -border-inline-start-style: none -border-inline-start-width: 0px -border-left-color: rgb(0, 0, 0) -border-left-style: none -border-left-width: 0px -border-right-color: rgb(0, 0, 0) -border-right-style: none -border-right-width: 0px -border-spacing: 0px 0px -border-start-end-radius: 0px -border-start-start-radius: 0px -border-top-color: rgb(0, 0, 0) -border-top-left-radius: 0px -border-top-right-radius: 0px -border-top-style: none -border-top-width: 0px -bottom: auto -box-shadow: none -box-sizing: content-box -break-after: auto -break-before: auto -break-inside: auto -buffered-rendering: auto -caption-side: top -caret-color: rgb(0, 0, 0) -clear: none -clip: auto -clip-path: none -clip-rule: nonzero -color: rgb(0, 0, 0) -color-interpolation: srgb -color-interpolation-filters: linearrgb -color-rendering: auto -column-count: auto -column-gap: normal -column-rule-color: rgb(0, 0, 0) -column-rule-style: none -column-rule-width: 0px -column-span: none -column-width: auto -contain-intrinsic-block-size: none -contain-intrinsic-height: none -contain-intrinsic-inline-size: none -contain-intrinsic-size: none -contain-intrinsic-width: none -container-name: none -container-type: normal -content: normal -cursor: auto -cx: 0px -cy: 0px -d: none -direction: ltr -display: block -dominant-baseline: auto -empty-cells: show -fill: rgb(0, 0, 0) -fill-opacity: 1 -fill-rule: nonzero -filter: none -flex-basis: auto -flex-direction: row -flex-grow: 0 -flex-shrink: 1 -flex-wrap: nowrap -float: none -flood-color: rgb(0, 0, 0) -flood-opacity: 1 -font-kerning: auto -font-optical-sizing: auto -font-palette: normal -font-size: 16px -font-size-adjust: none -font-stretch: 100% -font-style: normal -font-synthesis-small-caps: auto -font-synthesis-style: auto -font-synthesis-weight: auto -font-variant: normal -font-variant-alternates: normal -font-variant-caps: normal -font-variant-east-asian: normal -font-variant-ligatures: normal -font-variant-numeric: normal -font-variant-position: normal -font-weight: 400 -grid-auto-columns: auto -grid-auto-flow: row -grid-auto-rows: auto -grid-column-end: auto -grid-column-start: auto -grid-row-end: auto -grid-row-start: auto -grid-template-areas: none -grid-template-columns: none -grid-template-rows: none -height: 0px -hyphenate-character: auto -hyphenate-limit-chars: auto -hyphens: manual -image-orientation: from-image -image-rendering: auto -inline-size: 769px -inset-block-end: auto -inset-block-start: auto -inset-inline-end: auto -inset-inline-start: auto -isolation: auto -justify-content: normal -justify-items: normal -justify-self: auto -left: auto -letter-spacing: normal -lighting-color: rgb(255, 255, 255) -line-break: auto -line-height: normal -list-style-image: none -list-style-position: outside -list-style-type: disc -margin-block-end: 0px -margin-block-start: 0px -margin-bottom: 0px -margin-inline-end: 0px -margin-inline-start: 0px -margin-left: 0px -margin-right: 0px -margin-top: 0px -marker-end: none -marker-mid: none -marker-start: none -mask-type: luminance -math-depth: 0 -math-shift: normal -math-style: normal -max-block-size: none -max-height: none -max-inline-size: none -max-width: none -min-block-size: 0px -min-height: 0px -min-inline-size: 0px -min-width: 0px -mix-blend-mode: normal -object-fit: fill -object-position: 50% 50% -object-view-box: none -offset-anchor: auto -offset-distance: 0px -offset-path: none -offset-position: auto -offset-rotate: auto 0deg -opacity: 1 -order: 0 -orphans: 2 -outline-color: rgb(0, 0, 0) -outline-offset: 0px -outline-style: none -outline-width: 0px -overflow: visible -overflow-anchor: auto -overflow-block: visible -overflow-clip-margin: 0px -overflow-inline: visible -overflow-wrap: normal -overflow-x: visible -overflow-y: visible -overscroll-behavior-block: auto -overscroll-behavior-inline: auto -padding-block-end: 0px -padding-block-start: 0px -padding-bottom: 0px -padding-inline-end: 0px -padding-inline-start: 0px -padding-left: 0px -padding-right: 0px -padding-top: 0px -paint-order: normal -perspective: none -perspective-origin: 384.5px 0px -pointer-events: auto -position: static -position-fallback: none -r: 0px -resize: none -right: auto -rotate: none -row-gap: normal -ruby-position: over -rx: auto -ry: auto -scale: none -scroll-behavior: auto -scroll-margin-block-end: 0px -scroll-margin-block-start: 0px -scroll-margin-inline-end: 0px -scroll-margin-inline-start: 0px -scroll-padding-block-end: auto -scroll-padding-block-start: auto -scroll-padding-inline-end: auto -scroll-padding-inline-start: auto -scroll-timeline-axis: block -scroll-timeline-name: none -scrollbar-gutter: auto -scrollbar-width: auto -shape-image-threshold: 0 -shape-margin: 0px -shape-outside: none -shape-rendering: auto -speak: normal -stop-color: rgb(0, 0, 0) -stop-opacity: 1 -stroke: none -stroke-dasharray: none -stroke-dashoffset: 0px -stroke-linecap: butt -stroke-linejoin: miter -stroke-miterlimit: 4 -stroke-opacity: 1 -stroke-width: 1px -tab-size: 8 -table-layout: auto -text-align: start -text-align-last: auto -text-anchor: start -text-decoration: none solid rgb(0, 0, 0) -text-decoration-color: rgb(0, 0, 0) -text-decoration-line: none -text-decoration-skip-ink: auto -text-decoration-style: solid -text-emphasis-color: rgb(0, 0, 0) -text-emphasis-position: over -text-emphasis-style: none -text-indent: 0px -text-overflow: clip -text-rendering: auto -text-shadow: none -text-size-adjust: auto -text-transform: none -text-underline-position: auto -toggle-group: none -toggle-root: none -toggle-trigger: none -toggle-visibility: normal -top: auto -touch-action: auto -transform: none -transform-origin: 384.5px 0px -transform-style: flat -transition-delay: 0s -transition-duration: 0s -transition-property: all -transition-timing-function: ease -translate: none -unicode-bidi: normal -user-select: auto -vector-effect: none -vertical-align: baseline -view-timeline-axis: block -view-timeline-inset: 0px -view-timeline-name: none -visibility: visible -white-space: normal -widows: 2 -width: 769px -will-change: auto -word-break: normal -word-spacing: 0px -writing-mode: horizontal-tb -x: 0px -y: 0px -z-index: auto -zoom: 1 -PASS successfullyParsed is true - -TEST COMPLETE -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/getComputedStyle/computed-style-without-renderer-listing-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/getComputedStyle/computed-style-without-renderer-listing-expected.txt deleted file mode 100644 index 401bf96d..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/getComputedStyle/computed-style-without-renderer-listing-expected.txt +++ /dev/null
@@ -1,381 +0,0 @@ -This test documents all computed styles on a display: none element. - -On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". - --webkit-border-horizontal-spacing: 0px --webkit-border-image: none --webkit-border-vertical-spacing: 0px --webkit-box-align: stretch --webkit-box-decoration-break: slice --webkit-box-direction: normal --webkit-box-flex: 0 --webkit-box-ordinal-group: 1 --webkit-box-orient: horizontal --webkit-box-pack: start --webkit-box-reflect: none --webkit-font-smoothing: auto --webkit-highlight: none --webkit-line-break: auto --webkit-line-clamp: none --webkit-locale: auto --webkit-mask-box-image: none --webkit-mask-box-image-outset: 0 --webkit-mask-box-image-repeat: stretch --webkit-mask-box-image-slice: 0 fill --webkit-mask-box-image-source: none --webkit-mask-box-image-width: auto --webkit-mask-clip: border-box --webkit-mask-composite: source-over --webkit-mask-image: none --webkit-mask-origin: border-box --webkit-mask-position: 0% 0% --webkit-mask-position-x: 0% --webkit-mask-position-y: 0% --webkit-mask-repeat: repeat --webkit-mask-size: auto --webkit-print-color-adjust: economy --webkit-rtl-ordering: logical --webkit-text-combine: none --webkit-text-decorations-in-effect: none --webkit-text-fill-color: rgb(0, 0, 0) --webkit-text-orientation: vertical-right --webkit-text-security: none --webkit-text-stroke-color: rgb(0, 0, 0) --webkit-text-stroke-width: 0px --webkit-user-drag: auto --webkit-user-modify: read-only --webkit-writing-mode: horizontal-tb -accent-color: auto -align-content: normal -align-items: normal -align-self: auto -alignment-baseline: auto -anchor-name: none -anchor-scroll: none -animation-delay-end: 0s -animation-delay-start: 0s -animation-direction: normal -animation-duration: 0s -animation-fill-mode: none -animation-iteration-count: 1 -animation-name: none -animation-play-state: running -animation-timeline: auto -animation-timing-function: ease -app-region: none -appearance: none -backdrop-filter: none -backface-visibility: visible -background-attachment: scroll -background-blend-mode: normal -background-clip: border-box -background-color: rgba(0, 0, 0, 0) -background-image: none -background-origin: padding-box -background-position: 0% 0% -background-position-x: 0% -background-position-y: 0% -background-repeat: repeat -background-size: auto -baseline-shift: 0px -baseline-source: auto -block-size: auto -border-block-end-color: rgb(0, 0, 0) -border-block-end-style: none -border-block-end-width: 0px -border-block-start-color: rgb(0, 0, 0) -border-block-start-style: none -border-block-start-width: 0px -border-bottom-color: rgb(0, 0, 0) -border-bottom-left-radius: 0px -border-bottom-right-radius: 0px -border-bottom-style: none -border-bottom-width: 0px -border-collapse: separate -border-end-end-radius: 0px -border-end-start-radius: 0px -border-image-outset: 0 -border-image-repeat: stretch -border-image-slice: 100% -border-image-source: none -border-image-width: 1 -border-inline-end-color: rgb(0, 0, 0) -border-inline-end-style: none -border-inline-end-width: 0px -border-inline-start-color: rgb(0, 0, 0) -border-inline-start-style: none -border-inline-start-width: 0px -border-left-color: rgb(0, 0, 0) -border-left-style: none -border-left-width: 0px -border-right-color: rgb(0, 0, 0) -border-right-style: none -border-right-width: 0px -border-spacing: 0px 0px -border-start-end-radius: 0px -border-start-start-radius: 0px -border-top-color: rgb(0, 0, 0) -border-top-left-radius: 0px -border-top-right-radius: 0px -border-top-style: none -border-top-width: 0px -bottom: auto -box-shadow: none -box-sizing: content-box -break-after: auto -break-before: auto -break-inside: auto -buffered-rendering: auto -caption-side: top -caret-color: rgb(0, 0, 0) -clear: none -clip: auto -clip-path: none -clip-rule: nonzero -color: rgb(0, 0, 0) -color-interpolation: srgb -color-interpolation-filters: linearrgb -color-rendering: auto -column-count: auto -column-gap: normal -column-rule-color: rgb(0, 0, 0) -column-rule-style: none -column-rule-width: 0px -column-span: none -column-width: auto -contain-intrinsic-block-size: none -contain-intrinsic-height: none -contain-intrinsic-inline-size: none -contain-intrinsic-size: none -contain-intrinsic-width: none -container-name: none -container-type: normal -content: normal -cursor: auto -cx: 0px -cy: 0px -d: none -direction: ltr -display: none -dominant-baseline: auto -empty-cells: show -fill: rgb(0, 0, 0) -fill-opacity: 1 -fill-rule: nonzero -filter: none -flex-basis: auto -flex-direction: row -flex-grow: 0 -flex-shrink: 1 -flex-wrap: nowrap -float: none -flood-color: rgb(0, 0, 0) -flood-opacity: 1 -font-kerning: auto -font-optical-sizing: auto -font-palette: normal -font-size: 16px -font-size-adjust: none -font-stretch: 100% -font-style: normal -font-synthesis-small-caps: auto -font-synthesis-style: auto -font-synthesis-weight: auto -font-variant: normal -font-variant-alternates: normal -font-variant-caps: normal -font-variant-east-asian: normal -font-variant-ligatures: normal -font-variant-numeric: normal -font-variant-position: normal -font-weight: 400 -grid-auto-columns: auto -grid-auto-flow: row -grid-auto-rows: auto -grid-column-end: auto -grid-column-start: auto -grid-row-end: auto -grid-row-start: auto -grid-template-areas: none -grid-template-columns: none -grid-template-rows: none -height: auto -hyphenate-character: auto -hyphenate-limit-chars: auto -hyphens: manual -image-orientation: from-image -image-rendering: auto -inline-size: auto -inset-block-end: auto -inset-block-start: auto -inset-inline-end: auto -inset-inline-start: auto -isolation: auto -justify-content: normal -justify-items: normal -justify-self: auto -left: auto -letter-spacing: normal -lighting-color: rgb(255, 255, 255) -line-break: auto -line-height: normal -list-style-image: none -list-style-position: outside -list-style-type: disc -margin-block-end: 0px -margin-block-start: 0px -margin-bottom: 0px -margin-inline-end: 0px -margin-inline-start: 0px -margin-left: 0px -margin-right: 0px -margin-top: 0px -marker-end: none -marker-mid: none -marker-start: none -mask-type: luminance -math-depth: 0 -math-shift: normal -math-style: normal -max-block-size: none -max-height: none -max-inline-size: none -max-width: none -min-block-size: 0px -min-height: 0px -min-inline-size: 0px -min-width: 0px -mix-blend-mode: normal -object-fit: fill -object-position: 50% 50% -object-view-box: none -offset-anchor: auto -offset-distance: 0px -offset-path: none -offset-position: auto -offset-rotate: auto 0deg -opacity: 1 -order: 0 -orphans: 2 -outline-color: rgb(0, 0, 0) -outline-offset: 0px -outline-style: none -outline-width: 0px -overflow: visible -overflow-anchor: auto -overflow-block: visible -overflow-clip-margin: 0px -overflow-inline: visible -overflow-wrap: normal -overflow-x: visible -overflow-y: visible -overscroll-behavior-block: auto -overscroll-behavior-inline: auto -padding-block-end: 0px -padding-block-start: 0px -padding-bottom: 0px -padding-inline-end: 0px -padding-inline-start: 0px -padding-left: 0px -padding-right: 0px -padding-top: 0px -paint-order: normal -perspective: none -perspective-origin: 50% 50% -pointer-events: auto -position: static -position-fallback: none -r: 0px -resize: none -right: auto -rotate: none -row-gap: normal -ruby-position: over -rx: auto -ry: auto -scale: none -scroll-behavior: auto -scroll-margin-block-end: 0px -scroll-margin-block-start: 0px -scroll-margin-inline-end: 0px -scroll-margin-inline-start: 0px -scroll-padding-block-end: auto -scroll-padding-block-start: auto -scroll-padding-inline-end: auto -scroll-padding-inline-start: auto -scroll-timeline-axis: block -scroll-timeline-name: none -scrollbar-gutter: auto -scrollbar-width: auto -shape-image-threshold: 0 -shape-margin: 0px -shape-outside: none -shape-rendering: auto -speak: normal -stop-color: rgb(0, 0, 0) -stop-opacity: 1 -stroke: none -stroke-dasharray: none -stroke-dashoffset: 0px -stroke-linecap: butt -stroke-linejoin: miter -stroke-miterlimit: 4 -stroke-opacity: 1 -stroke-width: 1px -tab-size: 8 -table-layout: auto -text-align: start -text-align-last: auto -text-anchor: start -text-decoration: none solid rgb(0, 0, 0) -text-decoration-color: rgb(0, 0, 0) -text-decoration-line: none -text-decoration-skip-ink: auto -text-decoration-style: solid -text-emphasis-color: rgb(0, 0, 0) -text-emphasis-position: over -text-emphasis-style: none -text-indent: 0px -text-overflow: clip -text-rendering: auto -text-shadow: none -text-size-adjust: auto -text-transform: none -text-underline-position: auto -toggle-group: none -toggle-root: none -toggle-trigger: none -toggle-visibility: normal -top: auto -touch-action: auto -transform: none -transform-origin: 50% 50% -transform-style: flat -transition-delay: 0s -transition-duration: 0s -transition-property: all -transition-timing-function: ease -translate: none -unicode-bidi: normal -user-select: auto -vector-effect: none -vertical-align: baseline -view-timeline-axis: block -view-timeline-inset: 0px -view-timeline-name: none -visibility: visible -white-space: normal -widows: 2 -width: auto -will-change: auto -word-break: normal -word-spacing: 0px -writing-mode: horizontal-tb -x: 0px -y: 0px -z-index: auto -zoom: 1 -PASS successfullyParsed is true - -TEST COMPLETE -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/h1-in-section-elements-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/h1-in-section-elements-expected.png deleted file mode 100644 index af950d40..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/h1-in-section-elements-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/image-orientation/image-orientation-from-image-composited-dynamic-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/image-orientation/image-orientation-from-image-composited-dynamic-expected.png deleted file mode 100644 index 34f6c5e..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/image-orientation/image-orientation-from-image-composited-dynamic-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/image-orientation/image-orientation-from-image-composited-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/image-orientation/image-orientation-from-image-composited-expected.png deleted file mode 100644 index 34f6c5e..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/image-orientation/image-orientation-from-image-composited-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/image-orientation/image-orientation-from-image-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/image-orientation/image-orientation-from-image-expected.png deleted file mode 100644 index e880a5d4..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/image-orientation/image-orientation-from-image-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/image-orientation/image-orientation-none-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/image-orientation/image-orientation-none-expected.png deleted file mode 100644 index a6c56ce..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/image-orientation/image-orientation-none-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/image-set-value-not-removed-crash-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/image-set-value-not-removed-crash-expected.txt deleted file mode 100644 index 5dce66b..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/image-set-value-not-removed-crash-expected.txt +++ /dev/null
@@ -1,2 +0,0 @@ -PASS. WebKit did not crash. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/last-child-pseudo-class-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/last-child-pseudo-class-expected.png deleted file mode 100644 index acdce0c88..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/last-child-pseudo-class-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/last-of-type-pseudo-class-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/last-of-type-pseudo-class-expected.png deleted file mode 100644 index 28ff695c..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/last-of-type-pseudo-class-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/list-item-height-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/list-item-height-expected.png deleted file mode 100644 index be29b8f..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/list-item-height-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/list-outline-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/list-outline-expected.png deleted file mode 100644 index db364b2..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/list-outline-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/min-width-with-spanned-cell-fixed-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/min-width-with-spanned-cell-fixed-expected.png deleted file mode 100644 index 0281062..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/min-width-with-spanned-cell-fixed-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/nth-child-dynamic-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/nth-child-dynamic-expected.png deleted file mode 100644 index a82a0e5..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/nth-child-dynamic-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/only-child-pseudo-class-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/only-child-pseudo-class-expected.png deleted file mode 100644 index 209131b..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/only-child-pseudo-class-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/only-of-type-pseudo-class-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/only-of-type-pseudo-class-expected.png deleted file mode 100644 index 5ea36cab..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/only-of-type-pseudo-class-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/outline-auto-location-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/outline-auto-location-expected.png deleted file mode 100644 index 383b4641..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/outline-auto-location-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/selector-set-attribute-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/selector-set-attribute-expected.png deleted file mode 100644 index 115aaed..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/selector-set-attribute-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/shadow-multiple-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/shadow-multiple-expected.png deleted file mode 100644 index 1d85574..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/shadow-multiple-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/style-for-math-with-class-expected.html b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/style-for-math-with-class-expected.html deleted file mode 100644 index 0ae412a..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/style-for-math-with-class-expected.html +++ /dev/null
@@ -1,5 +0,0 @@ -<!DOCTYPE html> -<style> - span { background: green } -</style> -<span>Text</span>
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/text-align-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/text-align-expected.png deleted file mode 100644 index 9d327322..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/text-align-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/text-decoration-in-second-order-descendants-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/text-decoration-in-second-order-descendants-expected.png deleted file mode 100644 index e69de29..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/text-decoration-in-second-order-descendants-expected.png +++ /dev/null
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/text-overflow-ellipsis-bidi-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/text-overflow-ellipsis-bidi-expected.png deleted file mode 100644 index 37578bc..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/text-overflow-ellipsis-bidi-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/text-overflow-ellipsis-block-with-border-and-padding-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/text-overflow-ellipsis-block-with-border-and-padding-expected.png deleted file mode 100644 index b9f0592..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/text-overflow-ellipsis-block-with-border-and-padding-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/text-overflow-ellipsis-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/text-overflow-ellipsis-expected.png deleted file mode 100644 index a3d2066..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/text-overflow-ellipsis-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/text-overflow-ellipsis-strict-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/text-overflow-ellipsis-strict-expected.png deleted file mode 100644 index a3d2066..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/text-overflow-ellipsis-strict-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/text-overflow-ellipsis-text-align-center-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/text-overflow-ellipsis-text-align-center-expected.png deleted file mode 100644 index acbf18e..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/text-overflow-ellipsis-text-align-center-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/text-overflow-ellipsis-text-align-justify-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/text-overflow-ellipsis-text-align-justify-expected.png deleted file mode 100644 index 09cf81b..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/text-overflow-ellipsis-text-align-justify-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/text-overflow-ellipsis-text-align-left-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/text-overflow-ellipsis-text-align-left-expected.png deleted file mode 100644 index 87c1007..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/text-overflow-ellipsis-text-align-left-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/text-overflow-ellipsis-text-align-right-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/text-overflow-ellipsis-text-align-right-expected.png deleted file mode 100644 index 87c6901..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/text-overflow-ellipsis-text-align-right-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/text-overflow-ellipsis-vertical-hittest-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/text-overflow-ellipsis-vertical-hittest-expected.txt deleted file mode 100644 index ebf6469..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/text-overflow-ellipsis-vertical-hittest-expected.txt +++ /dev/null
@@ -1,3 +0,0 @@ -Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. -clicked -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/text-overflow-input-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/text-overflow-input-expected.png deleted file mode 100644 index 1de080e5..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/text-overflow-input-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/text-rendering-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/text-rendering-expected.png deleted file mode 100644 index 7eb350db..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/text-rendering-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/textCapitalizeEdgeCases-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/textCapitalizeEdgeCases-expected.png deleted file mode 100644 index a710ba58..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/textCapitalizeEdgeCases-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/vertical-text-overflow-ellipsis-text-align-center-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/vertical-text-overflow-ellipsis-text-align-center-expected.png deleted file mode 100644 index 0982e184..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/vertical-text-overflow-ellipsis-text-align-center-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/vertical-text-overflow-ellipsis-text-align-right-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/vertical-text-overflow-ellipsis-text-align-right-expected.png deleted file mode 100644 index a74e657..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/vertical-text-overflow-ellipsis-text-align-right-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/word-space-extra-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/word-space-extra-expected.png deleted file mode 100644 index 844204c..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css/word-space-extra-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css3-text/css3-text-decoration/text-underline-position/text-underline-position-all-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css3-text/css3-text-decoration/text-underline-position/text-underline-position-all-expected.png deleted file mode 100644 index 934612ba..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css3-text/css3-text-decoration/text-underline-position/text-underline-position-all-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css3-text/css3-text-decoration/text-underline-position/text-underline-position-auto-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css3-text/css3-text-decoration/text-underline-position/text-underline-position-auto-expected.png deleted file mode 100644 index 7034c3e..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css3-text/css3-text-decoration/text-underline-position/text-underline-position-auto-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css3-text/css3-text-indent/text-indent-out-of-flow-each-line-hanging-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css3-text/css3-text-indent/text-indent-out-of-flow-each-line-hanging-expected.txt deleted file mode 100644 index 07f14ec1..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/css3-text/css3-text-indent/text-indent-out-of-flow-each-line-hanging-expected.txt +++ /dev/null
@@ -1,57 +0,0 @@ -crbug.com/568851: text-indent should be applied to leading statically positioned out-of-flow objects. - -xxxx -PASS - - -xxxx -PASS -xxxx xxxx - - -xxxx -PASS - - -xxxx -PASS - - -xxxx -PASS - - -xxxx -PASS -xxxx - -xxxx -PASS - - -xxxx -xxxx -PASS - - -xxxx -PASS - - -xxxx -xxxx -PASS -xxxx -PASS - - -xxxx -xxxx -xxxx - - -xxxx -xxxx -PASS - -xxxx
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/deprecated-flexbox/023-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/deprecated-flexbox/023-expected.png deleted file mode 100644 index 2961e26..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/deprecated-flexbox/023-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/deprecated-flexbox/024-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/deprecated-flexbox/024-expected.png deleted file mode 100644 index 2961e26..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/deprecated-flexbox/024-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/dom/Element/getBoundingClientRect-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/dom/Element/getBoundingClientRect-expected.txt deleted file mode 100644 index cf5fa87b..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/dom/Element/getBoundingClientRect-expected.txt +++ /dev/null
@@ -1,134 +0,0 @@ -Test 1 -PASS rect.left.toFixed(3) is "8.000" -PASS rect.top.toFixed(3) is "40.000" -PASS rect.width.toFixed(3) is "300.000" -PASS rect.height.toFixed(3) is "100.000" -PASS rect.right is rect.left + rect.width -PASS rect.bottom is rect.top + rect.height - - -Test 2 -PASS rect.left.toFixed(3) is "8.000" -PASS rect.top.toFixed(3) is "188.000" -PASS rect.width.toFixed(3) is "320.000" -PASS rect.height.toFixed(3) is "120.000" -PASS rect.right is rect.left + rect.width -PASS rect.bottom is rect.top + rect.height - - -Test 3 -PASS rect.left.toFixed(3) is "18.000" -PASS rect.top.toFixed(3) is "356.000" -PASS rect.width.toFixed(3) is "300.000" -PASS rect.height.toFixed(3) is "100.000" -PASS rect.right is rect.left + rect.width -PASS rect.bottom is rect.top + rect.height - - -Test 4 -PASS rect.left.toFixed(3) is "37.289" -PASS rect.top.toFixed(3) is "483.289" -PASS rect.width.toFixed(3) is "141.421" -PASS rect.height.toFixed(3) is "141.421" -PASS rect.right is rect.left + rect.width -PASS rect.bottom is rect.top + rect.height - - -Test 5 -PASS rect.left.toFixed(3) is "8.000" -PASS rect.top.toFixed(3) is "652.000" -PASS rect.width.toFixed(3) is "300.000" -PASS rect.height.toFixed(3) is "368.000" -PASS rect.right is rect.left + rect.width -PASS rect.bottom is rect.top + rect.height - - -Test 6 -Known failure. Skipping. - - -Test 7 -PASS rect.left.toFixed(3) is "8.000" -PASS rect.top.toFixed(3) is "1484.000" -PASS rect.width.toFixed(3) is "288.000" -PASS rect.height.toFixed(3) is "464.000" -PASS rect.right is rect.left + rect.width -PASS rect.bottom is rect.top + rect.height - - -Test 8 -PASS rect.left.toFixed(3) is "8.000" -PASS rect.top.toFixed(3) is "1996.000" -PASS rect.width.toFixed(3) is "300.000" -PASS rect.height.toFixed(3) is "74.000" -PASS rect.right is rect.left + rect.width -PASS rect.bottom is rect.top + rect.height - - -Test 9 -PASS rect.left.toFixed(3) is "8.000" -PASS rect.top.toFixed(3) is "2134.000" -PASS rect.width.toFixed(3) is "300.000" -PASS rect.height.toFixed(3) is "90.000" -PASS rect.right is rect.left + rect.width -PASS rect.bottom is rect.top + rect.height - - -Test 10 -FAIL rect.left.toFixed(3) should be 10.000. Was 8.000. -PASS rect.top.toFixed(3) is "2274.000" -FAIL rect.width.toFixed(3) should be 296.000. Was 300.000. -PASS rect.height.toFixed(3) is "34.000" -PASS rect.right is rect.left + rect.width -PASS rect.bottom is rect.top + rect.height - - -Test 11 -PASS rect.left.toFixed(3) is "10.000" -PASS rect.top.toFixed(3) is "2396.000" -PASS rect.width.toFixed(3) is "147.000" -PASS rect.height.toFixed(3) is "34.000" -PASS rect.right is rect.left + rect.width -PASS rect.bottom is rect.top + rect.height - - -Test 12 -PASS rect.left.toFixed(3) is "8.000" -PASS rect.top.toFixed(3) is "2532.000" -PASS rect.width.toFixed(3) is "100.000" -PASS rect.height.toFixed(3) is "100.000" -PASS rect.right is rect.left + rect.width -PASS rect.bottom is rect.top + rect.height - - -Test 13 -PASS rect.left.toFixed(3) is "8.000" -PASS rect.top.toFixed(3) is "2783.000" -PASS rect.width.toFixed(3) is "260.000" -PASS rect.height.toFixed(3) is "16.000" -PASS rect.right is rect.left + rect.width -PASS rect.bottom is rect.top + rect.height - - -Test 14 -PASS rect.left.toFixed(3) is "8.000" -PASS rect.top.toFixed(3) is "2863.000" -PASS rect.width.toFixed(3) is "300.000" -PASS rect.height.toFixed(3) is "232.000" -PASS rect.right is rect.left + rect.width -PASS rect.bottom is rect.top + rect.height - - -Test 15 -PASS rect.left.toFixed(3) is "8.000" -PASS rect.top.toFixed(3) is "3159.000" -PASS rect.width.toFixed(3) is "0.000" -PASS rect.height.toFixed(3) is "0.000" -PASS rect.right is rect.left + rect.width -PASS rect.bottom is rect.top + rect.height - - -PASS successfullyParsed is true - -TEST COMPLETE -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/dom/HTMLMeterElement/meter-boundary-values-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/dom/HTMLMeterElement/meter-boundary-values-expected.png deleted file mode 100644 index 1120d0f..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/dom/HTMLMeterElement/meter-boundary-values-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/dom/HTMLObjectElement/vspace-hspace-as-number-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/dom/HTMLObjectElement/vspace-hspace-as-number-expected.png deleted file mode 100644 index 2c5e4f5..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/dom/HTMLObjectElement/vspace-hspace-as-number-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/dom/nodesFromRect/nodesFromRect-basic-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/dom/nodesFromRect/nodesFromRect-basic-expected.txt deleted file mode 100644 index 77334292..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/dom/nodesFromRect/nodesFromRect-basic-expected.txt +++ /dev/null
@@ -1,48 +0,0 @@ -PASS successfullyParsed is true - -TEST COMPLETE - -PASS All correct nodes found for rect -PASS All correct nodes found for rect -PASS All correct nodes found for rect -PASS All correct nodes found for rect -PASS All correct nodes found for rect -PASS All correct nodes found for rect -PASS All correct nodes found for rect -PASS All correct nodes found for rect -PASS All correct nodes found for rect -PASS All correct nodes found for rect -PASS All correct nodes found for rect -PASS All correct nodes found for rect -PASS All correct nodes found for rect -PASS All correct nodes found for rect -PASS All correct nodes found for rect -PASS All correct nodes found for rect -PASS All correct nodes found for rect -PASS All correct nodes found for rect -PASS All correct nodes found for rect -PASS All correct nodes found for rect -PASS All correct nodes found for rect -PASS All correct nodes found for rect -PASS All correct nodes found for rect -PASS All correct nodes found for rect -PASS All correct nodes found for rect -PASS All correct nodes found for rect -PASS All correct nodes found for rect -PASS All correct nodes found for rect -PASS All correct nodes found for rect -PASS All correct nodes found for rect -PASS All correct nodes found for rect -PASS All correct nodes found for rect -PASS All correct nodes found for rect -PASS All correct nodes found for rect -PASS All correct nodes found for rect -PASS All correct nodes found for rect -PASS All correct nodes found for rect -PASS All correct nodes found for rect -FAIL Unexpected node #0 for rect [39,202], [2,41] - DIV#d2 -FAIL Unexpected node #1 for rect [39,202], [6,41] - DIV#d2 -FAIL Unexpected node #2 for rect [39,202], [16,41] - DIV#d2 -PASS All correct nodes found for rect -PASS All correct nodes found for rect -PASS All correct nodes found for rect
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/dom/nodesFromRect/nodesFromRect-table-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/dom/nodesFromRect/nodesFromRect-table-expected.txt deleted file mode 100644 index ac65301..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/dom/nodesFromRect/nodesFromRect-table-expected.txt +++ /dev/null
@@ -1,41 +0,0 @@ -Document::nodesFromRect : Rect-based hit-testing on tables - bug 86605 - -On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". - -Check area hits fully inside table cells -PASS All correct nodes found for rect -PASS All correct nodes found for rect -PASS All correct nodes found for rect -PASS All correct nodes found for rect -Check area hits across table border -PASS All correct nodes found for rect -PASS All correct nodes found for rect -PASS All correct nodes found for rect -Check area hits crossing neighbouring table cells -FAIL Unexpected node #0 for rect [170,165], [41,21] - TD#td22 -FAIL Unexpected node #0 for rect [240,265], [41,21] - TD#td43 -FAIL Unexpected node #0 for rect [165,170], [21,41] - TD#td22 -FAIL Unexpected node #0 for rect [265,240], [21,41] - TD#td34 -FAIL Unexpected node #0 for rect [170,170], [41,41] - TD#td22 -Check area hits crossing entire table cells -FAIL Unexpected node #0 for rect [110,165], [181,21] - TD#td21 -FAIL Unexpected node #0 for rect [165,110], [21,181] - TD#td12 -FAIL Unexpected node #0 for rect [90,90], [121,121] - TD#td11 -FAIL Unexpected node #0 for rect [115,230], [21,131] - TD#td31 -FAIL Unexpected node #0 for rect [230,140], [131,21] - TD#td13 -Check area hits on right-to-left table -PASS All correct nodes found for rect -PASS All correct nodes found for rect -FAIL Unexpected node #0 for rect [165,170], [21,41] - TD#td23 -Check area hits on flipped (tb-lr) table -PASS All correct nodes found for rect -PASS All correct nodes found for rect -FAIL Unexpected node #0 for rect [110,165], [181,21] - TD#td12 -PASS successfullyParsed is true - -TEST COMPLETE - - - - -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/dom/scroll-reveal-top-overflow-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/dom/scroll-reveal-top-overflow-expected.png deleted file mode 100644 index cc5cddf..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/dom/scroll-reveal-top-overflow-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/dynamic/013-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/dynamic/013-expected.png deleted file mode 100644 index bed86e8a..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/dynamic/013-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/dynamic/outerHTML-doc-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/dynamic/outerHTML-doc-expected.png deleted file mode 100644 index cd0ebf6..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/dynamic/outerHTML-doc-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/dynamic/outerHTML-img-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/dynamic/outerHTML-img-expected.png deleted file mode 100644 index c45ef37..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/dynamic/outerHTML-img-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/dynamic/selection-highlight-adjust-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/dynamic/selection-highlight-adjust-expected.png deleted file mode 100644 index eae47a7..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/dynamic/selection-highlight-adjust-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/encoding/utf-16-big-endian-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/encoding/utf-16-big-endian-expected.png deleted file mode 100644 index 0807cdb8..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/encoding/utf-16-big-endian-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/encoding/utf-16-little-endian-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/encoding/utf-16-little-endian-expected.png deleted file mode 100644 index 0807cdb8..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/encoding/utf-16-little-endian-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/encoding/xmacroman-encoding-test-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/encoding/xmacroman-encoding-test-expected.png deleted file mode 100644 index a3772d3..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/encoding/xmacroman-encoding-test-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/events/pointer-events-2-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/events/pointer-events-2-expected.png deleted file mode 100644 index a4804f3..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/events/pointer-events-2-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/events/touch/compositor-touch-hit-rects-table-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/events/touch/compositor-touch-hit-rects-table-expected.txt deleted file mode 100644 index 45050d4..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/events/touch/compositor-touch-hit-rects-table-expected.txt +++ /dev/null
@@ -1,7 +0,0 @@ -: layer(800x600) has hit test rect (8,8 116x20) - -: layer(800x600) has hit test rect (8,30 114x14) - -: layer(800x600) has hit test rect (10,48 54x14) - -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/events/touch/compositor-touch-hit-rects-visibility-hidden-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/events/touch/compositor-touch-hit-rects-visibility-hidden-expected.txt deleted file mode 100644 index 4892d6a..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/events/touch/compositor-touch-hit-rects-visibility-hidden-expected.txt +++ /dev/null
@@ -1,25 +0,0 @@ -: no rects - -: no rects - -: layer(785x1118) has hit test rect (13,220 42x42) - -: layer(785x1166) has hit test rect (13,325 102x102) - -: no rects - -: layer(785x1246) has hit test rect (8,532 100x100) - -: no rects - -: layer(785x1326) has hit test rect (8,738 100x100) - -: no rects - -: layer(785x1406) has hit test rect (120,840 102x102) - -: no rects - -: layer(785x1486) has hit test rect (118,944 100x100) - -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/events/updateLayoutForHitTest-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/events/updateLayoutForHitTest-expected.png deleted file mode 100644 index 4c8a773..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/events/updateLayoutForHitTest-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/forms/001-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/forms/001-expected.png deleted file mode 100644 index 1b1437d2..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/forms/001-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/forms/006-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/forms/006-expected.png deleted file mode 100644 index 87cec572..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/forms/006-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/forms/basic-buttons-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/forms/basic-buttons-expected.png deleted file mode 100644 index 079f21e2..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/forms/basic-buttons-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/forms/calendar-picker/calendar-picker-appearance-zoom125-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/forms/calendar-picker/calendar-picker-appearance-zoom125-expected.png deleted file mode 100644 index 816786ed..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/forms/calendar-picker/calendar-picker-appearance-zoom125-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/forms/color-scheme/meter/meter-appearance-basic-vertical-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/forms/color-scheme/meter/meter-appearance-basic-vertical-expected.png deleted file mode 100644 index c5587532..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/forms/color-scheme/meter/meter-appearance-basic-vertical-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/forms/color/color-picker-appearance-zoom125-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/forms/color/color-picker-appearance-zoom125-expected.png deleted file mode 100644 index 9f5354b..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/forms/color/color-picker-appearance-zoom125-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/forms/color/input-appearance-color-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/forms/color/input-appearance-color-expected.png deleted file mode 100644 index b93e5be..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/forms/color/input-appearance-color-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/forms/date/date-appearance-basic-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/forms/date/date-appearance-basic-expected.png deleted file mode 100644 index ad691c7..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/forms/date/date-appearance-basic-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/forms/datetimelocal/datetimelocal-appearance-basic-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/forms/datetimelocal/datetimelocal-appearance-basic-expected.png deleted file mode 100644 index 8b2d4f2..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/forms/datetimelocal/datetimelocal-appearance-basic-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/forms/fieldset/overflow-scroll-interaction-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/forms/fieldset/overflow-scroll-interaction-expected.txt deleted file mode 100644 index 1e1975e0..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/forms/fieldset/overflow-scroll-interaction-expected.txt +++ /dev/null
@@ -1,5 +0,0 @@ -This is a testharness.js-based test. -FAIL Pressing the space bar should scroll up assert_equals: expected 400 but got 418 -FAIL Wheel scroll should work assert_equals: expected 400 but got 418 -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/forms/file/display-none-upload-button-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/forms/file/display-none-upload-button-expected.txt deleted file mode 100644 index 710a434f..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/forms/file/display-none-upload-button-expected.txt +++ /dev/null
@@ -1,6 +0,0 @@ -FAIL document.querySelector('input').offsetHeight > 10 should be true. Was false. -PASS successfullyParsed is true - -TEST COMPLETE - -Tests that a display:none upload button works.
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/forms/file/file-appearance-basic-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/forms/file/file-appearance-basic-expected.png deleted file mode 100644 index bfb1063..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/forms/file/file-appearance-basic-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/forms/file/file-appearance-bidi-filenames-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/forms/file/file-appearance-bidi-filenames-expected.png deleted file mode 100644 index 3e154aca..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/forms/file/file-appearance-bidi-filenames-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/forms/focus-rect/focus-ring-detached-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/forms/focus-rect/focus-ring-detached-expected.png deleted file mode 100644 index 8ff31d62..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/forms/focus-rect/focus-ring-detached-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/forms/form-element-geometry-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/forms/form-element-geometry-expected.png deleted file mode 100644 index 976ce2e..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/forms/form-element-geometry-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/forms/image/image-alt-text-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/forms/image/image-alt-text-expected.png deleted file mode 100644 index e87fd5a..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/forms/image/image-alt-text-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/forms/input-value-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/forms/input-value-expected.png deleted file mode 100644 index 72800d8..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/forms/input-value-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/forms/minWidthPercent-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/forms/minWidthPercent-expected.png deleted file mode 100644 index 471e26b7..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/forms/minWidthPercent-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/forms/month/month-appearance-basic-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/forms/month/month-appearance-basic-expected.png deleted file mode 100644 index bee2022..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/forms/month/month-appearance-basic-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/forms/month/month-picker-appearance-zoom150-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/forms/month/month-picker-appearance-zoom150-expected.png deleted file mode 100644 index 41d4d66..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/forms/month/month-picker-appearance-zoom150-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/forms/number/number-appearance-datalist-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/forms/number/number-appearance-datalist-expected.png deleted file mode 100644 index 9d743070..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/forms/number/number-appearance-datalist-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/forms/plaintext-mode-2-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/forms/plaintext-mode-2-expected.png deleted file mode 100644 index 921aef0..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/forms/plaintext-mode-2-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/forms/range/range-appearance-border-padding-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/forms/range/range-appearance-border-padding-expected.png deleted file mode 100644 index 66bc4e3..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/forms/range/range-appearance-border-padding-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/forms/select/menulist-update-text-popup-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/forms/select/menulist-update-text-popup-expected.txt deleted file mode 100644 index 2e8652c..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/forms/select/menulist-update-text-popup-expected.txt +++ /dev/null
@@ -1,15 +0,0 @@ -Tests <select> text update when popup is visible and selectionIndex changes. -Needs run-layout-test. - -A -B -C -layer at (0,0) size 31x20 - LayoutBlockFlow (positioned) {DIV} at (8,50) size 31x20 - LayoutFlexibleBox {SELECT} at (0,0) size 31x20 [bgcolor=#EFEFEF] [border: (1px solid #767676)] - LayoutText {#text} at (0,0) size 0x0 -layer at (5,1) size 9x18 - LayoutBlockFlow {DIV} at (5,1) size 9x18 - LayoutText {#text} at (0,1) size 9x16 - text run at (0,1) width 9: "C" -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/forms/select/option-text-clip-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/forms/select/option-text-clip-expected.png deleted file mode 100644 index 63b634c1..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/forms/select/option-text-clip-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/forms/select/select-multiple-rtl-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/forms/select/select-multiple-rtl-expected.png deleted file mode 100644 index 12f6b4d..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/forms/select/select-multiple-rtl-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/forms/select/select-style-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/forms/select/select-style-expected.png deleted file mode 100644 index 06dd3b6d..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/forms/select/select-style-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/forms/select/select-writing-direction-natural-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/forms/select/select-writing-direction-natural-expected.png deleted file mode 100644 index 0261b83..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/forms/select/select-writing-direction-natural-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/forms/suggestion-picker/date-suggestion-picker-appearance-zoom125-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/forms/suggestion-picker/date-suggestion-picker-appearance-zoom125-expected.png deleted file mode 100644 index 982c2d4..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/forms/suggestion-picker/date-suggestion-picker-appearance-zoom125-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/forms/suggestion-picker/time-suggestion-picker-appearance-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/forms/suggestion-picker/time-suggestion-picker-appearance-expected.png deleted file mode 100644 index 0dd772d..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/forms/suggestion-picker/time-suggestion-picker-appearance-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/forms/text/input-appearance-selection-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/forms/text/input-appearance-selection-expected.png deleted file mode 100644 index e15970a..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/forms/text/input-appearance-selection-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/forms/text/text-appearance-datalist-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/forms/text/text-appearance-datalist-expected.png deleted file mode 100644 index bbc72eb1..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/forms/text/text-appearance-datalist-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/forms/textarea/basic-textareas-quirks-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/forms/textarea/basic-textareas-quirks-expected.png deleted file mode 100644 index 9c0f13c..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/forms/textarea/basic-textareas-quirks-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/forms/time/time-appearance-basic-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/forms/time/time-appearance-basic-expected.png deleted file mode 100644 index dd8fc65..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/forms/time/time-appearance-basic-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/forms/validation-bubble-appearance-rtl-ui-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/forms/validation-bubble-appearance-rtl-ui-expected.png deleted file mode 100644 index 0164192..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/forms/validation-bubble-appearance-rtl-ui-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/forms/week/week-appearance-basic-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/forms/week/week-appearance-basic-expected.png deleted file mode 100644 index dca3d0bf..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/forms/week/week-appearance-basic-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/gradients/generated-gradients-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/gradients/generated-gradients-expected.png deleted file mode 100644 index 7f32aa6f..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/gradients/generated-gradients-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/gradients/list-item-gradient-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/gradients/list-item-gradient-expected.png deleted file mode 100644 index 2f38191d..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/gradients/list-item-gradient-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/gradients/radial-centered-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/gradients/radial-centered-expected.png deleted file mode 100644 index 5f46c7c..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/gradients/radial-centered-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/gradients/simple-gradients-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/gradients/simple-gradients-expected.png deleted file mode 100644 index 16450ae6..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/gradients/simple-gradients-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/gradients/unprefixed-list-item-gradient-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/gradients/unprefixed-list-item-gradient-expected.png deleted file mode 100644 index 82da0cf..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/gradients/unprefixed-list-item-gradient-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/inline-block/baseline-vertical-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/inline-block/baseline-vertical-expected.png deleted file mode 100644 index 51483da..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/inline-block/baseline-vertical-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/inline/absolute-positioned-inline-in-centred-block-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/inline/absolute-positioned-inline-in-centred-block-expected.png deleted file mode 100644 index fbd2e896..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/inline/absolute-positioned-inline-in-centred-block-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/inline/continuation-outlines-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/inline/continuation-outlines-expected.png deleted file mode 100644 index 46190fe..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/inline/continuation-outlines-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/inline/continuation-outlines-with-layers-2-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/inline/continuation-outlines-with-layers-2-expected.png deleted file mode 100644 index d6320f5..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/inline/continuation-outlines-with-layers-2-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/inline/continuation-outlines-with-layers-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/inline/continuation-outlines-with-layers-expected.png deleted file mode 100644 index 7a808bc..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/inline/continuation-outlines-with-layers-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/inline/emptyInlinesWithinLists-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/inline/emptyInlinesWithinLists-expected.png deleted file mode 100644 index 2db9dc38..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/inline/emptyInlinesWithinLists-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/inline/inline-borders-with-bidi-override-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/inline/inline-borders-with-bidi-override-expected.png deleted file mode 100644 index 193251c..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/inline/inline-borders-with-bidi-override-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/inline/inline-box-background-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/inline/inline-box-background-expected.png deleted file mode 100644 index 95b7c2c..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/inline/inline-box-background-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/inline/inline-box-background-long-image-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/inline/inline-box-background-long-image-expected.png deleted file mode 100644 index 9afc414..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/inline/inline-box-background-long-image-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/inline/inline-box-background-repeat-x-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/inline/inline-box-background-repeat-x-expected.png deleted file mode 100644 index dae7f2e..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/inline/inline-box-background-repeat-x-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/inline/inline-box-background-repeat-y-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/inline/inline-box-background-repeat-y-expected.png deleted file mode 100644 index 109c865..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/inline/inline-box-background-repeat-y-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/inline/justify-emphasis-inline-box-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/inline/justify-emphasis-inline-box-expected.png deleted file mode 100644 index 2a97d68..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/inline/justify-emphasis-inline-box-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/invalid/010-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/invalid/010-expected.png deleted file mode 100644 index bf41ad5f..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/invalid/010-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/invalid/018-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/invalid/018-expected.png deleted file mode 100644 index 606f7a5a..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/invalid/018-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/invalid/td-inside-object-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/invalid/td-inside-object-expected.png deleted file mode 100644 index 25f96adf..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/invalid/td-inside-object-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/layers/opacity-transforms-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/layers/opacity-transforms-expected.png deleted file mode 100644 index ed718310..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/layers/opacity-transforms-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/layers/scroll-rect-to-visible-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/layers/scroll-rect-to-visible-expected.png deleted file mode 100644 index 011f97f..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/layers/scroll-rect-to-visible-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/lists/001-vertical-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/lists/001-vertical-expected.png deleted file mode 100644 index 77c3a48..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/lists/001-vertical-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/lists/002-vertical-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/lists/002-vertical-expected.png deleted file mode 100644 index 996cf1d..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/lists/002-vertical-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/lists/003-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/lists/003-expected.png deleted file mode 100644 index 8f86fdc..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/lists/003-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/lists/003-vertical-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/lists/003-vertical-expected.png deleted file mode 100644 index 58c4e3c4..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/lists/003-vertical-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/lists/006-vertical-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/lists/006-vertical-expected.png deleted file mode 100644 index 183256e..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/lists/006-vertical-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/lists/008-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/lists/008-expected.png deleted file mode 100644 index af7cfda..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/lists/008-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/lists/008-vertical-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/lists/008-vertical-expected.png deleted file mode 100644 index 9ce4f2d..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/lists/008-vertical-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/lists/markers-in-selection-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/lists/markers-in-selection-expected.png deleted file mode 100644 index 8a22285..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/lists/markers-in-selection-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/lists/ol-display-types-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/lists/ol-display-types-expected.png deleted file mode 100644 index 730918fe..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/lists/ol-display-types-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/lists/ordered-list-with-no-ol-tag-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/lists/ordered-list-with-no-ol-tag-expected.png deleted file mode 100644 index 2225fc8e..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/lists/ordered-list-with-no-ol-tag-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/lists/remove-listmarker-and-make-anonblock-empty-2-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/lists/remove-listmarker-and-make-anonblock-empty-2-expected.txt deleted file mode 100644 index 139597f9..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/lists/remove-listmarker-and-make-anonblock-empty-2-expected.txt +++ /dev/null
@@ -1,2 +0,0 @@ - -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/lists/scrolled-marker-paint-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/lists/scrolled-marker-paint-expected.png deleted file mode 100644 index 2f76a7d..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/lists/scrolled-marker-paint-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/mediarecorder/MediaRecorder-ignores-oversize-frames-h264-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/mediarecorder/MediaRecorder-ignores-oversize-frames-h264-expected.txt deleted file mode 100644 index 343f49d..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/mediarecorder/MediaRecorder-ignores-oversize-frames-h264-expected.txt +++ /dev/null
@@ -1,4 +0,0 @@ -This is a testharness.js-based test. -NOTRUN Ignores frames when stream starts oversize with codec 'video/webm; codecs="h264"' codec not supported -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/multicol/caret-range-outside-columns-mac-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/multicol/caret-range-outside-columns-mac-expected.txt deleted file mode 100644 index bf65ac3..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/multicol/caret-range-outside-columns-mac-expected.txt +++ /dev/null
@@ -1,54 +0,0 @@ -Test that hitting areas outside columns takes us to the right text content inside columns. - -On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". - -Above first column: -PASS document.caretRangeFromPoint(50,0).startOffset is 0 -PASS document.caretRangeFromPoint(150,0).startOffset is 0 -PASS document.caretRangeFromPoint(189,0).startOffset is 0 -Above second column: -PASS document.caretRangeFromPoint(190,0).startOffset is 12 -PASS document.caretRangeFromPoint(250,0).startOffset is 12 -PASS document.caretRangeFromPoint(289,0).startOffset is 12 -Above third column: -PASS document.caretRangeFromPoint(290,0).startOffset is 24 -PASS document.caretRangeFromPoint(350,0).startOffset is 24 -PASS document.caretRangeFromPoint(450,0).startOffset is 24 -Below first column: -FAIL document.caretRangeFromPoint(50,100).startOffset should be 11. Was 12. -FAIL document.caretRangeFromPoint(150,100).startOffset should be 11. Was 12. -FAIL document.caretRangeFromPoint(189,100).startOffset should be 11. Was 12. -Below second column: -FAIL document.caretRangeFromPoint(190,100).startOffset should be 23. Was 24. -FAIL document.caretRangeFromPoint(250,100).startOffset should be 23. Was 24. -FAIL document.caretRangeFromPoint(289,100).startOffset should be 23. Was 24. -Below third column: -PASS document.caretRangeFromPoint(290,100).startOffset is 35 -PASS document.caretRangeFromPoint(350,100).startOffset is 35 -PASS document.caretRangeFromPoint(389,100).startOffset is 35 -To the left of the first column: -PASS document.caretRangeFromPoint(0,10).startOffset is 0 -PASS document.caretRangeFromPoint(0,30).startOffset is 0 -PASS document.caretRangeFromPoint(0,50).startOffset is 4 -PASS document.caretRangeFromPoint(0,70).startOffset is 8 -FAIL document.caretRangeFromPoint(0,90).startOffset should be 11. Was 12. -To the right of the third column: -PASS document.caretRangeFromPoint(400,10).startOffset is 24 -PASS document.caretRangeFromPoint(400,30).startOffset is 27 -PASS document.caretRangeFromPoint(400,50).startOffset is 31 -PASS document.caretRangeFromPoint(400,70).startOffset is 35 -In the gap between the first and second columns: -PASS document.caretRangeFromPoint(180,20).startOffset is 3 -PASS document.caretRangeFromPoint(180,40).startOffset is 7 -PASS document.caretRangeFromPoint(180,60).startOffset is 11 -PASS document.caretRangeFromPoint(180,69).startOffset is 11 -In the gap between the second and third columns: -PASS document.caretRangeFromPoint(280,20).startOffset is 15 -PASS document.caretRangeFromPoint(280,40).startOffset is 19 -PASS document.caretRangeFromPoint(280,60).startOffset is 23 -PASS document.caretRangeFromPoint(280,69).startOffset is 23 -PASS successfullyParsed is true - -TEST COMPLETE - -xxx xxx xxx xxx xxx xxx xxx xxx xxx
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/multicol/caret-range-outside-columns-rtl-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/multicol/caret-range-outside-columns-rtl-expected.txt deleted file mode 100644 index 72b77cb..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/multicol/caret-range-outside-columns-rtl-expected.txt +++ /dev/null
@@ -1,75 +0,0 @@ -Test that hitting areas outside columns takes us to the right text content inside columns. - -On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". - -Above first column: -PASS document.caretRangeFromPoint(450,0).startOffset is 0 -FAIL document.caretRangeFromPoint(350,0).startOffset should be 2. Was 0. -FAIL document.caretRangeFromPoint(291,0).startOffset should be 3. Was 0. -FAIL document.caretRangeFromPoint(290,0).startOffset should be 3. Was 12. -Above second column: -PASS document.caretRangeFromPoint(289,0).startOffset is 12 -FAIL document.caretRangeFromPoint(250,0).startOffset should be 14. Was 12. -FAIL document.caretRangeFromPoint(191,0).startOffset should be 15. Was 12. -FAIL document.caretRangeFromPoint(190,0).startOffset should be 15. Was 24. -Above third column: -PASS document.caretRangeFromPoint(189,0).startOffset is 24 -FAIL document.caretRangeFromPoint(150,0).startOffset should be 26. Was 24. -FAIL document.caretRangeFromPoint(50,0).startOffset should be 27. Was 24. -Below first column: -FAIL document.caretRangeFromPoint(450,100).startOffset should be 8. Was 12. -FAIL document.caretRangeFromPoint(350,100).startOffset should be 10. Was 12. -FAIL document.caretRangeFromPoint(291,100).startOffset should be 11. Was 12. -FAIL document.caretRangeFromPoint(290,100).startOffset should be 11. Was 24. -Below second column: -FAIL document.caretRangeFromPoint(289,100).startOffset should be 20. Was 24. -FAIL document.caretRangeFromPoint(250,100).startOffset should be 22. Was 24. -FAIL document.caretRangeFromPoint(191,100).startOffset should be 23. Was 24. -FAIL document.caretRangeFromPoint(190,100).startOffset should be 23. Was 32. -Below third column: -PASS document.caretRangeFromPoint(189,100).startOffset is 32 -FAIL document.caretRangeFromPoint(150,100).startOffset should be 34. Was 32. -FAIL document.caretRangeFromPoint(50,100).startOffset should be 35. Was 32. -To the right of the first column: -PASS document.caretRangeFromPoint(400,10).startOffset is 0 -PASS document.caretRangeFromPoint(400,30).startOffset is 0 -PASS document.caretRangeFromPoint(400,50).startOffset is 4 -PASS document.caretRangeFromPoint(400,70).startOffset is 8 -FAIL document.caretRangeFromPoint(400,90).startOffset should be 8. Was 12. -To the left of the third column: -FAIL document.caretRangeFromPoint(0,10).startOffset should be 27. Was 24. -PASS document.caretRangeFromPoint(0,30).startOffset is 27 -PASS document.caretRangeFromPoint(0,50).startOffset is 31 -PASS document.caretRangeFromPoint(0,70).startOffset is 35 -FAIL document.caretRangeFromPoint(0,90).startOffset should be 35. Was 32. -In the gap between the first and second columns: -PASS document.caretRangeFromPoint(291,20).startOffset is 3 -PASS document.caretRangeFromPoint(291,40).startOffset is 7 -PASS document.caretRangeFromPoint(291,60).startOffset is 11 -PASS document.caretRangeFromPoint(291,69).startOffset is 11 -FAIL document.caretRangeFromPoint(290,20).startOffset should be 3. Was 12. -FAIL document.caretRangeFromPoint(290,40).startOffset should be 7. Was 16. -FAIL document.caretRangeFromPoint(290,60).startOffset should be 11. Was 20. -FAIL document.caretRangeFromPoint(290,69).startOffset should be 11. Was 20. -PASS document.caretRangeFromPoint(289,20).startOffset is 12 -PASS document.caretRangeFromPoint(289,40).startOffset is 16 -PASS document.caretRangeFromPoint(289,60).startOffset is 20 -PASS document.caretRangeFromPoint(289,69).startOffset is 20 -In the gap between the second and third columns: -PASS document.caretRangeFromPoint(191,20).startOffset is 15 -PASS document.caretRangeFromPoint(191,40).startOffset is 19 -PASS document.caretRangeFromPoint(191,60).startOffset is 23 -PASS document.caretRangeFromPoint(191,69).startOffset is 23 -FAIL document.caretRangeFromPoint(190,20).startOffset should be 15. Was 24. -FAIL document.caretRangeFromPoint(190,40).startOffset should be 19. Was 28. -FAIL document.caretRangeFromPoint(190,60).startOffset should be 23. Was 32. -FAIL document.caretRangeFromPoint(190,69).startOffset should be 23. Was 32. -PASS document.caretRangeFromPoint(189,20).startOffset is 24 -PASS document.caretRangeFromPoint(189,40).startOffset is 28 -PASS document.caretRangeFromPoint(189,60).startOffset is 32 -PASS document.caretRangeFromPoint(189,69).startOffset is 32 -PASS successfullyParsed is true - -TEST COMPLETE - -xxx xxx xxx xxx xxx xxx xxx xxx xxx
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/multicol/caret-range-outside-columns-win-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/multicol/caret-range-outside-columns-win-expected.txt deleted file mode 100644 index de770b6..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/multicol/caret-range-outside-columns-win-expected.txt +++ /dev/null
@@ -1,54 +0,0 @@ -Test that hitting areas outside columns takes us to the right text content inside columns. - -On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". - -Above first column: -PASS document.caretRangeFromPoint(50,0).startOffset is 0 -FAIL document.caretRangeFromPoint(150,0).startOffset should be 2. Was 0. -FAIL document.caretRangeFromPoint(189,0).startOffset should be 3. Was 0. -Above second column: -PASS document.caretRangeFromPoint(190,0).startOffset is 12 -FAIL document.caretRangeFromPoint(250,0).startOffset should be 14. Was 12. -FAIL document.caretRangeFromPoint(289,0).startOffset should be 15. Was 12. -Above third column: -PASS document.caretRangeFromPoint(290,0).startOffset is 24 -FAIL document.caretRangeFromPoint(350,0).startOffset should be 26. Was 24. -FAIL document.caretRangeFromPoint(450,0).startOffset should be 27. Was 24. -Below first column: -FAIL document.caretRangeFromPoint(50,100).startOffset should be 8. Was 12. -FAIL document.caretRangeFromPoint(150,100).startOffset should be 10. Was 12. -FAIL document.caretRangeFromPoint(189,100).startOffset should be 11. Was 12. -Below second column: -FAIL document.caretRangeFromPoint(190,100).startOffset should be 20. Was 24. -FAIL document.caretRangeFromPoint(250,100).startOffset should be 22. Was 24. -FAIL document.caretRangeFromPoint(289,100).startOffset should be 23. Was 24. -Below third column: -PASS document.caretRangeFromPoint(290,100).startOffset is 32 -FAIL document.caretRangeFromPoint(350,100).startOffset should be 34. Was 32. -FAIL document.caretRangeFromPoint(389,100).startOffset should be 35. Was 32. -To the left of the first column: -PASS document.caretRangeFromPoint(0,10).startOffset is 0 -PASS document.caretRangeFromPoint(0,30).startOffset is 0 -PASS document.caretRangeFromPoint(0,50).startOffset is 4 -PASS document.caretRangeFromPoint(0,70).startOffset is 8 -FAIL document.caretRangeFromPoint(0,90).startOffset should be 8. Was 12. -To the right of the third column: -FAIL document.caretRangeFromPoint(400,10).startOffset should be 27. Was 24. -PASS document.caretRangeFromPoint(400,30).startOffset is 27 -PASS document.caretRangeFromPoint(400,50).startOffset is 31 -PASS document.caretRangeFromPoint(400,70).startOffset is 35 -In the gap between the first and second columns: -PASS document.caretRangeFromPoint(180,20).startOffset is 3 -PASS document.caretRangeFromPoint(180,40).startOffset is 7 -PASS document.caretRangeFromPoint(180,60).startOffset is 11 -PASS document.caretRangeFromPoint(180,69).startOffset is 11 -In the gap between the second and third columns: -PASS document.caretRangeFromPoint(280,20).startOffset is 15 -PASS document.caretRangeFromPoint(280,40).startOffset is 19 -PASS document.caretRangeFromPoint(280,60).startOffset is 23 -PASS document.caretRangeFromPoint(280,69).startOffset is 23 -PASS successfullyParsed is true - -TEST COMPLETE - -xxx xxx xxx xxx xxx xxx xxx xxx xxx
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/multicol/composited-inner-multicol-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/multicol/composited-inner-multicol-expected.png deleted file mode 100644 index 9d5e71e5..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/multicol/composited-inner-multicol-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/multicol/composited-layer-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/multicol/composited-layer-expected.txt deleted file mode 100644 index 67519b3d..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/multicol/composited-layer-expected.txt +++ /dev/null
@@ -1,29 +0,0 @@ -{ -"layers": [ -{ -"name": "Scrolling background of LayoutView #document", -"bounds": [800, 600], -"contentsOpaque": true, -"backgroundColor": "#FFFFFF" -}, -{ -"name": "LayoutBlockFlow DIV id='multicol'", -"bounds": [200, 100], -"contentsOpaqueForText": true, -"drawsContent": false, -"transform": 1 -} -], -"transforms": [ -{ -"id": 1, -"transform": [ -[1, 0, 0, 0], -[0, 1, 0, 0], -[0, 0, 1, 0], -[8, 8, 0, 1] -] -} -] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/multicol/composited-layer-multiple-fragments-translated-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/multicol/composited-layer-multiple-fragments-translated-expected.png deleted file mode 100644 index 996b8f8..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/multicol/composited-layer-multiple-fragments-translated-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/multicol/outline/outline-inline-across-columns-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/multicol/outline/outline-inline-across-columns-expected.png deleted file mode 100644 index 8af42428..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/multicol/outline/outline-inline-across-columns-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/multicol/outline/outline-inline-continuation-across-columns-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/multicol/outline/outline-inline-continuation-across-columns-expected.png deleted file mode 100644 index 5835529..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/multicol/outline/outline-inline-continuation-across-columns-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/multicol/vertical-lr/caret-range-outside-columns-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/multicol/vertical-lr/caret-range-outside-columns-expected.txt deleted file mode 100644 index 8bf843aa..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/multicol/vertical-lr/caret-range-outside-columns-expected.txt +++ /dev/null
@@ -1,62 +0,0 @@ -Test that hitting areas outside columns takes us to the right text content inside columns. - -On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". - -To the left of the first column: -PASS document.caretRangeFromPoint(0,10).startOffset is 0 -FAIL document.caretRangeFromPoint(0,70).startOffset should be 2. Was 0. -FAIL document.caretRangeFromPoint(0,109).startOffset should be 3. Was 0. -To the left of the second column: -PASS document.caretRangeFromPoint(0,110).startOffset is 12 -FAIL document.caretRangeFromPoint(0,170).startOffset should be 14. Was 12. -FAIL document.caretRangeFromPoint(0,209).startOffset should be 15. Was 12. -To the left of the third column: -PASS document.caretRangeFromPoint(0,210).startOffset is 24 -FAIL document.caretRangeFromPoint(0,270).startOffset should be 26. Was 24. -FAIL document.caretRangeFromPoint(0,309).startOffset should be 27. Was 24. -To the right of the first column: -FAIL document.caretRangeFromPoint(400,10).startOffset should be 8. Was 12. -FAIL document.caretRangeFromPoint(400,70).startOffset should be 10. Was 12. -FAIL document.caretRangeFromPoint(400,109).startOffset should be 11. Was 12. -To the right of the second column: -FAIL document.caretRangeFromPoint(400,110).startOffset should be 20. Was 24. -FAIL document.caretRangeFromPoint(400,170).startOffset should be 22. Was 24. -FAIL document.caretRangeFromPoint(400,209).startOffset should be 23. Was 24. -To the right of the third column: -PASS document.caretRangeFromPoint(400,210).startOffset is 32 -FAIL document.caretRangeFromPoint(400,270).startOffset should be 34. Was 32. -FAIL document.caretRangeFromPoint(400,309).startOffset should be 35. Was 32. -Above first column: -PASS document.caretRangeFromPoint(90,0).startOffset is 0 -PASS document.caretRangeFromPoint(110,0).startOffset is 0 -PASS document.caretRangeFromPoint(130,0).startOffset is 4 -PASS document.caretRangeFromPoint(150,0).startOffset is 8 -FAIL document.caretRangeFromPoint(170,0).startOffset should be 8. Was 12. -Below third column: -FAIL document.caretRangeFromPoint(90,350).startOffset should be 27. Was 24. -PASS document.caretRangeFromPoint(110,350).startOffset is 27 -PASS document.caretRangeFromPoint(130,350).startOffset is 31 -PASS document.caretRangeFromPoint(150,350).startOffset is 35 -In the gap between the first and second columns: -PASS document.caretRangeFromPoint(100,109).startOffset is 3 -PASS document.caretRangeFromPoint(120,109).startOffset is 7 -PASS document.caretRangeFromPoint(140,109).startOffset is 11 -PASS document.caretRangeFromPoint(159,109).startOffset is 11 -PASS document.caretRangeFromPoint(100,110).startOffset is 12 -PASS document.caretRangeFromPoint(120,110).startOffset is 16 -PASS document.caretRangeFromPoint(140,110).startOffset is 20 -PASS document.caretRangeFromPoint(159,110).startOffset is 20 -In the gap between the second and third columns: -PASS document.caretRangeFromPoint(100,209).startOffset is 15 -PASS document.caretRangeFromPoint(120,209).startOffset is 19 -PASS document.caretRangeFromPoint(140,209).startOffset is 23 -PASS document.caretRangeFromPoint(159,209).startOffset is 23 -PASS document.caretRangeFromPoint(100,210).startOffset is 24 -PASS document.caretRangeFromPoint(120,210).startOffset is 28 -PASS document.caretRangeFromPoint(140,210).startOffset is 32 -PASS document.caretRangeFromPoint(159,210).startOffset is 32 -PASS successfullyParsed is true - -TEST COMPLETE - -xxx xxx xxx xxx xxx xxx xxx xxx xxx
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/multicol/vertical-lr/caret-range-outside-columns-rtl-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/multicol/vertical-lr/caret-range-outside-columns-rtl-expected.txt deleted file mode 100644 index 44576d7b..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/multicol/vertical-lr/caret-range-outside-columns-rtl-expected.txt +++ /dev/null
@@ -1,74 +0,0 @@ -Test that hitting areas outside columns takes us to the right text content inside columns. - -On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". - -To the left of the first column: -PASS document.caretRangeFromPoint(0,309).startOffset is 0 -FAIL document.caretRangeFromPoint(0,270).startOffset should be 2. Was 0. -FAIL document.caretRangeFromPoint(0,211).startOffset should be 3. Was 0. -FAIL document.caretRangeFromPoint(0,210).startOffset should be 3. Was 12. -To the left of the second column: -PASS document.caretRangeFromPoint(0,209).startOffset is 12 -FAIL document.caretRangeFromPoint(0,170).startOffset should be 14. Was 12. -FAIL document.caretRangeFromPoint(0,111).startOffset should be 15. Was 12. -FAIL document.caretRangeFromPoint(0,110).startOffset should be 15. Was 24. -To the left of the third column: -PASS document.caretRangeFromPoint(0,109).startOffset is 24 -FAIL document.caretRangeFromPoint(0,70).startOffset should be 26. Was 24. -FAIL document.caretRangeFromPoint(0,0).startOffset should be 27. Was 24. -To the right of the first column: -FAIL document.caretRangeFromPoint(400,309).startOffset should be 8. Was 12. -FAIL document.caretRangeFromPoint(400,270).startOffset should be 10. Was 12. -FAIL document.caretRangeFromPoint(400,211).startOffset should be 11. Was 12. -FAIL document.caretRangeFromPoint(400,210).startOffset should be 11. Was 24. -To the right of the second column: -FAIL document.caretRangeFromPoint(400,209).startOffset should be 20. Was 24. -FAIL document.caretRangeFromPoint(400,170).startOffset should be 22. Was 24. -FAIL document.caretRangeFromPoint(400,111).startOffset should be 23. Was 24. -FAIL document.caretRangeFromPoint(400,110).startOffset should be 23. Was 32. -To the right of the third column: -PASS document.caretRangeFromPoint(400,109).startOffset is 32 -FAIL document.caretRangeFromPoint(400,70).startOffset should be 34. Was 32. -FAIL document.caretRangeFromPoint(400,11).startOffset should be 35. Was 32. -Below first column: -PASS document.caretRangeFromPoint(90,350).startOffset is 0 -PASS document.caretRangeFromPoint(110,350).startOffset is 0 -PASS document.caretRangeFromPoint(130,350).startOffset is 4 -PASS document.caretRangeFromPoint(150,350).startOffset is 8 -FAIL document.caretRangeFromPoint(170,350).startOffset should be 8. Was 12. -Above third column: -FAIL document.caretRangeFromPoint(90,0).startOffset should be 27. Was 24. -PASS document.caretRangeFromPoint(110,0).startOffset is 27 -PASS document.caretRangeFromPoint(130,0).startOffset is 31 -PASS document.caretRangeFromPoint(150,0).startOffset is 35 -In the gap between the first and second columns: -PASS document.caretRangeFromPoint(100,211).startOffset is 3 -PASS document.caretRangeFromPoint(120,211).startOffset is 7 -PASS document.caretRangeFromPoint(140,211).startOffset is 11 -PASS document.caretRangeFromPoint(159,211).startOffset is 11 -FAIL document.caretRangeFromPoint(100,210).startOffset should be 3. Was 12. -FAIL document.caretRangeFromPoint(120,210).startOffset should be 7. Was 16. -FAIL document.caretRangeFromPoint(140,210).startOffset should be 11. Was 20. -FAIL document.caretRangeFromPoint(159,210).startOffset should be 11. Was 20. -PASS document.caretRangeFromPoint(100,209).startOffset is 12 -PASS document.caretRangeFromPoint(120,209).startOffset is 16 -PASS document.caretRangeFromPoint(140,209).startOffset is 20 -PASS document.caretRangeFromPoint(159,209).startOffset is 20 -In the gap between the second and third columns: -PASS document.caretRangeFromPoint(100,111).startOffset is 15 -PASS document.caretRangeFromPoint(120,111).startOffset is 19 -PASS document.caretRangeFromPoint(140,111).startOffset is 23 -PASS document.caretRangeFromPoint(159,111).startOffset is 23 -FAIL document.caretRangeFromPoint(100,110).startOffset should be 15. Was 24. -FAIL document.caretRangeFromPoint(120,110).startOffset should be 19. Was 28. -FAIL document.caretRangeFromPoint(140,110).startOffset should be 23. Was 32. -FAIL document.caretRangeFromPoint(159,110).startOffset should be 23. Was 32. -PASS document.caretRangeFromPoint(100,109).startOffset is 24 -PASS document.caretRangeFromPoint(120,109).startOffset is 28 -PASS document.caretRangeFromPoint(140,109).startOffset is 32 -PASS document.caretRangeFromPoint(159,109).startOffset is 32 -PASS successfullyParsed is true - -TEST COMPLETE - -xxx xxx xxx xxx xxx xxx xxx xxx xxx
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/multicol/vertical-lr/composited-relpos-overlapping-will-change-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/multicol/vertical-lr/composited-relpos-overlapping-will-change-expected.png deleted file mode 100644 index b0e5e90..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/multicol/vertical-lr/composited-relpos-overlapping-will-change-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/multicol/vertical-rl/caret-range-outside-columns-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/multicol/vertical-rl/caret-range-outside-columns-expected.txt deleted file mode 100644 index 9c7cf947..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/multicol/vertical-rl/caret-range-outside-columns-expected.txt +++ /dev/null
@@ -1,60 +0,0 @@ -Test that hitting areas outside columns takes us to the right text content inside columns. - -On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". - -To the right of the first column: -PASS document.caretRangeFromPoint(550,10).startOffset is 0 -FAIL document.caretRangeFromPoint(550,70).startOffset should be 2. Was 0. -FAIL document.caretRangeFromPoint(550,109).startOffset should be 3. Was 0. -To the right of the second column: -FAIL document.caretRangeFromPoint(550,110).startOffset should be 12. Was 8. -FAIL document.caretRangeFromPoint(550,170).startOffset should be 14. Was 8. -FAIL document.caretRangeFromPoint(550,209).startOffset should be 15. Was 8. -To the right of the third column: -FAIL document.caretRangeFromPoint(550,210).startOffset should be 24. Was 20. -FAIL document.caretRangeFromPoint(550,270).startOffset should be 26. Was 20. -FAIL document.caretRangeFromPoint(550,309).startOffset should be 27. Was 20. -To the left of the first column: -PASS document.caretRangeFromPoint(0,10).startOffset is 8 -FAIL document.caretRangeFromPoint(0,70).startOffset should be 10. Was 8. -FAIL document.caretRangeFromPoint(0,109).startOffset should be 11. Was 8. -To the left of the second column: -PASS document.caretRangeFromPoint(0,110).startOffset is 20 -FAIL document.caretRangeFromPoint(0,170).startOffset should be 22. Was 20. -FAIL document.caretRangeFromPoint(0,209).startOffset should be 23. Was 20. -To the left of the third column: -PASS document.caretRangeFromPoint(0,210).startOffset is 32 -FAIL document.caretRangeFromPoint(0,270).startOffset should be 34. Was 32. -FAIL document.caretRangeFromPoint(0,309).startOffset should be 35. Was 32. -Above first column: -PASS document.caretRangeFromPoint(550,0).startOffset is 0 -PASS document.caretRangeFromPoint(490,0).startOffset is 0 -PASS document.caretRangeFromPoint(470,0).startOffset is 4 -PASS document.caretRangeFromPoint(450,0).startOffset is 8 -Below third column: -PASS document.caretRangeFromPoint(490,350).startOffset is 27 -PASS document.caretRangeFromPoint(470,350).startOffset is 31 -PASS document.caretRangeFromPoint(450,350).startOffset is 35 -In the gap between the first and second columns: -PASS document.caretRangeFromPoint(499,109).startOffset is 3 -PASS document.caretRangeFromPoint(479,109).startOffset is 7 -PASS document.caretRangeFromPoint(459,109).startOffset is 11 -PASS document.caretRangeFromPoint(440,109).startOffset is 11 -PASS document.caretRangeFromPoint(499,110).startOffset is 12 -PASS document.caretRangeFromPoint(479,110).startOffset is 16 -PASS document.caretRangeFromPoint(459,110).startOffset is 20 -PASS document.caretRangeFromPoint(440,110).startOffset is 20 -In the gap between the second and third columns: -PASS document.caretRangeFromPoint(499,209).startOffset is 15 -PASS document.caretRangeFromPoint(479,209).startOffset is 19 -PASS document.caretRangeFromPoint(459,209).startOffset is 23 -PASS document.caretRangeFromPoint(440,209).startOffset is 23 -PASS document.caretRangeFromPoint(499,210).startOffset is 24 -PASS document.caretRangeFromPoint(479,210).startOffset is 28 -PASS document.caretRangeFromPoint(459,210).startOffset is 32 -PASS document.caretRangeFromPoint(440,210).startOffset is 32 -PASS successfullyParsed is true - -TEST COMPLETE - -xxx xxx xxx xxx xxx xxx xxx xxx xxx
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/multicol/vertical-rl/caret-range-outside-columns-rtl-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/multicol/vertical-rl/caret-range-outside-columns-rtl-expected.txt deleted file mode 100644 index c70a44c..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/multicol/vertical-rl/caret-range-outside-columns-rtl-expected.txt +++ /dev/null
@@ -1,72 +0,0 @@ -Test that hitting areas outside columns takes us to the right text content inside columns. - -On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". - -To the right of the first column: -PASS document.caretRangeFromPoint(550,340).startOffset is 0 -FAIL document.caretRangeFromPoint(550,270).startOffset should be 2. Was 0. -FAIL document.caretRangeFromPoint(550,211).startOffset should be 3. Was 0. -FAIL document.caretRangeFromPoint(550,210).startOffset should be 3. Was 8. -To the right of the second column: -FAIL document.caretRangeFromPoint(550,209).startOffset should be 12. Was 8. -FAIL document.caretRangeFromPoint(550,170).startOffset should be 14. Was 8. -FAIL document.caretRangeFromPoint(550,111).startOffset should be 15. Was 8. -FAIL document.caretRangeFromPoint(550,110).startOffset should be 15. Was 20. -To the right of the third column: -FAIL document.caretRangeFromPoint(550,109).startOffset should be 24. Was 20. -FAIL document.caretRangeFromPoint(550,70).startOffset should be 26. Was 20. -FAIL document.caretRangeFromPoint(550,11).startOffset should be 27. Was 20. -To the left of the first column: -PASS document.caretRangeFromPoint(0,340).startOffset is 8 -FAIL document.caretRangeFromPoint(0,270).startOffset should be 10. Was 8. -FAIL document.caretRangeFromPoint(0,211).startOffset should be 11. Was 8. -FAIL document.caretRangeFromPoint(0,210).startOffset should be 11. Was 20. -To the left of the second column: -PASS document.caretRangeFromPoint(0,209).startOffset is 20 -FAIL document.caretRangeFromPoint(0,170).startOffset should be 22. Was 20. -FAIL document.caretRangeFromPoint(0,111).startOffset should be 23. Was 20. -FAIL document.caretRangeFromPoint(0,110).startOffset should be 23. Was 32. -To the left of the second column: -PASS document.caretRangeFromPoint(0,109).startOffset is 32 -FAIL document.caretRangeFromPoint(0,70).startOffset should be 34. Was 32. -FAIL document.caretRangeFromPoint(0,0).startOffset should be 35. Was 32. -Below first column: -PASS document.caretRangeFromPoint(550,350).startOffset is 0 -PASS document.caretRangeFromPoint(490,350).startOffset is 0 -PASS document.caretRangeFromPoint(470,350).startOffset is 4 -PASS document.caretRangeFromPoint(450,350).startOffset is 8 -Above third column: -PASS document.caretRangeFromPoint(490,0).startOffset is 27 -PASS document.caretRangeFromPoint(470,0).startOffset is 31 -PASS document.caretRangeFromPoint(450,0).startOffset is 35 -In the gap between the first and second columns: -PASS document.caretRangeFromPoint(499,211).startOffset is 3 -PASS document.caretRangeFromPoint(479,211).startOffset is 7 -PASS document.caretRangeFromPoint(459,211).startOffset is 11 -PASS document.caretRangeFromPoint(440,211).startOffset is 11 -FAIL document.caretRangeFromPoint(499,210).startOffset should be 3. Was 12. -FAIL document.caretRangeFromPoint(479,210).startOffset should be 7. Was 16. -FAIL document.caretRangeFromPoint(459,210).startOffset should be 11. Was 20. -FAIL document.caretRangeFromPoint(440,210).startOffset should be 11. Was 20. -PASS document.caretRangeFromPoint(499,209).startOffset is 12 -PASS document.caretRangeFromPoint(479,209).startOffset is 16 -PASS document.caretRangeFromPoint(459,209).startOffset is 20 -PASS document.caretRangeFromPoint(440,209).startOffset is 20 -In the gap between the second and third columns: -PASS document.caretRangeFromPoint(499,111).startOffset is 15 -PASS document.caretRangeFromPoint(479,111).startOffset is 19 -PASS document.caretRangeFromPoint(459,111).startOffset is 23 -PASS document.caretRangeFromPoint(440,111).startOffset is 23 -FAIL document.caretRangeFromPoint(499,110).startOffset should be 15. Was 24. -FAIL document.caretRangeFromPoint(479,110).startOffset should be 19. Was 28. -FAIL document.caretRangeFromPoint(459,110).startOffset should be 23. Was 32. -FAIL document.caretRangeFromPoint(440,110).startOffset should be 23. Was 32. -PASS document.caretRangeFromPoint(499,109).startOffset is 24 -PASS document.caretRangeFromPoint(479,109).startOffset is 28 -PASS document.caretRangeFromPoint(459,109).startOffset is 32 -PASS document.caretRangeFromPoint(440,109).startOffset is 32 -PASS successfullyParsed is true - -TEST COMPLETE - -xxx xxx xxx xxx xxx xxx xxx xxx xxx
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/overflow/003-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/overflow/003-expected.png deleted file mode 100644 index 6d7131a..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/overflow/003-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/overflow/image-selection-highlight-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/overflow/image-selection-highlight-expected.png deleted file mode 100644 index 9d72fc57..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/overflow/image-selection-highlight-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/overflow/overflow-rtl-vertical-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/overflow/overflow-rtl-vertical-expected.png deleted file mode 100644 index 5199d77..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/overflow/overflow-rtl-vertical-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/overflow/overflow-x-y-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/overflow/overflow-x-y-expected.png deleted file mode 100644 index fa5f989..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/overflow/overflow-x-y-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/overflow/transformed-frame-scrollIntoView-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/overflow/transformed-frame-scrollIntoView-expected.txt deleted file mode 100644 index c839d7da..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/overflow/transformed-frame-scrollIntoView-expected.txt +++ /dev/null
@@ -1,18 +0,0 @@ -layer at (0,0) size 800x600 scrollY 200.00 scrollHeight 2016 - LayoutView at (0,0) size 800x600 -layer at (0,-200) size 800x2016 backgroundClip at (0,0) size 800x600 clip at (0,0) size 800x600 - LayoutBlockFlow {HTML} at (0,0) size 800x2016 - LayoutBlockFlow {BODY} at (8,8) size 784x2000 - LayoutBlockFlow {DIV} at (0,0) size 784x2000 -layer at (0,0) size 300x200 hasTransform - LayoutIFrame (positioned) {IFRAME} at (0,400) size 300x200 - layer at (0,0) size 300x200 scrollY 50.00 scrollHeight 1016 - LayoutView at (0,0) size 300x200 - layer at (0,-50) size 300x1016 backgroundClip at (0,0) size 300x200 clip at (0,0) size 300x200 - LayoutBlockFlow {HTML} at (0,0) size 300x1016 - LayoutBlockFlow {BODY} at (8,8) size 284x1000 - LayoutBlockFlow {DIV} at (0,0) size 284x1000 - layer at (0,100) size 100x100 - LayoutBlockFlow (positioned) {DIV} at (0,150) size 100x100 [bgcolor=#008000] -scrolled to 0,200 -frame '<!--framePath //<!--frame0-->-->' scrolled to 0,50
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/parser/xhtml-alternate-entities-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/parser/xhtml-alternate-entities-expected.png deleted file mode 100644 index 79f74b51..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/parser/xhtml-alternate-entities-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/reflections/inline-crash-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/reflections/inline-crash-expected.png deleted file mode 100644 index 6a12f11f..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/reflections/inline-crash-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/reflections/opacity-reflection-transform-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/reflections/opacity-reflection-transform-expected.png deleted file mode 100644 index 4eabd14..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/reflections/opacity-reflection-transform-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/reflections/reflection-overflow-hidden-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/reflections/reflection-overflow-hidden-expected.png deleted file mode 100644 index dd20c22..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/reflections/reflection-overflow-hidden-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/replaced/border-radius-clip-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/replaced/border-radius-clip-expected.png deleted file mode 100644 index c8db1b9..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/replaced/border-radius-clip-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/replaced/selection-rect-in-table-cell-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/replaced/selection-rect-in-table-cell-expected.png deleted file mode 100644 index 720b772..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/replaced/selection-rect-in-table-cell-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/replaced/table-percent-height-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/replaced/table-percent-height-expected.txt deleted file mode 100644 index b2409f0c..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/replaced/table-percent-height-expected.txt +++ /dev/null
@@ -1,66 +0,0 @@ -Button -Button -Option -Option - -This test checks that replaced elements with percentage heights within table cells have the correct height. -Note, some of the button height tests fail on the Windows ports. See bug #34071. - -On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". - -PASS successfullyParsed is true - -TEST COMPLETE - -FAIL getWidth('canvas-75') should be 300px. Was 225px. -FAIL getHeight('canvas-75') should be 150px. Was 112.5px. -PASS getWidth('canvas-100') is '300px' -PASS getHeight('canvas-100') is '150px' -PASS getWidth('embed-75') is '300px' -FAIL getHeight('embed-75') should be 150px. Was 112.5px. -PASS getWidth('embed-100') is '300px' -PASS getHeight('embed-100') is '150px' -FAIL getWidth('img-75') should be 100px. Was 75px. -FAIL getHeight('img-75') should be 100px. Was 75px. -PASS getWidth('img-100') is '100px' -PASS getHeight('img-100') is '100px' -FAIL getWidth('img-75-nested') should be 100px. Was 75px. -FAIL getHeight('img-75-nested') should be 100px. Was 75px. -PASS getWidth('img-100-nested') is '100px' -PASS getHeight('img-100-nested') is '100px' -PASS getWidth('object-75') is '300px' -FAIL getHeight('object-75') should be 150px. Was 112.5px. -PASS getWidth('object-100') is '300px' -PASS getHeight('object-100') is '150px' -PASS getWidth('button-75') is getWidth('button-100') -PASS getHeight('button-75') != '0px' is true -PASS getHeight('button-75') is getHeight('button-100') -PASS getWidth('input-button-75') is getWidth('input-button-100') -PASS getHeight('input-button-75') != '0px' is true -PASS getHeight('input-button-75') is getHeight('input-button-100') -PASS getWidth('input-checkbox-75') is getWidth('input-checkbox-100') -PASS getHeight('input-checkbox-75') != '0px' is true -PASS getHeight('input-checkbox-75') is getHeight('input-checkbox-100') -PASS getWidth('input-file-75') is getWidth('input-file-100') -PASS getHeight('input-file-75') != '0px' is true -PASS getHeight('input-file-75') is getHeight('input-file-100') -FAIL getWidth('input-image-75') should be 100px. Was 75px. -FAIL getHeight('input-image-75') should be 100px. Was 75px. -PASS getWidth('input-image-100') is '100px' -PASS getHeight('input-image-100') is '100px' -PASS getWidth('input-radio-75') is getWidth('input-radio-100') -PASS getHeight('input-radio-75') != '0px' is true -PASS getHeight('input-radio-75') is getHeight('input-radio-100') -PASS getWidth('input-reset-75') is getWidth('input-reset-100') -PASS getHeight('input-reset-75') != '0px' is true -PASS getHeight('input-reset-75') is getHeight('input-reset-100') -PASS getWidth('input-submit-75') is getWidth('input-submit-100') -PASS getHeight('input-submit-75') != '0px' is true -PASS getHeight('input-submit-75') is getHeight('input-submit-100') -PASS getWidth('select-75') is getWidth('select-100') -PASS getHeight('select-75') != '0px' is true -PASS getHeight('select-75') is getHeight('select-100') -PASS successfullyParsed is true - -TEST COMPLETE -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/replaced/table-percent-width-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/replaced/table-percent-width-expected.txt deleted file mode 100644 index d04db25..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/replaced/table-percent-width-expected.txt +++ /dev/null
@@ -1,23 +0,0 @@ -This test checks that a replaced element with percentage width (and no height specified) within a table cell is squeezed to the dimensions of the table cell. -See bug #29447. - -On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". - -PASS successfullyParsed is true - -TEST COMPLETE - -PASS getWidth('img-1') is '105px' -PASS getHeight('img-1') is '105px' -FAIL getWidth('img-2') should be 100px. Was 98px. -FAIL getHeight('img-2') should be 100px. Was 98px. -PASS getWidth('img-3') is '40px' -PASS getHeight('img-3') is '40px' -FAIL getWidth('img-4') should be 102px. Was 98px. -FAIL getHeight('img-4') should be 102px. Was 98px. -PASS getWidth('img-5') is '40px' -FAIL getHeight('img-5') should be 102px. Was 98px. -PASS successfullyParsed is true - -TEST COMPLETE -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/replaced/table-replaced-element-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/replaced/table-replaced-element-expected.txt deleted file mode 100644 index 8b072d5..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/replaced/table-replaced-element-expected.txt +++ /dev/null
@@ -1,8 +0,0 @@ -Layout test for WebKit bug 85581. - -This tests that the contents of a table do not overflow when the table contains an image with percentage height. For this test to pass, the blue rectangle should be entirely within the table border and/or you should see a 'PASS' message below. - -Height of table: 306 -Height of table contents: 280 -PASS: Table contents do not overflow outside of table border. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/replaced/vertical-lr/absolute-position-percentage-width-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/replaced/vertical-lr/absolute-position-percentage-width-expected.png deleted file mode 100644 index 65b647c7..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/replaced/vertical-lr/absolute-position-percentage-width-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/replaced/vertical-lr/absolute-position-with-auto-height-and-top-and-bottom-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/replaced/vertical-lr/absolute-position-with-auto-height-and-top-and-bottom-expected.png deleted file mode 100644 index cba8dadc..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/replaced/vertical-lr/absolute-position-with-auto-height-and-top-and-bottom-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/replaced/vertical-lr/absolute-position-with-auto-width-and-left-and-right-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/replaced/vertical-lr/absolute-position-with-auto-width-and-left-and-right-expected.png deleted file mode 100644 index 896688822..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/replaced/vertical-lr/absolute-position-with-auto-width-and-left-and-right-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/replaced/width100percent-button-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/replaced/width100percent-button-expected.png deleted file mode 100644 index ea9ad84d..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/replaced/width100percent-button-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/replaced/width100percent-checkbox-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/replaced/width100percent-checkbox-expected.png deleted file mode 100644 index 10a5c9b..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/replaced/width100percent-checkbox-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/replaced/width100percent-radio-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/replaced/width100percent-radio-expected.png deleted file mode 100644 index 9d15721b..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/replaced/width100percent-radio-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/ruby/base-shorter-than-text-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/ruby/base-shorter-than-text-expected.png deleted file mode 100644 index 14dbd13..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/ruby/base-shorter-than-text-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/ruby/float-overhang-from-ruby-text-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/ruby/float-overhang-from-ruby-text-expected.png deleted file mode 100644 index fc3931d..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/ruby/float-overhang-from-ruby-text-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/ruby/nested-ruby-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/ruby/nested-ruby-expected.png deleted file mode 100644 index ba7cb24..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/ruby/nested-ruby-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/ruby/overhang-horizontal-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/ruby/overhang-horizontal-expected.png deleted file mode 100644 index b5b21c3..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/ruby/overhang-horizontal-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/ruby/overhang-horizontal-no-overlap1-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/ruby/overhang-horizontal-no-overlap1-expected.png deleted file mode 100644 index 01c758935..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/ruby/overhang-horizontal-no-overlap1-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/ruby/overhang-vertical-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/ruby/overhang-vertical-expected.png deleted file mode 100644 index 0d432052..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/ruby/overhang-vertical-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/ruby/overhang-vertical-no-overlap1-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/ruby/overhang-vertical-no-overlap1-expected.png deleted file mode 100644 index 42bc77f..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/ruby/overhang-vertical-no-overlap1-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/ruby/ruby-empty-rt-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/ruby/ruby-empty-rt-expected.png deleted file mode 100644 index 3b9b18f..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/ruby/ruby-empty-rt-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/ruby/ruby-length-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/ruby/ruby-length-expected.png deleted file mode 100644 index 8066e86..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/ruby/ruby-length-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/ruby/ruby-position-modern-japanese-fonts-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/ruby/ruby-position-modern-japanese-fonts-expected.png deleted file mode 100644 index 27d62085..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/ruby/ruby-position-modern-japanese-fonts-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/ruby/ruby-run-break-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/ruby/ruby-run-break-expected.png deleted file mode 100644 index 5fd88fe..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/ruby/ruby-run-break-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/ruby/ruby-runs-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/ruby/ruby-runs-expected.png deleted file mode 100644 index 49d3340..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/ruby/ruby-runs-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/ruby/ruby-runs-spans-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/ruby/ruby-runs-spans-expected.png deleted file mode 100644 index 5db382e..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/ruby/ruby-runs-spans-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/ruby/ruby-simple-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/ruby/ruby-simple-expected.png deleted file mode 100644 index 9109735..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/ruby/ruby-simple-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/ruby/ruby-simple-rp-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/ruby/ruby-simple-rp-expected.png deleted file mode 100644 index ffea2af..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/ruby/ruby-simple-rp-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/ruby/ruby-text-before-after-content-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/ruby/ruby-text-before-after-content-expected.png deleted file mode 100644 index 4d15d83..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/ruby/ruby-text-before-after-content-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/ruby/ruby-trailing-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/ruby/ruby-trailing-expected.png deleted file mode 100644 index 2bd3d3c..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/ruby/ruby-trailing-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/ruby/select-ruby-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/ruby/select-ruby-expected.png deleted file mode 100644 index bf1075b..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/ruby/select-ruby-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/selectors/040-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/selectors/040-expected.png deleted file mode 100644 index 7a6ab17..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/selectors/040-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/selectors/041-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/selectors/041-expected.png deleted file mode 100644 index 761e3a3..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/selectors/041-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/selectors/159-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/selectors/159-expected.png deleted file mode 100644 index 3db3eff..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/selectors/159-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/selectors/166-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/selectors/166-expected.png deleted file mode 100644 index 48447439..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/selectors/166-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/sub-pixel/inline-block-with-padding-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/sub-pixel/inline-block-with-padding-expected.txt deleted file mode 100644 index 2a05f8a2..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/sub-pixel/inline-block-with-padding-expected.txt +++ /dev/null
@@ -1,10 +0,0 @@ -PASS links[0].offsetWidth is within 5 of 175 -PASS successfullyParsed is true - -TEST COMPLETE - - -Both links should render the same and not wrap. - -This shouldn't wrap -This shouldn't wrap
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/sub-pixel/repaint-subpixel-layer-in-subpixel-composited-layer-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/sub-pixel/repaint-subpixel-layer-in-subpixel-composited-layer-expected.txt deleted file mode 100644 index 6b3ea42..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/sub-pixel/repaint-subpixel-layer-in-subpixel-composited-layer-expected.txt +++ /dev/null
@@ -1,161 +0,0 @@ -10.5px,12.5px,10.5px: -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV id='container'", - "bounds": [100, 50], - "contentsOpaqueForText": true, - "invalidations": [ - [12, 0, 12, 12], - [10, 0, 12, 12] - ], - "transform": 1 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [11, 0, 0, 1] - ] - } - ] -} -10.6px,12.4px,10.4px: -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV id='container'", - "bounds": [100, 50], - "contentsOpaqueForText": true, - "invalidations": [ - [11, 0, 13, 12], - [9, 0, 13, 12] - ], - "transform": 1 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [11, 0, 0, 1] - ] - } - ] -} -10.4px,12.6px,10.6px: -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV id='container'", - "bounds": [100, 50], - "contentsOpaqueForText": true, - "invalidations": [ - [12, 0, 13, 12], - [10, 0, 13, 12] - ], - "transform": 1 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [10, 0, 0, 1] - ] - } - ] -} -10.6px,12.6px,10.6px: -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV id='container'", - "bounds": [100, 50], - "contentsOpaqueForText": true, - "invalidations": [ - [12, 0, 13, 12], - [10, 0, 13, 12] - ], - "transform": 1 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [11, 0, 0, 1] - ] - } - ] -} -10.4px,12.4px,10.4px: -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV id='container'", - "bounds": [100, 50], - "contentsOpaqueForText": true, - "invalidations": [ - [12, 0, 13, 12], - [10, 0, 13, 12] - ], - "transform": 1 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [10, 0, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/sub-pixel/should-not-repaint-subpixel-composited-layer-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/sub-pixel/should-not-repaint-subpixel-composited-layer-expected.txt deleted file mode 100644 index f7675953..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/sub-pixel/should-not-repaint-subpixel-composited-layer-expected.txt +++ /dev/null
@@ -1,379 +0,0 @@ -10.1: -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV id='layer'", - "position": [18, 8], - "bounds": [100, 50], - "contentsOpaqueForText": true, - "drawsContent": false - } - ] -} -10.2: -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV id='layer'", - "position": [18, 8], - "bounds": [100, 50], - "contentsOpaqueForText": true, - "drawsContent": false - } - ] -} -10.299999999999999: -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV id='layer'", - "position": [18, 8], - "bounds": [100, 50], - "contentsOpaqueForText": true, - "drawsContent": false - } - ] -} -10.399999999999999: -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV id='layer'", - "position": [18, 8], - "bounds": [100, 50], - "contentsOpaqueForText": true, - "drawsContent": false - } - ] -} -10.499999999999998: -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV id='layer'", - "position": [19, 8], - "bounds": [100, 50], - "contentsOpaqueForText": true, - "drawsContent": false - } - ] -} -10.599999999999998: -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV id='layer'", - "position": [19, 8], - "bounds": [100, 50], - "contentsOpaqueForText": true, - "drawsContent": false - } - ] -} -10.699999999999998: -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV id='layer'", - "position": [19, 8], - "bounds": [100, 50], - "contentsOpaqueForText": true, - "drawsContent": false - } - ] -} -10.799999999999997: -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV id='layer'", - "position": [19, 8], - "bounds": [100, 50], - "contentsOpaqueForText": true, - "drawsContent": false - } - ] -} -10.899999999999997: -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV id='layer'", - "position": [19, 8], - "bounds": [100, 50], - "contentsOpaqueForText": true, - "drawsContent": false - } - ] -} -10.999999999999996: -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV id='layer'", - "position": [19, 8], - "bounds": [100, 50], - "contentsOpaqueForText": true, - "drawsContent": false - } - ] -} -11.099999999999996: -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV id='layer'", - "position": [19, 8], - "bounds": [100, 50], - "contentsOpaqueForText": true, - "drawsContent": false - } - ] -} -11.199999999999996: -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV id='layer'", - "position": [19, 8], - "bounds": [100, 50], - "contentsOpaqueForText": true, - "drawsContent": false - } - ] -} -11.299999999999995: -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV id='layer'", - "position": [19, 8], - "bounds": [100, 50], - "contentsOpaqueForText": true, - "drawsContent": false - } - ] -} -11.399999999999995: -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV id='layer'", - "position": [19, 8], - "bounds": [100, 50], - "contentsOpaqueForText": true, - "drawsContent": false - } - ] -} -11.499999999999995: -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV id='layer'", - "position": [20, 8], - "bounds": [100, 50], - "contentsOpaqueForText": true, - "drawsContent": false - } - ] -} -11.599999999999994: -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV id='layer'", - "position": [20, 8], - "bounds": [100, 50], - "contentsOpaqueForText": true, - "drawsContent": false - } - ] -} -11.699999999999994: -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV id='layer'", - "position": [20, 8], - "bounds": [100, 50], - "contentsOpaqueForText": true, - "drawsContent": false - } - ] -} -11.799999999999994: -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV id='layer'", - "position": [20, 8], - "bounds": [100, 50], - "contentsOpaqueForText": true, - "drawsContent": false - } - ] -} -11.899999999999993: -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV id='layer'", - "position": [20, 8], - "bounds": [100, 50], - "contentsOpaqueForText": true, - "drawsContent": false - } - ] -} -11.999999999999993: -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV id='layer'", - "position": [20, 8], - "bounds": [100, 50], - "contentsOpaqueForText": true, - "drawsContent": false - } - ] -} -12.099999999999993: -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV id='layer'", - "position": [20, 8], - "bounds": [100, 50], - "contentsOpaqueForText": true, - "drawsContent": false - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/002-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/002-expected.png deleted file mode 100644 index 9ede84ed..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/002-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/003-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/003-expected.png deleted file mode 100644 index b40ddc03..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/003-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/005-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/005-expected.png deleted file mode 100644 index dfd49262..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/005-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/013-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/013-expected.png deleted file mode 100644 index cb36b4c..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/013-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/017-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/017-expected.png deleted file mode 100644 index 3c6a966..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/017-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/022-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/022-expected.png deleted file mode 100644 index e5e05e6..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/022-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/024-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/024-expected.png deleted file mode 100644 index 91d206f..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/024-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/025-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/025-expected.png deleted file mode 100644 index 6c0c615..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/025-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/027-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/027-expected.png deleted file mode 100644 index af5949f..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/027-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/027-vertical-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/027-vertical-expected.png deleted file mode 100644 index b0fa9ed..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/027-vertical-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/028-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/028-expected.png deleted file mode 100644 index 429e425..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/028-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/028-vertical-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/028-vertical-expected.png deleted file mode 100644 index bc8c84a..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/028-vertical-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/030-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/030-expected.png deleted file mode 100644 index 7f04052d..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/030-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/040-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/040-expected.png deleted file mode 100644 index d1e701bb..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/040-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/040-vertical-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/040-vertical-expected.png deleted file mode 100644 index 9e48483..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/040-vertical-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/append-cells-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/append-cells-expected.png deleted file mode 100644 index 38ec851c..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/append-cells-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/append-cells2-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/append-cells2-expected.png deleted file mode 100644 index 8986181..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/append-cells2-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_border-table-cell-collapsed-border-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_border-table-cell-collapsed-border-expected.png deleted file mode 100644 index 983fc93..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_border-table-cell-collapsed-border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_border-table-cell-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_border-table-cell-expected.png deleted file mode 100644 index d03305d..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_border-table-cell-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_border-table-collapsed-border-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_border-table-collapsed-border-expected.png deleted file mode 100644 index 7ac0c80..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_border-table-collapsed-border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_border-table-column-collapsed-border-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_border-table-column-collapsed-border-expected.png deleted file mode 100644 index 4d3a340a..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_border-table-column-collapsed-border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_border-table-column-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_border-table-column-expected.png deleted file mode 100644 index 830e8270..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_border-table-column-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_border-table-column-group-collapsed-border-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_border-table-column-group-collapsed-border-expected.png deleted file mode 100644 index 1bad430..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_border-table-column-group-collapsed-border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_border-table-column-group-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_border-table-column-group-expected.png deleted file mode 100644 index 824dcfc..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_border-table-column-group-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_border-table-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_border-table-expected.png deleted file mode 100644 index 93077267..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_border-table-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_border-table-quirks-collapsed-border-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_border-table-quirks-collapsed-border-expected.png deleted file mode 100644 index 780cfbbc..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_border-table-quirks-collapsed-border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_border-table-quirks-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_border-table-quirks-expected.png deleted file mode 100644 index 81b8a71ef..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_border-table-quirks-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_border-table-row-collapsed-border-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_border-table-row-collapsed-border-expected.png deleted file mode 100644 index 20b5943e..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_border-table-row-collapsed-border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_border-table-row-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_border-table-row-expected.png deleted file mode 100644 index c8ff98f..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_border-table-row-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_border-table-row-group-collapsed-border-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_border-table-row-group-collapsed-border-expected.png deleted file mode 100644 index 64b1f92c..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_border-table-row-group-collapsed-border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_border-table-row-group-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_border-table-row-group-expected.png deleted file mode 100644 index adcdfb3..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_border-table-row-group-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_layers-hide-collapsed-border-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_layers-hide-collapsed-border-expected.png deleted file mode 100644 index 9a4ca02..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_layers-hide-collapsed-border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_layers-hide-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_layers-hide-expected.png deleted file mode 100644 index 865aba3..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_layers-hide-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_layers-opacity-collapsed-border-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_layers-opacity-collapsed-border-expected.png deleted file mode 100644 index c250aa7..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_layers-opacity-collapsed-border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_layers-opacity-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_layers-opacity-expected.png deleted file mode 100644 index c250aa7..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_layers-opacity-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_layers-show-collapsed-border-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_layers-show-collapsed-border-expected.png deleted file mode 100644 index aa55ead..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_layers-show-collapsed-border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_layers-show-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_layers-show-expected.png deleted file mode 100644 index a031f06..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_layers-show-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_position-table-cell-collapsed-border-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_position-table-cell-collapsed-border-expected.png deleted file mode 100644 index 5e6e6548..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_position-table-cell-collapsed-border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_position-table-cell-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_position-table-cell-expected.png deleted file mode 100644 index efb3ca3..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_position-table-cell-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_position-table-collapsed-border-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_position-table-collapsed-border-expected.png deleted file mode 100644 index 943ddcfe..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_position-table-collapsed-border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_position-table-column-collapsed-border-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_position-table-column-collapsed-border-expected.png deleted file mode 100644 index 07113dc..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_position-table-column-collapsed-border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_position-table-column-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_position-table-column-expected.png deleted file mode 100644 index 78ee022..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_position-table-column-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_position-table-column-group-collapsed-border-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_position-table-column-group-collapsed-border-expected.png deleted file mode 100644 index ef93136..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_position-table-column-group-collapsed-border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_position-table-column-group-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_position-table-column-group-expected.png deleted file mode 100644 index a953e2e3..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_position-table-column-group-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_position-table-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_position-table-expected.png deleted file mode 100644 index 40657ce..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_position-table-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_position-table-row-collapsed-border-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_position-table-row-collapsed-border-expected.png deleted file mode 100644 index fb6836b..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_position-table-row-collapsed-border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_position-table-row-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_position-table-row-expected.png deleted file mode 100644 index e60f9157..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_position-table-row-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_position-table-row-group-collapsed-border-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_position-table-row-group-collapsed-border-expected.png deleted file mode 100644 index 5d75a22..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_position-table-row-group-collapsed-border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_position-table-row-group-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_position-table-row-group-expected.png deleted file mode 100644 index 24e0bae..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_position-table-row-group-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_simple-table-cell-collapsed-border-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_simple-table-cell-collapsed-border-expected.png deleted file mode 100644 index 4dba011..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_simple-table-cell-collapsed-border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_simple-table-cell-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_simple-table-cell-expected.png deleted file mode 100644 index b371673..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_simple-table-cell-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_simple-table-collapsed-border-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_simple-table-collapsed-border-expected.png deleted file mode 100644 index 9d5ec06..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_simple-table-collapsed-border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_simple-table-column-collapsed-border-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_simple-table-column-collapsed-border-expected.png deleted file mode 100644 index 3c3a68b..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_simple-table-column-collapsed-border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_simple-table-column-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_simple-table-column-expected.png deleted file mode 100644 index 483c1442..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_simple-table-column-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_simple-table-column-group-collapsed-border-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_simple-table-column-group-collapsed-border-expected.png deleted file mode 100644 index f21a3b55..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_simple-table-column-group-collapsed-border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_simple-table-column-group-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_simple-table-column-group-expected.png deleted file mode 100644 index 67087df..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_simple-table-column-group-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_simple-table-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_simple-table-expected.png deleted file mode 100644 index daa35fa..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_simple-table-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_simple-table-row-collapsed-border-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_simple-table-row-collapsed-border-expected.png deleted file mode 100644 index 93318977..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_simple-table-row-collapsed-border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_simple-table-row-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_simple-table-row-expected.png deleted file mode 100644 index b8635be..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_simple-table-row-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_simple-table-row-group-collapsed-border-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_simple-table-row-group-collapsed-border-expected.png deleted file mode 100644 index db7d7a12..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_simple-table-row-group-collapsed-border-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_simple-table-row-group-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_simple-table-row-group-expected.png deleted file mode 100644 index 3c618e8..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/backgr_simple-table-row-group-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/background-gradient-border-collapsed-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/background-gradient-border-collapsed-expected.png deleted file mode 100644 index 9fdd1e8..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/background-gradient-border-collapsed-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/border-collapsing/001-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/border-collapsing/001-expected.png deleted file mode 100644 index b73441b..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/border-collapsing/001-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/border-collapsing/001-vertical-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/border-collapsing/001-vertical-expected.png deleted file mode 100644 index 522e9cc..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/border-collapsing/001-vertical-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/border-collapsing/002-vertical-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/border-collapsing/002-vertical-expected.png deleted file mode 100644 index 20c674f..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/border-collapsing/002-vertical-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/border-collapsing/003-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/border-collapsing/003-expected.png deleted file mode 100644 index cbe34da0..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/border-collapsing/003-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/border-collapsing/003-vertical-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/border-collapsing/003-vertical-expected.png deleted file mode 100644 index 5414b534..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/border-collapsing/003-vertical-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/border-collapsing/004-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/border-collapsing/004-expected.png deleted file mode 100644 index 8bbb623d3..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/border-collapsing/004-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/border-collapsing/collapsed-border-with-col-colgroup-span-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/border-collapsing/collapsed-border-with-col-colgroup-span-expected.png deleted file mode 100644 index e758faac..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/border-collapsing/collapsed-border-with-col-colgroup-span-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/border-collapsing/rtl-border-collapsing-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/border-collapsing/rtl-border-collapsing-expected.png deleted file mode 100644 index f0e36cd..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/border-collapsing/rtl-border-collapsing-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/border-collapsing/rtl-border-collapsing-vertical-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/border-collapsing/rtl-border-collapsing-vertical-expected.png deleted file mode 100644 index 4eb3cbf..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/border-collapsing/rtl-border-collapsing-vertical-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/calculated-width-on-col-within-colgroup-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/calculated-width-on-col-within-colgroup-expected.txt deleted file mode 100644 index 2de94e0..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/calculated-width-on-col-within-colgroup-expected.txt +++ /dev/null
@@ -1,17 +0,0 @@ - -FAIL: -Expected 200 for width, but got 0. -Expected 200 for width, but got 0. - -<table> - <colgroup width="200"> - <col data-expected-width="200"> - <col data-expected-width="200"> - </colgroup> - <tbody><tr> - <td data-expected-width="200"></td> - <td data-expected-width="200"></td> - </tr> -</tbody></table> - -crbug.com/446936: Use a used value of Auto on col elements that have a calc value. This is permitted by the spec and avoids ASSERTs.
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/caption-margin-direction-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/caption-margin-direction-expected.txt deleted file mode 100644 index b36ff728..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/caption-margin-direction-expected.txt +++ /dev/null
@@ -1,5 +0,0 @@ -This is a testharness.js-based test. -FAIL Test caption location 0 assert_equals: expected 20 but got 0 -PASS Test caption location 1 -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/colspan-with-all-percent-cells-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/colspan-with-all-percent-cells-expected.png deleted file mode 100644 index 85afd21..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/colspan-with-all-percent-cells-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/dynamic-descendant-percentage-height-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/dynamic-descendant-percentage-height-expected.png deleted file mode 100644 index c173a48..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/dynamic-descendant-percentage-height-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/empty-cells-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/empty-cells-expected.png deleted file mode 100644 index b6fb7784..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/empty-cells-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/multiple-percent-height-rows-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/multiple-percent-height-rows-expected.png deleted file mode 100644 index c029825..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/multiple-percent-height-rows-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/padding-height-and-override-height-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/padding-height-and-override-height-expected.txt deleted file mode 100644 index b8c56d4e..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/padding-height-and-override-height-expected.txt +++ /dev/null
@@ -1,6 +0,0 @@ -PASS document.getElementById('cell-contents').offsetHeight is 78 -FAIL document.getElementById('cell-contents').offsetWidth should be 88. Was 98. -PASS successfullyParsed is true - -TEST COMPLETE -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/percent-widths-float-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/percent-widths-float-expected.txt deleted file mode 100644 index 94f625c2..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/percent-widths-float-expected.txt +++ /dev/null
@@ -1,14 +0,0 @@ - - - -crbug.com/476370: Test cells get appropriate width when we use fractional percentage values. - -FAIL: -Expected 833 for width, but got 834. - -<td id="orange" data-expected-width="833"><div></div></td> -FAIL: -Expected 42 for width, but got 41. - -<td id="blue" data-expected-width="42"><div></div></td> -PASS
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/percent-widths-stretch-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/percent-widths-stretch-expected.png deleted file mode 100644 index c95b521..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/percent-widths-stretch-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/percent-widths-stretch-vertical-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/percent-widths-stretch-vertical-expected.png deleted file mode 100644 index d449e7ca..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/percent-widths-stretch-vertical-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/percent-widths-total-less-than-one-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/percent-widths-total-less-than-one-expected.txt deleted file mode 100644 index 836eaeba..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/percent-widths-total-less-than-one-expected.txt +++ /dev/null
@@ -1,12 +0,0 @@ - - -crbug.com/476370: Test cells get appropriate width when total width of cells is less than 1%. - -FAIL: -Expected 667 for width, but got 666. - -<td id="blue" data-expected-width="667"><div></div></td> -FAIL: -Expected 333 for width, but got 334. - -<td id="green" data-expected-width="333"><div></div></td>
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/quote-text-around-iframe-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/quote-text-around-iframe-expected.png deleted file mode 100644 index d9d6b78b..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/quote-text-around-iframe-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/remove-td-display-none-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/remove-td-display-none-expected.png deleted file mode 100644 index 3ffbbb3..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/remove-td-display-none-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/row-box-shadow-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/row-box-shadow-expected.png deleted file mode 100644 index 44fc3b7..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/row-box-shadow-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/rowspan-paint-order-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/rowspan-paint-order-expected.png deleted file mode 100644 index cbec3d4..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/rowspan-paint-order-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/rowspan-paint-order-vertical-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/rowspan-paint-order-vertical-expected.png deleted file mode 100644 index fd949c9..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/rowspan-paint-order-vertical-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/section-box-shadow-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/section-box-shadow-expected.png deleted file mode 100644 index 0900ffb8..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/section-box-shadow-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/self-painting-row-box-shadow-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/self-painting-row-box-shadow-expected.png deleted file mode 100644 index 44fc3b7..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/self-painting-row-box-shadow-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/split-table-section-before-anonymous-block-2-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/split-table-section-before-anonymous-block-2-expected.png deleted file mode 100644 index 1c7763d0..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/split-table-section-before-anonymous-block-2-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/split-table-section-before-anonymous-block-3-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/split-table-section-before-anonymous-block-3-expected.png deleted file mode 100644 index 07536fe..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/split-table-section-before-anonymous-block-3-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/split-table-section-before-anonymous-block-4-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/split-table-section-before-anonymous-block-4-expected.png deleted file mode 100644 index 1c7763d0..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/split-table-section-before-anonymous-block-4-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/table-display-types-strict-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/table-display-types-strict-expected.png deleted file mode 100644 index c639165..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/table-display-types-strict-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/table-display-types-vertical-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/table-display-types-vertical-expected.png deleted file mode 100644 index ac45a219..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/table-display-types-vertical-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/table-row-focus-ring-paint-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/table-row-focus-ring-paint-expected.png deleted file mode 100644 index 4fafa80..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/table-row-focus-ring-paint-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/table-row-outline-paint-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/table-row-outline-paint-expected.png deleted file mode 100644 index ba3fcc39..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/table-row-outline-paint-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/table-rowspan-cell-override-logical-content-height-reset-issue-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/table-rowspan-cell-override-logical-content-height-reset-issue-expected.txt deleted file mode 100644 index 9fdc2f5..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/table-rowspan-cell-override-logical-content-height-reset-issue-expected.txt +++ /dev/null
@@ -1,9 +0,0 @@ -Test for chromium bug : 445253. Setting rowspan=2 on the table cell causes the whole table to resize again and again. -FAIL: -Expected 60 for height, but got 58. - -<table border="1" data-expected-height="60"> - <tbody><tr> - <td rowspan="2" id="ta"><textarea style="height:100%;">Text area text</textarea></td> - </tr> - </tbody></table>
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/table-rowspan-cell-with-empty-cell-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/table-rowspan-cell-with-empty-cell-expected.txt deleted file mode 100644 index bc02286..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/table-rowspan-cell-with-empty-cell-expected.txt +++ /dev/null
@@ -1,11 +0,0 @@ -Test for chromium bug : 258420. Table rows are incorrectly collapsed in case of hidden cells and rowspans. -A spanning cell whose rows have only empty cell(s) shouldn't have a non-zero height. -A A1 A1.1 -A2 -FAIL: -Expected 57 for width, but got 56. - -<td rowspan="2" id="a" data-expected-width="57">A2</td> - - -long last row
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/table-rowspan-height-less-than-one-percent-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/table-rowspan-height-less-than-one-percent-expected.txt deleted file mode 100644 index d0d32d9..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/table-rowspan-height-less-than-one-percent-expected.txt +++ /dev/null
@@ -1,19 +0,0 @@ -Test for chromium bug : 408066. ASSERTION FAILED: !extraRowSpanningHeight in blink::RenderTableSection::distributeRowSpanHeightToRows. - -FAIL: -Expected 50 for height, but got 22. - -<th id="perc-height" data-expected-height="50"> - </th> -r0c0 - -r2c0 - -FAIL: -Expected 50 for height, but got 24. - -<th id="perc-height" data-expected-height="50"> - </th> -r0c0 r0c1 - -r2c0
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/tableInsideCaption-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/tableInsideCaption-expected.png deleted file mode 100644 index 639b194..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/tableInsideCaption-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/vertical-align-baseline-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/vertical-align-baseline-expected.png deleted file mode 100644 index ca10b14..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/table/vertical-align-baseline-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/text-autosizing/hackernews-comments-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/text-autosizing/hackernews-comments-expected.png deleted file mode 100644 index b053087..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/text-autosizing/hackernews-comments-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/text-autosizing/tables/fixed-table-lots-of-text-many-cells-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/text-autosizing/tables/fixed-table-lots-of-text-many-cells-expected.png deleted file mode 100644 index a497c15..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/text-autosizing/tables/fixed-table-lots-of-text-many-cells-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/text-autosizing/tables/fixed-table-single-cell-lots-of-text-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/text-autosizing/tables/fixed-table-single-cell-lots-of-text-expected.png deleted file mode 100644 index 681d6e9..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/text-autosizing/tables/fixed-table-single-cell-lots-of-text-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/text-autosizing/tables/lots-of-text-many-cells-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/text-autosizing/tables/lots-of-text-many-cells-expected.png deleted file mode 100644 index 5f047af..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/text-autosizing/tables/lots-of-text-many-cells-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/text-autosizing/tables/narrow-percentage-width-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/text-autosizing/tables/narrow-percentage-width-expected.png deleted file mode 100644 index e758de4..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/text-autosizing/tables/narrow-percentage-width-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/text-autosizing/tables/narrow-specified-width-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/text-autosizing/tables/narrow-specified-width-expected.png deleted file mode 100644 index d34ca49..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/text-autosizing/tables/narrow-specified-width-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/text-autosizing/tables/single-cell-lots-of-text-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/text-autosizing/tables/single-cell-lots-of-text-expected.png deleted file mode 100644 index b084158..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/text-autosizing/tables/single-cell-lots-of-text-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/text-autosizing/tables/single-percent-width-cell-lots-of-text-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/text-autosizing/tables/single-percent-width-cell-lots-of-text-expected.png deleted file mode 100644 index a342e06..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/text-autosizing/tables/single-percent-width-cell-lots-of-text-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/text-autosizing/tables/table-cell-inflation-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/text-autosizing/tables/table-cell-inflation-expected.png deleted file mode 100644 index 5f913339..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/text-autosizing/tables/table-cell-inflation-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/text-autosizing/tables/table-for-layout-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/text-autosizing/tables/table-for-layout-expected.png deleted file mode 100644 index c64bd86..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/text-autosizing/tables/table-for-layout-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/text-autosizing/tables/wide-percentage-width-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/text-autosizing/tables/wide-percentage-width-expected.png deleted file mode 100644 index a8c905a..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/text-autosizing/tables/wide-percentage-width-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/text-autosizing/tables/wide-specified-width-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/text-autosizing/tables/wide-specified-width-expected.png deleted file mode 100644 index 0542a89e..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/text-autosizing/tables/wide-specified-width-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/writing-mode/Kusa-Makura-background-canvas-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/writing-mode/Kusa-Makura-background-canvas-expected.png deleted file mode 100644 index 511a56f..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/writing-mode/Kusa-Makura-background-canvas-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/writing-mode/background-vertical-lr-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/writing-mode/background-vertical-lr-expected.png deleted file mode 100644 index 9dc056be..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/writing-mode/background-vertical-lr-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/writing-mode/basic-vertical-line-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/writing-mode/basic-vertical-line-expected.png deleted file mode 100644 index e2402cf..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/writing-mode/basic-vertical-line-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/writing-mode/border-image-vertical-lr-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/writing-mode/border-image-vertical-lr-expected.png deleted file mode 100644 index a447982..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/writing-mode/border-image-vertical-lr-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/writing-mode/border-radius-clipping-vertical-lr-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/writing-mode/border-radius-clipping-vertical-lr-expected.png deleted file mode 100644 index 6adf051..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/writing-mode/border-radius-clipping-vertical-lr-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/writing-mode/border-styles-vertical-lr-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/writing-mode/border-styles-vertical-lr-expected.png deleted file mode 100644 index f0935e5..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/writing-mode/border-styles-vertical-lr-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/writing-mode/border-vertical-lr-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/writing-mode/border-vertical-lr-expected.png deleted file mode 100644 index 12d8c87..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/writing-mode/border-vertical-lr-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/writing-mode/english-lr-text-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/writing-mode/english-lr-text-expected.png deleted file mode 100644 index 0bfcd273..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/writing-mode/english-lr-text-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/writing-mode/fieldsets-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/writing-mode/fieldsets-expected.png deleted file mode 100644 index b4d0511..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/writing-mode/fieldsets-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/writing-mode/japanese-ruby-vertical-lr-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/writing-mode/japanese-ruby-vertical-lr-expected.png deleted file mode 100644 index 90ff0243..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/writing-mode/japanese-ruby-vertical-lr-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/writing-mode/japanese-ruby-vertical-rl-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/writing-mode/japanese-ruby-vertical-rl-expected.png deleted file mode 100644 index d3b1d09..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/writing-mode/japanese-ruby-vertical-rl-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/writing-mode/table-percent-width-quirk-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/writing-mode/table-percent-width-quirk-expected.png deleted file mode 100644 index 4494e9ee..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/writing-mode/table-percent-width-quirk-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/writing-mode/text-combine-various-fonts-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/writing-mode/text-combine-various-fonts-expected.png deleted file mode 100644 index df3670e..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/writing-mode/text-combine-various-fonts-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/writing-mode/text_combine_oblique-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/writing-mode/text_combine_oblique-expected.png deleted file mode 100644 index 538ecd5..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/writing-mode/text_combine_oblique-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/writing-mode/vertical-align-table-baseline-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/writing-mode/vertical-align-table-baseline-expected.png deleted file mode 100644 index 1a53f9d..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/writing-mode/vertical-align-table-baseline-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/writing-mode/vertical-baseline-alignment-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/writing-mode/vertical-baseline-alignment-expected.png deleted file mode 100644 index f58dea0..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/writing-mode/vertical-baseline-alignment-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/writing-mode/vertical-font-fallback-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/writing-mode/vertical-font-fallback-expected.png deleted file mode 100644 index 27a01d0..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/writing-mode/vertical-font-fallback-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/xsl/xslt-extra-content-at-end-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/xsl/xslt-extra-content-at-end-expected.png deleted file mode 100644 index dc46ed3..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fast/xsl/xslt-extra-content-at-end-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fonts/monospace-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fonts/monospace-expected.png deleted file mode 100644 index f2a64f0..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fonts/monospace-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fonts/sans-serif-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fonts/sans-serif-expected.png deleted file mode 100644 index 12497819..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fonts/sans-serif-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fonts/serif-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fonts/serif-expected.png deleted file mode 100644 index 952a8b6c..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fonts/serif-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fragmentation/outline-crossing-columns-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fragmentation/outline-crossing-columns-expected.png deleted file mode 100644 index 51b325f45..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fragmentation/outline-crossing-columns-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fullscreen/full-screen-with-flex-item-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/fullscreen/full-screen-with-flex-item-expected.txt deleted file mode 100644 index b5c66b7..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/fullscreen/full-screen-with-flex-item-expected.txt +++ /dev/null
@@ -1,6 +0,0 @@ -Enter Fullscreen -EVENT(webkitfullscreenchange) -EVENT(webkitfullscreenchange) -EXPECTED (584 == '584') OK -END OF TEST -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/html/details_summary/details-clone-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/html/details_summary/details-clone-expected.png deleted file mode 100644 index b25eb8d..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/html/details_summary/details-clone-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/html/details_summary/details-marker-style-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/html/details_summary/details-marker-style-expected.png deleted file mode 100644 index ba3bc8b..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/html/details_summary/details-marker-style-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/html/details_summary/details-writing-mode-align-center-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/html/details_summary/details-writing-mode-align-center-expected.png deleted file mode 100644 index f730e37..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/html/details_summary/details-writing-mode-align-center-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/html/details_summary/details-writing-mode-align-left-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/html/details_summary/details-writing-mode-align-left-expected.png deleted file mode 100644 index b919eec..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/html/details_summary/details-writing-mode-align-left-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/html/details_summary/details-writing-mode-align-right-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/html/details_summary/details-writing-mode-align-right-expected.png deleted file mode 100644 index df1e5b7..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/html/details_summary/details-writing-mode-align-right-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/html/details_summary/details-writing-mode-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/html/details_summary/details-writing-mode-expected.png deleted file mode 100644 index dc1285e..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/html/details_summary/details-writing-mode-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/html/tabular_data/td_colspan_rendering-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/html/tabular_data/td_colspan_rendering-expected.png deleted file mode 100644 index 5c6f2d1..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/html/tabular_data/td_colspan_rendering-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/http/tests/devtools/elements/highlight/highlight-css-flex-item-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/http/tests/devtools/elements/highlight/highlight-css-flex-item-expected.txt deleted file mode 100644 index 7277fb1..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/http/tests/devtools/elements/highlight/highlight-css-flex-item-expected.txt +++ /dev/null
@@ -1,483 +0,0 @@ -This test verifies the base size returned when highlighting flex items. - -fixed-flex-basis{ - "paths": [ - { - "path": [ - "M", - 50, - 50, - "L", - 200, - 50, - "L", - 200, - 200, - "L", - 50, - 200, - "Z" - ], - "fillColor": "rgba(255, 0, 0, 0)", - "outlineColor": "rgba(128, 0, 0, 0)", - "name": "content" - }, - { - "path": [ - "M", - 50, - 50, - "L", - 200, - 50, - "L", - 200, - 200, - "L", - 50, - 200, - "Z" - ], - "fillColor": "rgba(0, 255, 0, 0)", - "name": "padding" - }, - { - "path": [ - "M", - 50, - 50, - "L", - 200, - 50, - "L", - 200, - 200, - "L", - 50, - 200, - "Z" - ], - "fillColor": "rgba(0, 0, 255, 0)", - "name": "border" - }, - { - "path": [ - "M", - 50, - 50, - "L", - 200, - 50, - "L", - 200, - 200, - "L", - 50, - 200, - "Z" - ], - "fillColor": "rgba(255, 255, 255, 0)", - "name": "margin" - } - ], - "showRulers": true, - "showExtensionLines": true, - "showAccessibilityInfo": true, - "colorFormat": "hex", - "elementInfo": { - "tagName": "div", - "idValue": "fixed-flex-basis", - "nodeWidth": "150", - "nodeHeight": "150", - "isKeyboardFocusable": false, - "accessibleName": "", - "accessibleRole": "generic", - "layoutObjectName": "LayoutBlockFlow", - "showAccessibilityInfo": true - } -} -zero-flex-basis{ - "paths": [ - { - "path": [ - "M", - 250, - 50, - "L", - 400, - 50, - "L", - 400, - 200, - "L", - 250, - 200, - "Z" - ], - "fillColor": "rgba(255, 0, 0, 0)", - "outlineColor": "rgba(128, 0, 0, 0)", - "name": "content" - }, - { - "path": [ - "M", - 250, - 50, - "L", - 400, - 50, - "L", - 400, - 200, - "L", - 250, - 200, - "Z" - ], - "fillColor": "rgba(0, 255, 0, 0)", - "name": "padding" - }, - { - "path": [ - "M", - 250, - 50, - "L", - 400, - 50, - "L", - 400, - 200, - "L", - 250, - 200, - "Z" - ], - "fillColor": "rgba(0, 0, 255, 0)", - "name": "border" - }, - { - "path": [ - "M", - 250, - 50, - "L", - 400, - 50, - "L", - 400, - 200, - "L", - 250, - 200, - "Z" - ], - "fillColor": "rgba(255, 255, 255, 0)", - "name": "margin" - } - ], - "showRulers": true, - "showExtensionLines": true, - "showAccessibilityInfo": true, - "colorFormat": "hex", - "elementInfo": { - "tagName": "div", - "idValue": "zero-flex-basis", - "nodeWidth": "150", - "nodeHeight": "150", - "isKeyboardFocusable": false, - "accessibleName": "", - "accessibleRole": "generic", - "layoutObjectName": "LayoutBlockFlow", - "showAccessibilityInfo": true - } -} -fixed-width{ - "paths": [ - { - "path": [ - "M", - 50, - 250, - "L", - 200, - 250, - "L", - 200, - 400, - "L", - 50, - 400, - "Z" - ], - "fillColor": "rgba(255, 0, 0, 0)", - "outlineColor": "rgba(128, 0, 0, 0)", - "name": "content" - }, - { - "path": [ - "M", - 50, - 250, - "L", - 200, - 250, - "L", - 200, - 400, - "L", - 50, - 400, - "Z" - ], - "fillColor": "rgba(0, 255, 0, 0)", - "name": "padding" - }, - { - "path": [ - "M", - 50, - 250, - "L", - 200, - 250, - "L", - 200, - 400, - "L", - 50, - 400, - "Z" - ], - "fillColor": "rgba(0, 0, 255, 0)", - "name": "border" - }, - { - "path": [ - "M", - 50, - 250, - "L", - 200, - 250, - "L", - 200, - 400, - "L", - 50, - 400, - "Z" - ], - "fillColor": "rgba(255, 255, 255, 0)", - "name": "margin" - } - ], - "showRulers": true, - "showExtensionLines": true, - "showAccessibilityInfo": true, - "colorFormat": "hex", - "elementInfo": { - "tagName": "div", - "idValue": "fixed-width", - "nodeWidth": "150", - "nodeHeight": "150", - "isKeyboardFocusable": false, - "accessibleName": "", - "accessibleRole": "generic", - "layoutObjectName": "LayoutBlockFlow", - "showAccessibilityInfo": true - } -} -missing-basis-width{ - "paths": [ - { - "path": [ - "M", - 250, - 250, - "L", - 400, - 250, - "L", - 400, - 400, - "L", - 250, - 400, - "Z" - ], - "fillColor": "rgba(255, 0, 0, 0)", - "outlineColor": "rgba(128, 0, 0, 0)", - "name": "content" - }, - { - "path": [ - "M", - 250, - 250, - "L", - 400, - 250, - "L", - 400, - 400, - "L", - 250, - 400, - "Z" - ], - "fillColor": "rgba(0, 255, 0, 0)", - "name": "padding" - }, - { - "path": [ - "M", - 250, - 250, - "L", - 400, - 250, - "L", - 400, - 400, - "L", - 250, - 400, - "Z" - ], - "fillColor": "rgba(0, 0, 255, 0)", - "name": "border" - }, - { - "path": [ - "M", - 250, - 250, - "L", - 400, - 250, - "L", - 400, - 400, - "L", - 250, - 400, - "Z" - ], - "fillColor": "rgba(255, 255, 255, 0)", - "name": "margin" - } - ], - "showRulers": true, - "showExtensionLines": true, - "showAccessibilityInfo": true, - "colorFormat": "hex", - "elementInfo": { - "tagName": "div", - "idValue": "missing-basis-width", - "nodeWidth": "150", - "nodeHeight": "150", - "isKeyboardFocusable": false, - "accessibleName": "", - "accessibleRole": "generic", - "layoutObjectName": "LayoutBlockFlow", - "showAccessibilityInfo": true - } -} -column-fixed-height{ - "paths": [ - { - "path": [ - "M", - 50, - 450, - "L", - 200, - 450, - "L", - 200, - 600, - "L", - 50, - 600, - "Z" - ], - "fillColor": "rgba(255, 0, 0, 0)", - "outlineColor": "rgba(128, 0, 0, 0)", - "name": "content" - }, - { - "path": [ - "M", - 50, - 450, - "L", - 200, - 450, - "L", - 200, - 600, - "L", - 50, - 600, - "Z" - ], - "fillColor": "rgba(0, 255, 0, 0)", - "name": "padding" - }, - { - "path": [ - "M", - 50, - 450, - "L", - 200, - 450, - "L", - 200, - 600, - "L", - 50, - 600, - "Z" - ], - "fillColor": "rgba(0, 0, 255, 0)", - "name": "border" - }, - { - "path": [ - "M", - 50, - 450, - "L", - 200, - 450, - "L", - 200, - 600, - "L", - 50, - 600, - "Z" - ], - "fillColor": "rgba(255, 255, 255, 0)", - "name": "margin" - } - ], - "showRulers": true, - "showExtensionLines": true, - "showAccessibilityInfo": true, - "colorFormat": "hex", - "elementInfo": { - "tagName": "div", - "idValue": "column-fixed-height", - "nodeWidth": "150", - "nodeHeight": "150", - "isKeyboardFocusable": false, - "accessibleName": "", - "accessibleRole": "generic", - "layoutObjectName": "LayoutBlockFlow", - "showAccessibilityInfo": true - } -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/http/tests/devtools/elements/highlight/highlight-css-shapes-outside-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/http/tests/devtools/elements/highlight/highlight-css-shapes-outside-expected.txt deleted file mode 100644 index 15ad9241..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/http/tests/devtools/elements/highlight/highlight-css-shapes-outside-expected.txt +++ /dev/null
@@ -1,1583 +0,0 @@ -Highlight CSS shapes. - -circle{ - "paths": [ - { - "path": [ - "M", - 168, - 88, - "Q", - 168, - 121, - 145, - 145, - "Q", - 121, - 168, - 88, - 168, - "Q", - 55, - 168, - 31, - 145, - "Q", - 8, - 121, - 8, - 88, - "Q", - 8, - 55, - 31, - 31, - "Q", - 55, - 8, - 88, - 8, - "Q", - 121, - 8, - 145, - 31, - "Q", - 168, - 55, - 168, - 88, - "Z" - ], - "fillColor": "rgba(0, 0, 0, 0)" - }, - { - "path": [ - "M", - 200, - 88, - "Q", - 200, - 134, - 167, - 167, - "Q", - 134, - 200, - 88, - 200, - "Q", - 42, - 200, - 9, - 167, - "Q", - -24, - 134, - -24, - 88, - "Q", - -24, - 42, - 9, - 9, - "Q", - 42, - -24, - 88, - -24, - "Q", - 134, - -24, - 167, - 9, - "Q", - 200, - 42, - 200, - 88, - "Z" - ], - "fillColor": "rgba(128, 128, 128, 0)" - }, - { - "path": [ - "M", - 24, - 24, - "L", - 152, - 24, - "L", - 152, - 152, - "L", - 24, - 152, - "Z" - ], - "fillColor": "rgba(255, 0, 0, 0)", - "outlineColor": "rgba(128, 0, 0, 0)", - "name": "content" - }, - { - "path": [ - "M", - 24, - 24, - "L", - 152, - 24, - "L", - 152, - 152, - "L", - 24, - 152, - "Z" - ], - "fillColor": "rgba(0, 255, 0, 0)", - "name": "padding" - }, - { - "path": [ - "M", - 24, - 24, - "L", - 152, - 24, - "L", - 152, - 152, - "L", - 24, - 152, - "Z" - ], - "fillColor": "rgba(0, 0, 255, 0)", - "name": "border" - }, - { - "path": [ - "M", - 8, - 8, - "L", - 168, - 8, - "L", - 168, - 168, - "L", - 8, - 168, - "Z" - ], - "fillColor": "rgba(255, 255, 255, 0)", - "name": "margin" - } - ], - "showRulers": true, - "showExtensionLines": true, - "showAccessibilityInfo": true, - "colorFormat": "hex", - "elementInfo": { - "tagName": "div", - "idValue": "circle", - "className": ".float.circle", - "nodeWidth": "128", - "nodeHeight": "128", - "isKeyboardFocusable": false, - "accessibleName": "", - "accessibleRole": "generic", - "layoutObjectName": "LayoutBlockFlow", - "showAccessibilityInfo": true - } -} -insetSimpleRound{ - "paths": [ - { - "path": [ - "M", - 248, - 56, - "Q", - 261, - 56, - 271, - 65, - "Q", - 280, - 75, - 280, - 88, - "Q", - 280, - 101, - 271, - 111, - "Q", - 261, - 120, - 248, - 120, - "Q", - 235, - 120, - 225, - 111, - "Q", - 216, - 101, - 216, - 88, - "Q", - 216, - 75, - 225, - 65, - "Q", - 235, - 56, - 248, - 56, - "Z" - ], - "fillColor": "rgba(0, 0, 0, 0)" - }, - { - "path": [ - "M", - 248, - 24, - "Q", - 275, - 24, - 293, - 43, - "Q", - 312, - 61, - 312, - 88, - "Q", - 312, - 115, - 293, - 133, - "Q", - 275, - 152, - 248, - 152, - "Q", - 221, - 152, - 203, - 133, - "Q", - 184, - 115, - 184, - 88, - "Q", - 184, - 61, - 203, - 43, - "Q", - 221, - 24, - 248, - 24, - "Z" - ], - "fillColor": "rgba(128, 128, 128, 0)" - }, - { - "path": [ - "M", - 184, - 24, - "L", - 312, - 24, - "L", - 312, - 152, - "L", - 184, - 152, - "Z" - ], - "fillColor": "rgba(255, 0, 0, 0)", - "outlineColor": "rgba(128, 0, 0, 0)", - "name": "content" - }, - { - "path": [ - "M", - 184, - 24, - "L", - 312, - 24, - "L", - 312, - 152, - "L", - 184, - 152, - "Z" - ], - "fillColor": "rgba(0, 255, 0, 0)", - "name": "padding" - }, - { - "path": [ - "M", - 184, - 24, - "L", - 312, - 24, - "L", - 312, - 152, - "L", - 184, - 152, - "Z" - ], - "fillColor": "rgba(0, 0, 255, 0)", - "name": "border" - }, - { - "path": [ - "M", - 168, - 8, - "L", - 328, - 8, - "L", - 328, - 168, - "L", - 168, - 168, - "Z" - ], - "fillColor": "rgba(255, 255, 255, 0)", - "name": "margin" - } - ], - "showRulers": true, - "showExtensionLines": true, - "showAccessibilityInfo": true, - "colorFormat": "hex", - "elementInfo": { - "tagName": "div", - "idValue": "insetSimpleRound", - "className": ".float.insetSimpleRound", - "nodeWidth": "128", - "nodeHeight": "128", - "isKeyboardFocusable": false, - "accessibleName": "", - "accessibleRole": "generic", - "layoutObjectName": "LayoutBlockFlow", - "showAccessibilityInfo": true - } -} -insetComplexRound{ - "paths": [ - { - "path": [ - "M", - 360, - 24, - "L", - 408, - 24, - "Q", - 435, - 24, - 453, - 43, - "Q", - 472, - 61, - 472, - 88, - "L", - 472, - 136, - "Q", - 472, - 143, - 467, - 147, - "Q", - 463, - 152, - 456, - 152, - "L", - 408, - 152, - "Q", - 381, - 152, - 363, - 133, - "Q", - 344, - 115, - 344, - 88, - "L", - 344, - 40, - "Q", - 344, - 33, - 349, - 29, - "Q", - 353, - 24, - 360, - 24, - "Z" - ], - "fillColor": "rgba(0, 0, 0, 0)" - }, - { - "path": [ - "M", - 360, - -8, - "L", - 408, - -8, - "Q", - 448, - -8, - 476, - 20, - "Q", - 504, - 48, - 504, - 88, - "L", - 504, - 136, - "Q", - 504, - 156, - 490, - 170, - "Q", - 476, - 184, - 456, - 184, - "L", - 408, - 184, - "Q", - 368, - 184, - 340, - 156, - "Q", - 312, - 128, - 312, - 88, - "L", - 312, - 40, - "Q", - 312, - 20, - 326, - 6, - "Q", - 340, - -8, - 360, - -8, - "Z" - ], - "fillColor": "rgba(128, 128, 128, 0)" - }, - { - "path": [ - "M", - 344, - 24, - "L", - 472, - 24, - "L", - 472, - 152, - "L", - 344, - 152, - "Z" - ], - "fillColor": "rgba(255, 0, 0, 0)", - "outlineColor": "rgba(128, 0, 0, 0)", - "name": "content" - }, - { - "path": [ - "M", - 344, - 24, - "L", - 472, - 24, - "L", - 472, - 152, - "L", - 344, - 152, - "Z" - ], - "fillColor": "rgba(0, 255, 0, 0)", - "name": "padding" - }, - { - "path": [ - "M", - 344, - 24, - "L", - 472, - 24, - "L", - 472, - 152, - "L", - 344, - 152, - "Z" - ], - "fillColor": "rgba(0, 0, 255, 0)", - "name": "border" - }, - { - "path": [ - "M", - 328, - 8, - "L", - 488, - 8, - "L", - 488, - 168, - "L", - 328, - 168, - "Z" - ], - "fillColor": "rgba(255, 255, 255, 0)", - "name": "margin" - } - ], - "showRulers": true, - "showExtensionLines": true, - "showAccessibilityInfo": true, - "colorFormat": "hex", - "elementInfo": { - "tagName": "div", - "idValue": "insetComplexRound", - "className": ".float.insetComplexRound", - "nodeWidth": "128", - "nodeHeight": "128", - "isKeyboardFocusable": false, - "accessibleName": "", - "accessibleRole": "generic", - "layoutObjectName": "LayoutBlockFlow", - "showAccessibilityInfo": true - } -} -ellipse{ - "paths": [ - { - "path": [ - "M", - 648, - 64, - "Q", - 648, - 87, - 625, - 104, - "Q", - 601, - 120, - 568, - 120, - "Q", - 535, - 120, - 511, - 104, - "Q", - 488, - 87, - 488, - 64, - "Q", - 488, - 41, - 511, - 24, - "Q", - 535, - 8, - 568, - 8, - "Q", - 601, - 8, - 625, - 24, - "Q", - 648, - 41, - 648, - 64, - "Z" - ], - "fillColor": "rgba(0, 0, 0, 0)" - }, - { - "path": [ - "M", - 680, - 64, - "Q", - 680, - 100, - 647, - 126, - "Q", - 614, - 152, - 568, - 152, - "Q", - 522, - 152, - 489, - 126, - "Q", - 456, - 100, - 456, - 64, - "Q", - 456, - 28, - 489, - 2, - "Q", - 522, - -24, - 568, - -24, - "Q", - 614, - -24, - 647, - 2, - "Q", - 680, - 28, - 680, - 64, - "Z" - ], - "fillColor": "rgba(128, 128, 128, 0)" - }, - { - "path": [ - "M", - 504, - 24, - "L", - 632, - 24, - "L", - 632, - 104, - "L", - 504, - 104, - "Z" - ], - "fillColor": "rgba(255, 0, 0, 0)", - "outlineColor": "rgba(128, 0, 0, 0)", - "name": "content" - }, - { - "path": [ - "M", - 504, - 24, - "L", - 632, - 24, - "L", - 632, - 104, - "L", - 504, - 104, - "Z" - ], - "fillColor": "rgba(0, 255, 0, 0)", - "name": "padding" - }, - { - "path": [ - "M", - 504, - 24, - "L", - 632, - 24, - "L", - 632, - 104, - "L", - 504, - 104, - "Z" - ], - "fillColor": "rgba(0, 0, 255, 0)", - "name": "border" - }, - { - "path": [ - "M", - 488, - 8, - "L", - 648, - 8, - "L", - 648, - 120, - "L", - 488, - 120, - "Z" - ], - "fillColor": "rgba(255, 255, 255, 0)", - "name": "margin" - } - ], - "showRulers": true, - "showExtensionLines": true, - "showAccessibilityInfo": true, - "colorFormat": "hex", - "elementInfo": { - "tagName": "div", - "idValue": "ellipse", - "className": ".float.ellipse", - "nodeWidth": "128", - "nodeHeight": "80", - "isKeyboardFocusable": false, - "accessibleName": "", - "accessibleRole": "generic", - "layoutObjectName": "LayoutBlockFlow", - "showAccessibilityInfo": true - } -} -contentBox{ - "paths": [ - { - "path": [ - "M", - 568, - 168, - "L", - 600, - 168, - "Q", - 627, - 168, - 645, - 187, - "Q", - 664, - 205, - 664, - 232, - "L", - 664, - 264, - "Q", - 664, - 277, - 655, - 287, - "Q", - 645, - 296, - 632, - 296, - "L", - 568, - 296, - "Q", - 555, - 296, - 545, - 287, - "Q", - 536, - 277, - 536, - 264, - "L", - 536, - 200, - "Q", - 536, - 187, - 545, - 177, - "Q", - 555, - 168, - 568, - 168, - "Z" - ], - "fillColor": "rgba(0, 0, 0, 0)" - }, - { - "path": [ - "M", - 568, - 136, - "L", - 600, - 136, - "Q", - 640, - 136, - 668, - 164, - "Q", - 696, - 192, - 696, - 232, - "L", - 696, - 264, - "Q", - 696, - 291, - 677, - 309, - "Q", - 659, - 328, - 632, - 328, - "L", - 568, - 328, - "Q", - 541, - 328, - 523, - 309, - "Q", - 504, - 291, - 504, - 264, - "L", - 504, - 200, - "Q", - 504, - 173, - 523, - 155, - "Q", - 541, - 136, - 568, - 136, - "Z" - ], - "fillColor": "rgba(128, 128, 128, 0)" - }, - { - "path": [ - "M", - 536, - 168, - "L", - 664, - 168, - "L", - 664, - 296, - "L", - 536, - 296, - "Z" - ], - "fillColor": "rgba(255, 0, 0, 0)", - "outlineColor": "rgba(128, 0, 0, 0)", - "name": "content" - }, - { - "path": [ - "M", - 504, - 152, - "L", - 680, - 152, - "L", - 680, - 312, - "L", - 504, - 312, - "Z" - ], - "fillColor": "rgba(0, 255, 0, 0)", - "name": "padding" - }, - { - "path": [ - "M", - 504, - 152, - "L", - 680, - 152, - "L", - 680, - 312, - "L", - 504, - 312, - "Z" - ], - "fillColor": "rgba(0, 0, 255, 0)", - "name": "border" - }, - { - "path": [ - "M", - 488, - 120, - "L", - 696, - 120, - "L", - 696, - 328, - "L", - 488, - 328, - "Z" - ], - "fillColor": "rgba(255, 255, 255, 0)", - "name": "margin" - } - ], - "showRulers": true, - "showExtensionLines": true, - "showAccessibilityInfo": true, - "colorFormat": "hex", - "elementInfo": { - "tagName": "div", - "idValue": "contentBox", - "className": ".float.contentBox", - "nodeWidth": "176", - "nodeHeight": "160", - "isKeyboardFocusable": false, - "accessibleName": "", - "accessibleRole": "generic", - "layoutObjectName": "LayoutBlockFlow", - "showAccessibilityInfo": true - } -} -polygon{ - "paths": [ - { - "path": [ - "M", - 8, - 328, - "L", - 8, - 528, - "L", - 208, - 328, - "Z" - ], - "fillColor": "rgba(0, 0, 0, 0)" - }, - { - "path": [ - "M", - 24, - 344, - "L", - 152, - 344, - "L", - 152, - 472, - "L", - 24, - 472, - "Z" - ], - "fillColor": "rgba(255, 0, 0, 0)", - "outlineColor": "rgba(128, 0, 0, 0)", - "name": "content" - }, - { - "path": [ - "M", - 24, - 344, - "L", - 152, - 344, - "L", - 152, - 472, - "L", - 24, - 472, - "Z" - ], - "fillColor": "rgba(0, 255, 0, 0)", - "name": "padding" - }, - { - "path": [ - "M", - 24, - 344, - "L", - 152, - 344, - "L", - 152, - 472, - "L", - 24, - 472, - "Z" - ], - "fillColor": "rgba(0, 0, 255, 0)", - "name": "border" - }, - { - "path": [ - "M", - 8, - 328, - "L", - 168, - 328, - "L", - 168, - 488, - "L", - 8, - 488, - "Z" - ], - "fillColor": "rgba(255, 255, 255, 0)", - "name": "margin" - } - ], - "showRulers": true, - "showExtensionLines": true, - "showAccessibilityInfo": true, - "colorFormat": "hex", - "elementInfo": { - "tagName": "div", - "idValue": "polygon", - "className": ".float.polygon", - "nodeWidth": "128", - "nodeHeight": "128", - "isKeyboardFocusable": false, - "accessibleName": "", - "accessibleRole": "generic", - "layoutObjectName": "LayoutBlockFlow", - "showAccessibilityInfo": true - } -} -raster{ - "paths": [ - { - "path": [ - "M", - 184, - 344, - "L", - 284, - 344, - "L", - 284, - 444, - "L", - 184, - 444, - "Z" - ], - "fillColor": "rgba(0, 0, 0, 0)" - }, - { - "path": [ - "M", - 157, - 328, - "L", - 311, - 328, - "L", - 311, - 329, - "L", - 157, - 329, - "Z", - "M", - 156, - 329, - "L", - 312, - 329, - "L", - 312, - 331, - "L", - 156, - 331, - "Z", - "M", - 155, - 331, - "L", - 313, - 331, - "L", - 313, - 333, - "L", - 155, - 333, - "Z", - "M", - 154, - 333, - "L", - 314, - 333, - "L", - 314, - 337, - "L", - 154, - 337, - "Z", - "M", - 153, - 337, - "L", - 315, - 337, - "L", - 315, - 344, - "L", - 153, - 344, - "Z", - "M", - 152, - 344, - "L", - 316, - 344, - "L", - 316, - 444, - "L", - 152, - 444, - "Z", - "M", - 153, - 444, - "L", - 315, - 444, - "L", - 315, - 451, - "L", - 153, - 451, - "Z", - "M", - 154, - 451, - "L", - 314, - 451, - "L", - 314, - 455, - "L", - 154, - 455, - "Z", - "M", - 155, - 455, - "L", - 313, - 455, - "L", - 313, - 457, - "L", - 155, - 457, - "Z", - "M", - 156, - 457, - "L", - 312, - 457, - "L", - 312, - 459, - "L", - 156, - 459, - "Z", - "M", - 157, - 459, - "L", - 311, - 459, - "L", - 311, - 461, - "L", - 157, - 461, - "Z", - "M", - 158, - 461, - "L", - 310, - 461, - "L", - 310, - 462, - "L", - 158, - 462, - "Z", - "M", - 159, - 462, - "L", - 309, - 462, - "L", - 309, - 463, - "L", - 159, - 463, - "Z", - "M", - 160, - 463, - "L", - 308, - 463, - "L", - 308, - 465, - "L", - 160, - 465, - "Z", - "M", - 161, - 465, - "L", - 307, - 465, - "L", - 307, - 466, - "L", - 161, - 466, - "Z", - "M", - 162, - 466, - "L", - 306, - 466, - "L", - 306, - 467, - "L", - 162, - 467, - "Z", - "M", - 163, - 467, - "L", - 305, - 467, - "L", - 305, - 468, - "L", - 163, - 468, - "Z", - "M", - 165, - 468, - "L", - 303, - 468, - "L", - 303, - 469, - "L", - 165, - 469, - "Z", - "M", - 166, - 469, - "L", - 302, - 469, - "L", - 302, - 470, - "L", - 166, - 470, - "Z", - "M", - 167, - 470, - "L", - 301, - 470, - "L", - 301, - 471, - "L", - 167, - 471, - "Z", - "M", - 169, - 471, - "L", - 299, - 471, - "L", - 299, - 472, - "L", - 169, - 472, - "Z", - "M", - 171, - 472, - "L", - 297, - 472, - "L", - 297, - 473, - "L", - 171, - 473, - "Z", - "M", - 173, - 473, - "L", - 295, - 473, - "L", - 295, - 474, - "L", - 173, - 474, - "Z", - "M", - 177, - 474, - "L", - 291, - 474, - "L", - 291, - 475, - "L", - 177, - 475, - "Z", - "M", - 184, - 475, - "L", - 284, - 475, - "L", - 284, - 476, - "L", - 184, - 476, - "Z" - ], - "fillColor": "rgba(128, 128, 128, 0)" - }, - { - "path": [ - "M", - 184, - 344, - "L", - 312, - 344, - "L", - 312, - 472, - "L", - 184, - 472, - "Z" - ], - "fillColor": "rgba(255, 0, 0, 0)", - "outlineColor": "rgba(128, 0, 0, 0)", - "name": "content" - }, - { - "path": [ - "M", - 184, - 344, - "L", - 312, - 344, - "L", - 312, - 472, - "L", - 184, - 472, - "Z" - ], - "fillColor": "rgba(0, 255, 0, 0)", - "name": "padding" - }, - { - "path": [ - "M", - 184, - 344, - "L", - 312, - 344, - "L", - 312, - 472, - "L", - 184, - 472, - "Z" - ], - "fillColor": "rgba(0, 0, 255, 0)", - "name": "border" - }, - { - "path": [ - "M", - 168, - 328, - "L", - 328, - 328, - "L", - 328, - 488, - "L", - 168, - 488, - "Z" - ], - "fillColor": "rgba(255, 255, 255, 0)", - "name": "margin" - } - ], - "showRulers": true, - "showExtensionLines": true, - "showAccessibilityInfo": true, - "colorFormat": "hex", - "elementInfo": { - "tagName": "div", - "idValue": "raster", - "className": ".float.raster", - "nodeWidth": "128", - "nodeHeight": "128", - "isKeyboardFocusable": false, - "accessibleName": "", - "accessibleRole": "generic", - "layoutObjectName": "LayoutBlockFlow", - "showAccessibilityInfo": true - } -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/http/tests/devtools/elements/highlight/highlight-css-shapes-outside-scroll-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/http/tests/devtools/elements/highlight/highlight-css-shapes-outside-scroll-expected.txt deleted file mode 100644 index 22b1e713..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/http/tests/devtools/elements/highlight/highlight-css-shapes-outside-scroll-expected.txt +++ /dev/null
@@ -1,393 +0,0 @@ -Highlight CSS shapes outside scroll. - -circle{ - "paths": [ - { - "path": [ - "M", - 168, - 88, - "Q", - 168, - 121, - 145, - 145, - "Q", - 121, - 168, - 88, - 168, - "Q", - 55, - 168, - 31, - 145, - "Q", - 8, - 121, - 8, - 88, - "Q", - 8, - 55, - 31, - 31, - "Q", - 55, - 8, - 88, - 8, - "Q", - 121, - 8, - 145, - 31, - "Q", - 168, - 55, - 168, - 88, - "Z" - ], - "fillColor": "rgba(0, 0, 0, 0)" - }, - { - "path": [ - "M", - 200, - 88, - "Q", - 200, - 134, - 167, - 167, - "Q", - 134, - 200, - 88, - 200, - "Q", - 42, - 200, - 9, - 167, - "Q", - -24, - 134, - -24, - 88, - "Q", - -24, - 42, - 9, - 9, - "Q", - 42, - -24, - 88, - -24, - "Q", - 134, - -24, - 167, - 9, - "Q", - 200, - 42, - 200, - 88, - "Z" - ], - "fillColor": "rgba(128, 128, 128, 0)" - }, - { - "path": [ - "M", - 24, - 24, - "L", - 152, - 24, - "L", - 152, - 152, - "L", - 24, - 152, - "Z" - ], - "fillColor": "rgba(255, 0, 0, 0)", - "outlineColor": "rgba(128, 0, 0, 0)", - "name": "content" - }, - { - "path": [ - "M", - 24, - 24, - "L", - 152, - 24, - "L", - 152, - 152, - "L", - 24, - 152, - "Z" - ], - "fillColor": "rgba(0, 255, 0, 0)", - "name": "padding" - }, - { - "path": [ - "M", - 24, - 24, - "L", - 152, - 24, - "L", - 152, - 152, - "L", - 24, - 152, - "Z" - ], - "fillColor": "rgba(0, 0, 255, 0)", - "name": "border" - }, - { - "path": [ - "M", - 8, - 8, - "L", - 168, - 8, - "L", - 168, - 168, - "L", - 8, - 168, - "Z" - ], - "fillColor": "rgba(255, 255, 255, 0)", - "name": "margin" - } - ], - "showRulers": true, - "showExtensionLines": true, - "showAccessibilityInfo": true, - "colorFormat": "hex", - "elementInfo": { - "tagName": "div", - "idValue": "circle", - "className": ".float.circle", - "nodeWidth": "128", - "nodeHeight": "128", - "isKeyboardFocusable": false, - "accessibleName": "", - "accessibleRole": "generic", - "layoutObjectName": "LayoutBlockFlow", - "showAccessibilityInfo": true - } -} -circle{ - "paths": [ - { - "path": [ - "M", - 168, - 88, - "Q", - 168, - 121, - 145, - 145, - "Q", - 121, - 168, - 88, - 168, - "Q", - 55, - 168, - 31, - 145, - "Q", - 8, - 121, - 8, - 88, - "Q", - 8, - 55, - 31, - 31, - "Q", - 55, - 8, - 88, - 8, - "Q", - 121, - 8, - 145, - 31, - "Q", - 168, - 55, - 168, - 88, - "Z" - ], - "fillColor": "rgba(0, 0, 0, 0)" - }, - { - "path": [ - "M", - 200, - 88, - "Q", - 200, - 134, - 167, - 167, - "Q", - 134, - 200, - 88, - 200, - "Q", - 42, - 200, - 9, - 167, - "Q", - -24, - 134, - -24, - 88, - "Q", - -24, - 42, - 9, - 9, - "Q", - 42, - -24, - 88, - -24, - "Q", - 134, - -24, - 167, - 9, - "Q", - 200, - 42, - 200, - 88, - "Z" - ], - "fillColor": "rgba(128, 128, 128, 0)" - }, - { - "path": [ - "M", - 24, - 24, - "L", - 152, - 24, - "L", - 152, - 152, - "L", - 24, - 152, - "Z" - ], - "fillColor": "rgba(255, 0, 0, 0)", - "outlineColor": "rgba(128, 0, 0, 0)", - "name": "content" - }, - { - "path": [ - "M", - 24, - 24, - "L", - 152, - 24, - "L", - 152, - 152, - "L", - 24, - 152, - "Z" - ], - "fillColor": "rgba(0, 255, 0, 0)", - "name": "padding" - }, - { - "path": [ - "M", - 24, - 24, - "L", - 152, - 24, - "L", - 152, - 152, - "L", - 24, - 152, - "Z" - ], - "fillColor": "rgba(0, 0, 255, 0)", - "name": "border" - }, - { - "path": [ - "M", - 8, - 8, - "L", - 168, - 8, - "L", - 168, - 168, - "L", - 8, - 168, - "Z" - ], - "fillColor": "rgba(255, 255, 255, 0)", - "name": "margin" - } - ], - "showRulers": true, - "showExtensionLines": true, - "showAccessibilityInfo": true, - "colorFormat": "hex", - "elementInfo": { - "tagName": "div", - "idValue": "circle", - "className": ".float.circle", - "nodeWidth": "128", - "nodeHeight": "128", - "isKeyboardFocusable": false, - "accessibleName": "", - "accessibleRole": "generic", - "layoutObjectName": "LayoutBlockFlow", - "showAccessibilityInfo": true - } -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/http/tests/devtools/elements/highlight/highlight-display-locked-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/http/tests/devtools/elements/highlight/highlight-display-locked-expected.txt deleted file mode 100644 index d7c3b61..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/http/tests/devtools/elements/highlight/highlight-display-locked-expected.txt +++ /dev/null
@@ -1,197 +0,0 @@ -Tests highlights for display locking. - -container{ - "paths": [ - { - "path": [ - "M", - 8, - 8, - "L", - 792, - 8, - "L", - 792, - 18, - "L", - 8, - 18, - "Z" - ], - "fillColor": "rgba(255, 0, 0, 0)", - "outlineColor": "rgba(128, 0, 0, 0)", - "name": "content" - }, - { - "path": [ - "M", - 8, - 8, - "L", - 792, - 8, - "L", - 792, - 18, - "L", - 8, - 18, - "Z" - ], - "fillColor": "rgba(0, 255, 0, 0)", - "name": "padding" - }, - { - "path": [ - "M", - 8, - 8, - "L", - 792, - 8, - "L", - 792, - 18, - "L", - 8, - 18, - "Z" - ], - "fillColor": "rgba(0, 0, 255, 0)", - "name": "border" - }, - { - "path": [ - "M", - 8, - 8, - "L", - 792, - 8, - "L", - 792, - 18, - "L", - 8, - 18, - "Z" - ], - "fillColor": "rgba(255, 255, 255, 0)", - "name": "margin" - } - ], - "showRulers": true, - "showExtensionLines": true, - "showAccessibilityInfo": true, - "colorFormat": "hex", - "elementInfo": { - "tagName": "div", - "idValue": "container", - "nodeWidth": "784", - "nodeHeight": "10", - "isKeyboardFocusable": false, - "accessibleName": "", - "accessibleRole": "generic", - "layoutObjectName": "LayoutBlockFlow", - "isLocked": true, - "showAccessibilityInfo": true - } -} -child{ - "paths": [ - { - "path": [ - "M", - 8, - 8, - "L", - 792, - 8, - "L", - 792, - 18, - "L", - 8, - 18, - "Z" - ], - "fillColor": "rgba(255, 0, 0, 0)", - "outlineColor": "rgba(128, 0, 0, 0)", - "name": "content" - }, - { - "path": [ - "M", - 8, - 8, - "L", - 792, - 8, - "L", - 792, - 18, - "L", - 8, - 18, - "Z" - ], - "fillColor": "rgba(0, 255, 0, 0)", - "name": "padding" - }, - { - "path": [ - "M", - 8, - 8, - "L", - 792, - 8, - "L", - 792, - 18, - "L", - 8, - 18, - "Z" - ], - "fillColor": "rgba(0, 0, 255, 0)", - "name": "border" - }, - { - "path": [ - "M", - 8, - 8, - "L", - 792, - 8, - "L", - 792, - 18, - "L", - 8, - 18, - "Z" - ], - "fillColor": "rgba(255, 255, 255, 0)", - "name": "margin" - } - ], - "showRulers": true, - "showExtensionLines": true, - "showAccessibilityInfo": true, - "colorFormat": "hex", - "elementInfo": { - "tagName": "div", - "idValue": "container", - "nodeWidth": "784", - "nodeHeight": "10", - "isKeyboardFocusable": false, - "accessibleName": "", - "accessibleRole": "generic", - "layoutObjectName": "LayoutBlockFlow", - "isLockedAncestor": true, - "showAccessibilityInfo": true - } -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/http/tests/devtools/elements/highlight/highlight-node-a11y-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/http/tests/devtools/elements/highlight/highlight-node-a11y-expected.txt deleted file mode 100644 index 0c8caa8..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/http/tests/devtools/elements/highlight/highlight-node-a11y-expected.txt +++ /dev/null
@@ -1,291 +0,0 @@ -This test verifies a11y attributes for a node. - -button{ - "paths": [ - { - "path": [ - "M", - 16, - 11, - "L", - 43, - 11, - "L", - 43, - 27, - "L", - 16, - 27, - "Z" - ], - "fillColor": "rgba(255, 0, 0, 0)", - "outlineColor": "rgba(128, 0, 0, 0)", - "name": "content" - }, - { - "path": [ - "M", - 10, - 10, - "L", - 49, - 10, - "L", - 49, - 28, - "L", - 10, - 28, - "Z" - ], - "fillColor": "rgba(0, 255, 0, 0)", - "name": "padding" - }, - { - "path": [ - "M", - 8, - 8, - "L", - 51, - 8, - "L", - 51, - 30, - "L", - 8, - 30, - "Z" - ], - "fillColor": "rgba(0, 0, 255, 0)", - "name": "border" - }, - { - "path": [ - "M", - 8, - 8, - "L", - 51, - 8, - "L", - 51, - 30, - "L", - 8, - 30, - "Z" - ], - "fillColor": "rgba(255, 255, 255, 0)", - "name": "margin" - } - ], - "showRulers": true, - "showExtensionLines": true, - "showAccessibilityInfo": true, - "colorFormat": "hex", - "elementInfo": { - "tagName": "button", - "idValue": "button", - "nodeWidth": "43", - "nodeHeight": "22", - "isKeyboardFocusable": true, - "accessibleName": "click", - "accessibleRole": "button", - "layoutObjectName": "LayoutButton", - "showAccessibilityInfo": true - } -} -input{ - "paths": [ - { - "path": [ - "M", - 59, - 11, - "L", - 236, - 11, - "L", - 236, - 27, - "L", - 59, - 27, - "Z" - ], - "fillColor": "rgba(255, 0, 0, 0)", - "outlineColor": "rgba(128, 0, 0, 0)", - "name": "content" - }, - { - "path": [ - "M", - 57, - 10, - "L", - 238, - 10, - "L", - 238, - 28, - "L", - 57, - 28, - "Z" - ], - "fillColor": "rgba(0, 255, 0, 0)", - "name": "padding" - }, - { - "path": [ - "M", - 55, - 8, - "L", - 240, - 8, - "L", - 240, - 30, - "L", - 55, - 30, - "Z" - ], - "fillColor": "rgba(0, 0, 255, 0)", - "name": "border" - }, - { - "path": [ - "M", - 55, - 8, - "L", - 240, - 8, - "L", - 240, - 30, - "L", - 55, - 30, - "Z" - ], - "fillColor": "rgba(255, 255, 255, 0)", - "name": "margin" - } - ], - "showRulers": true, - "showExtensionLines": true, - "showAccessibilityInfo": true, - "colorFormat": "hex", - "elementInfo": { - "tagName": "input", - "idValue": "input", - "nodeWidth": "185", - "nodeHeight": "22", - "isKeyboardFocusable": true, - "accessibleName": "", - "accessibleRole": "textbox", - "layoutObjectName": "LayoutTextControl", - "showAccessibilityInfo": true - } -} -div{ - "paths": [ - { - "path": [ - "M", - 8, - 30, - "L", - 792, - 30, - "L", - 792, - 50, - "L", - 8, - 50, - "Z" - ], - "fillColor": "rgba(255, 0, 0, 0)", - "outlineColor": "rgba(128, 0, 0, 0)", - "name": "content" - }, - { - "path": [ - "M", - 8, - 30, - "L", - 792, - 30, - "L", - 792, - 50, - "L", - 8, - 50, - "Z" - ], - "fillColor": "rgba(0, 255, 0, 0)", - "name": "padding" - }, - { - "path": [ - "M", - 8, - 30, - "L", - 792, - 30, - "L", - 792, - 50, - "L", - 8, - 50, - "Z" - ], - "fillColor": "rgba(0, 0, 255, 0)", - "name": "border" - }, - { - "path": [ - "M", - 8, - 30, - "L", - 792, - 30, - "L", - 792, - 50, - "L", - 8, - 50, - "Z" - ], - "fillColor": "rgba(255, 255, 255, 0)", - "name": "margin" - } - ], - "showRulers": true, - "showExtensionLines": true, - "showAccessibilityInfo": true, - "colorFormat": "hex", - "elementInfo": { - "tagName": "div", - "idValue": "div", - "nodeWidth": "784", - "nodeHeight": "20", - "isKeyboardFocusable": true, - "accessibleName": "click", - "accessibleRole": "button", - "layoutObjectName": "LayoutBlockFlow", - "showAccessibilityInfo": true - } -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/http/tests/devtools/elements/highlight/highlight-node-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/http/tests/devtools/elements/highlight/highlight-node-expected.txt deleted file mode 100644 index c464063..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/http/tests/devtools/elements/highlight/highlight-node-expected.txt +++ /dev/null
@@ -1,571 +0,0 @@ -This test verifies the position and size of the highlight rectangles overlaid on an inspected node. - -inspectedElement{ - "paths": [ - { - "path": [ - "M", - 30, - 30, - "L", - 230, - 30, - "L", - 230, - 230, - "L", - 30, - 230, - "Z" - ], - "fillColor": "rgba(255, 0, 0, 0)", - "outlineColor": "rgba(128, 0, 0, 0)", - "name": "content" - }, - { - "path": [ - "M", - 15, - 15, - "L", - 245, - 15, - "L", - 245, - 245, - "L", - 15, - 245, - "Z" - ], - "fillColor": "rgba(0, 255, 0, 0)", - "name": "padding" - }, - { - "path": [ - "M", - 5, - 5, - "L", - 255, - 5, - "L", - 255, - 255, - "L", - 5, - 255, - "Z" - ], - "fillColor": "rgba(0, 0, 255, 0)", - "name": "border" - }, - { - "path": [ - "M", - 0, - 0, - "L", - 260, - 0, - "L", - 260, - 260, - "L", - 0, - 260, - "Z" - ], - "fillColor": "rgba(255, 255, 255, 0)", - "name": "margin" - } - ], - "showRulers": true, - "showExtensionLines": true, - "showAccessibilityInfo": true, - "colorFormat": "hex", - "elementInfo": { - "tagName": "div", - "idValue": "inspectedElement", - "nodeWidth": "250", - "nodeHeight": "250", - "isKeyboardFocusable": false, - "accessibleName": "", - "accessibleRole": "generic", - "layoutObjectName": "LayoutBlockFlow", - "showAccessibilityInfo": true - } -} -inspectedElement with RGB format{ - "paths": [ - { - "path": [ - "M", - 30, - 30, - "L", - 230, - 30, - "L", - 230, - 230, - "L", - 30, - 230, - "Z" - ], - "fillColor": "rgba(255, 0, 0, 0)", - "outlineColor": "rgba(128, 0, 0, 0)", - "name": "content" - }, - { - "path": [ - "M", - 15, - 15, - "L", - 245, - 15, - "L", - 245, - 245, - "L", - 15, - 245, - "Z" - ], - "fillColor": "rgba(0, 255, 0, 0)", - "name": "padding" - }, - { - "path": [ - "M", - 5, - 5, - "L", - 255, - 5, - "L", - 255, - 255, - "L", - 5, - 255, - "Z" - ], - "fillColor": "rgba(0, 0, 255, 0)", - "name": "border" - }, - { - "path": [ - "M", - 0, - 0, - "L", - 260, - 0, - "L", - 260, - 260, - "L", - 0, - 260, - "Z" - ], - "fillColor": "rgba(255, 255, 255, 0)", - "name": "margin" - } - ], - "showRulers": true, - "showExtensionLines": true, - "showAccessibilityInfo": true, - "colorFormat": "rgb", - "elementInfo": { - "tagName": "div", - "idValue": "inspectedElement", - "nodeWidth": "250", - "nodeHeight": "250", - "isKeyboardFocusable": false, - "accessibleName": "", - "accessibleRole": "generic", - "layoutObjectName": "LayoutBlockFlow", - "showAccessibilityInfo": true - } -} -inspectedElement with HSL format{ - "paths": [ - { - "path": [ - "M", - 30, - 30, - "L", - 230, - 30, - "L", - 230, - 230, - "L", - 30, - 230, - "Z" - ], - "fillColor": "rgba(255, 0, 0, 0)", - "outlineColor": "rgba(128, 0, 0, 0)", - "name": "content" - }, - { - "path": [ - "M", - 15, - 15, - "L", - 245, - 15, - "L", - 245, - 245, - "L", - 15, - 245, - "Z" - ], - "fillColor": "rgba(0, 255, 0, 0)", - "name": "padding" - }, - { - "path": [ - "M", - 5, - 5, - "L", - 255, - 5, - "L", - 255, - 255, - "L", - 5, - 255, - "Z" - ], - "fillColor": "rgba(0, 0, 255, 0)", - "name": "border" - }, - { - "path": [ - "M", - 0, - 0, - "L", - 260, - 0, - "L", - 260, - 260, - "L", - 0, - 260, - "Z" - ], - "fillColor": "rgba(255, 255, 255, 0)", - "name": "margin" - } - ], - "showRulers": true, - "showExtensionLines": true, - "showAccessibilityInfo": true, - "colorFormat": "hsl", - "elementInfo": { - "tagName": "div", - "idValue": "inspectedElement", - "nodeWidth": "250", - "nodeHeight": "250", - "isKeyboardFocusable": false, - "accessibleName": "", - "accessibleRole": "generic", - "layoutObjectName": "LayoutBlockFlow", - "showAccessibilityInfo": true - } -} -inspectedElement with HWB format{ - "paths": [ - { - "path": [ - "M", - 30, - 30, - "L", - 230, - 30, - "L", - 230, - 230, - "L", - 30, - 230, - "Z" - ], - "fillColor": "rgba(255, 0, 0, 0)", - "outlineColor": "rgba(128, 0, 0, 0)", - "name": "content" - }, - { - "path": [ - "M", - 15, - 15, - "L", - 245, - 15, - "L", - 245, - 245, - "L", - 15, - 245, - "Z" - ], - "fillColor": "rgba(0, 255, 0, 0)", - "name": "padding" - }, - { - "path": [ - "M", - 5, - 5, - "L", - 255, - 5, - "L", - 255, - 255, - "L", - 5, - 255, - "Z" - ], - "fillColor": "rgba(0, 0, 255, 0)", - "name": "border" - }, - { - "path": [ - "M", - 0, - 0, - "L", - 260, - 0, - "L", - 260, - 260, - "L", - 0, - 260, - "Z" - ], - "fillColor": "rgba(255, 255, 255, 0)", - "name": "margin" - } - ], - "showRulers": true, - "showExtensionLines": true, - "showAccessibilityInfo": true, - "colorFormat": "hwb", - "elementInfo": { - "tagName": "div", - "idValue": "inspectedElement", - "nodeWidth": "250", - "nodeHeight": "250", - "isKeyboardFocusable": false, - "accessibleName": "", - "accessibleRole": "generic", - "layoutObjectName": "LayoutBlockFlow", - "showAccessibilityInfo": true - } -} - -First text node{ - "paths": [ - { - "path": [ - "M", - "<number>", - "<number>", - "L", - "<number>", - "<number>", - "L", - "<number>", - "<number>", - "L", - "<number>", - "<number>", - "Z" - ], - "fillColor": "rgba(255, 0, 0, 0)", - "outlineColor": "rgba(128, 0, 0, 0)", - "name": "content" - }, - { - "path": [ - "M", - "<number>", - "<number>", - "L", - "<number>", - "<number>", - "L", - "<number>", - "<number>", - "L", - "<number>", - "<number>", - "Z" - ], - "fillColor": "rgba(0, 255, 0, 0)", - "name": "padding" - }, - { - "path": [ - "M", - "<number>", - "<number>", - "L", - "<number>", - "<number>", - "L", - "<number>", - "<number>", - "L", - "<number>", - "<number>", - "Z" - ], - "fillColor": "rgba(0, 0, 255, 0)", - "name": "border" - }, - { - "path": [ - "M", - "<number>", - "<number>", - "L", - "<number>", - "<number>", - "L", - "<number>", - "<number>", - "L", - "<number>", - "<number>", - "Z" - ], - "fillColor": "rgba(255, 255, 255, 0)", - "name": "margin" - } - ], - "showRulers": true, - "showExtensionLines": true, - "showAccessibilityInfo": true, - "colorFormat": "hex", - "elementInfo": { - "nodeWidth": "Width within 3px from 28? true", - "nodeHeight": "Height within 3px from 25? true", - "tagName": "#text", - "showAccessibilityInfo": true - } -} - -Second text node{ - "paths": [ - { - "path": [ - "M", - "<number>", - "<number>", - "L", - "<number>", - "<number>", - "L", - "<number>", - "<number>", - "L", - "<number>", - "<number>", - "Z" - ], - "fillColor": "rgba(255, 0, 0, 0)", - "outlineColor": "rgba(128, 0, 0, 0)", - "name": "content" - }, - { - "path": [ - "M", - "<number>", - "<number>", - "L", - "<number>", - "<number>", - "L", - "<number>", - "<number>", - "L", - "<number>", - "<number>", - "Z" - ], - "fillColor": "rgba(0, 255, 0, 0)", - "name": "padding" - }, - { - "path": [ - "M", - "<number>", - "<number>", - "L", - "<number>", - "<number>", - "L", - "<number>", - "<number>", - "L", - "<number>", - "<number>", - "Z" - ], - "fillColor": "rgba(0, 0, 255, 0)", - "name": "border" - }, - { - "path": [ - "M", - "<number>", - "<number>", - "L", - "<number>", - "<number>", - "L", - "<number>", - "<number>", - "L", - "<number>", - "<number>", - "Z" - ], - "fillColor": "rgba(255, 255, 255, 0)", - "name": "margin" - } - ], - "showRulers": true, - "showExtensionLines": true, - "showAccessibilityInfo": true, - "colorFormat": "hex", - "elementInfo": { - "nodeWidth": "Width within 3px from 30? true", - "nodeHeight": "Height within 3px from 24? true", - "tagName": "#text", - "showAccessibilityInfo": true - } -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/http/tests/devtools/elements/highlight/highlight-node-scaled-and-scrolled-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/http/tests/devtools/elements/highlight/highlight-node-scaled-and-scrolled-expected.txt deleted file mode 100644 index fa74a55..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/http/tests/devtools/elements/highlight/highlight-node-scaled-and-scrolled-expected.txt +++ /dev/null
@@ -1,99 +0,0 @@ - - -div{ - "paths": [ - { - "path": [ - "M", - -558, - -396, - "L", - -492, - -396, - "L", - -492, - -308, - "L", - -558, - -308, - "Z" - ], - "fillColor": "rgba(255, 0, 0, 0)", - "outlineColor": "rgba(128, 0, 0, 0)", - "name": "content" - }, - { - "path": [ - "M", - -584, - -422, - "L", - -466, - -422, - "L", - -466, - -282, - "L", - -584, - -282, - "Z" - ], - "fillColor": "rgba(0, 255, 0, 0)", - "name": "padding" - }, - { - "path": [ - "M", - -594, - -432, - "L", - -456, - -432, - "L", - -456, - -272, - "L", - -594, - -272, - "Z" - ], - "fillColor": "rgba(0, 0, 255, 0)", - "name": "border" - }, - { - "path": [ - "M", - -608, - -446, - "L", - -442, - -446, - "L", - -442, - -258, - "L", - -608, - -258, - "Z" - ], - "fillColor": "rgba(255, 255, 255, 0)", - "name": "margin" - } - ], - "showRulers": true, - "showExtensionLines": true, - "showAccessibilityInfo": true, - "colorFormat": "hex", - "elementInfo": { - "tagName": "div", - "idValue": "div", - "nodeWidth": "69", - "nodeHeight": "80", - "isKeyboardFocusable": false, - "accessibleName": "", - "accessibleRole": "generic", - "layoutObjectName": "LayoutBlockFlow", - "showAccessibilityInfo": true - } -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/http/tests/devtools/elements/highlight/highlight-node-scaled-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/http/tests/devtools/elements/highlight/highlight-node-scaled-expected.txt deleted file mode 100644 index 800c45e9..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/http/tests/devtools/elements/highlight/highlight-node-scaled-expected.txt +++ /dev/null
@@ -1,99 +0,0 @@ - - -div{ - "paths": [ - { - "path": [ - "M", - 242, - 204, - "L", - 308, - 204, - "L", - 308, - 292, - "L", - 242, - 292, - "Z" - ], - "fillColor": "rgba(255, 0, 0, 0)", - "outlineColor": "rgba(128, 0, 0, 0)", - "name": "content" - }, - { - "path": [ - "M", - 216, - 178, - "L", - 334, - 178, - "L", - 334, - 318, - "L", - 216, - 318, - "Z" - ], - "fillColor": "rgba(0, 255, 0, 0)", - "name": "padding" - }, - { - "path": [ - "M", - 206, - 168, - "L", - 344, - 168, - "L", - 344, - 328, - "L", - 206, - 328, - "Z" - ], - "fillColor": "rgba(0, 0, 255, 0)", - "name": "border" - }, - { - "path": [ - "M", - 192, - 154, - "L", - 358, - 154, - "L", - 358, - 342, - "L", - 192, - 342, - "Z" - ], - "fillColor": "rgba(255, 255, 255, 0)", - "name": "margin" - } - ], - "showRulers": true, - "showExtensionLines": true, - "showAccessibilityInfo": true, - "colorFormat": "hex", - "elementInfo": { - "tagName": "div", - "idValue": "div", - "nodeWidth": "69", - "nodeHeight": "80", - "isKeyboardFocusable": false, - "accessibleName": "", - "accessibleRole": "generic", - "layoutObjectName": "LayoutBlockFlow", - "showAccessibilityInfo": true - } -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/http/tests/devtools/elements/highlight/highlight-node-scroll-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/http/tests/devtools/elements/highlight/highlight-node-scroll-expected.txt deleted file mode 100644 index b34bfcd6..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/http/tests/devtools/elements/highlight/highlight-node-scroll-expected.txt +++ /dev/null
@@ -1,197 +0,0 @@ -This test verifies the position and size of the highlight rectangles overlayed on an inspected div in the scrolled view. - -inspectedElement1{ - "paths": [ - { - "path": [ - "M", - -12, - -62, - "L", - 188, - -62, - "L", - 188, - 138, - "L", - -12, - 138, - "Z" - ], - "fillColor": "rgba(255, 0, 0, 0)", - "outlineColor": "rgba(128, 0, 0, 0)", - "name": "content" - }, - { - "path": [ - "M", - -27, - -77, - "L", - 203, - -77, - "L", - 203, - 153, - "L", - -27, - 153, - "Z" - ], - "fillColor": "rgba(0, 255, 0, 0)", - "name": "padding" - }, - { - "path": [ - "M", - -37, - -87, - "L", - 213, - -87, - "L", - 213, - 163, - "L", - -37, - 163, - "Z" - ], - "fillColor": "rgba(0, 0, 255, 0)", - "name": "border" - }, - { - "path": [ - "M", - -42, - -92, - "L", - 218, - -92, - "L", - 218, - 168, - "L", - -42, - 168, - "Z" - ], - "fillColor": "rgba(255, 255, 255, 0)", - "name": "margin" - } - ], - "showRulers": true, - "showExtensionLines": true, - "showAccessibilityInfo": true, - "colorFormat": "hex", - "elementInfo": { - "tagName": "div", - "idValue": "inspectedElement1", - "className": ".inspected", - "nodeWidth": "250", - "nodeHeight": "250", - "isKeyboardFocusable": false, - "accessibleName": "", - "accessibleRole": "generic", - "layoutObjectName": "LayoutBlockFlow", - "showAccessibilityInfo": true - } -} -inspectedElement2{ - "paths": [ - { - "path": [ - "M", - -72, - 148, - "L", - 128, - 148, - "L", - 128, - 348, - "L", - -72, - 348, - "Z" - ], - "fillColor": "rgba(255, 0, 0, 0)", - "outlineColor": "rgba(128, 0, 0, 0)", - "name": "content" - }, - { - "path": [ - "M", - -87, - 133, - "L", - 143, - 133, - "L", - 143, - 363, - "L", - -87, - 363, - "Z" - ], - "fillColor": "rgba(0, 255, 0, 0)", - "name": "padding" - }, - { - "path": [ - "M", - -97, - 123, - "L", - 153, - 123, - "L", - 153, - 373, - "L", - -97, - 373, - "Z" - ], - "fillColor": "rgba(0, 0, 255, 0)", - "name": "border" - }, - { - "path": [ - "M", - -102, - 118, - "L", - 158, - 118, - "L", - 158, - 378, - "L", - -102, - 378, - "Z" - ], - "fillColor": "rgba(255, 255, 255, 0)", - "name": "margin" - } - ], - "showRulers": true, - "showExtensionLines": true, - "showAccessibilityInfo": true, - "colorFormat": "hex", - "elementInfo": { - "tagName": "div", - "idValue": "inspectedElement2", - "className": ".inspected", - "nodeWidth": "250", - "nodeHeight": "250", - "isKeyboardFocusable": false, - "accessibleName": "", - "accessibleRole": "generic", - "layoutObjectName": "LayoutBlockFlow", - "showAccessibilityInfo": true - } -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/http/tests/devtools/elements/highlight/highlight-node-transformed-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/http/tests/devtools/elements/highlight/highlight-node-transformed-expected.txt deleted file mode 100644 index cd9a1f82..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/http/tests/devtools/elements/highlight/highlight-node-transformed-expected.txt +++ /dev/null
@@ -1,99 +0,0 @@ - - -div{ - "paths": [ - { - "path": [ - "M", - 205, - 100, - "L", - 205, - 180, - "L", - 105, - 180, - "L", - 105, - 100, - "Z" - ], - "fillColor": "rgba(255, 0, 0, 0)", - "outlineColor": "rgba(128, 0, 0, 0)", - "name": "content" - }, - { - "path": [ - "M", - 205, - 100, - "L", - 205, - 180, - "L", - 105, - 180, - "L", - 105, - 100, - "Z" - ], - "fillColor": "rgba(0, 255, 0, 0)", - "name": "padding" - }, - { - "path": [ - "M", - 205, - 100, - "L", - 205, - 180, - "L", - 105, - 180, - "L", - 105, - 100, - "Z" - ], - "fillColor": "rgba(0, 0, 255, 0)", - "name": "border" - }, - { - "path": [ - "M", - 205, - 100, - "L", - 205, - 180, - "L", - 105, - 180, - "L", - 105, - 100, - "Z" - ], - "fillColor": "rgba(255, 255, 255, 0)", - "name": "margin" - } - ], - "showRulers": true, - "showExtensionLines": true, - "showAccessibilityInfo": true, - "colorFormat": "hex", - "elementInfo": { - "tagName": "div", - "idValue": "div", - "nodeWidth": "100", - "nodeHeight": "80", - "isKeyboardFocusable": false, - "accessibleName": "", - "accessibleRole": "generic", - "layoutObjectName": "LayoutBlockFlow", - "showAccessibilityInfo": true - } -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/http/tests/images/document-policy/document-policy-oversized-images-edge-cases-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/http/tests/images/document-policy/document-policy-oversized-images-edge-cases-expected.png deleted file mode 100644 index eda6c6d..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/http/tests/images/document-policy/document-policy-oversized-images-edge-cases-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/http/tests/media/video-buffered-range-contains-currentTime-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/http/tests/media/video-buffered-range-contains-currentTime-expected.png deleted file mode 100644 index 01d0375d..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/http/tests/media/video-buffered-range-contains-currentTime-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/http/tests/misc/acid3-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/http/tests/misc/acid3-expected.png deleted file mode 100644 index 8d7f90d..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/http/tests/misc/acid3-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/http/tests/misc/iframe404-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/http/tests/misc/iframe404-expected.png deleted file mode 100644 index ea148ae..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/http/tests/misc/iframe404-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/http/tests/misc/slow-loading-image-in-pattern-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/http/tests/misc/slow-loading-image-in-pattern-expected.png deleted file mode 100644 index 3ac12bf..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/http/tests/misc/slow-loading-image-in-pattern-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/http/tests/misc/slow-loading-mask-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/http/tests/misc/slow-loading-mask-expected.png deleted file mode 100644 index 487f249..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/http/tests/misc/slow-loading-mask-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/http/tests/uri/css-href-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/http/tests/uri/css-href-expected.png deleted file mode 100644 index 8ca0fdd..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/http/tests/uri/css-href-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/http/tests/xmlviewer/dumpAsText/mathml-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/http/tests/xmlviewer/dumpAsText/mathml-expected.txt deleted file mode 100644 index e0c64227..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/http/tests/xmlviewer/dumpAsText/mathml-expected.txt +++ /dev/null
@@ -1,12 +0,0 @@ -This XML file does not appear to have any style information associated with it. The document tree is shown below. - -<!-- If you can see this, this test has failed, except if you are - not using a MathML-aware client. --> -<FAIL xmlns:a="http://www.w3.org/1998/Math/MathML"> -<header>This tests that xml viewer is not used when there is a tag in MATHML namespace.</header> -<a:math> -<a:mrow> -<a:mi>SUCCESS</a:mi> -</a:mrow> -</a:math> -</FAIL>
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/ietestcenter/css3/bordersbackgrounds/border-radius-applies-to-011-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/ietestcenter/css3/bordersbackgrounds/border-radius-applies-to-011-expected.png deleted file mode 100644 index 5fa5444f..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/ietestcenter/css3/bordersbackgrounds/border-radius-applies-to-011-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/ietestcenter/css3/text/textshadow-002-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/ietestcenter/css3/text/textshadow-002-expected.png deleted file mode 100644 index afe2433..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/ietestcenter/css3/text/textshadow-002-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/images/color-profile-image-filter-all-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/images/color-profile-image-filter-all-expected.png deleted file mode 100644 index b407986..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/images/color-profile-image-filter-all-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/images/exif-orientation-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/images/exif-orientation-expected.png deleted file mode 100644 index 8a94dff..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/images/exif-orientation-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/images/exif-orientation-image-document-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/images/exif-orientation-image-document-expected.png deleted file mode 100644 index 1e251535..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/images/exif-orientation-image-document-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/inspector-protocol/css/css-get-platform-fonts-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/inspector-protocol/css/css-get-platform-fonts-expected.txt deleted file mode 100644 index c14ba14e..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/inspector-protocol/css/css-get-platform-fonts-expected.txt +++ /dev/null
@@ -1,22 +0,0 @@ -Test css.getPlatformFontsForNode method. - -Running test: testFirstLetterPseudoClass -Font #0 - name: <Some-family-name-0> - glyphCount: 29 - isCustomFont: true -Font #1 - name: <Some-family-name-1> - glyphCount: 7 - isCustomFont: false -Font #2 - name: <Some-family-name-2> - glyphCount: 1 - isCustomFont: false - -Running test: testSelectElementPlatformFonts -Font #0 - name: <Some-family-name-0> - glyphCount: 27 - isCustomFont: false -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/inspector-protocol/dom-snapshot/dom-snapshot-captureSnapshot-pseudo-element-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/inspector-protocol/dom-snapshot/dom-snapshot-captureSnapshot-pseudo-element-expected.txt deleted file mode 100644 index 8d7d2de..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/inspector-protocol/dom-snapshot/dom-snapshot-captureSnapshot-pseudo-element-expected.txt +++ /dev/null
@@ -1,985 +0,0 @@ -Tests DOMSnapshot.captureSnapshot exports layout tree nodes associated with pseudo elements. -{ - documents : [ - [0] : { - baseURL : <number> - contentHeight : 600 - contentLanguage : -1 - contentWidth : 800 - documentURL : <number> - encodingName : 1 - frameId : <number> - layout : { - bounds : [ - [0] : [ - [0] : 0 - [1] : 0 - [2] : 800 - [3] : 600 - ] - [1] : [ - [0] : 0 - [1] : 0 - [2] : 800 - [3] : 600 - ] - [2] : [ - [0] : 8 - [1] : 8 - [2] : 784 - [3] : 582 - ] - [3] : [ - [0] : 8 - [1] : 18 - [2] : 200 - [3] : 200 - ] - [4] : [ - [0] : 8 - [1] : 18 - [2] : 10 - [3] : 10 - ] - [5] : [ - [0] : 8 - [1] : 18 - [2] : 10 - [3] : 10 - ] - [6] : [ - [0] : 8 - [1] : 18 - [2] : 140 - [3] : 20 - ] - [7] : [ - [0] : 8 - [1] : 18 - [2] : 200 - [3] : 200 - ] - [8] : [ - [0] : 8 - [1] : 18 - [2] : 10 - [3] : 10 - ] - [9] : [ - [0] : 8 - [1] : 18 - [2] : 10 - [3] : 10 - ] - [10] : [ - [0] : 8 - [1] : 18 - [2] : 200 - [3] : 30 - ] - [11] : [ - [0] : 8 - [1] : 18 - [2] : 200 - [3] : 30 - ] - [12] : [ - [0] : 8 - [1] : 18 - [2] : 200 - [3] : 200 - ] - [13] : [ - [0] : 8 - [1] : 110 - [2] : 10 - [3] : 10 - ] - [14] : [ - [0] : 8 - [1] : 110 - [2] : 10 - [3] : 10 - ] - [15] : [ - [0] : 8 - [1] : 110 - [2] : 200 - [3] : 10 - ] - [16] : [ - [0] : 18 - [1] : 110 - [2] : 70 - [3] : 10 - ] - [17] : [ - [0] : 88 - [1] : 110 - [2] : 10 - [3] : 10 - ] - [18] : [ - [0] : 98 - [1] : 18 - [2] : 100 - [3] : 100 - ] - [19] : [ - [0] : 198 - [1] : 110 - [2] : 10 - [3] : 10 - ] - [20] : [ - [0] : 8 - [1] : 120 - [2] : 190 - [3] : 30 - ] - [21] : [ - [0] : 8 - [1] : 8 - [2] : 784 - [3] : 40 - ] - [22] : [ - [0] : 48 - [1] : 8 - [2] : 744 - [3] : 10 - ] - [23] : [ - [0] : 35 - [1] : 8 - [2] : 5 - [3] : 10 - ] - [24] : [ - [0] : 48 - [1] : 8 - [2] : 50 - [3] : 10 - ] - [25] : [ - [0] : 48 - [1] : 18 - [2] : 744 - [3] : 10 - ] - [26] : [ - [0] : 35 - [1] : 18 - [2] : 5 - [3] : 10 - ] - [27] : [ - [0] : 48 - [1] : 18 - [2] : 40 - [3] : 10 - ] - [28] : [ - [0] : 48 - [1] : 28 - [2] : 744 - [3] : 10 - ] - [29] : [ - [0] : 35 - [1] : 28 - [2] : 5 - [3] : 10 - ] - [30] : [ - [0] : 48 - [1] : 28 - [2] : 40 - [3] : 10 - ] - [31] : [ - [0] : 48 - [1] : 38 - [2] : 744 - [3] : 10 - ] - [32] : [ - [0] : 35 - [1] : 38 - [2] : 5 - [3] : 10 - ] - [33] : [ - [0] : 48 - [1] : 38 - [2] : 50 - [3] : 10 - ] - ] - nodeIndex : [ - [0] : 0 - [1] : 1 - [2] : 8 - [3] : 10 - [4] : 11 - [5] : 11 - [6] : 12 - [7] : 14 - [8] : 15 - [9] : 15 - [10] : 16 - [11] : 17 - [12] : 19 - [13] : 20 - [14] : 20 - [15] : 21 - [16] : 21 - [17] : 21 - [18] : 21 - [19] : 21 - [20] : 22 - [21] : 24 - [22] : 25 - [23] : 26 - [24] : 27 - [25] : 28 - [26] : 29 - [27] : 30 - [28] : 31 - [29] : 32 - [30] : 33 - [31] : 34 - [32] : 35 - [33] : 36 - ] - stackingContexts : { - index : [ - [0] : 0 - [1] : 1 - ] - } - styles : [ - [0] : [ - ] - [1] : [ - [0] : 5 - [1] : 6 - ] - [2] : [ - [0] : 5 - [1] : 6 - ] - [3] : [ - [0] : 5 - [1] : 6 - ] - [4] : [ - [0] : 21 - [1] : 22 - ] - [5] : [ - [0] : 21 - [1] : 22 - ] - [6] : [ - [0] : 5 - [1] : 6 - ] - [7] : [ - [0] : 5 - [1] : 6 - ] - [8] : [ - [0] : 21 - [1] : 22 - ] - [9] : [ - [0] : 21 - [1] : 22 - ] - [10] : [ - [0] : 5 - [1] : 6 - ] - [11] : [ - [0] : 5 - [1] : 6 - ] - [12] : [ - [0] : 5 - [1] : 6 - ] - [13] : [ - [0] : 31 - [1] : 32 - ] - [14] : [ - [0] : 31 - [1] : 32 - ] - [15] : [ - [0] : 5 - [1] : 6 - ] - [16] : [ - [0] : 5 - [1] : 6 - ] - [17] : [ - [0] : 5 - [1] : 6 - ] - [18] : [ - [0] : 5 - [1] : 6 - ] - [19] : [ - [0] : 5 - [1] : 6 - ] - [20] : [ - [0] : 5 - [1] : 6 - ] - [21] : [ - [0] : 5 - [1] : 6 - ] - [22] : [ - [0] : 5 - [1] : 6 - ] - [23] : [ - [0] : 5 - [1] : 6 - ] - [24] : [ - [0] : 5 - [1] : 6 - ] - [25] : [ - [0] : 5 - [1] : 6 - ] - [26] : [ - [0] : 5 - [1] : 6 - ] - [27] : [ - [0] : 5 - [1] : 6 - ] - [28] : [ - [0] : 5 - [1] : 6 - ] - [29] : [ - [0] : 5 - [1] : 6 - ] - [30] : [ - [0] : 5 - [1] : 6 - ] - [31] : [ - [0] : 5 - [1] : 6 - ] - [32] : [ - [0] : 5 - [1] : 6 - ] - [33] : [ - [0] : 5 - [1] : 6 - ] - ] - text : [ - [0] : -1 - [1] : -1 - [2] : -1 - [3] : -1 - [4] : -1 - [5] : 23 - [6] : 26 - [7] : -1 - [8] : -1 - [9] : 23 - [10] : -1 - [11] : 29 - [12] : -1 - [13] : -1 - [14] : 33 - [15] : -1 - [16] : 35 - [17] : 36 - [18] : -1 - [19] : 37 - [20] : 39 - [21] : -1 - [22] : -1 - [23] : -1 - [24] : 44 - [25] : -1 - [26] : -1 - [27] : 45 - [28] : -1 - [29] : -1 - [30] : 46 - [31] : -1 - [32] : -1 - [33] : 47 - ] - } - nodes : { - attributes : [ - [0] : [ - ] - [1] : [ - ] - [2] : [ - ] - [3] : [ - ] - [4] : [ - ] - [5] : [ - ] - [6] : [ - [0] : 13 - [1] : 14 - ] - [7] : [ - ] - [8] : [ - ] - [9] : [ - ] - [10] : [ - [0] : 18 - [1] : 19 - ] - [11] : [ - ] - [12] : [ - ] - [13] : [ - ] - [14] : [ - [0] : 18 - [1] : 19 - ] - [15] : [ - ] - [16] : [ - ] - [17] : [ - ] - [18] : [ - ] - [19] : [ - [0] : 18 - [1] : 30 - ] - [20] : [ - ] - [21] : [ - ] - [22] : [ - ] - [23] : [ - ] - [24] : [ - ] - [25] : [ - ] - [26] : [ - ] - [27] : [ - ] - [28] : [ - ] - [29] : [ - ] - [30] : [ - ] - [31] : [ - ] - [32] : [ - ] - [33] : [ - ] - [34] : [ - ] - [35] : [ - ] - [36] : [ - ] - [37] : [ - ] - ] - backendNodeId : <object> - contentDocumentIndex : { - index : [ - ] - value : [ - ] - } - currentSourceURL : { - index : [ - ] - value : [ - ] - } - inputChecked : { - index : [ - ] - } - inputValue : { - index : [ - ] - value : [ - ] - } - isClickable : { - index : [ - ] - } - nodeName : [ - [0] : 3 - [1] : 4 - [2] : 7 - [3] : 8 - [4] : 9 - [5] : 9 - [6] : 12 - [7] : 9 - [8] : 15 - [9] : 9 - [10] : 17 - [11] : 20 - [12] : 9 - [13] : 9 - [14] : 17 - [15] : 20 - [16] : 27 - [17] : 9 - [18] : 9 - [19] : 17 - [20] : 20 - [21] : 34 - [22] : 9 - [23] : 9 - [24] : 40 - [25] : 41 - [26] : 42 - [27] : 9 - [28] : 41 - [29] : 42 - [30] : 9 - [31] : 41 - [32] : 42 - [33] : 9 - [34] : 41 - [35] : 42 - [36] : 9 - [37] : 9 - ] - nodeType : [ - [0] : 9 - [1] : 1 - [2] : 1 - [3] : 1 - [4] : 3 - [5] : 3 - [6] : 1 - [7] : 3 - [8] : 1 - [9] : 3 - [10] : 1 - [11] : 1 - [12] : 3 - [13] : 3 - [14] : 1 - [15] : 1 - [16] : 1 - [17] : 3 - [18] : 3 - [19] : 1 - [20] : 1 - [21] : 1 - [22] : 3 - [23] : 3 - [24] : 1 - [25] : 1 - [26] : 1 - [27] : 3 - [28] : 1 - [29] : 1 - [30] : 3 - [31] : 1 - [32] : 1 - [33] : 3 - [34] : 1 - [35] : 1 - [36] : 3 - [37] : 3 - ] - nodeValue : [ - [0] : -1 - [1] : -1 - [2] : -1 - [3] : -1 - [4] : 10 - [5] : 11 - [6] : -1 - [7] : 11 - [8] : -1 - [9] : 16 - [10] : -1 - [11] : -1 - [12] : 25 - [13] : 16 - [14] : -1 - [15] : -1 - [16] : -1 - [17] : 28 - [18] : 16 - [19] : -1 - [20] : -1 - [21] : -1 - [22] : 39 - [23] : 16 - [24] : -1 - [25] : -1 - [26] : -1 - [27] : 44 - [28] : -1 - [29] : -1 - [30] : 45 - [31] : -1 - [32] : -1 - [33] : 46 - [34] : -1 - [35] : -1 - [36] : 47 - [37] : 48 - ] - optionSelected : { - index : [ - ] - } - originURL : { - index : [ - ] - value : [ - ] - } - parentIndex : [ - [0] : -1 - [1] : 0 - [2] : 1 - [3] : 2 - [4] : 3 - [5] : 2 - [6] : 2 - [7] : 2 - [8] : 1 - [9] : 8 - [10] : 8 - [11] : 10 - [12] : 10 - [13] : 8 - [14] : 8 - [15] : 14 - [16] : 14 - [17] : 16 - [18] : 8 - [19] : 8 - [20] : 19 - [21] : 19 - [22] : 19 - [23] : 8 - [24] : 8 - [25] : 24 - [26] : 25 - [27] : 25 - [28] : 24 - [29] : 28 - [30] : 28 - [31] : 24 - [32] : 31 - [33] : 31 - [34] : 24 - [35] : 34 - [36] : 34 - [37] : 8 - ] - pseudoIdentifier : { - index : [ - ] - value : [ - ] - } - pseudoType : { - index : [ - [0] : 11 - [1] : 15 - [2] : 20 - [3] : 21 - [4] : 26 - [5] : 29 - [6] : 32 - [7] : 35 - ] - value : [ - [0] : 24 - [1] : 24 - [2] : 24 - [3] : 38 - [4] : 43 - [5] : 43 - [6] : 43 - [7] : 43 - ] - } - shadowRootType : <object> - textValue : { - index : [ - ] - value : [ - ] - } - } - publicId : -1 - scrollOffsetX : 0 - scrollOffsetY : 0 - systemId : -1 - textBoxes : { - bounds : [ - [0] : [ - [0] : 8 - [1] : 18 - [2] : 10 - [3] : 10 - ] - [1] : [ - [0] : 18 - [1] : 18 - [2] : 130 - [3] : 10 - ] - [2] : [ - [0] : 8 - [1] : 28 - [2] : 70 - [3] : 10 - ] - [3] : [ - [0] : 8 - [1] : 18 - [2] : 10 - [3] : 10 - ] - [4] : [ - [0] : 18 - [1] : 18 - [2] : 130 - [3] : 10 - ] - [5] : [ - [0] : 8 - [1] : 28 - [2] : 200 - [3] : 10 - ] - [6] : [ - [0] : 8 - [1] : 38 - [2] : 70 - [3] : 10 - ] - [7] : [ - [0] : 8 - [1] : 110 - [2] : 10 - [3] : 10 - ] - [8] : [ - [0] : 18 - [1] : 110 - [2] : 70 - [3] : 10 - ] - [9] : [ - [0] : 88 - [1] : 110 - [2] : 10 - [3] : 10 - ] - [10] : [ - [0] : 198 - [1] : 110 - [2] : 10 - [3] : 10 - ] - [11] : [ - [0] : 8 - [1] : 120 - [2] : 190 - [3] : 10 - ] - [12] : [ - [0] : 8 - [1] : 130 - [2] : 160 - [3] : 10 - ] - [13] : [ - [0] : 8 - [1] : 140 - [2] : 130 - [3] : 10 - ] - [14] : [ - [0] : 48 - [1] : 8 - [2] : 50 - [3] : 10 - ] - [15] : [ - [0] : 48 - [1] : 18 - [2] : 40 - [3] : 10 - ] - [16] : [ - [0] : 48 - [1] : 28 - [2] : 40 - [3] : 10 - ] - [17] : [ - [0] : 48 - [1] : 38 - [2] : 50 - [3] : 10 - ] - ] - layoutIndex : [ - [0] : 5 - [1] : 6 - [2] : 6 - [3] : 9 - [4] : 11 - [5] : 11 - [6] : 11 - [7] : 14 - [8] : 16 - [9] : 17 - [10] : 19 - [11] : 20 - [12] : 20 - [13] : 20 - [14] : 24 - [15] : 27 - [16] : 30 - [17] : 33 - ] - length : [ - [0] : 1 - [1] : 13 - [2] : 7 - [3] : 1 - [4] : 13 - [5] : 20 - [6] : 7 - [7] : 1 - [8] : 7 - [9] : 1 - [10] : 1 - [11] : 19 - [12] : 16 - [13] : 13 - [14] : 5 - [15] : 4 - [16] : 4 - [17] : 5 - ] - start : [ - [0] : 0 - [1] : 0 - [2] : 14 - [3] : 0 - [4] : 0 - [5] : 14 - [6] : 35 - [7] : 0 - [8] : 0 - [9] : 0 - [10] : 0 - [11] : 0 - [12] : 20 - [13] : 37 - [14] : 0 - [15] : 0 - [16] : 0 - [17] : 0 - ] - } - title : -1 - } - ] - strings : [ - [0] : - [1] : windows-1252 - [2] : - [3] : #document - [4] : HTML - [5] : 400 - [6] : rgb(0, 0, 0) - [7] : HEAD - [8] : STYLE - [9] : #text - [10] : p { position: absolute; height: 200px; width: 200px; font: 10px Ahem; } .c1::first-letter { font-weight: lighter; color: green; } .c2::first-letter { font-weight: bold; color: blue; } .c2::before { counter-increment: square; content: 'square: ' counter(square) url(square.png) '! '; } ul { font: 10px Ahem; } - [11] : - [12] : SCRIPT - [13] : src - [14] : ../../resources/ahem.js - [15] : BODY - [16] : - [17] : P - [18] : class - [19] : c1 - [20] : ::first-letter - [21] : 100 - [22] : rgb(0, 128, 0) - [23] : I - [24] : first-letter - [25] : I have a first letter. - [26] : have a first letter. - [27] : SPAN - [28] : I have a first letter because of my parent. - [29] : have a first letter because of my parent. - [30] : c2 - [31] : 700 - [32] : rgb(0, 0, 255) - [33] : s - [34] : ::before - [35] : quare: - [36] : 1 - [37] : ! - [38] : before - [39] : I have some content before me with a first letter. - [40] : UL - [41] : LI - [42] : ::marker - [43] : marker - [44] : water - [45] : malt - [46] : hops - [47] : yeast - [48] : - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/inspector-protocol/layout-fonts/languages-emoji-rare-glyphs-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/inspector-protocol/layout-fonts/languages-emoji-rare-glyphs-expected.txt deleted file mode 100644 index 496565b..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/inspector-protocol/layout-fonts/languages-emoji-rare-glyphs-expected.txt +++ /dev/null
@@ -1,54 +0,0 @@ -百家姓 趙錢孫李 周吳鄭王 馮陳褚衛 蔣沈韓楊 朱秦尤許 何呂施張 孔曹嚴華 金魏陶薑 戚謝鄒喻 柏水竇章 雲蘇潘葛 奚範彭郎 魯韋昌馬 苗鳳花方 俞任袁柳 酆鮑史唐 費廉岑薛 雷賀倪湯 滕殷羅畢 郝鄔安常 樂於時傅 皮卞齊康 伍餘元蔔 顧孟平黃 和穆蕭尹 姚邵堪汪 祁毛禹狄 米貝明臧 計伏成戴 談宋茅龐 熊紀舒屈 項祝董梁 杜阮藍閔 席季麻強 賈路婁危 江童顏郭 梅盛林刁 鍾徐邱駱 高夏蔡田 樊胡淩霍 虞萬支柯 昝管盧莫 經房裘繆 幹解應宗 丁宣賁鄧 鬱單杭洪 包諸左石 崔吉鈕龔 程嵇邢滑 裴陸榮翁 荀羊於惠 甄曲家封 芮羿儲靳 汲邴糜松 井段富巫 烏焦巴弓 牧隗山穀 車侯宓蓬 全郗班仰 秋仲伊宮 寧仇欒暴 甘鈄厲戎 祖武符劉 景詹束龍 葉幸司韶 郜黎薊薄 印宿白懷 蒲台從鄂 索鹹籍賴 卓藺屠蒙 池喬陰鬱 胥能蒼雙 聞莘黨翟 譚貢勞逄 姬申扶堵 冉宰酈雍 卻璩桑桂 濮牛壽通 邊扈燕冀 郟浦尚農 溫別莊晏 柴瞿閻充 慕連茹習 宦艾魚容 向古易慎 戈廖庚終 暨居衡步 都耿滿弘 匡國文寇 廣祿闕東 毆殳沃利 蔚越夔隆 師鞏厙聶 晁勾敖融 冷訾辛闞 那簡饒空 曾毋沙乜 養鞠須豐 巢關蒯相 查後荊紅 遊竺權逯 蓋益桓公 萬俟司馬 上官歐陽 夏侯諸葛 聞人東方 赫連皇甫 尉遲公羊 澹台公冶 宗政濮陽 淳於單於 太叔申屠 公孫仲孫 軒轅令狐 鐘離宇文 長孫慕容 鮮於閭丘 司徒司空 亓官司寇 仉督子車 顓孫端木 巫馬公西 漆雕樂正 壤駟公良 拓拔夾穀 宰父穀粱 晉楚閆法 汝鄢塗欽 段幹百里 東郭南門 呼延歸海 羊舌微生 嶽帥緱亢 況後有琴 梁丘左丘 東門西門 商牟佘佴 伯賞南宮 墨哈譙笪 年愛陽佟 -#hundred_chinese_surnames: -"Noto Sans CJK JP" : 563, -"Tinos" : 140 - -いろはにほへと ちりぬるを わかよたれそ つねならむ うゐのおくやま けふこえて あさき ゆめみし ゑひもせす（ん）色は匂へど 散りぬるを 我が世誰ぞ 常ならむ 有為の奥山 今日越えて 浅き夢見じ 酔ひもせず（ん） -#japanese_iroha: -"Noto Sans CJK JP" : 92, -"Tinos" : 15 - -키스의 고유조건은 입술끼리 만나야 하고 특별한 기술은 필요치 않다. -#korean_pangram: -"Noto Sans CJK JP" : 28, -"Tinos" : 9 - -ऋषियों को सताने वाले दुष्ट राक्षसों के राजा रावण का सर्वनाश करने वाले विष्णुवतार भगवान श्रीराम, अयोध्या के महाराज दशरथ के बड़े सपुत्र थे। -#hindi_pangram: -"Lohit Devanagari" : 99, -"Tinos" : 23 - -نصٌّ حكيمٌ لهُ سِرٌّ قاطِعٌ وَذُو شَأنٍ عَظيمٍ مكتوبٌ على ثوبٍ أخضرَ ومُغلفٌ بجلدٍ أزرق -#arabic_pangram: -"DejaVu Sans" : 71, -"Tinos" : 14 - -🌱🌲🌳🌴🌵🌷🌸🌹🌺🌻🌼💐🌾🌿🍀🍁🍂🍃🍄🌰☺️😀👪 -#emoji: -"Noto Color Emoji" : 22, -"Tinos" : 2 - -𓀀𓀁𓀂𓀃𓀄𓀅𓀆𓀇𓀈𓀉𓀊𓀋𓀌𓀍𓀎𓀏 -#egyptian_hieroglyphs: -"Tinos" : 16 - -ខ្ញុំអាចញុំកញ្ចក់បាន ដោយគ្មានបញ្ហារ -#khmer: -"Noto Sans Khmer" : 26, -"Tinos" : 1 - -𐌲𐌿𐍄𐌹𐍃𐌺 -#gothic: -"Tinos" : 6 - -ܐܬܘܪܝܐ -#syriac: -"Tinos" : 6 - -⇦⇧⇨⇩￩￪￫￬⟀ -#text_presentation_arrows_maths: -"DejaVu Sans" : 4, -"Noto Sans CJK JP" : 4, -"Tinos" : 1 - -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/media/audio-controls-rendering-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/media/audio-controls-rendering-expected.png deleted file mode 100644 index fdc9bbc5..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/media/audio-controls-rendering-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/media/controls-layout-direction-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/media/controls-layout-direction-expected.png deleted file mode 100644 index 33bfa4e..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/media/controls-layout-direction-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/media/media-controls-clone-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/media/media-controls-clone-expected.png deleted file mode 100644 index d97e8578..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/media/media-controls-clone-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/media/media-document-audio-repaint-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/media/media-document-audio-repaint-expected.png deleted file mode 100644 index e7ebc87..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/media/media-document-audio-repaint-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/media/track/track-cue-rendering-ruby-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/media/track/track-cue-rendering-ruby-expected.png deleted file mode 100644 index 9c47f5b..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/media/track/track-cue-rendering-ruby-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/media/video-aspect-ratio-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/media/video-aspect-ratio-expected.png deleted file mode 100644 index 240c910..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/media/video-aspect-ratio-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/media/video-colorspace-yuv420-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/media/video-colorspace-yuv420-expected.png deleted file mode 100644 index 16418ec..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/media/video-colorspace-yuv420-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/media/video-colorspace-yuv422-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/media/video-colorspace-yuv422-expected.png deleted file mode 100644 index f8cc093b..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/media/video-colorspace-yuv422-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/media/video-zoom-controls-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/media/video-zoom-controls-expected.png deleted file mode 100644 index 4ef147b..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/media/video-zoom-controls-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/overflow/overflow-transform-perspective-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/overflow/overflow-transform-perspective-expected.png deleted file mode 100644 index 6766c28b..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/overflow/overflow-transform-perspective-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/4774354-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/4774354-expected.png deleted file mode 100644 index 66efc20..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/4774354-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/animation/opacity-animation-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/animation/opacity-animation-expected.txt deleted file mode 100644 index 59ac26c..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/animation/opacity-animation-expected.txt +++ /dev/null
@@ -1,29 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow DIV id='target'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#808080", - "transform": 1 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 8, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/animation/transform-animation-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/animation/transform-animation-expected.txt deleted file mode 100644 index 618625e..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/animation/transform-animation-expected.txt +++ /dev/null
@@ -1,39 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow DIV id='target'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#808080", - "transform": 2 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 8, 0, 1] - ] - }, - { - "id": 2, - "parent": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [100, 0, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/background/background-resize-height-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/background/background-resize-height-expected.txt deleted file mode 100644 index cf046380..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/background/background-resize-height-expected.txt +++ /dev/null
@@ -1,132 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='test image'", - "position": [8, 8], - "bounds": [110, 44], - "contentsOpaqueForText": true, - "invalidations": [ - [50, 0, 60, 44], - [0, 40, 60, 4] - ] - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='test image size-contain'", - "position": [108, 8], - "bounds": [110, 44], - "contentsOpaqueForText": true, - "invalidations": [ - [0, 0, 60, 44], - [50, 40, 60, 4] - ] - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='test image percent-height'", - "position": [208, 8], - "bounds": [110, 44], - "contentsOpaqueForText": true, - "invalidations": [ - [0, 0, 60, 44], - [50, 40, 60, 4] - ] - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='test image bottom'", - "position": [308, 8], - "bounds": [110, 44], - "contentsOpaqueForText": true, - "invalidations": [ - [50, 0, 60, 44], - [0, 0, 60, 44] - ] - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='test image no-repeat'", - "position": [408, 8], - "bounds": [110, 44], - "contentsOpaqueForText": true, - "invalidations": [ - [50, 0, 60, 44], - [0, 40, 60, 4] - ] - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='test image repeat-round'", - "bounds": [60, 44], - "contentsOpaqueForText": true, - "backfaceVisibility": "hidden", - "invalidations": [ - [0, 0, 60, 44] - ], - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='test generated'", - "position": [8, 108], - "bounds": [110, 44], - "contentsOpaqueForText": true, - "invalidations": [ - [50, 0, 60, 44], - [0, 0, 60, 44] - ] - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='test generated size-contain'", - "position": [108, 108], - "bounds": [160, 44], - "contentsOpaqueForText": true, - "invalidations": [ - [100, 0, 60, 44], - [0, 0, 60, 44] - ] - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='test generated top'", - "position": [258, 108], - "bounds": [110, 44], - "contentsOpaqueForText": true, - "invalidations": [ - [50, 0, 60, 44], - [0, 0, 60, 44] - ] - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='test generated center'", - "position": [358, 108], - "bounds": [110, 44], - "contentsOpaqueForText": true, - "invalidations": [ - [50, 0, 60, 44], - [0, 0, 60, 44] - ] - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='test generated repeat-space'", - "position": [458, 108], - "bounds": [110, 44], - "contentsOpaqueForText": true, - "invalidations": [ - [50, 0, 60, 44], - [0, 0, 60, 44] - ] - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [508, 8, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/background/composited-background-on-both-layers-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/background/composited-background-on-both-layers-expected.txt deleted file mode 100644 index b5bb9f37..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/background/composited-background-on-both-layers-expected.txt +++ /dev/null
@@ -1,64 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow DIV id='target'", - "bounds": [240, 240], - "contentsOpaque": true, - "backgroundColor": "#008000", - "invalidations": [ - [0, 0, 240, 240] - ], - "transform": 1 - }, - { - "name": "LayoutBlockFlow DIV id='target'", - "position": [20, 20], - "bounds": [185, 185], - "drawsContent": false, - "transform": 1 - }, - { - "name": "HorizontalScrollbar", - "position": [20, 205], - "bounds": [200, 15], - "contentsOpaqueForText": true, - "transform": 1 - }, - { - "name": "VerticalScrollbar", - "position": [205, 20], - "bounds": [15, 185], - "contentsOpaque": true, - "transform": 1 - }, - { - "name": "LayoutBlockFlow DIV id='target'", - "position": [20, 20], - "bounds": [185, 3000], - "contentsOpaque": true, - "backgroundColor": "#008000", - "invalidations": [ - [0, 0, 185, 3000] - ], - "transform": 1 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 8, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/background/multiple-backgrounds-style-change-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/background/multiple-backgrounds-style-change-expected.txt deleted file mode 100644 index 6344315..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/background/multiple-backgrounds-style-change-expected.txt +++ /dev/null
@@ -1,38 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow DIV id='test' class='composited box'", - "bounds": [202, 202], - "contentsOpaqueForText": true, - "transform": 2 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 8, 0, 1] - ] - }, - { - "id": 2, - "parent": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [50, 50, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/background/no-repaint-for-composited-background-attachment-fixed-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/background/no-repaint-for-composited-background-attachment-fixed-expected.txt deleted file mode 100644 index d6768e3c..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/background/no-repaint-for-composited-background-attachment-fixed-expected.txt +++ /dev/null
@@ -1,27 +0,0 @@ -{ - "layers": [ - { - "name": "LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow HTML", - "bounds": [800, 5016], - "transform": 1 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [0, -1000, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/block-layout-inline-children-replaced-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/block-layout-inline-children-replaced-expected.txt deleted file mode 100644 index 9c0468b..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/block-layout-inline-children-replaced-expected.txt +++ /dev/null
@@ -1,14 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "invalidations": [ - [0, 116, 402, 152] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/box/box-inline-resize-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/box/box-inline-resize-expected.txt deleted file mode 100644 index 840a5351..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/box/box-inline-resize-expected.txt +++ /dev/null
@@ -1,16 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "invalidations": [ - [40, 107, 113, 27], - [8, 107, 113, 27], - [8, 88, 32, 32] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/bugzilla-3509-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/bugzilla-3509-expected.txt deleted file mode 100644 index 682ae491..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/bugzilla-3509-expected.txt +++ /dev/null
@@ -1,14 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "invalidations": [ - [11, 131, 100, 100] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/bugzilla-6278-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/bugzilla-6278-expected.txt deleted file mode 100644 index 2965136..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/bugzilla-6278-expected.txt +++ /dev/null
@@ -1,18 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "invalidations": [ - [10, 138, 292, 160], - [10, 303, 292, 50], - [10, 138, 242, 200], - [10, 343, 242, 50], - [252, 138, 50, 215] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/change-clip-composited-layer-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/change-clip-composited-layer-expected.txt deleted file mode 100644 index f963769..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/change-clip-composited-layer-expected.txt +++ /dev/null
@@ -1,32 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow DIV id='target'", - "bounds": [100, 10], - "contentsOpaqueForText": true, - "drawsContent": false, - "invalidations": [ - [0, 0, 50, 10] - ], - "transform": 1 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 8, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/clip/caret-ancestor-clip-change-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/clip/caret-ancestor-clip-change-expected.txt deleted file mode 100644 index d528ce6..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/clip/caret-ancestor-clip-change-expected.txt +++ /dev/null
@@ -1,28 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV", - "rect": [8, 58, 105, 62], - "reason": "incremental" - }, - { - "object": "LayoutTextControl INPUT id='target'", - "rect": [8, 58, 105, 62], - "reason": "incremental" - }, - { - "object": "LayoutBlockFlow DIV", - "rect": [10, 58, 1, 57], - "reason": "incremental" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/clip/clip-path-constant-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/clip/clip-path-constant-repaint-expected.txt deleted file mode 100644 index 623fe553..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/clip/clip-path-constant-repaint-expected.txt +++ /dev/null
@@ -1,45 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='clip'", - "bounds": [800, 300], - "contentsOpaqueForText": true, - "backgroundColor": "#FF0000E6", - "transform": 2 - }, - { - "name": "Synthesized Clip", - "position": [-2, -2], - "bounds": [804, 304], - "transform": 2 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 8, 0, 1] - ] - }, - { - "id": 2, - "parent": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [0, 100, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/clip/clip-path-in-mask-layer-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/clip/clip-path-in-mask-layer-expected.txt deleted file mode 100644 index d3a8b4aa..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/clip/clip-path-in-mask-layer-expected.txt +++ /dev/null
@@ -1,38 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow DIV", - "bounds": [200, 200], - "contentsOpaque": true, - "backgroundColor": "#0000FF", - "invalidations": [ - [0, 0, 200, 200] - ], - "transform": 1 - }, - { - "name": "Synthesized Clip", - "position": [-2, -2], - "bounds": [204, 204], - "transform": 1 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 8, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/clip/outline-clip-change-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/clip/outline-clip-change-expected.txt deleted file mode 100644 index cf0b8a38..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/clip/outline-clip-change-expected.txt +++ /dev/null
@@ -1,14 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "invalidations": [ - [48, 108, 90, 25] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/background-attachment-local-composited-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/background-attachment-local-composited-expected.txt deleted file mode 100644 index 6fdf4f9..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/background-attachment-local-composited-expected.txt +++ /dev/null
@@ -1,55 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow DIV id='container'", - "bounds": [400, 400], - "contentsOpaqueForText": true, - "drawsContent": false, - "transform": 1 - }, - { - "name": "LayoutBlockFlow DIV id='container'", - "bounds": [400, 400], - "drawsContent": false, - "transform": 1 - }, - { - "name": "LayoutBlockFlow DIV id='container'", - "bounds": [400, 2000], - "contentsOpaque": true, - "backgroundColor": "#0000FF", - "invalidations": [ - [0, 500, 400, 1500] - ], - "transform": 2 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 8, 0, 1] - ] - }, - { - "id": 2, - "parent": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [0, -1600, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/background-attachment-local-equivalent-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/background-attachment-local-equivalent-expected.txt deleted file mode 100644 index f80dfd50..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/background-attachment-local-equivalent-expected.txt +++ /dev/null
@@ -1,48 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow DIV id='container'", - "bounds": [400, 400], - "drawsContent": false, - "transform": 1 - }, - { - "name": "LayoutBlockFlow DIV id='container'", - "bounds": [400, 2000], - "contentsOpaque": true, - "backgroundColor": "#0000FF", - "invalidations": [ - [0, 500, 400, 1500] - ], - "transform": 2 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 8, 0, 1] - ] - }, - { - "id": 2, - "parent": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [0, -1600, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/child-of-sub-pixel-offset-composited-layer-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/child-of-sub-pixel-offset-composited-layer-expected.txt deleted file mode 100644 index 56175cf1..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/child-of-sub-pixel-offset-composited-layer-expected.txt +++ /dev/null
@@ -1,32 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='target' class='green'", - "position": [-1, 0], - "bounds": [15, 14], - "contentsOpaqueForText": true, - "invalidations": [ - [0, 0, 15, 14] - ], - "transform": 1 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [101, 100, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/chunk-reorder-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/chunk-reorder-expected.txt deleted file mode 100644 index ef7df3cb..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/chunk-reorder-expected.txt +++ /dev/null
@@ -1,41 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow DIV", - "bounds": [784, 1], - "contentsOpaqueForText": true, - "invalidations": [ - [0, 0, 1, 1] - ], - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='chunk5'", - "position": [400, 400], - "bounds": [150, 150], - "contentsOpaqueForText": true, - "invalidations": [ - [0, 0, 150, 150] - ], - "transform": 1 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 8, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/clipping-should-not-repaint-composited-descendants-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/clipping-should-not-repaint-composited-descendants-expected.txt deleted file mode 100644 index 93e7cf8..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/clipping-should-not-repaint-composited-descendants-expected.txt +++ /dev/null
@@ -1,67 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [785, 616], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='clipping-container'", - "position": [100, 100], - "bounds": [100, 100], - "contentsOpaqueForText": true, - "drawsContent": false, - "transform": 1 - }, - { - "name": "LayoutBlockFlow DIV class='clipped-composited-child'", - "bounds": [252, 252], - "contentsOpaque": true, - "backgroundColor": "#FFFF00", - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='clipping-container with-initial-clipping'", - "position": [100, 100], - "bounds": [100, 100], - "contentsOpaqueForText": true, - "drawsContent": false, - "transform": 2 - }, - { - "name": "LayoutBlockFlow DIV class='clipped-composited-child'", - "bounds": [252, 252], - "contentsOpaque": true, - "backgroundColor": "#FFFF00", - "transform": 2 - }, - { - "name": "VerticalScrollbar", - "position": [785, 0], - "bounds": [15, 600], - "contentsOpaque": true - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 8, 0, 1] - ] - }, - { - "id": 2, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 308, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/composited-layer-contents-move-in-subpixels-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/composited-layer-contents-move-in-subpixels-expected.txt deleted file mode 100644 index ce28d03..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/composited-layer-contents-move-in-subpixels-expected.txt +++ /dev/null
@@ -1,37 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow DIV id='container'", - "bounds": [784, 502], - "contentsOpaqueForText": true, - "invalidations": [ - [1, 317, 782, 54], - [1, 263, 782, 54], - [1, 426, 782, 53], - [1, 372, 782, 53], - [1, 209, 782, 53], - [1, 155, 782, 53], - [1, 101, 782, 53] - ], - "transform": 1 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 8, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/composited-layer-move-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/composited-layer-move-expected.txt deleted file mode 100644 index daeb18ab..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/composited-layer-move-expected.txt +++ /dev/null
@@ -1,29 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV id='target'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#008000", - "transform": 1 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [208, 8, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/composited-layer-move-in-subpixels-contents-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/composited-layer-move-in-subpixels-contents-expected.txt deleted file mode 100644 index ed8b2001..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/composited-layer-move-in-subpixels-contents-expected.txt +++ /dev/null
@@ -1,28 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow DIV id='container'", - "bounds": [784, 378], - "contentsOpaqueForText": true, - "transform": 1 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 110, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/composited-layers-move-in-subpixels-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/composited-layers-move-in-subpixels-expected.txt deleted file mode 100644 index 6a419762..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/composited-layers-move-in-subpixels-expected.txt +++ /dev/null
@@ -1,121 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow DIV id='first'", - "bounds": [784, 53], - "contentsOpaqueForText": true, - "backgroundColor": "#FFFF00", - "transform": 1 - }, - { - "name": "LayoutBlockFlow DIV", - "bounds": [784, 53], - "contentsOpaqueForText": true, - "transform": 2 - }, - { - "name": "LayoutBlockFlow DIV", - "position": [0, -1], - "bounds": [784, 53], - "contentsOpaqueForText": true, - "transform": 3 - }, - { - "name": "LayoutBlockFlow DIV", - "position": [0, -1], - "bounds": [784, 54], - "contentsOpaqueForText": true, - "transform": 4 - }, - { - "name": "LayoutBlockFlow DIV", - "bounds": [784, 53], - "contentsOpaqueForText": true, - "transform": 5 - }, - { - "name": "LayoutBlockFlow DIV", - "bounds": [784, 53], - "contentsOpaqueForText": true, - "transform": 6 - }, - { - "name": "LayoutBlockFlow DIV", - "bounds": [784, 53], - "contentsOpaqueForText": true, - "transform": 7 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 110, 0, 1] - ] - }, - { - "id": 2, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 164, 0, 1] - ] - }, - { - "id": 3, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 218, 0, 1] - ] - }, - { - "id": 4, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 273, 0, 1] - ] - }, - { - "id": 5, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 327, 0, 1] - ] - }, - { - "id": 6, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 381, 0, 1] - ] - }, - { - "id": 7, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 435, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/containing-block-added-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/containing-block-added-expected.txt deleted file mode 100644 index 521fdc1..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/containing-block-added-expected.txt +++ /dev/null
@@ -1,32 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='container'", - "bounds": [125, 125], - "contentsOpaqueForText": true, - "backgroundColor": "#0000FF", - "invalidations": [ - [50, 50, 75, 75] - ], - "transform": 1 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [200, 100, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/containing-block-added-individual-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/containing-block-added-individual-expected.txt deleted file mode 100644 index 521fdc1..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/containing-block-added-individual-expected.txt +++ /dev/null
@@ -1,32 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='container'", - "bounds": [125, 125], - "contentsOpaqueForText": true, - "backgroundColor": "#0000FF", - "invalidations": [ - [50, 50, 75, 75] - ], - "transform": 1 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [200, 100, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/containing-block-removed-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/containing-block-removed-expected.txt deleted file mode 100644 index 8c38f095..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/containing-block-removed-expected.txt +++ /dev/null
@@ -1,42 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='container'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#0000FF", - "invalidations": [ - [50, 50, 75, 75] - ], - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='fixed'", - "position": [50, 50], - "bounds": [75, 75], - "contentsOpaque": true, - "backgroundColor": "#008000", - "invalidations": [ - [0, 0, 75, 75] - ] - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [200, 100, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/containing-block-removed-individual-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/containing-block-removed-individual-expected.txt deleted file mode 100644 index 1708ba96..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/containing-block-removed-individual-expected.txt +++ /dev/null
@@ -1,43 +0,0 @@ -CONSOLE MESSAGE: debug -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='container'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#0000FF", - "invalidations": [ - [50, 50, 75, 75] - ], - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='fixed'", - "position": [50, 50], - "bounds": [75, 75], - "contentsOpaque": true, - "backgroundColor": "#008000", - "invalidations": [ - [0, 0, 75, 75] - ] - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [200, 100, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/dont-invalidate-root-layer-when-composited-layer-becomes-visible-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/dont-invalidate-root-layer-when-composited-layer-becomes-visible-expected.txt deleted file mode 100644 index 3035ac8..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/dont-invalidate-root-layer-when-composited-layer-becomes-visible-expected.txt +++ /dev/null
@@ -1,32 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='target'", - "bounds": [200, 200], - "contentsOpaqueForText": true, - "drawsContent": false, - "invalidations": [ - [0, 0, 200, 200] - ], - "transform": 1 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [200, 200, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/fixed-pos-inside-composited-intermediate-layer-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/fixed-pos-inside-composited-intermediate-layer-expected.txt deleted file mode 100644 index 8679f4e..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/fixed-pos-inside-composited-intermediate-layer-expected.txt +++ /dev/null
@@ -1,70 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [785, 30020], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "transform": 1 - }, - { - "name": "LayoutBlockFlow DIV class='compositedBehind'", - "bounds": [500, 500], - "contentsOpaque": true, - "backgroundColor": "#00FFFF", - "transform": 2 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='containerOverlapsComposited'", - "position": [20, 20], - "bounds": [100, 30000], - "contentsOpaque": true, - "backgroundColor": "#008000", - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='fixed'", - "bounds": [50, 50], - "contentsOpaque": true, - "backgroundColor": "#00FF00", - "transform": 3 - }, - { - "name": "VerticalScrollbar", - "position": [785, 0], - "bounds": [15, 600], - "contentsOpaque": true - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [0, -100, 0, 1] - ] - }, - { - "id": 2, - "parent": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 8, 0, 1] - ] - }, - { - "id": 3, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [45, 45, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/fixed-pos-with-abs-pos-child-scroll-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/fixed-pos-with-abs-pos-child-scroll-expected.txt deleted file mode 100644 index b68dc92..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/fixed-pos-with-abs-pos-child-scroll-expected.txt +++ /dev/null
@@ -1,37 +0,0 @@ -Hi! -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [785, 4021], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='abs'", - "position": [-360, -90], - "bounds": [360, 90], - "contentsOpaque": true, - "backgroundColor": "#FFFF00", - "transform": 1 - }, - { - "name": "VerticalScrollbar", - "position": [785, 0], - "bounds": [15, 600], - "contentsOpaque": true - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [785, 570, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/fixed-scroll-in-empty-root-layer-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/fixed-scroll-in-empty-root-layer-expected.txt deleted file mode 100644 index 23b8e3a..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/fixed-scroll-in-empty-root-layer-expected.txt +++ /dev/null
@@ -1,69 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [785, 2016], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV", - "bounds": [100, 100], - "contentsOpaque": true, - "backfaceVisibility": "hidden", - "backgroundColor": "#FF0000", - "transform": 2 - }, - { - "name": "LayoutBlockFlow HTML", - "position": [8, 8], - "bounds": [769, 2000], - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#008000", - "transform": 3 - }, - { - "name": "VerticalScrollbar", - "position": [785, 0], - "bounds": [15, 600], - "contentsOpaque": true - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [0, -200, 0, 1] - ] - }, - { - "id": 2, - "parent": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [0, 250, 0, 1] - ] - }, - { - "id": 3, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [0, 50, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/iframe-inside-squashed-layer-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/iframe-inside-squashed-layer-expected.txt deleted file mode 100644 index 865abe4..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/iframe-inside-squashed-layer-expected.txt +++ /dev/null
@@ -1,67 +0,0 @@ -{ - "layers": [ - { - "name": "LayoutView #document", - "bounds": [800, 600], - "drawsContent": false, - "backgroundColor": "#FFFFFF" - }, - { - "name": "Scrolling Layer", - "bounds": [785, 600], - "drawsContent": false - }, - { - "name": "Scrolling Contents Layer", - "bounds": [785, 1016], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "Squashing Containment Layer", - "drawsContent": false - }, - { - "name": "LayoutBlockFlow DIV id='foo'", - "bounds": [200, 1000], - "contentsOpaque": true, - "backgroundColor": "#D3D3D3", - "transform": 1 - }, - { - "name": "Squashing Layer (first squashed layer: LayoutBlockFlow (positioned) DIV)", - "position": [8, 0], - "bounds": [300, 654], - "paintInvalidations": [ - { - "object": "InlineTextBox 'test1'", - "rect": [8, 508, 29, 19], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'test1'", - "rect": [8, 508, 29, 19], - "reason": "disappeared" - }, - { - "object": "LayoutView #document", - "rect": [285, 500, 15, 150], - "reason": "chunk appeared" - } - ] - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 8, 0, 1] - ], - "flattenInheritedTransform": false - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/invalidate-paint-in-iframe-in-composited-layer-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/invalidate-paint-in-iframe-in-composited-layer-expected.txt deleted file mode 100644 index d30c35b1..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/invalidate-paint-in-iframe-in-composited-layer-expected.txt +++ /dev/null
@@ -1,37 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [785, 616], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow DIV", - "bounds": [304, 200], - "contentsOpaqueForText": true, - "invalidations": [ - [10, 10, 50, 50] - ], - "transform": 1 - }, - { - "name": "VerticalScrollbar", - "position": [785, 0], - "bounds": [15, 600], - "contentsOpaque": true - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 408, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/invalidate-when-leaving-squashed-layer-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/invalidate-when-leaving-squashed-layer-expected.txt deleted file mode 100644 index 32fdb29f..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/invalidate-when-leaving-squashed-layer-expected.txt +++ /dev/null
@@ -1,58 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV", - "bounds": [200, 200], - "contentsOpaque": true, - "backgroundColor": "#D3D3D3", - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV", - "position": [50, 50], - "bounds": [200, 200], - "contentsOpaque": true, - "backgroundColor": "#ADD8E6", - "invalidations": [ - [0, 0, 200, 200] - ] - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='target'", - "bounds": [200, 200], - "contentsOpaque": true, - "backgroundColor": "#ADD8E6", - "invalidations": [ - [0, 0, 200, 200] - ], - "transform": 2 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 8, 0, 1] - ] - }, - { - "id": 2, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [50, 50, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/invalidation-for-subpixel-offset-of-squashed-layer-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/invalidation-for-subpixel-offset-of-squashed-layer-expected.txt deleted file mode 100644 index a621f90..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/invalidation-for-subpixel-offset-of-squashed-layer-expected.txt +++ /dev/null
@@ -1,39 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV", - "bounds": [200, 200], - "contentsOpaque": true, - "backgroundColor": "#D3D3D3", - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV", - "position": [50, 50], - "bounds": [250, 250], - "contentsOpaqueForText": true, - "backgroundColor": "#FF0000", - "invalidations": [ - [50, 50, 200, 200] - ] - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 8, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/invalidations-on-composited-layers-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/invalidations-on-composited-layers-expected.txt deleted file mode 100644 index 20a3de06..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/invalidations-on-composited-layers-expected.txt +++ /dev/null
@@ -1,52 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow DIV id='parent'", - "bounds": [400, 400], - "contentsOpaque": true, - "backgroundColor": "#008000", - "invalidations": [ - [0, 0, 400, 400] - ], - "transform": 1 - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV id='child'", - "bounds": [75, 75], - "contentsOpaque": true, - "backgroundColor": "#0000FF", - "invalidations": [ - [0, 0, 75, 75] - ], - "transform": 2 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 8, 0, 1] - ] - }, - { - "id": 2, - "parent": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [50, 50, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/layer-repaint-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/layer-repaint-expected.png deleted file mode 100644 index 2dbfcc49..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/layer-repaint-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/layer-repaint-rects-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/layer-repaint-rects-expected.png deleted file mode 100644 index 2343e6d6..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/layer-repaint-rects-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/new-stacking-context-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/new-stacking-context-expected.txt deleted file mode 100644 index 75d8bddb..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/new-stacking-context-expected.txt +++ /dev/null
@@ -1,38 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow DIV", - "bounds": [100, 100], - "drawsContent": false, - "transform": 1 - }, - { - "name": "LayoutBlockFlow DIV id='target'", - "bounds": [200, 200], - "contentsOpaqueForText": true, - "backgroundColor": "#00800080", - "invalidations": [ - [0, 0, 200, 200] - ], - "transform": 1 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 8, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/opacity-from-zero-to-non-zero-composited-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/opacity-from-zero-to-non-zero-composited-expected.txt deleted file mode 100644 index 16bc6c8c..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/opacity-from-zero-to-non-zero-composited-expected.txt +++ /dev/null
@@ -1,29 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow DIV id='target'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#008000", - "transform": 1 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 8, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/overlap-test-with-filter-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/overlap-test-with-filter-expected.txt deleted file mode 100644 index 80dad651..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/overlap-test-with-filter-expected.txt +++ /dev/null
@@ -1,41 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutView #document", - "bounds": [300, 100], - "contentsOpaque": true, - "backgroundColor": "#FFFF00" - }, - { - "name": "LayoutBlockFlow BODY", - "bounds": [284, 84], - "contentsOpaqueForText": true, - "drawsContent": false, - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV", - "position": [151, 0], - "bounds": [300, 100], - "contentsOpaqueForText": true - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 8, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/pointer-events-composited-scrolling-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/pointer-events-composited-scrolling-expected.txt deleted file mode 100644 index cb26fea..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/pointer-events-composited-scrolling-expected.txt +++ /dev/null
@@ -1,31 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow DIV id='target'", - "bounds": [100, 100], - "contentsOpaqueForText": true, - "invalidations": [ - [0, 30, 50, 50] - ], - "transform": 1 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 8, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/remove-squashed-layer-plus-move-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/remove-squashed-layer-plus-move-expected.txt deleted file mode 100644 index 4e02dd3..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/remove-squashed-layer-plus-move-expected.txt +++ /dev/null
@@ -1,64 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [1418, 1008], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV", - "bounds": [1000, 1000], - "contentsOpaqueForText": true, - "drawsContent": false, - "transform": 1 - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV class='mv-tile'", - "position": [8, 8], - "bounds": [100, 50], - "contentsOpaque": true, - "backgroundColor": "#ADD8E6", - "invalidations": [ - [0, 0, 100, 50] - ] - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV class='mv-tile'", - "position": [8, 63], - "bounds": [1000, 50], - "contentsOpaqueForText": true, - "drawsContent": false - }, - { - "name": "HorizontalScrollbar", - "position": [0, 585], - "bounds": [785, 15], - "contentsOpaque": true - }, - { - "name": "VerticalScrollbar", - "position": [785, 0], - "bounds": [15, 585], - "contentsOpaque": true - }, - { - "name": "Scroll corner of LayoutView #document", - "position": [785, 585], - "bounds": [15, 15], - "contentsOpaque": true - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 8, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/repaint-overflow-scrolled-squashed-content-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/repaint-overflow-scrolled-squashed-content-expected.txt deleted file mode 100644 index 9c893c4..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/repaint-overflow-scrolled-squashed-content-expected.txt +++ /dev/null
@@ -1,39 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow DIV id='foo2'", - "bounds": [150, 1000], - "contentsOpaque": true, - "backgroundColor": "#ADD8E6", - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='foo'", - "bounds": [100, 1000], - "contentsOpaque": true, - "backgroundColor": "#FF0000", - "invalidations": [ - [0, 0, 100, 1000] - ], - "transform": 1 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 8, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/repaint-squashed-layer-in-rect-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/repaint-squashed-layer-in-rect-expected.txt deleted file mode 100644 index 20132f2..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/repaint-squashed-layer-in-rect-expected.txt +++ /dev/null
@@ -1,64 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [808, 816], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow DIV", - "bounds": [800, 800], - "contentsOpaque": true, - "backgroundColor": "#D3D3D3", - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV", - "position": [8, 0], - "bounds": [200, 200], - "contentsOpaqueForText": true, - "drawsContent": false - }, - { - "name": "LayoutBlockFlow (positioned) DIV", - "position": [400, 400], - "bounds": [200, 200], - "contentsOpaque": true, - "backgroundColor": "#ADD8E6", - "invalidations": [ - [0, 0, 200, 200] - ] - }, - { - "name": "HorizontalScrollbar", - "position": [0, 585], - "bounds": [785, 15], - "contentsOpaque": true - }, - { - "name": "VerticalScrollbar", - "position": [785, 0], - "bounds": [15, 585], - "contentsOpaque": true - }, - { - "name": "Scroll corner of LayoutView #document", - "position": [785, 585], - "bounds": [15, 15], - "contentsOpaque": true - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 8, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/repaint-via-layout-offset-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/repaint-via-layout-offset-expected.txt deleted file mode 100644 index 3a63430..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/repaint-via-layout-offset-expected.txt +++ /dev/null
@@ -1,39 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow DIV", - "bounds": [200, 200], - "contentsOpaque": true, - "backgroundColor": "#ADD8E6", - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) SPAN class='child'", - "position": [50, 50], - "bounds": [50, 50], - "contentsOpaque": true, - "backgroundColor": "#008000", - "invalidations": [ - [0, 0, 50, 50] - ] - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 8, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/requires-backing-repaint-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/requires-backing-repaint-expected.png deleted file mode 100644 index 503226b..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/requires-backing-repaint-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/resize-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/resize-repaint-expected.txt deleted file mode 100644 index 151a05b6..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/resize-repaint-expected.txt +++ /dev/null
@@ -1,31 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow DIV id='resizing'", - "bounds": [402, 207], - "contentsOpaqueForText": true, - "invalidations": [ - [0, 0, 402, 207] - ], - "transform": 1 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 8, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/resize-squashing-layer-that-needs-full-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/resize-squashing-layer-that-needs-full-repaint-expected.txt deleted file mode 100644 index 2bbc9ad..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/resize-squashing-layer-that-needs-full-repaint-expected.txt +++ /dev/null
@@ -1,36 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow DIV", - "bounds": [500, 500], - "contentsOpaqueForText": true, - "drawsContent": false, - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV", - "position": [55, 55], - "bounds": [500, 500], - "contentsOpaque": true, - "backgroundColor": "#ADD8E6" - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 8, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/scroll-fixed-layer-no-content-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/scroll-fixed-layer-no-content-expected.txt deleted file mode 100644 index a7eebf0..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/scroll-fixed-layer-no-content-expected.txt +++ /dev/null
@@ -1,45 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [785, 2016], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV", - "bounds": [200, 200], - "contentsOpaqueForText": true, - "drawsContent": false, - "transform": 2 - }, - { - "name": "VerticalScrollbar", - "position": [785, 0], - "bounds": [15, 600], - "contentsOpaque": true - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [0, -100, 0, 1] - ] - }, - { - "id": 2, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [100, 100, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/scroll-fixed-squahed-layer-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/scroll-fixed-squahed-layer-expected.txt deleted file mode 100644 index c7c7f5bd..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/scroll-fixed-squahed-layer-expected.txt +++ /dev/null
@@ -1,61 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [785, 2016], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='main'", - "bounds": [200, 200], - "contentsOpaque": true, - "backgroundColor": "#ADD8E6", - "transform": 2 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='squahed'", - "bounds": [200, 200], - "contentsOpaque": true, - "backgroundColor": "#90EE90", - "transform": 3 - }, - { - "name": "VerticalScrollbar", - "position": [785, 0], - "bounds": [15, 600], - "contentsOpaque": true - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [0, -100, 0, 1] - ] - }, - { - "id": 2, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [100, 100, 0, 1] - ] - }, - { - "id": 3, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [100, 150, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/scrolling-neg-z-index-descendants-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/scrolling-neg-z-index-descendants-expected.txt deleted file mode 100644 index 94b53caa..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/scrolling-neg-z-index-descendants-expected.txt +++ /dev/null
@@ -1,62 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV id='neg-z'", - "position": [1, 11], - "bounds": [100, 410], - "contentsOpaqueForText": true, - "backfaceVisibility": "hidden", - "transform": 2 - }, - { - "name": "LayoutBlockFlow HTML", - "position": [8, 8], - "bounds": [784, 302], - "contentsOpaqueForText": true, - "drawsContent": false - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV id='container'", - "bounds": [102, 302], - "contentsOpaqueForText": true, - "backfaceVisibility": "hidden", - "transform": 1 - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV id='container'", - "position": [1, 1], - "bounds": [100, 300], - "drawsContent": false, - "backfaceVisibility": "hidden", - "transform": 1 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 8, 0, 1] - ] - }, - { - "id": 2, - "parent": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [0, -100, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/scrolling-without-painting-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/scrolling-without-painting-expected.txt deleted file mode 100644 index 9f24a44b..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/scrolling-without-painting-expected.txt +++ /dev/null
@@ -1,61 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow DIV id='scroller'", - "position": [1, 1], - "bounds": [185, 185], - "drawsContent": false, - "transform": 1 - }, - { - "name": "HorizontalScrollbar", - "position": [1, 186], - "bounds": [200, 15], - "contentsOpaqueForText": true, - "transform": 1 - }, - { - "name": "VerticalScrollbar", - "position": [186, 1], - "bounds": [15, 185], - "contentsOpaque": true, - "transform": 1 - }, - { - "name": "LayoutBlockFlow DIV id='scroller'", - "position": [1, 26], - "bounds": [185, 1000], - "contentsOpaqueForText": true, - "drawsContent": false, - "transform": 2 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 8, 0, 1] - ] - }, - { - "id": 2, - "parent": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [0, -25, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/should-invoke-deferred-compositing-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/should-invoke-deferred-compositing-expected.txt deleted file mode 100644 index 21a64ff..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/should-invoke-deferred-compositing-expected.txt +++ /dev/null
@@ -1,21 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='container' class='composited box'", - "bounds": [300, 300], - "contentsOpaqueForText": true, - "drawsContent": false - }, - { - "name": "LayoutHTMLCanvas (positioned) CANVAS", - "bounds": [200, 200] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/should-not-clip-composited-overflow-scrolling-layer-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/should-not-clip-composited-overflow-scrolling-layer-expected.txt deleted file mode 100644 index bc0bdbf..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/should-not-clip-composited-overflow-scrolling-layer-expected.txt +++ /dev/null
@@ -1,69 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow DIV id='container'", - "bounds": [385, 285], - "drawsContent": false, - "transform": 1 - }, - { - "name": "HorizontalScrollbar", - "position": [0, 285], - "bounds": [385, 15], - "contentsOpaque": true, - "transform": 1 - }, - { - "name": "VerticalScrollbar", - "position": [385, 0], - "bounds": [15, 285], - "contentsOpaque": true, - "transform": 1 - }, - { - "name": "Scroll corner of LayoutBlockFlow DIV id='container'", - "position": [385, 285], - "bounds": [15, 15], - "contentsOpaque": true, - "transform": 1 - }, - { - "name": "LayoutBlockFlow DIV id='container'", - "bounds": [1000, 1000], - "contentsOpaque": true, - "backgroundColor": "#008000", - "invalidations": [ - [0, 0, 1000, 1000] - ], - "transform": 2 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 8, 0, 1] - ] - }, - { - "id": 2, - "parent": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [-500, -400, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/should-not-paint-outline-on-foreground-layer-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/should-not-paint-outline-on-foreground-layer-expected.txt deleted file mode 100644 index 51fc9720..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/should-not-paint-outline-on-foreground-layer-expected.txt +++ /dev/null
@@ -1,85 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow DIV id='container'", - "bounds": [300, 300], - "contentsOpaqueForText": true, - "drawsContent": false, - "transform": 1 - }, - { - "name": "LayoutBlockFlow DIV id='container'", - "bounds": [285, 285], - "drawsContent": false, - "transform": 1 - }, - { - "name": "HorizontalScrollbar", - "position": [0, 285], - "bounds": [285, 15], - "contentsOpaque": true, - "transform": 1 - }, - { - "name": "VerticalScrollbar", - "position": [285, 0], - "bounds": [15, 285], - "contentsOpaque": true, - "transform": 1 - }, - { - "name": "Scroll corner of LayoutBlockFlow DIV id='container'", - "position": [285, 285], - "bounds": [15, 15], - "contentsOpaque": true, - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#FF0000", - "transform": 2 - }, - { - "name": "LayoutBlockFlow DIV id='container'", - "bounds": [3000, 3000], - "transform": 2 - }, - { - "name": "LayoutBlockFlow DIV id='container'", - "position": [-10, -10], - "bounds": [320, 320], - "contentsOpaqueForText": true, - "transform": 1 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 8, 0, 1] - ] - }, - { - "id": 2, - "parent": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [0, -400, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/should-not-repaint-composited-descendants-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/should-not-repaint-composited-descendants-expected.txt deleted file mode 100644 index 1a202ea..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/should-not-repaint-composited-descendants-expected.txt +++ /dev/null
@@ -1,50 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='composited-box'", - "position": [30, 30], - "bounds": [20, 70], - "contentsOpaque": true, - "backgroundColor": "#008000", - "invalidations": [ - [0, 0, 20, 70] - ], - "transform": 1 - }, - { - "name": "LayoutBlockFlow DIV class='composited child'", - "bounds": [50, 50], - "contentsOpaque": true, - "backgroundColor": "#008000", - "transform": 2 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 8, 0, 1] - ] - }, - { - "id": 2, - "parent": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [0, 50, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/should-not-repaint-composited-descendants-on-overflow-change-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/should-not-repaint-composited-descendants-on-overflow-change-expected.txt deleted file mode 100644 index aac3753..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/should-not-repaint-composited-descendants-on-overflow-change-expected.txt +++ /dev/null
@@ -1,67 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow DIV class='composited-child'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#008000" - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV class='composited-child overflow-child'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#008000", - "transform": 1 - }, - { - "name": "LayoutBlockFlow DIV class='composited-child'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#008000", - "transform": 2 - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV class='composited-child overflow-child'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#008000", - "transform": 3 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [150, 150, 0, 1] - ] - }, - { - "id": 2, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [0, 200, 0, 1] - ] - }, - { - "id": 3, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [150, 350, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/should-not-repaint-composited-filter-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/should-not-repaint-composited-filter-expected.txt deleted file mode 100644 index 2411e0d..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/should-not-repaint-composited-filter-expected.txt +++ /dev/null
@@ -1,29 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow DIV id='composited-box'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#008000", - "transform": 1 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 8, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/should-not-repaint-composited-opacity-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/should-not-repaint-composited-opacity-expected.txt deleted file mode 100644 index 2411e0d..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/should-not-repaint-composited-opacity-expected.txt +++ /dev/null
@@ -1,29 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow DIV id='composited-box'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#008000", - "transform": 1 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 8, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/should-not-repaint-composited-transform-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/should-not-repaint-composited-transform-expected.txt deleted file mode 100644 index 9c82620..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/should-not-repaint-composited-transform-expected.txt +++ /dev/null
@@ -1,38 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow DIV id='composited-box'", - "bounds": [102, 102], - "contentsOpaqueForText": true, - "transform": 2 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 8, 0, 1] - ] - }, - { - "id": 2, - "parent": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [100, 100, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/should-not-repaint-composited-z-index-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/should-not-repaint-composited-z-index-expected.txt deleted file mode 100644 index 8555bd26..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/should-not-repaint-composited-z-index-expected.txt +++ /dev/null
@@ -1,30 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow DIV id='composited-box'", - "bounds": [100, 100], - "contentsOpaque": true, - "backfaceVisibility": "hidden", - "backgroundColor": "#008000", - "transform": 1 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 8, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/should-not-repaint-move-backface-hidden-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/should-not-repaint-move-backface-hidden-expected.txt deleted file mode 100644 index 728ce86a..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/should-not-repaint-move-backface-hidden-expected.txt +++ /dev/null
@@ -1,30 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='target'", - "bounds": [100, 100], - "contentsOpaque": true, - "backfaceVisibility": "hidden", - "backgroundColor": "#008000", - "transform": 1 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [100, 200, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/should-not-repaint-scrolling-contents-outline-change-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/should-not-repaint-scrolling-contents-outline-change-expected.txt deleted file mode 100644 index 7376932..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/should-not-repaint-scrolling-contents-outline-change-expected.txt +++ /dev/null
@@ -1,66 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow DIV id='target'", - "bounds": [200, 200], - "contentsOpaqueForText": true, - "drawsContent": false, - "transform": 1 - }, - { - "name": "LayoutBlockFlow DIV id='target'", - "bounds": [185, 185], - "drawsContent": false, - "transform": 1 - }, - { - "name": "HorizontalScrollbar", - "position": [0, 185], - "bounds": [200, 15], - "contentsOpaqueForText": true, - "transform": 1 - }, - { - "name": "VerticalScrollbar", - "position": [185, 0], - "bounds": [15, 185], - "contentsOpaque": true, - "transform": 1 - }, - { - "name": "LayoutBlockFlow DIV id='target'", - "bounds": [185, 2000], - "contentsOpaque": true, - "backgroundColor": "#0000FF", - "transform": 1 - }, - { - "name": "LayoutBlockFlow DIV id='target'", - "position": [-10, -10], - "bounds": [220, 220], - "contentsOpaqueForText": true, - "invalidations": [ - [0, 0, 220, 220] - ], - "transform": 1 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 8, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/squash-partial-repaint-inside-squashed-layer-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/squash-partial-repaint-inside-squashed-layer-expected.txt deleted file mode 100644 index b0bd767..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/squash-partial-repaint-inside-squashed-layer-expected.txt +++ /dev/null
@@ -1,45 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='composited box behind'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#0000FF", - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='box middle'", - "position": [180, 180], - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#00FF00" - }, - { - "name": "LayoutImage (positioned) IMG id='repaintdiv' class='repaintdiv'", - "position": [260, 260], - "bounds": [182, 120], - "contentsOpaqueForText": true, - "invalidations": [ - [0, 0, 182, 29] - ] - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [100, 100, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/squashing-inside-preserve-3d-element-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/squashing-inside-preserve-3d-element-expected.txt deleted file mode 100644 index b1a2d8d..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/squashing-inside-preserve-3d-element-expected.txt +++ /dev/null
@@ -1,64 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow DIV", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#D3D3D3", - "transform": 3 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='target'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#FF0000", - "invalidations": [ - [0, 0, 100, 100] - ], - "transform": 4 - } - ], - "transforms": [ - { - "id": 1, - "renderingContext": 1 - }, - { - "id": 2, - "parent": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 8, 0, 1] - ], - "flattenInheritedTransform": false, - "renderingContext": 1 - }, - { - "id": 3, - "parent": 2, - "flattenInheritedTransform": false, - "renderingContext": 1 - }, - { - "id": 4, - "parent": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [28, 28, 0, 1] - ], - "flattenInheritedTransform": false, - "renderingContext": 1 - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/subpixel-offset-scaled-will-change-transform-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/subpixel-offset-scaled-will-change-transform-expected.txt deleted file mode 100644 index 3ef38a8..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/subpixel-offset-scaled-will-change-transform-expected.txt +++ /dev/null
@@ -1,175 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV id='child1' class='child composited'", - "bounds": [1, 1], - "contentsOpaque": true, - "backgroundColor": "#0000FF", - "transform": 2 - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV id='child2' class='child scale composited'", - "bounds": [1, 1], - "contentsOpaque": true, - "backgroundColor": "#0000FF", - "transform": 4 - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV id='child3' class='child'", - "bounds": [1, 1], - "contentsOpaque": true, - "backgroundColor": "#0000FF", - "transform": 6 - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV id='child4' class='child scale'", - "bounds": [1, 1], - "contentsOpaque": true, - "backgroundColor": "#0000FF", - "transform": 8 - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV id='child5' class='child composited'", - "bounds": [1, 1], - "contentsOpaque": true, - "backgroundColor": "#0000FF", - "transform": 10 - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV id='child6' class='child scale composited'", - "bounds": [1, 1], - "contentsOpaque": true, - "backgroundColor": "#0000FF", - "transform": 12 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 8, 0, 1] - ] - }, - { - "id": 2, - "parent": 1, - "transform": [ - [40, 0, 0, 0], - [0, 40, 0, 0], - [0, 0, 1, 0], - [0, 0, 0, 1] - ], - "origin": [0, 0] - }, - { - "id": 3, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [9, 58, 0, 1] - ] - }, - { - "id": 4, - "parent": 3, - "transform": [ - [40, 0, 0, 0], - [0, 40, 0, 0], - [0, 0, 1, 0], - [0, 0, 0, 1] - ], - "origin": [0, 0] - }, - { - "id": 5, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 108, 0, 1] - ] - }, - { - "id": 6, - "parent": 5, - "transform": [ - [40, 0, 0, 0], - [0, 40, 0, 0], - [0, 0, 1, 0], - [0, 0, 0, 1] - ], - "origin": [0, 0] - }, - { - "id": 7, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 158, 0, 1] - ] - }, - { - "id": 8, - "parent": 7, - "transform": [ - [40, 0, 0, 0], - [0, 40, 0, 0], - [0, 0, 1, 0], - [0, 0, 0, 1] - ], - "origin": [0, 0] - }, - { - "id": 9, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 208, 0, 1] - ] - }, - { - "id": 10, - "parent": 9, - "transform": [ - [40, 0, 0, 0], - [0, 40, 0, 0], - [0, 0, 1, 0], - [0, 0, 0, 1] - ], - "origin": [0, 0] - }, - { - "id": 11, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 258, 0, 1] - ] - }, - { - "id": 12, - "parent": 11, - "transform": [ - [40, 0, 0, 0], - [0, 40, 0, 0], - [0, 0, 1, 0], - [0, 0, 0, 1] - ], - "origin": [0, 0] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/text-color-change-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/text-color-change-expected.txt deleted file mode 100644 index 7ef1e13..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/text-color-change-expected.txt +++ /dev/null
@@ -1,25 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "invalidations": [ - [8, 221, 48, 16], - [8, 205, 48, 16], - [8, 189, 48, 16], - [8, 173, 48, 16], - [8, 157, 48, 16], - [8, 141, 48, 16], - [8, 125, 48, 16], - [8, 109, 48, 16], - [8, 93, 48, 16], - [8, 77, 48, 16], - [8, 61, 48, 16], - [8, 237, 48, 9] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/text-match-highlight-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/text-match-highlight-expected.png deleted file mode 100644 index f472b9a..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/text-match-highlight-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/tricky-element-removal-crash-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/tricky-element-removal-crash-expected.txt deleted file mode 100644 index 0eae288..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/tricky-element-removal-crash-expected.txt +++ /dev/null
@@ -1,36 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow DIV", - "bounds": [200, 200], - "contentsOpaque": true, - "backgroundColor": "#FA8072", - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV", - "position": [8, 8], - "bounds": [100, 100], - "contentsOpaqueForText": true, - "drawsContent": false - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 8, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/updating-scrolling-content-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/updating-scrolling-content-expected.txt deleted file mode 100644 index 14e9cc35..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/compositing/updating-scrolling-content-expected.txt +++ /dev/null
@@ -1,51 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow DIV id='scroller'", - "bounds": [185, 185], - "drawsContent": false, - "transform": 1 - }, - { - "name": "HorizontalScrollbar", - "position": [0, 185], - "bounds": [200, 15], - "contentsOpaqueForText": true, - "transform": 1 - }, - { - "name": "VerticalScrollbar", - "position": [185, 0], - "bounds": [15, 185], - "contentsOpaque": true, - "transform": 1 - }, - { - "name": "LayoutBlockFlow DIV id='scroller'", - "bounds": [185, 1200], - "contentsOpaqueForText": true, - "invalidations": [ - [0, 0, 185, 200] - ], - "transform": 1 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 8, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/delete-into-nested-block-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/delete-into-nested-block-expected.txt deleted file mode 100644 index 0a6904ad..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/delete-into-nested-block-expected.txt +++ /dev/null
@@ -1,32 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "invalidations": [ - [6, 125, 788, 104] - ] - }, - { - "name": "Caret", - "position": [8, 127], - "bounds": [1, 19], - "contentsOpaque": true, - "invalidations": [ - [0, 0, 1, 19] - ] - }, - { - "name": "LayoutBlockFlow DIV", - "position": [6, 125], - "bounds": [788, 104], - "contentsOpaqueForText": true, - "invalidations": [ - [0, 0, 788, 104] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/filters/filter-invalidation-positioned-child-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/filters/filter-invalidation-positioned-child-expected.txt deleted file mode 100644 index 08b98ba0..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/filters/filter-invalidation-positioned-child-expected.txt +++ /dev/null
@@ -1,25 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow DIV id='box'", - "position": [8, 8], - "bounds": [90, 90], - "contentsOpaque": true, - "backgroundColor": "#008000" - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='positioned'", - "position": [108, 108], - "bounds": [50, 50], - "contentsOpaque": true, - "backgroundColor": "#0000FF" - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/filters/filter-invalidation-with-composited-container-change-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/filters/filter-invalidation-with-composited-container-change-expected.txt deleted file mode 100644 index a7c5d9eb..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/filters/filter-invalidation-with-composited-container-change-expected.txt +++ /dev/null
@@ -1,35 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "invalidations": [ - [8, 8, 330, 330] - ] - }, - { - "name": "LayoutBlockFlow DIV id='box' class='green box blurry'", - "bounds": [200, 200], - "contentsOpaque": true, - "backgroundColor": "#008000", - "invalidations": [ - [0, 0, 200, 200] - ], - "transform": 1 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 8, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/filters/filter-on-html-element-with-fixed-position-child-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/filters/filter-on-html-element-with-fixed-position-child-expected.txt deleted file mode 100644 index 9c9ea47a..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/filters/filter-on-html-element-with-fixed-position-child-expected.txt +++ /dev/null
@@ -1,67 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [785, 10016], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "transform": 1 - }, - { - "name": "Scrolling background of LayoutView #document", - "bounds": [785, 10016], - "contentsOpaqueForText": true, - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#D3D3D3", - "transform": 2 - }, - { - "name": "LayoutBlockFlow (positioned) DIV", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#D3D3D3", - "transform": 3 - }, - { - "name": "VerticalScrollbar", - "position": [785, 0], - "bounds": [15, 600], - "contentsOpaque": true - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [0, -10, 0, 1] - ] - }, - { - "id": 2, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 8, 0, 1] - ] - }, - { - "id": 3, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [100, 100, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/filters/filter-repaint-accelerated-child-with-filter-child-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/filters/filter-repaint-accelerated-child-with-filter-child-expected.txt deleted file mode 100644 index 97f04532..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/filters/filter-repaint-accelerated-child-with-filter-child-expected.txt +++ /dev/null
@@ -1,38 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow DIV class='blur'", - "position": [8, 8], - "bounds": [200, 200], - "contentsOpaqueForText": true - }, - { - "name": "LayoutBlockFlow DIV class='accelerated'", - "position": [-14, -14], - "bounds": [214, 260], - "contentsOpaqueForText": true, - "invalidations": [ - [0, 0, 214, 260] - ], - "transform": 1 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 8, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/filters/filter-repaint-accelerated-on-accelerated-filter-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/filters/filter-repaint-accelerated-on-accelerated-filter-expected.txt deleted file mode 100644 index d0fa7f8..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/filters/filter-repaint-accelerated-on-accelerated-filter-expected.txt +++ /dev/null
@@ -1,38 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow DIV class='blur accelerated'", - "bounds": [200, 200], - "contentsOpaqueForText": true, - "transform": 1 - }, - { - "name": "LayoutBlockFlow DIV id='resize' class='drop-shadow accelerated'", - "bounds": [100, 200], - "contentsOpaque": true, - "backgroundColor": "#008000", - "invalidations": [ - [0, 0, 100, 200] - ], - "transform": 1 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 8, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/filters/filter-repaint-on-accelerated-layer-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/filters/filter-repaint-on-accelerated-layer-expected.txt deleted file mode 100644 index 93af650b..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/filters/filter-repaint-on-accelerated-layer-expected.txt +++ /dev/null
@@ -1,35 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow DIV class='blur'", - "position": [8, 8], - "bounds": [200, 200], - "contentsOpaqueForText": true - }, - { - "name": "LayoutBlockFlow DIV id='resize' class='accelerated'", - "bounds": [100, 200], - "contentsOpaque": true, - "backgroundColor": "#008000", - "transform": 1 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 8, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/flexbox/repaint-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/flexbox/repaint-expected.txt deleted file mode 100644 index ea4863c2..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/flexbox/repaint-expected.txt +++ /dev/null
@@ -1,23 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "invalidations": [ - [139, 128, 653, 100], - [138, 168, 636, 19], - [138, 128, 636, 19], - [138, 188, 627, 19], - [138, 148, 620, 19], - [138, 208, 573, 19], - [400, 128, 392, 180], - [8, 228, 392, 80], - [148, 128, 252, 180], - [8, 128, 140, 100] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/flexbox/repaint-on-layout-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/flexbox/repaint-on-layout-expected.txt deleted file mode 100644 index aa4bba7..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/flexbox/repaint-on-layout-expected.txt +++ /dev/null
@@ -1,21 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "invalidations": [ - [712, 8, 80, 20] - ] - }, - { - "name": "LayoutFlexibleBox (positioned) NAV class='nav-bar'", - "position": [8, 0], - "bounds": [200, 600], - "contentsOpaque": true, - "backgroundColor": "#008000" - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/float-offscreen-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/float-offscreen-expected.txt deleted file mode 100644 index 088156b9..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/float-offscreen-expected.txt +++ /dev/null
@@ -1,23 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV id='target'", - "rect": [11, 11, 85, 22], - "reason": "chunk appeared" - }, - { - "object": "LayoutBlockFlow DIV id='target'", - "rect": [11, 11, 85, 22], - "reason": "chunk disappeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/forms/textarea-caret-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/forms/textarea-caret-expected.txt deleted file mode 100644 index 13d03cb..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/forms/textarea-caret-expected.txt +++ /dev/null
@@ -1,55 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "invalidations": [ - [7, 7, 183, 40] - ] - }, - { - "name": "Caret", - "position": [482, 3], - "bounds": [1, 16], - "contentsOpaque": true, - "invalidations": [ - [0, 0, 1, 16] - ], - "transform": 2 - }, - { - "name": "LayoutTextControl TEXTAREA id='editor'", - "position": [-1, -1], - "bounds": [183, 40], - "contentsOpaqueForText": true, - "invalidations": [ - [0, 0, 183, 40] - ], - "transform": 1 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 8, 0, 1] - ] - }, - { - "id": 2, - "parent": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [-303, 0, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/gradients-em-stops-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/gradients-em-stops-repaint-expected.txt deleted file mode 100644 index 9b4d39e..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/gradients-em-stops-repaint-expected.txt +++ /dev/null
@@ -1,16 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "invalidations": [ - [344, 18, 302, 122], - [18, 18, 302, 122], - [330, 135, 4, 19] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/image/canvas-composite-repaint-by-all-imagesource-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/image/canvas-composite-repaint-by-all-imagesource-expected.txt deleted file mode 100644 index b214fbd..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/image/canvas-composite-repaint-by-all-imagesource-expected.txt +++ /dev/null
@@ -1,86 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [785, 933], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "invalidations": [ - [570, 564, 132, 42], - [570, 514, 132, 42], - [570, 464, 132, 42], - [570, 414, 132, 42], - [570, 364, 132, 42], - [570, 314, 132, 42], - [570, 264, 132, 42], - [570, 214, 132, 42], - [570, 164, 132, 42], - [570, 114, 132, 42], - [570, 64, 132, 42], - [428, 564, 132, 42], - [428, 514, 132, 42], - [428, 464, 132, 42], - [428, 414, 132, 42], - [428, 364, 132, 42], - [428, 314, 132, 42], - [428, 264, 132, 42], - [428, 214, 132, 42], - [428, 164, 132, 42], - [428, 114, 132, 42], - [428, 64, 132, 42], - [286, 564, 132, 42], - [286, 514, 132, 42], - [286, 464, 132, 42], - [286, 414, 132, 42], - [286, 364, 132, 42], - [286, 314, 132, 42], - [286, 264, 132, 42], - [286, 214, 132, 42], - [286, 164, 132, 42], - [286, 114, 132, 42], - [286, 64, 132, 42], - [144, 564, 132, 42], - [144, 514, 132, 42], - [144, 464, 132, 42], - [144, 414, 132, 42], - [144, 364, 132, 42], - [144, 314, 132, 42], - [144, 264, 132, 42], - [144, 214, 132, 42], - [144, 164, 132, 42], - [144, 114, 132, 42], - [144, 64, 132, 42] - ] - }, - { - "name": "LayoutVideo VIDEO id='video'", - "bounds": [150, 60], - "transform": 1 - }, - { - "name": "LayoutFlexibleBox DIV class='sizing-small phase-pre-ready state-no-source'", - "bounds": [150, 60], - "contentsOpaqueForText": true, - "drawsContent": false, - "transform": 1 - }, - { - "name": "VerticalScrollbar", - "position": [785, 0], - "bounds": [15, 600], - "contentsOpaque": true - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [15, 859, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/inline-reflow-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/inline-reflow-expected.txt deleted file mode 100644 index 65f83169..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/inline-reflow-expected.txt +++ /dev/null
@@ -1,29 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "invalidations": [ - [0, 120, 300, 20], - [0, 0, 300, 20], - [0, 160, 280, 20], - [0, 140, 280, 20], - [0, 80, 280, 20], - [0, 40, 260, 20], - [0, 20, 260, 20], - [0, 100, 240, 20], - [0, 60, 220, 20], - [0, 260, 200, 20], - [0, 240, 200, 20], - [0, 200, 200, 20], - [0, 300, 180, 20], - [0, 220, 160, 20], - [0, 280, 140, 20], - [0, 180, 100, 20] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/invalidation-on-foreground-graphics-layer-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/invalidation-on-foreground-graphics-layer-expected.txt deleted file mode 100644 index 300680a..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/invalidation-on-foreground-graphics-layer-expected.txt +++ /dev/null
@@ -1,81 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow DIV", - "bounds": [200, 200], - "contentsOpaqueForText": true, - "drawsContent": false, - "transform": 1 - }, - { - "name": "LayoutBlockFlow DIV", - "bounds": [185, 185], - "drawsContent": false, - "transform": 1 - }, - { - "name": "HorizontalScrollbar", - "position": [0, 185], - "bounds": [185, 15], - "contentsOpaque": true, - "transform": 1 - }, - { - "name": "VerticalScrollbar", - "position": [185, 0], - "bounds": [15, 185], - "contentsOpaque": true, - "transform": 1 - }, - { - "name": "Scroll corner of LayoutBlockFlow DIV", - "position": [185, 185], - "bounds": [15, 15], - "contentsOpaque": true, - "transform": 1 - }, - { - "name": "LayoutBlockFlow DIV", - "bounds": [300, 300], - "contentsOpaque": true, - "backgroundColor": "#D3D3D3", - "transform": 1 - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV", - "bounds": [200, 200], - "contentsOpaque": true, - "backgroundColor": "#ADD8E6", - "transform": 1 - }, - { - "name": "LayoutBlockFlow DIV", - "position": [100, 100], - "bounds": [200, 200], - "contentsOpaque": true, - "backgroundColor": "#008000", - "invalidations": [ - [0, 0, 200, 200] - ], - "transform": 1 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 8, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/invalidations-in-iframe-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/invalidations-in-iframe-expected.txt deleted file mode 100644 index f5c343515..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/invalidations-in-iframe-expected.txt +++ /dev/null
@@ -1,45 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "invalidations": [ - [8, 158, 200, 200] - ] - }, - { - "name": "LayoutBlockFlow DIV", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#8888FF", - "invalidations": [ - [0, 0, 100, 100] - ], - "transform": 2 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 8, 0, 1] - ] - }, - { - "id": 2, - "parent": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 8, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/line-flow-with-floats-1-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/line-flow-with-floats-1-expected.png deleted file mode 100644 index cf37799..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/line-flow-with-floats-1-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/line-flow-with-floats-1-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/line-flow-with-floats-1-expected.txt deleted file mode 100644 index 5b79c7e..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/line-flow-with-floats-1-expected.txt +++ /dev/null
@@ -1,25 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "invalidations": [ - [14, 80, 354, 19], - [39, 100, 329, 19], - [55, 120, 313, 19], - [120, 140, 248, 19], - [190, 160, 230, 19], - [14, 180, 224, 19], - [172, 160, 196, 19], - [14, 160, 176, 19], - [14, 140, 106, 19], - [378, 138, 70, 30], - [14, 120, 41, 19], - [14, 100, 25, 19] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/line-flow-with-floats-10-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/line-flow-with-floats-10-expected.png deleted file mode 100644 index 96b632b..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/line-flow-with-floats-10-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/line-flow-with-floats-10-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/line-flow-with-floats-10-expected.txt deleted file mode 100644 index 8d8b9d3..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/line-flow-with-floats-10-expected.txt +++ /dev/null
@@ -1,49 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "invalidations": [ - [14, 540, 407, 19], - [14, 560, 406, 19], - [14, 520, 387, 19], - [14, 480, 354, 19], - [89, 580, 331, 19], - [65, 360, 306, 19], - [65, 400, 304, 19], - [14, 340, 292, 19], - [14, 320, 264, 19], - [14, 260, 259, 19], - [14, 300, 256, 19], - [56, 460, 255, 19], - [14, 280, 252, 19], - [128, 420, 241, 19], - [14, 460, 226, 19], - [14, 500, 219, 19], - [243, 240, 177, 19], - [14, 440, 172, 19], - [65, 440, 171, 19], - [266, 280, 154, 19], - [270, 300, 150, 19], - [273, 260, 147, 19], - [278, 320, 142, 19], - [240, 460, 128, 19], - [186, 440, 116, 19], - [235, 440, 115, 19], - [306, 340, 114, 19], - [65, 380, 89, 19], - [14, 580, 75, 19], - [302, 440, 66, 19], - [65, 420, 64, 19], - [370, 360, 51, 19], - [14, 374, 48, 64], - [14, 363, 48, 64], - [401, 520, 20, 19], - [349, 440, 20, 19] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/line-flow-with-floats-2-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/line-flow-with-floats-2-expected.png deleted file mode 100644 index 2ffd7d96..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/line-flow-with-floats-2-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/line-flow-with-floats-3-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/line-flow-with-floats-3-expected.png deleted file mode 100644 index bf339f8..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/line-flow-with-floats-3-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/line-flow-with-floats-3-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/line-flow-with-floats-3-expected.txt deleted file mode 100644 index b7a90cc..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/line-flow-with-floats-3-expected.txt +++ /dev/null
@@ -1,51 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "invalidations": [ - [14, 540, 407, 19], - [14, 560, 406, 19], - [14, 520, 387, 19], - [89, 580, 331, 19], - [65, 360, 306, 19], - [65, 400, 304, 19], - [14, 340, 292, 19], - [65, 420, 288, 19], - [14, 480, 288, 19], - [14, 320, 264, 19], - [14, 260, 259, 19], - [14, 300, 256, 19], - [14, 280, 252, 19], - [128, 420, 241, 19], - [14, 460, 226, 19], - [243, 240, 177, 19], - [14, 440, 172, 19], - [266, 280, 154, 19], - [14, 500, 151, 19], - [270, 300, 150, 19], - [273, 260, 147, 19], - [278, 320, 142, 19], - [215, 460, 137, 19], - [240, 460, 128, 19], - [186, 440, 116, 19], - [306, 340, 114, 19], - [133, 440, 109, 19], - [65, 380, 89, 19], - [14, 580, 75, 19], - [302, 480, 66, 19], - [302, 440, 66, 19], - [287, 480, 65, 19], - [242, 440, 65, 19], - [356, 423, 64, 80], - [362, 400, 58, 19], - [370, 360, 51, 19], - [372, 403, 48, 80], - [401, 520, 20, 19] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/line-flow-with-floats-4-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/line-flow-with-floats-4-expected.png deleted file mode 100644 index 82f45cb9..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/line-flow-with-floats-4-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/line-flow-with-floats-4-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/line-flow-with-floats-4-expected.txt deleted file mode 100644 index 69ee845..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/line-flow-with-floats-4-expected.txt +++ /dev/null
@@ -1,45 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "invalidations": [ - [14, 540, 407, 19], - [14, 560, 406, 19], - [14, 520, 387, 19], - [89, 580, 331, 19], - [65, 360, 306, 19], - [65, 400, 304, 19], - [14, 340, 292, 19], - [14, 480, 288, 19], - [14, 320, 264, 19], - [14, 260, 259, 19], - [14, 300, 256, 19], - [14, 280, 252, 19], - [128, 420, 241, 19], - [14, 460, 226, 19], - [243, 240, 177, 19], - [14, 440, 172, 19], - [266, 280, 154, 19], - [14, 500, 151, 19], - [270, 300, 150, 19], - [273, 260, 147, 19], - [278, 320, 142, 19], - [282, 480, 138, 19], - [240, 460, 128, 19], - [186, 440, 116, 19], - [306, 340, 114, 19], - [65, 380, 89, 19], - [14, 580, 75, 19], - [302, 440, 66, 19], - [65, 420, 64, 19], - [370, 360, 51, 19], - [372, 403, 48, 80], - [401, 520, 20, 19] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/line-flow-with-floats-5-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/line-flow-with-floats-5-expected.png deleted file mode 100644 index 37dff7e..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/line-flow-with-floats-5-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/line-flow-with-floats-5-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/line-flow-with-floats-5-expected.txt deleted file mode 100644 index 50214af4..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/line-flow-with-floats-5-expected.txt +++ /dev/null
@@ -1,51 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "invalidations": [ - [14, 540, 407, 19], - [14, 560, 406, 19], - [14, 520, 387, 19], - [89, 580, 331, 19], - [49, 360, 322, 19], - [65, 400, 304, 19], - [49, 400, 302, 19], - [14, 340, 292, 19], - [14, 480, 288, 19], - [88, 420, 281, 19], - [14, 320, 264, 19], - [14, 260, 259, 19], - [14, 300, 256, 19], - [14, 280, 252, 19], - [14, 460, 226, 19], - [181, 460, 187, 19], - [243, 240, 177, 19], - [14, 440, 172, 19], - [266, 280, 154, 19], - [14, 500, 151, 19], - [270, 300, 150, 19], - [273, 260, 147, 19], - [278, 320, 142, 19], - [229, 480, 139, 19], - [186, 440, 116, 19], - [306, 340, 114, 19], - [134, 440, 111, 19], - [65, 380, 89, 19], - [49, 380, 89, 19], - [14, 580, 75, 19], - [302, 440, 66, 19], - [245, 440, 65, 19], - [65, 420, 64, 19], - [370, 360, 51, 19], - [14, 363, 48, 64], - [49, 420, 40, 19], - [401, 520, 20, 19], - [350, 400, 20, 19] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/line-flow-with-floats-6-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/line-flow-with-floats-6-expected.png deleted file mode 100644 index 0849f20..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/line-flow-with-floats-6-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/line-flow-with-floats-6-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/line-flow-with-floats-6-expected.txt deleted file mode 100644 index 0685613..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/line-flow-with-floats-6-expected.txt +++ /dev/null
@@ -1,29 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "invalidations": [ - [65, 360, 306, 19], - [65, 400, 304, 19], - [14, 340, 292, 19], - [14, 320, 264, 19], - [14, 260, 259, 19], - [14, 300, 256, 19], - [14, 280, 252, 19], - [243, 240, 177, 19], - [266, 280, 154, 19], - [270, 300, 150, 19], - [273, 260, 147, 19], - [278, 320, 142, 19], - [306, 340, 114, 19], - [65, 380, 89, 19], - [370, 360, 51, 19], - [14, 363, 48, 64] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/line-flow-with-floats-7-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/line-flow-with-floats-7-expected.png deleted file mode 100644 index 4ad2d139..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/line-flow-with-floats-7-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/line-flow-with-floats-7-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/line-flow-with-floats-7-expected.txt deleted file mode 100644 index 964f138..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/line-flow-with-floats-7-expected.txt +++ /dev/null
@@ -1,19 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "invalidations": [ - [128, 420, 241, 19], - [14, 440, 172, 19], - [186, 440, 116, 19], - [184, 440, 114, 19], - [298, 440, 70, 19], - [65, 420, 64, 19] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/line-flow-with-floats-8-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/line-flow-with-floats-8-expected.png deleted file mode 100644 index 6deeb21..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/line-flow-with-floats-8-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/line-flow-with-floats-8-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/line-flow-with-floats-8-expected.txt deleted file mode 100644 index a1f945e7..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/line-flow-with-floats-8-expected.txt +++ /dev/null
@@ -1,14 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "invalidations": [ - [8, 74, 418, 526] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/line-flow-with-floats-9-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/line-flow-with-floats-9-expected.png deleted file mode 100644 index 7ce306a..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/line-flow-with-floats-9-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/line-flow-with-floats-9-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/line-flow-with-floats-9-expected.txt deleted file mode 100644 index 254456e2..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/line-flow-with-floats-9-expected.txt +++ /dev/null
@@ -1,57 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "invalidations": [ - [14, 540, 407, 19], - [14, 560, 406, 19], - [14, 360, 406, 19], - [14, 520, 387, 19], - [14, 340, 387, 19], - [14, 300, 385, 19], - [14, 320, 358, 19], - [14, 480, 354, 19], - [89, 580, 331, 19], - [14, 280, 328, 19], - [65, 400, 304, 19], - [14, 260, 263, 19], - [56, 460, 255, 19], - [128, 420, 241, 19], - [189, 200, 231, 19], - [14, 240, 229, 19], - [193, 220, 227, 19], - [14, 460, 226, 19], - [14, 500, 219, 19], - [14, 220, 179, 19], - [243, 240, 177, 19], - [14, 200, 175, 19], - [14, 440, 172, 19], - [65, 440, 171, 19], - [212, 240, 156, 19], - [266, 280, 154, 19], - [270, 300, 150, 19], - [273, 260, 147, 19], - [277, 180, 143, 19], - [278, 320, 142, 19], - [65, 380, 142, 19], - [240, 460, 128, 19], - [186, 440, 116, 19], - [235, 440, 115, 19], - [306, 340, 114, 19], - [14, 580, 75, 19], - [302, 440, 66, 19], - [65, 420, 64, 19], - [370, 360, 51, 19], - [14, 383, 48, 64], - [14, 363, 48, 64], - [372, 243, 48, 48], - [401, 520, 20, 19], - [349, 440, 20, 19] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/multicol/multicol-as-paint-container-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/multicol/multicol-as-paint-container-expected.txt deleted file mode 100644 index ca080b3c..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/multicol/multicol-as-paint-container-expected.txt +++ /dev/null
@@ -1,47 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow DIV id='target'", - "bounds": [630, 180], - "backfaceVisibility": "hidden", - "invalidations": [ - [325, 140, 300, 20], - [325, 100, 300, 20], - [325, 20, 300, 20], - [325, 0, 300, 20], - [0, 140, 300, 20], - [0, 20, 300, 20], - [325, 60, 280, 20], - [325, 120, 260, 20], - [0, 100, 260, 20], - [0, 120, 240, 20], - [325, 40, 220, 20], - [0, 80, 220, 20], - [0, 40, 220, 20], - [0, 0, 220, 20], - [0, 60, 200, 20], - [325, 80, 140, 20], - [0, 160, 120, 20] - ], - "transform": 1 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 8, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/multicol/multicol-with-overflowing-block-rl-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/multicol/multicol-with-overflowing-block-rl-expected.txt deleted file mode 100644 index a7f9b8bb..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/multicol/multicol-with-overflowing-block-rl-expected.txt +++ /dev/null
@@ -1,16 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#008000", - "invalidations": [ - [8, 341, 500, 167], - [8, 8, 500, 167], - [8, 175, 500, 166] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/non-text-link-invalidation-optimization-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/non-text-link-invalidation-optimization-expected.txt deleted file mode 100644 index 23259046..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/non-text-link-invalidation-optimization-expected.txt +++ /dev/null
@@ -1,22 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "invalidations": [ - [164, 8, 145, 19], - [75, 8, 61, 19], - [8, 8, 57, 19], - [353, 8, 52, 19], - [136, 8, 28, 19], - [319, 8, 24, 19], - [343, 13, 10, 10], - [309, 13, 10, 10], - [65, 13, 10, 10] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/offset-change-wrong-invalidation-with-float-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/offset-change-wrong-invalidation-with-float-expected.txt deleted file mode 100644 index 906b985..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/offset-change-wrong-invalidation-with-float-expected.txt +++ /dev/null
@@ -1,52 +0,0 @@ -{ - "layers": [ - { - "name": "LayoutView #document", - "bounds": [800, 600], - "drawsContent": false, - "backgroundColor": "#FFFFFF" - }, - { - "name": "Scrolling Layer", - "bounds": [800, 600], - "drawsContent": false - }, - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) UL id='submenu'", - "rect": [48, 94, 40, 20], - "reason": "chunk disappeared" - } - ] - }, - { - "name": "LayoutListItem (floating) LI id='watches'", - "position": [30, 44], - "bounds": [7, 19] - }, - { - "name": "LayoutInline (relative positioned) SPAN id='placeholder'", - "position": [48, 44], - "drawsContent": false, - "backfaceVisibility": "hidden" - }, - { - "name": "LayoutListItem (relative positioned) (floating) LI id='menu'", - "position": [30, 44], - "bounds": [7, 19], - "paintInvalidations": [ - { - "object": "LayoutListMarker ::marker", - "rect": [0, 0, 7, 19], - "reason": "geometry" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/outline/focus-continuations-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/outline/focus-continuations-expected.txt deleted file mode 100644 index cd1f195..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/outline/focus-continuations-expected.txt +++ /dev/null
@@ -1,18 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutInline SPAN id='outer'", - "rect": [7, 87, 88, 22], - "reason": "disappeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/outline/focus-enable-continuations-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/outline/focus-enable-continuations-expected.txt deleted file mode 100644 index 8605f8f..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/outline/focus-enable-continuations-expected.txt +++ /dev/null
@@ -1,18 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutInline SPAN id='outer'", - "rect": [7, 87, 88, 22], - "reason": "appeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/outline/focus-layers-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/outline/focus-layers-expected.png deleted file mode 100644 index ec2c74ce..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/outline/focus-layers-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/outline/focus-ring-on-continuation-move-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/outline/focus-ring-on-continuation-move-expected.txt deleted file mode 100644 index 15299df..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/outline/focus-ring-on-continuation-move-expected.txt +++ /dev/null
@@ -1,33 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutInline SPAN", - "rect": [207, 231, 102, 102], - "reason": "outline" - }, - { - "object": "LayoutInline SPAN", - "rect": [7, 231, 102, 102], - "reason": "outline" - }, - { - "object": "LayoutBlockFlow (relative positioned) DIV id='block'", - "rect": [208, 232, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (relative positioned) DIV id='block'", - "rect": [8, 232, 100, 100], - "reason": "geometry" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/outline/focus-ring-on-inline-continuation-move-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/outline/focus-ring-on-inline-continuation-move-expected.txt deleted file mode 100644 index 0c59072..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/outline/focus-ring-on-inline-continuation-move-expected.txt +++ /dev/null
@@ -1,28 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutInline SPAN", - "rect": [7, 7, 102, 182], - "reason": "outline" - }, - { - "object": "LayoutBlockFlow (relative positioned) DIV id='block'", - "rect": [8, 88, 100, 100], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (relative positioned) DIV id='block'", - "rect": [8, 8, 100, 100], - "reason": "geometry" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/outline/inline-outline-repaint-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/outline/inline-outline-repaint-expected.png deleted file mode 100644 index 18ed59d..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/outline/inline-outline-repaint-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/outline/inline-outline-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/outline/inline-outline-repaint-expected.txt deleted file mode 100644 index c078e2c8..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/outline/inline-outline-repaint-expected.txt +++ /dev/null
@@ -1,32 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "invalidations": [ - [5, 173, 95, 45] - ] - }, - { - "name": "Caret", - "position": [45, 196], - "bounds": [1, 19], - "contentsOpaque": true, - "invalidations": [ - [0, 0, 1, 19] - ] - }, - { - "name": "LayoutBlockFlow HTML", - "position": [5, 173], - "bounds": [94, 45], - "contentsOpaqueForText": true, - "invalidations": [ - [0, 0, 94, 45] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/outline/outline-become-affected-by-descendant-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/outline/outline-become-affected-by-descendant-expected.txt deleted file mode 100644 index bc031da..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/outline/outline-become-affected-by-descendant-expected.txt +++ /dev/null
@@ -1,23 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV id='outline'", - "rect": [7, 7, 152, 102], - "reason": "outline" - }, - { - "object": "LayoutBlockFlow DIV id='child'", - "rect": [58, 8, 100, 50], - "reason": "incremental" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/outline/outline-become-not-affected-by-descendant-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/outline/outline-become-not-affected-by-descendant-expected.txt deleted file mode 100644 index 6e134a2..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/outline/outline-become-not-affected-by-descendant-expected.txt +++ /dev/null
@@ -1,23 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV id='outline'", - "rect": [7, 7, 152, 102], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV id='child'", - "rect": [58, 8, 100, 50], - "reason": "incremental" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/overflow/composited-overflow-local-background-removed-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/overflow/composited-overflow-local-background-removed-expected.txt deleted file mode 100644 index 4c2999b..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/overflow/composited-overflow-local-background-removed-expected.txt +++ /dev/null
@@ -1,61 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow DIV id='scroller'", - "bounds": [200, 200], - "contentsOpaqueForText": true, - "drawsContent": false, - "transform": 1 - }, - { - "name": "LayoutBlockFlow DIV id='scroller'", - "bounds": [185, 185], - "drawsContent": false, - "transform": 1 - }, - { - "name": "HorizontalScrollbar", - "position": [0, 185], - "bounds": [200, 15], - "contentsOpaqueForText": true, - "invalidations": [ - [0, 0, 185, 15] - ], - "transform": 1 - }, - { - "name": "VerticalScrollbar", - "position": [185, 0], - "bounds": [15, 185], - "contentsOpaque": true, - "transform": 1 - }, - { - "name": "LayoutBlockFlow DIV id='scroller'", - "position": [0, 16], - "bounds": [185, 336], - "invalidations": [ - [0, 0, 185, 336] - ], - "transform": 1 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 8, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/overflow/composited-overflow-with-borderbox-background-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/overflow/composited-overflow-with-borderbox-background-expected.txt deleted file mode 100644 index 112b8e84..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/overflow/composited-overflow-with-borderbox-background-expected.txt +++ /dev/null
@@ -1,57 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "invalidations": [ - [8, 8, 220, 220] - ] - }, - { - "name": "LayoutBlockFlow DIV id='scroller'", - "position": [10, 10], - "bounds": [185, 185], - "drawsContent": false, - "transform": 1 - }, - { - "name": "HorizontalScrollbar", - "position": [10, 195], - "bounds": [200, 15], - "contentsOpaqueForText": true, - "transform": 1 - }, - { - "name": "VerticalScrollbar", - "position": [195, 10], - "bounds": [15, 185], - "contentsOpaque": true, - "transform": 1 - }, - { - "name": "LayoutBlockFlow DIV id='scroller'", - "position": [10, 10], - "bounds": [185, 300], - "contentsOpaque": true, - "backgroundColor": "#008000", - "invalidations": [ - [0, 0, 185, 300] - ], - "transform": 1 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 8, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/overflow/composited-overflow-with-local-background-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/overflow/composited-overflow-with-local-background-expected.txt deleted file mode 100644 index b18d12c..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/overflow/composited-overflow-with-local-background-expected.txt +++ /dev/null
@@ -1,59 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow DIV id='scroller'", - "bounds": [200, 200], - "contentsOpaqueForText": true, - "drawsContent": false, - "transform": 1 - }, - { - "name": "LayoutBlockFlow DIV id='scroller'", - "bounds": [185, 185], - "drawsContent": false, - "transform": 1 - }, - { - "name": "HorizontalScrollbar", - "position": [0, 185], - "bounds": [200, 15], - "contentsOpaqueForText": true, - "transform": 1 - }, - { - "name": "VerticalScrollbar", - "position": [185, 0], - "bounds": [15, 185], - "contentsOpaque": true, - "transform": 1 - }, - { - "name": "LayoutBlockFlow DIV id='scroller'", - "bounds": [185, 300], - "contentsOpaque": true, - "backgroundColor": "#008000", - "invalidations": [ - [0, 0, 185, 300] - ], - "transform": 1 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 8, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/overflow/composited-overflow-with-negative-offset-outline-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/overflow/composited-overflow-with-negative-offset-outline-expected.txt deleted file mode 100644 index e177b08..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/overflow/composited-overflow-with-negative-offset-outline-expected.txt +++ /dev/null
@@ -1,65 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow DIV id='scroller'", - "bounds": [200, 200], - "contentsOpaqueForText": true, - "drawsContent": false, - "transform": 1 - }, - { - "name": "LayoutBlockFlow DIV id='scroller'", - "bounds": [185, 185], - "drawsContent": false, - "transform": 1 - }, - { - "name": "HorizontalScrollbar", - "position": [0, 185], - "bounds": [200, 15], - "contentsOpaqueForText": true, - "transform": 1 - }, - { - "name": "VerticalScrollbar", - "position": [185, 0], - "bounds": [15, 185], - "contentsOpaque": true, - "transform": 1 - }, - { - "name": "LayoutBlockFlow DIV id='scroller'", - "bounds": [185, 300], - "contentsOpaqueForText": true, - "drawsContent": false, - "transform": 1 - }, - { - "name": "LayoutBlockFlow DIV id='scroller'", - "bounds": [200, 200], - "contentsOpaqueForText": true, - "invalidations": [ - [0, 0, 200, 200] - ], - "transform": 1 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 8, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/overflow/composited-vertical-rl-overflow-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/overflow/composited-vertical-rl-overflow-expected.txt deleted file mode 100644 index 9b00af10..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/overflow/composited-vertical-rl-overflow-expected.txt +++ /dev/null
@@ -1,33 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='div'", - "position": [-50, 0], - "bounds": [150, 100], - "contentsOpaqueForText": true, - "backgroundColor": "#0000FF", - "invalidations": [ - [0, 0, 150, 100] - ], - "transform": 1 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [100, 100, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/overflow/fixed-position-transparency-with-overflow-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/overflow/fixed-position-transparency-with-overflow-expected.txt deleted file mode 100644 index 2b77274..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/overflow/fixed-position-transparency-with-overflow-expected.txt +++ /dev/null
@@ -1,41 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [785, 2016], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "invalidations": [ - [108, 308, 100, 100], - [8, 208, 100, 100] - ] - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV id='container' class='relative blue'", - "position": [8, 208], - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#0000FF", - "invalidations": [ - [0, 0, 100, 100] - ] - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='absolute green'", - "position": [108, 308], - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#008000", - "invalidations": [ - [0, 0, 100, 100] - ] - }, - { - "name": "VerticalScrollbar", - "position": [785, 0], - "bounds": [15, 600], - "contentsOpaque": true - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/overflow/float-overflow-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/overflow/float-overflow-expected.txt deleted file mode 100644 index 60493890..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/overflow/float-overflow-expected.txt +++ /dev/null
@@ -1,563 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV class='outer'", - "rect": [61, 537, 62, 37], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV class='outer'", - "rect": [61, 531, 62, 37], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV class='outer'", - "rect": [61, 498, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV class='outer'", - "rect": [61, 492, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV class='outer'", - "rect": [61, 459, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV class='outer'", - "rect": [61, 453, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV class='outer'", - "rect": [61, 420, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV class='outer'", - "rect": [61, 414, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutFlexibleBox DIV class='outer box'", - "rect": [61, 249, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutFlexibleBox DIV class='outer box'", - "rect": [61, 243, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutFlexibleBox DIV class='outer box'", - "rect": [61, 210, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutFlexibleBox DIV class='outer box'", - "rect": [61, 204, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV class='outer'", - "rect": [61, 171, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV class='outer'", - "rect": [61, 165, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV class='outer'", - "rect": [61, 132, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV class='outer'", - "rect": [61, 126, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV class='outer'", - "rect": [61, 93, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV class='outer'", - "rect": [61, 87, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV class='outer'", - "rect": [61, 54, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV class='outer'", - "rect": [61, 48, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV class='outer'", - "rect": [61, 15, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV class='outer'", - "rect": [61, 9, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutTable TABLE class='outer'", - "rect": [61, 366, 58, 28], - "reason": "geometry" - }, - { - "object": "LayoutTable TABLE class='outer'", - "rect": [61, 360, 58, 28], - "reason": "geometry" - }, - { - "object": "LayoutTable TABLE class='outer'", - "rect": [61, 327, 58, 28], - "reason": "geometry" - }, - { - "object": "LayoutTable TABLE class='outer'", - "rect": [61, 321, 58, 28], - "reason": "geometry" - }, - { - "object": "LayoutTable TABLE class='outer'", - "rect": [61, 288, 58, 28], - "reason": "geometry" - }, - { - "object": "LayoutTable TABLE class='outer'", - "rect": [61, 282, 58, 28], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV", - "rect": [67, 504, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV", - "rect": [67, 498, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV", - "rect": [67, 465, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV", - "rect": [67, 459, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV", - "rect": [67, 426, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV", - "rect": [67, 420, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV", - "rect": [67, 216, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV", - "rect": [67, 210, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV", - "rect": [67, 177, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV", - "rect": [67, 171, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV", - "rect": [67, 138, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV", - "rect": [67, 132, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV", - "rect": [67, 99, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV", - "rect": [67, 93, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV", - "rect": [67, 60, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV", - "rect": [67, 54, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV", - "rect": [67, 21, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV", - "rect": [67, 15, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutTableCell TD", - "rect": [69, 374, 42, 12], - "reason": "geometry" - }, - { - "object": "LayoutTableCell TD", - "rect": [69, 368, 42, 12], - "reason": "geometry" - }, - { - "object": "LayoutTableCell TD", - "rect": [69, 335, 42, 12], - "reason": "geometry" - }, - { - "object": "LayoutTableCell TD", - "rect": [69, 329, 42, 12], - "reason": "geometry" - }, - { - "object": "LayoutTableCell TD", - "rect": [69, 296, 42, 12], - "reason": "geometry" - }, - { - "object": "LayoutTableCell TD", - "rect": [69, 290, 42, 12], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (floating) DIV", - "rect": [70, 375, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (floating) DIV", - "rect": [70, 369, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (floating) DIV", - "rect": [70, 336, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (floating) DIV", - "rect": [70, 330, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (floating) DIV", - "rect": [70, 297, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (floating) DIV", - "rect": [70, 291, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (floating) DIV", - "rect": [67, 138, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (floating) DIV", - "rect": [67, 132, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (floating) DIV", - "rect": [65, 60, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (floating) DIV", - "rect": [65, 54, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (floating) DIV", - "rect": [65, 21, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (floating) DIV", - "rect": [65, 15, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (floating) DIV", - "rect": [59, 543, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (floating) DIV", - "rect": [59, 537, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (floating) DIV", - "rect": [59, 504, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (floating) DIV", - "rect": [59, 498, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (floating) DIV", - "rect": [59, 465, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (floating) DIV", - "rect": [59, 459, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (floating) DIV", - "rect": [59, 426, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (floating) DIV", - "rect": [59, 420, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (floating) DIV", - "rect": [59, 255, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (floating) DIV", - "rect": [59, 249, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (floating) DIV", - "rect": [59, 216, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (floating) DIV", - "rect": [59, 210, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (floating) DIV", - "rect": [59, 177, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (floating) DIV", - "rect": [59, 171, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (floating) DIV", - "rect": [59, 99, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (floating) DIV", - "rect": [59, 93, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV", - "rect": [67, 543, 32, 20], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV", - "rect": [67, 537, 32, 20], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'x'", - "rect": [66, 299, 16, 17], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'x'", - "rect": [66, 293, 16, 17], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'x'", - "rect": [63, 23, 16, 17], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'x'", - "rect": [63, 17, 16, 17], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'x'", - "rect": [59, 545, 16, 17], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'x'", - "rect": [59, 539, 16, 17], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'x'", - "rect": [59, 506, 16, 17], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'x'", - "rect": [59, 500, 16, 17], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'x'", - "rect": [59, 467, 16, 17], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'x'", - "rect": [59, 461, 16, 17], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'x'", - "rect": [59, 428, 16, 17], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'x'", - "rect": [59, 422, 16, 17], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'x'", - "rect": [59, 257, 16, 17], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'x'", - "rect": [59, 251, 16, 17], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'x'", - "rect": [59, 218, 16, 17], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'x'", - "rect": [59, 212, 16, 17], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'x'", - "rect": [59, 179, 16, 17], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'x'", - "rect": [59, 173, 16, 17], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'x'", - "rect": [59, 140, 16, 17], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'x'", - "rect": [59, 134, 16, 17], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'x'", - "rect": [58, 377, 16, 17], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'x'", - "rect": [58, 371, 16, 17], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'x'", - "rect": [58, 338, 16, 17], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'x'", - "rect": [58, 332, 16, 17], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'x'", - "rect": [57, 101, 16, 17], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'x'", - "rect": [57, 95, 16, 17], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'x'", - "rect": [57, 62, 16, 17], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'x'", - "rect": [57, 56, 16, 17], - "reason": "geometry" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/overflow/float-overflow-right-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/overflow/float-overflow-right-expected.txt deleted file mode 100644 index b3698db5..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/overflow/float-overflow-right-expected.txt +++ /dev/null
@@ -1,563 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow DIV class='outer'", - "rect": [677, 537, 62, 37], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV class='outer'", - "rect": [677, 531, 62, 37], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV class='outer'", - "rect": [677, 498, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV class='outer'", - "rect": [677, 492, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV class='outer'", - "rect": [677, 459, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV class='outer'", - "rect": [677, 453, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV class='outer'", - "rect": [677, 420, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV class='outer'", - "rect": [677, 414, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutFlexibleBox DIV class='outer box'", - "rect": [677, 249, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutFlexibleBox DIV class='outer box'", - "rect": [677, 243, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutFlexibleBox DIV class='outer box'", - "rect": [677, 210, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutFlexibleBox DIV class='outer box'", - "rect": [677, 204, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV class='outer'", - "rect": [677, 171, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV class='outer'", - "rect": [677, 165, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV class='outer'", - "rect": [677, 132, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV class='outer'", - "rect": [677, 126, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV class='outer'", - "rect": [677, 93, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV class='outer'", - "rect": [677, 87, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV class='outer'", - "rect": [677, 54, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV class='outer'", - "rect": [677, 48, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV class='outer'", - "rect": [677, 15, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV class='outer'", - "rect": [677, 9, 62, 22], - "reason": "geometry" - }, - { - "object": "LayoutTable TABLE class='outer'", - "rect": [681, 366, 58, 28], - "reason": "geometry" - }, - { - "object": "LayoutTable TABLE class='outer'", - "rect": [681, 360, 58, 28], - "reason": "geometry" - }, - { - "object": "LayoutTable TABLE class='outer'", - "rect": [681, 327, 58, 28], - "reason": "geometry" - }, - { - "object": "LayoutTable TABLE class='outer'", - "rect": [681, 321, 58, 28], - "reason": "geometry" - }, - { - "object": "LayoutTable TABLE class='outer'", - "rect": [681, 288, 58, 28], - "reason": "geometry" - }, - { - "object": "LayoutTable TABLE class='outer'", - "rect": [681, 282, 58, 28], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV", - "rect": [683, 504, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV", - "rect": [683, 498, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV", - "rect": [683, 465, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV", - "rect": [683, 459, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV", - "rect": [683, 426, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV", - "rect": [683, 420, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV", - "rect": [683, 216, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV", - "rect": [683, 210, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV", - "rect": [683, 177, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV", - "rect": [683, 171, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV", - "rect": [683, 138, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV", - "rect": [683, 132, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV", - "rect": [683, 99, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV", - "rect": [683, 93, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV", - "rect": [683, 60, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV", - "rect": [683, 54, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV", - "rect": [683, 21, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV", - "rect": [683, 15, 50, 10], - "reason": "geometry" - }, - { - "object": "LayoutTableCell TD", - "rect": [689, 374, 42, 12], - "reason": "geometry" - }, - { - "object": "LayoutTableCell TD", - "rect": [689, 368, 42, 12], - "reason": "geometry" - }, - { - "object": "LayoutTableCell TD", - "rect": [689, 335, 42, 12], - "reason": "geometry" - }, - { - "object": "LayoutTableCell TD", - "rect": [689, 329, 42, 12], - "reason": "geometry" - }, - { - "object": "LayoutTableCell TD", - "rect": [689, 296, 42, 12], - "reason": "geometry" - }, - { - "object": "LayoutTableCell TD", - "rect": [689, 290, 42, 12], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (floating) DIV", - "rect": [701, 543, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (floating) DIV", - "rect": [701, 537, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (floating) DIV", - "rect": [701, 504, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (floating) DIV", - "rect": [701, 498, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (floating) DIV", - "rect": [701, 465, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (floating) DIV", - "rect": [701, 459, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (floating) DIV", - "rect": [701, 426, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (floating) DIV", - "rect": [701, 420, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (floating) DIV", - "rect": [701, 255, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (floating) DIV", - "rect": [701, 249, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (floating) DIV", - "rect": [701, 216, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (floating) DIV", - "rect": [701, 210, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (floating) DIV", - "rect": [701, 177, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (floating) DIV", - "rect": [701, 171, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (floating) DIV", - "rect": [701, 99, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (floating) DIV", - "rect": [701, 93, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (floating) DIV", - "rect": [695, 60, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (floating) DIV", - "rect": [695, 54, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (floating) DIV", - "rect": [695, 21, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (floating) DIV", - "rect": [695, 15, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (floating) DIV", - "rect": [693, 138, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (floating) DIV", - "rect": [693, 132, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (floating) DIV", - "rect": [690, 375, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (floating) DIV", - "rect": [690, 369, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (floating) DIV", - "rect": [690, 336, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (floating) DIV", - "rect": [690, 330, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (floating) DIV", - "rect": [690, 297, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow (floating) DIV", - "rect": [690, 291, 40, 10], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV", - "rect": [701, 543, 32, 20], - "reason": "geometry" - }, - { - "object": "LayoutBlockFlow DIV", - "rect": [701, 537, 32, 20], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'x'", - "rect": [727, 101, 16, 17], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'x'", - "rect": [727, 95, 16, 17], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'x'", - "rect": [727, 62, 16, 17], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'x'", - "rect": [727, 56, 16, 17], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'x'", - "rect": [726, 377, 16, 17], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'x'", - "rect": [726, 371, 16, 17], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'x'", - "rect": [726, 338, 16, 17], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'x'", - "rect": [726, 332, 16, 17], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'x'", - "rect": [725, 545, 16, 17], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'x'", - "rect": [725, 539, 16, 17], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'x'", - "rect": [725, 506, 16, 17], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'x'", - "rect": [725, 500, 16, 17], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'x'", - "rect": [725, 467, 16, 17], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'x'", - "rect": [725, 461, 16, 17], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'x'", - "rect": [725, 428, 16, 17], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'x'", - "rect": [725, 422, 16, 17], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'x'", - "rect": [725, 257, 16, 17], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'x'", - "rect": [725, 251, 16, 17], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'x'", - "rect": [725, 218, 16, 17], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'x'", - "rect": [725, 212, 16, 17], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'x'", - "rect": [725, 179, 16, 17], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'x'", - "rect": [725, 173, 16, 17], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'x'", - "rect": [725, 140, 16, 17], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'x'", - "rect": [725, 134, 16, 17], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'x'", - "rect": [721, 23, 16, 17], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'x'", - "rect": [721, 17, 16, 17], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'x'", - "rect": [718, 299, 16, 17], - "reason": "geometry" - }, - { - "object": "InlineTextBox 'x'", - "rect": [718, 293, 16, 17], - "reason": "geometry" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/overflow/line-overflow-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/overflow/line-overflow-expected.txt deleted file mode 100644 index 67c1f353..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/overflow/line-overflow-expected.txt +++ /dev/null
@@ -1,25 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "invalidations": [ - [8, 182, 195, 19], - [8, 102, 192, 19], - [8, 162, 168, 19], - [8, 142, 151, 19], - [8, 202, 139, 19], - [8, 82, 129, 19], - [103, 142, 94, 19], - [8, 122, 64, 19], - [149, 122, 54, 19], - [72, 122, 42, 19], - [114, 92, 35, 30], - [114, 122, 35, 19] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/overflow/opacity-change-on-overflow-float-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/overflow/opacity-change-on-overflow-float-expected.txt deleted file mode 100644 index efa341f..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/overflow/opacity-change-on-overflow-float-expected.txt +++ /dev/null
@@ -1,15 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "invalidations": [ - [8, 8, 761, 59], - [8, 84, 100, 100] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/overflow/overflow-changed-on-child-of-composited-layer-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/overflow/overflow-changed-on-child-of-composited-layer-expected.txt deleted file mode 100644 index 94352222..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/overflow/overflow-changed-on-child-of-composited-layer-expected.txt +++ /dev/null
@@ -1,34 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow DIV id='parent'", - "position": [-10, -10], - "bounds": [754, 210], - "contentsOpaqueForText": true, - "invalidations": [ - [0, 0, 120, 210], - [210, 20, 100, 100], - [200, 10, 100, 100] - ], - "transform": 1 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [28, 20, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/overflow/overflow-delete-line-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/overflow/overflow-delete-line-expected.txt deleted file mode 100644 index 6cbd802..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/overflow/overflow-delete-line-expected.txt +++ /dev/null
@@ -1,15 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "invalidations": [ - [8, 74, 72, 19], - [8, 94, 39, 16] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/position/absolute-display-block-to-none-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/position/absolute-display-block-to-none-expected.txt deleted file mode 100644 index b9e6ed7..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/position/absolute-display-block-to-none-expected.txt +++ /dev/null
@@ -1,14 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "invalidations": [ - [100, 100, 100, 100] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/position/absolute-position-changed-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/position/absolute-position-changed-expected.txt deleted file mode 100644 index af02c16..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/position/absolute-position-changed-expected.txt +++ /dev/null
@@ -1,50 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 2016], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='fixed red'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#FF0000", - "transform": 2 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='absoluteDiv' class='absolute green'", - "position": [100, 700], - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#008000", - "invalidations": [ - [0, 0, 100, 100] - ], - "transform": 1 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [0, -500, 0, 1] - ] - }, - { - "id": 2, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [100, 200, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/position/fixed-element-repaint-after-compositing-update-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/position/fixed-element-repaint-after-compositing-update-expected.txt deleted file mode 100644 index 4a64cf7..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/position/fixed-element-repaint-after-compositing-update-expected.txt +++ /dev/null
@@ -1,21 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='fixedOverlapping'", - "position": [8, 88], - "bounds": [792, 512], - "contentsOpaqueForText": true, - "invalidations": [ - [142, 62, 100, 100], - [0, 0, 100, 100] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/position/fixed-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/position/fixed-expected.txt deleted file mode 100644 index 0c93e7e..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/position/fixed-expected.txt +++ /dev/null
@@ -1,48 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [785, 2016], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='t'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#008000", - "invalidations": [ - [0, 0, 100, 100] - ], - "transform": 2 - }, - { - "name": "VerticalScrollbar", - "position": [785, 0], - "bounds": [15, 600], - "contentsOpaque": true - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [0, -20, 0, 1] - ] - }, - { - "id": 2, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 100, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/position/fixed-margin-change-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/position/fixed-margin-change-repaint-expected.txt deleted file mode 100644 index b6c4ad5..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/position/fixed-margin-change-repaint-expected.txt +++ /dev/null
@@ -1,18 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='test'", - "position": [0, 60], - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#008000" - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/position/fixed-scale-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/position/fixed-scale-expected.txt deleted file mode 100644 index 8688c468..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/position/fixed-scale-expected.txt +++ /dev/null
@@ -1,56 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [785, 2016], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='t' class='green translated'", - "bounds": [50, 50], - "contentsOpaque": true, - "backgroundColor": "#008000", - "transform": 3 - }, - { - "name": "VerticalScrollbar", - "position": [785, 0], - "bounds": [15, 600], - "contentsOpaque": true - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [0, -200, 0, 1] - ] - }, - { - "id": 2, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [125, 125, 0, 1] - ] - }, - { - "id": 3, - "parent": 2, - "transform": [ - [2, 0, 0, 0], - [0, 2, 0, 0], - [0, 0, 1, 0], - [0, 0, 0, 1] - ], - "origin": [25, 25] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/position/fixed-tranformed-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/position/fixed-tranformed-expected.txt deleted file mode 100644 index 48eb8c2..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/position/fixed-tranformed-expected.txt +++ /dev/null
@@ -1,49 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [785, 1000], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='test'", - "position": [50, 50], - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#008000", - "invalidations": [ - [0, 0, 100, 100] - ], - "transform": 2 - }, - { - "name": "VerticalScrollbar", - "position": [785, 0], - "bounds": [15, 600], - "contentsOpaque": true - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [0, -50, 0, 1] - ] - }, - { - "id": 2, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [10, 10, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/position/intermediate-layout-position-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/position/intermediate-layout-position-expected.txt deleted file mode 100644 index 074f86d..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/position/intermediate-layout-position-expected.txt +++ /dev/null
@@ -1,15 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "invalidations": [ - [8, 172, 46, 20], - [8, 74, 46, 20] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/position/layout-state-only-positioned-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/position/layout-state-only-positioned-expected.txt deleted file mode 100644 index 31c2dba7..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/position/layout-state-only-positioned-expected.txt +++ /dev/null
@@ -1,45 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "invalidations": [ - [0, 50, 106, 106] - ] - }, - { - "name": "LayoutBlockFlow (positioned) DIV", - "bounds": [106, 106], - "invalidations": [ - [0, 0, 106, 106] - ], - "transform": 1 - }, - { - "name": "Scrolling Contents Layer", - "position": [3, 3], - "bounds": [100, 200], - "transform": 1 - }, - { - "name": "ContentsLayer for Vertical Scrollbar Layer", - "position": [88, 3], - "bounds": [15, 100], - "transform": 1 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [0, 50, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/position/position-change-keeping-geometry-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/position/position-change-keeping-geometry-expected.txt deleted file mode 100644 index a703212..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/position/position-change-keeping-geometry-expected.txt +++ /dev/null
@@ -1,25 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "invalidations": [ - [420, 20, 100, 100], - [220, 20, 100, 100] - ] - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='target3'", - "position": [420, 20], - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#0000FF", - "invalidations": [ - [0, 0, 100, 100] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/position/relative-positioned-movement-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/position/relative-positioned-movement-repaint-expected.txt deleted file mode 100644 index 9bef0f33..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/position/relative-positioned-movement-repaint-expected.txt +++ /dev/null
@@ -1,28 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV id='block'", - "bounds": [402, 62], - "backfaceVisibility": "hidden", - "transform": 1 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [68, 10, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/raster-under-invalidation-checking-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/raster-under-invalidation-checking-expected.txt deleted file mode 100644 index 84945c47..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/raster-under-invalidation-checking-expected.txt +++ /dev/null
@@ -1,1324 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "invalidations": [ - [18, 10, 60, 40] - ], - "underInvalidations": [ - { - "x": 18, - "y": 10, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 19, - "y": 10, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 20, - "y": 10, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 21, - "y": 10, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 22, - "y": 10, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 23, - "y": 10, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 24, - "y": 10, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 25, - "y": 10, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 26, - "y": 10, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 27, - "y": 10, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 28, - "y": 10, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 29, - "y": 10, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 30, - "y": 10, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 31, - "y": 10, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 32, - "y": 10, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 33, - "y": 10, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 34, - "y": 10, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 35, - "y": 10, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 36, - "y": 10, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 37, - "y": 10, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 38, - "y": 10, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 39, - "y": 10, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 40, - "y": 10, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 41, - "y": 10, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 42, - "y": 10, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 43, - "y": 10, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 44, - "y": 10, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 45, - "y": 10, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 46, - "y": 10, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 47, - "y": 10, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 48, - "y": 10, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 49, - "y": 10, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 50, - "y": 10, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 51, - "y": 10, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 52, - "y": 10, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 53, - "y": 10, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 54, - "y": 10, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 55, - "y": 10, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 56, - "y": 10, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 57, - "y": 10, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 58, - "y": 10, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 59, - "y": 10, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 60, - "y": 10, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 61, - "y": 10, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 62, - "y": 10, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 63, - "y": 10, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 64, - "y": 10, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 65, - "y": 10, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 66, - "y": 10, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 67, - "y": 10, - "oldPixel": "#0000FF", - "newPixel": "#008000" - } - ] - }, - { - "name": "LayoutBlockFlow DIV id='target2'", - "bounds": [60, 40], - "contentsOpaque": true, - "backgroundColor": "#008000", - "invalidations": [ - [0, 0, 60, 40] - ], - "underInvalidations": [ - { - "x": 0, - "y": 0, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 1, - "y": 0, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 2, - "y": 0, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 3, - "y": 0, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 4, - "y": 0, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 5, - "y": 0, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 6, - "y": 0, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 7, - "y": 0, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 8, - "y": 0, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 9, - "y": 0, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 10, - "y": 0, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 11, - "y": 0, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 12, - "y": 0, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 13, - "y": 0, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 14, - "y": 0, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 15, - "y": 0, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 16, - "y": 0, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 17, - "y": 0, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 18, - "y": 0, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 19, - "y": 0, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 20, - "y": 0, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 21, - "y": 0, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 22, - "y": 0, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 23, - "y": 0, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 24, - "y": 0, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 25, - "y": 0, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 26, - "y": 0, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 27, - "y": 0, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 28, - "y": 0, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 29, - "y": 0, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 30, - "y": 0, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 31, - "y": 0, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 32, - "y": 0, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 33, - "y": 0, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 34, - "y": 0, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 35, - "y": 0, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 36, - "y": 0, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 37, - "y": 0, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 38, - "y": 0, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 39, - "y": 0, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 40, - "y": 0, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 41, - "y": 0, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 42, - "y": 0, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 43, - "y": 0, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 44, - "y": 0, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 45, - "y": 0, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 46, - "y": 0, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 47, - "y": 0, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 48, - "y": 0, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 49, - "y": 0, - "oldPixel": "#0000FF", - "newPixel": "#008000" - } - ], - "transform": 1 - }, - { - "name": "LayoutBlockFlow DIV", - "bounds": [150, 150], - "contentsOpaque": true, - "backgroundColor": "#FFFF00", - "invalidations": [ - [40, 70, 60, 40] - ], - "underInvalidations": [ - { - "x": 40, - "y": 70, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 41, - "y": 70, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 42, - "y": 70, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 43, - "y": 70, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 44, - "y": 70, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 45, - "y": 70, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 46, - "y": 70, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 47, - "y": 70, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 48, - "y": 70, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 49, - "y": 70, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 50, - "y": 70, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 51, - "y": 70, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 52, - "y": 70, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 53, - "y": 70, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 54, - "y": 70, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 55, - "y": 70, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 56, - "y": 70, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 57, - "y": 70, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 58, - "y": 70, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 59, - "y": 70, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 60, - "y": 70, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 61, - "y": 70, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 62, - "y": 70, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 63, - "y": 70, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 64, - "y": 70, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 65, - "y": 70, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 66, - "y": 70, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 67, - "y": 70, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 68, - "y": 70, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 69, - "y": 70, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 70, - "y": 70, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 71, - "y": 70, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 72, - "y": 70, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 73, - "y": 70, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 74, - "y": 70, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 75, - "y": 70, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 76, - "y": 70, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 77, - "y": 70, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 78, - "y": 70, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 79, - "y": 70, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 80, - "y": 70, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 81, - "y": 70, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 82, - "y": 70, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 83, - "y": 70, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 84, - "y": 70, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 85, - "y": 70, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 86, - "y": 70, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 87, - "y": 70, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 88, - "y": 70, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 89, - "y": 70, - "oldPixel": "#0000FF", - "newPixel": "#008000" - } - ], - "transform": 2 - }, - { - "name": "LayoutBlockFlow DIV id='scroller'", - "bounds": [150, 150], - "contentsOpaqueForText": true, - "drawsContent": false, - "transform": 3 - }, - { - "name": "LayoutBlockFlow DIV id='scroller'", - "bounds": [135, 135], - "drawsContent": false, - "transform": 3 - }, - { - "name": "HorizontalScrollbar", - "position": [0, 135], - "bounds": [135, 15], - "contentsOpaque": true, - "transform": 3 - }, - { - "name": "VerticalScrollbar", - "position": [135, 0], - "bounds": [15, 135], - "contentsOpaque": true, - "transform": 3 - }, - { - "name": "Scroll corner of LayoutBlockFlow DIV id='scroller'", - "position": [135, 135], - "bounds": [15, 15], - "contentsOpaque": true, - "transform": 3 - }, - { - "name": "LayoutBlockFlow DIV id='scroller'", - "bounds": [4000, 20000], - "contentsOpaqueForText": true, - "invalidations": [ - [40, 10010, 60, 40] - ], - "underInvalidations": [ - { - "x": 40, - "y": 10010, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 41, - "y": 10010, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 42, - "y": 10010, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 43, - "y": 10010, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 44, - "y": 10010, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 45, - "y": 10010, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 46, - "y": 10010, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 47, - "y": 10010, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 48, - "y": 10010, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 49, - "y": 10010, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 50, - "y": 10010, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 51, - "y": 10010, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 52, - "y": 10010, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 53, - "y": 10010, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 54, - "y": 10010, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 55, - "y": 10010, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 56, - "y": 10010, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 57, - "y": 10010, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 58, - "y": 10010, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 59, - "y": 10010, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 60, - "y": 10010, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 61, - "y": 10010, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 62, - "y": 10010, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 63, - "y": 10010, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 64, - "y": 10010, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 65, - "y": 10010, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 66, - "y": 10010, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 67, - "y": 10010, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 68, - "y": 10010, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 69, - "y": 10010, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 70, - "y": 10010, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 71, - "y": 10010, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 72, - "y": 10010, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 73, - "y": 10010, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 74, - "y": 10010, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 75, - "y": 10010, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 76, - "y": 10010, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 77, - "y": 10010, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 78, - "y": 10010, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 79, - "y": 10010, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 80, - "y": 10010, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 81, - "y": 10010, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 82, - "y": 10010, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 83, - "y": 10010, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 84, - "y": 10010, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 85, - "y": 10010, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 86, - "y": 10010, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 87, - "y": 10010, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 88, - "y": 10010, - "oldPixel": "#0000FF", - "newPixel": "#008000" - }, - { - "x": 89, - "y": 10010, - "oldPixel": "#0000FF", - "newPixel": "#008000" - } - ], - "transform": 4 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [18, 60, 0, 1] - ] - }, - { - "id": 2, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 110, 0, 1] - ] - }, - { - "id": 3, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 260, 0, 1] - ] - }, - { - "id": 4, - "parent": 3, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [-50, -9950, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/reflection/reflection-invalidation-positioned-child-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/reflection/reflection-invalidation-positioned-child-expected.txt deleted file mode 100644 index 7fe4a559..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/reflection/reflection-invalidation-positioned-child-expected.txt +++ /dev/null
@@ -1,24 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow DIV id='box'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#008000" - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='positioned'", - "position": [400, 10], - "bounds": [50, 50], - "contentsOpaque": true, - "backgroundColor": "#0000FF" - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/reflection/reflection-redraw-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/reflection/reflection-redraw-expected.txt deleted file mode 100644 index c08279f..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/reflection/reflection-redraw-expected.txt +++ /dev/null
@@ -1,23 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "invalidations": [ - [380, 287, 286, 19], - [70, 287, 286, 19], - [391, 267, 264, 19], - [81, 267, 264, 19], - [393, 307, 260, 19], - [83, 307, 260, 19], - [305, 54, 126, 142], - [305, 397, 126, 116], - [316, 377, 104, 156], - [318, 34, 100, 182] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/reflection/reflection-with-rotation-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/reflection/reflection-with-rotation-expected.txt deleted file mode 100644 index 91762b9..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/reflection/reflection-with-rotation-expected.txt +++ /dev/null
@@ -1,14 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "invalidations": [ - [22, 50, 226, 167] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/reflection/scroll-fixed-layer-with-reflection-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/reflection/scroll-fixed-layer-with-reflection-expected.txt deleted file mode 100644 index 9f34f70..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/reflection/scroll-fixed-layer-with-reflection-expected.txt +++ /dev/null
@@ -1,47 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [785, 2016], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='moveMe' class='fixed clipped'", - "bounds": [100, 100], - "contentsOpaqueForText": true, - "invalidations": [ - [0, 0, 100, 100] - ], - "transform": 2 - }, - { - "name": "VerticalScrollbar", - "position": [785, 0], - "bounds": [15, 600], - "contentsOpaque": true - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [0, -180, 0, 1] - ] - }, - { - "id": 2, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [250, 100, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/reflection/scroll-fixed-reflected-layer-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/reflection/scroll-fixed-reflected-layer-expected.txt deleted file mode 100644 index 70eb4b7..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/reflection/scroll-fixed-reflected-layer-expected.txt +++ /dev/null
@@ -1,47 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [785, 2016], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='reflected fixed'", - "bounds": [100, 100], - "contentsOpaqueForText": true, - "invalidations": [ - [0, 0, 100, 100] - ], - "transform": 2 - }, - { - "name": "VerticalScrollbar", - "position": [785, 0], - "bounds": [15, 600], - "contentsOpaque": true - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [0, -180, 0, 1] - ] - }, - { - "id": 2, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [250, 100, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/remove-inline-after-layout-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/remove-inline-after-layout-expected.txt deleted file mode 100644 index a32b52e..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/remove-inline-after-layout-expected.txt +++ /dev/null
@@ -1,18 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "invalidations": [ - [112, 193, 178, 19], - [290, 108, 100, 100], - [112, 108, 100, 100], - [8, 108, 100, 100], - [108, 193, 4, 19] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/remove-inline-layer-after-layout-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/remove-inline-layer-after-layout-expected.txt deleted file mode 100644 index a32b52e..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/remove-inline-layer-after-layout-expected.txt +++ /dev/null
@@ -1,18 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "invalidations": [ - [112, 193, 178, 19], - [290, 108, 100, 100], - [112, 108, 100, 100], - [8, 108, 100, 100], - [108, 193, 4, 19] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/repaint-across-writing-mode-boundary-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/repaint-across-writing-mode-boundary-expected.png deleted file mode 100644 index b431ef54..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/repaint-across-writing-mode-boundary-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/repaint-across-writing-mode-boundary-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/repaint-across-writing-mode-boundary-expected.txt deleted file mode 100644 index d3f001d..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/repaint-across-writing-mode-boundary-expected.txt +++ /dev/null
@@ -1,14 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "invalidations": [ - [548, 80, 24, 182] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/repaint-overlay/layers-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/repaint-overlay/layers-expected.txt deleted file mode 100644 index 3ed00073..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/repaint-overlay/layers-expected.txt +++ /dev/null
@@ -1,107 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 2016], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='container'", - "bounds": [100, 100], - "contentsOpaqueForText": true, - "backgroundColor": "#0000FF80", - "invalidations": [ - [20, 20, 10, 10] - ], - "transform": 2 - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV id='scrollable'", - "bounds": [302, 302], - "contentsOpaqueForText": true, - "transform": 3 - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV id='scrollable'", - "position": [1, 1], - "bounds": [300, 300], - "drawsContent": false, - "transform": 3 - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV id='transform'", - "bounds": [200, 200], - "contentsOpaque": true, - "backgroundColor": "#FFFF00", - "invalidations": [ - [20, 20, 10, 10] - ], - "transform": 6 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [0, -20, 0, 1] - ] - }, - { - "id": 2, - "parent": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [40, 50, 0, 1] - ] - }, - { - "id": 3, - "parent": 2, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [64, 53, 0, 1] - ] - }, - { - "id": 4, - "parent": 3, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [0, -30, 0, 1] - ] - }, - { - "id": 5, - "parent": 4, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [89, 78, 0, 1] - ] - }, - { - "id": 6, - "parent": 5, - "transform": [ - [3.53553390593274, 3.53553390593274, 0, 0], - [-3.53553390593274, 3.53553390593274, 0, 0], - [0, 0, 1, 0], - [0, 0, 0, 1] - ], - "origin": [0, 0] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/caret-invalidation-in-overflow-scroll-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/caret-invalidation-in-overflow-scroll-expected.png deleted file mode 100644 index db2abad..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/caret-invalidation-in-overflow-scroll-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/caret-invalidation-in-overflow-scroll-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/caret-invalidation-in-overflow-scroll-expected.txt deleted file mode 100644 index 0266ebf..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/caret-invalidation-in-overflow-scroll-expected.txt +++ /dev/null
@@ -1,38 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "Caret", - "position": [15, 0], - "bounds": [1, 16], - "contentsOpaque": true, - "invalidations": [ - [0, 0, 1, 16] - ], - "transform": 1 - }, - { - "name": "LayoutTextControl INPUT id='target'", - "position": [378, 7], - "bounds": [30, 24], - "contentsOpaqueForText": true - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [383, 11, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/caret-with-composited-scroll-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/caret-with-composited-scroll-expected.txt deleted file mode 100644 index 7e362ef..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/caret-with-composited-scroll-expected.txt +++ /dev/null
@@ -1,83 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow DIV id='scroller'", - "bounds": [100, 100], - "contentsOpaqueForText": true, - "drawsContent": false, - "transform": 1 - }, - { - "name": "LayoutBlockFlow DIV id='scroller'", - "bounds": [100, 100], - "drawsContent": false, - "transform": 1 - }, - { - "name": "LayoutBlockFlow DIV id='scroller'", - "bounds": [205, 1022], - "contentsOpaqueForText": true, - "invalidations": [ - [0, 999, 205, 23] - ], - "transform": 2 - }, - { - "name": "Caret", - "bounds": [1, 16], - "contentsOpaque": true, - "invalidations": [ - [0, 0, 1, 16] - ], - "transform": 3 - }, - { - "name": "LayoutTextControl INPUT id='text'", - "position": [0, 999], - "bounds": [205, 23], - "contentsOpaqueForText": true, - "invalidations": [ - [0, 0, 205, 23] - ], - "transform": 2 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 48, 0, 1] - ] - }, - { - "id": 2, - "parent": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [0, -922, 0, 1] - ] - }, - { - "id": 3, - "parent": 2, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [3, 1003, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/composited-add-resizer-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/composited-add-resizer-expected.txt deleted file mode 100644 index 182c9a6..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/composited-add-resizer-expected.txt +++ /dev/null
@@ -1,31 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow DIV id='target'", - "bounds": [100, 100], - "contentsOpaqueForText": true, - "invalidations": [ - [85, 85, 15, 15] - ], - "transform": 1 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 8, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/composited-iframe-scroll-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/composited-iframe-scroll-repaint-expected.txt deleted file mode 100644 index 11fb2fcd..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/composited-iframe-scroll-repaint-expected.txt +++ /dev/null
@@ -1,56 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "Scrolling background of LayoutView #document", - "bounds": [300, 516], - "contentsOpaque": true, - "backgroundColor": "#EEEEEE", - "transform": 2 - }, - { - "name": "LayoutBlockFlow BODY", - "bounds": [284, 500], - "contentsOpaqueForText": true, - "drawsContent": false, - "transform": 3 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [10, 10, 0, 1] - ] - }, - { - "id": 2, - "parent": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [0, -20, 0, 1] - ] - }, - { - "id": 3, - "parent": 2, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 8, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/destroy-composited-scrollbar-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/destroy-composited-scrollbar-expected.txt deleted file mode 100644 index e55b535..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/destroy-composited-scrollbar-expected.txt +++ /dev/null
@@ -1,32 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV", - "bounds": [200, 200], - "contentsOpaque": true, - "backgroundColor": "#0000FF", - "invalidations": [ - [0, 0, 200, 200] - ], - "transform": 1 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [0, 100, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/fixed-after-scroll-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/fixed-after-scroll-expected.txt deleted file mode 100644 index d7df244..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/fixed-after-scroll-expected.txt +++ /dev/null
@@ -1,64 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [785, 2016], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='red fixed'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#FF0000", - "transform": 2 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='t' class='green absolute'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#008000", - "invalidations": [ - [0, 0, 100, 100] - ], - "transform": 3 - }, - { - "name": "VerticalScrollbar", - "position": [785, 0], - "bounds": [15, 600], - "contentsOpaque": true - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [0, -500, 0, 1] - ] - }, - { - "id": 2, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 200, 0, 1] - ] - }, - { - "id": 3, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 200, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/fixed-and-absolute-position-scrolled-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/fixed-and-absolute-position-scrolled-expected.txt deleted file mode 100644 index 5223760..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/fixed-and-absolute-position-scrolled-expected.txt +++ /dev/null
@@ -1,56 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [785, 2016], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='fixed red'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#FF0000", - "transform": 2 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='absoluteDiv' class='absolute green'", - "position": [100, 700], - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#008000", - "invalidations": [ - [0, 0, 100, 100] - ], - "transform": 1 - }, - { - "name": "VerticalScrollbar", - "position": [785, 0], - "bounds": [15, 600], - "contentsOpaque": true - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [0, -500, 0, 1] - ] - }, - { - "id": 2, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [100, 200, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/fixed-child-move-after-scroll-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/fixed-child-move-after-scroll-expected.txt deleted file mode 100644 index 0fbca8efc..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/fixed-child-move-after-scroll-expected.txt +++ /dev/null
@@ -1,48 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [785, 3016], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='toMove'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#008000", - "invalidations": [ - [0, 0, 100, 100] - ], - "transform": 2 - }, - { - "name": "VerticalScrollbar", - "position": [785, 0], - "bounds": [15, 600], - "contentsOpaque": true - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [0, -200, 0, 1] - ] - }, - { - "id": 2, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [150, 70, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/fixed-child-of-fixed-move-after-scroll-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/fixed-child-of-fixed-move-after-scroll-expected.txt deleted file mode 100644 index 0fbca8efc..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/fixed-child-of-fixed-move-after-scroll-expected.txt +++ /dev/null
@@ -1,48 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [785, 3016], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='toMove'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#008000", - "invalidations": [ - [0, 0, 100, 100] - ], - "transform": 2 - }, - { - "name": "VerticalScrollbar", - "position": [785, 0], - "bounds": [15, 600], - "contentsOpaque": true - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [0, -200, 0, 1] - ] - }, - { - "id": 2, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [150, 70, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/fixed-move-after-scroll-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/fixed-move-after-scroll-expected.txt deleted file mode 100644 index 0fbca8efc..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/fixed-move-after-scroll-expected.txt +++ /dev/null
@@ -1,48 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [785, 3016], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='toMove'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#008000", - "invalidations": [ - [0, 0, 100, 100] - ], - "transform": 2 - }, - { - "name": "VerticalScrollbar", - "position": [785, 0], - "bounds": [15, 600], - "contentsOpaque": true - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [0, -200, 0, 1] - ] - }, - { - "id": 2, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [150, 70, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/fixed-scroll-simple-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/fixed-scroll-simple-expected.txt deleted file mode 100644 index 02fd391..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/fixed-scroll-simple-expected.txt +++ /dev/null
@@ -1,45 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [785, 2016], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='green'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#008000", - "transform": 2 - }, - { - "name": "VerticalScrollbar", - "position": [785, 0], - "bounds": [15, 600], - "contentsOpaque": true - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [0, -100, 0, 1] - ] - }, - { - "id": 2, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 100, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/fixed-scroll-viewport-scroll-hidden-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/fixed-scroll-viewport-scroll-hidden-expected.txt deleted file mode 100644 index 9e29782..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/fixed-scroll-viewport-scroll-hidden-expected.txt +++ /dev/null
@@ -1,39 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 2016], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='fixed green'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#008000", - "transform": 2 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [0, -100, 0, 1] - ] - }, - { - "id": 2, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 100, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/fixed-under-composited-absolute-scrolled-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/fixed-under-composited-absolute-scrolled-expected.txt deleted file mode 100644 index ab58752..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/fixed-under-composited-absolute-scrolled-expected.txt +++ /dev/null
@@ -1,56 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [785, 2001], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='absolute'", - "bounds": [1, 1], - "contentsOpaque": true, - "backfaceVisibility": "hidden", - "backgroundColor": "#FF0000", - "transform": 2 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='fixed'", - "bounds": [100, 200], - "contentsOpaque": true, - "backgroundColor": "#008000", - "invalidations": [ - [0, 100, 100, 100] - ] - }, - { - "name": "VerticalScrollbar", - "position": [785, 0], - "bounds": [15, 600], - "contentsOpaque": true - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [0, -400, 0, 1] - ] - }, - { - "id": 2, - "parent": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 2000, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/fixed-with-border-under-composited-absolute-scrolled-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/fixed-with-border-under-composited-absolute-scrolled-expected.txt deleted file mode 100644 index 5589ab6..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/fixed-with-border-under-composited-absolute-scrolled-expected.txt +++ /dev/null
@@ -1,56 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [785, 2001], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='absolute'", - "bounds": [1, 1], - "contentsOpaque": true, - "backfaceVisibility": "hidden", - "backgroundColor": "#FF0000", - "transform": 2 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='fixed'", - "bounds": [120, 220], - "contentsOpaque": true, - "backgroundColor": "#008000", - "invalidations": [ - [0, 0, 120, 220] - ] - }, - { - "name": "VerticalScrollbar", - "position": [785, 0], - "bounds": [15, 600], - "contentsOpaque": true - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [0, -400, 0, 1] - ] - }, - { - "id": 2, - "parent": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 2000, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/flipped-blocks-writing-mode-scroll-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/flipped-blocks-writing-mode-scroll-expected.txt deleted file mode 100644 index f968b5b..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/flipped-blocks-writing-mode-scroll-expected.txt +++ /dev/null
@@ -1,52 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow DIV id='scroller'", - "bounds": [400, 400], - "contentsOpaqueForText": true, - "drawsContent": false, - "transform": 1 - }, - { - "name": "LayoutBlockFlow DIV id='scroller'", - "bounds": [400, 385], - "drawsContent": false, - "transform": 1 - }, - { - "name": "HorizontalScrollbar", - "position": [0, 385], - "bounds": [400, 15], - "contentsOpaque": true, - "transform": 1 - }, - { - "name": "LayoutBlockFlow DIV id='scroller'", - "bounds": [10000, 200], - "contentsOpaque": true, - "backgroundColor": "#008000", - "invalidations": [ - [0, 0, 10000, 200] - ], - "transform": 1 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 8, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/invalidate-after-composited-scroll-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/invalidate-after-composited-scroll-expected.txt deleted file mode 100644 index 4d4f789..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/invalidate-after-composited-scroll-expected.txt +++ /dev/null
@@ -1,61 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='scroller'", - "bounds": [200, 200], - "contentsOpaqueForText": true, - "drawsContent": false, - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='scroller'", - "bounds": [185, 200], - "drawsContent": false, - "transform": 1 - }, - { - "name": "VerticalScrollbar", - "position": [185, 0], - "bounds": [15, 200], - "contentsOpaque": true, - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='scroller'", - "bounds": [185, 4900], - "contentsOpaqueForText": true, - "invalidations": [ - [0, 2400, 100, 100] - ], - "transform": 2 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [300, 300, 0, 1] - ] - }, - { - "id": 2, - "parent": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [0, -2350, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/line-in-scrolled-clipped-block-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/line-in-scrolled-clipped-block-expected.png deleted file mode 100644 index 28a2876d..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/line-in-scrolled-clipped-block-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/overflow-hidden-yet-scrolled-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/overflow-hidden-yet-scrolled-expected.txt deleted file mode 100644 index 0c48b3b..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/overflow-hidden-yet-scrolled-expected.txt +++ /dev/null
@@ -1,32 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow DIV id='scroller'", - "bounds": [302, 302], - "contentsOpaqueForText": true, - "backfaceVisibility": "hidden", - "invalidations": [ - [1, 201, 100, 100] - ], - "transform": 1 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 8, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/overflow-hidden-yet-scrolled-with-custom-scrollbar-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/overflow-hidden-yet-scrolled-with-custom-scrollbar-expected.txt deleted file mode 100644 index 0c48b3b..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/overflow-hidden-yet-scrolled-with-custom-scrollbar-expected.txt +++ /dev/null
@@ -1,32 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow DIV id='scroller'", - "bounds": [302, 302], - "contentsOpaqueForText": true, - "backfaceVisibility": "hidden", - "invalidations": [ - [1, 201, 100, 100] - ], - "transform": 1 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 8, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/overflow-move-after-scroll-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/overflow-move-after-scroll-expected.txt deleted file mode 100644 index 2080245..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/overflow-move-after-scroll-expected.txt +++ /dev/null
@@ -1,69 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='scroller' class='scroller'", - "bounds": [700, 400], - "contentsOpaqueForText": true, - "drawsContent": false, - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='scroller' class='scroller'", - "bounds": [685, 385], - "drawsContent": false, - "transform": 1 - }, - { - "name": "HorizontalScrollbar", - "position": [0, 385], - "bounds": [700, 15], - "contentsOpaqueForText": true, - "transform": 1 - }, - { - "name": "VerticalScrollbar", - "position": [685, 0], - "bounds": [15, 385], - "contentsOpaque": true, - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='scroller' class='scroller'", - "bounds": [685, 600], - "contentsOpaqueForText": true, - "invalidations": [ - [300, 200, 120, 50], - [50, 200, 120, 50] - ], - "transform": 2 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [10, 60, 0, 1] - ] - }, - { - "id": 2, - "parent": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [0, -100, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/overflow-scroll-after-move-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/overflow-scroll-after-move-expected.txt deleted file mode 100644 index 3a5807e..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/overflow-scroll-after-move-expected.txt +++ /dev/null
@@ -1,69 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='scroller'", - "bounds": [300, 400], - "contentsOpaqueForText": true, - "drawsContent": false, - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='scroller'", - "bounds": [285, 385], - "drawsContent": false, - "transform": 1 - }, - { - "name": "HorizontalScrollbar", - "position": [0, 385], - "bounds": [300, 15], - "contentsOpaqueForText": true, - "transform": 1 - }, - { - "name": "VerticalScrollbar", - "position": [285, 0], - "bounds": [15, 385], - "contentsOpaque": true, - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='scroller'", - "bounds": [285, 900], - "contentsOpaqueForText": true, - "invalidations": [ - [50, 310, 200, 50], - [50, 200, 200, 50] - ], - "transform": 2 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [10, 60, 0, 1] - ] - }, - { - "id": 2, - "parent": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [0, -150, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/overflow-scroll-body-appear-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/overflow-scroll-body-appear-expected.txt deleted file mode 100644 index 00843996..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/overflow-scroll-body-appear-expected.txt +++ /dev/null
@@ -1,64 +0,0 @@ -{ - "layers": [ - { - "name": "LayoutView #document", - "bounds": [800, 600], - "drawsContent": false, - "backgroundColor": "#FFFFFF" - }, - { - "name": "Scrolling Layer", - "bounds": [785, 585], - "drawsContent": false - }, - { - "name": "Scrolling Contents Layer", - "bounds": [2008, 2096], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'Bug 36461 - No vertical scrollbar after the CSS class change'", - "rect": [124, 52, 383, 19], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'Bug 36461 - No vertical scrollbar after the CSS class change'", - "rect": [124, 52, 383, 19], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'You should see both vertical and horizontal scrollbars.'", - "rect": [8, 16, 340, 19], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'You should see both vertical and horizontal scrollbars.'", - "rect": [8, 16, 340, 19], - "reason": "disappeared" - }, - { - "object": "InlineTextBox 'This is the test for '", - "rect": [8, 52, 116, 19], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'This is the test for '", - "rect": [8, 52, 116, 19], - "reason": "disappeared" - }, - { - "object": "InlineTextBox '.'", - "rect": [507, 52, 4, 19], - "reason": "appeared" - }, - { - "object": "InlineTextBox '.'", - "rect": [507, 52, 4, 19], - "reason": "disappeared" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/overflow-scroll-composited-non-stacking-child-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/overflow-scroll-composited-non-stacking-child-expected.txt deleted file mode 100644 index c25531cc..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/overflow-scroll-composited-non-stacking-child-expected.txt +++ /dev/null
@@ -1,34 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "invalidations": [ - [93, 125, 180, 100], - [93, 75, 180, 100], - [308, 65, 15, 175] - ] - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='icon'", - "bounds": [40, 40], - "contentsOpaque": true, - "backgroundColor": "#FFDDBB", - "transform": 1 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [200, 10, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/overflow-scroll-delete-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/overflow-scroll-delete-expected.png deleted file mode 100644 index 3fda932..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/overflow-scroll-delete-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/overflow-scroll-local-background-text-color-change-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/overflow-scroll-local-background-text-color-change-expected.txt deleted file mode 100644 index 8d52990e4..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/overflow-scroll-local-background-text-color-change-expected.txt +++ /dev/null
@@ -1,72 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow DIV id='scroller'", - "bounds": [200, 200], - "contentsOpaqueForText": true, - "drawsContent": false, - "transform": 1 - }, - { - "name": "LayoutBlockFlow DIV id='scroller'", - "bounds": [185, 185], - "drawsContent": false, - "transform": 1 - }, - { - "name": "HorizontalScrollbar", - "position": [0, 185], - "bounds": [200, 15], - "contentsOpaqueForText": true, - "invalidations": [ - [0, 0, 185, 15] - ], - "transform": 1 - }, - { - "name": "VerticalScrollbar", - "position": [185, 0], - "bounds": [15, 185], - "contentsOpaque": true, - "transform": 1 - }, - { - "name": "LayoutBlockFlow DIV id='scroller'", - "bounds": [185, 552], - "contentsOpaque": true, - "backgroundColor": "#0000FF", - "invalidations": [ - [0, 0, 185, 552] - ], - "transform": 2 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 8, 0, 1] - ] - }, - { - "id": 2, - "parent": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [0, -367, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/repaint-composited-child-in-scrolled-container-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/repaint-composited-child-in-scrolled-container-expected.txt deleted file mode 100644 index fb92c909..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/repaint-composited-child-in-scrolled-container-expected.txt +++ /dev/null
@@ -1,55 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "invalidations": [ - [8, 293, 285, 15] - ] - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='container'", - "bounds": [600, 600], - "contentsOpaque": true, - "backgroundColor": "#FF0000", - "invalidations": [ - [0, 0, 600, 600] - ], - "transform": 3 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 8, 0, 1] - ] - }, - { - "id": 2, - "parent": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [-365, 0, 0, 1] - ] - }, - { - "id": 3, - "parent": 2, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [50, 0, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/repaint-during-scroll-with-zoom-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/repaint-during-scroll-with-zoom-expected.txt deleted file mode 100644 index c1ab524..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/repaint-during-scroll-with-zoom-expected.txt +++ /dev/null
@@ -1,60 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#C0C0C0" - }, - { - "name": "HorizontalScrollbar", - "position": [0, 235], - "bounds": [235, 15], - "contentsOpaque": true, - "transform": 1 - }, - { - "name": "VerticalScrollbar", - "position": [235, 0], - "bounds": [15, 235], - "contentsOpaque": true, - "transform": 1 - }, - { - "name": "Scroll corner of LayoutView #document", - "position": [235, 235], - "bounds": [15, 15], - "contentsOpaque": true, - "transform": 1 - }, - { - "name": "Scrolling background of LayoutView #document", - "bounds": [2008, 2016], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "transform": 2 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [2, 65, 0, 1] - ] - }, - { - "id": 2, - "parent": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [-10, -10, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/scroll-descendant-with-cached-cliprects-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/scroll-descendant-with-cached-cliprects-expected.txt deleted file mode 100644 index 46b7106..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/scroll-descendant-with-cached-cliprects-expected.txt +++ /dev/null
@@ -1,51 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [785, 1895], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "invalidations": [ - [677, 52, 100, 100] - ], - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='scrollpanel'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#FF0000", - "invalidations": [ - [0, 0, 100, 100] - ], - "transform": 2 - }, - { - "name": "VerticalScrollbar", - "position": [785, 0], - "bounds": [15, 600], - "contentsOpaque": true - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [0, -200, 0, 1] - ] - }, - { - "id": 2, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [677, 52, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/scroll-fixed-layer-with-no-visible-content-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/scroll-fixed-layer-with-no-visible-content-expected.txt deleted file mode 100644 index ed6483c..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/scroll-fixed-layer-with-no-visible-content-expected.txt +++ /dev/null
@@ -1,48 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [785, 2016], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='moveMe' class='fixed clipped'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#008000", - "invalidations": [ - [0, 0, 100, 100] - ], - "transform": 2 - }, - { - "name": "VerticalScrollbar", - "position": [785, 0], - "bounds": [15, 600], - "contentsOpaque": true - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [0, -1000, 0, 1] - ] - }, - { - "id": 2, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [100, 150, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/scroll-in-fixed-layer-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/scroll-in-fixed-layer-expected.txt deleted file mode 100644 index ed6483c..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/scroll-in-fixed-layer-expected.txt +++ /dev/null
@@ -1,48 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [785, 2016], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='moveMe' class='fixed clipped'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#008000", - "invalidations": [ - [0, 0, 100, 100] - ], - "transform": 2 - }, - { - "name": "VerticalScrollbar", - "position": [785, 0], - "bounds": [15, 600], - "contentsOpaque": true - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [0, -1000, 0, 1] - ] - }, - { - "id": 2, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [100, 150, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/scroll-stacking-context-backface-visiblity-leaves-traces-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/scroll-stacking-context-backface-visiblity-leaves-traces-expected.txt deleted file mode 100644 index 6916cffa..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/scroll/scroll-stacking-context-backface-visiblity-leaves-traces-expected.txt +++ /dev/null
@@ -1,63 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [785, 5056], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "transform": 1 - }, - { - "name": "LayoutBlockFlow (relative positioned) HEADER", - "bounds": [769, 20], - "contentsOpaqueForText": true, - "drawsContent": false, - "backfaceVisibility": "hidden", - "transform": 2 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='searchbar'", - "bounds": [150, 150], - "contentsOpaque": true, - "backgroundColor": "#800080", - "transform": 3 - }, - { - "name": "VerticalScrollbar", - "position": [785, 0], - "bounds": [15, 600], - "contentsOpaque": true - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [0, -1400, 0, 1] - ] - }, - { - "id": 2, - "parent": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 28, 0, 1] - ] - }, - { - "id": 3, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [18, 450, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/selection/invalidation-rect-includes-newline-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/selection/invalidation-rect-includes-newline-expected.png deleted file mode 100644 index bfc8ddb5..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/selection/invalidation-rect-includes-newline-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/selection/invalidation-rect-includes-newline-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/selection/invalidation-rect-includes-newline-expected.txt deleted file mode 100644 index cd5b5c5b..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/selection/invalidation-rect-includes-newline-expected.txt +++ /dev/null
@@ -1,15 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "invalidations": [ - [8, 8, 48, 16], - [8, 24, 32, 16] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/selection/invalidation-rect-includes-newline-for-rtl-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/selection/invalidation-rect-includes-newline-for-rtl-expected.png deleted file mode 100644 index 15c6318..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/selection/invalidation-rect-includes-newline-for-rtl-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/selection/invalidation-rect-includes-newline-for-rtl-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/selection/invalidation-rect-includes-newline-for-rtl-expected.txt deleted file mode 100644 index afd1fa0..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/selection/invalidation-rect-includes-newline-for-rtl-expected.txt +++ /dev/null
@@ -1,15 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "invalidations": [ - [0, 8, 40, 16], - [8, 24, 32, 16] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/selection/invalidation-rect-includes-newline-for-vertical-lr-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/selection/invalidation-rect-includes-newline-for-vertical-lr-expected.png deleted file mode 100644 index 06362a6..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/selection/invalidation-rect-includes-newline-for-vertical-lr-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/selection/invalidation-rect-includes-newline-for-vertical-lr-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/selection/invalidation-rect-includes-newline-for-vertical-lr-expected.txt deleted file mode 100644 index d70a2096..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/selection/invalidation-rect-includes-newline-for-vertical-lr-expected.txt +++ /dev/null
@@ -1,15 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "invalidations": [ - [8, 8, 16, 48], - [24, 8, 16, 32] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/selection/invalidation-rect-includes-newline-for-vertical-rl-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/selection/invalidation-rect-includes-newline-for-vertical-rl-expected.png deleted file mode 100644 index 83de137..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/selection/invalidation-rect-includes-newline-for-vertical-rl-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/selection/invalidation-rect-includes-newline-for-vertical-rl-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/selection/invalidation-rect-includes-newline-for-vertical-rl-expected.txt deleted file mode 100644 index 5ebcf164..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/selection/invalidation-rect-includes-newline-for-vertical-rl-expected.txt +++ /dev/null
@@ -1,15 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "invalidations": [ - [24, 8, 16, 48], - [8, 8, 16, 32] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/selection/invalidation-rect-with-br-includes-newline-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/selection/invalidation-rect-with-br-includes-newline-expected.png deleted file mode 100644 index 99549441..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/selection/invalidation-rect-with-br-includes-newline-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/selection/invalidation-rect-with-br-includes-newline-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/selection/invalidation-rect-with-br-includes-newline-expected.txt deleted file mode 100644 index 97ec688a..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/selection/invalidation-rect-with-br-includes-newline-expected.txt +++ /dev/null
@@ -1,16 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "invalidations": [ - [8, 24, 32, 16], - [24, 8, 16, 16], - [8, 8, 16, 16] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/selection/japanese-rl-selection-clear-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/selection/japanese-rl-selection-clear-expected.txt deleted file mode 100644 index dcdb2d0..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/selection/japanese-rl-selection-clear-expected.txt +++ /dev/null
@@ -1,27 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "invalidations": [ - [719, 123, 31, 404], - [688, 123, 31, 404], - [657, 123, 31, 404], - [626, 123, 31, 404], - [595, 123, 31, 404], - [533, 123, 31, 404], - [502, 123, 31, 404], - [471, 123, 31, 404], - [440, 123, 31, 404], - [409, 123, 31, 404], - [564, 123, 31, 388], - [378, 123, 31, 383], - [750, 123, 25, 404], - [347, 123, 25, 316] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/selection/repaint-rect-for-vertical-writing-mode-with-positioned-root-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/selection/repaint-rect-for-vertical-writing-mode-with-positioned-root-expected.png deleted file mode 100644 index d44bc9d..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/selection/repaint-rect-for-vertical-writing-mode-with-positioned-root-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/selection/repaint-rect-for-vertical-writing-mode-with-positioned-root-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/selection/repaint-rect-for-vertical-writing-mode-with-positioned-root-expected.txt deleted file mode 100644 index 5552193..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/selection/repaint-rect-for-vertical-writing-mode-with-positioned-root-expected.txt +++ /dev/null
@@ -1,14 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "invalidations": [ - [184, 201, 19, 168] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/selection/selection-after-delete-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/selection/selection-after-delete-expected.png deleted file mode 100644 index d1f77fc..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/selection/selection-after-delete-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/selection/selection-after-delete-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/selection/selection-after-delete-expected.txt deleted file mode 100644 index d451bfdb..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/selection/selection-after-delete-expected.txt +++ /dev/null
@@ -1,27 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "invalidations": [ - [38, 78, 152, 102], - [187, 138, 8, 20], - [187, 118, 8, 20], - [187, 98, 8, 20], - [187, 79, 8, 19] - ] - }, - { - "name": "Caret", - "position": [39, 79], - "bounds": [1, 19], - "contentsOpaque": true, - "invalidations": [ - [0, 0, 1, 19] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/selection/selection-after-remove-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/selection/selection-after-remove-expected.png deleted file mode 100644 index bc7d6a8..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/selection/selection-after-remove-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/selection/selection-after-remove-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/selection/selection-after-remove-expected.txt deleted file mode 100644 index d859ecf..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/selection/selection-after-remove-expected.txt +++ /dev/null
@@ -1,18 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "invalidations": [ - [38, 78, 152, 102], - [187, 138, 8, 20], - [187, 118, 8, 20], - [187, 98, 8, 20], - [187, 79, 8, 19] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/selection/selection-clear-after-move-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/selection/selection-clear-after-move-expected.txt deleted file mode 100644 index a027ba0..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/selection/selection-clear-after-move-expected.txt +++ /dev/null
@@ -1,14 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "invalidations": [ - [100, 300, 50, 50] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/selection/selection-clear-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/selection/selection-clear-expected.txt deleted file mode 100644 index 980a3afb..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/selection/selection-clear-expected.txt +++ /dev/null
@@ -1,14 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "invalidations": [ - [8, 8, 100, 200] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/selection/selection-in-composited-scrolling-container-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/selection/selection-in-composited-scrolling-container-expected.png deleted file mode 100644 index ec3eb38..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/selection/selection-in-composited-scrolling-container-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/selection/selection-partial-invalidation-between-blocks-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/selection/selection-partial-invalidation-between-blocks-expected.png deleted file mode 100644 index 87c9bdef..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/selection/selection-partial-invalidation-between-blocks-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/selection/selection-partial-invalidation-between-blocks-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/selection/selection-partial-invalidation-between-blocks-expected.txt deleted file mode 100644 index 951c064..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/selection/selection-partial-invalidation-between-blocks-expected.txt +++ /dev/null
@@ -1,15 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "invalidations": [ - [11, 35, 74, 19], - [11, 11, 58, 19] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/selection/selection-rl-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/selection/selection-rl-expected.png deleted file mode 100644 index 58fd09c9..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/selection/selection-rl-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/selection/selection-rl-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/selection/selection-rl-expected.txt deleted file mode 100644 index ed54d71..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/selection/selection-rl-expected.txt +++ /dev/null
@@ -1,14 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "invalidations": [ - [773, 8, 19, 143] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/selection/selection-within-composited-scroller-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/selection/selection-within-composited-scroller-expected.png deleted file mode 100644 index 3a6d797..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/selection/selection-within-composited-scroller-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/selection/selection-within-composited-scroller-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/selection/selection-within-composited-scroller-expected.txt deleted file mode 100644 index e2caab09..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/selection/selection-within-composited-scroller-expected.txt +++ /dev/null
@@ -1,76 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow DIV id='scroller'", - "bounds": [200, 200], - "contentsOpaqueForText": true, - "drawsContent": false, - "transform": 1 - }, - { - "name": "LayoutBlockFlow DIV id='scroller'", - "bounds": [185, 185], - "drawsContent": false, - "transform": 1 - }, - { - "name": "HorizontalScrollbar", - "position": [0, 185], - "bounds": [185, 15], - "contentsOpaque": true, - "transform": 1 - }, - { - "name": "VerticalScrollbar", - "position": [185, 0], - "bounds": [15, 185], - "contentsOpaque": true, - "transform": 1 - }, - { - "name": "Scroll corner of LayoutBlockFlow DIV id='scroller'", - "position": [185, 185], - "bounds": [15, 15], - "contentsOpaque": true, - "transform": 1 - }, - { - "name": "LayoutBlockFlow DIV id='scroller'", - "bounds": [200, 1620], - "contentsOpaque": true, - "backgroundColor": "#ADD8E6", - "invalidations": [ - [0, 610, 22, 19] - ], - "transform": 2 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 8, 0, 1] - ] - }, - { - "id": 2, - "parent": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [0, -450, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/selection/text-selection-rect-in-overflow-2-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/selection/text-selection-rect-in-overflow-2-expected.png deleted file mode 100644 index 32b1527..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/selection/text-selection-rect-in-overflow-2-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/selection/text-selection-rect-in-overflow-2-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/selection/text-selection-rect-in-overflow-2-expected.txt deleted file mode 100644 index c5ab676c..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/selection/text-selection-rect-in-overflow-2-expected.txt +++ /dev/null
@@ -1,14 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "invalidations": [ - [18, 18, 234, 19] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/selection/text-selection-rect-in-overflow-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/selection/text-selection-rect-in-overflow-expected.txt deleted file mode 100644 index 5faa354..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/selection/text-selection-rect-in-overflow-expected.txt +++ /dev/null
@@ -1,14 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "invalidations": [ - [8, 8, 197, 19] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/shadow-multiple-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/shadow-multiple-expected.png deleted file mode 100644 index 98c30647..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/shadow-multiple-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/stacking-context-lost-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/stacking-context-lost-expected.txt deleted file mode 100644 index 30519d96..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/stacking-context-lost-expected.txt +++ /dev/null
@@ -1,33 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV id='outer'", - "bounds": [100, 100], - "contentsOpaque": true, - "backfaceVisibility": "hidden", - "backgroundColor": "#008000", - "invalidations": [ - [0, 0, 100, 100] - ], - "transform": 1 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [278, 278, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/subtree-root-skipped-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/subtree-root-skipped-expected.txt deleted file mode 100644 index 6622112..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/subtree-root-skipped-expected.txt +++ /dev/null
@@ -1,28 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'PASS'", - "rect": [10, 11, 35, 16], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'FAIL'", - "rect": [10, 11, 27, 16], - "reason": "disappeared" - }, - { - "object": "LayoutBlockFlow (positioned) DIV id='div'", - "rect": [8, 288, 10, 20], - "reason": "geometry" - } - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/svg/animated-path-inside-transformed-html-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/svg/animated-path-inside-transformed-html-expected.png deleted file mode 100644 index ca09d30e..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/svg/animated-path-inside-transformed-html-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/svg/animated-path-inside-transformed-html-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/svg/animated-path-inside-transformed-html-expected.txt deleted file mode 100644 index 786e0028..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/svg/animated-path-inside-transformed-html-expected.txt +++ /dev/null
@@ -1,19 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "invalidations": [ - [246, 89, 127, 46], - [203, 336, 126, 45], - [108, 84, 105, 102], - [355, 125, 104, 104], - [352, 398, 99, 98], - [90, 207, 98, 99] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/svg/animated-svg-as-image-transformed-offscreen-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/svg/animated-svg-as-image-transformed-offscreen-expected.txt deleted file mode 100644 index 238165b..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/svg/animated-svg-as-image-transformed-offscreen-expected.txt +++ /dev/null
@@ -1,55 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [2008, 2016], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow DIV id='targetDiv'", - "bounds": [2000, 2000], - "transform": 2 - }, - { - "name": "HorizontalScrollbar", - "position": [0, 585], - "bounds": [785, 15], - "contentsOpaque": true - }, - { - "name": "VerticalScrollbar", - "position": [785, 0], - "bounds": [15, 585], - "contentsOpaque": true - }, - { - "name": "Scroll corner of LayoutView #document", - "position": [785, 585], - "bounds": [15, 15], - "contentsOpaque": true - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 8, 0, 1] - ] - }, - { - "id": 2, - "parent": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [0, -1000, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/svg/hit-test-with-br-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/svg/hit-test-with-br-expected.png deleted file mode 100644 index 913572e..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/svg/hit-test-with-br-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/svg/js-late-gradient-and-object-creation-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/svg/js-late-gradient-and-object-creation-expected.png deleted file mode 100644 index dca35a8d..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/svg/js-late-gradient-and-object-creation-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/svg/js-late-gradient-creation-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/svg/js-late-gradient-creation-expected.png deleted file mode 100644 index b9bfcd3..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/svg/js-late-gradient-creation-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/svg/scrolling-embedded-svg-file-image-repaint-problem-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/svg/scrolling-embedded-svg-file-image-repaint-problem-expected.txt deleted file mode 100644 index ef0293a..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/svg/scrolling-embedded-svg-file-image-repaint-problem-expected.txt +++ /dev/null
@@ -1,97 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [1026, 996], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "paintInvalidations": [ - { - "object": "InlineTextBox 'pservers-pattern-01-b \u2190'", - "rect": [208, 972, 173, 19], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'pservers-pattern-01-b \u2190'", - "rect": [208, 972, 173, 19], - "reason": "disappeared" - }, - { - "object": "InlineTextBox '\u2192 script-handle-01-b'", - "rect": [427, 972, 150, 19], - "reason": "appeared" - }, - { - "object": "InlineTextBox '\u2192 script-handle-01-b'", - "rect": [427, 972, 150, 19], - "reason": "disappeared" - }, - { - "object": "LayoutInline A", - "rect": [383, 971, 42, 21], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'index'", - "rect": [384, 972, 40, 19], - "reason": "appeared" - }, - { - "object": "InlineTextBox 'index'", - "rect": [384, 972, 40, 19], - "reason": "disappeared" - }, - { - "object": "InlineTextBox '\n'", - "rect": [423, 972, 5, 19], - "reason": "appeared" - }, - { - "object": "InlineTextBox '\n'", - "rect": [423, 972, 5, 19], - "reason": "disappeared" - }, - { - "object": "InlineTextBox '\n'", - "rect": [380, 972, 5, 19], - "reason": "appeared" - }, - { - "object": "InlineTextBox '\n'", - "rect": [380, 972, 5, 19], - "reason": "disappeared" - } - ], - "transform": 1 - }, - { - "name": "ContentsLayer for Horizontal Scrollbar Layer", - "position": [0, 585], - "bounds": [785, 15], - "contentsOpaque": true - }, - { - "name": "ContentsLayer for Vertical Scrollbar Layer", - "position": [785, 0], - "bounds": [15, 585], - "contentsOpaque": true - }, - { - "name": "Scroll Corner Layer", - "position": [785, 585], - "bounds": [15, 15] - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [0, -411, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/svg/text-rescale-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/svg/text-rescale-expected.txt deleted file mode 100644 index fa46e4a..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/svg/text-rescale-expected.txt +++ /dev/null
@@ -1,23 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "invalidations": [ - [0, 114, 192, 46], - [0, 14, 192, 46], - [310, 114, 91, 46], - [310, 14, 91, 46], - [210, 114, 91, 46], - [210, 14, 91, 46], - [0, 3, 8, 3], - [9, 3, 4, 3], - [6, 3, 4, 2], - [0, 0, 1, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/svg/text-selection-text-05-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/svg/text-selection-text-05-t-expected.png deleted file mode 100644 index d148296..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/svg/text-selection-text-05-t-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/svg/text-selection-text-05-t-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/svg/text-selection-text-05-t-expected.txt deleted file mode 100644 index ff2246d..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/svg/text-selection-text-05-t-expected.txt +++ /dev/null
@@ -1,56 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "invalidations": [ - [16, 522, 450, 78], - [519, 12, 129, 36], - [352, 12, 129, 36], - [186, 12, 128, 36], - [266, 485, 113, 29], - [266, 201, 113, 21], - [428, 485, 104, 29], - [428, 201, 104, 21], - [590, 485, 94, 29], - [590, 201, 94, 21], - [376, 36, 82, 35], - [16, 491, 79, 34], - [16, 441, 79, 34], - [16, 391, 79, 34], - [16, 341, 79, 34], - [16, 291, 79, 34], - [16, 241, 79, 34], - [16, 191, 79, 34], - [16, 141, 79, 34], - [16, 91, 79, 34], - [428, 285, 61, 54], - [266, 285, 61, 54], - [428, 435, 61, 29], - [266, 435, 61, 29], - [428, 151, 61, 21], - [266, 151, 61, 21], - [590, 285, 60, 54], - [590, 435, 60, 29], - [590, 151, 60, 21], - [224, 36, 52, 35], - [428, 335, 46, 54], - [266, 335, 46, 54], - [590, 335, 45, 54], - [562, 36, 42, 35], - [573, 235, 39, 54], - [411, 235, 38, 54], - [546, 101, 38, 21], - [250, 235, 37, 54], - [250, 385, 37, 45], - [398, 101, 37, 21], - [250, 101, 37, 21], - [565, 385, 29, 45], - [411, 385, 29, 45] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/svg/transform-focus-ring-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/svg/transform-focus-ring-repaint-expected.txt deleted file mode 100644 index 4141e86..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/svg/transform-focus-ring-repaint-expected.txt +++ /dev/null
@@ -1,48 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling Contents Layer", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='target'", - "position": [-1, -1], - "bounds": [402, 542], - "backfaceVisibility": "hidden", - "backgroundColor": "#FFFF00", - "paintInvalidations": [ - { - "object": "LayoutBlockFlow (positioned) DIV id='target'", - "rect": [0, 0, 402, 542], - "reason": "full layer" - }, - { - "object": "LayoutBlockFlow (positioned) DIV id='target'", - "rect": [0, 0, 200, 200], - "reason": "full layer" - } - ], - "transform": 1 - }, - { - "name": "Squashing Layer (first squashed layer: LayoutBlockFlow (positioned) DIV)", - "position": [100, 100], - "bounds": [300, 440], - "transform": 1 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 58, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/svg/zoom-foreignObject-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/svg/zoom-foreignObject-expected.png deleted file mode 100644 index 4130567..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/svg/zoom-foreignObject-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/animated-row-background-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/animated-row-background-expected.txt deleted file mode 100644 index e7f93c8d..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/animated-row-background-expected.txt +++ /dev/null
@@ -1,15 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "invalidations": [ - [8, 10, 210, 102], - [8, 114, 50, 50] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/border-collapse-change-separate-to-collapse-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/border-collapse-change-separate-to-collapse-expected.png deleted file mode 100644 index 354cc0f0..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/border-collapse-change-separate-to-collapse-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/cached-change-col-border-color-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/cached-change-col-border-color-expected.txt deleted file mode 100644 index ca7a6b8..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/cached-change-col-border-color-expected.txt +++ /dev/null
@@ -1,15 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "invalidations": [ - [8, 59, 113, 53], - [8, 8, 113, 53] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/cached-change-col-border-width-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/cached-change-col-border-width-expected.txt deleted file mode 100644 index b1c73cfa..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/cached-change-col-border-width-expected.txt +++ /dev/null
@@ -1,16 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "invalidations": [ - [8, 59, 113, 53], - [8, 8, 113, 53], - [8, 58, 109, 52] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/cached-change-colgroup-border-color-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/cached-change-colgroup-border-color-expected.txt deleted file mode 100644 index 46a9640..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/cached-change-colgroup-border-color-expected.txt +++ /dev/null
@@ -1,15 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "invalidations": [ - [8, 59, 167, 53], - [8, 8, 167, 53] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/cached-change-colgroup-border-width-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/cached-change-colgroup-border-width-expected.txt deleted file mode 100644 index d3c610d..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/cached-change-colgroup-border-width-expected.txt +++ /dev/null
@@ -1,16 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "invalidations": [ - [8, 59, 167, 53], - [8, 8, 167, 53], - [8, 58, 162, 52] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/cached-change-row-border-color-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/cached-change-row-border-color-expected.txt deleted file mode 100644 index 69126da..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/cached-change-row-border-color-expected.txt +++ /dev/null
@@ -1,15 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "invalidations": [ - [8, 8, 60, 54], - [8, 58, 60, 53] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/cached-change-row-border-width-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/cached-change-row-border-width-expected.txt deleted file mode 100644 index 69126da..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/cached-change-row-border-width-expected.txt +++ /dev/null
@@ -1,15 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "invalidations": [ - [8, 8, 60, 54], - [8, 58, 60, 53] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/cached-change-tbody-border-color-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/cached-change-tbody-border-color-expected.txt deleted file mode 100644 index c269946..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/cached-change-tbody-border-color-expected.txt +++ /dev/null
@@ -1,16 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "invalidations": [ - [8, 108, 114, 53], - [8, 59, 114, 53], - [8, 8, 114, 53] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/cached-change-tbody-border-width-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/cached-change-tbody-border-width-expected.txt deleted file mode 100644 index 458f2ae..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/cached-change-tbody-border-width-expected.txt +++ /dev/null
@@ -1,17 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "invalidations": [ - [8, 108, 114, 53], - [8, 59, 114, 53], - [8, 8, 114, 53], - [8, 58, 109, 52] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/composited-table-background-col-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/composited-table-background-col-expected.txt deleted file mode 100644 index 47cf4db..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/composited-table-background-col-expected.txt +++ /dev/null
@@ -1,30 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "invalidations": [ - [8, 28, 186, 134] - ] - }, - { - "name": "LayoutTableCell TD", - "bounds": [59, 64], - "transform": 1 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [72, 96, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/composited-table-background-col-initial-empty-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/composited-table-background-col-initial-empty-expected.txt deleted file mode 100644 index 47cf4db..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/composited-table-background-col-initial-empty-expected.txt +++ /dev/null
@@ -1,30 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "invalidations": [ - [8, 28, 186, 134] - ] - }, - { - "name": "LayoutTableCell TD", - "bounds": [59, 64], - "transform": 1 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [72, 96, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/composited-table-background-col-span-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/composited-table-background-col-span-expected.txt deleted file mode 100644 index b6b5549..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/composited-table-background-col-span-expected.txt +++ /dev/null
@@ -1,44 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "invalidations": [ - [8, 28, 186, 134] - ] - }, - { - "name": "LayoutTableCell TD", - "bounds": [59, 64], - "transform": 1 - }, - { - "name": "LayoutTableCell TD", - "bounds": [59, 64], - "transform": 2 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [72, 96, 0, 1] - ] - }, - { - "id": 2, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [133, 96, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/composited-table-background-col-span-initial-empty-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/composited-table-background-col-span-initial-empty-expected.txt deleted file mode 100644 index b6b5549..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/composited-table-background-col-span-initial-empty-expected.txt +++ /dev/null
@@ -1,44 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "invalidations": [ - [8, 28, 186, 134] - ] - }, - { - "name": "LayoutTableCell TD", - "bounds": [59, 64], - "transform": 1 - }, - { - "name": "LayoutTableCell TD", - "bounds": [59, 64], - "transform": 2 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [72, 96, 0, 1] - ] - }, - { - "id": 2, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [133, 96, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/composited-table-background-colgroup-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/composited-table-background-colgroup-expected.txt deleted file mode 100644 index eda629c8..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/composited-table-background-colgroup-expected.txt +++ /dev/null
@@ -1,30 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "invalidations": [ - [8, 28, 186, 134] - ] - }, - { - "name": "LayoutTableCell TD id='target'", - "bounds": [59, 64], - "transform": 1 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [72, 96, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/composited-table-background-colgroup-initial-empty-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/composited-table-background-colgroup-initial-empty-expected.txt deleted file mode 100644 index eda629c8..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/composited-table-background-colgroup-initial-empty-expected.txt +++ /dev/null
@@ -1,30 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "invalidations": [ - [8, 28, 186, 134] - ] - }, - { - "name": "LayoutTableCell TD id='target'", - "bounds": [59, 64], - "transform": 1 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [72, 96, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/composited-table-background-composited-row-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/composited-table-background-composited-row-expected.txt deleted file mode 100644 index d1486b4..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/composited-table-background-composited-row-expected.txt +++ /dev/null
@@ -1,35 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutTableRow TR id='target'", - "position": [8, 96], - "bounds": [186, 64], - "invalidations": [ - [0, 0, 186, 64] - ] - }, - { - "name": "LayoutTableCell TD", - "bounds": [59, 64], - "transform": 1 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [72, 96, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/composited-table-background-composited-row-initial-empty-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/composited-table-background-composited-row-initial-empty-expected.txt deleted file mode 100644 index d1486b4..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/composited-table-background-composited-row-initial-empty-expected.txt +++ /dev/null
@@ -1,35 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutTableRow TR id='target'", - "position": [8, 96], - "bounds": [186, 64], - "invalidations": [ - [0, 0, 186, 64] - ] - }, - { - "name": "LayoutTableCell TD", - "bounds": [59, 64], - "transform": 1 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [72, 96, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/composited-table-background-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/composited-table-background-expected.txt deleted file mode 100644 index 5360127..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/composited-table-background-expected.txt +++ /dev/null
@@ -1,30 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "invalidations": [ - [8, 96, 186, 64] - ] - }, - { - "name": "LayoutTableCell TD", - "bounds": [59, 64], - "transform": 1 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [72, 96, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/composited-table-background-initial-empty-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/composited-table-background-initial-empty-expected.txt deleted file mode 100644 index 5360127..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/composited-table-background-initial-empty-expected.txt +++ /dev/null
@@ -1,30 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "invalidations": [ - [8, 96, 186, 64] - ] - }, - { - "name": "LayoutTableCell TD", - "bounds": [59, 64], - "transform": 1 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [72, 96, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/composited-table-background-section-composited-row-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/composited-table-background-section-composited-row-expected.txt deleted file mode 100644 index 563eb0fc..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/composited-table-background-section-composited-row-expected.txt +++ /dev/null
@@ -1,40 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutTableSection TBODY id='target'", - "position": [8, 28], - "bounds": [186, 134], - "invalidations": [ - [0, 0, 186, 134] - ] - }, - { - "name": "LayoutTableRow TR", - "position": [8, 96], - "bounds": [186, 64] - }, - { - "name": "LayoutTableCell TD", - "bounds": [59, 64], - "transform": 1 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [72, 96, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/composited-table-background-section-composited-row-initial-empty-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/composited-table-background-section-composited-row-initial-empty-expected.txt deleted file mode 100644 index 563eb0fc..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/composited-table-background-section-composited-row-initial-empty-expected.txt +++ /dev/null
@@ -1,40 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutTableSection TBODY id='target'", - "position": [8, 28], - "bounds": [186, 134], - "invalidations": [ - [0, 0, 186, 134] - ] - }, - { - "name": "LayoutTableRow TR", - "position": [8, 96], - "bounds": [186, 64] - }, - { - "name": "LayoutTableCell TD", - "bounds": [59, 64], - "transform": 1 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [72, 96, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/composited-table-background-section-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/composited-table-background-section-expected.txt deleted file mode 100644 index 515a279..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/composited-table-background-section-expected.txt +++ /dev/null
@@ -1,35 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutTableSection TBODY id='target'", - "position": [8, 28], - "bounds": [186, 134], - "invalidations": [ - [0, 0, 186, 134] - ] - }, - { - "name": "LayoutTableCell TD", - "bounds": [59, 64], - "transform": 1 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [72, 96, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/composited-table-background-section-initial-empty-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/composited-table-background-section-initial-empty-expected.txt deleted file mode 100644 index 515a279..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/composited-table-background-section-initial-empty-expected.txt +++ /dev/null
@@ -1,35 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutTableSection TBODY id='target'", - "position": [8, 28], - "bounds": [186, 134], - "invalidations": [ - [0, 0, 186, 134] - ] - }, - { - "name": "LayoutTableCell TD", - "bounds": [59, 64], - "transform": 1 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [72, 96, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/composited-table-row-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/composited-table-row-expected.txt deleted file mode 100644 index a012f06..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/composited-table-row-expected.txt +++ /dev/null
@@ -1,19 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutTableRow TR", - "position": [8, 8], - "bounds": [74, 24], - "invalidations": [ - [0, 0, 37, 23] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/fixed-table-cell-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/fixed-table-cell-expected.txt deleted file mode 100644 index dfbf02e..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/fixed-table-cell-expected.txt +++ /dev/null
@@ -1,51 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [785, 2016], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "invalidations": [ - [200, 200, 100, 100] - ], - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) TD id='moveMe' class='fixed'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#008000", - "invalidations": [ - [0, 0, 100, 100] - ], - "transform": 2 - }, - { - "name": "VerticalScrollbar", - "position": [785, 0], - "bounds": [15, 600], - "contentsOpaque": true - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [0, -100, 0, 1] - ] - }, - { - "id": 2, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [50, 100, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/fixed-table-overflow-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/fixed-table-overflow-expected.txt deleted file mode 100644 index 06228f8b..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/fixed-table-overflow-expected.txt +++ /dev/null
@@ -1,53 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [785, 2016], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "invalidations": [ - [100, 100, 100, 100], - [0, 100, 100, 100] - ], - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) TD id='moveMe' class='fixed'", - "position": [-100, 0], - "bounds": [200, 100], - "contentsOpaque": true, - "backgroundColor": "#008000", - "invalidations": [ - [0, 0, 200, 100] - ], - "transform": 2 - }, - { - "name": "VerticalScrollbar", - "position": [785, 0], - "bounds": [15, 600], - "contentsOpaque": true - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [0, -100, 0, 1] - ] - }, - { - "id": 2, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [100, 0, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/fixed-table-overflow-zindex-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/fixed-table-overflow-zindex-expected.txt deleted file mode 100644 index e815cea8..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/fixed-table-overflow-zindex-expected.txt +++ /dev/null
@@ -1,51 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [785, 2016], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "invalidations": [ - [0, 100, 100, 100] - ], - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) TD id='moveMe' class='fixed'", - "bounds": [100, 100], - "contentsOpaque": true, - "backgroundColor": "#008000", - "invalidations": [ - [0, 0, 100, 100] - ], - "transform": 2 - }, - { - "name": "VerticalScrollbar", - "position": [785, 0], - "bounds": [15, 600], - "contentsOpaque": true - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [0, -100, 0, 1] - ] - }, - { - "id": 2, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [100, 0, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/invalidate-cell-in-row-with-offset-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/invalidate-cell-in-row-with-offset-expected.png deleted file mode 100644 index 3572603..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/invalidate-cell-in-row-with-offset-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/invalidate-cell-in-row-with-offset-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/invalidate-cell-in-row-with-offset-expected.txt deleted file mode 100644 index 2d737b4a..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/invalidate-cell-in-row-with-offset-expected.txt +++ /dev/null
@@ -1,26 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutTableRow TR", - "position": [8, 28], - "bounds": [234, 102], - "contentsOpaqueForText": true - }, - { - "name": "LayoutTableRow TR class='shadow-inset'", - "position": [8, 140], - "bounds": [234, 102], - "contentsOpaqueForText": true, - "invalidations": [ - [10, 0, 102, 102] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/invisible-col-visible-td-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/invisible-col-visible-td-expected.txt deleted file mode 100644 index 09ab61c..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/invisible-col-visible-td-expected.txt +++ /dev/null
@@ -1,14 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "invalidations": [ - [9, 9, 198, 198] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/invisible-tr-visible-td-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/invisible-tr-visible-td-expected.txt deleted file mode 100644 index 20201d4..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/invisible-tr-visible-td-expected.txt +++ /dev/null
@@ -1,14 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "invalidations": [ - [8, 8, 200, 200] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/replace-col-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/replace-col-expected.txt deleted file mode 100644 index 8821a00..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/replace-col-expected.txt +++ /dev/null
@@ -1,16 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "invalidations": [ - [10, 132, 52, 22], - [10, 108, 52, 22], - [10, 84, 52, 22] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/resize-table-repaint-percent-size-cell-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/resize-table-repaint-percent-size-cell-expected.txt deleted file mode 100644 index 6d85b17..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/resize-table-repaint-percent-size-cell-expected.txt +++ /dev/null
@@ -1,15 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "invalidations": [ - [2, 52, 102, 238], - [2, 292, 102, 236] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/row-change-background-rowspan-cell-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/row-change-background-rowspan-cell-expected.txt deleted file mode 100644 index 4a1198cd..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/row-change-background-rowspan-cell-expected.txt +++ /dev/null
@@ -1,14 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "invalidations": [ - [8, 298, 110, 106] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/single-line-cells-repeating-thead-break-inside-on-thead-only-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/single-line-cells-repeating-thead-break-inside-on-thead-only-expected.png deleted file mode 100644 index d3c0ec7..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/single-line-cells-repeating-thead-break-inside-on-thead-only-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/single-line-cells-repeating-thead-break-inside-on-thead-only-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/single-line-cells-repeating-thead-break-inside-on-thead-only-expected.txt deleted file mode 100644 index 33aaf85..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/single-line-cells-repeating-thead-break-inside-on-thead-only-expected.txt +++ /dev/null
@@ -1,23 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [1059, 585], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "invalidations": [ - [809, 74, 37, 19], - [543, 74, 37, 19], - [276, 74, 37, 19], - [10, 74, 36, 19] - ] - }, - { - "name": "HorizontalScrollbar", - "position": [0, 585], - "bounds": [800, 15], - "contentsOpaque": true - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/table-cell-collapsed-border-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/table-cell-collapsed-border-expected.txt deleted file mode 100644 index 0e853f8..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/table-cell-collapsed-border-expected.txt +++ /dev/null
@@ -1,17 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "invalidations": [ - [3, 264, 441, 110], - [3, 166, 441, 108], - [3, 364, 441, 105], - [8, 64, 436, 108] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/table-cell-vertical-overflow-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/table-cell-vertical-overflow-expected.png deleted file mode 100644 index e49e50f..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/table-cell-vertical-overflow-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/table-collapsed-border-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/table-collapsed-border-expected.txt deleted file mode 100644 index 791738cb..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/table-collapsed-border-expected.txt +++ /dev/null
@@ -1,23 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "invalidations": [ - [8, 224, 108, 22], - [8, 338, 99, 30], - [8, 286, 99, 30], - [8, 154, 99, 30], - [8, 102, 99, 30], - [8, 316, 99, 22], - [8, 132, 99, 22], - [8, 62, 95, 30], - [8, 10, 95, 30], - [8, 40, 95, 22] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/table-extra-bottom-grow-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/table-extra-bottom-grow-expected.txt deleted file mode 100644 index 82c7392..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/table-extra-bottom-grow-expected.txt +++ /dev/null
@@ -1,11 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/table-outer-border-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/table-outer-border-expected.txt deleted file mode 100644 index ef2d363..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/table-outer-border-expected.txt +++ /dev/null
@@ -1,15 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "invalidations": [ - [8, 75, 132, 82], - [8, 8, 132, 82] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/table-row-bg-change-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/table-row-bg-change-expected.txt deleted file mode 100644 index 394af0a..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/table-row-bg-change-expected.txt +++ /dev/null
@@ -1,14 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "invalidations": [ - [8, 10, 200, 97] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/table-section-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/table-section-repaint-expected.txt deleted file mode 100644 index 37303f1..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/table-section-repaint-expected.txt +++ /dev/null
@@ -1,26 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "invalidations": [ - [8, 353, 60, 38], - [8, 338, 60, 38], - [8, 323, 60, 38], - [8, 308, 60, 38], - [8, 248, 60, 30], - [8, 218, 60, 30], - [8, 188, 60, 30], - [8, 158, 60, 30], - [8, 128, 60, 30], - [8, 98, 60, 30], - [8, 68, 60, 30], - [8, 38, 60, 30], - [8, 8, 60, 30] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/table-two-pass-layout-overpaint-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/table-two-pass-layout-overpaint-expected.txt deleted file mode 100644 index aaf33f6..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/table/table-two-pass-layout-overpaint-expected.txt +++ /dev/null
@@ -1,14 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "invalidations": [ - [61, 45, 50, 25] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/text-append-dirty-lines-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/text-append-dirty-lines-expected.txt deleted file mode 100644 index 2d4209c..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/text-append-dirty-lines-expected.txt +++ /dev/null
@@ -1,20 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "invalidations": [ - [8, 144, 756, 19], - [8, 84, 751, 19], - [8, 64, 749, 19], - [8, 44, 744, 19], - [8, 124, 740, 19], - [8, 104, 713, 19], - [8, 164, 106, 19] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/text-match-document-change-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/text-match-document-change-expected.txt deleted file mode 100644 index e402631..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/text-match-document-change-expected.txt +++ /dev/null
@@ -1,16 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "invalidations": [ - [18, 130, 251, 19], - [18, 150, 240, 19], - [295, 102, 15, 400] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/transform/caret-with-transformation-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/transform/caret-with-transformation-expected.txt deleted file mode 100644 index 8ceeda4..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/transform/caret-with-transformation-expected.txt +++ /dev/null
@@ -1,50 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "Caret", - "position": [340, 0], - "bounds": [1, 19], - "contentsOpaque": true, - "invalidations": [ - [0, 0, 1, 19] - ], - "transform": 2 - }, - { - "name": "LayoutBlockFlow DIV", - "position": [-2, -2], - "bounds": [788, 24], - "contentsOpaqueForText": true, - "transform": 2 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 8, 0, 1] - ] - }, - { - "id": 2, - "parent": 1, - "transform": [ - [0.866025403784439, 0.5, 0, 0], - [-0.5, 0.866025403784439, 0, 0], - [0, 0, 1, 0], - [-13.3974596215561, 223.205080756888, 0, 1] - ], - "origin": [392, 10] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/transform/invalidation-with-scale-transform-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/transform/invalidation-with-scale-transform-expected.txt deleted file mode 100644 index decf70f..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/transform/invalidation-with-scale-transform-expected.txt +++ /dev/null
@@ -1,14 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "invalidations": [ - [85, 70, 91, 91] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/transform/transform-layout-repaint-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/transform/transform-layout-repaint-expected.txt deleted file mode 100644 index 3339aba..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/transform/transform-layout-repaint-expected.txt +++ /dev/null
@@ -1,14 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "invalidations": [ - [40, 50, 208, 118] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/vertical-align-length1-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/vertical-align-length1-expected.txt deleted file mode 100644 index 9e6303c..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/vertical-align-length1-expected.txt +++ /dev/null
@@ -1,18 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "invalidations": [ - [20, 0, 100, 100], - [120, 130, 20, 20], - [120, 100, 20, 20], - [0, 130, 20, 20], - [0, 100, 20, 20] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/vertical-align-length2-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/vertical-align-length2-expected.txt deleted file mode 100644 index faf5d3f..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/vertical-align-length2-expected.txt +++ /dev/null
@@ -1,17 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "invalidations": [ - [300, 0, 200, 200], - [0, 0, 200, 200], - [200, 80, 100, 100], - [200, 50, 100, 100] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/vertical-align1-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/vertical-align1-expected.txt deleted file mode 100644 index 9b470de..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/vertical-align1-expected.txt +++ /dev/null
@@ -1,18 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "invalidations": [ - [20, 0, 100, 100], - [120, 80, 20, 20], - [120, 34, 20, 20], - [0, 80, 20, 20], - [0, 34, 20, 20] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/vertical-align2-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/vertical-align2-expected.txt deleted file mode 100644 index 684e8b44..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/vertical-align2-expected.txt +++ /dev/null
@@ -1,17 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "invalidations": [ - [300, 0, 200, 200], - [0, 0, 200, 200], - [200, 146, 100, 100], - [200, 100, 100, 100] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/vertical-rl-as-paint-container-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/vertical-rl-as-paint-container-expected.txt deleted file mode 100644 index 92c88bf3..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/vertical-rl-as-paint-container-expected.txt +++ /dev/null
@@ -1,34 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow DIV id='target'", - "bounds": [600, 400], - "backfaceVisibility": "hidden", - "invalidations": [ - [580, 0, 20, 340], - [520, 0, 20, 320], - [540, 0, 20, 220], - [560, 0, 20, 180] - ], - "transform": 1 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 8, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/video-paint-invalidation-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/video-paint-invalidation-expected.txt deleted file mode 100644 index 248e12a5..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/video-paint-invalidation-expected.txt +++ /dev/null
@@ -1,32 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutVideo VIDEO id='video'", - "bounds": [320, 240], - "transform": 1 - }, - { - "name": "LayoutFlexibleBox DIV class='sizing-small test-mode phase-ready state-scrubbing'", - "bounds": [320, 240], - "transform": 1 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 8, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/window-resize/window-resize-background-image-fixed-centered-composited-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/window-resize/window-resize-background-image-fixed-centered-composited-expected.txt deleted file mode 100644 index 1cc4d7b..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/window-resize/window-resize-background-image-fixed-centered-composited-expected.txt +++ /dev/null
@@ -1,77 +0,0 @@ -{ - "layers": [ - { - "name": "LayoutView #document", - "bounds": [600, 250], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "invalidations": [ - [0, 0, 600, 250] - ] - }, - { - "name": "LayoutBlockFlow HTML", - "bounds": [600, 8], - "contentsOpaqueForText": true, - "drawsContent": false - } - ] -} -{ - "layers": [ - { - "name": "LayoutView #document", - "bounds": [400, 250], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "invalidations": [ - [0, 0, 400, 250] - ] - }, - { - "name": "LayoutBlockFlow HTML", - "bounds": [400, 8], - "contentsOpaqueForText": true, - "drawsContent": false - } - ] -} -{ - "layers": [ - { - "name": "LayoutView #document", - "bounds": [400, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "invalidations": [ - [0, 0, 400, 600] - ] - }, - { - "name": "LayoutBlockFlow HTML", - "bounds": [400, 8], - "contentsOpaqueForText": true, - "drawsContent": false - } - ] -} -{ - "layers": [ - { - "name": "LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "invalidations": [ - [0, 0, 800, 600] - ] - }, - { - "name": "LayoutBlockFlow HTML", - "bounds": [800, 8], - "contentsOpaqueForText": true, - "drawsContent": false - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/window-resize/window-resize-centered-inline-under-fixed-pos-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/window-resize/window-resize-centered-inline-under-fixed-pos-expected.txt deleted file mode 100644 index 469c7d7..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/window-resize/window-resize-centered-inline-under-fixed-pos-expected.txt +++ /dev/null
@@ -1,83 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [600, 250], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='container'", - "bounds": [600, 250], - "contentsOpaque": true, - "backgroundColor": "#D3D3D3", - "invalidations": [ - [0, 0, 600, 250] - ] - } - ] -} -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [400, 250], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='container'", - "bounds": [400, 250], - "contentsOpaque": true, - "backgroundColor": "#D3D3D3", - "invalidations": [ - [0, 0, 400, 250] - ] - } - ] -} -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [400, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "invalidations": [ - [0, 250, 400, 350] - ] - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='container'", - "bounds": [400, 600], - "contentsOpaque": true, - "backgroundColor": "#D3D3D3", - "invalidations": [ - [0, 0, 400, 600] - ] - } - ] -} -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "invalidations": [ - [400, 0, 400, 600] - ] - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='container'", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#D3D3D3", - "invalidations": [ - [0, 0, 800, 600] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/window-resize/window-resize-vertical-writing-mode-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/window-resize/window-resize-vertical-writing-mode-expected.txt deleted file mode 100644 index a586fa6..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/invalidation/window-resize/window-resize-vertical-writing-mode-expected.txt +++ /dev/null
@@ -1,94 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [939, 235], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "invalidations": [ - [0, 0, 939, 235] - ], - "transform": 1 - }, - { - "name": "HorizontalScrollbar", - "position": [0, 235], - "bounds": [600, 15], - "contentsOpaque": true - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [-339, 0, 0, 1] - ] - } - ] -} -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [939, 235], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "invalidations": [ - [0, 0, 939, 235] - ], - "transform": 1 - }, - { - "name": "HorizontalScrollbar", - "position": [0, 235], - "bounds": [400, 15], - "contentsOpaque": true - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [-539, 0, 0, 1] - ] - } - ] -} -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [400, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "invalidations": [ - [0, 0, 400, 600] - ] - } - ] -} -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "invalidations": [ - [400, 0, 400, 600], - [110, 8, 68, 562], - [181, 8, 68, 561], - [323, 8, 68, 522], - [252, 8, 68, 482], - [39, 8, 68, 172] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/markers/document-markers-font-64px-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/markers/document-markers-font-64px-expected.png deleted file mode 100644 index 60714207a..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/markers/document-markers-font-64px-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/markers/document-markers-zoom-150-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/markers/document-markers-zoom-150-expected.png deleted file mode 100644 index 48a38ca..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/markers/document-markers-zoom-150-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/markers/document-markers-zoom-175-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/markers/document-markers-zoom-175-expected.png deleted file mode 100644 index a0662fdc..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/markers/document-markers-zoom-175-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/markers/document-markers-zoom-2000-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/markers/document-markers-zoom-2000-expected.png deleted file mode 100644 index d9c5def5..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/markers/document-markers-zoom-2000-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/markers/document-markers-zoom-250-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/markers/document-markers-zoom-250-expected.png deleted file mode 100644 index fd9a5bb..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/markers/document-markers-zoom-250-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/markers/ellipsis-ltr-text-in-ltr-flow-with-markers-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/markers/ellipsis-ltr-text-in-ltr-flow-with-markers-expected.png deleted file mode 100644 index e4463b1..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/markers/ellipsis-ltr-text-in-ltr-flow-with-markers-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/markers/ellipsis-ltr-text-in-rtl-flow-with-markers-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/markers/ellipsis-ltr-text-in-rtl-flow-with-markers-expected.png deleted file mode 100644 index 1eb942d..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/markers/ellipsis-ltr-text-in-rtl-flow-with-markers-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/markers/ellipsis-mixed-text-in-ltr-flow-with-markers-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/markers/ellipsis-mixed-text-in-ltr-flow-with-markers-expected.png deleted file mode 100644 index 940baec6..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/markers/ellipsis-mixed-text-in-ltr-flow-with-markers-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/markers/ellipsis-mixed-text-in-rtl-flow-with-markers-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/markers/ellipsis-mixed-text-in-rtl-flow-with-markers-expected.png deleted file mode 100644 index abceddd5..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/markers/ellipsis-mixed-text-in-rtl-flow-with-markers-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/markers/ellipsis-rtl-text-in-ltr-flow-with-markers-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/markers/ellipsis-rtl-text-in-ltr-flow-with-markers-expected.png deleted file mode 100644 index bf7e327..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/markers/ellipsis-rtl-text-in-ltr-flow-with-markers-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/markers/ellipsis-rtl-text-in-rtl-flow-with-markers-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/markers/ellipsis-rtl-text-in-rtl-flow-with-markers-expected.png deleted file mode 100644 index 5dd4841b..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/markers/ellipsis-rtl-text-in-rtl-flow-with-markers-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/markers/inline-spelling-markers-hidpi-composited-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/markers/inline-spelling-markers-hidpi-composited-expected.png deleted file mode 100644 index 96611816..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/markers/inline-spelling-markers-hidpi-composited-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/markers/inline-spelling-markers-hidpi-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/markers/inline-spelling-markers-hidpi-expected.png deleted file mode 100644 index 96611816..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/markers/inline-spelling-markers-hidpi-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/markers/inline_spelling_markers-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/markers/inline_spelling_markers-expected.png deleted file mode 100644 index ba6a3ea..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/markers/inline_spelling_markers-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/markers/markers-zoomed-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/markers/markers-zoomed-expected.png deleted file mode 100644 index 08d4686..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/markers/markers-zoomed-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/markers/vertical-lr-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/markers/vertical-lr-expected.png deleted file mode 100644 index 0d25d8dd..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/markers/vertical-lr-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/markers/vertical-rl-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/markers/vertical-rl-expected.png deleted file mode 100644 index f82ef3b..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/markers/vertical-rl-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/pagination/pagination-change-clip-crash-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/pagination/pagination-change-clip-crash-expected.txt deleted file mode 100644 index a89824c..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/pagination/pagination-change-clip-crash-expected.txt +++ /dev/null
@@ -1,27 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [785, 736], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF", - "invalidations": [ - [0, 636, 785, 100] - ] - }, - { - "name": "LayoutBlockFlow DIV id='background'", - "position": [8, 428], - "bounds": [769, 300], - "contentsOpaqueForText": true, - "drawsContent": false - }, - { - "name": "VerticalScrollbar", - "position": [785, 0], - "bounds": [15, 600], - "contentsOpaque": true - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/selection/image-writing-modes-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/selection/image-writing-modes-expected.png deleted file mode 100644 index b0cbfa4..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/selection/image-writing-modes-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/selection/text-selection-inline-block-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/selection/text-selection-inline-block-expected.png deleted file mode 100644 index 7e7c0d0..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/selection/text-selection-inline-block-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/selection/text-selection-inline-block-rtl-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/selection/text-selection-inline-block-rtl-expected.png deleted file mode 100644 index 326c124..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/selection/text-selection-inline-block-rtl-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/selection/text-selection-newline-across-blocks-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/selection/text-selection-newline-across-blocks-expected.png deleted file mode 100644 index 99549441..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/selection/text-selection-newline-across-blocks-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/selection/text-selection-newline-across-blocks-line-beginning-end-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/selection/text-selection-newline-across-blocks-line-beginning-end-expected.png deleted file mode 100644 index e2fdd24..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/selection/text-selection-newline-across-blocks-line-beginning-end-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/selection/text-selection-newline-br-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/selection/text-selection-newline-br-expected.png deleted file mode 100644 index 99549441..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/selection/text-selection-newline-br-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/selection/text-selection-newline-clipped-by-overflow-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/selection/text-selection-newline-clipped-by-overflow-expected.png deleted file mode 100644 index 102409f..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/selection/text-selection-newline-clipped-by-overflow-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/selection/text-selection-newline-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/selection/text-selection-newline-expected.png deleted file mode 100644 index bfc8ddb5..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/selection/text-selection-newline-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/selection/text-selection-newline-mixed-ltr-rtl-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/selection/text-selection-newline-mixed-ltr-rtl-expected.png deleted file mode 100644 index e1c8e27..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/selection/text-selection-newline-mixed-ltr-rtl-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/selection/text-selection-newline-rtl-double-linebreak-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/selection/text-selection-newline-rtl-double-linebreak-expected.png deleted file mode 100644 index b25b296..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/selection/text-selection-newline-rtl-double-linebreak-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/selection/text-selection-newline-rtl-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/selection/text-selection-newline-rtl-expected.png deleted file mode 100644 index 15c6318..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/selection/text-selection-newline-rtl-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/selection/text-selection-newline-span-across-line-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/selection/text-selection-newline-span-across-line-expected.png deleted file mode 100644 index b0cbe32d..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/selection/text-selection-newline-span-across-line-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/selection/text-selection-newline-span-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/selection/text-selection-newline-span-expected.png deleted file mode 100644 index 2dedae2..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/selection/text-selection-newline-span-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/selection/text-selection-newline-vertical-lr-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/selection/text-selection-newline-vertical-lr-expected.png deleted file mode 100644 index 06362a6..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/selection/text-selection-newline-vertical-lr-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/selection/text-selection-newline-vertical-rl-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/selection/text-selection-newline-vertical-rl-expected.png deleted file mode 100644 index 83de137..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/selection/text-selection-newline-vertical-rl-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/tables/collapsed-border-corner-conflict-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/tables/collapsed-border-corner-conflict-expected.png deleted file mode 100644 index 0bb78fbf..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/tables/collapsed-border-corner-conflict-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/tables/composited-collapsed-table-borders-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/tables/composited-collapsed-table-borders-expected.png deleted file mode 100644 index cd4cd569..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/tables/composited-collapsed-table-borders-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/text/selection-no-clip-text-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/text/selection-no-clip-text-expected.png deleted file mode 100644 index 7fc6ff8..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/text/selection-no-clip-text-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/text/vertical-upright-oblique-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/text/vertical-upright-oblique-expected.png deleted file mode 100644 index 89f8d17d..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/paint/text/vertical-upright-oblique-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/printing/composited-thead-tfoot-repeat-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/printing/composited-thead-tfoot-repeat-expected.png deleted file mode 100644 index e995381..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/printing/composited-thead-tfoot-repeat-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/printing/forced-break-tree-dump-only-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/printing/forced-break-tree-dump-only-expected.txt deleted file mode 100644 index 247c6e5..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/printing/forced-break-tree-dump-only-expected.txt +++ /dev/null
@@ -1,17 +0,0 @@ -layer at (0,0) size 800x600 scrollHeight 827 - LayoutView at (0,0) size 1066x799 -layer at (0,0) size 1066x827 - LayoutBlockFlow {HTML} at (0,0) size 1066x827 - LayoutBlockFlow {BODY} at (8,16) size 1050x803 - LayoutBlockFlow {P} at (0,0) size 1050x40 - LayoutText {#text} at (0,0) size 1010x39 - text run at (0,0) width 554: "This is a test that only dumps the layout tree, and doesn't actually display the page. This " - text run at (554,0) width 456: "tests some peculiarities in the test framework for printing. To run this test" - text run at (0,20) width 102: "manually, run it " - text run at (102,20) width 214: "with content_shell --run-web-tests" - LayoutBlockFlow {DIV} at (0,56) size 1050x20 - LayoutText {#text} at (0,0) size 163x19 - text run at (0,0) width 163: "This should be on page 1." - LayoutBlockFlow {DIV} at (0,783) size 1050x20 - LayoutText {#text} at (0,0) size 163x19 - text run at (0,0) width 163: "This should be on page 2."
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/printing/page-orientation-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/printing/page-orientation-expected.png deleted file mode 100644 index 7b8107a..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/printing/page-orientation-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/printing/single-line-must-not-be-split-into-two-pages-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/printing/single-line-must-not-be-split-into-two-pages-expected.png deleted file mode 100644 index 8841588..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/printing/single-line-must-not-be-split-into-two-pages-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/printing/tfoot-repeats-at-bottom-of-each-page-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/printing/tfoot-repeats-at-bottom-of-each-page-expected.png deleted file mode 100644 index 2cfe7dc..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/printing/tfoot-repeats-at-bottom-of-each-page-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/printing/tfoot-repeats-at-bottom-of-each-page-multiple-tables-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/printing/tfoot-repeats-at-bottom-of-each-page-multiple-tables-expected.png deleted file mode 100644 index f191854..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/printing/tfoot-repeats-at-bottom-of-each-page-multiple-tables-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/printing/thead-repeat-in-nested-table-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/printing/thead-repeat-in-nested-table-expected.png deleted file mode 100644 index 5ca53cd..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/printing/thead-repeat-in-nested-table-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/printing/thead-tfoot-containing-svg-repeat-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/printing/thead-tfoot-containing-svg-repeat-expected.png deleted file mode 100644 index 6a2c3db..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/printing/thead-tfoot-containing-svg-repeat-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/printing/thead-tfoot-containing-svg-repeat-extra-pages-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/printing/thead-tfoot-containing-svg-repeat-extra-pages-expected.png deleted file mode 100644 index 13c64b68..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/printing/thead-tfoot-containing-svg-repeat-extra-pages-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/printing/thead-under-multicol-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/printing/thead-under-multicol-expected.png deleted file mode 100644 index b758fe56..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/printing/thead-under-multicol-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/printing/width-overflow-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/printing/width-overflow-expected.png deleted file mode 100644 index c8e38dc..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/printing/width-overflow-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/scrollbars/scrollbars-on-positioned-content-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/scrollbars/scrollbars-on-positioned-content-expected.png deleted file mode 100644 index 31413c4..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/scrollbars/scrollbars-on-positioned-content-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-I18N/g-dirRTL-ubNone-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-I18N/g-dirRTL-ubNone-expected.png deleted file mode 100644 index 97b2a3b5..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-I18N/g-dirRTL-ubNone-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-I18N/g-dirRTL-ubOverride-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-I18N/g-dirRTL-ubOverride-expected.png deleted file mode 100644 index 837ed1d..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-I18N/g-dirRTL-ubOverride-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-I18N/text-dirRTL-ubNone-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-I18N/text-dirRTL-ubNone-expected.png deleted file mode 100644 index 97b2a3b5..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-I18N/text-dirRTL-ubNone-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-I18N/tspan-dirRTL-ubEmbed-in-default-context-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-I18N/tspan-dirRTL-ubEmbed-in-default-context-expected.png deleted file mode 100644 index 5466b50..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-I18N/tspan-dirRTL-ubEmbed-in-default-context-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-I18N/tspan-dirRTL-ubEmbed-in-ltr-context-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-I18N/tspan-dirRTL-ubEmbed-in-ltr-context-expected.png deleted file mode 100644 index 5466b50..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-I18N/tspan-dirRTL-ubEmbed-in-ltr-context-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-I18N/tspan-dirRTL-ubNone-in-default-context-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-I18N/tspan-dirRTL-ubNone-in-default-context-expected.png deleted file mode 100644 index db79b3a..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-I18N/tspan-dirRTL-ubNone-in-default-context-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-I18N/tspan-dirRTL-ubNone-in-ltr-context-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-I18N/tspan-dirRTL-ubNone-in-ltr-context-expected.png deleted file mode 100644 index db79b3a..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-I18N/tspan-dirRTL-ubNone-in-ltr-context-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-I18N/tspan-dirRTL-ubOverride-in-default-context-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-I18N/tspan-dirRTL-ubOverride-in-default-context-expected.png deleted file mode 100644 index e622764..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-I18N/tspan-dirRTL-ubOverride-in-default-context-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-I18N/tspan-dirRTL-ubOverride-in-ltr-context-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-I18N/tspan-dirRTL-ubOverride-in-ltr-context-expected.png deleted file mode 100644 index e622764..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-I18N/tspan-dirRTL-ubOverride-in-ltr-context-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-I18N/tspan-direction-rtl-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-I18N/tspan-direction-rtl-expected.png deleted file mode 100644 index 15e99371..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-I18N/tspan-direction-rtl-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1-SE/filters-felem-01-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1-SE/filters-felem-01-b-expected.png deleted file mode 100644 index 71db14c..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1-SE/filters-felem-01-b-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1-SE/filters-image-05-f-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1-SE/filters-image-05-f-expected.png deleted file mode 100644 index 2e222cc..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1-SE/filters-image-05-f-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1-SE/pservers-grad-17-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1-SE/pservers-grad-17-b-expected.png deleted file mode 100644 index 10e2e9f..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1-SE/pservers-grad-17-b-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1-SE/pservers-grad-20-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1-SE/pservers-grad-20-b-expected.png deleted file mode 100644 index ddf5fcb..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1-SE/pservers-grad-20-b-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1/animate-elem-37-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1/animate-elem-37-t-expected.png deleted file mode 100644 index db7de4a8..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1/animate-elem-37-t-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1/animate-elem-39-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1/animate-elem-39-t-expected.png deleted file mode 100644 index 0a2cd365..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1/animate-elem-39-t-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1/animate-elem-52-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1/animate-elem-52-t-expected.png deleted file mode 100644 index 65ada21..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1/animate-elem-52-t-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1/animate-elem-83-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1/animate-elem-83-t-expected.png deleted file mode 100644 index dc07cea..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1/animate-elem-83-t-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1/animate-elem-84-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1/animate-elem-84-t-expected.png deleted file mode 100644 index 14e197e7..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1/animate-elem-84-t-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1/coords-viewattr-03-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1/coords-viewattr-03-b-expected.png deleted file mode 100644 index f39bb42..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1/coords-viewattr-03-b-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1/filters-tile-01-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1/filters-tile-01-b-expected.png deleted file mode 100644 index 4490396..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1/filters-tile-01-b-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1/filters-turb-01-f-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1/filters-turb-01-f-expected.png deleted file mode 100644 index 1f0e4ed..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1/filters-turb-01-f-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1/filters-turb-02-f-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1/filters-turb-02-f-expected.png deleted file mode 100644 index 6f960bd..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1/filters-turb-02-f-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1/interact-dom-01-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1/interact-dom-01-b-expected.png deleted file mode 100644 index ee2ddc9..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1/interact-dom-01-b-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1/interact-events-01-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1/interact-events-01-b-expected.png deleted file mode 100644 index 4e5580d..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1/interact-events-01-b-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1/masking-intro-01-f-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1/masking-intro-01-f-expected.png deleted file mode 100644 index be8c688..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1/masking-intro-01-f-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1/masking-path-04-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1/masking-path-04-b-expected.png deleted file mode 100644 index a9fe612..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1/masking-path-04-b-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1/metadata-example-01-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1/metadata-example-01-b-expected.png deleted file mode 100644 index 69c8f5d7..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1/metadata-example-01-b-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1/painting-marker-03-f-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1/painting-marker-03-f-expected.png deleted file mode 100644 index bf9acccd..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1/painting-marker-03-f-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1/painting-render-01-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1/painting-render-01-b-expected.png deleted file mode 100644 index eb9dbd8..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1/painting-render-01-b-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1/paths-data-03-f-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1/paths-data-03-f-expected.png deleted file mode 100644 index 1697f9d..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1/paths-data-03-f-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1/pservers-grad-13-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1/pservers-grad-13-b-expected.png deleted file mode 100644 index 7faedc8f..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1/pservers-grad-13-b-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1/render-elems-06-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1/render-elems-06-t-expected.png deleted file mode 100644 index 24e3d9a..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1/render-elems-06-t-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1/render-elems-07-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1/render-elems-07-t-expected.png deleted file mode 100644 index 37df814..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1/render-elems-07-t-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1/render-elems-08-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1/render-elems-08-t-expected.png deleted file mode 100644 index 7aadb555..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1/render-elems-08-t-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1/script-handle-01-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1/script-handle-01-b-expected.png deleted file mode 100644 index fadfc6c..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1/script-handle-01-b-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1/struct-cond-02-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1/struct-cond-02-t-expected.png deleted file mode 100644 index fe791b186..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1/struct-cond-02-t-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1/struct-cond-03-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1/struct-cond-03-t-expected.png deleted file mode 100644 index b9b567fd..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1/struct-cond-03-t-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1/struct-dom-06-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1/struct-dom-06-b-expected.png deleted file mode 100644 index f748fbb..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1/struct-dom-06-b-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1/struct-frag-06-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1/struct-frag-06-t-expected.png deleted file mode 100644 index 7532d70e..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1/struct-frag-06-t-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1/struct-use-05-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1/struct-use-05-b-expected.png deleted file mode 100644 index d7e8589..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1/struct-use-05-b-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1/styling-css-05-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1/styling-css-05-b-expected.png deleted file mode 100644 index ad1664e..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1/styling-css-05-b-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1/text-align-03-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1/text-align-03-b-expected.png deleted file mode 100644 index ea26d15..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1/text-align-03-b-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1/text-align-06-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1/text-align-06-b-expected.png deleted file mode 100644 index c7b94b2f4..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1/text-align-06-b-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1/text-deco-01-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1/text-deco-01-b-expected.png deleted file mode 100644 index a108c45..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1/text-deco-01-b-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1/text-fonts-01-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1/text-fonts-01-t-expected.png deleted file mode 100644 index 75449f26..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1/text-fonts-01-t-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1/text-intro-01-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1/text-intro-01-t-expected.png deleted file mode 100644 index 40e52f5e..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1/text-intro-01-t-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1/text-intro-03-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1/text-intro-03-b-expected.png deleted file mode 100644 index 7c0e197..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1/text-intro-03-b-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1/text-intro-04-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1/text-intro-04-t-expected.png deleted file mode 100644 index df44e8a5..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1/text-intro-04-t-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1/text-path-01-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1/text-path-01-b-expected.png deleted file mode 100644 index 87722a5..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1/text-path-01-b-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1/text-spacing-01-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1/text-spacing-01-b-expected.png deleted file mode 100644 index 1d54961..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1/text-spacing-01-b-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1/text-text-03-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1/text-text-03-b-expected.png deleted file mode 100644 index 1326f7c9..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1/text-text-03-b-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1/text-text-07-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1/text-text-07-t-expected.png deleted file mode 100644 index 4a00c40..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1/text-text-07-t-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1/text-text-08-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1/text-text-08-b-expected.png deleted file mode 100644 index 12ba2dd..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1/text-text-08-b-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1/text-tselect-02-f-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1/text-tselect-02-f-expected.png deleted file mode 100644 index 18671159..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1/text-tselect-02-f-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1/text-tspan-01-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1/text-tspan-01-b-expected.png deleted file mode 100644 index eef01727c..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/W3C-SVG-1.1/text-tspan-01-b-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/as-background-image/background-image-preserveaspectRatio-support-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/as-background-image/background-image-preserveaspectRatio-support-expected.png deleted file mode 100644 index 579c7f7..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/as-background-image/background-image-preserveaspectRatio-support-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/as-background-image/svg-as-background-5-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/as-background-image/svg-as-background-5-expected.png deleted file mode 100644 index 0f16b91..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/as-background-image/svg-as-background-5-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/as-image/img-preserveAspectRatio-support-1-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/as-image/img-preserveAspectRatio-support-1-expected.png deleted file mode 100644 index 0b67a02..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/as-image/img-preserveAspectRatio-support-1-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/batik/text/smallFonts-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/batik/text/smallFonts-expected.png deleted file mode 100644 index 7a80c0a..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/batik/text/smallFonts-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/batik/text/textDecoration-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/batik/text/textDecoration-expected.png deleted file mode 100644 index b6b4689..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/batik/text/textDecoration-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/batik/text/textDecoration2-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/batik/text/textDecoration2-expected.png deleted file mode 100644 index 35b4488..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/batik/text/textDecoration2-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/batik/text/textEffect3-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/batik/text/textEffect3-expected.png deleted file mode 100644 index 4089fe97..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/batik/text/textEffect3-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/batik/text/textFeatures-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/batik/text/textFeatures-expected.png deleted file mode 100644 index 7c52b68d..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/batik/text/textFeatures-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/batik/text/textLayout-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/batik/text/textLayout-expected.png deleted file mode 100644 index a056e7f..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/batik/text/textLayout-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/batik/text/textLength-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/batik/text/textLength-expected.png deleted file mode 100644 index 34710b1..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/batik/text/textLength-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/batik/text/textOnPath-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/batik/text/textOnPath-expected.png deleted file mode 100644 index 7018bc5..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/batik/text/textOnPath-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/batik/text/textOnPath2-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/batik/text/textOnPath2-expected.png deleted file mode 100644 index e89b9e9..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/batik/text/textOnPath2-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/batik/text/textOnPath3-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/batik/text/textOnPath3-expected.png deleted file mode 100644 index cca2ac9..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/batik/text/textOnPath3-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/batik/text/textOnPathSpaces-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/batik/text/textOnPathSpaces-expected.png deleted file mode 100644 index 4740a9e..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/batik/text/textOnPathSpaces-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/batik/text/textPCDATA-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/batik/text/textPCDATA-expected.png deleted file mode 100644 index 3f5aee21..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/batik/text/textPCDATA-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/batik/text/textProperties-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/batik/text/textProperties-expected.png deleted file mode 100644 index 2d88328..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/batik/text/textProperties-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/batik/text/verticalText-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/batik/text/verticalText-expected.png deleted file mode 100644 index 296ed737..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/batik/text/verticalText-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/batik/text/verticalTextOnPath-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/batik/text/verticalTextOnPath-expected.png deleted file mode 100644 index b65c5ee..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/batik/text/verticalTextOnPath-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/batik/text/xmlSpace-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/batik/text/xmlSpace-expected.png deleted file mode 100644 index 5a7c665..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/batik/text/xmlSpace-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/carto.net/scrollbar-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/carto.net/scrollbar-expected.png deleted file mode 100644 index 870caf6..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/carto.net/scrollbar-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/carto.net/selectionlist-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/carto.net/selectionlist-expected.png deleted file mode 100644 index c0964d5..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/carto.net/selectionlist-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/css/alignment-baseline-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/css/alignment-baseline-expected.png deleted file mode 100644 index 909ba95..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/css/alignment-baseline-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/css/getComputedStyle-listing-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/css/getComputedStyle-listing-expected.txt deleted file mode 100644 index 5c7af81..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/css/getComputedStyle-listing-expected.txt +++ /dev/null
@@ -1,381 +0,0 @@ -This test documents all computed styles on an SVG rect element. - -On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". - --webkit-border-horizontal-spacing: 0px --webkit-border-image: none --webkit-border-vertical-spacing: 0px --webkit-box-align: stretch --webkit-box-decoration-break: slice --webkit-box-direction: normal --webkit-box-flex: 0 --webkit-box-ordinal-group: 1 --webkit-box-orient: horizontal --webkit-box-pack: start --webkit-box-reflect: none --webkit-font-smoothing: auto --webkit-highlight: none --webkit-line-break: auto --webkit-line-clamp: none --webkit-locale: auto --webkit-mask-box-image: none --webkit-mask-box-image-outset: 0 --webkit-mask-box-image-repeat: stretch --webkit-mask-box-image-slice: 0 fill --webkit-mask-box-image-source: none --webkit-mask-box-image-width: auto --webkit-mask-clip: border-box --webkit-mask-composite: source-over --webkit-mask-image: none --webkit-mask-origin: border-box --webkit-mask-position: 0% 0% --webkit-mask-position-x: 0% --webkit-mask-position-y: 0% --webkit-mask-repeat: repeat --webkit-mask-size: auto --webkit-print-color-adjust: economy --webkit-rtl-ordering: logical --webkit-text-combine: none --webkit-text-decorations-in-effect: none --webkit-text-fill-color: rgb(0, 0, 0) --webkit-text-orientation: vertical-right --webkit-text-security: none --webkit-text-stroke-color: rgb(0, 0, 0) --webkit-text-stroke-width: 0px --webkit-user-drag: auto --webkit-user-modify: read-only --webkit-writing-mode: horizontal-tb -accent-color: auto -align-content: normal -align-items: normal -align-self: auto -alignment-baseline: auto -anchor-name: none -anchor-scroll: none -animation-delay-end: 0s -animation-delay-start: 0s -animation-direction: normal -animation-duration: 0s -animation-fill-mode: none -animation-iteration-count: 1 -animation-name: none -animation-play-state: running -animation-timeline: auto -animation-timing-function: ease -app-region: none -appearance: none -backdrop-filter: none -backface-visibility: visible -background-attachment: scroll -background-blend-mode: normal -background-clip: border-box -background-color: rgba(0, 0, 0, 0) -background-image: none -background-origin: padding-box -background-position: 0% 0% -background-position-x: 0% -background-position-y: 0% -background-repeat: repeat -background-size: auto -baseline-shift: 0px -baseline-source: auto -block-size: 100px -border-block-end-color: rgb(0, 0, 0) -border-block-end-style: none -border-block-end-width: 0px -border-block-start-color: rgb(0, 0, 0) -border-block-start-style: none -border-block-start-width: 0px -border-bottom-color: rgb(0, 0, 0) -border-bottom-left-radius: 0px -border-bottom-right-radius: 0px -border-bottom-style: none -border-bottom-width: 0px -border-collapse: separate -border-end-end-radius: 0px -border-end-start-radius: 0px -border-image-outset: 0 -border-image-repeat: stretch -border-image-slice: 100% -border-image-source: none -border-image-width: 1 -border-inline-end-color: rgb(0, 0, 0) -border-inline-end-style: none -border-inline-end-width: 0px -border-inline-start-color: rgb(0, 0, 0) -border-inline-start-style: none -border-inline-start-width: 0px -border-left-color: rgb(0, 0, 0) -border-left-style: none -border-left-width: 0px -border-right-color: rgb(0, 0, 0) -border-right-style: none -border-right-width: 0px -border-spacing: 0px 0px -border-start-end-radius: 0px -border-start-start-radius: 0px -border-top-color: rgb(0, 0, 0) -border-top-left-radius: 0px -border-top-right-radius: 0px -border-top-style: none -border-top-width: 0px -bottom: auto -box-shadow: none -box-sizing: content-box -break-after: auto -break-before: auto -break-inside: auto -buffered-rendering: auto -caption-side: top -caret-color: rgb(0, 0, 0) -clear: none -clip: auto -clip-path: none -clip-rule: nonzero -color: rgb(0, 0, 0) -color-interpolation: srgb -color-interpolation-filters: linearrgb -color-rendering: auto -column-count: auto -column-gap: normal -column-rule-color: rgb(0, 0, 0) -column-rule-style: none -column-rule-width: 0px -column-span: none -column-width: auto -contain-intrinsic-block-size: none -contain-intrinsic-height: none -contain-intrinsic-inline-size: none -contain-intrinsic-size: none -contain-intrinsic-width: none -container-name: none -container-type: normal -content: normal -cursor: auto -cx: 0px -cy: 0px -d: none -direction: ltr -display: inline -dominant-baseline: auto -empty-cells: show -fill: rgb(0, 128, 0) -fill-opacity: 1 -fill-rule: nonzero -filter: none -flex-basis: auto -flex-direction: row -flex-grow: 0 -flex-shrink: 1 -flex-wrap: nowrap -float: none -flood-color: rgb(0, 0, 0) -flood-opacity: 1 -font-kerning: auto -font-optical-sizing: auto -font-palette: normal -font-size: 16px -font-size-adjust: none -font-stretch: 100% -font-style: normal -font-synthesis-small-caps: auto -font-synthesis-style: auto -font-synthesis-weight: auto -font-variant: normal -font-variant-alternates: normal -font-variant-caps: normal -font-variant-east-asian: normal -font-variant-ligatures: normal -font-variant-numeric: normal -font-variant-position: normal -font-weight: 400 -grid-auto-columns: auto -grid-auto-flow: row -grid-auto-rows: auto -grid-column-end: auto -grid-column-start: auto -grid-row-end: auto -grid-row-start: auto -grid-template-areas: none -grid-template-columns: none -grid-template-rows: none -height: 100px -hyphenate-character: auto -hyphenate-limit-chars: auto -hyphens: manual -image-orientation: from-image -image-rendering: auto -inline-size: 100px -inset-block-end: auto -inset-block-start: auto -inset-inline-end: auto -inset-inline-start: auto -isolation: auto -justify-content: normal -justify-items: normal -justify-self: auto -left: auto -letter-spacing: normal -lighting-color: rgb(255, 255, 255) -line-break: auto -line-height: normal -list-style-image: none -list-style-position: outside -list-style-type: disc -margin-block-end: 0px -margin-block-start: 0px -margin-bottom: 0px -margin-inline-end: 0px -margin-inline-start: 0px -margin-left: 0px -margin-right: 0px -margin-top: 0px -marker-end: none -marker-mid: none -marker-start: none -mask-type: luminance -math-depth: 0 -math-shift: normal -math-style: normal -max-block-size: none -max-height: none -max-inline-size: none -max-width: none -min-block-size: 0px -min-height: 0px -min-inline-size: 0px -min-width: 0px -mix-blend-mode: normal -object-fit: fill -object-position: 50% 50% -object-view-box: none -offset-anchor: auto -offset-distance: 0px -offset-path: none -offset-position: auto -offset-rotate: auto 0deg -opacity: 1 -order: 0 -orphans: 2 -outline-color: rgb(0, 0, 0) -outline-offset: 0px -outline-style: none -outline-width: 0px -overflow: visible -overflow-anchor: auto -overflow-block: visible -overflow-clip-margin: 0px -overflow-inline: visible -overflow-wrap: normal -overflow-x: visible -overflow-y: visible -overscroll-behavior-block: auto -overscroll-behavior-inline: auto -padding-block-end: 0px -padding-block-start: 0px -padding-bottom: 0px -padding-inline-end: 0px -padding-inline-start: 0px -padding-left: 0px -padding-right: 0px -padding-top: 0px -paint-order: normal -perspective: none -perspective-origin: 0px 0px -pointer-events: auto -position: static -position-fallback: none -r: 0px -resize: none -right: auto -rotate: none -row-gap: normal -ruby-position: over -rx: auto -ry: auto -scale: none -scroll-behavior: auto -scroll-margin-block-end: 0px -scroll-margin-block-start: 0px -scroll-margin-inline-end: 0px -scroll-margin-inline-start: 0px -scroll-padding-block-end: auto -scroll-padding-block-start: auto -scroll-padding-inline-end: auto -scroll-padding-inline-start: auto -scroll-timeline-axis: block -scroll-timeline-name: none -scrollbar-gutter: auto -scrollbar-width: auto -shape-image-threshold: 0 -shape-margin: 0px -shape-outside: none -shape-rendering: auto -speak: normal -stop-color: rgb(0, 0, 0) -stop-opacity: 1 -stroke: none -stroke-dasharray: none -stroke-dashoffset: 0px -stroke-linecap: butt -stroke-linejoin: miter -stroke-miterlimit: 4 -stroke-opacity: 1 -stroke-width: 1px -tab-size: 8 -table-layout: auto -text-align: start -text-align-last: auto -text-anchor: start -text-decoration: none solid rgb(0, 0, 0) -text-decoration-color: rgb(0, 0, 0) -text-decoration-line: none -text-decoration-skip-ink: auto -text-decoration-style: solid -text-emphasis-color: rgb(0, 0, 0) -text-emphasis-position: over -text-emphasis-style: none -text-indent: 0px -text-overflow: clip -text-rendering: auto -text-shadow: none -text-size-adjust: auto -text-transform: none -text-underline-position: auto -toggle-group: none -toggle-root: none -toggle-trigger: none -toggle-visibility: normal -top: auto -touch-action: auto -transform: none -transform-origin: 0px 0px -transform-style: flat -transition-delay: 0s -transition-duration: 0s -transition-property: all -transition-timing-function: ease -translate: none -unicode-bidi: normal -user-select: auto -vector-effect: none -vertical-align: baseline -view-timeline-axis: block -view-timeline-inset: 0px -view-timeline-name: none -visibility: visible -white-space: normal -widows: 2 -width: 100px -will-change: auto -word-break: normal -word-spacing: 0px -writing-mode: horizontal-tb -x: 0px -y: 0px -z-index: auto -zoom: 1 -PASS successfullyParsed is true - -TEST COMPLETE -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/custom/absolute-sized-svg-in-xhtml-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/custom/absolute-sized-svg-in-xhtml-expected.png deleted file mode 100644 index c9862cb..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/custom/absolute-sized-svg-in-xhtml-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/custom/clone-element-with-animated-svg-properties-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/custom/clone-element-with-animated-svg-properties-expected.png deleted file mode 100644 index 991bc8c1..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/custom/clone-element-with-animated-svg-properties-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/custom/focus-ring-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/custom/focus-ring-expected.png deleted file mode 100644 index 20b6ea5a..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/custom/focus-ring-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/custom/font-face-cascade-order-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/custom/font-face-cascade-order-expected.png deleted file mode 100644 index a045604f..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/custom/font-face-cascade-order-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/custom/getscreenctm-in-mixed-content2-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/custom/getscreenctm-in-mixed-content2-expected.txt deleted file mode 100644 index 2262355..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/custom/getscreenctm-in-mixed-content2-expected.txt +++ /dev/null
@@ -1,5 +0,0 @@ -Expected matrix [1, 0, 0, 1, 350, 55.5] -Got matrix [1, 0, 0, 1, 350, 55] - -This tests the behaviour of SVGLocatable::getScreenCTM() in mixed content -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/custom/getsvgdocument-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/custom/getsvgdocument-expected.png deleted file mode 100644 index d3150a6c..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/custom/getsvgdocument-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/custom/inline-svg-in-xhtml-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/custom/inline-svg-in-xhtml-expected.png deleted file mode 100644 index a9f035f..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/custom/inline-svg-in-xhtml-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/custom/invalid-fill-hex-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/custom/invalid-fill-hex-expected.png deleted file mode 100644 index f540c9b9..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/custom/invalid-fill-hex-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/custom/invalid-stroke-hex-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/custom/invalid-stroke-hex-expected.png deleted file mode 100644 index 868b204..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/custom/invalid-stroke-hex-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/custom/linking-uri-01-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/custom/linking-uri-01-b-expected.png deleted file mode 100644 index 7657623ce..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/custom/linking-uri-01-b-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/custom/rootmost-svg-xy-attrs-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/custom/rootmost-svg-xy-attrs-expected.png deleted file mode 100644 index 81e0a94..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/custom/rootmost-svg-xy-attrs-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/custom/svg-float-border-padding-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/custom/svg-float-border-padding-expected.png deleted file mode 100644 index 05a682ad..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/custom/svg-float-border-padding-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/custom/svg-fonts-in-html-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/custom/svg-fonts-in-html-expected.png deleted file mode 100644 index 76ed612..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/custom/svg-fonts-in-html-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/custom/text-match-highlight-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/custom/text-match-highlight-expected.png deleted file mode 100644 index a62bed5..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/custom/text-match-highlight-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/custom/text-whitespace-handling-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/custom/text-whitespace-handling-expected.png deleted file mode 100644 index 0f7cb31..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/custom/text-whitespace-handling-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/custom/text-x-dy-lists-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/custom/text-x-dy-lists-expected.png deleted file mode 100644 index eb80de9..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/custom/text-x-dy-lists-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/custom/transformed-outlines-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/custom/transformed-outlines-expected.png deleted file mode 100644 index 35cc0b6..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/custom/transformed-outlines-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/custom/transformed-text-pattern-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/custom/transformed-text-pattern-expected.png deleted file mode 100644 index 6a5736d..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/custom/transformed-text-pattern-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/dom/SVGStringList-basics-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/dom/SVGStringList-basics-expected.png deleted file mode 100644 index 5123766..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/dom/SVGStringList-basics-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/dynamic-updates/SVGTextElement-dom-lengthAdjust-attr-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/dynamic-updates/SVGTextElement-dom-lengthAdjust-attr-expected.txt deleted file mode 100644 index 6a02e78..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/dynamic-updates/SVGTextElement-dom-lengthAdjust-attr-expected.txt +++ /dev/null
@@ -1,18 +0,0 @@ -SVG 1.1 dynamic update tests -Stretched text - -Tests dynamic updates of the 'lengthAdjust' attribute of the SVGTextElement object - -On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". - -PASS textElement.getAttribute('lengthAdjust') is null -PASS textElement.lengthAdjust.baseVal is SVGTextContentElement.LENGTHADJUST_SPACING -PASS textElement.textLength.baseVal.value is 200 -PASS lastLength = textElement.getComputedTextLength(); lastLength > 0 && lastLength < 200 is true -PASS textElement.lengthAdjust.baseVal is SVGTextContentElement.LENGTHADJUST_SPACINGANDGLYPHS -PASS textElement.textLength.baseVal.value is 200 -PASS textElement.getComputedTextLength() == lastLength is true -PASS successfullyParsed is true - -TEST COMPLETE -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/dynamic-updates/SVGTextElement-svgdom-lengthAdjust-prop-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/dynamic-updates/SVGTextElement-svgdom-lengthAdjust-prop-expected.txt deleted file mode 100644 index 0e72168..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/dynamic-updates/SVGTextElement-svgdom-lengthAdjust-prop-expected.txt +++ /dev/null
@@ -1,19 +0,0 @@ -SVG 1.1 dynamic update tests -Stretched text - -Tests dynamic updates of the 'lengthAdjust' property of the SVGTextElement object - -On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". - -PASS textElement.getAttribute('lengthAdjust') is null -PASS textElement.lengthAdjust.baseVal is SVGTextContentElement.LENGTHADJUST_SPACING -PASS textElement.textLength.baseVal.value is 200 -PASS lastLength = textElement.getComputedTextLength(); lastLength > 0 && lastLength < 200 is true -PASS textElement.getAttribute('lengthAdjust') is "spacingAndGlyphs" -PASS textElement.lengthAdjust.baseVal is SVGTextContentElement.LENGTHADJUST_SPACINGANDGLYPHS -PASS textElement.textLength.baseVal.value is 200 -PASS textElement.getComputedTextLength() == lastLength is true -PASS successfullyParsed is true - -TEST COMPLETE -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/filters/filter-on-filter-for-text-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/filters/filter-on-filter-for-text-expected.png deleted file mode 100644 index 37af6aa7..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/filters/filter-on-filter-for-text-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/foreignObject/svg-document-in-html-document-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/foreignObject/svg-document-in-html-document-expected.png deleted file mode 100644 index 085e2c6..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/foreignObject/svg-document-in-html-document-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/hixie/viewbox/preserveAspectRatio/001-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/hixie/viewbox/preserveAspectRatio/001-expected.png deleted file mode 100644 index 2ae8b44..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/hixie/viewbox/preserveAspectRatio/001-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/bbox-with-glyph-overflow-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/bbox-with-glyph-overflow-expected.png deleted file mode 100644 index 966e391..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/bbox-with-glyph-overflow-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/bbox-with-glyph-overflow-on-path-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/bbox-with-glyph-overflow-on-path-expected.png deleted file mode 100644 index 09e38fe0..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/bbox-with-glyph-overflow-on-path-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/bbox-with-glyph-overflow-zoomed-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/bbox-with-glyph-overflow-zoomed-expected.png deleted file mode 100644 index 71d818535..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/bbox-with-glyph-overflow-zoomed-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/bidi-dir-rtl-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/bidi-dir-rtl-expected.txt deleted file mode 100644 index c75516a..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/bidi-dir-rtl-expected.txt +++ /dev/null
@@ -1,4 +0,0 @@ -This is a testharness.js-based test. -FAIL Correctness of bidi reordering assert_array_equals: expected property 1 to be object "[object SVGPoint]" but got object "[object SVGPoint]" (expected array [object "[object SVGPoint]", object "[object SVGPoint]", object "[object SVGPoint]", object "[object SVGPoint]", object "[object SVGPoint]", object "[object SVGPoint]"] got [object "[object SVGPoint]", object "[object SVGPoint]", object "[object SVGPoint]", object "[object SVGPoint]", object "[object SVGPoint]", object "[object SVGPoint]"]) -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/bidi-embedded-direction-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/bidi-embedded-direction-expected.png deleted file mode 100644 index 8fcc92f..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/bidi-embedded-direction-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/bidi-reorder-in-text-chunks-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/bidi-reorder-in-text-chunks-expected.png deleted file mode 100644 index e61b0b9d..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/bidi-reorder-in-text-chunks-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/bidi-text-anchor-direction-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/bidi-text-anchor-direction-expected.png deleted file mode 100644 index 3fa749a9..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/bidi-text-anchor-direction-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/bidi-textlength-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/bidi-textlength-expected.png deleted file mode 100644 index 47d90a5..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/bidi-textlength-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/bidi-tspans-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/bidi-tspans-expected.png deleted file mode 100644 index 56e448b..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/bidi-tspans-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/combining-character-queries-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/combining-character-queries-expected.png deleted file mode 100644 index 0942328e..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/combining-character-queries-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/current-text-position-initial-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/current-text-position-initial-expected.png deleted file mode 100644 index 918e4874..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/current-text-position-initial-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/dominant-baseline-decoration-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/dominant-baseline-decoration-expected.png deleted file mode 100644 index 5f6c296..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/dominant-baseline-decoration-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/foreignObject-text-clipping-bug-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/foreignObject-text-clipping-bug-expected.png deleted file mode 100644 index 5edfddb1..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/foreignObject-text-clipping-bug-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/ligature-queries-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/ligature-queries-expected.png deleted file mode 100644 index 404fc34..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/ligature-queries-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/mix-blend-mode-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/mix-blend-mode-expected.png deleted file mode 100644 index 0ef8e1d..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/mix-blend-mode-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/select-textLength-spacing-squeeze-1-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/select-textLength-spacing-squeeze-1-expected.png deleted file mode 100644 index f0fa3cb..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/select-textLength-spacing-squeeze-1-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/select-textLength-spacing-squeeze-2-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/select-textLength-spacing-squeeze-2-expected.png deleted file mode 100644 index 7bfe8aa..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/select-textLength-spacing-squeeze-2-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/select-textLength-spacing-squeeze-3-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/select-textLength-spacing-squeeze-3-expected.png deleted file mode 100644 index f0becb81..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/select-textLength-spacing-squeeze-3-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/select-textLength-spacing-squeeze-4-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/select-textLength-spacing-squeeze-4-expected.png deleted file mode 100644 index 9ceef00..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/select-textLength-spacing-squeeze-4-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/select-textLength-spacing-stretch-1-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/select-textLength-spacing-stretch-1-expected.png deleted file mode 100644 index 71ad53a8..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/select-textLength-spacing-stretch-1-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/select-textLength-spacing-stretch-4-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/select-textLength-spacing-stretch-4-expected.png deleted file mode 100644 index 96d0047..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/select-textLength-spacing-stretch-4-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/select-textLength-spacingAndGlyphs-stretch-1-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/select-textLength-spacingAndGlyphs-stretch-1-expected.png deleted file mode 100644 index d809b5b..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/select-textLength-spacingAndGlyphs-stretch-1-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/surrogate-pair-queries-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/surrogate-pair-queries-expected.png deleted file mode 100644 index a12066d..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/surrogate-pair-queries-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/text-decoration-thickness-in-iframe-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/text-decoration-thickness-in-iframe-expected.png deleted file mode 100644 index 6c645a0..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/text-decoration-thickness-in-iframe-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/text-decorations-in-scaled-pattern-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/text-decorations-in-scaled-pattern-expected.png deleted file mode 100644 index 3d3a0bff..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/text-decorations-in-scaled-pattern-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/text-layout-crash-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/text-layout-crash-expected.png deleted file mode 100644 index 7cd0d9b35..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/text-layout-crash-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/text-repaint-rects-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/text-repaint-rects-expected.png deleted file mode 100644 index b46b54f5..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/text-repaint-rects-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/text-selection-align-01-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/text-selection-align-01-b-expected.png deleted file mode 100644 index 6fc6e01..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/text-selection-align-01-b-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/text-selection-align-02-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/text-selection-align-02-b-expected.png deleted file mode 100644 index 32f0ea1..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/text-selection-align-02-b-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/text-selection-align-03-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/text-selection-align-03-b-expected.png deleted file mode 100644 index 6363739..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/text-selection-align-03-b-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/text-selection-align-04-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/text-selection-align-04-b-expected.png deleted file mode 100644 index 3ec2ed8..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/text-selection-align-04-b-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/text-selection-align-05-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/text-selection-align-05-b-expected.png deleted file mode 100644 index ed1a7d7..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/text-selection-align-05-b-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/text-selection-align-06-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/text-selection-align-06-b-expected.png deleted file mode 100644 index 96b8b8e..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/text-selection-align-06-b-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/text-selection-deco-01-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/text-selection-deco-01-b-expected.png deleted file mode 100644 index c5966da..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/text-selection-deco-01-b-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/text-selection-fonts-01-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/text-selection-fonts-01-t-expected.png deleted file mode 100644 index 12751218..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/text-selection-fonts-01-t-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/text-selection-fonts-02-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/text-selection-fonts-02-t-expected.png deleted file mode 100644 index ad68117..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/text-selection-fonts-02-t-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/text-selection-intro-05-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/text-selection-intro-05-t-expected.png deleted file mode 100644 index f78e39a11..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/text-selection-intro-05-t-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/text-selection-path-01-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/text-selection-path-01-b-expected.png deleted file mode 100644 index 273301c4..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/text-selection-path-01-b-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/text-selection-spacing-01-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/text-selection-spacing-01-b-expected.png deleted file mode 100644 index eb73474..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/text-selection-spacing-01-b-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/text-selection-text-01-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/text-selection-text-01-b-expected.png deleted file mode 100644 index d9501f4..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/text-selection-text-01-b-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/text-selection-text-03-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/text-selection-text-03-b-expected.png deleted file mode 100644 index a1555524..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/text-selection-text-03-b-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/text-selection-text-04-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/text-selection-text-04-t-expected.png deleted file mode 100644 index 616a877..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/text-selection-text-04-t-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/text-selection-text-06-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/text-selection-text-06-t-expected.png deleted file mode 100644 index 1f84013..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/text-selection-text-06-t-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/text-selection-text-07-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/text-selection-text-07-t-expected.png deleted file mode 100644 index eea4763..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/text-selection-text-07-t-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/text-selection-text-08-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/text-selection-text-08-b-expected.png deleted file mode 100644 index ace4cde..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/text-selection-text-08-b-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/text-selection-tselect-01-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/text-selection-tselect-01-b-expected.png deleted file mode 100644 index 1e3ac88b..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/text-selection-tselect-01-b-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/text-selection-tselect-02-f-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/text-selection-tselect-02-f-expected.png deleted file mode 100644 index 5df3f7e..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/text-selection-tselect-02-f-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/text-selection-tspan-01-b-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/text-selection-tspan-01-b-expected.png deleted file mode 100644 index 0c884ea..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/text-selection-tspan-01-b-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/text-selection-ws-01-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/text-selection-ws-01-t-expected.png deleted file mode 100644 index 45c63a1a..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/text-selection-ws-01-t-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/text-selection-ws-02-t-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/text-selection-ws-02-t-expected.png deleted file mode 100644 index b74f8aed..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/text-selection-ws-02-t-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/textLength-spacingAndGlyphs-decoration-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/textLength-spacingAndGlyphs-decoration-expected.png deleted file mode 100644 index 2f69684c..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/textLength-spacingAndGlyphs-decoration-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/textPathBoundsBug-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/textPathBoundsBug-expected.png deleted file mode 100644 index bd389a0..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/textPathBoundsBug-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/textpath-connected-glyphs-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/textpath-connected-glyphs-expected.png deleted file mode 100644 index 9247d21..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/text/textpath-connected-glyphs-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/transforms/text-with-mask-with-svg-transform-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/transforms/text-with-mask-with-svg-transform-expected.png deleted file mode 100644 index 9599db1..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/transforms/text-with-mask-with-svg-transform-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/transforms/text-with-pattern-inside-transformed-html-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/transforms/text-with-pattern-inside-transformed-html-expected.png deleted file mode 100644 index 825bb072..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/transforms/text-with-pattern-inside-transformed-html-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/transforms/text-with-pattern-with-svg-transform-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/transforms/text-with-pattern-with-svg-transform-expected.png deleted file mode 100644 index e6784dc..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/transforms/text-with-pattern-with-svg-transform-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/wicd/test-scalable-background-image2-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/wicd/test-scalable-background-image2-expected.png deleted file mode 100644 index be7d1ba..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/wicd/test-scalable-background-image2-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/zoom/page/zoom-foreign-content-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/zoom/page/zoom-foreign-content-expected.png deleted file mode 100644 index adfcdc9..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/zoom/page/zoom-foreign-content-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/zoom/page/zoom-foreignObject-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/zoom/page/zoom-foreignObject-expected.png deleted file mode 100644 index d709ed37..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/zoom/page/zoom-foreignObject-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/zoom/page/zoom-img-preserveAspectRatio-support-1-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/zoom/page/zoom-img-preserveAspectRatio-support-1-expected.png deleted file mode 100644 index 7eaaa984..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/zoom/page/zoom-img-preserveAspectRatio-support-1-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/zoom/page/zoom-mask-with-percentages-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/zoom/page/zoom-mask-with-percentages-expected.png deleted file mode 100644 index b49a6ab..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/zoom/page/zoom-mask-with-percentages-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/zoom/page/zoom-replaced-intrinsic-ratio-001-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/zoom/page/zoom-replaced-intrinsic-ratio-001-expected.png deleted file mode 100644 index f070239..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/zoom/page/zoom-replaced-intrinsic-ratio-001-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/zoom/page/zoom-svg-float-border-padding-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/zoom/page/zoom-svg-float-border-padding-expected.png deleted file mode 100644 index 55d14a7..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/zoom/page/zoom-svg-float-border-padding-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/zoom/page/zoom-svg-through-object-with-absolute-size-2-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/zoom/page/zoom-svg-through-object-with-absolute-size-2-expected.png deleted file mode 100644 index d521b27e..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/zoom/page/zoom-svg-through-object-with-absolute-size-2-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/zoom/page/zoom-svg-through-object-with-absolute-size-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/zoom/page/zoom-svg-through-object-with-absolute-size-expected.png deleted file mode 100644 index d521b27e..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/zoom/page/zoom-svg-through-object-with-absolute-size-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/zoom/page/zoom-svg-through-object-with-percentage-size-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/zoom/page/zoom-svg-through-object-with-percentage-size-expected.png deleted file mode 100644 index d5880172f..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/zoom/page/zoom-svg-through-object-with-percentage-size-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/zoom/page/zoom-zoom-coords-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/zoom/page/zoom-zoom-coords-expected.txt deleted file mode 100644 index d8a8c7b..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/zoom/page/zoom-zoom-coords-expected.txt +++ /dev/null
@@ -1,125 +0,0 @@ -Test -Test -Test - -This test checks getBoundingClientRect() on zoomed HTML and SVG elements - -On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". - -Gray rectangles: 100x50 -Green rectangles: 100x50, zoom=200% -Blue rectangles: 200x100, zoom=50% - - -Checking HTML elements: - - -PASS div1.left is 0.00 -PASS div1.top is 0.00 -PASS div1.width is 100.00 -PASS div1.height is 50.00 -PASS div1.right is 100.00 -PASS div1.bottom is 50.00 - - -PASS div2.left is 0.00 -PASS div2.top is 25.00 -PASS div2.width is 100.00 -PASS div2.height is 50.00 -PASS div2.right is 100.00 -PASS div2.bottom is 75.00 - - -PASS div3.left is 0.00 -PASS div3.top is 300.00 -PASS div3.width is 200.00 -PASS div3.height is 100.00 -PASS div3.right is 200.00 -PASS div3.bottom is 400.00 - - -Checking SVG elements: - - -PASS svg1.left is 0.00 -PASS svg1.top is 250.00 -PASS svg1.width is 150.00 -PASS svg1.height is 50.00 -PASS svg1.right is 150.00 -PASS svg1.bottom is 300.00 -PASS rect1.left is 0.00 -PASS rect1.top is 250.00 -PASS rect1.width is 100.00 -PASS rect1.height is 50.00 -PASS rect1.right is 100.00 -PASS rect1.bottom is 300.00 -PASS image1.left is 100.00 -PASS image1.top is 250.00 -PASS image1.width is 50.00 -PASS image1.height is 25.00 -PASS image1.right is 150.00 -PASS image1.bottom is 275.00 -PASS text1.left is 100.00 -PASS text1.top is 282.66 -FAIL text1.width should be 47.98. Was 49.203128814697266. -PASS text1.height is 6.16 -FAIL text1.right should be 147.98. Was 149.20312881469727. -PASS text1.bottom is 288.82 - - -PASS svg2.left is 75.00 -PASS svg2.top is 100.00 -PASS svg2.width is 150.00 -PASS svg2.height is 50.00 -PASS svg2.right is 225.00 -PASS svg2.bottom is 150.00 -PASS rect2.left is 75.00 -PASS rect2.top is 100.00 -PASS rect2.width is 100.00 -PASS rect2.height is 50.00 -PASS rect2.right is 175.00 -PASS rect2.bottom is 150.00 -PASS image2.left is 175.00 -PASS image2.top is 100.00 -PASS image2.width is 50.00 -PASS image2.height is 25.00 -PASS image2.right is 225.00 -PASS image2.bottom is 125.00 -PASS text2.left is 175.00 -PASS text2.top is 132.66 -FAIL text2.width should be 47.98. Was 47.875. -FAIL text2.height should be 6.02. Was 5.937491416931152. -FAIL text2.right should be 222.98. Was 222.875. -FAIL text2.bottom should be 138.7. Was 138.60155391693115. - - -PASS svg3.left is 900.00 -PASS svg3.top is 500.00 -PASS svg3.width is 300.00 -PASS svg3.height is 100.00 -PASS svg3.right is 1200.00 -PASS svg3.bottom is 600.00 -PASS rect3.left is 900.00 -PASS rect3.top is 500.00 -PASS rect3.width is 200.00 -PASS rect3.height is 100.00 -PASS rect3.right is 1100.00 -PASS rect3.bottom is 600.00 -PASS image3.left is 1100.00 -PASS image3.top is 500.00 -PASS image3.width is 100.00 -PASS image3.height is 50.00 -PASS image3.right is 1200.00 -PASS image3.bottom is 550.00 -PASS text3.left is 1100.00 -PASS text3.top is 565.33 -FAIL text3.width should be 95.97. Was 98.40630340576172. -PASS text3.height is 12.31 -FAIL text3.right should be 1195.97. Was 1198.4063034057617. -PASS text3.bottom is 577.64 - - -PASS successfullyParsed is true - -TEST COMPLETE -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/zoom/text/zoom-svg-float-border-padding-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/zoom/text/zoom-svg-float-border-padding-expected.png deleted file mode 100644 index f45e5425..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/svg/zoom/text/zoom-svg-float-border-padding-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug10009-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug10009-expected.png deleted file mode 100644 index 2208df0..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug10009-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug101674-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug101674-expected.png deleted file mode 100644 index 734dc2f..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug101674-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug1055-1-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug1055-1-expected.png deleted file mode 100644 index 03eb993b..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug1055-1-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug106158-1-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug106158-1-expected.png deleted file mode 100644 index b7976104..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug106158-1-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug106158-2-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug106158-2-expected.png deleted file mode 100644 index a6f3b69..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug106158-2-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug10633-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug10633-expected.png deleted file mode 100644 index d125d7b4..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug10633-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug106795-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug106795-expected.png deleted file mode 100644 index e6e2aba..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug106795-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug109043-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug109043-expected.png deleted file mode 100644 index 44bb5c3..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug109043-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug110566-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug110566-expected.png deleted file mode 100644 index 07f7a275..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug110566-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug113235-1-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug113235-1-expected.png deleted file mode 100644 index 1bc6afa..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug113235-1-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug113424-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug113424-expected.png deleted file mode 100644 index 0e5c4509..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug113424-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug11384q-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug11384q-expected.png deleted file mode 100644 index cac0ef8..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug11384q-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug11384s-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug11384s-expected.png deleted file mode 100644 index f94f9761..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug11384s-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug1188-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug1188-expected.png deleted file mode 100644 index 6962544..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug1188-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug11944-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug11944-expected.png deleted file mode 100644 index e051279..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug11944-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug12008-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug12008-expected.png deleted file mode 100644 index dd7b0e2..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug12008-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug1220-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug1220-expected.png deleted file mode 100644 index 74decfb441..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug1220-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug126742-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug126742-expected.png deleted file mode 100644 index 6fe8c1a..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug126742-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug12709-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug12709-expected.png deleted file mode 100644 index 813dde0..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug12709-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug128229-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug128229-expected.png deleted file mode 100644 index 308dfe6..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug128229-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug1296-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug1296-expected.png deleted file mode 100644 index a35e038a..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug1296-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug1302-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug1302-expected.png deleted file mode 100644 index 89a8898..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug1302-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug131020-2-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug131020-2-expected.png deleted file mode 100644 index 86b866fb..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug131020-2-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug131020-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug131020-expected.png deleted file mode 100644 index f9f48a8..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug131020-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug131020_iframe-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug131020_iframe-expected.png deleted file mode 100644 index 2348ce4..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug131020_iframe-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug13118-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug13118-expected.png deleted file mode 100644 index a246cbf..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug13118-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug1318-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug1318-expected.png deleted file mode 100644 index 36a5dd8..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug1318-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug13196-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug13196-expected.png deleted file mode 100644 index 3ccf677..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug13196-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug137388-1-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug137388-1-expected.png deleted file mode 100644 index 1bb1d73d..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug137388-1-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug137388-2-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug137388-2-expected.png deleted file mode 100644 index 82b8eb7..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug137388-2-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug139524-1-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug139524-1-expected.png deleted file mode 100644 index c7146af..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug139524-1-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug139524-2-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug139524-2-expected.png deleted file mode 100644 index 3ed13cf..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug139524-2-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug139524-3-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug139524-3-expected.png deleted file mode 100644 index c7146af..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug139524-3-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug14159-1-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug14159-1-expected.png deleted file mode 100644 index 2cb922f7..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug14159-1-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug14159-3-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug14159-3-expected.png deleted file mode 100644 index c8ef95c..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug14159-3-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug1430-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug1430-expected.png deleted file mode 100644 index 01da8ff6..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug1430-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug14323-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug14323-expected.png deleted file mode 100644 index 28243b3..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug14323-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug1474-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug1474-expected.png deleted file mode 100644 index 40576d98..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug1474-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug149275-1-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug149275-1-expected.png deleted file mode 100644 index 3c64555..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug149275-1-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug149275-2-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug149275-2-expected.png deleted file mode 100644 index 8f054dbb..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug149275-2-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug14929-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug14929-expected.png deleted file mode 100644 index 4ec4cac..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug14929-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug15247-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug15247-expected.png deleted file mode 100644 index e4d8078..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug15247-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug154780-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug154780-expected.png deleted file mode 100644 index 9bbe961..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug154780-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug15544-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug15544-expected.png deleted file mode 100644 index c668816..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug15544-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug157890-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug157890-expected.png deleted file mode 100644 index 1fcdfa99..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug157890-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug16252-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug16252-expected.png deleted file mode 100644 index 493fbb0e..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug16252-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug17130-1-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug17130-1-expected.png deleted file mode 100644 index 05c4412f..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug17130-1-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug17138-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug17138-expected.png deleted file mode 100644 index 52a76781..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug17138-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug17168-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug17168-expected.png deleted file mode 100644 index 78eabc4..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug17168-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug17548-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug17548-expected.png deleted file mode 100644 index 1e20684d..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug17548-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug1802-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug1802-expected.png deleted file mode 100644 index 9cde323..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug1802-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug1802s-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug1802s-expected.png deleted file mode 100644 index 9cde323..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug1802s-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug1809-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug1809-expected.png deleted file mode 100644 index 2208df0..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug1809-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug18440-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug18440-expected.png deleted file mode 100644 index 3f0fb31..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug18440-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug18664-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug18664-expected.png deleted file mode 100644 index 820f865..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug18664-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug18955-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug18955-expected.png deleted file mode 100644 index 63977d8..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug18955-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug19061-1-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug19061-1-expected.png deleted file mode 100644 index 1bf6e8d..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug19061-1-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug19061-2-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug19061-2-expected.png deleted file mode 100644 index 0819c88..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug19061-2-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug20804-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug20804-expected.png deleted file mode 100644 index 4df0c0e..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug20804-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug22246-2-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug22246-2-expected.png deleted file mode 100644 index ac3fe315..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug22246-2-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug22246-2a-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug22246-2a-expected.png deleted file mode 100644 index ac3fe315..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug22246-2a-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug22246-3-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug22246-3-expected.png deleted file mode 100644 index da9ac8a..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug22246-3-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug22246-3a-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug22246-3a-expected.png deleted file mode 100644 index da9ac8a..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug22246-3a-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug2267-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug2267-expected.png deleted file mode 100644 index 1b678e4d..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug2267-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug23235-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug23235-expected.png deleted file mode 100644 index f68aa6a..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug23235-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug24627-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug24627-expected.png deleted file mode 100644 index a410f04..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug24627-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug2479-1-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug2479-1-expected.png deleted file mode 100644 index 97720dc6..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug2479-1-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug2479-2-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug2479-2-expected.png deleted file mode 100644 index 8fc2457..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug2479-2-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug2479-3-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug2479-3-expected.png deleted file mode 100644 index 50c53d9..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug2479-3-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug2479-4-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug2479-4-expected.png deleted file mode 100644 index c34617b0..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug2479-4-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug25004-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug25004-expected.png deleted file mode 100644 index 2208df0..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug25004-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug25074-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug25074-expected.png deleted file mode 100644 index 50262b1..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug25074-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug26553-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug26553-expected.png deleted file mode 100644 index d2a6f5d..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug26553-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug2684-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug2684-expected.png deleted file mode 100644 index 42234e8..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug2684-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug2757-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug2757-expected.png deleted file mode 100644 index b37541d..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug2757-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug2773-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug2773-expected.png deleted file mode 100644 index 42234e8..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug2773-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug27993-1-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug27993-1-expected.png deleted file mode 100644 index d273280b..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug27993-1-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug2886-2-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug2886-2-expected.png deleted file mode 100644 index 62aa056..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug2886-2-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug29429-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug29429-expected.png deleted file mode 100644 index a3fc039..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug29429-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug2947-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug2947-expected.png deleted file mode 100644 index f8f1e57..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug2947-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug2962-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug2962-expected.png deleted file mode 100644 index 1d60e97..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug2962-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug2973-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug2973-expected.png deleted file mode 100644 index 411e7c9..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug2973-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug2981-2-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug2981-2-expected.png deleted file mode 100644 index abfcd9d..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug2981-2-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug2997-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug2997-expected.png deleted file mode 100644 index b9c4d835..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug2997-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug30692-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug30692-expected.png deleted file mode 100644 index 57b4068..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug30692-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug3103-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug3103-expected.png deleted file mode 100644 index eaeee52..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug3103-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug32205-3-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug32205-3-expected.png deleted file mode 100644 index 7a0a22a..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug32205-3-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug3260-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug3260-expected.png deleted file mode 100644 index 2c7abe3..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug3260-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug3309-1-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug3309-1-expected.png deleted file mode 100644 index 313c9e2..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug3309-1-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug3454-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug3454-expected.png deleted file mode 100644 index 9a45a29c..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug3454-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug35662-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug35662-expected.png deleted file mode 100644 index 7dd9a81..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug35662-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug3681-1-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug3681-1-expected.png deleted file mode 100644 index f5dc1e53..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug3681-1-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug3681-2-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug3681-2-expected.png deleted file mode 100644 index 41f0059..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug3681-2-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug38916-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug38916-expected.png deleted file mode 100644 index 7208b1c6..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug38916-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug39209-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug39209-expected.png deleted file mode 100644 index 1f235ee..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug39209-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug3977-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug3977-expected.png deleted file mode 100644 index 5607a91..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug3977-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug4093-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug4093-expected.png deleted file mode 100644 index 166913fb..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug4093-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug42443-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug42443-expected.png deleted file mode 100644 index dcc707e7..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug42443-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug43039-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug43039-expected.png deleted file mode 100644 index 48c309d9..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug43039-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug4385-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug4385-expected.png deleted file mode 100644 index ee003b2..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug4385-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug43854-2-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug43854-2-expected.png deleted file mode 100644 index d4e70e2f..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug43854-2-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug4427-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug4427-expected.png deleted file mode 100644 index 4a29f8c..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug4427-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug44505-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug44505-expected.png deleted file mode 100644 index 65c9b92f..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug44505-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug44523-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug44523-expected.png deleted file mode 100644 index 07b7148..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug44523-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug4501-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug4501-expected.png deleted file mode 100644 index ab8e15d9..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug4501-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug4523-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug4523-expected.png deleted file mode 100644 index a350cc7e..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug4523-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug4527-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug4527-expected.png deleted file mode 100644 index 3f8c121a..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug4527-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug45486-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug45486-expected.png deleted file mode 100644 index 41f1977..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug45486-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug4576-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug4576-expected.png deleted file mode 100644 index 2ee5dbf..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug4576-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug46268-1-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug46268-1-expected.png deleted file mode 100644 index 0c5846c0..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug46268-1-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug46268-2-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug46268-2-expected.png deleted file mode 100644 index 0c5846c0..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug46268-2-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug46268-5-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug46268-5-expected.png deleted file mode 100644 index ea58783e..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug46268-5-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug46268-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug46268-expected.png deleted file mode 100644 index ea58783e..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug46268-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug46368-1-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug46368-1-expected.png deleted file mode 100644 index abae75dd5..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug46368-1-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug46368-2-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug46368-2-expected.png deleted file mode 100644 index baf764ec..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug46368-2-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug46480-1-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug46480-1-expected.png deleted file mode 100644 index 5ad9bbe..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug46480-1-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug46480-2-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug46480-2-expected.png deleted file mode 100644 index f231cbfb..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug46480-2-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug46623-1-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug46623-1-expected.png deleted file mode 100644 index c623f79..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug46623-1-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug46623-2-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug46623-2-expected.png deleted file mode 100644 index 3022afb2..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug46623-2-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug46924-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug46924-expected.png deleted file mode 100644 index 71890d2..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug46924-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug4803-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug4803-expected.png deleted file mode 100644 index 8a31409..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug4803-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug4849-2-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug4849-2-expected.png deleted file mode 100644 index 19d2b79..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug4849-2-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug4849-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug4849-expected.png deleted file mode 100644 index 862b51e..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug4849-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug48827-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug48827-expected.png deleted file mode 100644 index 7324402..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug48827-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug50695-2-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug50695-2-expected.png deleted file mode 100644 index e50220e..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug50695-2-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug5188-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug5188-expected.png deleted file mode 100644 index f5bd0088..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug5188-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug5538-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug5538-expected.png deleted file mode 100644 index 0210eb37..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug5538-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug55527-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug55527-expected.png deleted file mode 100644 index 3831632..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug55527-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug57300-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug57300-expected.png deleted file mode 100644 index 77895502..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug57300-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug57828-2-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug57828-2-expected.png deleted file mode 100644 index 404f61f8..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug57828-2-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug57828-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug57828-expected.png deleted file mode 100644 index c74285b..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug57828-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug5799-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug5799-expected.png deleted file mode 100644 index f4f43b1..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug5799-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug5835-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug5835-expected.png deleted file mode 100644 index 89eb144..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug5835-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug59354-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug59354-expected.png deleted file mode 100644 index d28ff5f..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug59354-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug60804-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug60804-expected.png deleted file mode 100644 index 7bc8f6c1..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug60804-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug60807-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug60807-expected.png deleted file mode 100644 index 7bc8f6c1..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug60807-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug60992-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug60992-expected.png deleted file mode 100644 index 80ddb39..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug60992-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug6184-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug6184-expected.png deleted file mode 100644 index e21751f5..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug6184-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug625-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug625-expected.png deleted file mode 100644 index 3912c50..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug625-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug6304-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug6304-expected.png deleted file mode 100644 index c126830e..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug6304-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug6404-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug6404-expected.png deleted file mode 100644 index a55cf267..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug6404-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug67915-1-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug67915-1-expected.png deleted file mode 100644 index b194f1a..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug67915-1-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug69382-1-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug69382-1-expected.png deleted file mode 100644 index 7aeb669..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug69382-1-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug69382-2-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug69382-2-expected.png deleted file mode 100644 index f698efc..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug69382-2-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug7112-1-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug7112-1-expected.png deleted file mode 100644 index e0ed8a0..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug7112-1-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug7112-2-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug7112-2-expected.png deleted file mode 100644 index 52eeca1b..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug7112-2-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug7121-1-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug7121-1-expected.png deleted file mode 100644 index 4abb722..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug7121-1-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug727-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug727-expected.png deleted file mode 100644 index 7a0c104b..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug727-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug7342-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug7342-expected.png deleted file mode 100644 index ae8006a4..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug7342-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug7471-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug7471-expected.png deleted file mode 100644 index 388165a..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug7471-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug7714-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug7714-expected.png deleted file mode 100644 index dcebae1..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug7714-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug81934-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug81934-expected.png deleted file mode 100644 index 14a98c1d..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug81934-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug82946-1-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug82946-1-expected.png deleted file mode 100644 index 0ceaed42..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug82946-1-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug82946-2-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug82946-2-expected.png deleted file mode 100644 index 933bc466..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug82946-2-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug8950-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug8950-expected.png deleted file mode 100644 index ac30baa..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug8950-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug9123-1-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug9123-1-expected.png deleted file mode 100644 index 9e21e38c..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug9123-1-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug93363-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug93363-expected.png deleted file mode 100644 index 7fe5ce1b..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug93363-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug97138-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug97138-expected.png deleted file mode 100644 index c0bfc00..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/bugs/bug97138-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/collapsing_borders/bug41262-4-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/collapsing_borders/bug41262-4-expected.png deleted file mode 100644 index d743f62..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/collapsing_borders/bug41262-4-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/core/bloomberg-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/core/bloomberg-expected.png deleted file mode 100644 index 5bac61f..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/core/bloomberg-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/core/box_sizing-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/core/box_sizing-expected.png deleted file mode 100644 index d626211..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/core/box_sizing-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/core/cell_heights-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/core/cell_heights-expected.png deleted file mode 100644 index 4f080e38..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/core/cell_heights-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/core/col_span-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/core/col_span-expected.png deleted file mode 100644 index 7694ec0c..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/core/col_span-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/core/col_widths_auto_autoFixPer-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/core/col_widths_auto_autoFixPer-expected.png deleted file mode 100644 index a2c486f..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/core/col_widths_auto_autoFixPer-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/core/col_widths_auto_fix-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/core/col_widths_auto_fix-expected.png deleted file mode 100644 index 7655bb8..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/core/col_widths_auto_fix-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/core/col_widths_auto_fixPer-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/core/col_widths_auto_fixPer-expected.png deleted file mode 100644 index cc4ea20..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/core/col_widths_auto_fixPer-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/core/col_widths_fix_auto-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/core/col_widths_fix_auto-expected.png deleted file mode 100644 index 72e0744..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/core/col_widths_fix_auto-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/core/col_widths_fix_autoFix-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/core/col_widths_fix_autoFix-expected.png deleted file mode 100644 index 16ebf7a..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/core/col_widths_fix_autoFix-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/core/col_widths_fix_autoPer-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/core/col_widths_fix_autoPer-expected.png deleted file mode 100644 index 6394fc1..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/core/col_widths_fix_autoPer-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/core/col_widths_fix_fix-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/core/col_widths_fix_fix-expected.png deleted file mode 100644 index f60819b..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/core/col_widths_fix_fix-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/core/col_widths_fix_per-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/core/col_widths_fix_per-expected.png deleted file mode 100644 index 44ccf9f..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/core/col_widths_fix_per-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/core/margins-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/core/margins-expected.png deleted file mode 100644 index 5349a0f..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/core/margins-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/core/misc-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/core/misc-expected.png deleted file mode 100644 index 6597640..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/core/misc-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/core/nested1-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/core/nested1-expected.png deleted file mode 100644 index 450e4e7..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/core/nested1-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/core/one_row-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/core/one_row-expected.png deleted file mode 100644 index dbd7642..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/core/one_row-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/core/row_span-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/core/row_span-expected.png deleted file mode 100644 index f94dc762..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/core/row_span-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/col_span-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/col_span-expected.png deleted file mode 100644 index d3efda9e..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/col_span-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/colgroup_align_center-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/colgroup_align_center-expected.png deleted file mode 100644 index 3734088..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/colgroup_align_center-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/colgroup_align_justify-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/colgroup_align_justify-expected.png deleted file mode 100644 index c710b53f..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/colgroup_align_justify-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/colgroup_align_left-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/colgroup_align_left-expected.png deleted file mode 100644 index 3bb8f91..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/colgroup_align_left-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/colgroup_align_right-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/colgroup_align_right-expected.png deleted file mode 100644 index bf2582a..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/colgroup_align_right-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/colgroup_span-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/colgroup_span-expected.png deleted file mode 100644 index 8b3803c6..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/colgroup_span-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/colgroup_valign_baseline-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/colgroup_valign_baseline-expected.png deleted file mode 100644 index eb59cce..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/colgroup_valign_baseline-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/colgroup_valign_bottom-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/colgroup_valign_bottom-expected.png deleted file mode 100644 index 7884efa..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/colgroup_valign_bottom-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/colgroup_valign_middle-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/colgroup_valign_middle-expected.png deleted file mode 100644 index af40d4c..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/colgroup_valign_middle-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/colgroup_valign_top-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/colgroup_valign_top-expected.png deleted file mode 100644 index 7333e068..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/colgroup_valign_top-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/colgroup_width_pct-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/colgroup_width_pct-expected.png deleted file mode 100644 index 307b86b3..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/colgroup_width_pct-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/colgroup_width_px-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/colgroup_width_px-expected.png deleted file mode 100644 index d835743..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/colgroup_width_px-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/table_rules_all-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/table_rules_all-expected.png deleted file mode 100644 index fe16d98..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/table_rules_all-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/table_rules_none-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/table_rules_none-expected.png deleted file mode 100644 index d9d7e20..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/table_rules_none-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/tables_td_align_center-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/tables_td_align_center-expected.png deleted file mode 100644 index fba336aa..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/tables_td_align_center-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/tables_td_align_left-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/tables_td_align_left-expected.png deleted file mode 100644 index 3268be2..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/tables_td_align_left-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/tables_td_align_right-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/tables_td_align_right-expected.png deleted file mode 100644 index 9aa7b80..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/tables_td_align_right-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/tables_th_align_center-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/tables_th_align_center-expected.png deleted file mode 100644 index be57e05e..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/tables_th_align_center-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/tables_th_align_left-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/tables_th_align_left-expected.png deleted file mode 100644 index c45eb320..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/tables_th_align_left-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/tables_th_align_right-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/tables_th_align_right-expected.png deleted file mode 100644 index 6d60ac6..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/tables_th_align_right-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/tables_width_percent-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/tables_width_percent-expected.png deleted file mode 100644 index 36fd716b..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/tables_width_percent-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/tables_width_px-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/tables_width_px-expected.png deleted file mode 100644 index 7af5aa9..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/tables_width_px-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/tbody_align_center-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/tbody_align_center-expected.png deleted file mode 100644 index 434554c..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/tbody_align_center-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/tbody_align_char-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/tbody_align_char-expected.png deleted file mode 100644 index 0ef50b1..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/tbody_align_char-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/tbody_align_justify-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/tbody_align_justify-expected.png deleted file mode 100644 index 85062e5..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/tbody_align_justify-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/tbody_align_left-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/tbody_align_left-expected.png deleted file mode 100644 index acb7733..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/tbody_align_left-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/tbody_align_right-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/tbody_align_right-expected.png deleted file mode 100644 index 758abc8e..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/tbody_align_right-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/tbody_char-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/tbody_char-expected.png deleted file mode 100644 index f613a11..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/tbody_char-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/tbody_valign_baseline-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/tbody_valign_baseline-expected.png deleted file mode 100644 index 78f445a..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/tbody_valign_baseline-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/tbody_valign_bottom-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/tbody_valign_bottom-expected.png deleted file mode 100644 index 4eba081f..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/tbody_valign_bottom-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/tbody_valign_middle-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/tbody_valign_middle-expected.png deleted file mode 100644 index bc25163f..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/tbody_valign_middle-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/tbody_valign_top-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/tbody_valign_top-expected.png deleted file mode 100644 index 048b088..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/tbody_valign_top-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/td_valign_middle-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/td_valign_middle-expected.png deleted file mode 100644 index 823824b6..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/td_valign_middle-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/tfoot_align_char-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/tfoot_align_char-expected.png deleted file mode 100644 index f7fa58c..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/tfoot_align_char-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/tfoot_align_justify-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/tfoot_align_justify-expected.png deleted file mode 100644 index 51f06f8..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/tfoot_align_justify-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/tfoot_valign_middle-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/tfoot_valign_middle-expected.png deleted file mode 100644 index 5999af30..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/tfoot_valign_middle-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/th_valign_middle-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/th_valign_middle-expected.png deleted file mode 100644 index b44fd07..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/th_valign_middle-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/thead_align_char-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/thead_align_char-expected.png deleted file mode 100644 index 6b510a0..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/thead_align_char-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/thead_align_justify-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/thead_align_justify-expected.png deleted file mode 100644 index 24640d8..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/thead_align_justify-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/thead_valign_middle-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/thead_valign_middle-expected.png deleted file mode 100644 index a75d3d3..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/thead_valign_middle-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/tr_valign_middle-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/tr_valign_middle-expected.png deleted file mode 100644 index 166a2c1..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/tr_valign_middle-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/x_col_align_char-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/x_col_align_char-expected.png deleted file mode 100644 index 897d2af..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/x_col_align_char-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/x_col_valign_baseline-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/x_col_valign_baseline-expected.png deleted file mode 100644 index c049692..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/x_col_valign_baseline-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/x_col_valign_bottom-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/x_col_valign_bottom-expected.png deleted file mode 100644 index 3ab5052..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/x_col_valign_bottom-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/x_col_valign_middle-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/x_col_valign_middle-expected.png deleted file mode 100644 index c2c2f2e..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/x_col_valign_middle-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/x_col_valign_top-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/x_col_valign_top-expected.png deleted file mode 100644 index 68d1b42f..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/x_col_valign_top-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/x_col_width_pct-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/x_col_width_pct-expected.png deleted file mode 100644 index 5dc2f03..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/x_col_width_pct-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/x_col_width_px-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/x_col_width_px-expected.png deleted file mode 100644 index a16ee22..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/x_col_width_px-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/x_col_width_rel-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/x_col_width_rel-expected.png deleted file mode 100644 index c48b9f2..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/x_col_width_rel-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/x_colgroup_valign_baseline-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/x_colgroup_valign_baseline-expected.png deleted file mode 100644 index 9a714068..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/x_colgroup_valign_baseline-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/x_colgroup_valign_bottom-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/x_colgroup_valign_bottom-expected.png deleted file mode 100644 index 5d5dfaeb..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/x_colgroup_valign_bottom-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/x_colgroup_valign_middle-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/x_colgroup_valign_middle-expected.png deleted file mode 100644 index a42e427..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/x_colgroup_valign_middle-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/x_colgroup_valign_top-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/x_colgroup_valign_top-expected.png deleted file mode 100644 index f203519..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/x_colgroup_valign_top-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/x_colgroup_width_pct-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/x_colgroup_width_pct-expected.png deleted file mode 100644 index 198baf0..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/x_colgroup_width_pct-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/x_colgroup_width_rel-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/x_colgroup_width_rel-expected.png deleted file mode 100644 index 0ea0d63b..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/x_colgroup_width_rel-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/x_table-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/x_table-expected.png deleted file mode 100644 index 02acd9a..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/x_table-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/x_tbody_align_center-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/x_tbody_align_center-expected.png deleted file mode 100644 index 081e87a..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/x_tbody_align_center-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/x_tbody_align_char-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/x_tbody_align_char-expected.png deleted file mode 100644 index bf893fa..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/x_tbody_align_char-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/x_tbody_align_justify-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/x_tbody_align_justify-expected.png deleted file mode 100644 index 981e1de..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/x_tbody_align_justify-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/x_tbody_align_left-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/x_tbody_align_left-expected.png deleted file mode 100644 index 65d9ffa..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/x_tbody_align_left-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/x_tbody_align_right-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/x_tbody_align_right-expected.png deleted file mode 100644 index 60b71fc..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/x_tbody_align_right-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/x_tbody_valign_baseline-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/x_tbody_valign_baseline-expected.png deleted file mode 100644 index 90cd6c7..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/x_tbody_valign_baseline-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/x_tbody_valign_bottom-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/x_tbody_valign_bottom-expected.png deleted file mode 100644 index a8536aa..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/x_tbody_valign_bottom-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/x_tbody_valign_middle-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/x_tbody_valign_middle-expected.png deleted file mode 100644 index 56e64fb..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/x_tbody_valign_middle-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/x_tbody_valign_top-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/x_tbody_valign_top-expected.png deleted file mode 100644 index ce0e6b2..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/x_tbody_valign_top-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/x_td_align_justify-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/x_td_align_justify-expected.png deleted file mode 100644 index 435d77d75..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/x_td_align_justify-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/x_td_valign_baseline-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/x_td_valign_baseline-expected.png deleted file mode 100644 index f1244a30..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/x_td_valign_baseline-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/x_td_valign_middle-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/x_td_valign_middle-expected.png deleted file mode 100644 index d3367026..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/x_td_valign_middle-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/x_tfoot_valign_baseline-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/x_tfoot_valign_baseline-expected.png deleted file mode 100644 index 0ebb00a..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/x_tfoot_valign_baseline-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/x_tfoot_valign_middle-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/x_tfoot_valign_middle-expected.png deleted file mode 100644 index 02644acb..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/x_tfoot_valign_middle-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/x_th_align_justify-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/x_th_align_justify-expected.png deleted file mode 100644 index 831d6d4..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/x_th_align_justify-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/x_th_colspan-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/x_th_colspan-expected.png deleted file mode 100644 index da15aae4..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/x_th_colspan-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/x_th_valign_baseline-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/x_th_valign_baseline-expected.png deleted file mode 100644 index 24ae60c..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/x_th_valign_baseline-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/x_th_valign_middle-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/x_th_valign_middle-expected.png deleted file mode 100644 index d1e2dd3..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/x_th_valign_middle-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/x_thead_valign_baseline-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/x_thead_valign_baseline-expected.png deleted file mode 100644 index 888c9b5b..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/x_thead_valign_baseline-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/x_thead_valign_middle-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/x_thead_valign_middle-expected.png deleted file mode 100644 index 802572b..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/x_thead_valign_middle-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/x_tr_align_justify-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/x_tr_align_justify-expected.png deleted file mode 100644 index 18fa8ede..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/x_tr_align_justify-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/x_tr_valign_baseline-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/x_tr_valign_baseline-expected.png deleted file mode 100644 index 6bce3741..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/x_tr_valign_baseline-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/x_tr_valign_middle-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/x_tr_valign_middle-expected.png deleted file mode 100644 index 39b889a..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/marvin/x_tr_valign_middle-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/other/cellspacing-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/other/cellspacing-expected.png deleted file mode 100644 index ee1f75f..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/other/cellspacing-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/other/ms-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/other/ms-expected.png deleted file mode 100644 index efc751f0..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/other/ms-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/other/nested2-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/other/nested2-expected.png deleted file mode 100644 index f11525f..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/other/nested2-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/other/nestedTables-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/other/nestedTables-expected.png deleted file mode 100644 index 7c05d0c..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/other/nestedTables-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/other/slashlogo-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/other/slashlogo-expected.png deleted file mode 100644 index 854f044..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/other/slashlogo-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/other/test3-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/other/test3-expected.png deleted file mode 100644 index c97d282..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/other/test3-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/other/test6-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/other/test6-expected.png deleted file mode 100644 index acc76a97..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/other/test6-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/other/wa_table_thtd_rowspan-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/other/wa_table_thtd_rowspan-expected.png deleted file mode 100644 index ba1ca30..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/other/wa_table_thtd_rowspan-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/other/wa_table_tr_align-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/other/wa_table_tr_align-expected.png deleted file mode 100644 index 736e733..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla/other/wa_table_tr_align-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/bugs/97619-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/bugs/97619-expected.png deleted file mode 100644 index 2e59403..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/bugs/97619-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/bugs/bug1010-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/bugs/bug1010-expected.png deleted file mode 100644 index 35f4515e..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/bugs/bug1010-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/bugs/bug1055-2-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/bugs/bug1055-2-expected.png deleted file mode 100644 index 05a1640..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/bugs/bug1055-2-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/bugs/bug106966-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/bugs/bug106966-expected.png deleted file mode 100644 index 0f961ca..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/bugs/bug106966-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/bugs/bug1128-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/bugs/bug1128-expected.png deleted file mode 100644 index 5384dba..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/bugs/bug1128-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/bugs/bug1262-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/bugs/bug1262-expected.png deleted file mode 100644 index ea00150c..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/bugs/bug1262-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/bugs/bug131020-3-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/bugs/bug131020-3-expected.png deleted file mode 100644 index b8d70f6..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/bugs/bug131020-3-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/bugs/bug14007-1-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/bugs/bug14007-1-expected.png deleted file mode 100644 index 4e94b5f..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/bugs/bug14007-1-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/bugs/bug14007-2-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/bugs/bug14007-2-expected.png deleted file mode 100644 index 7e6bf1c..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/bugs/bug14007-2-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/bugs/bug1647-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/bugs/bug1647-expected.png deleted file mode 100644 index 21307fdc..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/bugs/bug1647-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/bugs/bug17826-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/bugs/bug17826-expected.png deleted file mode 100644 index c0bca65..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/bugs/bug17826-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/bugs/bug18770-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/bugs/bug18770-expected.png deleted file mode 100644 index 75c8776..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/bugs/bug18770-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/bugs/bug19526-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/bugs/bug19526-expected.png deleted file mode 100644 index 739253e..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/bugs/bug19526-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/bugs/bug21518-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/bugs/bug21518-expected.png deleted file mode 100644 index b02ba5a..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/bugs/bug21518-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/bugs/bug22122-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/bugs/bug22122-expected.png deleted file mode 100644 index b346c31..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/bugs/bug22122-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/bugs/bug23847-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/bugs/bug23847-expected.png deleted file mode 100644 index 6ae06aa8..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/bugs/bug23847-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/bugs/bug2479-5-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/bugs/bug2479-5-expected.png deleted file mode 100644 index 05cd0247..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/bugs/bug2479-5-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/bugs/bug27993-2-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/bugs/bug27993-2-expected.png deleted file mode 100644 index d273280b..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/bugs/bug27993-2-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/bugs/bug3166-14-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/bugs/bug3166-14-expected.png deleted file mode 100644 index 94cfc5e..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/bugs/bug3166-14-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/bugs/bug3166-17-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/bugs/bug3166-17-expected.png deleted file mode 100644 index 1d8f0f9..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/bugs/bug3166-17-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/bugs/bug32205-4-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/bugs/bug32205-4-expected.png deleted file mode 100644 index 81e7c5d9..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/bugs/bug32205-4-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/bugs/bug4294-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/bugs/bug4294-expected.png deleted file mode 100644 index fd5b710..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/bugs/bug4294-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/bugs/bug47163-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/bugs/bug47163-expected.png deleted file mode 100644 index 1ec7137..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/bugs/bug47163-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/bugs/bug51000-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/bugs/bug51000-expected.png deleted file mode 100644 index bbb04c120..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/bugs/bug51000-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/bugs/bug59252-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/bugs/bug59252-expected.png deleted file mode 100644 index 4a53c0f4..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/bugs/bug59252-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/bugs/bug61042-1-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/bugs/bug61042-1-expected.png deleted file mode 100644 index 902779d..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/bugs/bug61042-1-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/bugs/bug61042-2-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/bugs/bug61042-2-expected.png deleted file mode 100644 index 902779d..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/bugs/bug61042-2-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/bugs/bug72393-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/bugs/bug72393-expected.png deleted file mode 100644 index 977a0ec..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/bugs/bug72393-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/bugs/bug7243-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/bugs/bug7243-expected.png deleted file mode 100644 index b90260d..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/bugs/bug7243-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/bugs/bug80762-2-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/bugs/bug80762-2-expected.png deleted file mode 100644 index 0bf1c4c..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/bugs/bug80762-2-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/bugs/bug8499-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/bugs/bug8499-expected.png deleted file mode 100644 index d11772c..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/bugs/bug8499-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/bugs/bug85016-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/bugs/bug85016-expected.png deleted file mode 100644 index 5bba62c4..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/bugs/bug85016-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/bugs/bug89315-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/bugs/bug89315-expected.png deleted file mode 100644 index 71b0489e..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/bugs/bug89315-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/bugs/bug91057-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/bugs/bug91057-expected.png deleted file mode 100644 index a6aefbc..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/bugs/bug91057-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/bugs/bug92647-1-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/bugs/bug92647-1-expected.png deleted file mode 100644 index 239afd2..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/bugs/bug92647-1-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/collapsing_borders/bug41262-1-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/collapsing_borders/bug41262-1-expected.png deleted file mode 100644 index 7a0993f..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/collapsing_borders/bug41262-1-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/core/captions1-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/core/captions1-expected.png deleted file mode 100644 index 1dc2172..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/core/captions1-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/core/captions2-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/core/captions2-expected.png deleted file mode 100644 index ca835564..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/core/captions2-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/core/col_span2-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/core/col_span2-expected.png deleted file mode 100644 index dd67078..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/core/col_span2-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/core/cols1-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/core/cols1-expected.png deleted file mode 100644 index 24fffd00..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/core/cols1-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/core/columns-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/core/columns-expected.png deleted file mode 100644 index 4f343e42..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/core/columns-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/core/standards1-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/core/standards1-expected.png deleted file mode 100644 index d85eb3f0..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/core/standards1-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/marvin/backgr_fixed-bg-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/marvin/backgr_fixed-bg-expected.png deleted file mode 100644 index e8b3ffb..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/marvin/backgr_fixed-bg-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/marvin/table_overflow_caption-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/marvin/table_overflow_caption-expected.png deleted file mode 100644 index bb3c90d..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/marvin/table_overflow_caption-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/marvin/table_overflow_caption_bottom-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/marvin/table_overflow_caption_bottom-expected.png deleted file mode 100644 index 1c833184..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/marvin/table_overflow_caption_bottom-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/marvin/table_overflow_caption_hidden-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/marvin/table_overflow_caption_hidden-expected.png deleted file mode 100644 index 477b746..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/marvin/table_overflow_caption_hidden-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/marvin/table_overflow_caption_hidden_table-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/marvin/table_overflow_caption_hidden_table-expected.png deleted file mode 100644 index 8dec4bc..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/marvin/table_overflow_caption_hidden_table-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/marvin/table_overflow_caption_left-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/marvin/table_overflow_caption_left-expected.png deleted file mode 100644 index bb3c90d..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/marvin/table_overflow_caption_left-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/marvin/table_overflow_caption_right-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/marvin/table_overflow_caption_right-expected.png deleted file mode 100644 index bb3c90d..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/marvin/table_overflow_caption_right-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/marvin/table_overflow_caption_top-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/marvin/table_overflow_caption_top-expected.png deleted file mode 100644 index bb3c90d..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/marvin/table_overflow_caption_top-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/marvin/table_overflow_dirty_reflow_table-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/marvin/table_overflow_dirty_reflow_table-expected.png deleted file mode 100644 index 2827fbc2..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/marvin/table_overflow_dirty_reflow_table-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/marvin/table_rules_cols-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/marvin/table_rules_cols-expected.png deleted file mode 100644 index 8d549d5f..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/marvin/table_rules_cols-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/marvin/table_rules_rows-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/marvin/table_rules_rows-expected.png deleted file mode 100644 index f0f426acd..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/marvin/table_rules_rows-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/marvin/x_colgroup_width_px-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/marvin/x_colgroup_width_px-expected.png deleted file mode 100644 index 45227e98..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/marvin/x_colgroup_width_px-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/other/test4-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/other/test4-expected.png deleted file mode 100644 index 7260944..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/tables/mozilla_expected_failures/other/test4-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/transforms/2d/transform-fixed-container-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/transforms/2d/transform-fixed-container-expected.png deleted file mode 100644 index 0f128083..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/transforms/2d/transform-fixed-container-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/transforms/3d/general/perspective-units-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/transforms/3d/general/perspective-units-expected.png deleted file mode 100644 index 01b72479..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/transforms/3d/general/perspective-units-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/transforms/3d/hit-testing/backface-hit-test-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/transforms/3d/hit-testing/backface-hit-test-expected.png deleted file mode 100644 index 882974fe..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/transforms/3d/hit-testing/backface-hit-test-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/transforms/3d/hit-testing/backface-no-transform-hit-test-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/transforms/3d/hit-testing/backface-no-transform-hit-test-expected.png deleted file mode 100644 index c4da0c8..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/transforms/3d/hit-testing/backface-no-transform-hit-test-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/transforms/bounding-rect-zoom-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/transforms/bounding-rect-zoom-expected.png deleted file mode 100644 index 69f2e8b..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/transforms/bounding-rect-zoom-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/transforms/transformed-caret-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/transforms/transformed-caret-expected.png deleted file mode 100644 index a2f06b4..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/transforms/transformed-caret-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/transforms/transforms-with-zoom-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/transforms/transforms-with-zoom-expected.png deleted file mode 100644 index 1eca0662..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/transforms/transforms-with-zoom-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/android/fullscreen/full-screen-with-flex-item-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/android/fullscreen/full-screen-with-flex-item-expected.txt deleted file mode 100644 index b5c66b7..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/android/fullscreen/full-screen-with-flex-item-expected.txt +++ /dev/null
@@ -1,6 +0,0 @@ -Enter Fullscreen -EVENT(webkitfullscreenchange) -EVENT(webkitfullscreenchange) -EXPECTED (584 == '584') OK -END OF TEST -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/dark-color-scheme/fast/forms/color-scheme/meter/meter-appearance-basic-vertical-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/dark-color-scheme/fast/forms/color-scheme/meter/meter-appearance-basic-vertical-expected.png deleted file mode 100644 index c03806a..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/dark-color-scheme/fast/forms/color-scheme/meter/meter-appearance-basic-vertical-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/dark-color-scheme/select/select-dark-mode-basic-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/dark-color-scheme/select/select-dark-mode-basic-expected.png deleted file mode 100644 index 37d6d10..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/dark-color-scheme/select/select-dark-mode-basic-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/dark-mode-default/dark-mode/colors/selection-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/dark-mode-default/dark-mode/colors/selection-expected.png deleted file mode 100644 index 849f8e5..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/dark-mode-default/dark-mode/colors/selection-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/exotic-color-space/images/color-profile-image-filter-all-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/exotic-color-space/images/color-profile-image-filter-all-expected.png deleted file mode 100644 index 6bb632a..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/exotic-color-space/images/color-profile-image-filter-all-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/exotic-color-space/images/exif-orientation-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/exotic-color-space/images/exif-orientation-expected.png deleted file mode 100644 index a503c96..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/exotic-color-space/images/exif-orientation-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/exotic-color-space/images/exif-orientation-image-document-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/exotic-color-space/images/exif-orientation-image-document-expected.png deleted file mode 100644 index 19b89aeb..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/exotic-color-space/images/exif-orientation-image-document-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/gpu-rasterization/images/12-55-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/gpu-rasterization/images/12-55-expected.png deleted file mode 100644 index ee45be9..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/gpu-rasterization/images/12-55-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/gpu-rasterization/images/182-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/gpu-rasterization/images/182-expected.png deleted file mode 100644 index 5d226121..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/gpu-rasterization/images/182-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/gpu-rasterization/images/2-dht-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/gpu-rasterization/images/2-dht-expected.png deleted file mode 100644 index 9c52cf0..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/gpu-rasterization/images/2-dht-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/gpu-rasterization/images/23-55-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/gpu-rasterization/images/23-55-expected.png deleted file mode 100644 index f079674..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/gpu-rasterization/images/23-55-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/gpu-rasterization/images/55-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/gpu-rasterization/images/55-expected.png deleted file mode 100644 index 538799a..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/gpu-rasterization/images/55-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/gpu-rasterization/images/color-profile-image-filter-all-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/gpu-rasterization/images/color-profile-image-filter-all-expected.png deleted file mode 100644 index 61ce18b1..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/gpu-rasterization/images/color-profile-image-filter-all-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/gpu-rasterization/images/exif-orientation-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/gpu-rasterization/images/exif-orientation-expected.png deleted file mode 100644 index 30af65b..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/gpu-rasterization/images/exif-orientation-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/gpu-rasterization/images/exif-orientation-image-document-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/gpu-rasterization/images/exif-orientation-image-document-expected.png deleted file mode 100644 index 32f4aeb..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/gpu-rasterization/images/exif-orientation-image-document-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/gpu-rasterization/images/imagemap-focus-ring-zoom-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/gpu-rasterization/images/imagemap-focus-ring-zoom-expected.png deleted file mode 100644 index 7ba770e..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/gpu-rasterization/images/imagemap-focus-ring-zoom-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/gpu/fast/canvas/canvas-composite-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/gpu/fast/canvas/canvas-composite-expected.png deleted file mode 100644 index 89ffc00..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/gpu/fast/canvas/canvas-composite-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/gpu/fast/canvas/image-object-in-canvas-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/gpu/fast/canvas/image-object-in-canvas-expected.png deleted file mode 100644 index 624fbe2..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/gpu/fast/canvas/image-object-in-canvas-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/gpu/fast/canvas/patternfill-repeat-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/gpu/fast/canvas/patternfill-repeat-expected.png deleted file mode 100644 index 640fddc..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/gpu/fast/canvas/patternfill-repeat-expected.png +++ /dev/null Binary files differ
diff --git "a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/idna-2008/external/wpt/url/url-constructor.any.worker_exclude=\050file_javascript_mailto\051-expected.txt" "b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/idna-2008/external/wpt/url/url-constructor.any.worker_exclude=\050file_javascript_mailto\051-expected.txt" deleted file mode 100644 index f5843467..0000000 --- "a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/idna-2008/external/wpt/url/url-constructor.any.worker_exclude=\050file_javascript_mailto\051-expected.txt" +++ /dev/null
@@ -1,706 +0,0 @@ -This is a testharness.js-based test. -Found 605 tests; 466 PASS, 139 FAIL, 0 TIMEOUT, 0 NOTRUN. -PASS Loading data… -PASS Parsing: <http://example . -org> against <http://example.org/foo/bar> -PASS Parsing: <http://user:pass@foo:21/bar;par?b#c> against <http://example.org/foo/bar> -PASS Parsing: <https://test:@test> against <about:blank> -PASS Parsing: <https://:@test> against <about:blank> -FAIL Parsing: <non-special://test:@test/x> against <about:blank> assert_equals: href expected "non-special://test@test/x" but got "non-special://test:@test/x" -FAIL Parsing: <non-special://:@test/x> against <about:blank> assert_equals: href expected "non-special://test/x" but got "non-special://:@test/x" -PASS Parsing: <http:foo.com> against <http://example.org/foo/bar> -PASS Parsing: < :foo.com -> against <http://example.org/foo/bar> -PASS Parsing: < foo.com > against <http://example.org/foo/bar> -PASS Parsing: <a: foo.com> against <http://example.org/foo/bar> -PASS Parsing: <http://f:21/ b ? d # e > against <http://example.org/foo/bar> -PASS Parsing: <lolscheme:x x#x x> against <about:blank> -PASS Parsing: <http://f:/c> against <http://example.org/foo/bar> -PASS Parsing: <http://f:0/c> against <http://example.org/foo/bar> -PASS Parsing: <http://f:00000000000000/c> against <http://example.org/foo/bar> -PASS Parsing: <http://f:00000000000000000000080/c> against <http://example.org/foo/bar> -PASS Parsing: <http://f:b/c> against <http://example.org/foo/bar> -PASS Parsing: <http://f: /c> against <http://example.org/foo/bar> -PASS Parsing: <http://f: -/c> against <http://example.org/foo/bar> -PASS Parsing: <http://f:fifty-two/c> against <http://example.org/foo/bar> -PASS Parsing: <http://f:999999/c> against <http://example.org/foo/bar> -FAIL Parsing: <non-special://f:999999/c> against <http://example.org/foo/bar> assert_throws_js: function "function() { - bURL(expected.input, expected.base) - }" did not throw -PASS Parsing: <http://f: 21 / b ? d # e > against <http://example.org/foo/bar> -PASS Parsing: <> against <http://example.org/foo/bar> -PASS Parsing: < > against <http://example.org/foo/bar> -PASS Parsing: <:foo.com/> against <http://example.org/foo/bar> -PASS Parsing: <:foo.com\> against <http://example.org/foo/bar> -PASS Parsing: <:> against <http://example.org/foo/bar> -PASS Parsing: <:a> against <http://example.org/foo/bar> -PASS Parsing: <:/> against <http://example.org/foo/bar> -PASS Parsing: <:\> against <http://example.org/foo/bar> -PASS Parsing: <:#> against <http://example.org/foo/bar> -PASS Parsing: <#> against <http://example.org/foo/bar> -PASS Parsing: <#/> against <http://example.org/foo/bar> -PASS Parsing: <#\> against <http://example.org/foo/bar> -PASS Parsing: <#;?> against <http://example.org/foo/bar> -PASS Parsing: <?> against <http://example.org/foo/bar> -PASS Parsing: </> against <http://example.org/foo/bar> -PASS Parsing: <:23> against <http://example.org/foo/bar> -PASS Parsing: </:23> against <http://example.org/foo/bar> -PASS Parsing: <\x> against <http://example.org/foo/bar> -PASS Parsing: <\\x\hello> against <http://example.org/foo/bar> -PASS Parsing: <::> against <http://example.org/foo/bar> -PASS Parsing: <::23> against <http://example.org/foo/bar> -FAIL Parsing: <foo://> against <http://example.org/foo/bar> assert_equals: pathname expected "" but got "//" -PASS Parsing: <http://a:b@c:29/d> against <http://example.org/foo/bar> -PASS Parsing: <http::@c:29> against <http://example.org/foo/bar> -PASS Parsing: <http://&a:foo(b]c@d:2/> against <http://example.org/foo/bar> -PASS Parsing: <http://::@c@d:2> against <http://example.org/foo/bar> -PASS Parsing: <http://foo.com:b@d/> against <http://example.org/foo/bar> -PASS Parsing: <http://foo.com/\@> against <http://example.org/foo/bar> -PASS Parsing: <http:\\foo.com\> against <http://example.org/foo/bar> -PASS Parsing: <http:\\a\b:c\d@foo.com\> against <http://example.org/foo/bar> -PASS Parsing: <foo:/> against <http://example.org/foo/bar> -PASS Parsing: <foo:/bar.com/> against <http://example.org/foo/bar> -FAIL Parsing: <foo://///////> against <http://example.org/foo/bar> assert_equals: pathname expected "///////" but got "/////////" -FAIL Parsing: <foo://///////bar.com/> against <http://example.org/foo/bar> assert_equals: pathname expected "///////bar.com/" but got "/////////bar.com/" -FAIL Parsing: <foo:////://///> against <http://example.org/foo/bar> assert_equals: pathname expected "//://///" but got "////://///" -PASS Parsing: <c:/foo> against <http://example.org/foo/bar> -PASS Parsing: <//foo/bar> against <http://example.org/foo/bar> -PASS Parsing: <http://foo/path;a??e#f#g> against <http://example.org/foo/bar> -PASS Parsing: <http://foo/abcd?efgh?ijkl> against <http://example.org/foo/bar> -PASS Parsing: <http://foo/abcd#foo?bar> against <http://example.org/foo/bar> -PASS Parsing: <[61:24:74]:98> against <http://example.org/foo/bar> -PASS Parsing: <http:[61:27]/:foo> against <http://example.org/foo/bar> -PASS Parsing: <http://[1::2]:3:4> against <http://example.org/foo/bar> -PASS Parsing: <http://2001::1> against <http://example.org/foo/bar> -PASS Parsing: <http://2001::1]> against <http://example.org/foo/bar> -PASS Parsing: <http://2001::1]:80> against <http://example.org/foo/bar> -PASS Parsing: <http://[2001::1]> against <http://example.org/foo/bar> -PASS Parsing: <http://[::127.0.0.1]> against <http://example.org/foo/bar> -PASS Parsing: <http://[0:0:0:0:0:0:13.1.68.3]> against <http://example.org/foo/bar> -PASS Parsing: <http://[2001::1]:80> against <http://example.org/foo/bar> -PASS Parsing: <http:/example.com/> against <http://example.org/foo/bar> -PASS Parsing: <ftp:/example.com/> against <http://example.org/foo/bar> -PASS Parsing: <https:/example.com/> against <http://example.org/foo/bar> -PASS Parsing: <madeupscheme:/example.com/> against <http://example.org/foo/bar> -PASS Parsing: <ftps:/example.com/> against <http://example.org/foo/bar> -PASS Parsing: <gopher:/example.com/> against <http://example.org/foo/bar> -PASS Parsing: <ws:/example.com/> against <http://example.org/foo/bar> -PASS Parsing: <wss:/example.com/> against <http://example.org/foo/bar> -PASS Parsing: <data:/example.com/> against <http://example.org/foo/bar> -PASS Parsing: <http:example.com/> against <http://example.org/foo/bar> -PASS Parsing: <ftp:example.com/> against <http://example.org/foo/bar> -PASS Parsing: <https:example.com/> against <http://example.org/foo/bar> -PASS Parsing: <madeupscheme:example.com/> against <http://example.org/foo/bar> -PASS Parsing: <ftps:example.com/> against <http://example.org/foo/bar> -PASS Parsing: <gopher:example.com/> against <http://example.org/foo/bar> -PASS Parsing: <ws:example.com/> against <http://example.org/foo/bar> -PASS Parsing: <wss:example.com/> against <http://example.org/foo/bar> -PASS Parsing: <data:example.com/> against <http://example.org/foo/bar> -PASS Parsing: </a/b/c> against <http://example.org/foo/bar> -PASS Parsing: </a/ /c> against <http://example.org/foo/bar> -PASS Parsing: </a%2fc> against <http://example.org/foo/bar> -PASS Parsing: </a/%2f/c> against <http://example.org/foo/bar> -PASS Parsing: <#β> against <http://example.org/foo/bar> -PASS Parsing: <data:text/html,test#test> against <http://example.org/foo/bar> -PASS Parsing: <tel:1234567890> against <http://example.org/foo/bar> -FAIL Parsing: <ssh://example.com/foo/bar.git> against <http://example.org/> assert_equals: host expected "example.com" but got "" -PASS Parsing: <http://example.com/././foo> against <about:blank> -PASS Parsing: <http://example.com/./.foo> against <about:blank> -PASS Parsing: <http://example.com/foo/.> against <about:blank> -PASS Parsing: <http://example.com/foo/./> against <about:blank> -PASS Parsing: <http://example.com/foo/bar/..> against <about:blank> -PASS Parsing: <http://example.com/foo/bar/../> against <about:blank> -PASS Parsing: <http://example.com/foo/..bar> against <about:blank> -PASS Parsing: <http://example.com/foo/bar/../ton> against <about:blank> -PASS Parsing: <http://example.com/foo/bar/../ton/../../a> against <about:blank> -PASS Parsing: <http://example.com/foo/../../..> against <about:blank> -PASS Parsing: <http://example.com/foo/../../../ton> against <about:blank> -PASS Parsing: <http://example.com/foo/%2e> against <about:blank> -FAIL Parsing: <http://example.com/foo/%2e%2> against <about:blank> assert_equals: href expected "http://example.com/foo/%2e%2" but got "http://example.com/foo/.%2" -FAIL Parsing: <http://example.com/foo/%2e./%2e%2e/.%2e/%2e.bar> against <about:blank> assert_equals: href expected "http://example.com/%2e.bar" but got "http://example.com/..bar" -PASS Parsing: <http://example.com////../..> against <about:blank> -PASS Parsing: <http://example.com/foo/bar//../..> against <about:blank> -PASS Parsing: <http://example.com/foo/bar//..> against <about:blank> -PASS Parsing: <http://example.com/foo> against <about:blank> -PASS Parsing: <http://example.com/%20foo> against <about:blank> -PASS Parsing: <http://example.com/foo%> against <about:blank> -PASS Parsing: <http://example.com/foo%2> against <about:blank> -PASS Parsing: <http://example.com/foo%2zbar> against <about:blank> -PASS Parsing: <http://example.com/foo%2©zbar> against <about:blank> -FAIL Parsing: <http://example.com/foo%41%7a> against <about:blank> assert_equals: href expected "http://example.com/foo%41%7a" but got "http://example.com/fooAz" -PASS Parsing: <http://example.com/foo %91> against <about:blank> -FAIL Parsing: <http://example.com/foo%00%51> against <about:blank> Failed to construct 'URL': Invalid URL -PASS Parsing: <http://example.com/(%28:%3A%29)> against <about:blank> -PASS Parsing: <http://example.com/%3A%3a%3C%3c> against <about:blank> -PASS Parsing: <http://example.com/foo bar> against <about:blank> -PASS Parsing: <http://example.com\\foo\\bar> against <about:blank> -PASS Parsing: <http://example.com/%7Ffp3%3Eju%3Dduvgw%3Dd> against <about:blank> -PASS Parsing: <http://example.com/@asdf%40> against <about:blank> -PASS Parsing: <http://example.com/你好你好> against <about:blank> -PASS Parsing: <http://example.com/‥/foo> against <about:blank> -PASS Parsing: <http://example.com//foo> against <about:blank> -PASS Parsing: <http://example.com//foo//bar> against <about:blank> -PASS Parsing: <http://www.google.com/foo?bar=baz#> against <about:blank> -PASS Parsing: <http://www.google.com/foo?bar=baz# »> against <about:blank> -PASS Parsing: <data:test# »> against <about:blank> -PASS Parsing: <http://www.google.com> against <about:blank> -PASS Parsing: <http://192.0x00A80001> against <about:blank> -FAIL Parsing: <http://www/foo%2Ehtml> against <about:blank> assert_equals: href expected "http://www/foo%2Ehtml" but got "http://www/foo.html" -PASS Parsing: <http://www/foo/%2E/html> against <about:blank> -PASS Parsing: <http://user:pass@/> against <about:blank> -PASS Parsing: <http://%25DOMAIN:foobar@foodomain.com/> against <about:blank> -PASS Parsing: <http:\\www.google.com\foo> against <about:blank> -PASS Parsing: <http://foo:80/> against <about:blank> -PASS Parsing: <http://foo:81/> against <about:blank> -FAIL Parsing: <httpa://foo:80/> against <about:blank> assert_equals: host expected "foo:80" but got "" -PASS Parsing: <http://foo:-80/> against <about:blank> -PASS Parsing: <https://foo:443/> against <about:blank> -PASS Parsing: <https://foo:80/> against <about:blank> -PASS Parsing: <ftp://foo:21/> against <about:blank> -PASS Parsing: <ftp://foo:80/> against <about:blank> -FAIL Parsing: <gopher://foo:70/> against <about:blank> assert_equals: host expected "foo:70" but got "" -FAIL Parsing: <gopher://foo:443/> against <about:blank> assert_equals: host expected "foo:443" but got "" -PASS Parsing: <ws://foo:80/> against <about:blank> -PASS Parsing: <ws://foo:81/> against <about:blank> -PASS Parsing: <ws://foo:443/> against <about:blank> -PASS Parsing: <ws://foo:815/> against <about:blank> -PASS Parsing: <wss://foo:80/> against <about:blank> -PASS Parsing: <wss://foo:81/> against <about:blank> -PASS Parsing: <wss://foo:443/> against <about:blank> -PASS Parsing: <wss://foo:815/> against <about:blank> -PASS Parsing: <http:/example.com/> against <about:blank> -PASS Parsing: <ftp:/example.com/> against <about:blank> -PASS Parsing: <https:/example.com/> against <about:blank> -PASS Parsing: <madeupscheme:/example.com/> against <about:blank> -PASS Parsing: <ftps:/example.com/> against <about:blank> -PASS Parsing: <gopher:/example.com/> against <about:blank> -PASS Parsing: <ws:/example.com/> against <about:blank> -PASS Parsing: <wss:/example.com/> against <about:blank> -PASS Parsing: <data:/example.com/> against <about:blank> -PASS Parsing: <http:example.com/> against <about:blank> -PASS Parsing: <ftp:example.com/> against <about:blank> -PASS Parsing: <https:example.com/> against <about:blank> -PASS Parsing: <madeupscheme:example.com/> against <about:blank> -PASS Parsing: <ftps:example.com/> against <about:blank> -PASS Parsing: <gopher:example.com/> against <about:blank> -PASS Parsing: <ws:example.com/> against <about:blank> -PASS Parsing: <wss:example.com/> against <about:blank> -PASS Parsing: <data:example.com/> against <about:blank> -PASS Parsing: <http:@www.example.com> against <about:blank> -PASS Parsing: <http:/@www.example.com> against <about:blank> -PASS Parsing: <http://@www.example.com> against <about:blank> -PASS Parsing: <http:a:b@www.example.com> against <about:blank> -PASS Parsing: <http:/a:b@www.example.com> against <about:blank> -PASS Parsing: <http://a:b@www.example.com> against <about:blank> -PASS Parsing: <http://@pple.com> against <about:blank> -PASS Parsing: <http::b@www.example.com> against <about:blank> -PASS Parsing: <http:/:b@www.example.com> against <about:blank> -PASS Parsing: <http://:b@www.example.com> against <about:blank> -PASS Parsing: <http:/:@/www.example.com> against <about:blank> -PASS Parsing: <http://user@/www.example.com> against <about:blank> -PASS Parsing: <http:@/www.example.com> against <about:blank> -PASS Parsing: <http:/@/www.example.com> against <about:blank> -PASS Parsing: <http://@/www.example.com> against <about:blank> -PASS Parsing: <https:@/www.example.com> against <about:blank> -PASS Parsing: <http:a:b@/www.example.com> against <about:blank> -PASS Parsing: <http:/a:b@/www.example.com> against <about:blank> -PASS Parsing: <http://a:b@/www.example.com> against <about:blank> -PASS Parsing: <http::@/www.example.com> against <about:blank> -PASS Parsing: <http:a:@www.example.com> against <about:blank> -PASS Parsing: <http:/a:@www.example.com> against <about:blank> -PASS Parsing: <http://a:@www.example.com> against <about:blank> -PASS Parsing: <http://www.@pple.com> against <about:blank> -PASS Parsing: <http:@:www.example.com> against <about:blank> -PASS Parsing: <http:/@:www.example.com> against <about:blank> -PASS Parsing: <http://@:www.example.com> against <about:blank> -PASS Parsing: <http://:@www.example.com> against <about:blank> -PASS Parsing: </> against <http://www.example.com/test> -PASS Parsing: </test.txt> against <http://www.example.com/test> -PASS Parsing: <.> against <http://www.example.com/test> -PASS Parsing: <..> against <http://www.example.com/test> -PASS Parsing: <test.txt> against <http://www.example.com/test> -PASS Parsing: <./test.txt> against <http://www.example.com/test> -PASS Parsing: <../test.txt> against <http://www.example.com/test> -PASS Parsing: <../aaa/test.txt> against <http://www.example.com/test> -PASS Parsing: <../../test.txt> against <http://www.example.com/test> -PASS Parsing: <中/test.txt> against <http://www.example.com/test> -PASS Parsing: <http://www.example2.com> against <http://www.example.com/test> -PASS Parsing: <//www.example2.com> against <http://www.example.com/test> -PASS Parsing: <http://ExAmPlE.CoM> against <http://other.com/> -FAIL Parsing: <http://example example.com> against <http://other.com/> assert_throws_js: function "function() { - bURL(expected.input, expected.base) - }" did not throw -FAIL Parsing: <http://Goo%20 goo%7C|.com> against <http://other.com/> assert_throws_js: function "function() { - bURL(expected.input, expected.base) - }" did not throw -PASS Parsing: <http://[]> against <http://other.com/> -PASS Parsing: <http://[:]> against <http://other.com/> -FAIL Parsing: <http://GOO goo.com> against <http://other.com/> assert_throws_js: function "function() { - bURL(expected.input, expected.base) - }" did not throw -PASS Parsing: <http://GOOgoo.com> against <http://other.com/> -PASS Parsing: <\0 http://example.com/ \r > against <about:blank> -PASS Parsing: <http://www.foo。bar.com> against <http://other.com/> -PASS Parsing: <http://zyx.com> against <http://other.com/> -PASS Parsing: <http://%ef%b7%90zyx.com> against <http://other.com/> -PASS Parsing: <https://�> against <about:blank> -PASS Parsing: <https://%EF%BF%BD> against <about:blank> -PASS Parsing: <https://x/�?�#�> against <about:blank> -FAIL Parsing: <http://a.b.c.xn--pokxncvks> against <about:blank> assert_throws_js: function "function() { - bURL(expected.input, expected.base) - }" did not throw -FAIL Parsing: <http://10.0.0.xn--pokxncvks> against <about:blank> assert_throws_js: function "function() { - bURL(expected.input, expected.base) - }" did not throw -FAIL Parsing: <http://a.b.c.XN--pokxncvks> against <about:blank> assert_throws_js: function "function() { - bURL(expected.input, expected.base) - }" did not throw -FAIL Parsing: <http://a.b.c.Xn--pokxncvks> against <about:blank> assert_throws_js: function "function() { - bURL(expected.input, expected.base) - }" did not throw -FAIL Parsing: <http://10.0.0.XN--pokxncvks> against <about:blank> assert_throws_js: function "function() { - bURL(expected.input, expected.base) - }" did not throw -FAIL Parsing: <http://10.0.0.xN--pokxncvks> against <about:blank> assert_throws_js: function "function() { - bURL(expected.input, expected.base) - }" did not throw -PASS Parsing: <http://Ｇｏ.com> against <http://other.com/> -FAIL Parsing: <http://％４１.com> against <http://other.com/> assert_throws_js: function "function() { - bURL(expected.input, expected.base) - }" did not throw -FAIL Parsing: <http://%ef%bc%85%ef%bc%94%ef%bc%91.com> against <http://other.com/> assert_throws_js: function "function() { - bURL(expected.input, expected.base) - }" did not throw -PASS Parsing: <http://％００.com> against <http://other.com/> -PASS Parsing: <http://%ef%bc%85%ef%bc%90%ef%bc%90.com> against <http://other.com/> -PASS Parsing: <http://你好你好> against <http://other.com/> -FAIL Parsing: <https://faß.ExAmPlE/> against <about:blank> assert_equals: href expected "https://xn--fa-hia.example/" but got "https://fass.example/" -FAIL Parsing: <sc://faß.ExAmPlE/> against <about:blank> assert_equals: host expected "fa%C3%9F.ExAmPlE" but got "" -PASS Parsing: <http://%zz%66%a.com> against <http://other.com/> -PASS Parsing: <http://%25> against <http://other.com/> -PASS Parsing: <http://hello%00> against <http://other.com/> -PASS Parsing: <http://%30%78%63%30%2e%30%32%35%30.01> against <http://other.com/> -PASS Parsing: <http://%30%78%63%30%2e%30%32%35%30.01%2e> against <http://other.com/> -PASS Parsing: <http://192.168.0.257> against <http://other.com/> -PASS Parsing: <http://%3g%78%63%30%2e%30%32%35%30%2E.01> against <http://other.com/> -FAIL Parsing: <http://192.168.0.1 hello> against <http://other.com/> assert_throws_js: function "function() { - bURL(expected.input, expected.base) - }" did not throw -FAIL Parsing: <https://x x:12> against <about:blank> assert_throws_js: function "function() { - bURL(expected.input, expected.base) - }" did not throw -PASS Parsing: <http://０Ｘｃ０．０２５０．０１> against <http://other.com/> -PASS Parsing: <http://./> against <about:blank> -PASS Parsing: <http://../> against <about:blank> -FAIL Parsing: <h://.> against <about:blank> assert_equals: host expected "." but got "" -PASS Parsing: <http://[www.google.com]/> against <about:blank> -PASS Parsing: <http://[google.com]> against <http://other.com/> -PASS Parsing: <http://[::1.2.3.4x]> against <http://other.com/> -FAIL Parsing: <http://[::1.2.3.]> against <http://other.com/> assert_throws_js: function "function() { - bURL(expected.input, expected.base) - }" did not throw -FAIL Parsing: <http://[::1.2.]> against <http://other.com/> assert_throws_js: function "function() { - bURL(expected.input, expected.base) - }" did not throw -FAIL Parsing: <http://[::1.]> against <http://other.com/> assert_throws_js: function "function() { - bURL(expected.input, expected.base) - }" did not throw -PASS Parsing: <http://foo:💩@example.com/bar> against <http://other.com/> -PASS Parsing: <#> against <test:test> -PASS Parsing: <#x> against <data:,> -PASS Parsing: <#x> against <about:blank> -PASS Parsing: <#> against <test:test?test> -PASS Parsing: <https://@test@test@example:800/> against <http://doesnotmatter/> -PASS Parsing: <https://@@@example> against <http://doesnotmatter/> -PASS Parsing: <http://`{}:`{}@h/`{}?`{}> against <http://doesnotmatter/> -PASS Parsing: <http://host/?'> against <about:blank> -FAIL Parsing: <notspecial://host/?'> against <about:blank> assert_equals: href expected "notspecial://host/?'" but got "notspecial://host/?%27" -PASS Parsing: </some/path> against <http://user@example.org/smth> -PASS Parsing: <> against <http://user:pass@example.org:21/smth> -PASS Parsing: </some/path> against <http://user:pass@example.org:21/smth> -PASS Parsing: <i> against <sc:sd> -PASS Parsing: <i> against <sc:sd/sd> -PASS Parsing: <i> against <sc:/pa/pa> -FAIL Parsing: <i> against <sc://ho/pa> assert_equals: host expected "ho" but got "" -FAIL Parsing: <i> against <sc:///pa/pa> assert_equals: pathname expected "/pa/i" but got "///pa/i" -PASS Parsing: <../i> against <sc:sd> -PASS Parsing: <../i> against <sc:sd/sd> -PASS Parsing: <../i> against <sc:/pa/pa> -FAIL Parsing: <../i> against <sc://ho/pa> assert_equals: host expected "ho" but got "" -FAIL Parsing: <../i> against <sc:///pa/pa> assert_equals: href expected "sc:///i" but got "sc:///pa/i" -PASS Parsing: </i> against <sc:sd> -PASS Parsing: </i> against <sc:sd/sd> -PASS Parsing: </i> against <sc:/pa/pa> -FAIL Parsing: </i> against <sc://ho/pa> assert_equals: host expected "ho" but got "" -FAIL Parsing: </i> against <sc:///pa/pa> assert_equals: href expected "sc:///i" but got "sc:///pa/i" -PASS Parsing: <?i> against <sc:sd> -PASS Parsing: <?i> against <sc:sd/sd> -PASS Parsing: <?i> against <sc:/pa/pa> -FAIL Parsing: <?i> against <sc://ho/pa> assert_equals: host expected "ho" but got "" -FAIL Parsing: <?i> against <sc:///pa/pa> assert_equals: pathname expected "/pa/pa" but got "///pa/pa" -PASS Parsing: <#i> against <sc:sd> -PASS Parsing: <#i> against <sc:sd/sd> -PASS Parsing: <#i> against <sc:/pa/pa> -FAIL Parsing: <#i> against <sc://ho/pa> assert_equals: host expected "ho" but got "" -FAIL Parsing: <#i> against <sc:///pa/pa> assert_equals: pathname expected "/pa/pa" but got "///pa/pa" -FAIL Parsing: <about:/../> against <about:blank> assert_equals: href expected "about:/" but got "about:/../" -FAIL Parsing: <data:/../> against <about:blank> assert_equals: href expected "data:/" but got "data:/../" -FAIL Parsing: <sc://ñ.test/> against <about:blank> assert_equals: host expected "%C3%B1.test" but got "" -FAIL Parsing: <sc://%/> against <about:blank> assert_equals: host expected "%" but got "" -FAIL Parsing: <sc://@/> against <about:blank> assert_throws_js: function "function() { - bURL(expected.input, expected.base) - }" did not throw -FAIL Parsing: <sc://te@s:t@/> against <about:blank> assert_throws_js: function "function() { - bURL(expected.input, expected.base) - }" did not throw -FAIL Parsing: <sc://:/> against <about:blank> assert_throws_js: function "function() { - bURL(expected.input, expected.base) - }" did not throw -FAIL Parsing: <sc://:12/> against <about:blank> assert_throws_js: function "function() { - bURL(expected.input, expected.base) - }" did not throw -FAIL Parsing: <x> against <sc://ñ> Failed to construct 'URL': Invalid URL -PASS Parsing: <sc:\../> against <about:blank> -PASS Parsing: <sc::a@example.net> against <about:blank> -PASS Parsing: <wow:%NBD> against <about:blank> -PASS Parsing: <wow:%1G> against <about:blank> -FAIL Parsing: <wow:> against <about:blank> assert_equals: href expected "wow:%EF%BF%BF" but got "wow:%EF%BF%BD" -FAIL Parsing: <http://example.com/U+d800U+dfff﷏ﷰ?U+d800U+dfff﷏ﷰ> against <about:blank> Failed to construct 'URL': Invalid URL -FAIL Parsing: <sc://a\0b/> against <about:blank> assert_throws_js: function "function() { - bURL(expected.input, expected.base) - }" did not throw -FAIL Parsing: <sc://a b/> against <about:blank> assert_throws_js: function "function() { - bURL(expected.input, expected.base) - }" did not throw -FAIL Parsing: <sc://a<b> against <about:blank> assert_throws_js: function "function() { - bURL(expected.input, expected.base) - }" did not throw -FAIL Parsing: <sc://a>b> against <about:blank> assert_throws_js: function "function() { - bURL(expected.input, expected.base) - }" did not throw -FAIL Parsing: <sc://a[b/> against <about:blank> assert_throws_js: function "function() { - bURL(expected.input, expected.base) - }" did not throw -FAIL Parsing: <sc://a\b/> against <about:blank> assert_throws_js: function "function() { - bURL(expected.input, expected.base) - }" did not throw -FAIL Parsing: <sc://a]b/> against <about:blank> assert_throws_js: function "function() { - bURL(expected.input, expected.base) - }" did not throw -FAIL Parsing: <sc://a^b> against <about:blank> assert_throws_js: function "function() { - bURL(expected.input, expected.base) - }" did not throw -FAIL Parsing: <sc://a|b/> against <about:blank> assert_throws_js: function "function() { - bURL(expected.input, expected.base) - }" did not throw -FAIL Parsing: <foo://ho st/> against <about:blank> assert_equals: host expected "host" but got "" -FAIL Parsing: <foo://ho -st/> against <about:blank> assert_equals: host expected "host" but got "" -FAIL Parsing: <foo://ho\rst/> against <about:blank> assert_equals: host expected "host" but got "" -PASS Parsing: <http://a\0b/> against <about:blank> -PASS Parsing: <http://ab/> against <about:blank> -PASS Parsing: <http://ab/> against <about:blank> -PASS Parsing: <http://ab/> against <about:blank> -PASS Parsing: <http://ab/> against <about:blank> -PASS Parsing: <http://ab/> against <about:blank> -PASS Parsing: <http://ab/> against <about:blank> -PASS Parsing: <http://ab/> against <about:blank> -PASS Parsing: <http://ab/> against <about:blank> -PASS Parsing: <http://a b/> against <about:blank> -PASS Parsing: <http://a b/> against <about:blank> -PASS Parsing: <http://ab/> against <about:blank> -PASS Parsing: <http://ab/> against <about:blank> -PASS Parsing: <http://ab/> against <about:blank> -PASS Parsing: <http://ab/> against <about:blank> -PASS Parsing: <http://ab/> against <about:blank> -PASS Parsing: <http://ab/> against <about:blank> -PASS Parsing: <http://ab/> against <about:blank> -PASS Parsing: <http://ab/> against <about:blank> -PASS Parsing: <http://ab/> against <about:blank> -PASS Parsing: <http://ab/> against <about:blank> -PASS Parsing: <http://ab/> against <about:blank> -PASS Parsing: <http://ab/> against <about:blank> -PASS Parsing: <http://ab/> against <about:blank> -PASS Parsing: <http://ab/> against <about:blank> -PASS Parsing: <http://a b/> against <about:blank> -PASS Parsing: <http://a b/> against <about:blank> -PASS Parsing: <http://a b/> against <about:blank> -PASS Parsing: <http://a b/> against <about:blank> -FAIL Parsing: <http://a b/> against <about:blank> assert_throws_js: function "function() { - bURL(expected.input, expected.base) - }" did not throw -PASS Parsing: <http://a%b/> against <about:blank> -FAIL Parsing: <http://a<b> against <about:blank> assert_throws_js: function "function() { - bURL(expected.input, expected.base) - }" did not throw -FAIL Parsing: <http://a>b> against <about:blank> assert_throws_js: function "function() { - bURL(expected.input, expected.base) - }" did not throw -PASS Parsing: <http://a[b/> against <about:blank> -PASS Parsing: <http://a]b/> against <about:blank> -PASS Parsing: <http://a^b> against <about:blank> -FAIL Parsing: <http://a|b/> against <about:blank> assert_throws_js: function "function() { - bURL(expected.input, expected.base) - }" did not throw -PASS Parsing: <http://ab/> against <about:blank> -PASS Parsing: <http://ho st/> against <about:blank> -PASS Parsing: <http://ho -st/> against <about:blank> -PASS Parsing: <http://ho\rst/> against <about:blank> -PASS Parsing: <http://ho%00st/> against <about:blank> -PASS Parsing: <http://ho%01st/> against <about:blank> -PASS Parsing: <http://ho%02st/> against <about:blank> -PASS Parsing: <http://ho%03st/> against <about:blank> -PASS Parsing: <http://ho%04st/> against <about:blank> -PASS Parsing: <http://ho%05st/> against <about:blank> -PASS Parsing: <http://ho%06st/> against <about:blank> -PASS Parsing: <http://ho%07st/> against <about:blank> -PASS Parsing: <http://ho%08st/> against <about:blank> -PASS Parsing: <http://ho%09st/> against <about:blank> -PASS Parsing: <http://ho%0Ast/> against <about:blank> -PASS Parsing: <http://ho%0Bst/> against <about:blank> -PASS Parsing: <http://ho%0Cst/> against <about:blank> -PASS Parsing: <http://ho%0Dst/> against <about:blank> -PASS Parsing: <http://ho%0Est/> against <about:blank> -PASS Parsing: <http://ho%0Fst/> against <about:blank> -PASS Parsing: <http://ho%10st/> against <about:blank> -PASS Parsing: <http://ho%11st/> against <about:blank> -PASS Parsing: <http://ho%12st/> against <about:blank> -PASS Parsing: <http://ho%13st/> against <about:blank> -PASS Parsing: <http://ho%14st/> against <about:blank> -PASS Parsing: <http://ho%15st/> against <about:blank> -PASS Parsing: <http://ho%16st/> against <about:blank> -PASS Parsing: <http://ho%17st/> against <about:blank> -PASS Parsing: <http://ho%18st/> against <about:blank> -PASS Parsing: <http://ho%19st/> against <about:blank> -PASS Parsing: <http://ho%1Ast/> against <about:blank> -PASS Parsing: <http://ho%1Bst/> against <about:blank> -PASS Parsing: <http://ho%1Cst/> against <about:blank> -PASS Parsing: <http://ho%1Dst/> against <about:blank> -PASS Parsing: <http://ho%1Est/> against <about:blank> -PASS Parsing: <http://ho%1Fst/> against <about:blank> -FAIL Parsing: <http://ho%20st/> against <about:blank> assert_throws_js: function "function() { - bURL(expected.input, expected.base) - }" did not throw -FAIL Parsing: <http://ho%23st/> against <about:blank> assert_throws_js: function "function() { - bURL(expected.input, expected.base) - }" did not throw -PASS Parsing: <http://ho%25st/> against <about:blank> -PASS Parsing: <http://ho%2Fst/> against <about:blank> -PASS Parsing: <http://ho%3Ast/> against <about:blank> -FAIL Parsing: <http://ho%3Cst/> against <about:blank> assert_throws_js: function "function() { - bURL(expected.input, expected.base) - }" did not throw -FAIL Parsing: <http://ho%3Est/> against <about:blank> assert_throws_js: function "function() { - bURL(expected.input, expected.base) - }" did not throw -PASS Parsing: <http://ho%3Fst/> against <about:blank> -FAIL Parsing: <http://ho%40st/> against <about:blank> assert_throws_js: function "function() { - bURL(expected.input, expected.base) - }" did not throw -PASS Parsing: <http://ho%5Bst/> against <about:blank> -PASS Parsing: <http://ho%5Cst/> against <about:blank> -PASS Parsing: <http://ho%5Dst/> against <about:blank> -FAIL Parsing: <http://ho%7Cst/> against <about:blank> assert_throws_js: function "function() { - bURL(expected.input, expected.base) - }" did not throw -PASS Parsing: <http://ho%7Fst/> against <about:blank> -FAIL Parsing: <http://!"$&'()*+,-.;=_`{}~/> against <about:blank> Failed to construct 'URL': Invalid URL -FAIL Parsing: <sc:// !"$%&'()*+,-.;=_`{}~/> against <about:blank> assert_equals: host expected "%01%02%03%04%05%06%07%08%0B%0C%0E%0F%10%11%12%13%14%15%16%17%18%19%1A%1B%1C%1D%1E%1F%7F!\"$%&'()*+,-.;=_`{}~" but got "" -PASS Parsing: <ftp://example.com%80/> against <about:blank> -PASS Parsing: <ftp://example.com%A0/> against <about:blank> -PASS Parsing: <https://example.com%80/> against <about:blank> -PASS Parsing: <https://example.com%A0/> against <about:blank> -PASS Parsing: <ftp://%e2%98%83> against <about:blank> -PASS Parsing: <https://%e2%98%83> against <about:blank> -PASS Parsing: <http://127.0.0.1:10100/relative_import.html> against <about:blank> -PASS Parsing: <http://facebook.com/?foo=%7B%22abc%22> against <about:blank> -PASS Parsing: <https://localhost:3000/jqueryui@1.2.3> against <about:blank> -PASS Parsing: <h t -t\rp://h o -s\rt:9 0 -0\r0/p a -t\rh?q u -e\rry#f r -a\rg> against <about:blank> -PASS Parsing: <?a=b&c=d> against <http://example.org/foo/bar> -PASS Parsing: <??a=b&c=d> against <http://example.org/foo/bar> -PASS Parsing: <http:> against <http://example.org/foo/bar> -PASS Parsing: <http:> against <https://example.org/foo/bar> -PASS Parsing: <sc:> against <https://example.org/foo/bar> -PASS Parsing: <http://foo.bar/baz?qux#foobar> against <about:blank> -PASS Parsing: <http://foo.bar/baz?qux#foo"bar> against <about:blank> -PASS Parsing: <http://foo.bar/baz?qux#foo<bar> against <about:blank> -PASS Parsing: <http://foo.bar/baz?qux#foo>bar> against <about:blank> -PASS Parsing: <http://foo.bar/baz?qux#foo`bar> against <about:blank> -PASS Parsing: <http://1.2.3.4/> against <http://other.com/> -PASS Parsing: <http://1.2.3.4./> against <http://other.com/> -PASS Parsing: <http://192.168.257> against <http://other.com/> -PASS Parsing: <http://192.168.257.> against <http://other.com/> -PASS Parsing: <http://192.168.257.com> against <http://other.com/> -PASS Parsing: <http://256> against <http://other.com/> -PASS Parsing: <http://256.com> against <http://other.com/> -PASS Parsing: <http://999999999> against <http://other.com/> -PASS Parsing: <http://999999999.> against <http://other.com/> -PASS Parsing: <http://999999999.com> against <http://other.com/> -PASS Parsing: <http://10000000000> against <http://other.com/> -PASS Parsing: <http://10000000000.com> against <http://other.com/> -PASS Parsing: <http://4294967295> against <http://other.com/> -PASS Parsing: <http://4294967296> against <http://other.com/> -PASS Parsing: <http://0xffffffff> against <http://other.com/> -PASS Parsing: <http://0xffffffff1> against <http://other.com/> -PASS Parsing: <http://256.256.256.256> against <http://other.com/> -PASS Parsing: <https://0x.0x.0> against <about:blank> -PASS Parsing: <https://0x100000000/test> against <about:blank> -PASS Parsing: <https://256.0.0.1/test> against <about:blank> -FAIL Parsing: <https://%43%7C/> against <about:blank> assert_throws_js: function "function() { - bURL(expected.input, expected.base) - }" did not throw -FAIL Parsing: <asdf://%43|/> against <about:blank> assert_throws_js: function "function() { - bURL(expected.input, expected.base) - }" did not throw -FAIL Parsing: <asdf://%43%7C/> against <about:blank> assert_equals: host expected "%43%7C" but got "" -PASS Parsing: <\\\.\Y:> against <about:blank> -PASS Parsing: <\\\.\y:> against <about:blank> -PASS Parsing: <http://[1:0::]> against <http://example.net/> -PASS Parsing: <http://[0:1:2:3:4:5:6:7:8]> against <http://example.net/> -PASS Parsing: <https://[0::0::0]> against <about:blank> -PASS Parsing: <https://[0:.0]> against <about:blank> -PASS Parsing: <https://[0:0:]> against <about:blank> -PASS Parsing: <https://[0:1:2:3:4:5:6:7.0.0.0.1]> against <about:blank> -PASS Parsing: <https://[0:1.00.0.0.0]> against <about:blank> -PASS Parsing: <https://[0:1.290.0.0.0]> against <about:blank> -PASS Parsing: <https://[0:1.23.23]> against <about:blank> -PASS Parsing: <http://?> against <about:blank> -PASS Parsing: <http://#> against <about:blank> -PASS Parsing: <http://f:4294967377/c> against <http://example.org/> -PASS Parsing: <http://f:18446744073709551697/c> against <http://example.org/> -PASS Parsing: <http://f:340282366920938463463374607431768211537/c> against <http://example.org/> -FAIL Parsing: <sc://ñ> against <about:blank> assert_equals: host expected "%C3%B1" but got "" -FAIL Parsing: <sc://ñ?x> against <about:blank> assert_equals: host expected "%C3%B1" but got "" -FAIL Parsing: <sc://ñ#x> against <about:blank> assert_equals: host expected "%C3%B1" but got "" -FAIL Parsing: <#x> against <sc://ñ> Failed to construct 'URL': Invalid URL -FAIL Parsing: <?x> against <sc://ñ> Failed to construct 'URL': Invalid URL -FAIL Parsing: <sc://?> against <about:blank> assert_equals: pathname expected "" but got "//" -FAIL Parsing: <sc://#> against <about:blank> assert_equals: pathname expected "" but got "//" -FAIL Parsing: <///> against <sc://x/> Failed to construct 'URL': Invalid URL -FAIL Parsing: <////> against <sc://x/> Failed to construct 'URL': Invalid URL -FAIL Parsing: <////x/> against <sc://x/> assert_equals: href expected "sc:////x/" but got "sc://x/" -FAIL Parsing: <tftp://foobar.com/someconfig;mode=netascii> against <about:blank> assert_equals: host expected "foobar.com" but got "" -FAIL Parsing: <telnet://user:pass@foobar.com:23/> against <about:blank> assert_equals: username expected "user" but got "" -FAIL Parsing: <ut2004://10.10.10.10:7777/Index.ut2> against <about:blank> assert_equals: host expected "10.10.10.10:7777" but got "" -FAIL Parsing: <redis://foo:bar@somehost:6379/0?baz=bam&qux=baz> against <about:blank> assert_equals: username expected "foo" but got "" -FAIL Parsing: <rsync://foo@host:911/sup> against <about:blank> assert_equals: username expected "foo" but got "" -FAIL Parsing: <git://github.com/foo/bar.git> against <about:blank> assert_equals: host expected "github.com" but got "" -FAIL Parsing: <irc://myserver.com:6999/channel?passwd> against <about:blank> assert_equals: host expected "myserver.com:6999" but got "" -FAIL Parsing: <dns://fw.example.org:9999/foo.bar.org?type=TXT> against <about:blank> assert_equals: host expected "fw.example.org:9999" but got "" -FAIL Parsing: <ldap://localhost:389/ou=People,o=JNDITutorial> against <about:blank> assert_equals: host expected "localhost:389" but got "" -FAIL Parsing: <git+https://github.com/foo/bar> against <about:blank> assert_equals: host expected "github.com" but got "" -PASS Parsing: <urn:ietf:rfc:2648> against <about:blank> -PASS Parsing: <tag:joe@example.org,2001:foo/bar> against <about:blank> -FAIL Parsing: <non-spec:/.//> against <about:blank> assert_equals: pathname expected "//" but got "/.//" -FAIL Parsing: <non-spec:/..//> against <about:blank> assert_equals: href expected "non-spec:/.//" but got "non-spec:/..//" -FAIL Parsing: <non-spec:/a/..//> against <about:blank> assert_equals: href expected "non-spec:/.//" but got "non-spec:/a/..//" -FAIL Parsing: <non-spec:/.//path> against <about:blank> assert_equals: pathname expected "//path" but got "/.//path" -FAIL Parsing: <non-spec:/..//path> against <about:blank> assert_equals: href expected "non-spec:/.//path" but got "non-spec:/..//path" -FAIL Parsing: <non-spec:/a/..//path> against <about:blank> assert_equals: href expected "non-spec:/.//path" but got "non-spec:/a/..//path" -FAIL Parsing: </.//path> against <non-spec:/p> assert_equals: href expected "non-spec:/.//path" but got "non-spec://path" -FAIL Parsing: </..//path> against <non-spec:/p> assert_equals: href expected "non-spec:/.//path" but got "non-spec://path" -FAIL Parsing: <..//path> against <non-spec:/p> assert_equals: href expected "non-spec:/.//path" but got "non-spec://path" -FAIL Parsing: <a/..//path> against <non-spec:/p> assert_equals: href expected "non-spec:/.//path" but got "non-spec://path" -FAIL Parsing: <> against <non-spec:/..//p> assert_equals: href expected "non-spec:/.//p" but got "non-spec:/..//p" -FAIL Parsing: <path> against <non-spec:/..//p> assert_equals: href expected "non-spec:/.//path" but got "non-spec:/..//path" -FAIL Parsing: <../path> against <non-spec:/.//p> assert_equals: href expected "non-spec:/path" but got "non-spec:/./path" -FAIL Parsing: <non-special://%E2%80%A0/> against <about:blank> assert_equals: host expected "%E2%80%A0" but got "" -FAIL Parsing: <non-special://H%4fSt/path> against <about:blank> assert_equals: host expected "H%4fSt" but got "" -FAIL Parsing: <non-special://[1:2:0:0:5:0:0:0]/> against <about:blank> assert_equals: href expected "non-special://[1:2:0:0:5::]/" but got "non-special://[1:2:0:0:5:0:0:0]/" -FAIL Parsing: <non-special://[1:2:0:0:0:0:0:3]/> against <about:blank> assert_equals: href expected "non-special://[1:2::3]/" but got "non-special://[1:2:0:0:0:0:0:3]/" -FAIL Parsing: <non-special://[1:2::3]:80/> against <about:blank> assert_equals: host expected "[1:2::3]:80" but got "" -FAIL Parsing: <non-special://[:80/> against <about:blank> assert_throws_js: function "function() { - bURL(expected.input, expected.base) - }" did not throw -PASS Parsing: <blob:https://example.com:443/> against <about:blank> -PASS Parsing: <blob:d3958f5c-0777-0845-9dcf-2cb28783acaf> against <about:blank> -PASS Parsing: <blob:> against <about:blank> -PASS Parsing: <http://0x7f.0.0.0x7g> against <about:blank> -PASS Parsing: <http://0X7F.0.0.0X7G> against <about:blank> -PASS Parsing: <http://[::127.0.0.0.1]> against <about:blank> -PASS Parsing: <http://[0:1:0:1:0:1:0:1]> against <about:blank> -PASS Parsing: <http://[1:0:1:0:1:0:1:0]> against <about:blank> -PASS Parsing: <http://example.org/test?"> against <about:blank> -PASS Parsing: <http://example.org/test?#> against <about:blank> -PASS Parsing: <http://example.org/test?<> against <about:blank> -PASS Parsing: <http://example.org/test?>> against <about:blank> -PASS Parsing: <http://example.org/test?⌣> against <about:blank> -PASS Parsing: <http://example.org/test?%23%23> against <about:blank> -PASS Parsing: <http://example.org/test?%GH> against <about:blank> -PASS Parsing: <http://example.org/test?a#%EF> against <about:blank> -PASS Parsing: <http://example.org/test?a#%GH> against <about:blank> -PASS Parsing: <a> against <about:blank> -PASS Parsing: <a/> against <about:blank> -PASS Parsing: <a//> against <about:blank> -PASS Parsing: <test-a-colon.html> against <a:> -PASS Parsing: <test-a-colon-b.html> against <a:b> -PASS Parsing: <test-a-colon-slash.html> against <a:/> -FAIL Parsing: <test-a-colon-slash-slash.html> against <a://> Failed to construct 'URL': Invalid URL -PASS Parsing: <test-a-colon-slash-b.html> against <a:/b> -FAIL Parsing: <test-a-colon-slash-slash-b.html> against <a://b> Failed to construct 'URL': Invalid URL -PASS Parsing: <http://example.org/test?a#b\0c> against <about:blank> -FAIL Parsing: <non-spec://example.org/test?a#b\0c> against <about:blank> assert_equals: host expected "example.org" but got "" -PASS Parsing: <non-spec:/test?a#b\0c> against <about:blank> -PASS Parsing: <a1234567890-+.:foo/bar> against <http://example.com/dir/file> -PASS Parsing: <#link> against <https://example.org/##link> -PASS Parsing: <non-special:cannot-be-a-base-url-\0 ~> against <about:blank> -PASS Parsing: <https://www.example.com/path{path.html?query'=query#fragment<fragment> against <about:blank> -PASS Parsing: <https://user:pass[@foo/bar> against <http://example.org> -FAIL Parsing: <foo:// !"$%&'()*+,-.;<=>@[\]^_`{|}~@host/> against <about:blank> assert_equals: href expected "foo://%20!%22$%&'()*+,-.%3B%3C%3D%3E%40%5B%5C%5D%5E_%60%7B%7C%7D~@host/" but got "foo:// !\"$%&'()*+,-.;<=>@[\\]^_`{|}~@host/" -FAIL Parsing: <wss:// !"$%&'()*+,-.;<=>@[]^_`{|}~@host/> against <about:blank> assert_equals: href expected "wss://%20!%22$%&'()*+,-.%3B%3C%3D%3E%40%5B%5D%5E_%60%7B%7C%7D~@host/" but got "wss://%20!%22$%&%27()*+,-.%3B%3C%3D%3E%40%5B%5D%5E_%60%7B%7C%7D~@host/" -FAIL Parsing: <foo://joe: !"$%&'()*+,-.:;<=>@[\]^_`{|}~@host/> against <about:blank> assert_equals: href expected "foo://joe:%20!%22$%&'()*+,-.%3A%3B%3C%3D%3E%40%5B%5C%5D%5E_%60%7B%7C%7D~@host/" but got "foo://joe: !\"$%&'()*+,-.:;<=>@[\\]^_`{|}~@host/" -FAIL Parsing: <wss://joe: !"$%&'()*+,-.:;<=>@[]^_`{|}~@host/> against <about:blank> assert_equals: href expected "wss://joe:%20!%22$%&'()*+,-.%3A%3B%3C%3D%3E%40%5B%5D%5E_%60%7B%7C%7D~@host/" but got "wss://joe:%20!%22$%&%27()*+,-.%3A%3B%3C%3D%3E%40%5B%5D%5E_%60%7B%7C%7D~@host/" -FAIL Parsing: <foo://!"$%&'()*+,-.;=_`{}~/> against <about:blank> assert_equals: host expected "!\"$%&'()*+,-.;=_`{}~" but got "" -FAIL Parsing: <wss://!"$&'()*+,-.;=_`{}~/> against <about:blank> Failed to construct 'URL': Invalid URL -FAIL Parsing: <foo://host/ !"$%&'()*+,-./:;<=>@[\]^_`{|}~> against <about:blank> assert_equals: href expected "foo://host/%20!%22$%&'()*+,-./:;%3C=%3E@[\\]^_%60%7B|%7D~" but got "foo://host/ !\"$%&'()*+,-./:;<=>@[\\]^_`{|}~" -FAIL Parsing: <wss://host/ !"$%&'()*+,-./:;<=>@[\]^_`{|}~> against <about:blank> assert_equals: href expected "wss://host/%20!%22$%&'()*+,-./:;%3C=%3E@[/]^_%60%7B|%7D~" but got "wss://host/%20!%22$%&'()*+,-./:;%3C=%3E@[/]%5E_%60%7B%7C%7D~" -FAIL Parsing: <foo://host/dir/? !"$%&'()*+,-./:;<=>?@[\]^_`{|}~> against <about:blank> assert_equals: href expected "foo://host/dir/?%20!%22$%&'()*+,-./:;%3C=%3E?@[\\]^_`{|}~" but got "foo://host/dir/?%20!%22$%&%27()*+,-./:;%3C=%3E?@[\\]^_`{|}~" -PASS Parsing: <wss://host/dir/? !"$%&'()*+,-./:;<=>?@[\]^_`{|}~> against <about:blank> -FAIL Parsing: <foo://host/dir/# !"#$%&'()*+,-./:;<=>?@[\]^_`{|}~> against <about:blank> assert_equals: host expected "host" but got "" -PASS Parsing: <wss://host/dir/# !"#$%&'()*+,-./:;<=>?@[\]^_`{|}~> against <about:blank> -FAIL Parsing: <abc:rootless> against <abc://host/path> assert_equals: href expected "abc:rootless" but got "abc://host/rootless" -FAIL Parsing: <abc:rootless> against <abc:/path> assert_equals: href expected "abc:rootless" but got "abc:/rootless" -PASS Parsing: <abc:rootless> against <abc:path> -FAIL Parsing: <abc:/rooted> against <abc://host/path> assert_equals: href expected "abc:/rooted" but got "abc://host/rooted" -PASS Parsing: <#> against <null> -PASS Parsing: <?> against <null> -PASS Parsing: <http://1.2.3.4.5> against <http://other.com/> -PASS Parsing: <http://1.2.3.4.5.> against <http://other.com/> -PASS Parsing: <http://0..0x300/> against <about:blank> -PASS Parsing: <http://0..0x300./> against <about:blank> -PASS Parsing: <http://256.256.256.256.256> against <http://other.com/> -PASS Parsing: <http://256.256.256.256.256.> against <http://other.com/> -PASS Parsing: <http://1.2.3.08> against <about:blank> -PASS Parsing: <http://1.2.3.08.> against <about:blank> -PASS Parsing: <http://1.2.3.09> against <about:blank> -PASS Parsing: <http://09.2.3.4> against <about:blank> -PASS Parsing: <http://09.2.3.4.> against <about:blank> -PASS Parsing: <http://01.2.3.4.5> against <about:blank> -PASS Parsing: <http://01.2.3.4.5.> against <about:blank> -PASS Parsing: <http://0x100.2.3.4> against <about:blank> -PASS Parsing: <http://0x100.2.3.4.> against <about:blank> -PASS Parsing: <http://0x1.2.3.4.5> against <about:blank> -PASS Parsing: <http://0x1.2.3.4.5.> against <about:blank> -PASS Parsing: <http://foo.1.2.3.4> against <about:blank> -PASS Parsing: <http://foo.1.2.3.4.> against <about:blank> -PASS Parsing: <http://foo.2.3.4> against <about:blank> -PASS Parsing: <http://foo.2.3.4.> against <about:blank> -PASS Parsing: <http://foo.09> against <about:blank> -PASS Parsing: <http://foo.09.> against <about:blank> -PASS Parsing: <http://foo.0x4> against <about:blank> -PASS Parsing: <http://foo.0x4.> against <about:blank> -PASS Parsing: <http://foo.09..> against <about:blank> -PASS Parsing: <http://0999999999999999999/> against <about:blank> -PASS Parsing: <http://foo.0x> against <about:blank> -PASS Parsing: <http://foo.0XFfFfFfFfFfFfFfFfFfAcE123> against <about:blank> -PASS Parsing: <http://💩.123/> against <about:blank> -Harness: the test ran to completion. -
diff --git "a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/idna-2008/external/wpt/url/url-setters-a-area.window_exclude=\050file_javascript_mailto\051-expected.txt" "b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/idna-2008/external/wpt/url/url-setters-a-area.window_exclude=\050file_javascript_mailto\051-expected.txt" deleted file mode 100644 index 6e10766..0000000 --- "a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/idna-2008/external/wpt/url/url-setters-a-area.window_exclude=\050file_javascript_mailto\051-expected.txt" +++ /dev/null
@@ -1,389 +0,0 @@ -This is a testharness.js-based test. -Found 371 tests; 229 PASS, 142 FAIL, 0 TIMEOUT, 0 NOTRUN. -PASS Loading data… -PASS <a>: Setting <a://example.net>.protocol = '' The empty string is not a valid scheme. Setter leaves the URL unchanged. -PASS <area>: Setting <a://example.net>.protocol = '' The empty string is not a valid scheme. Setter leaves the URL unchanged. -PASS <a>: Setting <a://example.net>.protocol = 'b' -PASS <area>: Setting <a://example.net>.protocol = 'b' -PASS <a>: Setting <a://example.net>.protocol = 'B' Upper-case ASCII is lower-cased -PASS <area>: Setting <a://example.net>.protocol = 'B' Upper-case ASCII is lower-cased -PASS <a>: Setting <a://example.net>.protocol = 'é' Non-ASCII is rejected -PASS <area>: Setting <a://example.net>.protocol = 'é' Non-ASCII is rejected -PASS <a>: Setting <a://example.net>.protocol = '0b' No leading digit -PASS <area>: Setting <a://example.net>.protocol = '0b' No leading digit -PASS <a>: Setting <a://example.net>.protocol = '+b' No leading punctuation -PASS <area>: Setting <a://example.net>.protocol = '+b' No leading punctuation -PASS <a>: Setting <a://example.net>.protocol = 'bC0+-.' -PASS <area>: Setting <a://example.net>.protocol = 'bC0+-.' -PASS <a>: Setting <a://example.net>.protocol = 'b,c' Only some punctuation is acceptable -PASS <area>: Setting <a://example.net>.protocol = 'b,c' Only some punctuation is acceptable -PASS <a>: Setting <a://example.net>.protocol = 'bé' Non-ASCII is rejected -PASS <area>: Setting <a://example.net>.protocol = 'bé' Non-ASCII is rejected -PASS <a>: Setting <http://test@example.net>.protocol = 'file' Can’t switch from URL containing username/password/port to file -PASS <area>: Setting <http://test@example.net>.protocol = 'file' Can’t switch from URL containing username/password/port to file -PASS <a>: Setting <https://example.net:1234>.protocol = 'file' -PASS <area>: Setting <https://example.net:1234>.protocol = 'file' -PASS <a>: Setting <wss://x:x@example.net:1234>.protocol = 'file' -PASS <area>: Setting <wss://x:x@example.net:1234>.protocol = 'file' -FAIL <a>: Setting <http://example.net>.protocol = 'b' Can’t switch from special scheme to non-special assert_equals: expected "http://example.net/" but got "b://example.net/" -FAIL <area>: Setting <http://example.net>.protocol = 'b' Can’t switch from special scheme to non-special assert_equals: expected "http://example.net/" but got "b://example.net/" -FAIL <a>: Setting <https://example.net>.protocol = 's' assert_equals: expected "https://example.net/" but got "s://example.net/" -FAIL <area>: Setting <https://example.net>.protocol = 's' assert_equals: expected "https://example.net/" but got "s://example.net/" -FAIL <a>: Setting <ftp://example.net>.protocol = 'test' assert_equals: expected "ftp://example.net/" but got "test://example.net/" -FAIL <area>: Setting <ftp://example.net>.protocol = 'test' assert_equals: expected "ftp://example.net/" but got "test://example.net/" -FAIL <a>: Setting <ssh://me@example.net>.protocol = 'http' Can’t switch from non-special scheme to special assert_equals: expected "ssh://me@example.net" but got "http://me@example.net/" -FAIL <area>: Setting <ssh://me@example.net>.protocol = 'http' Can’t switch from non-special scheme to special assert_equals: expected "ssh://me@example.net" but got "http://me@example.net/" -FAIL <a>: Setting <ssh://me@example.net>.protocol = 'https' assert_equals: expected "ssh://me@example.net" but got "https://me@example.net/" -FAIL <area>: Setting <ssh://me@example.net>.protocol = 'https' assert_equals: expected "ssh://me@example.net" but got "https://me@example.net/" -FAIL <a>: Setting <ssh://me@example.net>.protocol = 'file' assert_equals: expected "ssh://me@example.net" but got "file://me%40example.net/" -FAIL <area>: Setting <ssh://me@example.net>.protocol = 'file' assert_equals: expected "ssh://me@example.net" but got "file://me%40example.net/" -FAIL <a>: Setting <ssh://example.net>.protocol = 'file' assert_equals: expected "ssh://example.net" but got "file://example.net/" -FAIL <area>: Setting <ssh://example.net>.protocol = 'file' assert_equals: expected "ssh://example.net" but got "file://example.net/" -FAIL <a>: Setting <nonsense:///test>.protocol = 'https' assert_equals: expected "nonsense:///test" but got "https://test/" -FAIL <area>: Setting <nonsense:///test>.protocol = 'https' assert_equals: expected "nonsense:///test" but got "https://test/" -PASS <a>: Setting <http://example.net>.protocol = 'https:foo : bar' Stuff after the first ':' is ignored -PASS <area>: Setting <http://example.net>.protocol = 'https:foo : bar' Stuff after the first ':' is ignored -PASS <a>: Setting <data:text/html,<p>Test>.protocol = 'view-source+data:foo : bar' Stuff after the first ':' is ignored -PASS <area>: Setting <data:text/html,<p>Test>.protocol = 'view-source+data:foo : bar' Stuff after the first ':' is ignored -PASS <a>: Setting <http://foo.com:443/>.protocol = 'https' Port is set to null if it is the default for new scheme. -PASS <area>: Setting <http://foo.com:443/>.protocol = 'https' Port is set to null if it is the default for new scheme. -PASS <a>: Setting <unix:/run/foo.socket>.username = 'me' No host means no username -PASS <area>: Setting <unix:/run/foo.socket>.username = 'me' No host means no username -PASS <a>: Setting <http://example.net>.username = 'me' -PASS <area>: Setting <http://example.net>.username = 'me' -PASS <a>: Setting <http://:secret@example.net>.username = 'me' -PASS <area>: Setting <http://:secret@example.net>.username = 'me' -PASS <a>: Setting <http://me@example.net>.username = '' -PASS <area>: Setting <http://me@example.net>.username = '' -PASS <a>: Setting <http://me:secret@example.net>.username = '' -PASS <area>: Setting <http://me:secret@example.net>.username = '' -FAIL <a>: Setting <http://example.net>.username = '\0 -\r !"#$%&'()*+,-./09:;<=>?@AZ[\]^_`az{|}~Éé' UTF-8 percent encoding with the userinfo encode set. assert_equals: expected "http://%00%01%09%0A%0D%1F%20!%22%23$%&'()*+,-.%2F09%3A%3B%3C%3D%3E%3F%40AZ%5B%5C%5D%5E_%60az%7B%7C%7D~%7F%C2%80%C2%81%C3%89%C3%A9@example.net/" but got "http://%00%01%09%0A%0D%1F%20!%22%23$%&%27()*+,-.%2F09%3A%3B%3C%3D%3E%3F%40AZ%5B%5C%5D%5E_%60az%7B%7C%7D~%7F%C2%80%C2%81%C3%89%C3%A9@example.net/" -FAIL <area>: Setting <http://example.net>.username = '\0 -\r !"#$%&'()*+,-./09:;<=>?@AZ[\]^_`az{|}~Éé' UTF-8 percent encoding with the userinfo encode set. assert_equals: expected "http://%00%01%09%0A%0D%1F%20!%22%23$%&'()*+,-.%2F09%3A%3B%3C%3D%3E%3F%40AZ%5B%5C%5D%5E_%60az%7B%7C%7D~%7F%C2%80%C2%81%C3%89%C3%A9@example.net/" but got "http://%00%01%09%0A%0D%1F%20!%22%23$%&%27()*+,-.%2F09%3A%3B%3C%3D%3E%3F%40AZ%5B%5C%5D%5E_%60az%7B%7C%7D~%7F%C2%80%C2%81%C3%89%C3%A9@example.net/" -PASS <a>: Setting <http://example.net>.username = '%c3%89té' Bytes already percent-encoded are left as-is. -PASS <area>: Setting <http://example.net>.username = '%c3%89té' Bytes already percent-encoded are left as-is. -PASS <a>: Setting <sc:///>.username = 'x' -PASS <area>: Setting <sc:///>.username = 'x' -PASS <a>: Setting <unix:/run/foo.socket>.password = 'secret' No host means no password -PASS <area>: Setting <unix:/run/foo.socket>.password = 'secret' No host means no password -PASS <a>: Setting <http://example.net>.password = 'secret' -PASS <area>: Setting <http://example.net>.password = 'secret' -PASS <a>: Setting <http://me@example.net>.password = 'secret' -PASS <area>: Setting <http://me@example.net>.password = 'secret' -PASS <a>: Setting <http://:secret@example.net>.password = '' -PASS <area>: Setting <http://:secret@example.net>.password = '' -PASS <a>: Setting <http://me:secret@example.net>.password = '' -PASS <area>: Setting <http://me:secret@example.net>.password = '' -FAIL <a>: Setting <http://example.net>.password = '\0 -\r !"#$%&'()*+,-./09:;<=>?@AZ[\]^_`az{|}~Éé' UTF-8 percent encoding with the userinfo encode set. assert_equals: expected "http://:%00%01%09%0A%0D%1F%20!%22%23$%&'()*+,-.%2F09%3A%3B%3C%3D%3E%3F%40AZ%5B%5C%5D%5E_%60az%7B%7C%7D~%7F%C2%80%C2%81%C3%89%C3%A9@example.net/" but got "http://:%00%01%09%0A%0D%1F%20!%22%23$%&%27()*+,-.%2F09%3A%3B%3C%3D%3E%3F%40AZ%5B%5C%5D%5E_%60az%7B%7C%7D~%7F%C2%80%C2%81%C3%89%C3%A9@example.net/" -FAIL <area>: Setting <http://example.net>.password = '\0 -\r !"#$%&'()*+,-./09:;<=>?@AZ[\]^_`az{|}~Éé' UTF-8 percent encoding with the userinfo encode set. assert_equals: expected "http://:%00%01%09%0A%0D%1F%20!%22%23$%&'()*+,-.%2F09%3A%3B%3C%3D%3E%3F%40AZ%5B%5C%5D%5E_%60az%7B%7C%7D~%7F%C2%80%C2%81%C3%89%C3%A9@example.net/" but got "http://:%00%01%09%0A%0D%1F%20!%22%23$%&%27()*+,-.%2F09%3A%3B%3C%3D%3E%3F%40AZ%5B%5C%5D%5E_%60az%7B%7C%7D~%7F%C2%80%C2%81%C3%89%C3%A9@example.net/" -PASS <a>: Setting <http://example.net>.password = '%c3%89té' Bytes already percent-encoded are left as-is. -PASS <area>: Setting <http://example.net>.password = '%c3%89té' Bytes already percent-encoded are left as-is. -PASS <a>: Setting <sc:///>.password = 'x' -PASS <area>: Setting <sc:///>.password = 'x' -FAIL <a>: Setting <sc://x/>.host = '\0' Non-special scheme assert_equals: expected "x" but got "" -FAIL <area>: Setting <sc://x/>.host = '\0' Non-special scheme assert_equals: expected "x" but got "" -FAIL <a>: Setting <sc://x/>.host = ' ' assert_equals: expected "sc:///" but got "sc://x/" -FAIL <area>: Setting <sc://x/>.host = ' ' assert_equals: expected "sc:///" but got "sc://x/" -FAIL <a>: Setting <sc://x/>.host = ' -' assert_equals: expected "sc:///" but got "sc://x/" -FAIL <area>: Setting <sc://x/>.host = ' -' assert_equals: expected "sc:///" but got "sc://x/" -FAIL <a>: Setting <sc://x/>.host = '\r' assert_equals: expected "sc:///" but got "sc://x/" -FAIL <area>: Setting <sc://x/>.host = '\r' assert_equals: expected "sc:///" but got "sc://x/" -FAIL <a>: Setting <sc://x/>.host = ' ' assert_equals: expected "x" but got "" -FAIL <area>: Setting <sc://x/>.host = ' ' assert_equals: expected "x" but got "" -FAIL <a>: Setting <sc://x/>.host = '#' assert_equals: expected "sc:///" but got "sc://x/" -FAIL <area>: Setting <sc://x/>.host = '#' assert_equals: expected "sc:///" but got "sc://x/" -FAIL <a>: Setting <sc://x/>.host = '/' assert_equals: expected "sc:///" but got "sc://x/" -FAIL <area>: Setting <sc://x/>.host = '/' assert_equals: expected "sc:///" but got "sc://x/" -FAIL <a>: Setting <sc://x/>.host = '?' assert_equals: expected "sc:///" but got "sc://x/" -FAIL <area>: Setting <sc://x/>.host = '?' assert_equals: expected "sc:///" but got "sc://x/" -FAIL <a>: Setting <sc://x/>.host = '@' assert_equals: expected "x" but got "" -FAIL <area>: Setting <sc://x/>.host = '@' assert_equals: expected "x" but got "" -FAIL <a>: Setting <sc://x/>.host = 'ß' assert_equals: expected "sc://%C3%9F/" but got "sc://x/" -FAIL <area>: Setting <sc://x/>.host = 'ß' assert_equals: expected "sc://%C3%9F/" but got "sc://x/" -FAIL <a>: Setting <https://x/>.host = 'ß' IDNA Nontransitional_Processing assert_equals: expected "https://xn--zca/" but got "https://ss/" -FAIL <area>: Setting <https://x/>.host = 'ß' IDNA Nontransitional_Processing assert_equals: expected "https://xn--zca/" but got "https://ss/" -PASS <a>: Setting <data:text/plain,Stuff>.host = 'example.net' Cannot-be-a-base means no host -PASS <area>: Setting <data:text/plain,Stuff>.host = 'example.net' Cannot-be-a-base means no host -PASS <a>: Setting <http://example.net>.host = 'example.com:8080' -PASS <area>: Setting <http://example.net>.host = 'example.com:8080' -PASS <a>: Setting <http://example.net:8080>.host = 'example.com' Port number is unchanged if not specified in the new value -PASS <area>: Setting <http://example.net:8080>.host = 'example.com' Port number is unchanged if not specified in the new value -PASS <a>: Setting <http://example.net:8080>.host = 'example.com:' Port number is unchanged if not specified -PASS <area>: Setting <http://example.net:8080>.host = 'example.com:' Port number is unchanged if not specified -PASS <a>: Setting <http://example.net>.host = '' The empty host is not valid for special schemes -PASS <area>: Setting <http://example.net>.host = '' The empty host is not valid for special schemes -FAIL <a>: Setting <view-source+http://example.net/foo>.host = '' The empty host is OK for non-special schemes assert_equals: expected "view-source+http:///foo" but got "view-source+http://example.net/foo" -FAIL <area>: Setting <view-source+http://example.net/foo>.host = '' The empty host is OK for non-special schemes assert_equals: expected "view-source+http:///foo" but got "view-source+http://example.net/foo" -FAIL <a>: Setting <a:/foo>.host = 'example.net' Path-only URLs can gain a host assert_equals: expected "a://example.net/foo" but got "a:/foo" -FAIL <area>: Setting <a:/foo>.host = 'example.net' Path-only URLs can gain a host assert_equals: expected "a://example.net/foo" but got "a:/foo" -PASS <a>: Setting <http://example.net>.host = '0x7F000001:8080' IPv4 address syntax is normalized -PASS <area>: Setting <http://example.net>.host = '0x7F000001:8080' IPv4 address syntax is normalized -PASS <a>: Setting <http://example.net>.host = '[::0:01]:2' IPv6 address syntax is normalized -PASS <area>: Setting <http://example.net>.host = '[::0:01]:2' IPv6 address syntax is normalized -PASS <a>: Setting <http://example.net>.host = '[2001:db8::2]:4002' IPv6 literal address with port, crbug.com/1012416 -PASS <area>: Setting <http://example.net>.host = '[2001:db8::2]:4002' IPv6 literal address with port, crbug.com/1012416 -PASS <a>: Setting <http://example.net>.host = 'example.com:80' Default port number is removed -PASS <area>: Setting <http://example.net>.host = 'example.com:80' Default port number is removed -PASS <a>: Setting <https://example.net>.host = 'example.com:443' Default port number is removed -PASS <area>: Setting <https://example.net>.host = 'example.com:443' Default port number is removed -PASS <a>: Setting <https://example.net>.host = 'example.com:80' Default port number is only removed for the relevant scheme -PASS <area>: Setting <https://example.net>.host = 'example.com:80' Default port number is only removed for the relevant scheme -PASS <a>: Setting <http://example.net:8080>.host = 'example.com:80' Port number is removed if new port is scheme default and existing URL has a non-default port -PASS <area>: Setting <http://example.net:8080>.host = 'example.com:80' Port number is removed if new port is scheme default and existing URL has a non-default port -PASS <a>: Setting <http://example.net/path>.host = 'example.com/stuff' Stuff after a / delimiter is ignored -PASS <area>: Setting <http://example.net/path>.host = 'example.com/stuff' Stuff after a / delimiter is ignored -PASS <a>: Setting <http://example.net/path>.host = 'example.com:8080/stuff' Stuff after a / delimiter is ignored -PASS <area>: Setting <http://example.net/path>.host = 'example.com:8080/stuff' Stuff after a / delimiter is ignored -PASS <a>: Setting <http://example.net/path>.host = 'example.com?stuff' Stuff after a ? delimiter is ignored -PASS <area>: Setting <http://example.net/path>.host = 'example.com?stuff' Stuff after a ? delimiter is ignored -PASS <a>: Setting <http://example.net/path>.host = 'example.com:8080?stuff' Stuff after a ? delimiter is ignored -PASS <area>: Setting <http://example.net/path>.host = 'example.com:8080?stuff' Stuff after a ? delimiter is ignored -PASS <a>: Setting <http://example.net/path>.host = 'example.com#stuff' Stuff after a # delimiter is ignored -PASS <area>: Setting <http://example.net/path>.host = 'example.com#stuff' Stuff after a # delimiter is ignored -PASS <a>: Setting <http://example.net/path>.host = 'example.com:8080#stuff' Stuff after a # delimiter is ignored -PASS <area>: Setting <http://example.net/path>.host = 'example.com:8080#stuff' Stuff after a # delimiter is ignored -PASS <a>: Setting <http://example.net/path>.host = 'example.com\stuff' Stuff after a \ delimiter is ignored for special schemes -PASS <area>: Setting <http://example.net/path>.host = 'example.com\stuff' Stuff after a \ delimiter is ignored for special schemes -PASS <a>: Setting <http://example.net/path>.host = 'example.com:8080\stuff' Stuff after a \ delimiter is ignored for special schemes -PASS <area>: Setting <http://example.net/path>.host = 'example.com:8080\stuff' Stuff after a \ delimiter is ignored for special schemes -FAIL <a>: Setting <view-source+http://example.net/path>.host = 'example.com\stuff' \ is not a delimiter for non-special schemes, but still forbidden in hosts assert_equals: expected "example.net" but got "" -FAIL <area>: Setting <view-source+http://example.net/path>.host = 'example.com\stuff' \ is not a delimiter for non-special schemes, but still forbidden in hosts assert_equals: expected "example.net" but got "" -FAIL <a>: Setting <view-source+http://example.net/path>.host = 'example.com:8080stuff2' Anything other than ASCII digit stops the port parser in a setter but is not an error assert_equals: expected "view-source+http://example.com:8080/path" but got "view-source+http://example.net/path" -FAIL <area>: Setting <view-source+http://example.net/path>.host = 'example.com:8080stuff2' Anything other than ASCII digit stops the port parser in a setter but is not an error assert_equals: expected "view-source+http://example.com:8080/path" but got "view-source+http://example.net/path" -PASS <a>: Setting <http://example.net/path>.host = 'example.com:8080stuff2' Anything other than ASCII digit stops the port parser in a setter but is not an error -PASS <area>: Setting <http://example.net/path>.host = 'example.com:8080stuff2' Anything other than ASCII digit stops the port parser in a setter but is not an error -PASS <a>: Setting <http://example.net/path>.host = 'example.com:8080+2' Anything other than ASCII digit stops the port parser in a setter but is not an error -PASS <area>: Setting <http://example.net/path>.host = 'example.com:8080+2' Anything other than ASCII digit stops the port parser in a setter but is not an error -PASS <a>: Setting <http://example.net/path>.host = 'example.com:65535' Port numbers are 16 bit integers -PASS <area>: Setting <http://example.net/path>.host = 'example.com:65535' Port numbers are 16 bit integers -PASS <a>: Setting <http://example.net/path>.host = 'example.com:65536' Port numbers are 16 bit integers, overflowing is an error. Hostname is still set, though. -PASS <area>: Setting <http://example.net/path>.host = 'example.com:65536' Port numbers are 16 bit integers, overflowing is an error. Hostname is still set, though. -PASS <a>: Setting <http://example.net/>.host = '[google.com]' Broken IPv6 -PASS <area>: Setting <http://example.net/>.host = '[google.com]' Broken IPv6 -PASS <a>: Setting <http://example.net/>.host = '[::1.2.3.4x]' -PASS <area>: Setting <http://example.net/>.host = '[::1.2.3.4x]' -FAIL <a>: Setting <http://example.net/>.host = '[::1.2.3.]' assert_equals: expected "http://example.net/" but got "http://[::102:3]/" -FAIL <area>: Setting <http://example.net/>.host = '[::1.2.3.]' assert_equals: expected "http://example.net/" but got "http://[::102:3]/" -FAIL <a>: Setting <http://example.net/>.host = '[::1.2.]' assert_equals: expected "http://example.net/" but got "http://[::100:2]/" -FAIL <area>: Setting <http://example.net/>.host = '[::1.2.]' assert_equals: expected "http://example.net/" but got "http://[::100:2]/" -FAIL <a>: Setting <http://example.net/>.host = '[::1.]' assert_equals: expected "http://example.net/" but got "http://[::1]/" -FAIL <area>: Setting <http://example.net/>.host = '[::1.]' assert_equals: expected "http://example.net/" but got "http://[::1]/" -FAIL <a>: Setting <sc://test@test/>.host = '' assert_equals: expected "test" but got "" -FAIL <area>: Setting <sc://test@test/>.host = '' assert_equals: expected "test" but got "" -FAIL <a>: Setting <sc://test:12/>.host = '' assert_equals: expected "test:12" but got "" -FAIL <area>: Setting <sc://test:12/>.host = '' assert_equals: expected "test:12" but got "" -PASS <a>: Setting <http://example.com/>.host = '///bad.com' Leading / is not stripped -PASS <area>: Setting <http://example.com/>.host = '///bad.com' Leading / is not stripped -FAIL <a>: Setting <sc://example.com/>.host = '///bad.com' Leading / is not stripped assert_equals: expected "sc:///" but got "sc://example.com/" -FAIL <area>: Setting <sc://example.com/>.host = '///bad.com' Leading / is not stripped assert_equals: expected "sc:///" but got "sc://example.com/" -FAIL <a>: Setting <sc://x/>.hostname = '\0' Non-special scheme assert_equals: expected "x" but got "" -FAIL <area>: Setting <sc://x/>.hostname = '\0' Non-special scheme assert_equals: expected "x" but got "" -FAIL <a>: Setting <sc://x/>.hostname = ' ' assert_equals: expected "sc:///" but got "sc://x/" -FAIL <area>: Setting <sc://x/>.hostname = ' ' assert_equals: expected "sc:///" but got "sc://x/" -FAIL <a>: Setting <sc://x/>.hostname = ' -' assert_equals: expected "sc:///" but got "sc://x/" -FAIL <area>: Setting <sc://x/>.hostname = ' -' assert_equals: expected "sc:///" but got "sc://x/" -FAIL <a>: Setting <sc://x/>.hostname = '\r' assert_equals: expected "sc:///" but got "sc://x/" -FAIL <area>: Setting <sc://x/>.hostname = '\r' assert_equals: expected "sc:///" but got "sc://x/" -FAIL <a>: Setting <sc://x/>.hostname = ' ' assert_equals: expected "x" but got "" -FAIL <area>: Setting <sc://x/>.hostname = ' ' assert_equals: expected "x" but got "" -FAIL <a>: Setting <sc://x/>.hostname = '#' assert_equals: expected "sc:///" but got "sc://x/" -FAIL <area>: Setting <sc://x/>.hostname = '#' assert_equals: expected "sc:///" but got "sc://x/" -FAIL <a>: Setting <sc://x/>.hostname = '/' assert_equals: expected "sc:///" but got "sc://x/" -FAIL <area>: Setting <sc://x/>.hostname = '/' assert_equals: expected "sc:///" but got "sc://x/" -FAIL <a>: Setting <sc://x/>.hostname = '?' assert_equals: expected "sc:///" but got "sc://x/" -FAIL <area>: Setting <sc://x/>.hostname = '?' assert_equals: expected "sc:///" but got "sc://x/" -FAIL <a>: Setting <sc://x/>.hostname = '@' assert_equals: expected "x" but got "" -FAIL <area>: Setting <sc://x/>.hostname = '@' assert_equals: expected "x" but got "" -PASS <a>: Setting <data:text/plain,Stuff>.hostname = 'example.net' Cannot-be-a-base means no host -PASS <area>: Setting <data:text/plain,Stuff>.hostname = 'example.net' Cannot-be-a-base means no host -PASS <a>: Setting <http://example.net:8080>.hostname = 'example.com' -PASS <area>: Setting <http://example.net:8080>.hostname = 'example.com' -PASS <a>: Setting <http://example.net>.hostname = '' The empty host is not valid for special schemes -PASS <area>: Setting <http://example.net>.hostname = '' The empty host is not valid for special schemes -FAIL <a>: Setting <view-source+http://example.net/foo>.hostname = '' The empty host is OK for non-special schemes assert_equals: expected "view-source+http:///foo" but got "view-source+http://example.net/foo" -FAIL <area>: Setting <view-source+http://example.net/foo>.hostname = '' The empty host is OK for non-special schemes assert_equals: expected "view-source+http:///foo" but got "view-source+http://example.net/foo" -FAIL <a>: Setting <a:/foo>.hostname = 'example.net' Path-only URLs can gain a host assert_equals: expected "a://example.net/foo" but got "a:/foo" -FAIL <area>: Setting <a:/foo>.hostname = 'example.net' Path-only URLs can gain a host assert_equals: expected "a://example.net/foo" but got "a:/foo" -PASS <a>: Setting <http://example.net:8080>.hostname = '0x7F000001' IPv4 address syntax is normalized -PASS <area>: Setting <http://example.net:8080>.hostname = '0x7F000001' IPv4 address syntax is normalized -PASS <a>: Setting <http://example.net>.hostname = '[::0:01]' IPv6 address syntax is normalized -PASS <area>: Setting <http://example.net>.hostname = '[::0:01]' IPv6 address syntax is normalized -PASS <a>: Setting <http://example.net/path>.hostname = 'example.com:8080' : delimiter invalidates entire value -PASS <area>: Setting <http://example.net/path>.hostname = 'example.com:8080' : delimiter invalidates entire value -PASS <a>: Setting <http://example.net:8080/path>.hostname = 'example.com:' : delimiter invalidates entire value -PASS <area>: Setting <http://example.net:8080/path>.hostname = 'example.com:' : delimiter invalidates entire value -PASS <a>: Setting <http://example.net/path>.hostname = 'example.com/stuff' Stuff after a / delimiter is ignored -PASS <area>: Setting <http://example.net/path>.hostname = 'example.com/stuff' Stuff after a / delimiter is ignored -PASS <a>: Setting <http://example.net/path>.hostname = 'example.com?stuff' Stuff after a ? delimiter is ignored -PASS <area>: Setting <http://example.net/path>.hostname = 'example.com?stuff' Stuff after a ? delimiter is ignored -PASS <a>: Setting <http://example.net/path>.hostname = 'example.com#stuff' Stuff after a # delimiter is ignored -PASS <area>: Setting <http://example.net/path>.hostname = 'example.com#stuff' Stuff after a # delimiter is ignored -PASS <a>: Setting <http://example.net/path>.hostname = 'example.com\stuff' Stuff after a \ delimiter is ignored for special schemes -PASS <area>: Setting <http://example.net/path>.hostname = 'example.com\stuff' Stuff after a \ delimiter is ignored for special schemes -FAIL <a>: Setting <view-source+http://example.net/path>.hostname = 'example.com\stuff' \ is not a delimiter for non-special schemes, but still forbidden in hosts assert_equals: expected "example.net" but got "" -FAIL <area>: Setting <view-source+http://example.net/path>.hostname = 'example.com\stuff' \ is not a delimiter for non-special schemes, but still forbidden in hosts assert_equals: expected "example.net" but got "" -PASS <a>: Setting <http://example.net/>.hostname = '[google.com]' Broken IPv6 -PASS <area>: Setting <http://example.net/>.hostname = '[google.com]' Broken IPv6 -PASS <a>: Setting <http://example.net/>.hostname = '[::1.2.3.4x]' -PASS <area>: Setting <http://example.net/>.hostname = '[::1.2.3.4x]' -FAIL <a>: Setting <http://example.net/>.hostname = '[::1.2.3.]' assert_equals: expected "http://example.net/" but got "http://[::102:3]/" -FAIL <area>: Setting <http://example.net/>.hostname = '[::1.2.3.]' assert_equals: expected "http://example.net/" but got "http://[::102:3]/" -FAIL <a>: Setting <http://example.net/>.hostname = '[::1.2.]' assert_equals: expected "http://example.net/" but got "http://[::100:2]/" -FAIL <area>: Setting <http://example.net/>.hostname = '[::1.2.]' assert_equals: expected "http://example.net/" but got "http://[::100:2]/" -FAIL <a>: Setting <http://example.net/>.hostname = '[::1.]' assert_equals: expected "http://example.net/" but got "http://[::1]/" -FAIL <area>: Setting <http://example.net/>.hostname = '[::1.]' assert_equals: expected "http://example.net/" but got "http://[::1]/" -FAIL <a>: Setting <sc://test@test/>.hostname = '' assert_equals: expected "test" but got "" -FAIL <area>: Setting <sc://test@test/>.hostname = '' assert_equals: expected "test" but got "" -FAIL <a>: Setting <sc://test:12/>.hostname = '' assert_equals: expected "test:12" but got "" -FAIL <area>: Setting <sc://test:12/>.hostname = '' assert_equals: expected "test:12" but got "" -FAIL <a>: Setting <non-spec:/.//p>.hostname = 'h' Drop /. from path assert_equals: expected "non-spec://h//p" but got "non-spec:/.//p" -FAIL <area>: Setting <non-spec:/.//p>.hostname = 'h' Drop /. from path assert_equals: expected "non-spec://h//p" but got "non-spec:/.//p" -FAIL <a>: Setting <non-spec:/.//p>.hostname = '' assert_equals: expected "non-spec:////p" but got "non-spec:/.//p" -FAIL <area>: Setting <non-spec:/.//p>.hostname = '' assert_equals: expected "non-spec:////p" but got "non-spec:/.//p" -PASS <a>: Setting <http://example.com/>.hostname = '///bad.com' Leading / is not stripped -PASS <area>: Setting <http://example.com/>.hostname = '///bad.com' Leading / is not stripped -FAIL <a>: Setting <sc://example.com/>.hostname = '///bad.com' Leading / is not stripped assert_equals: expected "sc:///" but got "sc://example.com/" -FAIL <area>: Setting <sc://example.com/>.hostname = '///bad.com' Leading / is not stripped assert_equals: expected "sc:///" but got "sc://example.com/" -PASS <a>: Setting <http://example.net>.port = '8080' -PASS <area>: Setting <http://example.net>.port = '8080' -PASS <a>: Setting <http://example.net:8080>.port = '' Port number is removed if empty is the new value -PASS <area>: Setting <http://example.net:8080>.port = '' Port number is removed if empty is the new value -PASS <a>: Setting <http://example.net:8080>.port = '80' Default port number is removed -PASS <area>: Setting <http://example.net:8080>.port = '80' Default port number is removed -PASS <a>: Setting <https://example.net:4433>.port = '443' Default port number is removed -PASS <area>: Setting <https://example.net:4433>.port = '443' Default port number is removed -PASS <a>: Setting <https://example.net>.port = '80' Default port number is only removed for the relevant scheme -PASS <area>: Setting <https://example.net>.port = '80' Default port number is only removed for the relevant scheme -PASS <a>: Setting <http://example.net/path>.port = '8080/stuff' Stuff after a / delimiter is ignored -PASS <area>: Setting <http://example.net/path>.port = '8080/stuff' Stuff after a / delimiter is ignored -PASS <a>: Setting <http://example.net/path>.port = '8080?stuff' Stuff after a ? delimiter is ignored -PASS <area>: Setting <http://example.net/path>.port = '8080?stuff' Stuff after a ? delimiter is ignored -PASS <a>: Setting <http://example.net/path>.port = '8080#stuff' Stuff after a # delimiter is ignored -PASS <area>: Setting <http://example.net/path>.port = '8080#stuff' Stuff after a # delimiter is ignored -PASS <a>: Setting <http://example.net/path>.port = '8080\stuff' Stuff after a \ delimiter is ignored for special schemes -PASS <area>: Setting <http://example.net/path>.port = '8080\stuff' Stuff after a \ delimiter is ignored for special schemes -FAIL <a>: Setting <view-source+http://example.net/path>.port = '8080stuff2' Anything other than ASCII digit stops the port parser in a setter but is not an error assert_equals: expected "view-source+http://example.net:8080/path" but got "view-source+http://example.net/path" -FAIL <area>: Setting <view-source+http://example.net/path>.port = '8080stuff2' Anything other than ASCII digit stops the port parser in a setter but is not an error assert_equals: expected "view-source+http://example.net:8080/path" but got "view-source+http://example.net/path" -PASS <a>: Setting <http://example.net/path>.port = '8080stuff2' Anything other than ASCII digit stops the port parser in a setter but is not an error -PASS <area>: Setting <http://example.net/path>.port = '8080stuff2' Anything other than ASCII digit stops the port parser in a setter but is not an error -PASS <a>: Setting <http://example.net/path>.port = '8080+2' Anything other than ASCII digit stops the port parser in a setter but is not an error -PASS <area>: Setting <http://example.net/path>.port = '8080+2' Anything other than ASCII digit stops the port parser in a setter but is not an error -PASS <a>: Setting <http://example.net/path>.port = '65535' Port numbers are 16 bit integers -PASS <area>: Setting <http://example.net/path>.port = '65535' Port numbers are 16 bit integers -FAIL <a>: Setting <http://example.net:8080/path>.port = '65536' Port numbers are 16 bit integers, overflowing is an error assert_equals: expected "http://example.net:8080/path" but got "http://example.net:0/path" -FAIL <area>: Setting <http://example.net:8080/path>.port = '65536' Port numbers are 16 bit integers, overflowing is an error assert_equals: expected "http://example.net:8080/path" but got "http://example.net:0/path" -FAIL <a>: Setting <non-special://example.net:8080/path>.port = '65536' Port numbers are 16 bit integers, overflowing is an error assert_equals: expected "example.net:8080" but got "" -FAIL <area>: Setting <non-special://example.net:8080/path>.port = '65536' Port numbers are 16 bit integers, overflowing is an error assert_equals: expected "example.net:8080" but got "" -PASS <a>: Setting <non-base:value>.port = '12' -PASS <area>: Setting <non-base:value>.port = '12' -PASS <a>: Setting <sc:///>.port = '12' -PASS <area>: Setting <sc:///>.port = '12' -FAIL <a>: Setting <sc://x/>.port = '12' assert_equals: expected "sc://x:12/" but got "sc://x/" -FAIL <area>: Setting <sc://x/>.port = '12' assert_equals: expected "sc://x:12/" but got "sc://x/" -FAIL <a>: Setting <foo://somehost/some/path>.pathname = '' Non-special URLs can have their paths erased assert_equals: expected "foo://somehost" but got "foo://somehost/some/path" -FAIL <area>: Setting <foo://somehost/some/path>.pathname = '' Non-special URLs can have their paths erased assert_equals: expected "foo://somehost" but got "foo://somehost/some/path" -FAIL <a>: Setting <foo:///some/path>.pathname = '' Non-special URLs with an empty host can have their paths erased assert_equals: expected "foo://" but got "foo:///some/path" -FAIL <area>: Setting <foo:///some/path>.pathname = '' Non-special URLs with an empty host can have their paths erased assert_equals: expected "foo://" but got "foo:///some/path" -FAIL <a>: Setting <foo:/some/path>.pathname = '' Path-only URLs cannot have their paths erased assert_equals: expected "foo:/" but got "foo:/some/path" -FAIL <area>: Setting <foo:/some/path>.pathname = '' Path-only URLs cannot have their paths erased assert_equals: expected "foo:/" but got "foo:/some/path" -FAIL <a>: Setting <foo:/some/path>.pathname = 'test' Path-only URLs always have an initial slash assert_equals: expected "foo:/test" but got "foo:/some/path" -FAIL <area>: Setting <foo:/some/path>.pathname = 'test' Path-only URLs always have an initial slash assert_equals: expected "foo:/test" but got "foo:/some/path" -FAIL <a>: Setting <unix:/run/foo.socket?timeout=10>.pathname = '/var/log/../run/bar.socket' assert_equals: expected "unix:/var/run/bar.socket?timeout=10" but got "unix:/run/foo.socket?timeout=10" -FAIL <area>: Setting <unix:/run/foo.socket?timeout=10>.pathname = '/var/log/../run/bar.socket' assert_equals: expected "unix:/var/run/bar.socket?timeout=10" but got "unix:/run/foo.socket?timeout=10" -PASS <a>: Setting <https://example.net#nav>.pathname = 'home' -PASS <area>: Setting <https://example.net#nav>.pathname = 'home' -PASS <a>: Setting <https://example.net#nav>.pathname = '../home' -PASS <area>: Setting <https://example.net#nav>.pathname = '../home' -PASS <a>: Setting <http://example.net/home?lang=fr#nav>.pathname = '\a\%2E\b\%2e.\c' \ is a segment delimiter for 'special' URLs -PASS <area>: Setting <http://example.net/home?lang=fr#nav>.pathname = '\a\%2E\b\%2e.\c' \ is a segment delimiter for 'special' URLs -FAIL <a>: Setting <view-source+http://example.net/home?lang=fr#nav>.pathname = '\a\%2E\b\%2e.\c' \ is *not* a segment delimiter for non-'special' URLs assert_equals: expected "view-source+http://example.net/\\a\\%2E\\b\\%2e.\\c?lang=fr#nav" but got "view-source+http://example.net/home?lang=fr#nav" -FAIL <area>: Setting <view-source+http://example.net/home?lang=fr#nav>.pathname = '\a\%2E\b\%2e.\c' \ is *not* a segment delimiter for non-'special' URLs assert_equals: expected "view-source+http://example.net/\\a\\%2E\\b\\%2e.\\c?lang=fr#nav" but got "view-source+http://example.net/home?lang=fr#nav" -FAIL <a>: Setting <a:/>.pathname = '\0 -\r !"#$%&'()*+,-./09:;<=>?@AZ[\]^_`az{|}~Éé' UTF-8 percent encoding with the default encode set. Tabs and newlines are removed. assert_equals: expected "a:/%00%01%1F%20!%22%23$%&'()*+,-./09:;%3C=%3E%3F@AZ[\\]^_%60az%7B|%7D~%7F%C2%80%C2%81%C3%89%C3%A9" but got "a:/" -FAIL <area>: Setting <a:/>.pathname = '\0 -\r !"#$%&'()*+,-./09:;<=>?@AZ[\]^_`az{|}~Éé' UTF-8 percent encoding with the default encode set. Tabs and newlines are removed. assert_equals: expected "a:/%00%01%1F%20!%22%23$%&'()*+,-./09:;%3C=%3E%3F@AZ[\\]^_%60az%7B|%7D~%7F%C2%80%C2%81%C3%89%C3%A9" but got "a:/" -FAIL <a>: Setting <http://example.net>.pathname = '%2e%2E%c3%89té' Bytes already percent-encoded are left as-is, including %2E outside dotted segments. assert_equals: expected "http://example.net/%2e%2E%c3%89t%C3%A9" but got "http://example.net/..%c3%89t%C3%A9" -FAIL <area>: Setting <http://example.net>.pathname = '%2e%2E%c3%89té' Bytes already percent-encoded are left as-is, including %2E outside dotted segments. assert_equals: expected "http://example.net/%2e%2E%c3%89t%C3%A9" but got "http://example.net/..%c3%89t%C3%A9" -PASS <a>: Setting <http://example.net>.pathname = '?' ? needs to be encoded -PASS <area>: Setting <http://example.net>.pathname = '?' ? needs to be encoded -PASS <a>: Setting <http://example.net>.pathname = '#' # needs to be encoded -PASS <area>: Setting <http://example.net>.pathname = '#' # needs to be encoded -FAIL <a>: Setting <sc://example.net>.pathname = '?' ? needs to be encoded, non-special scheme assert_equals: expected "sc://example.net/%3F" but got "sc://example.net" -FAIL <area>: Setting <sc://example.net>.pathname = '?' ? needs to be encoded, non-special scheme assert_equals: expected "sc://example.net/%3F" but got "sc://example.net" -FAIL <a>: Setting <sc://example.net>.pathname = '#' # needs to be encoded, non-special scheme assert_equals: expected "sc://example.net/%23" but got "sc://example.net" -FAIL <area>: Setting <sc://example.net>.pathname = '#' # needs to be encoded, non-special scheme assert_equals: expected "sc://example.net/%23" but got "sc://example.net" -PASS <a>: Setting <http://example.net>.pathname = '/?é' ? doesn't mess up encoding -PASS <area>: Setting <http://example.net>.pathname = '/?é' ? doesn't mess up encoding -PASS <a>: Setting <http://example.net>.pathname = '/#é' # doesn't mess up encoding -PASS <area>: Setting <http://example.net>.pathname = '/#é' # doesn't mess up encoding -FAIL <a>: Setting <non-spec:/>.pathname = '/.//p' Serialize /. in path assert_equals: expected "non-spec:/.//p" but got "non-spec:/" -FAIL <area>: Setting <non-spec:/>.pathname = '/.//p' Serialize /. in path assert_equals: expected "non-spec:/.//p" but got "non-spec:/" -FAIL <a>: Setting <non-spec:/>.pathname = '/..//p' assert_equals: expected "non-spec:/.//p" but got "non-spec:/" -FAIL <area>: Setting <non-spec:/>.pathname = '/..//p' assert_equals: expected "non-spec:/.//p" but got "non-spec:/" -FAIL <a>: Setting <non-spec:/>.pathname = '//p' assert_equals: expected "non-spec:/.//p" but got "non-spec:/" -FAIL <area>: Setting <non-spec:/>.pathname = '//p' assert_equals: expected "non-spec:/.//p" but got "non-spec:/" -FAIL <a>: Setting <non-spec:/.//>.pathname = 'p' Drop /. from path assert_equals: expected "non-spec:/p" but got "non-spec:/.//" -FAIL <area>: Setting <non-spec:/.//>.pathname = 'p' Drop /. from path assert_equals: expected "non-spec:/p" but got "non-spec:/.//" -PASS <a>: Setting <https://example.net#nav>.search = 'lang=fr' -PASS <area>: Setting <https://example.net#nav>.search = 'lang=fr' -PASS <a>: Setting <https://example.net?lang=en-US#nav>.search = 'lang=fr' -PASS <area>: Setting <https://example.net?lang=en-US#nav>.search = 'lang=fr' -PASS <a>: Setting <https://example.net?lang=en-US#nav>.search = '?lang=fr' -PASS <area>: Setting <https://example.net?lang=en-US#nav>.search = '?lang=fr' -PASS <a>: Setting <https://example.net?lang=en-US#nav>.search = '??lang=fr' -PASS <area>: Setting <https://example.net?lang=en-US#nav>.search = '??lang=fr' -FAIL <a>: Setting <https://example.net?lang=en-US#nav>.search = '?' assert_equals: expected "https://example.net/?#nav" but got "https://example.net/#nav" -FAIL <area>: Setting <https://example.net?lang=en-US#nav>.search = '?' assert_equals: expected "https://example.net/?#nav" but got "https://example.net/#nav" -PASS <a>: Setting <https://example.net?lang=en-US#nav>.search = '' -PASS <area>: Setting <https://example.net?lang=en-US#nav>.search = '' -PASS <a>: Setting <https://example.net?lang=en-US>.search = '' -PASS <area>: Setting <https://example.net?lang=en-US>.search = '' -PASS <a>: Setting <https://example.net>.search = '' -PASS <area>: Setting <https://example.net>.search = '' -FAIL <a>: Setting <a:/>.search = '\0 -\r !"#$%&'()*+,-./09:;<=>?@AZ[\]^_`az{|}~Éé' UTF-8 percent encoding with the query encode set. Tabs and newlines are removed. assert_equals: expected "a:/?%00%01%1F%20!%22%23$%&'()*+,-./09:;%3C=%3E?@AZ[\\]^_`az{|}~%7F%C2%80%C2%81%C3%89%C3%A9" but got "a:/?%00%01%1F%20!%22%23$%&%27()*+,-./09:;%3C=%3E?@AZ[\\]^_`az{|}~%7F%C2%80%C2%81%C3%89%C3%A9" -FAIL <area>: Setting <a:/>.search = '\0 -\r !"#$%&'()*+,-./09:;<=>?@AZ[\]^_`az{|}~Éé' UTF-8 percent encoding with the query encode set. Tabs and newlines are removed. assert_equals: expected "a:/?%00%01%1F%20!%22%23$%&'()*+,-./09:;%3C=%3E?@AZ[\\]^_`az{|}~%7F%C2%80%C2%81%C3%89%C3%A9" but got "a:/?%00%01%1F%20!%22%23$%&%27()*+,-./09:;%3C=%3E?@AZ[\\]^_`az{|}~%7F%C2%80%C2%81%C3%89%C3%A9" -PASS <a>: Setting <http://example.net>.search = '%c3%89té' Bytes already percent-encoded are left as-is -PASS <area>: Setting <http://example.net>.search = '%c3%89té' Bytes already percent-encoded are left as-is -PASS <a>: Setting <https://example.net>.hash = 'main' -PASS <area>: Setting <https://example.net>.hash = 'main' -PASS <a>: Setting <https://example.net#nav>.hash = 'main' -PASS <area>: Setting <https://example.net#nav>.hash = 'main' -PASS <a>: Setting <https://example.net?lang=en-US>.hash = '##nav' -PASS <area>: Setting <https://example.net?lang=en-US>.hash = '##nav' -PASS <a>: Setting <https://example.net?lang=en-US#nav>.hash = '#main' -PASS <area>: Setting <https://example.net?lang=en-US#nav>.hash = '#main' -PASS <a>: Setting <https://example.net?lang=en-US#nav>.hash = '#' -PASS <area>: Setting <https://example.net?lang=en-US#nav>.hash = '#' -PASS <a>: Setting <https://example.net?lang=en-US#nav>.hash = '' -PASS <area>: Setting <https://example.net?lang=en-US#nav>.hash = '' -PASS <a>: Setting <http://example.net>.hash = '#foo bar' -PASS <area>: Setting <http://example.net>.hash = '#foo bar' -PASS <a>: Setting <http://example.net>.hash = '#foo"bar' -PASS <area>: Setting <http://example.net>.hash = '#foo"bar' -PASS <a>: Setting <http://example.net>.hash = '#foo<bar' -PASS <area>: Setting <http://example.net>.hash = '#foo<bar' -PASS <a>: Setting <http://example.net>.hash = '#foo>bar' -PASS <area>: Setting <http://example.net>.hash = '#foo>bar' -PASS <a>: Setting <http://example.net>.hash = '#foo`bar' -PASS <area>: Setting <http://example.net>.hash = '#foo`bar' -PASS <a>: Setting <a:/>.hash = '\0 -\r !"#$%&'()*+,-./09:;<=>?@AZ[\]^_`az{|}~Éé' Simple percent-encoding; tabs and newlines are removed -PASS <area>: Setting <a:/>.hash = '\0 -\r !"#$%&'()*+,-./09:;<=>?@AZ[\]^_`az{|}~Éé' Simple percent-encoding; tabs and newlines are removed -PASS <a>: Setting <http://example.net>.hash = 'a\0b' Percent-encode NULLs in fragment -PASS <area>: Setting <http://example.net>.hash = 'a\0b' Percent-encode NULLs in fragment -PASS <a>: Setting <non-spec:/>.hash = 'a\0b' Percent-encode NULLs in fragment -PASS <area>: Setting <non-spec:/>.hash = 'a\0b' Percent-encode NULLs in fragment -PASS <a>: Setting <http://example.net>.hash = '%c3%89té' Bytes already percent-encoded are left as-is -PASS <area>: Setting <http://example.net>.hash = '%c3%89té' Bytes already percent-encoded are left as-is -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/idna-2008/external/wpt/url/url-setters.any_include=mailto-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/idna-2008/external/wpt/url/url-setters.any_include=mailto-expected.txt deleted file mode 100644 index af68c2a..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/idna-2008/external/wpt/url/url-setters.any_include=mailto-expected.txt +++ /dev/null
@@ -1,10 +0,0 @@ -This is a testharness.js-based test. -PASS Loading data… -FAIL URL: Setting <mailto:me@example.net>.protocol = 'http' Cannot-be-a-base URL doesn’t have a host, but URL in a special scheme must. assert_equals: expected "mailto:me@example.net" but got "http://me@example.net/" -PASS URL: Setting <mailto:you@example.net>.username = 'me' Cannot-be-a-base means no username -PASS URL: Setting <mailto:me@example.net>.password = 'secret' Cannot-be-a-base means no password -PASS URL: Setting <mailto:me@example.net>.host = 'example.com' Cannot-be-a-base means no host -PASS URL: Setting <mailto:me@example.net>.hostname = 'example.com' Cannot-be-a-base means no host -PASS URL: Setting <mailto:me@example.net>.pathname = '/foo' Cannot-be-a-base don’t have a path -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/media-foundation-for-clear-dcomp/media/track/track-cue-rendering-ruby-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/media-foundation-for-clear-dcomp/media/track/track-cue-rendering-ruby-expected.png deleted file mode 100644 index 25c1d76c6..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/media-foundation-for-clear-dcomp/media/track/track-cue-rendering-ruby-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/media-foundation-for-clear-dcomp/media/video-aspect-ratio-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/media-foundation-for-clear-dcomp/media/video-aspect-ratio-expected.png deleted file mode 100644 index d9af8615..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/media-foundation-for-clear-dcomp/media/video-aspect-ratio-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/media-foundation-for-clear-dcomp/media/video-colorspace-yuv420-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/media-foundation-for-clear-dcomp/media/video-colorspace-yuv420-expected.png deleted file mode 100644 index 8e24b2c..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/media-foundation-for-clear-dcomp/media/video-colorspace-yuv420-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/media-foundation-for-clear-dcomp/media/video-colorspace-yuv422-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/media-foundation-for-clear-dcomp/media/video-colorspace-yuv422-expected.png deleted file mode 100644 index 3576dd0..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/media-foundation-for-clear-dcomp/media/video-colorspace-yuv422-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/media-foundation-for-clear-frameserver/media/track/track-cue-rendering-ruby-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/media-foundation-for-clear-frameserver/media/track/track-cue-rendering-ruby-expected.png deleted file mode 100644 index 25c1d76c6..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/media-foundation-for-clear-frameserver/media/track/track-cue-rendering-ruby-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/media-foundation-for-clear-frameserver/media/video-aspect-ratio-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/media-foundation-for-clear-frameserver/media/video-aspect-ratio-expected.png deleted file mode 100644 index d9af8615..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/media-foundation-for-clear-frameserver/media/video-aspect-ratio-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/media-foundation-for-clear-frameserver/media/video-colorspace-yuv420-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/media-foundation-for-clear-frameserver/media/video-colorspace-yuv420-expected.png deleted file mode 100644 index 8e24b2c..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/media-foundation-for-clear-frameserver/media/video-colorspace-yuv420-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/media-foundation-for-clear-frameserver/media/video-colorspace-yuv422-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/media-foundation-for-clear-frameserver/media/video-colorspace-yuv422-expected.png deleted file mode 100644 index 3576dd0..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/media-foundation-for-clear-frameserver/media/video-colorspace-yuv422-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/no-alloc-direct-call/fast/canvas/canvas-composite-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/no-alloc-direct-call/fast/canvas/canvas-composite-expected.png deleted file mode 100644 index e3d21377c..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/no-alloc-direct-call/fast/canvas/canvas-composite-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/no-alloc-direct-call/fast/canvas/canvas-composite-video-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/no-alloc-direct-call/fast/canvas/canvas-composite-video-expected.png deleted file mode 100644 index 42a91d00..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/no-alloc-direct-call/fast/canvas/canvas-composite-video-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/no-alloc-direct-call/fast/canvas/canvas-composite-video-shadow-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/no-alloc-direct-call/fast/canvas/canvas-composite-video-shadow-expected.png deleted file mode 100644 index 195c1f3..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/no-alloc-direct-call/fast/canvas/canvas-composite-video-shadow-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/no-alloc-direct-call/fast/canvas/canvas-text-baseline-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/no-alloc-direct-call/fast/canvas/canvas-text-baseline-expected.png deleted file mode 100644 index 0d3496e..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/no-alloc-direct-call/fast/canvas/canvas-text-baseline-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/off-main-thread-css-paint/external/wpt/css/css-paint-api/geometry-background-image-001.https-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/off-main-thread-css-paint/external/wpt/css/css-paint-api/geometry-background-image-001.https-expected.png deleted file mode 100644 index b5daa85..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/off-main-thread-css-paint/external/wpt/css/css-paint-api/geometry-background-image-001.https-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/oopr-canvas2d/fast/canvas/canvas-composite-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/oopr-canvas2d/fast/canvas/canvas-composite-expected.png deleted file mode 100644 index 83c183b7..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/oopr-canvas2d/fast/canvas/canvas-composite-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/oopr-canvas2d/fast/canvas/canvas-ellipse-connecting-line-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/oopr-canvas2d/fast/canvas/canvas-ellipse-connecting-line-expected.png deleted file mode 100644 index 84fc034..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/oopr-canvas2d/fast/canvas/canvas-ellipse-connecting-line-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/oopr-canvas2d/fast/canvas/canvas-imageSmoothing-disabled-scaling-down-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/oopr-canvas2d/fast/canvas/canvas-imageSmoothing-disabled-scaling-down-expected.txt deleted file mode 100644 index ea08ff3..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/oopr-canvas2d/fast/canvas/canvas-imageSmoothing-disabled-scaling-down-expected.txt +++ /dev/null
@@ -1,4 +0,0 @@ -This is a testharness.js-based test. -PASS Test drawImage with imageSmoothingEnabled=false and scaling down the source. -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/oopr-canvas2d/fast/canvas/canvas-zero-length-lineCap-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/oopr-canvas2d/fast/canvas/canvas-zero-length-lineCap-expected.png deleted file mode 100644 index 61fb575..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/oopr-canvas2d/fast/canvas/canvas-zero-length-lineCap-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/oopr-canvas2d/fast/canvas/image-object-in-canvas-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/oopr-canvas2d/fast/canvas/image-object-in-canvas-expected.png deleted file mode 100644 index 7c0630f4..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/oopr-canvas2d/fast/canvas/image-object-in-canvas-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/plz-dedicated-worker/external/wpt/service-workers/service-worker/worker-interception.https-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/plz-dedicated-worker/external/wpt/service-workers/service-worker/worker-interception.https-expected.txt deleted file mode 100644 index db5d0f4..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/plz-dedicated-worker/external/wpt/service-workers/service-worker/worker-interception.https-expected.txt +++ /dev/null
@@ -1,19 +0,0 @@ -This is a testharness.js-based test. -FAIL Verify a dedicated worker script request gets correct client Ids assert_equals: expected "9fef6b6b-e88c-4e31-a808-874dc4cc0c18" but got "" -FAIL Verify a dedicated worker script request issued from a uncontrolled document is intercepted by worker's own service worker. promise_test: Unhandled rejection with value: object "Error: wait_for_state needs a ServiceWorker object to be passed." -PASS Verify an out-of-scope dedicated worker script request issued from a controlled document should not be intercepted by document's service worker. -PASS Verify a shared worker script request issued from a uncontrolled document is intercepted by worker's own service worker. -PASS Verify a same-origin worker script served by a service worker succeeds in starting a dedicated worker. -PASS Verify a same-origin worker script served by a service worker succeeds in starting a shared worker. -PASS Verify a cors worker script served by a service worker fails dedicated worker start. -PASS Verify a cors worker script served by a service worker fails shared worker start. -PASS Verify a no-cors cross-origin worker script served by a service worker fails dedicated worker start. -PASS Verify a no-cors cross-origin worker script served by a service worker fails shared worker start. -PASS Register a service worker for worker subresource interception tests. -PASS Requests on a dedicated worker controlled by a service worker. -PASS Requests on a shared worker controlled by a service worker. -PASS Requests on a dedicated worker nested in a dedicated worker and controlled by a service worker -FAIL Requests on a dedicated worker nested in a shared worker and controlled by a service worker assert_equals: expected "This load was successfully intercepted." but got "Unexpected error! Worker is not defined" -PASS Unregister a service worker for subresource interception tests. -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/plz-dedicated-worker/http/tests/devtools/layers/layer-canvas-log-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/plz-dedicated-worker/http/tests/devtools/layers/layer-canvas-log-expected.txt deleted file mode 100644 index c458c28..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/plz-dedicated-worker/http/tests/devtools/layers/layer-canvas-log-expected.txt +++ /dev/null
@@ -1,177 +0,0 @@ -Tests layer command log - -Canvas log: -{ - 0 : { - commandIndex : 0 - method : "drawPaint" - params : { - paint : { - blendMode : "Src" - color : "#00000000" - flags : "none" - strokeCap : "Butt" - strokeJoin : "Miter" - strokeMiter : 4 - strokeWidth : 0 - styleName : "Fill" - } - } - } - 1 : { - commandIndex : 1 - method : "drawRect" - params : { - paint : { - color : "#FF0000FF" - flags : "AntiAlias" - strokeCap : "Butt" - strokeJoin : "Miter" - strokeMiter : 4 - strokeWidth : 0 - styleName : "Fill" - } - rect : { - bottom : 100 - left : 0 - right : 100 - top : 0 - } - } - } - 10 : { - commandIndex : 10 - method : "drawRect" - params : { - paint : { - color : "#7F000000" - flags : "AntiAlias" - strokeCap : "Butt" - strokeJoin : "Miter" - strokeMiter : 4 - strokeWidth : 0 - styleName : "Fill" - } - rect : { - bottom : 10 - left : 0 - right : 10 - top : 0 - } - } - } - 11 : { - commandIndex : 11 - method : "restore" - params : undefined - } - 2 : { - commandIndex : 2 - method : "drawRect" - params : { - paint : { - color : "#FFFF0000" - flags : "AntiAlias" - strokeCap : "Butt" - strokeJoin : "Miter" - strokeMiter : 4 - strokeWidth : 0 - styleName : "Fill" - } - rect : { - bottom : 50 - left : 0 - right : 50 - top : 0 - } - } - } - 3 : { - commandIndex : 3 - method : "save" - params : undefined - } - 4 : { - commandIndex : 4 - method : "concat44" - params : { - matrix44 : [ - 1 - 0 - 0 - 0 - 0 - 1 - 0 - 0 - 0 - 0 - 1 - 0 - 0 - 50 - 0 - 1 - ] - } - } - 5 : { - commandIndex : 5 - method : "drawImage" - params : { - image : { - height : 21 - opaque : false - width : 19 - } - left : 0 - paint : { - color : "#FF000000" - flags : "AntiAlias" - strokeCap : "Butt" - strokeJoin : "Miter" - strokeMiter : 4 - strokeWidth : 0 - styleName : "Fill" - } - sampling : { - filter : "kLinear" - mipmap : "kNearest" - } - top : 0 - } - } - 6 : { - commandIndex : 6 - method : "restore" - params : undefined - } - 7 : { - commandIndex : 7 - method : "save" - params : undefined - } - 8 : { - commandIndex : 8 - method : "translate" - params : { - dx : 0 - dy : 71 - } - } - 9 : { - commandIndex : 9 - method : "clipRect" - params : { - SkRegion::Op : "kIntersect_Op" - rect : { - bottom : 150 - left : 0 - right : 300 - top : 0 - } - softClipEdgeStyle : true - } - } -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/prefer_compositing_to_lcd_text/compositing/overflow/accelerated-overflow-scroll-should-not-affect-perspective-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/prefer_compositing_to_lcd_text/compositing/overflow/accelerated-overflow-scroll-should-not-affect-perspective-expected.txt deleted file mode 100644 index 825af66..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/prefer_compositing_to_lcd_text/compositing/overflow/accelerated-overflow-scroll-should-not-affect-perspective-expected.txt +++ /dev/null
@@ -1,118 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='container'", - "bounds": [200, 200], - "contentsOpaqueForText": true, - "drawsContent": false, - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='container'", - "bounds": [185, 185], - "drawsContent": false, - "transform": 1 - }, - { - "name": "HorizontalScrollbar", - "position": [0, 185], - "bounds": [200, 15], - "contentsOpaqueForText": true, - "transform": 1 - }, - { - "name": "VerticalScrollbar", - "position": [185, 0], - "bounds": [15, 185], - "contentsOpaque": true, - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='child first'", - "bounds": [60, 200], - "contentsOpaque": true, - "backgroundColor": "#008000", - "transform": 4 - }, - { - "name": "LayoutBlockFlow (positioned) DIV class='child second'", - "bounds": [60, 200], - "contentsOpaque": true, - "backgroundColor": "#0000FF", - "transform": 6 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 8, 0, 1] - ] - }, - { - "id": 2, - "parent": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, -0.01], - [0, 0, 0, 1] - ], - "origin": [100, 100] - }, - { - "id": 3, - "parent": 2, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [0, 65, 0, 1] - ], - "flattenInheritedTransform": false - }, - { - "id": 4, - "parent": 3, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [0, 0, 10, 1] - ], - "flattenInheritedTransform": false - }, - { - "id": 5, - "parent": 2, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [65, 65, 0, 1] - ], - "flattenInheritedTransform": false - }, - { - "id": 6, - "parent": 5, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [0, 0, 20, 1] - ], - "flattenInheritedTransform": false - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/prefer_compositing_to_lcd_text/compositing/overflow/accelerated-scrolling-with-clip-path-text-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/prefer_compositing_to_lcd_text/compositing/overflow/accelerated-scrolling-with-clip-path-text-expected.png deleted file mode 100644 index 2a3bc499..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/prefer_compositing_to_lcd_text/compositing/overflow/accelerated-scrolling-with-clip-path-text-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/prefer_compositing_to_lcd_text/compositing/overflow/disng-cap-nested-scrolling-actual.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/prefer_compositing_to_lcd_text/compositing/overflow/disng-cap-nested-scrolling-actual.png deleted file mode 100644 index ab5a37f..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/prefer_compositing_to_lcd_text/compositing/overflow/disng-cap-nested-scrolling-actual.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/prefer_compositing_to_lcd_text/compositing/overflow/nested-render-surfaces-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/prefer_compositing_to_lcd_text/compositing/overflow/nested-render-surfaces-expected.png deleted file mode 100644 index 561e143f..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/prefer_compositing_to_lcd_text/compositing/overflow/nested-render-surfaces-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/prefer_compositing_to_lcd_text/compositing/overflow/nested-scrolling-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/prefer_compositing_to_lcd_text/compositing/overflow/nested-scrolling-expected.png deleted file mode 100644 index 424a63cd..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/prefer_compositing_to_lcd_text/compositing/overflow/nested-scrolling-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/prefer_compositing_to_lcd_text/compositing/overflow/overflow-auto-with-touch-toggle-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/prefer_compositing_to_lcd_text/compositing/overflow/overflow-auto-with-touch-toggle-expected.txt deleted file mode 100644 index b9cf2d7..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/prefer_compositing_to_lcd_text/compositing/overflow/overflow-auto-with-touch-toggle-expected.txt +++ /dev/null
@@ -1,56 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow DIV class='scroller'", - "bounds": [285, 285], - "drawsContent": false, - "transform": 1 - }, - { - "name": "HorizontalScrollbar", - "position": [0, 285], - "bounds": [285, 15], - "contentsOpaque": true, - "transform": 1 - }, - { - "name": "VerticalScrollbar", - "position": [285, 0], - "bounds": [15, 285], - "contentsOpaque": true, - "transform": 1 - }, - { - "name": "Scroll corner of LayoutBlockFlow DIV class='scroller'", - "position": [285, 285], - "bounds": [15, 15], - "contentsOpaque": true, - "transform": 1 - }, - { - "name": "LayoutBlockFlow DIV class='scroller'", - "bounds": [1000, 1000], - "contentsOpaque": true, - "backgroundColor": "#C0C0C0", - "transform": 1 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [8, 8, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/prefer_compositing_to_lcd_text/compositing/overflow/overflow-scroll-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/prefer_compositing_to_lcd_text/compositing/overflow/overflow-scroll-expected.png deleted file mode 100644 index b4f240bc..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/prefer_compositing_to_lcd_text/compositing/overflow/overflow-scroll-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/prefer_compositing_to_lcd_text/compositing/overflow/rotate-then-clip-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/prefer_compositing_to_lcd_text/compositing/overflow/rotate-then-clip-expected.png deleted file mode 100644 index a66542e..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/prefer_compositing_to_lcd_text/compositing/overflow/rotate-then-clip-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/prefer_compositing_to_lcd_text/compositing/overflow/universal-accelerated-overflow-scroll-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/prefer_compositing_to_lcd_text/compositing/overflow/universal-accelerated-overflow-scroll-expected.txt deleted file mode 100644 index 00bfad04..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/prefer_compositing_to_lcd_text/compositing/overflow/universal-accelerated-overflow-scroll-expected.txt +++ /dev/null
@@ -1,885 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [785, 2016], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow DIV id='container-absolute-grandchildren-not-contained' class='overflow'", - "position": [2, 2], - "bounds": [85, 85], - "drawsContent": false, - "transform": 1 - }, - { - "name": "HorizontalScrollbar", - "position": [10, 97], - "bounds": [104, 257], - "contentsOpaqueForText": true - }, - { - "name": "VerticalScrollbar", - "position": [87, 2], - "bounds": [15, 85], - "contentsOpaque": true, - "transform": 1 - }, - { - "name": "LayoutBlockFlow DIV id='container-absolute-grandchildren-not-contained' class='overflow'", - "position": [2, 6], - "bounds": [85, 136], - "contentsOpaqueForText": true, - "drawsContent": false, - "transform": 2 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='positioned-absolute-grandchildren-not-contained' class='positionAbsolute positioned'", - "position": [35, 10], - "bounds": [199, 105], - "contentsOpaqueForText": true - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV id='scrolled-absolute-grandchildren-not-contained' class='scrolled'", - "position": [6, 6], - "bounds": [75, 136], - "contentsOpaqueForText": true, - "transform": 2 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='container-absolute-grandchildren' class='positionAbsolute overflow'", - "position": [2, 2], - "bounds": [85, 85], - "drawsContent": false, - "transform": 3 - }, - { - "name": "HorizontalScrollbar", - "position": [2, 87], - "bounds": [85, 15], - "contentsOpaque": true, - "transform": 3 - }, - { - "name": "VerticalScrollbar", - "position": [87, 2], - "bounds": [15, 85], - "contentsOpaque": true, - "transform": 3 - }, - { - "name": "Scroll corner of LayoutBlockFlow (positioned) DIV id='container-absolute-grandchildren' class='positionAbsolute overflow'", - "position": [217, 10], - "bounds": [137, 104], - "contentsOpaqueForText": true - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='container-absolute-grandchildren' class='positionAbsolute overflow'", - "position": [2, 6], - "bounds": [105, 136], - "contentsOpaqueForText": true, - "transform": 4 - }, - { - "name": "LayoutBlockFlow DIV id='container-absolute-not-contained' class='overflow'", - "position": [2, 2], - "bounds": [85, 85], - "drawsContent": false, - "transform": 5 - }, - { - "name": "HorizontalScrollbar", - "position": [2, 87], - "bounds": [100, 15], - "contentsOpaqueForText": true, - "transform": 5 - }, - { - "name": "VerticalScrollbar", - "position": [87, 2], - "bounds": [15, 85], - "contentsOpaque": true, - "transform": 5 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='positioned-absolute-not-contained' class='positionAbsolute positioned'", - "position": [275, 10], - "bounds": [199, 105], - "contentsOpaqueForText": true - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV id='scrolled-absolute-not-contained' class='scrolled'", - "position": [6, 6], - "bounds": [75, 136], - "contentsOpaqueForText": true, - "transform": 6 - }, - { - "name": "LayoutBlockFlow DIV id='container-absolute-sibling-grandchildren-not-contained' class='overflow'", - "position": [2, 2], - "bounds": [85, 85], - "drawsContent": false, - "transform": 7 - }, - { - "name": "HorizontalScrollbar", - "position": [2, 87], - "bounds": [100, 15], - "contentsOpaqueForText": true, - "transform": 7 - }, - { - "name": "VerticalScrollbar", - "position": [87, 2], - "bounds": [15, 85], - "contentsOpaque": true, - "transform": 7 - }, - { - "name": "LayoutBlockFlow DIV id='container-absolute-sibling-grandchildren-not-contained' class='overflow'", - "position": [2, 6], - "bounds": [85, 136], - "contentsOpaqueForText": true, - "drawsContent": false, - "transform": 8 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='positioned-absolute-sibling-grandchildren-not-contained' class='positionAbsolute positioned'", - "position": [395, 75], - "bounds": [80, 40], - "contentsOpaque": true, - "backgroundColor": "#800080" - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV id='scrolled-absolute-sibling-grandchildren-not-contained' class='scrolled'", - "position": [6, 34], - "bounds": [75, 80], - "contentsOpaqueForText": true, - "transform": 8 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='container-absolute-sibling-grandchildren' class='positionAbsolute overflow'", - "position": [2, 2], - "bounds": [85, 85], - "drawsContent": false, - "transform": 9 - }, - { - "name": "HorizontalScrollbar", - "position": [2, 87], - "bounds": [85, 15], - "contentsOpaque": true, - "transform": 9 - }, - { - "name": "VerticalScrollbar", - "position": [87, 2], - "bounds": [15, 85], - "contentsOpaque": true, - "transform": 9 - }, - { - "name": "Scroll corner of LayoutBlockFlow (positioned) DIV id='container-absolute-sibling-grandchildren' class='positionAbsolute overflow'", - "position": [97, 130], - "bounds": [137, 104], - "contentsOpaqueForText": true - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='container-absolute-sibling-grandchildren' class='positionAbsolute overflow'", - "position": [2, 6], - "bounds": [105, 136], - "contentsOpaqueForText": true, - "transform": 10 - }, - { - "name": "LayoutBlockFlow DIV id='container-absolute-sibling-not-contained' class='overflow'", - "position": [2, 2], - "bounds": [85, 85], - "drawsContent": false, - "transform": 11 - }, - { - "name": "HorizontalScrollbar", - "position": [130, 217], - "bounds": [224, 137], - "contentsOpaqueForText": true - }, - { - "name": "VerticalScrollbar", - "position": [87, 2], - "bounds": [15, 85], - "contentsOpaque": true, - "transform": 11 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='positioned-absolute-sibling-not-contained' class='positionAbsolute positioned'", - "position": [155, 130], - "bounds": [199, 105], - "contentsOpaqueForText": true - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV id='scrolled-absolute-sibling-not-contained' class='scrolled'", - "position": [6, 34], - "bounds": [75, 80], - "contentsOpaqueForText": true, - "transform": 12 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='container-absolute-sibling' class='positionAbsolute overflow'", - "position": [2, 2], - "bounds": [85, 85], - "drawsContent": false, - "transform": 13 - }, - { - "name": "HorizontalScrollbar", - "position": [2, 87], - "bounds": [85, 15], - "contentsOpaque": true, - "transform": 13 - }, - { - "name": "VerticalScrollbar", - "position": [87, 2], - "bounds": [15, 85], - "contentsOpaque": true, - "transform": 13 - }, - { - "name": "Scroll corner of LayoutBlockFlow (positioned) DIV id='container-absolute-sibling' class='positionAbsolute overflow'", - "position": [337, 130], - "bounds": [137, 104], - "contentsOpaqueForText": true - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='positioned-absolute-sibling' class='positionAbsolute positioned'", - "position": [6, 34], - "bounds": [101, 80], - "contentsOpaqueForText": true, - "transform": 14 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='container-absolute' class='positionAbsolute overflow'", - "position": [2, 2], - "bounds": [85, 85], - "drawsContent": false, - "transform": 15 - }, - { - "name": "HorizontalScrollbar", - "position": [2, 87], - "bounds": [85, 15], - "contentsOpaque": true, - "transform": 15 - }, - { - "name": "VerticalScrollbar", - "position": [87, 2], - "bounds": [15, 85], - "contentsOpaque": true, - "transform": 15 - }, - { - "name": "Scroll corner of LayoutBlockFlow (positioned) DIV id='container-absolute' class='positionAbsolute overflow'", - "position": [370, 217], - "bounds": [104, 137], - "contentsOpaqueForText": true - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='positioned-absolute' class='positionAbsolute positioned'", - "position": [6, 34], - "bounds": [101, 80], - "contentsOpaqueForText": true, - "transform": 16 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='container-fixed-sibling-grandchildren' class='positionAbsolute overflow'", - "position": [2, 2], - "bounds": [85, 85], - "drawsContent": false, - "transform": 17 - }, - { - "name": "HorizontalScrollbar", - "position": [2, 87], - "bounds": [100, 15], - "contentsOpaqueForText": true, - "transform": 17 - }, - { - "name": "VerticalScrollbar", - "position": [87, 2], - "bounds": [15, 85], - "contentsOpaque": true, - "transform": 17 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='container-fixed-sibling-grandchildren' class='positionAbsolute overflow'", - "position": [2, 6], - "bounds": [85, 136], - "contentsOpaqueForText": true, - "drawsContent": false, - "transform": 18 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='positioned-fixed-sibling-grandchildren' class='positionFixed positioned'", - "bounds": [80, 40], - "contentsOpaque": true, - "backgroundColor": "#800080", - "transform": 19 - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV id='scrolled-fixed-sibling-grandchildren' class='scrolled'", - "position": [6, 34], - "bounds": [75, 80], - "contentsOpaqueForText": true, - "transform": 18 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='container-fixed-sibling' class='positionAbsolute overflow'", - "position": [2, 2], - "bounds": [85, 85], - "drawsContent": false, - "transform": 20 - }, - { - "name": "HorizontalScrollbar", - "position": [2, 87], - "bounds": [100, 15], - "contentsOpaqueForText": true, - "transform": 20 - }, - { - "name": "VerticalScrollbar", - "position": [87, 2], - "bounds": [15, 85], - "contentsOpaque": true, - "transform": 20 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='positioned-fixed-sibling' class='positionFixed positioned'", - "bounds": [80, 40], - "contentsOpaque": true, - "backgroundColor": "#800080", - "transform": 21 - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV id='scrolled-fixed-sibling' class='scrolled'", - "position": [6, 34], - "bounds": [75, 80], - "contentsOpaqueForText": true, - "transform": 22 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='container-fixed-grandchildren' class='positionAbsolute overflow'", - "position": [2, 2], - "bounds": [85, 85], - "drawsContent": false, - "transform": 23 - }, - { - "name": "HorizontalScrollbar", - "position": [2, 87], - "bounds": [100, 15], - "contentsOpaqueForText": true, - "transform": 23 - }, - { - "name": "VerticalScrollbar", - "position": [87, 2], - "bounds": [15, 85], - "contentsOpaque": true, - "transform": 23 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='container-fixed-grandchildren' class='positionAbsolute overflow'", - "position": [2, 6], - "bounds": [85, 136], - "contentsOpaqueForText": true, - "drawsContent": false, - "transform": 24 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='positioned-fixed-grandchildren' class='positionFixed positioned'", - "bounds": [80, 40], - "contentsOpaque": true, - "backgroundColor": "#800080", - "transform": 25 - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV id='scrolled-fixed-grandchildren' class='scrolled'", - "position": [6, 34], - "bounds": [75, 80], - "contentsOpaqueForText": true, - "transform": 24 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='container-fixed' class='positionAbsolute overflow'", - "position": [2, 2], - "bounds": [85, 85], - "drawsContent": false, - "transform": 26 - }, - { - "name": "HorizontalScrollbar", - "position": [2, 87], - "bounds": [100, 15], - "contentsOpaqueForText": true, - "transform": 26 - }, - { - "name": "VerticalScrollbar", - "position": [87, 2], - "bounds": [15, 85], - "contentsOpaque": true, - "transform": 26 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='positioned-fixed' class='positionFixed positioned'", - "bounds": [80, 40], - "contentsOpaque": true, - "backgroundColor": "#800080", - "transform": 27 - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV id='scrolled-fixed' class='scrolled'", - "position": [6, 34], - "bounds": [75, 80], - "contentsOpaqueForText": true, - "transform": 28 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='sibling-absolute-sibling-grandchildren-not-contained' class='positionFixed sibling'", - "bounds": [50, 100], - "contentsOpaque": true, - "backgroundColor": "#008000", - "transform": 29 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='sibling-absolute-sibling-grandchildren' class='positionFixed sibling'", - "bounds": [50, 100], - "contentsOpaque": true, - "backgroundColor": "#008000", - "transform": 30 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='sibling-absolute-sibling-not-contained' class='positionFixed sibling'", - "bounds": [50, 100], - "contentsOpaque": true, - "backgroundColor": "#008000", - "transform": 31 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='sibling-absolute-sibling' class='positionFixed sibling'", - "bounds": [50, 100], - "contentsOpaque": true, - "backgroundColor": "#008000", - "transform": 32 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='sibling-fixed-sibling-grandchildren' class='positionFixed sibling'", - "bounds": [50, 100], - "contentsOpaque": true, - "backgroundColor": "#008000", - "transform": 33 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='sibling-fixed-sibling' class='positionFixed sibling'", - "bounds": [50, 100], - "contentsOpaque": true, - "backgroundColor": "#008000", - "transform": 34 - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV id='scrolled-absolute-sibling-grandchildren-not-contained' class='scrolled onTop'", - "position": [6, 6], - "bounds": [75, 136], - "contentsOpaqueForText": true, - "transform": 8 - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV id='scrolled-absolute-sibling-grandchildren' class='scrolled onTop'", - "position": [6, 6], - "bounds": [75, 136], - "contentsOpaqueForText": true, - "transform": 10 - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV id='scrolled-absolute-sibling-not-contained' class='scrolled onTop'", - "position": [6, 6], - "bounds": [75, 136], - "contentsOpaqueForText": true, - "transform": 12 - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV id='scrolled-absolute-sibling' class='scrolled onTop'", - "position": [6, 6], - "bounds": [75, 136], - "contentsOpaqueForText": true, - "transform": 14 - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV id='scrolled-absolute' class='scrolled onTop'", - "position": [6, 6], - "bounds": [75, 136], - "contentsOpaqueForText": true, - "transform": 16 - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV id='scrolled-fixed-sibling-grandchildren' class='scrolled onTop'", - "position": [6, 6], - "bounds": [75, 136], - "contentsOpaqueForText": true, - "transform": 18 - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV id='scrolled-fixed-sibling' class='scrolled onTop'", - "position": [6, 6], - "bounds": [75, 136], - "contentsOpaqueForText": true, - "transform": 22 - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV id='scrolled-fixed-grandchildren' class='scrolled onTop'", - "position": [6, 6], - "bounds": [75, 136], - "contentsOpaqueForText": true, - "transform": 24 - }, - { - "name": "LayoutBlockFlow (relative positioned) DIV id='scrolled-fixed' class='scrolled onTop'", - "position": [6, 6], - "bounds": [75, 136], - "contentsOpaqueForText": true, - "transform": 28 - }, - { - "name": "VerticalScrollbar", - "position": [785, 0], - "bounds": [15, 600], - "contentsOpaque": true - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [10, 10, 0, 1] - ] - }, - { - "id": 2, - "parent": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [0, -59, 0, 1] - ] - }, - { - "id": 3, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [130, 10, 0, 1] - ] - }, - { - "id": 4, - "parent": 3, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [0, -59, 0, 1] - ] - }, - { - "id": 5, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [250, 10, 0, 1] - ] - }, - { - "id": 6, - "parent": 5, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [0, -59, 0, 1] - ] - }, - { - "id": 7, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [370, 10, 0, 1] - ] - }, - { - "id": 8, - "parent": 7, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [0, -59, 0, 1] - ] - }, - { - "id": 9, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [10, 130, 0, 1] - ] - }, - { - "id": 10, - "parent": 9, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [0, -59, 0, 1] - ] - }, - { - "id": 11, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [130, 130, 0, 1] - ] - }, - { - "id": 12, - "parent": 11, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [0, -59, 0, 1] - ] - }, - { - "id": 13, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [250, 130, 0, 1] - ] - }, - { - "id": 14, - "parent": 13, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [0, -59, 0, 1] - ] - }, - { - "id": 15, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [370, 130, 0, 1] - ] - }, - { - "id": 16, - "parent": 15, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [0, -59, 0, 1] - ] - }, - { - "id": 17, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [10, 250, 0, 1] - ] - }, - { - "id": 18, - "parent": 17, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [0, -59, 0, 1] - ] - }, - { - "id": 19, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [35, 315, 0, 1] - ] - }, - { - "id": 20, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [130, 250, 0, 1] - ] - }, - { - "id": 21, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [155, 315, 0, 1] - ] - }, - { - "id": 22, - "parent": 20, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [0, -59, 0, 1] - ] - }, - { - "id": 23, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [250, 250, 0, 1] - ] - }, - { - "id": 24, - "parent": 23, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [0, -59, 0, 1] - ] - }, - { - "id": 25, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [275, 315, 0, 1] - ] - }, - { - "id": 26, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [370, 250, 0, 1] - ] - }, - { - "id": 27, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [395, 315, 0, 1] - ] - }, - { - "id": 28, - "parent": 26, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [0, -59, 0, 1] - ] - }, - { - "id": 29, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [375, 20, 0, 1] - ] - }, - { - "id": 30, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [15, 140, 0, 1] - ] - }, - { - "id": 31, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [135, 140, 0, 1] - ] - }, - { - "id": 32, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [255, 140, 0, 1] - ] - }, - { - "id": 33, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [15, 260, 0, 1] - ] - }, - { - "id": 34, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [135, 260, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/prefer_compositing_to_lcd_text/compositing/squashing/keep-lcd-text-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/prefer_compositing_to_lcd_text/compositing/squashing/keep-lcd-text-expected.txt deleted file mode 100644 index 5045d52..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/prefer_compositing_to_lcd_text/compositing/squashing/keep-lcd-text-expected.txt +++ /dev/null
@@ -1,22 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='composited'", - "bounds": [300, 300], - "contentsOpaqueForText": true, - "drawsContent": false - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='non-opaque'", - "bounds": [220, 270], - "backgroundColor": "#FFFF00" - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/prefer_compositing_to_lcd_text/scrollbars/overlay-scrollbars-within-overflow-scroll-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/prefer_compositing_to_lcd_text/scrollbars/overlay-scrollbars-within-overflow-scroll-expected.txt deleted file mode 100644 index a09d4f1..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/prefer_compositing_to_lcd_text/scrollbars/overlay-scrollbars-within-overflow-scroll-expected.txt +++ /dev/null
@@ -1,78 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [800, 600], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow DIV id='outer'", - "position": [1, 1], - "bounds": [400, 300], - "drawsContent": false - }, - { - "name": "LayoutBlockFlow DIV id='outer'", - "position": [1, 1], - "bounds": [400, 500], - "contentsOpaqueForText": true, - "drawsContent": false, - "transform": 1 - }, - { - "name": "LayoutBlockFlow DIV id='inner'", - "bounds": [102, 102], - "contentsOpaqueForText": true, - "transform": 2 - }, - { - "name": "LayoutBlockFlow DIV id='inner'", - "position": [1, 1], - "bounds": [100, 100], - "drawsContent": false, - "transform": 2 - }, - { - "name": "LayoutBlockFlow DIV id='inner'", - "position": [1, 1], - "bounds": [100, 500], - "contentsOpaqueForText": true, - "drawsContent": false, - "transform": 2 - }, - { - "name": "VerticalScrollbar", - "position": [94, 1], - "bounds": [7, 100], - "transform": 2 - }, - { - "name": "VerticalScrollbar", - "position": [394, 1], - "bounds": [7, 300] - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [0, -302, 0, 1] - ] - }, - { - "id": 2, - "parent": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [1, 501, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/prefer_compositing_to_lcd_text/scrollbars/scrollbars-on-positioned-content-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/prefer_compositing_to_lcd_text/scrollbars/scrollbars-on-positioned-content-expected.png deleted file mode 100644 index 31413c4..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/prefer_compositing_to_lcd_text/scrollbars/scrollbars-on-positioned-content-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/scalefactor200/css3/filters/composited-layer-bounds-after-sw-blur-animation-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/scalefactor200/css3/filters/composited-layer-bounds-after-sw-blur-animation-expected.txt deleted file mode 100644 index e79c42c9..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/scalefactor200/css3/filters/composited-layer-bounds-after-sw-blur-animation-expected.txt +++ /dev/null
@@ -1,29 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [1600, 1200], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='composited-layer' class='initial-drop-shadow'", - "bounds": [200, 200], - "contentsOpaque": true, - "backgroundColor": "#008000", - "transform": 1 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [200, 200, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/scalefactor200/css3/filters/composited-layer-bounds-with-composited-blur-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/scalefactor200/css3/filters/composited-layer-bounds-with-composited-blur-expected.txt deleted file mode 100644 index c15512f..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/scalefactor200/css3/filters/composited-layer-bounds-with-composited-blur-expected.txt +++ /dev/null
@@ -1,29 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [1600, 1200], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='composited'", - "bounds": [200, 200], - "contentsOpaque": true, - "backgroundColor": "#008000", - "transform": 1 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [200, 200, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/scalefactor200/css3/filters/composited-layer-promotion-after-outset-overlap-change-using-composited-shadow-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/scalefactor200/css3/filters/composited-layer-promotion-after-outset-overlap-change-using-composited-shadow-expected.txt deleted file mode 100644 index 5c80211a..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/scalefactor200/css3/filters/composited-layer-promotion-after-outset-overlap-change-using-composited-shadow-expected.txt +++ /dev/null
@@ -1,63 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [1600, 1200], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='composited-layer-to-overlap'", - "bounds": [200, 200], - "contentsOpaque": true, - "backgroundColor": "#0000FF", - "transform": 1 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [500, 500, 0, 1] - ] - } - ] -} -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [1600, 1200], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='composited-layer-to-overlap'", - "bounds": [200, 200], - "contentsOpaque": true, - "backgroundColor": "#0000FF", - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='software-layer-to-promote' class='final-drop-shadow'", - "position": [200, 200], - "bounds": [400, 400], - "contentsOpaqueForText": true - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [500, 500, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/scalefactor200/css3/filters/composited-layer-promotion-after-outset-overlap-change-using-sw-shadow-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/scalefactor200/css3/filters/composited-layer-promotion-after-outset-overlap-change-using-sw-shadow-expected.txt deleted file mode 100644 index 5c80211a..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/scalefactor200/css3/filters/composited-layer-promotion-after-outset-overlap-change-using-sw-shadow-expected.txt +++ /dev/null
@@ -1,63 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [1600, 1200], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='composited-layer-to-overlap'", - "bounds": [200, 200], - "contentsOpaque": true, - "backgroundColor": "#0000FF", - "transform": 1 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [500, 500, 0, 1] - ] - } - ] -} -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [1600, 1200], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='composited-layer-to-overlap'", - "bounds": [200, 200], - "contentsOpaque": true, - "backgroundColor": "#0000FF", - "transform": 1 - }, - { - "name": "LayoutBlockFlow (positioned) DIV id='software-layer-to-promote' class='final-drop-shadow'", - "position": [200, 200], - "bounds": [400, 400], - "contentsOpaqueForText": true - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [500, 500, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/scalefactor200/css3/filters/filter-repaint-turbulence-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/scalefactor200/css3/filters/filter-repaint-turbulence-expected.png deleted file mode 100644 index 2d8cca9..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/scalefactor200/css3/filters/filter-repaint-turbulence-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/scalefactor200/css3/filters/filtered-compositing-descendant-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/scalefactor200/css3/filters/filtered-compositing-descendant-expected.txt deleted file mode 100644 index 49ba8df..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/scalefactor200/css3/filters/filtered-compositing-descendant-expected.txt +++ /dev/null
@@ -1,45 +0,0 @@ -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [1600, 1200], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow DIV class='filtered box'", - "position": [16, 16], - "bounds": [288, 288], - "contentsOpaqueForText": true - }, - { - "name": "LayoutBlockFlow DIV class='compositing box'", - "bounds": [200, 200], - "contentsOpaque": true, - "backgroundColor": "#FF0000", - "transform": 2 - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [60, 60, 0, 1] - ] - }, - { - "id": 2, - "parent": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [0, 0, 2, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/scalefactor200/http/tests/images/document-policy/document-policy-oversized-images-edge-cases-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/scalefactor200/http/tests/images/document-policy/document-policy-oversized-images-edge-cases-expected.png deleted file mode 100644 index 697a2b9..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/scalefactor200/http/tests/images/document-policy/document-policy-oversized-images-edge-cases-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/shared_array_buffer_on_desktop/fast/css/002-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/shared_array_buffer_on_desktop/fast/css/002-expected.png deleted file mode 100644 index c798092c..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/shared_array_buffer_on_desktop/fast/css/002-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/shared_array_buffer_on_desktop/fast/css/004-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/shared_array_buffer_on_desktop/fast/css/004-expected.png deleted file mode 100644 index 68441ad5..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/shared_array_buffer_on_desktop/fast/css/004-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/shared_array_buffer_on_desktop/fast/css/005-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/shared_array_buffer_on_desktop/fast/css/005-expected.png deleted file mode 100644 index 8ad8eab7..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/shared_array_buffer_on_desktop/fast/css/005-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/shared_array_buffer_on_desktop/fast/css/acid2-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/shared_array_buffer_on_desktop/fast/css/acid2-expected.png deleted file mode 100644 index 74e85e5..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/shared_array_buffer_on_desktop/fast/css/acid2-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/shared_array_buffer_on_desktop/fast/css/clip-text-in-scaled-div-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/shared_array_buffer_on_desktop/fast/css/clip-text-in-scaled-div-expected.png deleted file mode 100644 index 6ec97771..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/shared_array_buffer_on_desktop/fast/css/clip-text-in-scaled-div-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/shared_array_buffer_on_desktop/fast/css/clip-zooming-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/shared_array_buffer_on_desktop/fast/css/clip-zooming-expected.png deleted file mode 100644 index f0615b0..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/shared_array_buffer_on_desktop/fast/css/clip-zooming-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/shared_array_buffer_on_desktop/fast/css/first-child-pseudo-class-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/shared_array_buffer_on_desktop/fast/css/first-child-pseudo-class-expected.png deleted file mode 100644 index 631928c..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/shared_array_buffer_on_desktop/fast/css/first-child-pseudo-class-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/shared_array_buffer_on_desktop/fast/css/first-of-type-pseudo-class-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/shared_array_buffer_on_desktop/fast/css/first-of-type-pseudo-class-expected.png deleted file mode 100644 index 6c7270d..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/shared_array_buffer_on_desktop/fast/css/first-of-type-pseudo-class-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/shared_array_buffer_on_desktop/fast/css/font-face-synthetic-bold-italic-for-locally-installed-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/shared_array_buffer_on_desktop/fast/css/font-face-synthetic-bold-italic-for-locally-installed-expected.png deleted file mode 100644 index 67c9fed6..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/shared_array_buffer_on_desktop/fast/css/font-face-synthetic-bold-italic-for-locally-installed-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/shared_array_buffer_on_desktop/fast/css/font-smoothing-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/shared_array_buffer_on_desktop/fast/css/font-smoothing-expected.png deleted file mode 100644 index 6030423c..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/shared_array_buffer_on_desktop/fast/css/font-smoothing-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/shared_array_buffer_on_desktop/fast/css/font_property_normal-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/shared_array_buffer_on_desktop/fast/css/font_property_normal-expected.png deleted file mode 100644 index 12a754c..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/shared_array_buffer_on_desktop/fast/css/font_property_normal-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/shared_array_buffer_on_desktop/fast/css/input-search-padding-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/shared_array_buffer_on_desktop/fast/css/input-search-padding-expected.png deleted file mode 100644 index b3812aa..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/shared_array_buffer_on_desktop/fast/css/input-search-padding-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/shared_array_buffer_on_desktop/fast/css/last-child-pseudo-class-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/shared_array_buffer_on_desktop/fast/css/last-child-pseudo-class-expected.png deleted file mode 100644 index acdce0c88..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/shared_array_buffer_on_desktop/fast/css/last-child-pseudo-class-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/shared_array_buffer_on_desktop/fast/css/last-of-type-pseudo-class-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/shared_array_buffer_on_desktop/fast/css/last-of-type-pseudo-class-expected.png deleted file mode 100644 index 28ff695c..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/shared_array_buffer_on_desktop/fast/css/last-of-type-pseudo-class-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/shared_array_buffer_on_desktop/fast/css/list-item-height-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/shared_array_buffer_on_desktop/fast/css/list-item-height-expected.png deleted file mode 100644 index be29b8f..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/shared_array_buffer_on_desktop/fast/css/list-item-height-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/shared_array_buffer_on_desktop/fast/css/negative-leading-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/shared_array_buffer_on_desktop/fast/css/negative-leading-expected.png deleted file mode 100644 index 4fc561a1..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/shared_array_buffer_on_desktop/fast/css/negative-leading-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/shared_array_buffer_on_desktop/fast/css/only-child-pseudo-class-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/shared_array_buffer_on_desktop/fast/css/only-child-pseudo-class-expected.png deleted file mode 100644 index 209131b..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/shared_array_buffer_on_desktop/fast/css/only-child-pseudo-class-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/shared_array_buffer_on_desktop/fast/css/only-of-type-pseudo-class-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/shared_array_buffer_on_desktop/fast/css/only-of-type-pseudo-class-expected.png deleted file mode 100644 index 5ea36cab..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/shared_array_buffer_on_desktop/fast/css/only-of-type-pseudo-class-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/shared_array_buffer_on_desktop/fast/css/outline-auto-location-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/shared_array_buffer_on_desktop/fast/css/outline-auto-location-expected.png deleted file mode 100644 index 383b4641..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/shared_array_buffer_on_desktop/fast/css/outline-auto-location-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/shared_array_buffer_on_desktop/fast/css/rem-calc-dynamic-scaling-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/shared_array_buffer_on_desktop/fast/css/rem-calc-dynamic-scaling-expected.png deleted file mode 100644 index 74e885d..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/shared_array_buffer_on_desktop/fast/css/rem-calc-dynamic-scaling-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/shared_array_buffer_on_desktop/fast/css/rem-dynamic-scaling-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/shared_array_buffer_on_desktop/fast/css/rem-dynamic-scaling-expected.png deleted file mode 100644 index 74e885d..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/shared_array_buffer_on_desktop/fast/css/rem-dynamic-scaling-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/shared_array_buffer_on_desktop/fast/css/rem-units-on-root-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/shared_array_buffer_on_desktop/fast/css/rem-units-on-root-expected.png deleted file mode 100644 index d37ad8d3..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/shared_array_buffer_on_desktop/fast/css/rem-units-on-root-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/shared_array_buffer_on_desktop/fast/css/shadow-multiple-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/shared_array_buffer_on_desktop/fast/css/shadow-multiple-expected.png deleted file mode 100644 index eee32fa..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/shared_array_buffer_on_desktop/fast/css/shadow-multiple-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/shared_array_buffer_on_desktop/fast/css/text-overflow-ellipsis-multiple-shadows-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/shared_array_buffer_on_desktop/fast/css/text-overflow-ellipsis-multiple-shadows-expected.png deleted file mode 100644 index 156ce55..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/shared_array_buffer_on_desktop/fast/css/text-overflow-ellipsis-multiple-shadows-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/shared_array_buffer_on_desktop/fast/css/text-overflow-ellipsis-shadow-alpha-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/shared_array_buffer_on_desktop/fast/css/text-overflow-ellipsis-shadow-alpha-expected.png deleted file mode 100644 index befe81c..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/shared_array_buffer_on_desktop/fast/css/text-overflow-ellipsis-shadow-alpha-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/shared_array_buffer_on_desktop/fast/css/text-rendering-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/shared_array_buffer_on_desktop/fast/css/text-rendering-expected.png deleted file mode 100644 index 7eb350db..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/shared_array_buffer_on_desktop/fast/css/text-rendering-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/shared_array_buffer_on_desktop/fast/css/word-space-extra-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/shared_array_buffer_on_desktop/fast/css/word-space-extra-expected.png deleted file mode 100644 index 844204c..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/shared_array_buffer_on_desktop/fast/css/word-space-extra-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/shared_array_buffer_on_desktop/fast/css/zoom-font-size-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/shared_array_buffer_on_desktop/fast/css/zoom-font-size-expected.png deleted file mode 100644 index 19736745..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/shared_array_buffer_on_desktop/fast/css/zoom-font-size-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/shared_array_buffer_on_desktop/fast/dom/HTMLMeterElement/meter-optimums-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/shared_array_buffer_on_desktop/fast/dom/HTMLMeterElement/meter-optimums-expected.png deleted file mode 100644 index 2e3da26..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/shared_array_buffer_on_desktop/fast/dom/HTMLMeterElement/meter-optimums-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/shared_array_buffer_on_desktop/fast/encoding/utf-16-big-endian-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/shared_array_buffer_on_desktop/fast/encoding/utf-16-big-endian-expected.png deleted file mode 100644 index 358b974..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/shared_array_buffer_on_desktop/fast/encoding/utf-16-big-endian-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/shared_array_buffer_on_desktop/fast/encoding/utf-16-little-endian-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/shared_array_buffer_on_desktop/fast/encoding/utf-16-little-endian-expected.png deleted file mode 100644 index 358b974..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/shared_array_buffer_on_desktop/fast/encoding/utf-16-little-endian-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/stable/inspector-protocol/dom-snapshot/dom-snapshot-captureSnapshot-pseudo-element-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/stable/inspector-protocol/dom-snapshot/dom-snapshot-captureSnapshot-pseudo-element-expected.txt deleted file mode 100644 index 8d7d2de..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/stable/inspector-protocol/dom-snapshot/dom-snapshot-captureSnapshot-pseudo-element-expected.txt +++ /dev/null
@@ -1,985 +0,0 @@ -Tests DOMSnapshot.captureSnapshot exports layout tree nodes associated with pseudo elements. -{ - documents : [ - [0] : { - baseURL : <number> - contentHeight : 600 - contentLanguage : -1 - contentWidth : 800 - documentURL : <number> - encodingName : 1 - frameId : <number> - layout : { - bounds : [ - [0] : [ - [0] : 0 - [1] : 0 - [2] : 800 - [3] : 600 - ] - [1] : [ - [0] : 0 - [1] : 0 - [2] : 800 - [3] : 600 - ] - [2] : [ - [0] : 8 - [1] : 8 - [2] : 784 - [3] : 582 - ] - [3] : [ - [0] : 8 - [1] : 18 - [2] : 200 - [3] : 200 - ] - [4] : [ - [0] : 8 - [1] : 18 - [2] : 10 - [3] : 10 - ] - [5] : [ - [0] : 8 - [1] : 18 - [2] : 10 - [3] : 10 - ] - [6] : [ - [0] : 8 - [1] : 18 - [2] : 140 - [3] : 20 - ] - [7] : [ - [0] : 8 - [1] : 18 - [2] : 200 - [3] : 200 - ] - [8] : [ - [0] : 8 - [1] : 18 - [2] : 10 - [3] : 10 - ] - [9] : [ - [0] : 8 - [1] : 18 - [2] : 10 - [3] : 10 - ] - [10] : [ - [0] : 8 - [1] : 18 - [2] : 200 - [3] : 30 - ] - [11] : [ - [0] : 8 - [1] : 18 - [2] : 200 - [3] : 30 - ] - [12] : [ - [0] : 8 - [1] : 18 - [2] : 200 - [3] : 200 - ] - [13] : [ - [0] : 8 - [1] : 110 - [2] : 10 - [3] : 10 - ] - [14] : [ - [0] : 8 - [1] : 110 - [2] : 10 - [3] : 10 - ] - [15] : [ - [0] : 8 - [1] : 110 - [2] : 200 - [3] : 10 - ] - [16] : [ - [0] : 18 - [1] : 110 - [2] : 70 - [3] : 10 - ] - [17] : [ - [0] : 88 - [1] : 110 - [2] : 10 - [3] : 10 - ] - [18] : [ - [0] : 98 - [1] : 18 - [2] : 100 - [3] : 100 - ] - [19] : [ - [0] : 198 - [1] : 110 - [2] : 10 - [3] : 10 - ] - [20] : [ - [0] : 8 - [1] : 120 - [2] : 190 - [3] : 30 - ] - [21] : [ - [0] : 8 - [1] : 8 - [2] : 784 - [3] : 40 - ] - [22] : [ - [0] : 48 - [1] : 8 - [2] : 744 - [3] : 10 - ] - [23] : [ - [0] : 35 - [1] : 8 - [2] : 5 - [3] : 10 - ] - [24] : [ - [0] : 48 - [1] : 8 - [2] : 50 - [3] : 10 - ] - [25] : [ - [0] : 48 - [1] : 18 - [2] : 744 - [3] : 10 - ] - [26] : [ - [0] : 35 - [1] : 18 - [2] : 5 - [3] : 10 - ] - [27] : [ - [0] : 48 - [1] : 18 - [2] : 40 - [3] : 10 - ] - [28] : [ - [0] : 48 - [1] : 28 - [2] : 744 - [3] : 10 - ] - [29] : [ - [0] : 35 - [1] : 28 - [2] : 5 - [3] : 10 - ] - [30] : [ - [0] : 48 - [1] : 28 - [2] : 40 - [3] : 10 - ] - [31] : [ - [0] : 48 - [1] : 38 - [2] : 744 - [3] : 10 - ] - [32] : [ - [0] : 35 - [1] : 38 - [2] : 5 - [3] : 10 - ] - [33] : [ - [0] : 48 - [1] : 38 - [2] : 50 - [3] : 10 - ] - ] - nodeIndex : [ - [0] : 0 - [1] : 1 - [2] : 8 - [3] : 10 - [4] : 11 - [5] : 11 - [6] : 12 - [7] : 14 - [8] : 15 - [9] : 15 - [10] : 16 - [11] : 17 - [12] : 19 - [13] : 20 - [14] : 20 - [15] : 21 - [16] : 21 - [17] : 21 - [18] : 21 - [19] : 21 - [20] : 22 - [21] : 24 - [22] : 25 - [23] : 26 - [24] : 27 - [25] : 28 - [26] : 29 - [27] : 30 - [28] : 31 - [29] : 32 - [30] : 33 - [31] : 34 - [32] : 35 - [33] : 36 - ] - stackingContexts : { - index : [ - [0] : 0 - [1] : 1 - ] - } - styles : [ - [0] : [ - ] - [1] : [ - [0] : 5 - [1] : 6 - ] - [2] : [ - [0] : 5 - [1] : 6 - ] - [3] : [ - [0] : 5 - [1] : 6 - ] - [4] : [ - [0] : 21 - [1] : 22 - ] - [5] : [ - [0] : 21 - [1] : 22 - ] - [6] : [ - [0] : 5 - [1] : 6 - ] - [7] : [ - [0] : 5 - [1] : 6 - ] - [8] : [ - [0] : 21 - [1] : 22 - ] - [9] : [ - [0] : 21 - [1] : 22 - ] - [10] : [ - [0] : 5 - [1] : 6 - ] - [11] : [ - [0] : 5 - [1] : 6 - ] - [12] : [ - [0] : 5 - [1] : 6 - ] - [13] : [ - [0] : 31 - [1] : 32 - ] - [14] : [ - [0] : 31 - [1] : 32 - ] - [15] : [ - [0] : 5 - [1] : 6 - ] - [16] : [ - [0] : 5 - [1] : 6 - ] - [17] : [ - [0] : 5 - [1] : 6 - ] - [18] : [ - [0] : 5 - [1] : 6 - ] - [19] : [ - [0] : 5 - [1] : 6 - ] - [20] : [ - [0] : 5 - [1] : 6 - ] - [21] : [ - [0] : 5 - [1] : 6 - ] - [22] : [ - [0] : 5 - [1] : 6 - ] - [23] : [ - [0] : 5 - [1] : 6 - ] - [24] : [ - [0] : 5 - [1] : 6 - ] - [25] : [ - [0] : 5 - [1] : 6 - ] - [26] : [ - [0] : 5 - [1] : 6 - ] - [27] : [ - [0] : 5 - [1] : 6 - ] - [28] : [ - [0] : 5 - [1] : 6 - ] - [29] : [ - [0] : 5 - [1] : 6 - ] - [30] : [ - [0] : 5 - [1] : 6 - ] - [31] : [ - [0] : 5 - [1] : 6 - ] - [32] : [ - [0] : 5 - [1] : 6 - ] - [33] : [ - [0] : 5 - [1] : 6 - ] - ] - text : [ - [0] : -1 - [1] : -1 - [2] : -1 - [3] : -1 - [4] : -1 - [5] : 23 - [6] : 26 - [7] : -1 - [8] : -1 - [9] : 23 - [10] : -1 - [11] : 29 - [12] : -1 - [13] : -1 - [14] : 33 - [15] : -1 - [16] : 35 - [17] : 36 - [18] : -1 - [19] : 37 - [20] : 39 - [21] : -1 - [22] : -1 - [23] : -1 - [24] : 44 - [25] : -1 - [26] : -1 - [27] : 45 - [28] : -1 - [29] : -1 - [30] : 46 - [31] : -1 - [32] : -1 - [33] : 47 - ] - } - nodes : { - attributes : [ - [0] : [ - ] - [1] : [ - ] - [2] : [ - ] - [3] : [ - ] - [4] : [ - ] - [5] : [ - ] - [6] : [ - [0] : 13 - [1] : 14 - ] - [7] : [ - ] - [8] : [ - ] - [9] : [ - ] - [10] : [ - [0] : 18 - [1] : 19 - ] - [11] : [ - ] - [12] : [ - ] - [13] : [ - ] - [14] : [ - [0] : 18 - [1] : 19 - ] - [15] : [ - ] - [16] : [ - ] - [17] : [ - ] - [18] : [ - ] - [19] : [ - [0] : 18 - [1] : 30 - ] - [20] : [ - ] - [21] : [ - ] - [22] : [ - ] - [23] : [ - ] - [24] : [ - ] - [25] : [ - ] - [26] : [ - ] - [27] : [ - ] - [28] : [ - ] - [29] : [ - ] - [30] : [ - ] - [31] : [ - ] - [32] : [ - ] - [33] : [ - ] - [34] : [ - ] - [35] : [ - ] - [36] : [ - ] - [37] : [ - ] - ] - backendNodeId : <object> - contentDocumentIndex : { - index : [ - ] - value : [ - ] - } - currentSourceURL : { - index : [ - ] - value : [ - ] - } - inputChecked : { - index : [ - ] - } - inputValue : { - index : [ - ] - value : [ - ] - } - isClickable : { - index : [ - ] - } - nodeName : [ - [0] : 3 - [1] : 4 - [2] : 7 - [3] : 8 - [4] : 9 - [5] : 9 - [6] : 12 - [7] : 9 - [8] : 15 - [9] : 9 - [10] : 17 - [11] : 20 - [12] : 9 - [13] : 9 - [14] : 17 - [15] : 20 - [16] : 27 - [17] : 9 - [18] : 9 - [19] : 17 - [20] : 20 - [21] : 34 - [22] : 9 - [23] : 9 - [24] : 40 - [25] : 41 - [26] : 42 - [27] : 9 - [28] : 41 - [29] : 42 - [30] : 9 - [31] : 41 - [32] : 42 - [33] : 9 - [34] : 41 - [35] : 42 - [36] : 9 - [37] : 9 - ] - nodeType : [ - [0] : 9 - [1] : 1 - [2] : 1 - [3] : 1 - [4] : 3 - [5] : 3 - [6] : 1 - [7] : 3 - [8] : 1 - [9] : 3 - [10] : 1 - [11] : 1 - [12] : 3 - [13] : 3 - [14] : 1 - [15] : 1 - [16] : 1 - [17] : 3 - [18] : 3 - [19] : 1 - [20] : 1 - [21] : 1 - [22] : 3 - [23] : 3 - [24] : 1 - [25] : 1 - [26] : 1 - [27] : 3 - [28] : 1 - [29] : 1 - [30] : 3 - [31] : 1 - [32] : 1 - [33] : 3 - [34] : 1 - [35] : 1 - [36] : 3 - [37] : 3 - ] - nodeValue : [ - [0] : -1 - [1] : -1 - [2] : -1 - [3] : -1 - [4] : 10 - [5] : 11 - [6] : -1 - [7] : 11 - [8] : -1 - [9] : 16 - [10] : -1 - [11] : -1 - [12] : 25 - [13] : 16 - [14] : -1 - [15] : -1 - [16] : -1 - [17] : 28 - [18] : 16 - [19] : -1 - [20] : -1 - [21] : -1 - [22] : 39 - [23] : 16 - [24] : -1 - [25] : -1 - [26] : -1 - [27] : 44 - [28] : -1 - [29] : -1 - [30] : 45 - [31] : -1 - [32] : -1 - [33] : 46 - [34] : -1 - [35] : -1 - [36] : 47 - [37] : 48 - ] - optionSelected : { - index : [ - ] - } - originURL : { - index : [ - ] - value : [ - ] - } - parentIndex : [ - [0] : -1 - [1] : 0 - [2] : 1 - [3] : 2 - [4] : 3 - [5] : 2 - [6] : 2 - [7] : 2 - [8] : 1 - [9] : 8 - [10] : 8 - [11] : 10 - [12] : 10 - [13] : 8 - [14] : 8 - [15] : 14 - [16] : 14 - [17] : 16 - [18] : 8 - [19] : 8 - [20] : 19 - [21] : 19 - [22] : 19 - [23] : 8 - [24] : 8 - [25] : 24 - [26] : 25 - [27] : 25 - [28] : 24 - [29] : 28 - [30] : 28 - [31] : 24 - [32] : 31 - [33] : 31 - [34] : 24 - [35] : 34 - [36] : 34 - [37] : 8 - ] - pseudoIdentifier : { - index : [ - ] - value : [ - ] - } - pseudoType : { - index : [ - [0] : 11 - [1] : 15 - [2] : 20 - [3] : 21 - [4] : 26 - [5] : 29 - [6] : 32 - [7] : 35 - ] - value : [ - [0] : 24 - [1] : 24 - [2] : 24 - [3] : 38 - [4] : 43 - [5] : 43 - [6] : 43 - [7] : 43 - ] - } - shadowRootType : <object> - textValue : { - index : [ - ] - value : [ - ] - } - } - publicId : -1 - scrollOffsetX : 0 - scrollOffsetY : 0 - systemId : -1 - textBoxes : { - bounds : [ - [0] : [ - [0] : 8 - [1] : 18 - [2] : 10 - [3] : 10 - ] - [1] : [ - [0] : 18 - [1] : 18 - [2] : 130 - [3] : 10 - ] - [2] : [ - [0] : 8 - [1] : 28 - [2] : 70 - [3] : 10 - ] - [3] : [ - [0] : 8 - [1] : 18 - [2] : 10 - [3] : 10 - ] - [4] : [ - [0] : 18 - [1] : 18 - [2] : 130 - [3] : 10 - ] - [5] : [ - [0] : 8 - [1] : 28 - [2] : 200 - [3] : 10 - ] - [6] : [ - [0] : 8 - [1] : 38 - [2] : 70 - [3] : 10 - ] - [7] : [ - [0] : 8 - [1] : 110 - [2] : 10 - [3] : 10 - ] - [8] : [ - [0] : 18 - [1] : 110 - [2] : 70 - [3] : 10 - ] - [9] : [ - [0] : 88 - [1] : 110 - [2] : 10 - [3] : 10 - ] - [10] : [ - [0] : 198 - [1] : 110 - [2] : 10 - [3] : 10 - ] - [11] : [ - [0] : 8 - [1] : 120 - [2] : 190 - [3] : 10 - ] - [12] : [ - [0] : 8 - [1] : 130 - [2] : 160 - [3] : 10 - ] - [13] : [ - [0] : 8 - [1] : 140 - [2] : 130 - [3] : 10 - ] - [14] : [ - [0] : 48 - [1] : 8 - [2] : 50 - [3] : 10 - ] - [15] : [ - [0] : 48 - [1] : 18 - [2] : 40 - [3] : 10 - ] - [16] : [ - [0] : 48 - [1] : 28 - [2] : 40 - [3] : 10 - ] - [17] : [ - [0] : 48 - [1] : 38 - [2] : 50 - [3] : 10 - ] - ] - layoutIndex : [ - [0] : 5 - [1] : 6 - [2] : 6 - [3] : 9 - [4] : 11 - [5] : 11 - [6] : 11 - [7] : 14 - [8] : 16 - [9] : 17 - [10] : 19 - [11] : 20 - [12] : 20 - [13] : 20 - [14] : 24 - [15] : 27 - [16] : 30 - [17] : 33 - ] - length : [ - [0] : 1 - [1] : 13 - [2] : 7 - [3] : 1 - [4] : 13 - [5] : 20 - [6] : 7 - [7] : 1 - [8] : 7 - [9] : 1 - [10] : 1 - [11] : 19 - [12] : 16 - [13] : 13 - [14] : 5 - [15] : 4 - [16] : 4 - [17] : 5 - ] - start : [ - [0] : 0 - [1] : 0 - [2] : 14 - [3] : 0 - [4] : 0 - [5] : 14 - [6] : 35 - [7] : 0 - [8] : 0 - [9] : 0 - [10] : 0 - [11] : 0 - [12] : 20 - [13] : 37 - [14] : 0 - [15] : 0 - [16] : 0 - [17] : 0 - ] - } - title : -1 - } - ] - strings : [ - [0] : - [1] : windows-1252 - [2] : - [3] : #document - [4] : HTML - [5] : 400 - [6] : rgb(0, 0, 0) - [7] : HEAD - [8] : STYLE - [9] : #text - [10] : p { position: absolute; height: 200px; width: 200px; font: 10px Ahem; } .c1::first-letter { font-weight: lighter; color: green; } .c2::first-letter { font-weight: bold; color: blue; } .c2::before { counter-increment: square; content: 'square: ' counter(square) url(square.png) '! '; } ul { font: 10px Ahem; } - [11] : - [12] : SCRIPT - [13] : src - [14] : ../../resources/ahem.js - [15] : BODY - [16] : - [17] : P - [18] : class - [19] : c1 - [20] : ::first-letter - [21] : 100 - [22] : rgb(0, 128, 0) - [23] : I - [24] : first-letter - [25] : I have a first letter. - [26] : have a first letter. - [27] : SPAN - [28] : I have a first letter because of my parent. - [29] : have a first letter because of my parent. - [30] : c2 - [31] : 700 - [32] : rgb(0, 0, 255) - [33] : s - [34] : ::before - [35] : quare: - [36] : 1 - [37] : ! - [38] : before - [39] : I have some content before me with a first letter. - [40] : UL - [41] : LI - [42] : ::marker - [43] : marker - [44] : water - [45] : malt - [46] : hops - [47] : yeast - [48] : - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/stable/webexposed/css-properties-as-js-properties-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/stable/webexposed/css-properties-as-js-properties-expected.txt deleted file mode 100644 index 58f933d..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/stable/webexposed/css-properties-as-js-properties-expected.txt +++ /dev/null
@@ -1,607 +0,0 @@ -This test (crudely) documents Blink's web-exposed CSS properties. All changes to this list should go through Blink's feature review process: http://www.chromium.org/blink#new-features - - -accentColor -additiveSymbols -alignContent -alignItems -alignSelf -alignmentBaseline -all -animation -animationDelay -animationDirection -animationDuration -animationFillMode -animationIterationCount -animationName -animationPlayState -animationTimingFunction -appRegion -appearance -ascentOverride -aspectRatio -backdropFilter -backfaceVisibility -background -backgroundAttachment -backgroundBlendMode -backgroundClip -backgroundColor -backgroundImage -backgroundOrigin -backgroundPosition -backgroundPositionX -backgroundPositionY -backgroundRepeat -backgroundRepeatX -backgroundRepeatY -backgroundSize -basePalette -baselineShift -blockSize -border -borderBlock -borderBlockColor -borderBlockEnd -borderBlockEndColor -borderBlockEndStyle -borderBlockEndWidth -borderBlockStart -borderBlockStartColor -borderBlockStartStyle -borderBlockStartWidth -borderBlockStyle -borderBlockWidth -borderBottom -borderBottomColor -borderBottomLeftRadius -borderBottomRightRadius -borderBottomStyle -borderBottomWidth -borderCollapse -borderColor -borderEndEndRadius -borderEndStartRadius -borderImage -borderImageOutset -borderImageRepeat -borderImageSlice -borderImageSource -borderImageWidth -borderInline -borderInlineColor -borderInlineEnd -borderInlineEndColor -borderInlineEndStyle -borderInlineEndWidth -borderInlineStart -borderInlineStartColor -borderInlineStartStyle -borderInlineStartWidth -borderInlineStyle -borderInlineWidth -borderLeft -borderLeftColor -borderLeftStyle -borderLeftWidth -borderRadius -borderRight -borderRightColor -borderRightStyle -borderRightWidth -borderSpacing -borderStartEndRadius -borderStartStartRadius -borderStyle -borderTop -borderTopColor -borderTopLeftRadius -borderTopRightRadius -borderTopStyle -borderTopWidth -borderWidth -bottom -boxShadow -boxSizing -breakAfter -breakBefore -breakInside -bufferedRendering -captionSide -caretColor -clear -clip -clipPath -clipRule -color -colorInterpolation -colorInterpolationFilters -colorRendering -colorScheme -columnCount -columnFill -columnGap -columnRule -columnRuleColor -columnRuleStyle -columnRuleWidth -columnSpan -columnWidth -columns -contain -containIntrinsicBlockSize -containIntrinsicHeight -containIntrinsicInlineSize -containIntrinsicSize -containIntrinsicWidth -container -containerName -containerType -content -contentVisibility -counterIncrement -counterReset -counterSet -cssFloat -cssText -cursor -cx -cy -d -descentOverride -direction -display -dominantBaseline -emptyCells -fallback -fill -fillOpacity -fillRule -filter -flex -flexBasis -flexDirection -flexFlow -flexGrow -flexShrink -flexWrap -float -floodColor -floodOpacity -font -fontDisplay -fontFamily -fontFeatureSettings -fontKerning -fontOpticalSizing -fontPalette -fontSize -fontStretch -fontStyle -fontSynthesis -fontSynthesisSmallCaps -fontSynthesisStyle -fontSynthesisWeight -fontVariant -fontVariantAlternates -fontVariantCaps -fontVariantEastAsian -fontVariantLigatures -fontVariantNumeric -fontVariationSettings -fontWeight -forcedColorAdjust -gap -getPropertyPriority -getPropertyValue -grid -gridArea -gridAutoColumns -gridAutoFlow -gridAutoRows -gridColumn -gridColumnEnd -gridColumnGap -gridColumnStart -gridGap -gridRow -gridRowEnd -gridRowGap -gridRowStart -gridTemplate -gridTemplateAreas -gridTemplateColumns -gridTemplateRows -height -hyphenateCharacter -hyphenateLimitChars -hyphens -imageOrientation -imageRendering -inherits -initialValue -inlineSize -inset -insetBlock -insetBlockEnd -insetBlockStart -insetInline -insetInlineEnd -insetInlineStart -isolation -item -justifyContent -justifyItems -justifySelf -left -length -letterSpacing -lightingColor -lineBreak -lineGapOverride -lineHeight -listStyle -listStyleImage -listStylePosition -listStyleType -margin -marginBlock -marginBlockEnd -marginBlockStart -marginBottom -marginInline -marginInlineEnd -marginInlineStart -marginLeft -marginRight -marginTop -marker -markerEnd -markerMid -markerStart -mask -maskType -mathDepth -mathShift -mathStyle -maxBlockSize -maxHeight -maxInlineSize -maxWidth -minBlockSize -minHeight -minInlineSize -minWidth -mixBlendMode -negative -objectFit -objectPosition -objectViewBox -offset -offsetDistance -offsetPath -offsetRotate -opacity -order -orphans -outline -outlineColor -outlineOffset -outlineStyle -outlineWidth -overflow -overflowAnchor -overflowClipMargin -overflowWrap -overflowX -overflowY -overrideColors -overscrollBehavior -overscrollBehaviorBlock -overscrollBehaviorInline -overscrollBehaviorX -overscrollBehaviorY -pad -padding -paddingBlock -paddingBlockEnd -paddingBlockStart -paddingBottom -paddingInline -paddingInlineEnd -paddingInlineStart -paddingLeft -paddingRight -paddingTop -page -pageBreakAfter -pageBreakBefore -pageBreakInside -pageOrientation -paintOrder -parentRule -perspective -perspectiveOrigin -placeContent -placeItems -placeSelf -pointerEvents -position -prefix -quotes -r -range -removeProperty -resize -right -rotate -rowGap -rubyPosition -rx -ry -scale -scrollBehavior -scrollMargin -scrollMarginBlock -scrollMarginBlockEnd -scrollMarginBlockStart -scrollMarginBottom -scrollMarginInline -scrollMarginInlineEnd -scrollMarginInlineStart -scrollMarginLeft -scrollMarginRight -scrollMarginTop -scrollPadding -scrollPaddingBlock -scrollPaddingBlockEnd -scrollPaddingBlockStart -scrollPaddingBottom -scrollPaddingInline -scrollPaddingInlineEnd -scrollPaddingInlineStart -scrollPaddingLeft -scrollPaddingRight -scrollPaddingTop -scrollSnapAlign -scrollSnapStop -scrollSnapType -scrollbarGutter -setProperty -shapeImageThreshold -shapeMargin -shapeOutside -shapeRendering -size -sizeAdjust -speak -speakAs -src -stopColor -stopOpacity -stroke -strokeDasharray -strokeDashoffset -strokeLinecap -strokeLinejoin -strokeMiterlimit -strokeOpacity -strokeWidth -suffix -symbols -syntax -system -tabSize -tableLayout -textAlign -textAlignLast -textAnchor -textCombineUpright -textDecoration -textDecorationColor -textDecorationLine -textDecorationSkipInk -textDecorationStyle -textDecorationThickness -textEmphasis -textEmphasisColor -textEmphasisPosition -textEmphasisStyle -textIndent -textOrientation -textOverflow -textRendering -textShadow -textSizeAdjust -textTransform -textUnderlineOffset -textUnderlinePosition -top -touchAction -transform -transformBox -transformOrigin -transformStyle -transition -transitionDelay -transitionDuration -transitionProperty -transitionTimingFunction -translate -unicodeBidi -unicodeRange -userSelect -vectorEffect -verticalAlign -visibility -webkitAlignContent -webkitAlignItems -webkitAlignSelf -webkitAnimation -webkitAnimationDelay -webkitAnimationDirection -webkitAnimationDuration -webkitAnimationFillMode -webkitAnimationIterationCount -webkitAnimationName -webkitAnimationPlayState -webkitAnimationTimingFunction -webkitAppRegion -webkitAppearance -webkitBackfaceVisibility -webkitBackgroundClip -webkitBackgroundOrigin -webkitBackgroundSize -webkitBorderAfter -webkitBorderAfterColor -webkitBorderAfterStyle -webkitBorderAfterWidth -webkitBorderBefore -webkitBorderBeforeColor -webkitBorderBeforeStyle -webkitBorderBeforeWidth -webkitBorderBottomLeftRadius -webkitBorderBottomRightRadius -webkitBorderEnd -webkitBorderEndColor -webkitBorderEndStyle -webkitBorderEndWidth -webkitBorderHorizontalSpacing -webkitBorderImage -webkitBorderRadius -webkitBorderStart -webkitBorderStartColor -webkitBorderStartStyle -webkitBorderStartWidth -webkitBorderTopLeftRadius -webkitBorderTopRightRadius -webkitBorderVerticalSpacing -webkitBoxAlign -webkitBoxDecorationBreak -webkitBoxDirection -webkitBoxFlex -webkitBoxOrdinalGroup -webkitBoxOrient -webkitBoxPack -webkitBoxReflect -webkitBoxShadow -webkitBoxSizing -webkitClipPath -webkitColumnBreakAfter -webkitColumnBreakBefore -webkitColumnBreakInside -webkitColumnCount -webkitColumnGap -webkitColumnRule -webkitColumnRuleColor -webkitColumnRuleStyle -webkitColumnRuleWidth -webkitColumnSpan -webkitColumnWidth -webkitColumns -webkitFilter -webkitFlex -webkitFlexBasis -webkitFlexDirection -webkitFlexFlow -webkitFlexGrow -webkitFlexShrink -webkitFlexWrap -webkitFontFeatureSettings -webkitFontSmoothing -webkitHighlight -webkitHyphenateCharacter -webkitJustifyContent -webkitLineBreak -webkitLineClamp -webkitLocale -webkitLogicalHeight -webkitLogicalWidth -webkitMarginAfter -webkitMarginBefore -webkitMarginEnd -webkitMarginStart -webkitMask -webkitMaskBoxImage -webkitMaskBoxImageOutset -webkitMaskBoxImageRepeat -webkitMaskBoxImageSlice -webkitMaskBoxImageSource -webkitMaskBoxImageWidth -webkitMaskClip -webkitMaskComposite -webkitMaskImage -webkitMaskOrigin -webkitMaskPosition -webkitMaskPositionX -webkitMaskPositionY -webkitMaskRepeat -webkitMaskRepeatX -webkitMaskRepeatY -webkitMaskSize -webkitMaxLogicalHeight -webkitMaxLogicalWidth -webkitMinLogicalHeight -webkitMinLogicalWidth -webkitOpacity -webkitOrder -webkitPaddingAfter -webkitPaddingBefore -webkitPaddingEnd -webkitPaddingStart -webkitPerspective -webkitPerspectiveOrigin -webkitPerspectiveOriginX -webkitPerspectiveOriginY -webkitPrintColorAdjust -webkitRtlOrdering -webkitRubyPosition -webkitShapeImageThreshold -webkitShapeMargin -webkitShapeOutside -webkitTapHighlightColor -webkitTextCombine -webkitTextDecorationsInEffect -webkitTextEmphasis -webkitTextEmphasisColor -webkitTextEmphasisPosition -webkitTextEmphasisStyle -webkitTextFillColor -webkitTextOrientation -webkitTextSecurity -webkitTextSizeAdjust -webkitTextStroke -webkitTextStrokeColor -webkitTextStrokeWidth -webkitTransform -webkitTransformOrigin -webkitTransformOriginX -webkitTransformOriginY -webkitTransformOriginZ -webkitTransformStyle -webkitTransition -webkitTransitionDelay -webkitTransitionDuration -webkitTransitionProperty -webkitTransitionTimingFunction -webkitUserDrag -webkitUserModify -webkitUserSelect -webkitWritingMode -whiteSpace -widows -width -willChange -wordBreak -wordSpacing -wordWrap -writingMode -x -y -zIndex -zoom -PASS successfullyParsed is true - -TEST COMPLETE -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/stable/webexposed/css-property-listing-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/stable/webexposed/css-property-listing-expected.txt deleted file mode 100644 index fbcfdd0..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/stable/webexposed/css-property-listing-expected.txt +++ /dev/null
@@ -1,957 +0,0 @@ -This test documents Blink's web-exposed CSS properties. -All changes to this list should go through Blink's feature review process: http://www.chromium.org/blink#new-features - -[LONGHANDS] - -webkit-border-horizontal-spacing - -webkit-border-image - -webkit-border-vertical-spacing - -webkit-box-align - -webkit-box-decoration-break - -webkit-box-direction - -webkit-box-flex - -webkit-box-ordinal-group - -webkit-box-orient - -webkit-box-pack - -webkit-box-reflect - -webkit-font-smoothing - -webkit-highlight - -webkit-line-break - -webkit-line-clamp - -webkit-locale - -webkit-mask-box-image-outset - -webkit-mask-box-image-repeat - -webkit-mask-box-image-slice - -webkit-mask-box-image-source - -webkit-mask-box-image-width - -webkit-mask-clip - -webkit-mask-composite - -webkit-mask-image - -webkit-mask-origin - -webkit-mask-position-x - -webkit-mask-position-y - -webkit-mask-repeat-x - -webkit-mask-repeat-y - -webkit-mask-size - -webkit-perspective-origin-x - -webkit-perspective-origin-y - -webkit-print-color-adjust - -webkit-rtl-ordering - -webkit-ruby-position - -webkit-tap-highlight-color - -webkit-text-combine - -webkit-text-decorations-in-effect - -webkit-text-fill-color - -webkit-text-orientation - -webkit-text-security - -webkit-text-stroke-color - -webkit-text-stroke-width - -webkit-transform-origin-x - -webkit-transform-origin-y - -webkit-transform-origin-z - -webkit-user-drag - -webkit-user-modify - -webkit-writing-mode - accent-color - align-content - align-items - align-self - alignment-baseline - all - animation-delay - animation-direction - animation-duration - animation-fill-mode - animation-iteration-count - animation-name - animation-play-state - animation-timing-function - app-region - appearance - aspect-ratio - backdrop-filter - backface-visibility - background-attachment - background-blend-mode - background-clip - background-color - background-image - background-origin - background-position-x - background-position-y - background-repeat-x - background-repeat-y - background-size - baseline-shift - block-size - border-block-end-color - border-block-end-style - border-block-end-width - border-block-start-color - border-block-start-style - border-block-start-width - border-bottom-color - border-bottom-left-radius - border-bottom-right-radius - border-bottom-style - border-bottom-width - border-collapse - border-end-end-radius - border-end-start-radius - border-image-outset - border-image-repeat - border-image-slice - border-image-source - border-image-width - border-inline-end-color - border-inline-end-style - border-inline-end-width - border-inline-start-color - border-inline-start-style - border-inline-start-width - border-left-color - border-left-style - border-left-width - border-right-color - border-right-style - border-right-width - border-start-end-radius - border-start-start-radius - border-top-color - border-top-left-radius - border-top-right-radius - border-top-style - border-top-width - bottom - box-shadow - box-sizing - break-after - break-before - break-inside - buffered-rendering - caption-side - caret-color - clear - clip - clip-path - clip-rule - color - color-interpolation - color-interpolation-filters - color-rendering - color-scheme - column-count - column-fill - column-gap - column-rule-color - column-rule-style - column-rule-width - column-span - column-width - contain - contain-intrinsic-block-size - contain-intrinsic-height - contain-intrinsic-inline-size - contain-intrinsic-width - container-name - container-type - content - content-visibility - counter-increment - counter-reset - counter-set - cursor - cx - cy - d - direction - display - dominant-baseline - empty-cells - fill - fill-opacity - fill-rule - filter - flex-basis - flex-direction - flex-grow - flex-shrink - flex-wrap - float - flood-color - flood-opacity - font-family - font-feature-settings - font-kerning - font-optical-sizing - font-palette - font-size - font-stretch - font-style - font-synthesis-small-caps - font-synthesis-style - font-synthesis-weight - font-variant-alternates - font-variant-caps - font-variant-east-asian - font-variant-ligatures - font-variant-numeric - font-variation-settings - font-weight - forced-color-adjust - grid-auto-columns - grid-auto-flow - grid-auto-rows - grid-column-end - grid-column-start - grid-row-end - grid-row-start - grid-template-areas - grid-template-columns - grid-template-rows - height - hyphenate-character - hyphenate-limit-chars - hyphens - image-orientation - image-rendering - inline-size - inset-block-end - inset-block-start - inset-inline-end - inset-inline-start - isolation - justify-content - justify-items - justify-self - left - letter-spacing - lighting-color - line-break - line-height - list-style-image - list-style-position - list-style-type - margin-block-end - margin-block-start - margin-bottom - margin-inline-end - margin-inline-start - margin-left - margin-right - margin-top - marker-end - marker-mid - marker-start - mask - mask-type - math-depth - math-shift - math-style - max-block-size - max-height - max-inline-size - max-width - min-block-size - min-height - min-inline-size - min-width - mix-blend-mode - object-fit - object-position - object-view-box - offset-distance - offset-path - offset-rotate - opacity - order - orphans - outline-color - outline-offset - outline-style - outline-width - overflow-anchor - overflow-clip-margin - overflow-wrap - overflow-x - overflow-y - overscroll-behavior-block - overscroll-behavior-inline - overscroll-behavior-x - overscroll-behavior-y - padding-block-end - padding-block-start - padding-bottom - padding-inline-end - padding-inline-start - padding-left - padding-right - padding-top - page - page-orientation - paint-order - perspective - perspective-origin - pointer-events - position - quotes - r - resize - right - rotate - row-gap - ruby-position - rx - ry - scale - scroll-behavior - scroll-margin-block-end - scroll-margin-block-start - scroll-margin-bottom - scroll-margin-inline-end - scroll-margin-inline-start - scroll-margin-left - scroll-margin-right - scroll-margin-top - scroll-padding-block-end - scroll-padding-block-start - scroll-padding-bottom - scroll-padding-inline-end - scroll-padding-inline-start - scroll-padding-left - scroll-padding-right - scroll-padding-top - scroll-snap-align - scroll-snap-stop - scroll-snap-type - scrollbar-gutter - shape-image-threshold - shape-margin - shape-outside - shape-rendering - size - speak - stop-color - stop-opacity - stroke - stroke-dasharray - stroke-dashoffset - stroke-linecap - stroke-linejoin - stroke-miterlimit - stroke-opacity - stroke-width - tab-size - table-layout - text-align - text-align-last - text-anchor - text-combine-upright - text-decoration-color - text-decoration-line - text-decoration-skip-ink - text-decoration-style - text-decoration-thickness - text-emphasis-color - text-emphasis-position - text-emphasis-style - text-indent - text-orientation - text-overflow - text-rendering - text-shadow - text-size-adjust - text-transform - text-underline-offset - text-underline-position - top - touch-action - transform - transform-box - transform-origin - transform-style - transition-delay - transition-duration - transition-property - transition-timing-function - translate - unicode-bidi - user-select - vector-effect - vertical-align - visibility - white-space - widows - width - will-change - word-break - word-spacing - writing-mode - x - y - z-index - zoom - -[SHORTHANDS] - -webkit-column-break-after - break-after - -webkit-column-break-before - break-before - -webkit-column-break-inside - break-inside - -webkit-mask - -webkit-mask-clip - -webkit-mask-image - -webkit-mask-origin - -webkit-mask-position-x - -webkit-mask-position-y - -webkit-mask-repeat-x - -webkit-mask-repeat-y - -webkit-mask-size - -webkit-mask-box-image - -webkit-mask-box-image-outset - -webkit-mask-box-image-repeat - -webkit-mask-box-image-slice - -webkit-mask-box-image-source - -webkit-mask-box-image-width - -webkit-mask-position - -webkit-mask-position-x - -webkit-mask-position-y - -webkit-mask-repeat - -webkit-mask-repeat-x - -webkit-mask-repeat-y - -webkit-text-stroke - -webkit-text-stroke-color - -webkit-text-stroke-width - animation - animation-delay - animation-direction - animation-duration - animation-fill-mode - animation-iteration-count - animation-name - animation-play-state - animation-timing-function - background - background-attachment - background-clip - background-color - background-image - background-origin - background-position-x - background-position-y - background-repeat-x - background-repeat-y - background-size - background-position - background-position-x - background-position-y - background-repeat - background-repeat-x - background-repeat-y - border - border-bottom-color - border-bottom-style - border-bottom-width - border-image-outset - border-image-repeat - border-image-slice - border-image-source - border-image-width - border-left-color - border-left-style - border-left-width - border-right-color - border-right-style - border-right-width - border-top-color - border-top-style - border-top-width - border-block - border-block-end-color - border-block-end-style - border-block-end-width - border-block-start-color - border-block-start-style - border-block-start-width - border-block-color - border-block-end-color - border-block-start-color - border-block-end - border-block-end-color - border-block-end-style - border-block-end-width - border-block-start - border-block-start-color - border-block-start-style - border-block-start-width - border-block-style - border-block-end-style - border-block-start-style - border-block-width - border-block-end-width - border-block-start-width - border-bottom - border-bottom-color - border-bottom-style - border-bottom-width - border-color - border-bottom-color - border-left-color - border-right-color - border-top-color - border-image - border-image-outset - border-image-repeat - border-image-slice - border-image-source - border-image-width - border-inline - border-inline-end-color - border-inline-end-style - border-inline-end-width - border-inline-start-color - border-inline-start-style - border-inline-start-width - border-inline-color - border-inline-end-color - border-inline-start-color - border-inline-end - border-inline-end-color - border-inline-end-style - border-inline-end-width - border-inline-start - border-inline-start-color - border-inline-start-style - border-inline-start-width - border-inline-style - border-inline-end-style - border-inline-start-style - border-inline-width - border-inline-end-width - border-inline-start-width - border-left - border-left-color - border-left-style - border-left-width - border-radius - border-bottom-left-radius - border-bottom-right-radius - border-top-left-radius - border-top-right-radius - border-right - border-right-color - border-right-style - border-right-width - border-spacing - -webkit-border-horizontal-spacing - -webkit-border-vertical-spacing - border-style - border-bottom-style - border-left-style - border-right-style - border-top-style - border-top - border-top-color - border-top-style - border-top-width - border-width - border-bottom-width - border-left-width - border-right-width - border-top-width - column-rule - column-rule-color - column-rule-style - column-rule-width - columns - column-count - column-width - contain-intrinsic-size - contain-intrinsic-height - contain-intrinsic-width - container - container-name - container-type - flex - flex-basis - flex-grow - flex-shrink - flex-flow - flex-direction - flex-wrap - font - font-family - font-size - font-stretch - font-style - font-variant-alternates - font-variant-caps - font-variant-east-asian - font-variant-ligatures - font-variant-numeric - font-weight - line-height - font-synthesis - font-synthesis-small-caps - font-synthesis-style - font-synthesis-weight - font-variant - font-variant-alternates - font-variant-caps - font-variant-east-asian - font-variant-ligatures - font-variant-numeric - gap - column-gap - row-gap - grid - grid-auto-columns - grid-auto-flow - grid-auto-rows - grid-template-areas - grid-template-columns - grid-template-rows - grid-area - grid-column-end - grid-column-start - grid-row-end - grid-row-start - grid-column - grid-column-end - grid-column-start - grid-column-gap - column-gap - grid-gap - column-gap - row-gap - grid-row - grid-row-end - grid-row-start - grid-row-gap - row-gap - grid-template - grid-template-areas - grid-template-columns - grid-template-rows - inset - bottom - left - right - top - inset-block - inset-block-end - inset-block-start - inset-inline - inset-inline-end - inset-inline-start - list-style - list-style-image - list-style-position - list-style-type - margin - margin-bottom - margin-left - margin-right - margin-top - margin-block - margin-block-end - margin-block-start - margin-inline - margin-inline-end - margin-inline-start - marker - marker-end - marker-mid - marker-start - offset - offset-distance - offset-path - offset-rotate - outline - outline-color - outline-style - outline-width - overflow - overflow-x - overflow-y - overscroll-behavior - overscroll-behavior-x - overscroll-behavior-y - padding - padding-bottom - padding-left - padding-right - padding-top - padding-block - padding-block-end - padding-block-start - padding-inline - padding-inline-end - padding-inline-start - page-break-after - break-after - page-break-before - break-before - page-break-inside - break-inside - place-content - align-content - justify-content - place-items - align-items - justify-items - place-self - align-self - justify-self - scroll-margin - scroll-margin-bottom - scroll-margin-left - scroll-margin-right - scroll-margin-top - scroll-margin-block - scroll-margin-block-end - scroll-margin-block-start - scroll-margin-inline - scroll-margin-inline-end - scroll-margin-inline-start - scroll-padding - scroll-padding-bottom - scroll-padding-left - scroll-padding-right - scroll-padding-top - scroll-padding-block - scroll-padding-block-end - scroll-padding-block-start - scroll-padding-inline - scroll-padding-inline-end - scroll-padding-inline-start - text-decoration - text-decoration-color - text-decoration-line - text-decoration-style - text-decoration-thickness - text-emphasis - text-emphasis-color - text-emphasis-style - transition - transition-delay - transition-duration - transition-property - transition-timing-function - -[ALIASES] - -epub-caption-side - caption-side - -epub-text-combine - -webkit-text-combine - -epub-text-emphasis - text-emphasis - -epub-text-emphasis-color - text-emphasis-color - -epub-text-emphasis-style - text-emphasis-style - -epub-text-orientation - -webkit-text-orientation - -epub-text-transform - text-transform - -epub-word-break - word-break - -epub-writing-mode - -webkit-writing-mode - -webkit-align-content - align-content - -webkit-align-items - align-items - -webkit-align-self - align-self - -webkit-animation - animation - -webkit-animation-delay - animation-delay - -webkit-animation-direction - animation-direction - -webkit-animation-duration - animation-duration - -webkit-animation-fill-mode - animation-fill-mode - -webkit-animation-iteration-count - animation-iteration-count - -webkit-animation-name - animation-name - -webkit-animation-play-state - animation-play-state - -webkit-animation-timing-function - animation-timing-function - -webkit-app-region - app-region - -webkit-appearance - appearance - -webkit-backface-visibility - backface-visibility - -webkit-background-clip - background-clip - -webkit-background-origin - background-origin - -webkit-background-size - background-size - -webkit-border-after - border-block-end - -webkit-border-after-color - border-block-end-color - -webkit-border-after-style - border-block-end-style - -webkit-border-after-width - border-block-end-width - -webkit-border-before - border-block-start - -webkit-border-before-color - border-block-start-color - -webkit-border-before-style - border-block-start-style - -webkit-border-before-width - border-block-start-width - -webkit-border-bottom-left-radius - border-bottom-left-radius - -webkit-border-bottom-right-radius - border-bottom-right-radius - -webkit-border-end - border-inline-end - -webkit-border-end-color - border-inline-end-color - -webkit-border-end-style - border-inline-end-style - -webkit-border-end-width - border-inline-end-width - -webkit-border-radius - border-radius - -webkit-border-start - border-inline-start - -webkit-border-start-color - border-inline-start-color - -webkit-border-start-style - border-inline-start-style - -webkit-border-start-width - border-inline-start-width - -webkit-border-top-left-radius - border-top-left-radius - -webkit-border-top-right-radius - border-top-right-radius - -webkit-box-shadow - box-shadow - -webkit-box-sizing - box-sizing - -webkit-clip-path - clip-path - -webkit-column-count - column-count - -webkit-column-gap - column-gap - -webkit-column-rule - column-rule - -webkit-column-rule-color - column-rule-color - -webkit-column-rule-style - column-rule-style - -webkit-column-rule-width - column-rule-width - -webkit-column-span - column-span - -webkit-column-width - column-width - -webkit-columns - columns - -webkit-filter - filter - -webkit-flex - flex - -webkit-flex-basis - flex-basis - -webkit-flex-direction - flex-direction - -webkit-flex-flow - flex-flow - -webkit-flex-grow - flex-grow - -webkit-flex-shrink - flex-shrink - -webkit-flex-wrap - flex-wrap - -webkit-font-feature-settings - font-feature-settings - -webkit-hyphenate-character - hyphenate-character - -webkit-justify-content - justify-content - -webkit-logical-height - block-size - -webkit-logical-width - inline-size - -webkit-margin-after - margin-block-end - -webkit-margin-before - margin-block-start - -webkit-margin-end - margin-inline-end - -webkit-margin-start - margin-inline-start - -webkit-max-logical-height - max-block-size - -webkit-max-logical-width - max-inline-size - -webkit-min-logical-height - min-block-size - -webkit-min-logical-width - min-inline-size - -webkit-opacity - opacity - -webkit-order - order - -webkit-padding-after - padding-block-end - -webkit-padding-before - padding-block-start - -webkit-padding-end - padding-inline-end - -webkit-padding-start - padding-inline-start - -webkit-perspective - perspective - -webkit-perspective-origin - perspective-origin - -webkit-shape-image-threshold - shape-image-threshold - -webkit-shape-margin - shape-margin - -webkit-shape-outside - shape-outside - -webkit-text-emphasis - text-emphasis - -webkit-text-emphasis-color - text-emphasis-color - -webkit-text-emphasis-position - text-emphasis-position - -webkit-text-emphasis-style - text-emphasis-style - -webkit-text-size-adjust - text-size-adjust - -webkit-transform - transform - -webkit-transform-origin - transform-origin - -webkit-transform-style - transform-style - -webkit-transition - transition - -webkit-transition-delay - transition-delay - -webkit-transition-duration - transition-duration - -webkit-transition-property - transition-property - -webkit-transition-timing-function - transition-timing-function - -webkit-user-select - user-select - word-wrap - overflow-wrap -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/atomic-inline-before-ellipsis-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/atomic-inline-before-ellipsis-expected.png deleted file mode 100644 index 8e9264c5..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/atomic-inline-before-ellipsis-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/basic/007-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/basic/007-expected.png deleted file mode 100644 index bb3789a..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/basic/007-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/basic/009-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/basic/009-expected.png deleted file mode 100644 index 473dfde..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/basic/009-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/basic/013-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/basic/013-expected.png deleted file mode 100644 index b7ad34c..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/basic/013-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/basic/015-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/basic/015-expected.png deleted file mode 100644 index 1b3e1f9c..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/basic/015-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/capitalize-boundaries-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/capitalize-boundaries-expected.png deleted file mode 100644 index 2e73d98..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/capitalize-boundaries-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/color-emoji-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/color-emoji-expected.png deleted file mode 100644 index 2a4a8ebb..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/color-emoji-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/decorations-with-text-combine-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/decorations-with-text-combine-expected.png deleted file mode 100644 index 9179fae..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/decorations-with-text-combine-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/drawBidiText-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/drawBidiText-expected.png deleted file mode 100644 index 8b7031e7..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/drawBidiText-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/ellipsis-at-edge-of-ltr-text-in-rtl-flow-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/ellipsis-at-edge-of-ltr-text-in-rtl-flow-expected.png deleted file mode 100644 index 3ded8b1..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/ellipsis-at-edge-of-ltr-text-in-rtl-flow-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/ellipsis-at-edge-of-rtl-text-in-ltr-flow-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/ellipsis-at-edge-of-rtl-text-in-ltr-flow-expected.png deleted file mode 100644 index d7248bf..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/ellipsis-at-edge-of-rtl-text-in-ltr-flow-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/ellipsis-in-absolute-block-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/ellipsis-in-absolute-block-expected.png deleted file mode 100644 index 21531901..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/ellipsis-in-absolute-block-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/ellipsis-ltr-text-in-rtl-flow-leading-space-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/ellipsis-ltr-text-in-rtl-flow-leading-space-expected.png deleted file mode 100644 index 2209017..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/ellipsis-ltr-text-in-rtl-flow-leading-space-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/ellipsis-ltr-text-in-rtl-flow-underline-composition-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/ellipsis-ltr-text-in-rtl-flow-underline-composition-expected.png deleted file mode 100644 index 8ce6012..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/ellipsis-ltr-text-in-rtl-flow-underline-composition-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/ellipsis-mixed-text-in-ltr-flow-underline-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/ellipsis-mixed-text-in-ltr-flow-underline-expected.png deleted file mode 100644 index 3dfd14f..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/ellipsis-mixed-text-in-ltr-flow-underline-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/ellipsis-mixed-text-in-rtl-flow-underline-2-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/ellipsis-mixed-text-in-rtl-flow-underline-2-expected.png deleted file mode 100644 index 0351d02b..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/ellipsis-mixed-text-in-rtl-flow-underline-2-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/ellipsis-rtl-text-in-rtl-flow-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/ellipsis-rtl-text-in-rtl-flow-expected.png deleted file mode 100644 index 2ccd6f8..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/ellipsis-rtl-text-in-rtl-flow-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/ellipsis-rtl-text-in-rtl-flow-underline-composition-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/ellipsis-rtl-text-in-rtl-flow-underline-composition-expected.png deleted file mode 100644 index d3fc153e..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/ellipsis-rtl-text-in-rtl-flow-underline-composition-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/ellipsis-rtl-text-in-rtl-flow-underline-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/ellipsis-rtl-text-in-rtl-flow-underline-expected.png deleted file mode 100644 index 89bae7b..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/ellipsis-rtl-text-in-rtl-flow-underline-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/emoticons-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/emoticons-expected.png deleted file mode 100644 index edaffd15..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/emoticons-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/emphasis-ellipsis-complextext-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/emphasis-ellipsis-complextext-expected.png deleted file mode 100644 index 3fb5def..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/emphasis-ellipsis-complextext-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/emphasis-vertical-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/emphasis-vertical-expected.png deleted file mode 100644 index 8b70cb4..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/emphasis-vertical-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/fake-italic-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/fake-italic-expected.png deleted file mode 100644 index 6e67c9bc..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/fake-italic-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/fallback-for-custom-font-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/fallback-for-custom-font-expected.png deleted file mode 100644 index 2751edf..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/fallback-for-custom-font-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/font-features/caps-native-synthesis-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/font-features/caps-native-synthesis-expected.png deleted file mode 100644 index dddeacbe..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/font-features/caps-native-synthesis-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/font-stretch-variant-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/font-stretch-variant-expected.png deleted file mode 100644 index 8134011..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/font-stretch-variant-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/hide-atomic-inlines-after-ellipsis-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/hide-atomic-inlines-after-ellipsis-expected.png deleted file mode 100644 index 8bde08f..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/hide-atomic-inlines-after-ellipsis-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/international/003-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/international/003-expected.png deleted file mode 100644 index 6e986a097..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/international/003-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/international/bidi-CS-after-AN-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/international/bidi-CS-after-AN-expected.png deleted file mode 100644 index da0414d5..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/international/bidi-CS-after-AN-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/international/bidi-LDB-2-CSS-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/international/bidi-LDB-2-CSS-expected.png deleted file mode 100644 index 6ad19d75a..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/international/bidi-LDB-2-CSS-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/international/bidi-LDB-2-HTML-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/international/bidi-LDB-2-HTML-expected.png deleted file mode 100644 index 4c1a0c0..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/international/bidi-LDB-2-HTML-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/international/bidi-LDB-2-formatting-characters-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/international/bidi-LDB-2-formatting-characters-expected.png deleted file mode 100644 index 8073cc9..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/international/bidi-LDB-2-formatting-characters-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/international/bidi-ignored-for-first-child-inline-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/international/bidi-ignored-for-first-child-inline-expected.png deleted file mode 100644 index d87c632..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/international/bidi-ignored-for-first-child-inline-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/international/bidi-innertext-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/international/bidi-innertext-expected.png deleted file mode 100644 index ce29e35..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/international/bidi-innertext-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/international/bidi-linebreak-001-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/international/bidi-linebreak-001-expected.png deleted file mode 100644 index fba79c2d6..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/international/bidi-linebreak-001-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/international/bidi-linebreak-002-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/international/bidi-linebreak-002-expected.png deleted file mode 100644 index dc9aaa2..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/international/bidi-linebreak-002-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/international/bidi-linebreak-003-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/international/bidi-linebreak-003-expected.png deleted file mode 100644 index dc9aaa2..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/international/bidi-linebreak-003-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/international/bidi-listbox-atsui-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/international/bidi-listbox-atsui-expected.png deleted file mode 100644 index 1038705..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/international/bidi-listbox-atsui-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/international/bidi-mirror-he-ar-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/international/bidi-mirror-he-ar-expected.png deleted file mode 100644 index f0c4808c..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/international/bidi-mirror-he-ar-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/international/bidi-neutral-directionality-paragraph-start-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/international/bidi-neutral-directionality-paragraph-start-expected.png deleted file mode 100644 index 9a52031..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/international/bidi-neutral-directionality-paragraph-start-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/international/hindi-whitespace-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/international/hindi-whitespace-expected.png deleted file mode 100644 index e5f7776..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/international/hindi-whitespace-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/international/plane2-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/international/plane2-expected.png deleted file mode 100644 index 2e923495..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/international/plane2-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/international/rtl-white-space-pre-wrap-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/international/rtl-white-space-pre-wrap-expected.png deleted file mode 100644 index 5b2eded..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/international/rtl-white-space-pre-wrap-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/international/shape-across-elements-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/international/shape-across-elements-expected.txt deleted file mode 100644 index df204ba..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/international/shape-across-elements-expected.txt +++ /dev/null
@@ -1,11 +0,0 @@ -FAIL Width of isolated word should match width of word with markup. -FAIL Width of partial glyph in ligature should not match width of isolated glyph. -PASS successfullyParsed is true - -TEST COMPLETE - -Shape across element boundary test -سلام The word by itself. -سلام Adding a span around a character that forms a ligature. Should render the same as the above, except that half of the middle glyph should be red. -سلام Same word with a ZWJ character to disallow the ligature. -ل The letter in red, in isolation.
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/international/text-combine-image-test-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/international/text-combine-image-test-expected.png deleted file mode 100644 index 0bf7cbd3..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/international/text-combine-image-test-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/international/thai-baht-space-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/international/thai-baht-space-expected.png deleted file mode 100644 index 08f8365..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/international/thai-baht-space-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/international/unicode-bidi-plaintext-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/international/unicode-bidi-plaintext-expected.png deleted file mode 100644 index 933ea41..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/international/unicode-bidi-plaintext-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/international/wrap-CJK-001-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/international/wrap-CJK-001-expected.png deleted file mode 100644 index 4c3e4b3..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/international/wrap-CJK-001-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/justify-ideograph-simple-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/justify-ideograph-simple-expected.png deleted file mode 100644 index 021fc177..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/justify-ideograph-simple-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/justify-ideograph-vertical-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/justify-ideograph-vertical-expected.png deleted file mode 100644 index 2b24cc1..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/justify-ideograph-vertical-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/letter-spacing-leading-and-trailing-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/letter-spacing-leading-and-trailing-expected.png deleted file mode 100644 index 7398e9e..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/letter-spacing-leading-and-trailing-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/line-breaks-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/line-breaks-expected.png deleted file mode 100644 index 397e16e..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/line-breaks-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/midword-break-before-surrogate-pair-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/midword-break-before-surrogate-pair-expected.png deleted file mode 100644 index f9515ba..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/midword-break-before-surrogate-pair-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/orientation-sideways-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/orientation-sideways-expected.png deleted file mode 100644 index 2a1501f6..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/orientation-sideways-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/place-ellipsis-in-inline-block-adjacent-float-2-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/place-ellipsis-in-inline-block-adjacent-float-2-expected.png deleted file mode 100644 index b457b61..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/place-ellipsis-in-inline-block-adjacent-float-2-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/place-ellipsis-in-inline-block-adjacent-float-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/place-ellipsis-in-inline-block-adjacent-float-expected.png deleted file mode 100644 index 37b0c0d..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/place-ellipsis-in-inline-block-adjacent-float-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/place-ellipsis-in-inline-blocks-2-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/place-ellipsis-in-inline-blocks-2-expected.png deleted file mode 100644 index 78c1861f..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/place-ellipsis-in-inline-blocks-2-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/place-ellipsis-in-inline-blocks-align-center-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/place-ellipsis-in-inline-blocks-align-center-expected.png deleted file mode 100644 index 7999d0e8..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/place-ellipsis-in-inline-blocks-align-center-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/place-ellipsis-in-inline-blocks-align-justify-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/place-ellipsis-in-inline-blocks-align-justify-expected.png deleted file mode 100644 index 7999d0e8..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/place-ellipsis-in-inline-blocks-align-justify-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/place-ellipsis-in-inline-blocks-align-left-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/place-ellipsis-in-inline-blocks-align-left-expected.png deleted file mode 100644 index 7999d0e8..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/place-ellipsis-in-inline-blocks-align-left-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/place-ellipsis-in-inline-blocks-align-right-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/place-ellipsis-in-inline-blocks-align-right-expected.png deleted file mode 100644 index 7999d0e8..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/place-ellipsis-in-inline-blocks-align-right-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/place-ellipsis-in-inline-blocks-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/place-ellipsis-in-inline-blocks-expected.png deleted file mode 100644 index 7999d0e8..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/place-ellipsis-in-inline-blocks-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/place-mixed-ellipsis-in-inline-blocks-2-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/place-mixed-ellipsis-in-inline-blocks-2-expected.png deleted file mode 100644 index 9aea753..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/place-mixed-ellipsis-in-inline-blocks-2-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/place-mixed-ellipsis-in-inline-blocks-align-center-2-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/place-mixed-ellipsis-in-inline-blocks-align-center-2-expected.png deleted file mode 100644 index e93b020..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/place-mixed-ellipsis-in-inline-blocks-align-center-2-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/place-mixed-ellipsis-in-inline-blocks-align-center-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/place-mixed-ellipsis-in-inline-blocks-align-center-expected.png deleted file mode 100644 index 19049a0..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/place-mixed-ellipsis-in-inline-blocks-align-center-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/place-mixed-ellipsis-in-inline-blocks-align-justify-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/place-mixed-ellipsis-in-inline-blocks-align-justify-expected.png deleted file mode 100644 index dfe01cf..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/place-mixed-ellipsis-in-inline-blocks-align-justify-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/place-mixed-ellipsis-in-inline-blocks-align-left-2-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/place-mixed-ellipsis-in-inline-blocks-align-left-2-expected.png deleted file mode 100644 index 2bfd330..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/place-mixed-ellipsis-in-inline-blocks-align-left-2-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/place-mixed-ellipsis-in-inline-blocks-align-left-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/place-mixed-ellipsis-in-inline-blocks-align-left-expected.png deleted file mode 100644 index 7f23912..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/place-mixed-ellipsis-in-inline-blocks-align-left-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/place-mixed-ellipsis-in-inline-blocks-align-right-2-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/place-mixed-ellipsis-in-inline-blocks-align-right-2-expected.png deleted file mode 100644 index 3236f044..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/place-mixed-ellipsis-in-inline-blocks-align-right-2-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/place-mixed-ellipsis-in-inline-blocks-align-right-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/place-mixed-ellipsis-in-inline-blocks-align-right-expected.png deleted file mode 100644 index 299ee5b..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/place-mixed-ellipsis-in-inline-blocks-align-right-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/place-mixed-ellipsis-in-inline-blocks-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/place-mixed-ellipsis-in-inline-blocks-expected.png deleted file mode 100644 index dfe01cf..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/place-mixed-ellipsis-in-inline-blocks-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/place-rtl-ellipsis-in-inline-blocks-2-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/place-rtl-ellipsis-in-inline-blocks-2-expected.png deleted file mode 100644 index 956bb3b..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/place-rtl-ellipsis-in-inline-blocks-2-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/place-rtl-ellipsis-in-inline-blocks-align-center-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/place-rtl-ellipsis-in-inline-blocks-align-center-expected.png deleted file mode 100644 index a71336bf..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/place-rtl-ellipsis-in-inline-blocks-align-center-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/place-rtl-ellipsis-in-inline-blocks-align-justify-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/place-rtl-ellipsis-in-inline-blocks-align-justify-expected.png deleted file mode 100644 index a71336bf..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/place-rtl-ellipsis-in-inline-blocks-align-justify-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/place-rtl-ellipsis-in-inline-blocks-align-left-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/place-rtl-ellipsis-in-inline-blocks-align-left-expected.png deleted file mode 100644 index a71336bf..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/place-rtl-ellipsis-in-inline-blocks-align-left-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/place-rtl-ellipsis-in-inline-blocks-align-right-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/place-rtl-ellipsis-in-inline-blocks-align-right-expected.png deleted file mode 100644 index a71336bf..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/place-rtl-ellipsis-in-inline-blocks-align-right-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/place-rtl-ellipsis-in-inline-blocks-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/place-rtl-ellipsis-in-inline-blocks-expected.png deleted file mode 100644 index a71336bf..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/place-rtl-ellipsis-in-inline-blocks-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/selection/atsui-kerning-and-ligatures-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/selection/atsui-kerning-and-ligatures-expected.png deleted file mode 100644 index 14b1fdb..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/selection/atsui-kerning-and-ligatures-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/selection/atsui-rtl-override-selection-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/selection/atsui-rtl-override-selection-expected.png deleted file mode 100644 index 6295980d..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/selection/atsui-rtl-override-selection-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/selection/complex-text-rtl-selection-repaint-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/selection/complex-text-rtl-selection-repaint-expected.png deleted file mode 100644 index 289f4e8..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/selection/complex-text-rtl-selection-repaint-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/selection/emphasis-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/selection/emphasis-expected.png deleted file mode 100644 index c2128da..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/selection/emphasis-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/selection/flexbox-selection-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/selection/flexbox-selection-expected.png deleted file mode 100644 index 34af46a..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/selection/flexbox-selection-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/selection/flexbox-selection-nested-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/selection/flexbox-selection-nested-expected.png deleted file mode 100644 index cbcfc0a1..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/selection/flexbox-selection-nested-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/selection/justified-selection-at-edge-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/selection/justified-selection-at-edge-expected.png deleted file mode 100644 index a68afa7..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/selection/justified-selection-at-edge-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/selection/justified-selection-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/selection/justified-selection-expected.png deleted file mode 100644 index 14a6be57..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/selection/justified-selection-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/selection/khmer-selection-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/selection/khmer-selection-expected.png deleted file mode 100644 index fa9f850..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/selection/khmer-selection-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/selection/mixed-directionality-selection-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/selection/mixed-directionality-selection-expected.png deleted file mode 100644 index b3efee6f..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/selection/mixed-directionality-selection-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/selection/select-ligature-2-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/selection/select-ligature-2-expected.png deleted file mode 100644 index 25dae2ca..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/selection/select-ligature-2-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/selection/select-ligature-3-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/selection/select-ligature-3-expected.png deleted file mode 100644 index 2c52845c..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/selection/select-ligature-3-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/selection/select-ligature-vertical-2-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/selection/select-ligature-vertical-2-expected.png deleted file mode 100644 index d026cfb4..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/selection/select-ligature-vertical-2-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/selection/select-ligature-vertical-3-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/selection/select-ligature-vertical-3-expected.png deleted file mode 100644 index 61937c5..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/selection/select-ligature-vertical-3-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/selection/selection-hard-linebreak-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/selection/selection-hard-linebreak-expected.png deleted file mode 100644 index c1c4346..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/selection/selection-hard-linebreak-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/selection/selection-multiple-runs-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/selection/selection-multiple-runs-expected.png deleted file mode 100644 index 35180ca..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/selection/selection-multiple-runs-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/selection/selection-painting-hidpi-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/selection/selection-painting-hidpi-expected.png deleted file mode 100644 index 4a39d90..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/selection/selection-painting-hidpi-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/selection/selection-rect-line-height-too-big-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/selection/selection-rect-line-height-too-big-expected.png deleted file mode 100644 index d8b8ab5..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/selection/selection-rect-line-height-too-big-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/selection/selection-with-inline-padding-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/selection/selection-with-inline-padding-expected.png deleted file mode 100644 index 763927911..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/selection/selection-with-inline-padding-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/selection/shaping-selection-rect-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/selection/shaping-selection-rect-expected.png deleted file mode 100644 index 34471ec..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/selection/shaping-selection-rect-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/selection/should-use-atsui-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/selection/should-use-atsui-expected.png deleted file mode 100644 index e332715..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/selection/should-use-atsui-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/shaping/same-script-different-lang-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/shaping/same-script-different-lang-expected.png deleted file mode 100644 index 4216585..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/shaping/same-script-different-lang-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/stroking-decorations-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/stroking-decorations-expected.png deleted file mode 100644 index 1ce47d45..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/stroking-decorations-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/sub-pixel/text-scaling-pixel-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/sub-pixel/text-scaling-pixel-expected.png deleted file mode 100644 index d053b46..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/sub-pixel/text-scaling-pixel-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/text-letter-spacing-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/text-letter-spacing-expected.png deleted file mode 100644 index b1c63767..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/text-letter-spacing-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/trailing-white-space-2-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/trailing-white-space-2-expected.png deleted file mode 100644 index 27b9e478..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/trailing-white-space-2-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/trailing-white-space-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/trailing-white-space-expected.png deleted file mode 100644 index 3822de8..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/trailing-white-space-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/unicode-fallback-font-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/unicode-fallback-font-expected.png deleted file mode 100644 index cd31b038..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/unicode-fallback-font-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/vertical-surrogate-pair-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/vertical-surrogate-pair-expected.png deleted file mode 100644 index 5d50427..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/vertical-surrogate-pair-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/whitespace/020-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/whitespace/020-expected.png deleted file mode 100644 index e6c6375..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/whitespace/020-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/whitespace/028-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/whitespace/028-expected.png deleted file mode 100644 index ed86d31a..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/whitespace/028-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/whitespace/tab-character-basics-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/whitespace/tab-character-basics-expected.png deleted file mode 100644 index c2bdd082..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/whitespace/tab-character-basics-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/word-space-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/word-space-expected.png deleted file mode 100644 index b00fe08..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/text-antialias/word-space-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/threaded/compositing/visibility/visibility-image-layers-dynamic-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/threaded/compositing/visibility/visibility-image-layers-dynamic-expected.txt deleted file mode 100644 index a032849b..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/threaded/compositing/visibility/visibility-image-layers-dynamic-expected.txt +++ /dev/null
@@ -1,247 +0,0 @@ -Initial -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [785, 626], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow DIV class='composited container'", - "bounds": [749, 145], - "contentsOpaqueForText": true, - "drawsContent": false, - "transform": 1 - }, - { - "name": "LayoutImage IMG class='visible composited box'", - "bounds": [100, 100], - "contentsOpaqueForText": true, - "transform": 3 - }, - { - "name": "VerticalScrollbar", - "position": [785, 0], - "bounds": [15, 600], - "contentsOpaque": true - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [18, 10, 0, 1] - ] - }, - { - "id": 2, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [18, 320, 0, 1] - ] - }, - { - "id": 3, - "parent": 2, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [20, 20, 0, 1] - ] - } - ] -} - -After step 1 -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [785, 1590], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow DIV class='composited container'", - "bounds": [749, 145], - "contentsOpaqueForText": true, - "drawsContent": false, - "transform": 1 - }, - { - "name": "LayoutImage IMG class='hidden composited box'", - "bounds": [100, 100], - "contentsOpaqueForText": true, - "transform": 2 - }, - { - "name": "LayoutImage IMG class='visible composited box'", - "bounds": [100, 100], - "contentsOpaqueForText": true, - "transform": 4 - }, - { - "name": "VerticalScrollbar", - "position": [785, 0], - "bounds": [15, 600], - "contentsOpaque": true - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [18, 10, 0, 1] - ] - }, - { - "id": 2, - "parent": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [20, 20, 0, 1] - ] - }, - { - "id": 3, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [18, 320, 0, 1] - ] - }, - { - "id": 4, - "parent": 3, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [20, 20, 0, 1] - ] - } - ] -} - -After step 2 -{ - "layers": [ - { - "name": "Scrolling background of LayoutView #document", - "bounds": [785, 2809], - "contentsOpaque": true, - "backgroundColor": "#FFFFFF" - }, - { - "name": "LayoutBlockFlow DIV class='composited container'", - "bounds": [749, 145], - "contentsOpaqueForText": true, - "drawsContent": false, - "transform": 1 - }, - { - "name": "LayoutImage IMG class='hidden composited box'", - "bounds": [100, 100], - "contentsOpaqueForText": true, - "transform": 2 - }, - { - "name": "LayoutBlockFlow DIV class='composited hidden container'", - "position": [-4, -4], - "bounds": [757, 153], - "contentsOpaqueForText": true, - "transform": 3 - }, - { - "name": "LayoutImage IMG class='composited box'", - "bounds": [100, 100], - "contentsOpaqueForText": true, - "transform": 4 - }, - { - "name": "LayoutImage IMG class='visible composited box'", - "bounds": [100, 100], - "contentsOpaqueForText": true, - "transform": 6 - }, - { - "name": "VerticalScrollbar", - "position": [785, 0], - "bounds": [15, 600], - "contentsOpaque": true - } - ], - "transforms": [ - { - "id": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [18, 10, 0, 1] - ] - }, - { - "id": 2, - "parent": 1, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [20, 20, 0, 1] - ] - }, - { - "id": 3, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [18, 165, 0, 1] - ] - }, - { - "id": 4, - "parent": 3, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [20, 20, 0, 1] - ] - }, - { - "id": 5, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [18, 320, 0, 1] - ] - }, - { - "id": 6, - "parent": 5, - "transform": [ - [1, 0, 0, 0], - [0, 1, 0, 0], - [0, 0, 1, 0], - [20, 20, 0, 1] - ] - } - ] -} -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/view-transition/external/wpt/css/css-view-transitions/old-content-captures-clip-path-expected.png b/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/view-transition/external/wpt/css/css-view-transitions/old-content-captures-clip-path-expected.png deleted file mode 100644 index e69de29..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/virtual/view-transition/external/wpt/css/css-view-transitions/old-content-captures-clip-path-expected.png +++ /dev/null
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/webexposed/css-properties-as-js-properties-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/webexposed/css-properties-as-js-properties-expected.txt deleted file mode 100644 index 002c8e3..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/webexposed/css-properties-as-js-properties-expected.txt +++ /dev/null
@@ -1,636 +0,0 @@ -This test (crudely) documents Blink's web-exposed CSS properties. All changes to this list should go through Blink's feature review process: http://www.chromium.org/blink#new-features - - -accentColor -additiveSymbols -alignContent -alignItems -alignSelf -alignmentBaseline -all -anchorName -anchorScroll -animation -animationDelay -animationDelayEnd -animationDelayStart -animationDirection -animationDuration -animationFillMode -animationIterationCount -animationName -animationPlayState -animationTimeline -animationTimingFunction -appRegion -appearance -ascentOverride -aspectRatio -backdropFilter -backfaceVisibility -background -backgroundAttachment -backgroundBlendMode -backgroundClip -backgroundColor -backgroundImage -backgroundOrigin -backgroundPosition -backgroundPositionX -backgroundPositionY -backgroundRepeat -backgroundRepeatX -backgroundRepeatY -backgroundSize -basePalette -baselineShift -baselineSource -blockSize -border -borderBlock -borderBlockColor -borderBlockEnd -borderBlockEndColor -borderBlockEndStyle -borderBlockEndWidth -borderBlockStart -borderBlockStartColor -borderBlockStartStyle -borderBlockStartWidth -borderBlockStyle -borderBlockWidth -borderBottom -borderBottomColor -borderBottomLeftRadius -borderBottomRightRadius -borderBottomStyle -borderBottomWidth -borderCollapse -borderColor -borderEndEndRadius -borderEndStartRadius -borderImage -borderImageOutset -borderImageRepeat -borderImageSlice -borderImageSource -borderImageWidth -borderInline -borderInlineColor -borderInlineEnd -borderInlineEndColor -borderInlineEndStyle -borderInlineEndWidth -borderInlineStart -borderInlineStartColor -borderInlineStartStyle -borderInlineStartWidth -borderInlineStyle -borderInlineWidth -borderLeft -borderLeftColor -borderLeftStyle -borderLeftWidth -borderRadius -borderRight -borderRightColor -borderRightStyle -borderRightWidth -borderSpacing -borderStartEndRadius -borderStartStartRadius -borderStyle -borderTop -borderTopColor -borderTopLeftRadius -borderTopRightRadius -borderTopStyle -borderTopWidth -borderWidth -bottom -boxShadow -boxSizing -breakAfter -breakBefore -breakInside -bufferedRendering -captionSide -caretColor -clear -clip -clipPath -clipRule -color -colorInterpolation -colorInterpolationFilters -colorRendering -colorScheme -columnCount -columnFill -columnGap -columnRule -columnRuleColor -columnRuleStyle -columnRuleWidth -columnSpan -columnWidth -columns -contain -containIntrinsicBlockSize -containIntrinsicHeight -containIntrinsicInlineSize -containIntrinsicSize -containIntrinsicWidth -container -containerName -containerType -content -contentVisibility -counterIncrement -counterReset -counterSet -cssFloat -cssText -cursor -cx -cy -d -descentOverride -direction -display -dominantBaseline -emptyCells -end -fallback -fill -fillOpacity -fillRule -filter -flex -flexBasis -flexDirection -flexFlow -flexGrow -flexShrink -flexWrap -float -floodColor -floodOpacity -font -fontDisplay -fontFamily -fontFeatureSettings -fontKerning -fontOpticalSizing -fontPalette -fontSize -fontSizeAdjust -fontStretch -fontStyle -fontSynthesis -fontSynthesisSmallCaps -fontSynthesisStyle -fontSynthesisWeight -fontVariant -fontVariantAlternates -fontVariantCaps -fontVariantEastAsian -fontVariantLigatures -fontVariantNumeric -fontVariantPosition -fontVariationSettings -fontWeight -forcedColorAdjust -gap -getPropertyPriority -getPropertyValue -grid -gridArea -gridAutoColumns -gridAutoFlow -gridAutoRows -gridColumn -gridColumnEnd -gridColumnGap -gridColumnStart -gridGap -gridRow -gridRowEnd -gridRowGap -gridRowStart -gridTemplate -gridTemplateAreas -gridTemplateColumns -gridTemplateRows -height -hyphenateCharacter -hyphenateLimitChars -hyphens -imageOrientation -imageRendering -inherits -initialValue -inlineSize -inset -insetBlock -insetBlockEnd -insetBlockStart -insetInline -insetInlineEnd -insetInlineStart -isolation -item -justifyContent -justifyItems -justifySelf -left -length -letterSpacing -lightingColor -lineBreak -lineGapOverride -lineHeight -listStyle -listStyleImage -listStylePosition -listStyleType -margin -marginBlock -marginBlockEnd -marginBlockStart -marginBottom -marginInline -marginInlineEnd -marginInlineStart -marginLeft -marginRight -marginTop -marker -markerEnd -markerMid -markerStart -mask -maskType -mathDepth -mathShift -mathStyle -maxBlockSize -maxHeight -maxInlineSize -maxWidth -minBlockSize -minHeight -minInlineSize -minWidth -mixBlendMode -negative -objectFit -objectPosition -objectViewBox -offset -offsetAnchor -offsetDistance -offsetPath -offsetPosition -offsetRotate -opacity -order -orphans -outline -outlineColor -outlineOffset -outlineStyle -outlineWidth -overflow -overflowAnchor -overflowBlock -overflowClipMargin -overflowInline -overflowWrap -overflowX -overflowY -overrideColors -overscrollBehavior -overscrollBehaviorBlock -overscrollBehaviorInline -overscrollBehaviorX -overscrollBehaviorY -pad -padding -paddingBlock -paddingBlockEnd -paddingBlockStart -paddingBottom -paddingInline -paddingInlineEnd -paddingInlineStart -paddingLeft -paddingRight -paddingTop -page -pageBreakAfter -pageBreakBefore -pageBreakInside -pageOrientation -paintOrder -parentRule -perspective -perspectiveOrigin -placeContent -placeItems -placeSelf -pointerEvents -position -positionFallback -prefix -quotes -r -range -removeProperty -resize -right -rotate -rowGap -rubyPosition -rx -ry -scale -scrollBehavior -scrollMargin -scrollMarginBlock -scrollMarginBlockEnd -scrollMarginBlockStart -scrollMarginBottom -scrollMarginInline -scrollMarginInlineEnd -scrollMarginInlineStart -scrollMarginLeft -scrollMarginRight -scrollMarginTop -scrollPadding -scrollPaddingBlock -scrollPaddingBlockEnd -scrollPaddingBlockStart -scrollPaddingBottom -scrollPaddingInline -scrollPaddingInlineEnd -scrollPaddingInlineStart -scrollPaddingLeft -scrollPaddingRight -scrollPaddingTop -scrollSnapAlign -scrollSnapStop -scrollSnapType -scrollTimeline -scrollTimelineAxis -scrollTimelineName -scrollbarGutter -scrollbarWidth -setProperty -shapeImageThreshold -shapeMargin -shapeOutside -shapeRendering -size -sizeAdjust -source -speak -speakAs -src -start -stopColor -stopOpacity -stroke -strokeDasharray -strokeDashoffset -strokeLinecap -strokeLinejoin -strokeMiterlimit -strokeOpacity -strokeWidth -suffix -symbols -syntax -system -tabSize -tableLayout -textAlign -textAlignLast -textAnchor -textCombineUpright -textDecoration -textDecorationColor -textDecorationLine -textDecorationSkipInk -textDecorationStyle -textDecorationThickness -textEmphasis -textEmphasisColor -textEmphasisPosition -textEmphasisStyle -textIndent -textOrientation -textOverflow -textRendering -textShadow -textSizeAdjust -textTransform -textUnderlineOffset -textUnderlinePosition -toggle -toggleGroup -toggleRoot -toggleTrigger -toggleVisibility -top -touchAction -transform -transformBox -transformOrigin -transformStyle -transition -transitionDelay -transitionDuration -transitionProperty -transitionTimingFunction -translate -unicodeBidi -unicodeRange -userSelect -vectorEffect -verticalAlign -viewTimeline -viewTimelineAxis -viewTimelineInset -viewTimelineName -visibility -webkitAlignContent -webkitAlignItems -webkitAlignSelf -webkitAnimation -webkitAnimationDelay -webkitAnimationDirection -webkitAnimationDuration -webkitAnimationFillMode -webkitAnimationIterationCount -webkitAnimationName -webkitAnimationPlayState -webkitAnimationTimingFunction -webkitAppRegion -webkitAppearance -webkitBackfaceVisibility -webkitBackgroundClip -webkitBackgroundOrigin -webkitBackgroundSize -webkitBorderAfter -webkitBorderAfterColor -webkitBorderAfterStyle -webkitBorderAfterWidth -webkitBorderBefore -webkitBorderBeforeColor -webkitBorderBeforeStyle -webkitBorderBeforeWidth -webkitBorderBottomLeftRadius -webkitBorderBottomRightRadius -webkitBorderEnd -webkitBorderEndColor -webkitBorderEndStyle -webkitBorderEndWidth -webkitBorderHorizontalSpacing -webkitBorderImage -webkitBorderRadius -webkitBorderStart -webkitBorderStartColor -webkitBorderStartStyle -webkitBorderStartWidth -webkitBorderTopLeftRadius -webkitBorderTopRightRadius -webkitBorderVerticalSpacing -webkitBoxAlign -webkitBoxDecorationBreak -webkitBoxDirection -webkitBoxFlex -webkitBoxOrdinalGroup -webkitBoxOrient -webkitBoxPack -webkitBoxReflect -webkitBoxShadow -webkitBoxSizing -webkitClipPath -webkitColumnBreakAfter -webkitColumnBreakBefore -webkitColumnBreakInside -webkitColumnCount -webkitColumnGap -webkitColumnRule -webkitColumnRuleColor -webkitColumnRuleStyle -webkitColumnRuleWidth -webkitColumnSpan -webkitColumnWidth -webkitColumns -webkitFilter -webkitFlex -webkitFlexBasis -webkitFlexDirection -webkitFlexFlow -webkitFlexGrow -webkitFlexShrink -webkitFlexWrap -webkitFontFeatureSettings -webkitFontSmoothing -webkitHighlight -webkitHyphenateCharacter -webkitJustifyContent -webkitLineBreak -webkitLineClamp -webkitLocale -webkitLogicalHeight -webkitLogicalWidth -webkitMarginAfter -webkitMarginBefore -webkitMarginEnd -webkitMarginStart -webkitMask -webkitMaskBoxImage -webkitMaskBoxImageOutset -webkitMaskBoxImageRepeat -webkitMaskBoxImageSlice -webkitMaskBoxImageSource -webkitMaskBoxImageWidth -webkitMaskClip -webkitMaskComposite -webkitMaskImage -webkitMaskOrigin -webkitMaskPosition -webkitMaskPositionX -webkitMaskPositionY -webkitMaskRepeat -webkitMaskRepeatX -webkitMaskRepeatY -webkitMaskSize -webkitMaxLogicalHeight -webkitMaxLogicalWidth -webkitMinLogicalHeight -webkitMinLogicalWidth -webkitOpacity -webkitOrder -webkitPaddingAfter -webkitPaddingBefore -webkitPaddingEnd -webkitPaddingStart -webkitPerspective -webkitPerspectiveOrigin -webkitPerspectiveOriginX -webkitPerspectiveOriginY -webkitPrintColorAdjust -webkitRtlOrdering -webkitRubyPosition -webkitShapeImageThreshold -webkitShapeMargin -webkitShapeOutside -webkitTapHighlightColor -webkitTextCombine -webkitTextDecorationsInEffect -webkitTextEmphasis -webkitTextEmphasisColor -webkitTextEmphasisPosition -webkitTextEmphasisStyle -webkitTextFillColor -webkitTextOrientation -webkitTextSecurity -webkitTextSizeAdjust -webkitTextStroke -webkitTextStrokeColor -webkitTextStrokeWidth -webkitTransform -webkitTransformOrigin -webkitTransformOriginX -webkitTransformOriginY -webkitTransformOriginZ -webkitTransformStyle -webkitTransition -webkitTransitionDelay -webkitTransitionDuration -webkitTransitionProperty -webkitTransitionTimingFunction -webkitUserDrag -webkitUserModify -webkitUserSelect -webkitWritingMode -whiteSpace -widows -width -willChange -wordBreak -wordSpacing -wordWrap -writingMode -x -y -zIndex -zoom -PASS successfullyParsed is true - -TEST COMPLETE -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/webexposed/css-property-listing-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/webexposed/css-property-listing-expected.txt deleted file mode 100644 index be10d6ca..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/webexposed/css-property-listing-expected.txt +++ /dev/null
@@ -1,997 +0,0 @@ -This test documents Blink's web-exposed CSS properties. -All changes to this list should go through Blink's feature review process: http://www.chromium.org/blink#new-features - -[LONGHANDS] - -webkit-border-horizontal-spacing - -webkit-border-image - -webkit-border-vertical-spacing - -webkit-box-align - -webkit-box-decoration-break - -webkit-box-direction - -webkit-box-flex - -webkit-box-ordinal-group - -webkit-box-orient - -webkit-box-pack - -webkit-box-reflect - -webkit-font-smoothing - -webkit-highlight - -webkit-line-break - -webkit-line-clamp - -webkit-locale - -webkit-mask-box-image-outset - -webkit-mask-box-image-repeat - -webkit-mask-box-image-slice - -webkit-mask-box-image-source - -webkit-mask-box-image-width - -webkit-mask-clip - -webkit-mask-composite - -webkit-mask-image - -webkit-mask-origin - -webkit-mask-position-x - -webkit-mask-position-y - -webkit-mask-repeat-x - -webkit-mask-repeat-y - -webkit-mask-size - -webkit-perspective-origin-x - -webkit-perspective-origin-y - -webkit-print-color-adjust - -webkit-rtl-ordering - -webkit-ruby-position - -webkit-tap-highlight-color - -webkit-text-combine - -webkit-text-decorations-in-effect - -webkit-text-fill-color - -webkit-text-orientation - -webkit-text-security - -webkit-text-stroke-color - -webkit-text-stroke-width - -webkit-transform-origin-x - -webkit-transform-origin-y - -webkit-transform-origin-z - -webkit-user-drag - -webkit-user-modify - -webkit-writing-mode - accent-color - align-content - align-items - align-self - alignment-baseline - all - anchor-name - anchor-scroll - animation-delay-end - animation-delay-start - animation-direction - animation-duration - animation-fill-mode - animation-iteration-count - animation-name - animation-play-state - animation-timeline - animation-timing-function - app-region - appearance - aspect-ratio - backdrop-filter - backface-visibility - background-attachment - background-blend-mode - background-clip - background-color - background-image - background-origin - background-position-x - background-position-y - background-repeat-x - background-repeat-y - background-size - baseline-shift - baseline-source - block-size - border-block-end-color - border-block-end-style - border-block-end-width - border-block-start-color - border-block-start-style - border-block-start-width - border-bottom-color - border-bottom-left-radius - border-bottom-right-radius - border-bottom-style - border-bottom-width - border-collapse - border-end-end-radius - border-end-start-radius - border-image-outset - border-image-repeat - border-image-slice - border-image-source - border-image-width - border-inline-end-color - border-inline-end-style - border-inline-end-width - border-inline-start-color - border-inline-start-style - border-inline-start-width - border-left-color - border-left-style - border-left-width - border-right-color - border-right-style - border-right-width - border-start-end-radius - border-start-start-radius - border-top-color - border-top-left-radius - border-top-right-radius - border-top-style - border-top-width - bottom - box-shadow - box-sizing - break-after - break-before - break-inside - buffered-rendering - caption-side - caret-color - clear - clip - clip-path - clip-rule - color - color-interpolation - color-interpolation-filters - color-rendering - color-scheme - column-count - column-fill - column-gap - column-rule-color - column-rule-style - column-rule-width - column-span - column-width - contain - contain-intrinsic-block-size - contain-intrinsic-height - contain-intrinsic-inline-size - contain-intrinsic-width - container-name - container-type - content - content-visibility - counter-increment - counter-reset - counter-set - cursor - cx - cy - d - direction - display - dominant-baseline - empty-cells - fill - fill-opacity - fill-rule - filter - flex-basis - flex-direction - flex-grow - flex-shrink - flex-wrap - float - flood-color - flood-opacity - font-family - font-feature-settings - font-kerning - font-optical-sizing - font-palette - font-size - font-size-adjust - font-stretch - font-style - font-synthesis-small-caps - font-synthesis-style - font-synthesis-weight - font-variant-alternates - font-variant-caps - font-variant-east-asian - font-variant-ligatures - font-variant-numeric - font-variant-position - font-variation-settings - font-weight - forced-color-adjust - grid-auto-columns - grid-auto-flow - grid-auto-rows - grid-column-end - grid-column-start - grid-row-end - grid-row-start - grid-template-areas - grid-template-columns - grid-template-rows - height - hyphenate-character - hyphenate-limit-chars - hyphens - image-orientation - image-rendering - inline-size - inset-block-end - inset-block-start - inset-inline-end - inset-inline-start - isolation - justify-content - justify-items - justify-self - left - letter-spacing - lighting-color - line-break - line-height - list-style-image - list-style-position - list-style-type - margin-block-end - margin-block-start - margin-bottom - margin-inline-end - margin-inline-start - margin-left - margin-right - margin-top - marker-end - marker-mid - marker-start - mask - mask-type - math-depth - math-shift - math-style - max-block-size - max-height - max-inline-size - max-width - min-block-size - min-height - min-inline-size - min-width - mix-blend-mode - object-fit - object-position - object-view-box - offset-anchor - offset-distance - offset-path - offset-position - offset-rotate - opacity - order - orphans - outline-color - outline-offset - outline-style - outline-width - overflow-anchor - overflow-block - overflow-clip-margin - overflow-inline - overflow-wrap - overflow-x - overflow-y - overscroll-behavior-block - overscroll-behavior-inline - overscroll-behavior-x - overscroll-behavior-y - padding-block-end - padding-block-start - padding-bottom - padding-inline-end - padding-inline-start - padding-left - padding-right - padding-top - page - page-orientation - paint-order - perspective - perspective-origin - pointer-events - position - position-fallback - quotes - r - resize - right - rotate - row-gap - ruby-position - rx - ry - scale - scroll-behavior - scroll-margin-block-end - scroll-margin-block-start - scroll-margin-bottom - scroll-margin-inline-end - scroll-margin-inline-start - scroll-margin-left - scroll-margin-right - scroll-margin-top - scroll-padding-block-end - scroll-padding-block-start - scroll-padding-bottom - scroll-padding-inline-end - scroll-padding-inline-start - scroll-padding-left - scroll-padding-right - scroll-padding-top - scroll-snap-align - scroll-snap-stop - scroll-snap-type - scroll-timeline-axis - scroll-timeline-name - scrollbar-gutter - scrollbar-width - shape-image-threshold - shape-margin - shape-outside - shape-rendering - size - speak - stop-color - stop-opacity - stroke - stroke-dasharray - stroke-dashoffset - stroke-linecap - stroke-linejoin - stroke-miterlimit - stroke-opacity - stroke-width - tab-size - table-layout - text-align - text-align-last - text-anchor - text-combine-upright - text-decoration-color - text-decoration-line - text-decoration-skip-ink - text-decoration-style - text-decoration-thickness - text-emphasis-color - text-emphasis-position - text-emphasis-style - text-indent - text-orientation - text-overflow - text-rendering - text-shadow - text-size-adjust - text-transform - text-underline-offset - text-underline-position - toggle-group - toggle-root - toggle-trigger - toggle-visibility - top - touch-action - transform - transform-box - transform-origin - transform-style - transition-delay - transition-duration - transition-property - transition-timing-function - translate - unicode-bidi - user-select - vector-effect - vertical-align - view-timeline-axis - view-timeline-inset - view-timeline-name - visibility - white-space - widows - width - will-change - word-break - word-spacing - writing-mode - x - y - z-index - zoom - -[SHORTHANDS] - -webkit-column-break-after - break-after - -webkit-column-break-before - break-before - -webkit-column-break-inside - break-inside - -webkit-mask - -webkit-mask-clip - -webkit-mask-image - -webkit-mask-origin - -webkit-mask-position-x - -webkit-mask-position-y - -webkit-mask-repeat-x - -webkit-mask-repeat-y - -webkit-mask-size - -webkit-mask-box-image - -webkit-mask-box-image-outset - -webkit-mask-box-image-repeat - -webkit-mask-box-image-slice - -webkit-mask-box-image-source - -webkit-mask-box-image-width - -webkit-mask-position - -webkit-mask-position-x - -webkit-mask-position-y - -webkit-mask-repeat - -webkit-mask-repeat-x - -webkit-mask-repeat-y - -webkit-text-stroke - -webkit-text-stroke-color - -webkit-text-stroke-width - animation - animation-delay-end - animation-delay-start - animation-direction - animation-duration - animation-fill-mode - animation-iteration-count - animation-name - animation-play-state - animation-timeline - animation-timing-function - animation-delay - animation-delay-end - animation-delay-start - background - background-attachment - background-clip - background-color - background-image - background-origin - background-position-x - background-position-y - background-repeat-x - background-repeat-y - background-size - background-position - background-position-x - background-position-y - background-repeat - background-repeat-x - background-repeat-y - border - border-bottom-color - border-bottom-style - border-bottom-width - border-image-outset - border-image-repeat - border-image-slice - border-image-source - border-image-width - border-left-color - border-left-style - border-left-width - border-right-color - border-right-style - border-right-width - border-top-color - border-top-style - border-top-width - border-block - border-block-end-color - border-block-end-style - border-block-end-width - border-block-start-color - border-block-start-style - border-block-start-width - border-block-color - border-block-end-color - border-block-start-color - border-block-end - border-block-end-color - border-block-end-style - border-block-end-width - border-block-start - border-block-start-color - border-block-start-style - border-block-start-width - border-block-style - border-block-end-style - border-block-start-style - border-block-width - border-block-end-width - border-block-start-width - border-bottom - border-bottom-color - border-bottom-style - border-bottom-width - border-color - border-bottom-color - border-left-color - border-right-color - border-top-color - border-image - border-image-outset - border-image-repeat - border-image-slice - border-image-source - border-image-width - border-inline - border-inline-end-color - border-inline-end-style - border-inline-end-width - border-inline-start-color - border-inline-start-style - border-inline-start-width - border-inline-color - border-inline-end-color - border-inline-start-color - border-inline-end - border-inline-end-color - border-inline-end-style - border-inline-end-width - border-inline-start - border-inline-start-color - border-inline-start-style - border-inline-start-width - border-inline-style - border-inline-end-style - border-inline-start-style - border-inline-width - border-inline-end-width - border-inline-start-width - border-left - border-left-color - border-left-style - border-left-width - border-radius - border-bottom-left-radius - border-bottom-right-radius - border-top-left-radius - border-top-right-radius - border-right - border-right-color - border-right-style - border-right-width - border-spacing - -webkit-border-horizontal-spacing - -webkit-border-vertical-spacing - border-style - border-bottom-style - border-left-style - border-right-style - border-top-style - border-top - border-top-color - border-top-style - border-top-width - border-width - border-bottom-width - border-left-width - border-right-width - border-top-width - column-rule - column-rule-color - column-rule-style - column-rule-width - columns - column-count - column-width - contain-intrinsic-size - contain-intrinsic-height - contain-intrinsic-width - container - container-name - container-type - flex - flex-basis - flex-grow - flex-shrink - flex-flow - flex-direction - flex-wrap - font - font-family - font-size - font-stretch - font-style - font-variant-alternates - font-variant-caps - font-variant-east-asian - font-variant-ligatures - font-variant-numeric - font-variant-position - font-weight - line-height - font-synthesis - font-synthesis-small-caps - font-synthesis-style - font-synthesis-weight - font-variant - font-variant-alternates - font-variant-caps - font-variant-east-asian - font-variant-ligatures - font-variant-numeric - font-variant-position - gap - column-gap - row-gap - grid - grid-auto-columns - grid-auto-flow - grid-auto-rows - grid-template-areas - grid-template-columns - grid-template-rows - grid-area - grid-column-end - grid-column-start - grid-row-end - grid-row-start - grid-column - grid-column-end - grid-column-start - grid-column-gap - column-gap - grid-gap - column-gap - row-gap - grid-row - grid-row-end - grid-row-start - grid-row-gap - row-gap - grid-template - grid-template-areas - grid-template-columns - grid-template-rows - inset - bottom - left - right - top - inset-block - inset-block-end - inset-block-start - inset-inline - inset-inline-end - inset-inline-start - list-style - list-style-image - list-style-position - list-style-type - margin - margin-bottom - margin-left - margin-right - margin-top - margin-block - margin-block-end - margin-block-start - margin-inline - margin-inline-end - margin-inline-start - marker - marker-end - marker-mid - marker-start - offset - offset-anchor - offset-distance - offset-path - offset-position - offset-rotate - outline - outline-color - outline-style - outline-width - overflow - overflow-x - overflow-y - overscroll-behavior - overscroll-behavior-x - overscroll-behavior-y - padding - padding-bottom - padding-left - padding-right - padding-top - padding-block - padding-block-end - padding-block-start - padding-inline - padding-inline-end - padding-inline-start - page-break-after - break-after - page-break-before - break-before - page-break-inside - break-inside - place-content - align-content - justify-content - place-items - align-items - justify-items - place-self - align-self - justify-self - scroll-margin - scroll-margin-bottom - scroll-margin-left - scroll-margin-right - scroll-margin-top - scroll-margin-block - scroll-margin-block-end - scroll-margin-block-start - scroll-margin-inline - scroll-margin-inline-end - scroll-margin-inline-start - scroll-padding - scroll-padding-bottom - scroll-padding-left - scroll-padding-right - scroll-padding-top - scroll-padding-block - scroll-padding-block-end - scroll-padding-block-start - scroll-padding-inline - scroll-padding-inline-end - scroll-padding-inline-start - scroll-timeline - scroll-timeline-axis - scroll-timeline-name - text-decoration - text-decoration-color - text-decoration-line - text-decoration-style - text-decoration-thickness - text-emphasis - text-emphasis-color - text-emphasis-style - toggle - toggle-root - toggle-trigger - transition - transition-delay - transition-duration - transition-property - transition-timing-function - view-timeline - view-timeline-axis - view-timeline-name - -[ALIASES] - -epub-caption-side - caption-side - -epub-text-combine - -webkit-text-combine - -epub-text-emphasis - text-emphasis - -epub-text-emphasis-color - text-emphasis-color - -epub-text-emphasis-style - text-emphasis-style - -epub-text-orientation - -webkit-text-orientation - -epub-text-transform - text-transform - -epub-word-break - word-break - -epub-writing-mode - -webkit-writing-mode - -webkit-align-content - align-content - -webkit-align-items - align-items - -webkit-align-self - align-self - -webkit-animation - animation - -webkit-animation-delay - animation-delay - -webkit-animation-direction - animation-direction - -webkit-animation-duration - animation-duration - -webkit-animation-fill-mode - animation-fill-mode - -webkit-animation-iteration-count - animation-iteration-count - -webkit-animation-name - animation-name - -webkit-animation-play-state - animation-play-state - -webkit-animation-timing-function - animation-timing-function - -webkit-app-region - app-region - -webkit-appearance - appearance - -webkit-backface-visibility - backface-visibility - -webkit-background-clip - background-clip - -webkit-background-origin - background-origin - -webkit-background-size - background-size - -webkit-border-after - border-block-end - -webkit-border-after-color - border-block-end-color - -webkit-border-after-style - border-block-end-style - -webkit-border-after-width - border-block-end-width - -webkit-border-before - border-block-start - -webkit-border-before-color - border-block-start-color - -webkit-border-before-style - border-block-start-style - -webkit-border-before-width - border-block-start-width - -webkit-border-bottom-left-radius - border-bottom-left-radius - -webkit-border-bottom-right-radius - border-bottom-right-radius - -webkit-border-end - border-inline-end - -webkit-border-end-color - border-inline-end-color - -webkit-border-end-style - border-inline-end-style - -webkit-border-end-width - border-inline-end-width - -webkit-border-radius - border-radius - -webkit-border-start - border-inline-start - -webkit-border-start-color - border-inline-start-color - -webkit-border-start-style - border-inline-start-style - -webkit-border-start-width - border-inline-start-width - -webkit-border-top-left-radius - border-top-left-radius - -webkit-border-top-right-radius - border-top-right-radius - -webkit-box-shadow - box-shadow - -webkit-box-sizing - box-sizing - -webkit-clip-path - clip-path - -webkit-column-count - column-count - -webkit-column-gap - column-gap - -webkit-column-rule - column-rule - -webkit-column-rule-color - column-rule-color - -webkit-column-rule-style - column-rule-style - -webkit-column-rule-width - column-rule-width - -webkit-column-span - column-span - -webkit-column-width - column-width - -webkit-columns - columns - -webkit-filter - filter - -webkit-flex - flex - -webkit-flex-basis - flex-basis - -webkit-flex-direction - flex-direction - -webkit-flex-flow - flex-flow - -webkit-flex-grow - flex-grow - -webkit-flex-shrink - flex-shrink - -webkit-flex-wrap - flex-wrap - -webkit-font-feature-settings - font-feature-settings - -webkit-hyphenate-character - hyphenate-character - -webkit-justify-content - justify-content - -webkit-logical-height - block-size - -webkit-logical-width - inline-size - -webkit-margin-after - margin-block-end - -webkit-margin-before - margin-block-start - -webkit-margin-end - margin-inline-end - -webkit-margin-start - margin-inline-start - -webkit-max-logical-height - max-block-size - -webkit-max-logical-width - max-inline-size - -webkit-min-logical-height - min-block-size - -webkit-min-logical-width - min-inline-size - -webkit-opacity - opacity - -webkit-order - order - -webkit-padding-after - padding-block-end - -webkit-padding-before - padding-block-start - -webkit-padding-end - padding-inline-end - -webkit-padding-start - padding-inline-start - -webkit-perspective - perspective - -webkit-perspective-origin - perspective-origin - -webkit-shape-image-threshold - shape-image-threshold - -webkit-shape-margin - shape-margin - -webkit-shape-outside - shape-outside - -webkit-text-emphasis - text-emphasis - -webkit-text-emphasis-color - text-emphasis-color - -webkit-text-emphasis-position - text-emphasis-position - -webkit-text-emphasis-style - text-emphasis-style - -webkit-text-size-adjust - text-size-adjust - -webkit-transform - transform - -webkit-transform-origin - transform-origin - -webkit-transform-style - transform-style - -webkit-transition - transition - -webkit-transition-delay - transition-delay - -webkit-transition-duration - transition-duration - -webkit-transition-property - transition-property - -webkit-transition-timing-function - transition-timing-function - -webkit-user-select - user-select - word-wrap - overflow-wrap -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/wpt_internal/geolocation-api/notimer-after-unload.https-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/wpt_internal/geolocation-api/notimer-after-unload.https-expected.txt deleted file mode 100644 index 492e3bd3..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/wpt_internal/geolocation-api/notimer-after-unload.https-expected.txt +++ /dev/null
@@ -1,4 +0,0 @@ -This is a testharness.js-based test. -PASS geolocation callbacks are not invoked after page unload -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/wpt_internal/geolocation-api/timeout-clear-watch.https-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/wpt_internal/geolocation-api/timeout-clear-watch.https-expected.txt deleted file mode 100644 index bfad7c4..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/wpt_internal/geolocation-api/timeout-clear-watch.https-expected.txt +++ /dev/null
@@ -1,4 +0,0 @@ -This is a testharness.js-based test. -PASS Tests that when a watch times out and is cleared from the error callback, there is no crash. This a regression test for https://bugs.webkit.org/show_bug.cgi?id=32111. -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/wpt_internal/geolocation-api/timeout-negative.https-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/wpt_internal/geolocation-api/timeout-negative.https-expected.txt deleted file mode 100644 index ec1f1b4..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/wpt_internal/geolocation-api/timeout-negative.https-expected.txt +++ /dev/null
@@ -1,4 +0,0 @@ -This is a testharness.js-based test. -PASS Tests that when timeout is negative (and maximumAge is too), the error callback is called immediately with code TIMEOUT. -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/wpt_internal/geolocation-api/timeout-zero.https-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/wpt_internal/geolocation-api/timeout-zero.https-expected.txt deleted file mode 100644 index 4f97b9d..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/wpt_internal/geolocation-api/timeout-zero.https-expected.txt +++ /dev/null
@@ -1,4 +0,0 @@ -This is a testharness.js-based test. -PASS Tests that when timeout is zero (and maximumAge is too), the error callback is called immediately with code TIMEOUT. -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/wpt_internal/geolocation-api/timeout.https-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/wpt_internal/geolocation-api/timeout.https-expected.txt deleted file mode 100644 index e11f094..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/wpt_internal/geolocation-api/timeout.https-expected.txt +++ /dev/null
@@ -1,4 +0,0 @@ -This is a testharness.js-based test. -PASS Tests that when timeout is non-zero, the success callback is called as expected. -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/wpt_internal/webcodecs/avc_encoder_config.https.any-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/wpt_internal/webcodecs/avc_encoder_config.https.any-expected.txt deleted file mode 100644 index 7e47f23..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/wpt_internal/webcodecs/avc_encoder_config.https.any-expected.txt +++ /dev/null
@@ -1,6 +0,0 @@ -This is a testharness.js-based test. -FAIL Test AvcConfig supports 'avc' and 'annexb' promise_test: Unhandled rejection with value: object "InvalidStateError: Failed to execute 'encode' on 'VideoEncoder': Cannot call 'encode' on a closed codec." -FAIL Test H.264 only supports even sizes assert_true: expected true got false -FAIL Resolutions exceeding H.264 level are rejected assert_true: expected true got false -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/flag-specific/disable-layout-ng/wpt_internal/webcodecs/avc_encoder_config.https.any.worker-expected.txt b/third_party/blink/web_tests/flag-specific/disable-layout-ng/wpt_internal/webcodecs/avc_encoder_config.https.any.worker-expected.txt deleted file mode 100644 index f41392d..0000000 --- a/third_party/blink/web_tests/flag-specific/disable-layout-ng/wpt_internal/webcodecs/avc_encoder_config.https.any.worker-expected.txt +++ /dev/null
@@ -1,6 +0,0 @@ -This is a testharness.js-based test. -FAIL Test AvcConfig supports 'avc' and 'annexb' assert_not_equals: output default got disallowed value undefined -FAIL Test H.264 only supports even sizes assert_true: expected true got false -FAIL Resolutions exceeding H.264 level are rejected assert_true: expected true got false -Harness: the test ran to completion. -
diff --git a/third_party/blink/web_tests/paint/invalidation/svg/window.svg b/third_party/blink/web_tests/paint/invalidation/svg/window.svg index 88f7db76..6fa19b8 100644 --- a/third_party/blink/web_tests/paint/invalidation/svg/window.svg +++ b/third_party/blink/web_tests/paint/invalidation/svg/window.svg
@@ -22,6 +22,9 @@ // terminate before the final window decoration is added. // See <https://bugs.webkit.org/show_bug.cgi?id=21531>. window.testIsAsync = true; + // Under-invalidation checking is slow for this test. + if (window.internals) + internals.runtimeFlags.paintUnderInvalidationCheckingEnabled = false; var numberOfWindows = 7; var createCalls = 0;
diff --git a/third_party/blink/web_tests/platform/linux/external/wpt/css/css-properties-values-api/at-property-animation-expected.txt b/third_party/blink/web_tests/platform/linux/external/wpt/css/css-properties-values-api/at-property-animation-expected.txt new file mode 100644 index 0000000..a193d781 --- /dev/null +++ b/third_party/blink/web_tests/platform/linux/external/wpt/css/css-properties-values-api/at-property-animation-expected.txt
@@ -0,0 +1,17 @@ +This is a testharness.js-based test. +PASS @keyframes works with @property +PASS @keyframes picks up the latest @property in the document +PASS Ongoing animation picks up redeclared custom property +PASS Ongoing animation matches new keyframes against the current registration +PASS Ongoing animation picks up redeclared intial value +PASS Ongoing animation picks up redeclared inherits flag +PASS Ongoing animation picks up redeclared meaning of 'unset' +PASS Transitioning from initial value +PASS Transitioning from specified value +PASS Transition triggered by initial value change +PASS No transition when changing types +FAIL No transition when removing @property rule assert_equals: expected "100px" but got " 100px" +FAIL Unregistered properties referencing animated properties update correctly. assert_equals: expected "150px" but got " 150px" +FAIL Registered properties referencing animated properties update correctly. assert_equals: expected "150px" but got " 150px" +Harness: the test ran to completion. +
diff --git a/third_party/blink/web_tests/platform/mac/external/wpt/css/css-properties-values-api/at-property-animation-expected.txt b/third_party/blink/web_tests/platform/mac/external/wpt/css/css-properties-values-api/at-property-animation-expected.txt new file mode 100644 index 0000000..a193d781 --- /dev/null +++ b/third_party/blink/web_tests/platform/mac/external/wpt/css/css-properties-values-api/at-property-animation-expected.txt
@@ -0,0 +1,17 @@ +This is a testharness.js-based test. +PASS @keyframes works with @property +PASS @keyframes picks up the latest @property in the document +PASS Ongoing animation picks up redeclared custom property +PASS Ongoing animation matches new keyframes against the current registration +PASS Ongoing animation picks up redeclared intial value +PASS Ongoing animation picks up redeclared inherits flag +PASS Ongoing animation picks up redeclared meaning of 'unset' +PASS Transitioning from initial value +PASS Transitioning from specified value +PASS Transition triggered by initial value change +PASS No transition when changing types +FAIL No transition when removing @property rule assert_equals: expected "100px" but got " 100px" +FAIL Unregistered properties referencing animated properties update correctly. assert_equals: expected "150px" but got " 150px" +FAIL Registered properties referencing animated properties update correctly. assert_equals: expected "150px" but got " 150px" +Harness: the test ran to completion. +
diff --git a/third_party/blink/web_tests/platform/win10/external/wpt/css/css-properties-values-api/at-property-animation-expected.txt b/third_party/blink/web_tests/platform/win10/external/wpt/css/css-properties-values-api/at-property-animation-expected.txt new file mode 100644 index 0000000..a193d781 --- /dev/null +++ b/third_party/blink/web_tests/platform/win10/external/wpt/css/css-properties-values-api/at-property-animation-expected.txt
@@ -0,0 +1,17 @@ +This is a testharness.js-based test. +PASS @keyframes works with @property +PASS @keyframes picks up the latest @property in the document +PASS Ongoing animation picks up redeclared custom property +PASS Ongoing animation matches new keyframes against the current registration +PASS Ongoing animation picks up redeclared intial value +PASS Ongoing animation picks up redeclared inherits flag +PASS Ongoing animation picks up redeclared meaning of 'unset' +PASS Transitioning from initial value +PASS Transitioning from specified value +PASS Transition triggered by initial value change +PASS No transition when changing types +FAIL No transition when removing @property rule assert_equals: expected "100px" but got " 100px" +FAIL Unregistered properties referencing animated properties update correctly. assert_equals: expected "150px" but got " 150px" +FAIL Registered properties referencing animated properties update correctly. assert_equals: expected "150px" but got " 150px" +Harness: the test ran to completion. +
diff --git a/third_party/blink/web_tests/wpt_internal/view-transition-on-navigation/root-and-nested-element-transition.html.ini b/third_party/blink/web_tests/wpt_internal/view-transition-on-navigation/root-and-nested-element-transition.html.ini index 26d0e98..18731b1 100644 --- a/third_party/blink/web_tests/wpt_internal/view-transition-on-navigation/root-and-nested-element-transition.html.ini +++ b/third_party/blink/web_tests/wpt_internal/view-transition-on-navigation/root-and-nested-element-transition.html.ini
@@ -1,2 +1,2 @@ [root-and-nested-element-transition.html] - expected: FAIL + expected: ERROR
diff --git a/third_party/jacoco/BUILD.gn b/third_party/jacoco/BUILD.gn index 705951b..93ebbe5 100644 --- a/third_party/jacoco/BUILD.gn +++ b/third_party/jacoco/BUILD.gn
@@ -17,11 +17,20 @@ ] } +# When running on-device, prevent Jacoco from trying to write its default +# output path. The test runner will explicitly dump to a file when appropriate. +# https://crbug.com/1334374 +android_assets("jacocoagent_properties_assets") { + renaming_sources = [ "jacoco-agent.properties" ] + renaming_destinations = [ "../jacoco-agent.properties" ] +} + java_prebuilt("jacocoagent_java") { include_java_resources = true supports_android = true jar_path = "lib/jacocoagent.jar" proguard_configs = [ "jacoco_instrument.flags" ] + deps = [ ":jacocoagent_properties_assets" ] } java_prebuilt("jacocoant_java") {
diff --git a/third_party/jacoco/README.chromium b/third_party/jacoco/README.chromium index 18ea162..13bbd74 100644 --- a/third_party/jacoco/README.chromium +++ b/third_party/jacoco/README.chromium
@@ -8,3 +8,6 @@ Description: JaCoCo is a Java code coverage tool. + +Local Modifications: +* Added jacoco-agent.properties for use on Android.
diff --git a/third_party/jacoco/jacoco-agent.properties b/third_party/jacoco/jacoco-agent.properties new file mode 100644 index 0000000..52c4b253 --- /dev/null +++ b/third_party/jacoco/jacoco-agent.properties
@@ -0,0 +1 @@ +output=none
diff --git a/tools/clang/scripts/update.py b/tools/clang/scripts/update.py index ebeea5d..413f125c 100755 --- a/tools/clang/scripts/update.py +++ b/tools/clang/scripts/update.py
@@ -153,7 +153,7 @@ os.makedirs(path) -def DownloadAndUnpack(url, output_dir, path_prefixes=None): +def DownloadAndUnpack(url, output_dir, path_prefixes=None, is_known_zip=False): """Download an archive from url and extract into output_dir. If path_prefixes is not None, only extract files whose paths within the archive start with any prefix in path_prefixes.""" @@ -161,7 +161,7 @@ DownloadUrl(url, f) f.seek(0) EnsureDirExists(output_dir) - if url.endswith('.zip'): + if url.endswith('.zip') or is_known_zip: assert path_prefixes is None zipfile.ZipFile(f).extractall(path=output_dir) else:
diff --git a/tools/clang/scripts/upload_revision.py b/tools/clang/scripts/upload_revision.py index 63a8c08..d912d114 100755 --- a/tools/clang/scripts/upload_revision.py +++ b/tools/clang/scripts/upload_revision.py
@@ -19,8 +19,8 @@ import sys import urllib3 -from build import CheckoutLLVM, GetCommitDescription, LLVM_DIR -from update import CHROMIUM_DIR +from build import CheckoutLLVM, GetCommitDescription, LLVM_DIR, RunCommand +from update import CHROMIUM_DIR, DownloadAndUnpack # Path constants. THIS_DIR = os.path.dirname(__file__) @@ -37,7 +37,14 @@ # Constants for finding HEAD. CLANG_URL = 'https://api.github.com/repos/llvm/llvm-project/git/refs/heads/main' CLANG_REGEX = b'"sha":"([^"]+)"' + +# Constants for finding and downloading the latest Rust sources. +RUST_SRC_PATH = 'third_party/rust_src/src' RUST_CIPD_PATH = 'chromium/third_party/rust_src' +# This is the URL where we can download packages found in CIPD. +# The complete format is: +# https://chrome-infra-packages.appspot.com/dl/path../+/version +RUST_CIPD_DOWNLOAD_URL = f'https://chrome-infra-packages.appspot.com/dl' RUST_INSTANCES_REGEX = bytes('([0-9A-Za-z-_]+) │ .*? latest\W*\n', 'utf-8') RUST_CIPD_VERSION_REGEX = '([0-9]+)@([0-9]{4})-([0-9]{2})-([0-9]{2})' RUST_CIPD_DESCRIBE_REGEX = f'version:({RUST_CIPD_VERSION_REGEX})'.encode( @@ -198,6 +205,18 @@ return RustVersion.from_cipd_date(m.group(1).decode('utf-8'), sub_revision) +def FetchRust(rust_version): + print(f'Removing {RUST_SRC_PATH}.') + shutil.rmtree(RUST_SRC_PATH) + + print(f'Fetching Rust {rust_version} into {RUST_SRC_PATH}') + version_str = rust_version.string_with_dashes(with_tag=True) + DownloadAndUnpack( + f'{RUST_CIPD_DOWNLOAD_URL}/{RUST_CIPD_PATH}/+/version:{version_str}', + RUST_SRC_PATH, + is_known_zip=True) + + def PatchClangRevision(new_version: ClangVersion) -> ClangVersion: with open(CLANG_UPDATE_PY_PATH) as f: content = f.read() @@ -225,27 +244,12 @@ def PatchRustRevision(new_version: RustVersion) -> RustVersion: - verify_stage0 = subprocess.run([BUILD_RUST_PY_PATH, '--verify-stage0-hash'], - capture_output=True, - text=True) - if verify_stage0.returncode != 0: - # TODO(crbug.com/1405814): We're printing a warning that the hash has - # changed, but we could require a verification step of some sort here. We - # should do the same for both Rust and Clang if we do so. - print(verify_stage0.stdout) - lines = verify_stage0.stdout.splitlines() - m = re.match('Actual hash: +([0-9a-z]+)', lines[2]) - new_stage0_hash = m.group(1) - else: - new_stage0_hash = None - with open(RUST_UPDATE_PY_PATH) as f: content = f.read() REV = '\'([0-9]+)\'' SUB_REV = '([0-9]+)' TAG = '\'([0-9]+)\'' - STAGE0_HASH = '\'([0-9a-z]+)\'' tag = re.search(f'RUST_REVISION_TAG = {TAG}', content).group(1) date = re.search(f'RUST_REVISION = {REV}', content).group(1) @@ -264,11 +268,6 @@ f'RUST_SUB_REVISION = {new_version.sub_revision}', content, count=1) - if new_stage0_hash: - content = re.sub(f'STAGE0_JSON_SHA256 = {STAGE0_HASH}', - f'STAGE0_JSON_SHA256 = \'{new_stage0_hash}\'', - content, - count=1) with open(RUST_UPDATE_PY_PATH, 'w') as f: f.write(content) @@ -298,6 +297,46 @@ return old_version +def PatchRustStage0(): + verify_stage0 = subprocess.run([BUILD_RUST_PY_PATH, '--verify-stage0-hash'], + capture_output=True, + text=True) + if verify_stage0.returncode == 0: + return + + # TODO(crbug.com/1405814): We're printing a warning that the hash has + # changed, but we could require a verification step of some sort here. We + # should do the same for both Rust and Clang if we do so. + print(verify_stage0.stdout) + lines = verify_stage0.stdout.splitlines() + m = re.match('Actual hash: +([0-9a-z]+)', lines[2]) + new_stage0_hash = m.group(1) + + with open(RUST_UPDATE_PY_PATH) as f: + content = f.read() + + STAGE0_HASH = '\'([0-9a-z]+)\'' + content = re.sub(f'STAGE0_JSON_SHA256 = {STAGE0_HASH}', + f'STAGE0_JSON_SHA256 = \'{new_stage0_hash}\'', + content, + count=1) + with open(RUST_UPDATE_PY_PATH, 'w') as f: + f.write(content) + + +def PatchRustRemoveFallback(): + with open(RUST_UPDATE_PY_PATH) as f: + content = f.read() + + CLANG_HASH = '([0-9a-z-]+)' + content = re.sub(f'FALLBACK_CLANG_VERSION = \'{CLANG_HASH}\'', + f'FALLBACK_CLANG_VERSION = \'\'', + content, + count=1) + with open(RUST_UPDATE_PY_PATH, 'w') as f: + f.write(content) + + def Git(*args, no_run: bool): """Runs a git command, or just prints it out if `no_run` is True.""" if no_run: @@ -371,6 +410,8 @@ else: rust_version = GetLatestRustVersion(args.rust_sub_revision) + FetchRust(rust_version) + print((f'Making a patch for Clang {clang_version} and Rust {rust_version}')) branch_name = f'clang-{clang_version}_rust-{rust_version}' @@ -382,8 +423,10 @@ or rust_version != old_rust_version), ( 'Change the sub-revision of Clang or Rust if there is ' 'no major version change.') - # TODO: Turn the nightly dates into git hashes? + PatchRustStage0() + # TODO: Do this when we block Clang updates without a matching Rust compiler. + # PatchRustRemoveFallback() clang_change = f'{old_clang_version} : {clang_version}' clang_change_log = (
diff --git a/tools/gritsettings/resource_ids.spec b/tools/gritsettings/resource_ids.spec index 47696ff6..6c51249 100644 --- a/tools/gritsettings/resource_ids.spec +++ b/tools/gritsettings/resource_ids.spec
@@ -299,12 +299,20 @@ "META": {"sizes": {"includes": [5],}}, "includes": [1931], }, - "<(SHARED_INTERMEDIATE_DIR)/chrome/browser/resources/side_panel/reading_list/resources.grd": { + "<(SHARED_INTERMEDIATE_DIR)/chrome/browser/resources/side_panel/read_anything/resources.grd": { "META": {"sizes": {"includes": [10],}}, "includes": [1932], }, - "<(SHARED_INTERMEDIATE_DIR)/chrome/browser/resources/side_panel/side_panel_resources.grd": { - "META": {"sizes": {"includes": [50],}}, + "<(SHARED_INTERMEDIATE_DIR)/chrome/browser/resources/side_panel/reading_list/resources.grd": { + "META": {"sizes": {"includes": [10],}}, + "includes": [1933], + }, + "<(SHARED_INTERMEDIATE_DIR)/chrome/browser/resources/side_panel/shared/resources.grd": { + "META": {"sizes": {"includes": [10],}}, + "includes": [1934], + }, + "<(SHARED_INTERMEDIATE_DIR)/chrome/browser/resources/side_panel/user_notes/resources.grd": { + "META": {"sizes": {"includes": [10],}}, "includes": [1935], }, "<(SHARED_INTERMEDIATE_DIR)/chrome/browser/resources/settings/chromeos/os_settings_resources.grd": { @@ -346,6 +354,10 @@ "META": {"sizes": {"includes": [70]}}, "includes": [2130], }, + "<(SHARED_INTERMEDIATE_DIR)/chrome/browser/resources/web_app_internals/resources.grd": { + "META": {"sizes": {"includes": [10]}}, + "includes": [2135], + }, "<(SHARED_INTERMEDIATE_DIR)/chrome/browser/resources/whats_new/resources.grd": { "META": {"sizes": {"includes": [10]}}, "includes": [2140], @@ -765,6 +777,9 @@ "components/components_strings.grd": { "messages": [3580], }, + "components/headless/command_handler/headless_command.grd": { + "includes": [3590], + }, "components/omnibox/resources/omnibox_pedal_synonyms.grd": { "messages": [3600], }, @@ -979,10 +994,6 @@ "messages": [4380], }, - "headless/app/headless_command.grd": { - "includes": [4410], - }, - "mojo/public/js/mojo_bindings_resources.grd": { "includes": [4420], },
diff --git a/tools/mb/mb_config.pyl b/tools/mb/mb_config.pyl index 7bea9499..92e78d0a 100644 --- a/tools/mb/mb_config.pyl +++ b/tools/mb/mb_config.pyl
@@ -166,6 +166,7 @@ 'lacros-amd64-generic-rel-skylab': 'chromeos_amd64-generic_lacros_rel_skylab_reclient', 'lacros-arm-generic-rel': 'chromeos_arm-generic_lacros_rel_reclient', 'lacros-arm64-generic-rel': 'chromeos_arm64-generic_lacros_rel_reclient', + 'lacros-arm64-generic-rel-skylab': 'chromeos_arm64-generic_lacros_rel_skylab_reclient', 'linux-ash-chromium-generator-rel': 'chromeos_with_codecs_release_bot_reclient', 'linux-cfm-rel': 'linux_cfm_release_bot_reclient', 'linux-chromeos-dbg': 'chromeos_with_codecs_debug_bot_reclient', @@ -419,7 +420,7 @@ 'lacros-amd64-generic-rel (reclient)': 'chromeos_amd64-generic-vm_lacros_rel_reclient', 'lacros-amd64-generic-rel-fyi': 'chromeos_amd64-generic_lacros_rel_reclient', 'lacros-amd64-generic-rel-skylab-fyi': 'chromeos_amd64-generic_lacros_rel_skylab_reclient', - 'lacros-arm64-generic-rel-skylab-fyi': 'chromeos_arm64-generic_lacros_rel_fyi_reclient', + 'lacros-arm64-generic-rel-skylab-fyi': 'chromeos_arm64-generic_lacros_rel_skylab_reclient', 'linux-annotator-rel': 'release_bot_reclient', 'linux-backuprefptr-x64-fyi-rel': 'release_trybot_backuprefptr_x64_reclient', 'linux-blink-animation-use-time-delta': 'debug_bot_enable_blink_animation_use_time_delta_reclient', @@ -2142,14 +2143,14 @@ 'chromeos_arm64-generic-crostoolchain', 'lacros', 'release','is_skylab', ], - 'chromeos_arm64-generic_lacros_rel_fyi_reclient': [ - 'chromeos_arm64-generic-crostoolchain_reclient', 'lacros', 'release','is_skylab', - ], - 'chromeos_arm64-generic_lacros_rel_reclient': [ 'chromeos_arm64-generic-crostoolchain_reclient', 'lacros', 'release', ], + 'chromeos_arm64-generic_lacros_rel_skylab_reclient': [ + 'chromeos_arm64-generic-crostoolchain_reclient', 'lacros', 'release','is_skylab', + ], + 'chromeos_asan_lsan_fuzzer_v8_heap_release_bot_reclient': [ 'chromeos', 'asan', 'lsan', 'fuzzer', 'v8_heap', 'release_bot_reclient', ],
diff --git a/tools/mb/mb_config_expectations/chromium.chromiumos.json b/tools/mb/mb_config_expectations/chromium.chromiumos.json index 97b811e..75b1e41 100644 --- a/tools/mb/mb_config_expectations/chromium.chromiumos.json +++ b/tools/mb/mb_config_expectations/chromium.chromiumos.json
@@ -174,6 +174,19 @@ "use_remoteexec": true } }, + "lacros-arm64-generic-rel-skylab": { + "args_file": "//build/args/chromeos/arm64-generic-crostoolchain.gni", + "gn_args": { + "chromeos_is_browser_only": true, + "dcheck_always_on": false, + "is_chromeos_device": true, + "is_debug": false, + "is_skylab": true, + "ozone_platform_headless": true, + "target_os": "chromeos", + "use_remoteexec": true + } + }, "linux-ash-chromium-generator-rel": { "gn_args": { "dcheck_always_on": false,
diff --git a/tools/metrics/actions/actions.xml b/tools/metrics/actions/actions.xml index e435363..f1b795b 100644 --- a/tools/metrics/actions/actions.xml +++ b/tools/metrics/actions/actions.xml
@@ -905,7 +905,7 @@ </action> <action name="Accel_NewTabInGroup"> - <owner>connily@chromium.org</owner> + <owner>dpenning@chromium.org</owner> <owner>chrome-desktop-ui-sea@google.com</owner> <description> User added a new tab to the existing group by keyboard shortcut Ctrl-T. @@ -6066,7 +6066,7 @@ </action> <action name="CloseGroupedTab"> - <owner>connily@chromium.org</owner> + <owner>dpenning@chromium.org</owner> <owner>chrome-desktop-ui-sea@google.com</owner> <description>User closed a tab that belongs to a group.</description> </action> @@ -33627,7 +33627,7 @@ </action> <action name="TabContextMenu_NewTabInGroup"> - <owner>connily@chromium.org</owner> + <owner>dpenning@chromium.org</owner> <owner>chrome-desktop-ui-sea@google.com</owner> <description> User added a tab to an existing group by choosing 'Add to existing group' @@ -33825,7 +33825,7 @@ <obsolete> This action no longer occurs as of 11/2022. Tab groups can always collapse. </obsolete> - <owner>connily@chromium.org</owner> + <owner>dpenning@chromium.org</owner> <owner>chrome-desktop-ui-sea@google.com</owner> <description> User clicked on the tab group header of the last expanded tab group. This @@ -33834,13 +33834,13 @@ </action> <action name="TabGroups_SwitchGroupedTab"> - <owner>connily@chromium.org</owner> + <owner>dpenning@chromium.org</owner> <owner>chrome-desktop-ui-sea@google.com</owner> <description>User switched to a tab that belongs in a group.</description> </action> <action name="TabGroups_TabGroupBubble_CloseGroup"> - <owner>connily@chromium.org</owner> + <owner>dpenning@chromium.org</owner> <owner>chrome-desktop-ui-sea@google.com</owner> <description> User closed a group by choosing 'Close group' from the tab group editor @@ -33849,7 +33849,7 @@ </action> <action name="TabGroups_TabGroupBubble_ColorChanged"> - <owner>connily@chromium.org</owner> + <owner>dpenning@chromium.org</owner> <owner>chrome-desktop-ui-sea@google.com</owner> <description> User changed the color of a group through the color picker in the tab group @@ -33858,7 +33858,7 @@ </action> <action name="TabGroups_TabGroupBubble_GroupSaved"> - <owner>connily@chromium.org</owner> + <owner>dpenning@chromium.org</owner> <owner>chrome-desktop-ui-sea@google.com</owner> <description> User saved an existing tab group by switching the toggle to the right next @@ -33867,7 +33867,7 @@ </action> <action name="TabGroups_TabGroupBubble_GroupUnsaved"> - <owner>connily@chromium.org</owner> + <owner>dpenning@chromium.org</owner> <owner>chrome-desktop-ui-sea@google.com</owner> <description> User unsaved an existing tab group by switching the toggle to the left next @@ -33876,7 +33876,7 @@ </action> <action name="TabGroups_TabGroupBubble_NameChanged"> - <owner>connily@chromium.org</owner> + <owner>dpenning@chromium.org</owner> <owner>chrome-desktop-ui-sea@google.com</owner> <description> User changed the name of a group through the editor bubble. @@ -33884,7 +33884,7 @@ </action> <action name="TabGroups_TabGroupBubble_NewTabInGroup"> - <owner>connily@chromium.org</owner> + <owner>dpenning@chromium.org</owner> <owner>chrome-desktop-ui-sea@google.com</owner> <description> User added a new tab to an existing group by choosing 'New tab in group' @@ -33893,7 +33893,7 @@ </action> <action name="TabGroups_TabGroupBubble_SendFeedback"> - <owner>connily@chromium.org</owner> + <owner>dpenning@chromium.org</owner> <owner>chrome-desktop-ui-sea@google.com</owner> <description> User opened the feedback app by choosing 'Send feedback' from the tab group @@ -33902,7 +33902,7 @@ </action> <action name="TabGroups_TabGroupBubble_Ungroup"> - <owner>connily@chromium.org</owner> + <owner>dpenning@chromium.org</owner> <owner>chrome-desktop-ui-sea@google.com</owner> <description> User removed all tabs in a group from that group by choosing 'Ungroup' from @@ -33911,7 +33911,7 @@ </action> <action name="TabGroups_TabGroupHeader_Collapsed"> - <owner>connily@chromium.org</owner> + <owner>dpenning@chromium.org</owner> <owner>chrome-desktop-ui-sea@google.com</owner> <description> User clicked on the tab group header of an expanded tab group to collapse @@ -33920,7 +33920,7 @@ </action> <action name="TabGroups_TabGroupHeader_Expanded"> - <owner>connily@chromium.org</owner> + <owner>dpenning@chromium.org</owner> <owner>chrome-desktop-ui-sea@google.com</owner> <description> User clicked on the tab group header of a collapsed tab group to expand the @@ -35810,7 +35810,7 @@ </action> <action name="WrenchMenu_OpenRecentGroup"> - <owner>connily@chromium.org</owner> + <owner>dpenning@chromium.org</owner> <description>App Menu: Recently Closed: Open a recent group.</description> </action>
diff --git a/tools/metrics/histograms/enums.xml b/tools/metrics/histograms/enums.xml index 7bc5ded6..378544a 100644 --- a/tools/metrics/histograms/enums.xml +++ b/tools/metrics/histograms/enums.xml
@@ -58811,6 +58811,8 @@ <int value="-1218063855" label="MediaAppAnnotation:disabled"/> <int value="-1217623062" label="AutofillAlwaysReturnCloudTokenizedCard:disabled"/> + <int value="-1217600112" + label="AccessibilityAcceleratorNotificationsTimeout:disabled"/> <int value="-1217462552" label="OmniboxUIExperimentHideSteadyStateUrlTrivialSubdomains:disabled"/> <int value="-1217425153" label="ChromeHomeClearUrlOnOpen:enabled"/> @@ -59809,6 +59811,8 @@ <int value="-645455405" label="MacViewsNativeDialogs:enabled"/> <int value="-644550997" label="AutofillPreventOverridingPrefilledValues:disabled"/> + <int value="-644402170" + label="AccessibilityAcceleratorNotificationsTimeout:enabled"/> <int value="-643217597" label="EduCoexistenceConsentLog:enabled"/> <int value="-642346675" label="DesktopPWAsAttentionBadgingCrOS:enabled"/> <int value="-641846393" label="WebViewLegacyTlsSupport:enabled"/> @@ -61574,6 +61578,7 @@ <int value="390360656" label="TrustSafetySentimentSurvey:enabled"/> <int value="391632490" label="NtpDriveModule:enabled"/> <int value="392107748" label="PwaUpdateDialogForIcon:disabled"/> + <int value="392154827" label="BaselineGM3SurfaceColors:enabled"/> <int value="392782890" label="SafeBrowsingTelemetryForApkDownloads:enabled"/> <int value="393569083" label="OmniboxMatchToolbarAndStatusBarColor:enabled"/> <int value="393704200" label="account-consistency"/> @@ -63990,6 +63995,7 @@ <int value="1814854881" label="NearbySharingSelfShareUI:disabled"/> <int value="1815186008" label="SearchResumptionModuleAndroid:enabled"/> <int value="1816174635" label="RequestUnbufferedDispatch:enabled"/> + <int value="1816515324" label="BaselineGM3SurfaceColors:disabled"/> <int value="1816723085" label="SchemefulSameSite:enabled"/> <int value="1816816375" label="MediaAppHandlesAudio:disabled"/> <int value="1816843861" label="ServiceWorkerServicification:enabled"/>
diff --git a/tools/metrics/histograms/metadata/METRIC_REVIEWER_OWNERS b/tools/metrics/histograms/metadata/METRIC_REVIEWER_OWNERS index 2a389ae..c222a6e 100644 --- a/tools/metrics/histograms/metadata/METRIC_REVIEWER_OWNERS +++ b/tools/metrics/histograms/metadata/METRIC_REVIEWER_OWNERS
@@ -285,6 +285,7 @@ tby@chromium.org # prefetch curranmax@chromium.org +spelchat@chromium.org tbansal@chromium.org toyoshim@chromium.org # printing
diff --git a/tools/metrics/histograms/metadata/accessibility/histograms.xml b/tools/metrics/histograms/metadata/accessibility/histograms.xml index 55f939b..9708573 100644 --- a/tools/metrics/histograms/metadata/accessibility/histograms.xml +++ b/tools/metrics/histograms/metadata/accessibility/histograms.xml
@@ -1734,6 +1734,24 @@ </summary> </histogram> +<histogram name="Accessibility.ScreenAI.Screen2xDistillationTime.{Result}" + units="ms" expires_after="2023-11-30"> + <owner>abigailbklein@google.com</owner> + <owner>rhalavati@google.com</owner> + <owner>kyungjunlee@google.com</owner> + <owner>chrome-a11y-core@google.com</owner> + <summary> + Records the time taken to distill a web page for cases where the action + {Result}. It's being emitted each time whenever it distills or fails to + distill a page. for Screen2x. Refer to + ScreenAIService::ExtractMainContentInternal for details. + </summary> + <token key="Result"> + <variant name="Failure" summary="has failed"/> + <variant name="Success" summary="has succeeded"/> + </token> +</histogram> + <histogram name="Accessibility.ScreenAI.VisualAnnotator.NodesCount" units="count" expires_after="2023-11-30"> <owner>kyungjunlee@google.com</owner>
diff --git a/tools/metrics/histograms/metadata/chromeos/histograms.xml b/tools/metrics/histograms/metadata/chromeos/histograms.xml index c393f59..9ed67d8 100644 --- a/tools/metrics/histograms/metadata/chromeos/histograms.xml +++ b/tools/metrics/histograms/metadata/chromeos/histograms.xml
@@ -625,7 +625,7 @@ </histogram> <histogram name="ChromeOS.CWP.CollectProcessTypes" - enum="ChromeOSProcessTypeCollectionStatus" expires_after="2023-01-19"> + enum="ChromeOSProcessTypeCollectionStatus" expires_after="2024-01-19"> <owner>aalexand@google.com</owner> <owner>cwp-team@google.com</owner> <summary> @@ -850,7 +850,7 @@ </histogram> <histogram name="ChromeOS.DiagnosticsUi.MemoryRoutineDuration" units="s" - expires_after="2023-02-12"> + expires_after="2024-02-12"> <owner>ashleydp@google.com</owner> <owner>gavinwill@chromium.org</owner> <owner>zentaro@chromium.org</owner> @@ -887,7 +887,7 @@ </histogram> <histogram name="ChromeOS.DiagnosticsUi.{NavigationView}.OpenDuration" - units="ms" expires_after="2023-02-12"> + units="ms" expires_after="2024-02-12"> <owner>ashleydp@google.com</owner> <owner>gavinwill@chromium.org</owner> <owner>zentaro@chromium.org</owner>
diff --git a/tools/metrics/histograms/metadata/compositing/histograms.xml b/tools/metrics/histograms/metadata/compositing/histograms.xml index 329a835..7d36471 100644 --- a/tools/metrics/histograms/metadata/compositing/histograms.xml +++ b/tools/metrics/histograms/metadata/compositing/histograms.xml
@@ -606,19 +606,6 @@ </token> </histogram> -<histogram - name="Compositing.Renderer.LayerSkippedForDrawPropertiesDueToBackface" - units="boolean" expires_after="2023-01-31"> - <owner>chrishtr@chromium.org</owner> - <owner>dbaron@chromium.org</owner> - <owner>paint-dev@chromium.org</owner> - <summary> - Records whether layer draw properties updates were skipped due to the layer - being back-facing and not being double-sided, but were otherwise going to be - updated. - </summary> -</histogram> - <histogram name="Compositing.Renderer.LayersUpdateTime" units="microseconds" expires_after="2023-06-25"> <owner>schenney@chromium.org</owner> @@ -635,18 +622,6 @@ </summary> </histogram> -<histogram name="Compositing.Renderer.LayerUpdateSkippedDueToBackface" - units="boolean" expires_after="2023-01-31"> - <owner>chrishtr@chromium.org</owner> - <owner>dbaron@chromium.org</owner> - <owner>paint-dev@chromium.org</owner> - <summary> - Records whether a layer update was skipped due to the layer being - back-facing and not being double-sided, but was otherwise going to be - updated. - </summary> -</histogram> - <histogram name="Compositing.Renderer.LCDTextDisallowedReasonKPixels" enum="LCDTextDisallowedReason" expires_after="2023-06-18"> <owner>wangxianzhu@chromium.org</owner>
diff --git a/tools/metrics/histograms/metadata/history/histograms.xml b/tools/metrics/histograms/metadata/history/histograms.xml index e7af677e..8980f7c 100644 --- a/tools/metrics/histograms/metadata/history/histograms.xml +++ b/tools/metrics/histograms/metadata/history/histograms.xml
@@ -1079,6 +1079,45 @@ </summary> </histogram> +<histogram name="History.Clusters.Backend.UpdateClusters.Counts.{Segment}" + units="count" expires_after="2023-10-01"> + <owner>manukh@chromium.org</owner> + <owner>chrome-journeys@google.com</owner> + <component>UI>Browser>Journeys</component> + <summary> + Near startup and every 1 hour afterwards, unclustered visits are clustered, + and the clusters are persisted in the history DB. + + As needed, both fresh and persisted clusters are fetched. Clusters are + fetched for: a) displaying on the Journeys WebUI and b) generating keyword + caches to match with omnibox inputs and show journey chips or suggestions in + the omnibox. + + Each update consists of multiple batches of 1-3 days. The number of batches + depends on how long ago the last update occurred, which could have been 0-90 + days ago. + + Recorded for every batch of visits clustered; can be recorded more than once + every hour. + + {Segment} + </summary> + <token key="Segment"> + <variant name="NumClustersReplaced" + summary="This slice records the number of clusters included in the + visits and therefore replaced from the DB. Not recorded if + there were 0 visits. Recorded even if there were 0 model + clusters or 0 replaced clusters."/> + <variant name="NumClustersReturned" + summary="This slice records the number of clusters returned from the + cluster model. Not recorded if there were 0 visits. Recorded + een if there were 0 clusters."/> + <variant name="NumVisitsToCluster" + summary="This slice records the number of visits returned and sent to + the cluster model. Recorded even if there were 0 visits."/> + </token> +</histogram> + <histogram name="History.Clusters.Backend.UpdateClusters.{Segment}" units="ms" expires_after="2023-10-01"> <owner>manukh@chromium.org</owner>
diff --git a/tools/metrics/histograms/metadata/prefetch/OWNERS b/tools/metrics/histograms/metadata/prefetch/OWNERS index 4e554bb4..f551e9a 100644 --- a/tools/metrics/histograms/metadata/prefetch/OWNERS +++ b/tools/metrics/histograms/metadata/prefetch/OWNERS
@@ -3,5 +3,6 @@ # Prefer sending CLs to the owners listed below. # Use chromium-metrics-reviews@google.com as a backup. curranmax@chromium.org +spelchat@chromium.org tbansal@chromium.org toyoshim@chromium.org
diff --git a/tools/metrics/histograms/metadata/tab/histograms.xml b/tools/metrics/histograms/metadata/tab/histograms.xml index 081932c7..342b2d8 100644 --- a/tools/metrics/histograms/metadata/tab/histograms.xml +++ b/tools/metrics/histograms/metadata/tab/histograms.xml
@@ -727,7 +727,7 @@ <histogram name="TabGroups.CollapsedGroupCountPerLoad" units="groups" expires_after="2023-06-18"> - <owner>connily@chromium.org</owner> + <owner>dpenning@chromium.org</owner> <owner>chrome-desktop-ui-sea@google.com</owner> <summary> The number of tabs groups that are collapsed in all browsers (counting @@ -737,7 +737,7 @@ <histogram name="TabGroups.CollapsedTabCount" units="tabs" expires_after="2021-09-12"> - <owner>connily@chromium.org</owner> + <owner>dpenning@chromium.org</owner> <owner>chrome-desktop-ui-sea@google.com</owner> <summary> The number of tabs in a collapsed tab group in all browsers, reported every @@ -747,7 +747,7 @@ <histogram name="TabGroups.NonZeroUserGroupCountPerLoad" units="groups" expires_after="2021-09-12"> - <owner>connily@chromium.org</owner> + <owner>dpenning@chromium.org</owner> <owner>chrome-desktop-ui-sea@google.com</owner> <summary> The number of (non-zero) tabs groups open in all browsers (counting app-mode @@ -769,7 +769,7 @@ <histogram name="TabGroups.TimeSpentCollapsed2" units="seconds" expires_after="2021-09-12"> - <owner>connily@chromium.org</owner> + <owner>dpenning@chromium.org</owner> <owner>chrome-desktop-ui-sea@google.com</owner> <summary> The time a tab group spends in the collapsed state before the group is @@ -779,7 +779,7 @@ <histogram name="TabGroups.TimeSpentExpanded2" units="seconds" expires_after="2021-09-12"> - <owner>connily@chromium.org</owner> + <owner>dpenning@chromium.org</owner> <owner>chrome-desktop-ui-sea@google.com</owner> <summary> The time a tab group spends in the expanded state before the group is either @@ -789,7 +789,7 @@ <histogram name="TabGroups.UserCustomizedGroupCountPerLoad" units="groups" expires_after="2023-07-02"> - <owner>connily@chromium.org</owner> + <owner>dpenning@chromium.org</owner> <owner>chrome-desktop-ui-sea@google.com</owner> <summary> The number of tabs groups with a user-set name or color open in all browsers @@ -809,7 +809,7 @@ <histogram name="TabGroups.UserGroupCountPerLoad" units="groups" expires_after="2023-06-18"> - <owner>connily@chromium.org</owner> + <owner>dpenning@chromium.org</owner> <owner>chrome-desktop-ui-sea@google.com</owner> <summary> The number of tabs groups open in all browsers (counting app-mode windows) @@ -1950,7 +1950,7 @@ <histogram name="Tabs.TabCountInGroupPerLoad" units="tabs" expires_after="2023-06-18"> - <owner>connily@chromium.org</owner> + <owner>dpenning@chromium.org</owner> <owner>chrome-desktop-ui-sea@google.com</owner> <summary> The number of tabs in the current active group when a load completes. @@ -1985,7 +1985,7 @@ <histogram name="Tabs.TabCountPerDomainPerLoad.{TotalTabCountBucket}" units="tabs" expires_after="2021-06-30"> - <owner>connily@chromium.org</owner> + <owner>dpenning@chromium.org</owner> <owner>chrome-desktop-ui-sea@google.com</owner> <summary> The number of tabs across all browsers (counting app-mode windows) with the @@ -2821,7 +2821,7 @@ </histogram> <histogram name="TabStrip.TimeToSwitch" units="ms" expires_after="2023-06-18"> - <owner>connily@chromium.org</owner> + <owner>dpenning@chromium.org</owner> <owner>chrome-desktop-ui-sea@google.com</owner> <summary> The amount of time from cursor entering the tabstrip to first click on a tab
diff --git a/tools/perf/core/shard_maps/fuchsia-perf-ast_map.json b/tools/perf/core/shard_maps/fuchsia-perf-ast_map.json index 79a61af..bcd3f484 100644 --- a/tools/perf/core/shard_maps/fuchsia-perf-ast_map.json +++ b/tools/perf/core/shard_maps/fuchsia-perf-ast_map.json
@@ -6,7 +6,7 @@ "--test-launcher-jobs=1", "--test-launcher-retry-limit=0", "-d", - "--os-check=check", + "--os-check=update", "--system-image-dir=../../third_party/fuchsia-sdk/images-internal/astro-release/smart_display_eng_arrested" ], "path": "bin/run_base_perftests" @@ -26,11 +26,11 @@ }, "extra_infos": { "num_stories": 18, - "predicted_min_shard_time": 615.0, + "predicted_min_shard_time": 731.0, "predicted_min_shard_index": 1, "predicted_max_shard_time": 900.0, "predicted_max_shard_index": 0, "shard #0": 900.0, - "shard #1": 615.0 + "shard #1": 731.0 } } \ No newline at end of file
diff --git a/tools/perf/core/shard_maps/fuchsia-perf-atlas-fyi_map.json b/tools/perf/core/shard_maps/fuchsia-perf-atlas-fyi_map.json index 3906bec..fd3a332a 100644 --- a/tools/perf/core/shard_maps/fuchsia-perf-atlas-fyi_map.json +++ b/tools/perf/core/shard_maps/fuchsia-perf-atlas-fyi_map.json
@@ -1,24 +1,25 @@ { "0": { + "benchmarks": { + "jetstream": { + "abridged": false + } + }, "executables": { "base_perftests": { "arguments": [ "--test-launcher-jobs=1", "--test-launcher-retry-limit=0", "-d", - "--os-check=check", + "--os-check=update", "--system-image-dir=workstation_eng.chromebook-x64" ], "path": "bin/run_base_perftests" } - }, - "benchmarks": {} + } }, "1": { "benchmarks": { - "jetstream": { - "abridged": false - }, "jetstream2": { "abridged": false }, @@ -35,7 +36,7 @@ "--test-launcher-jobs=1", "--test-launcher-retry-limit=0", "-d", - "--os-check=check", + "--os-check=update", "--system-image-dir=workstation_eng.chromebook-x64" ], "path": "bin/run_sync_performance_tests" @@ -45,7 +46,7 @@ "2": { "benchmarks": { "system_health.common_desktop": { - "end": 41, + "end": 51, "abridged": false } } @@ -53,20 +54,20 @@ "3": { "benchmarks": { "system_health.common_desktop": { - "begin": 41, + "begin": 51, "abridged": false } } }, "extra_infos": { "num_stories": 87, - "predicted_min_shard_time": 400, - "predicted_min_shard_index": 3, - "predicted_max_shard_time": 940.0, + "predicted_min_shard_time": 1178.0, + "predicted_min_shard_index": 0, + "predicted_max_shard_time": 1464.0, "predicted_max_shard_index": 1, - "shard #0": 900.0, - "shard #1": 940.0, - "shard #2": 410, - "shard #3": 400 + "shard #0": 1178.0, + "shard #1": 1464.0, + "shard #2": 1261.0, + "shard #3": 1269.0 } } \ No newline at end of file
diff --git a/tools/perf/core/shard_maps/fuchsia-perf-fyi_map.json b/tools/perf/core/shard_maps/fuchsia-perf-fyi_map.json index baa17fc..53c6bc3 100644 --- a/tools/perf/core/shard_maps/fuchsia-perf-fyi_map.json +++ b/tools/perf/core/shard_maps/fuchsia-perf-fyi_map.json
@@ -5,7 +5,7 @@ "abridged": false }, "rendering.mobile": { - "end": 51, + "end": 56, "abridged": false } } @@ -13,8 +13,8 @@ "1": { "benchmarks": { "rendering.mobile": { - "begin": 51, - "end": 101, + "begin": 56, + "end": 102, "abridged": false } } @@ -22,8 +22,8 @@ "2": { "benchmarks": { "rendering.mobile": { - "begin": 101, - "end": 162, + "begin": 102, + "end": 163, "abridged": false } } @@ -31,7 +31,7 @@ "3": { "benchmarks": { "rendering.mobile": { - "begin": 162, + "begin": 163, "end": 256, "abridged": false } @@ -41,7 +41,7 @@ "benchmarks": { "rendering.mobile": { "begin": 256, - "end": 318, + "end": 323, "abridged": false } } @@ -49,8 +49,8 @@ "5": { "benchmarks": { "rendering.mobile": { - "begin": 318, - "end": 363, + "begin": 323, + "end": 366, "abridged": false } } @@ -58,8 +58,8 @@ "6": { "benchmarks": { "rendering.mobile": { - "begin": 363, - "end": 412, + "begin": 366, + "end": 413, "abridged": false } } @@ -67,11 +67,11 @@ "7": { "benchmarks": { "rendering.mobile": { - "begin": 412, + "begin": 413, "abridged": false }, "system_health.memory_desktop": { - "end": 28, + "end": 32, "abridged": false } } @@ -79,8 +79,8 @@ "8": { "benchmarks": { "system_health.memory_desktop": { - "begin": 28, - "end": 50, + "begin": 32, + "end": 53, "abridged": false } } @@ -88,26 +88,26 @@ "9": { "benchmarks": { "system_health.memory_desktop": { - "begin": 50, + "begin": 53, "abridged": false } } }, "extra_infos": { "num_stories": 504, - "predicted_min_shard_time": 1240.0, - "predicted_min_shard_index": 9, - "predicted_max_shard_time": 1332.0, - "predicted_max_shard_index": 8, - "shard #0": 1297.0, - "shard #1": 1299.0, - "shard #2": 1288.0, - "shard #3": 1288.0, - "shard #4": 1294.0, - "shard #5": 1288.0, - "shard #6": 1293.0, - "shard #7": 1263.0, - "shard #8": 1332.0, - "shard #9": 1240.0 + "predicted_min_shard_time": 1324.0, + "predicted_min_shard_index": 0, + "predicted_max_shard_time": 1385.0, + "predicted_max_shard_index": 6, + "shard #0": 1324.0, + "shard #1": 1365.0, + "shard #2": 1341.0, + "shard #3": 1336.0, + "shard #4": 1343.0, + "shard #5": 1341.0, + "shard #6": 1385.0, + "shard #7": 1355.0, + "shard #8": 1324.0, + "shard #9": 1365.0 } } \ No newline at end of file
diff --git a/tools/perf/core/shard_maps/fuchsia-perf-nsn_map.json b/tools/perf/core/shard_maps/fuchsia-perf-nsn_map.json index e8a8727..ff1752bb 100644 --- a/tools/perf/core/shard_maps/fuchsia-perf-nsn_map.json +++ b/tools/perf/core/shard_maps/fuchsia-perf-nsn_map.json
@@ -6,7 +6,7 @@ "--test-launcher-jobs=1", "--test-launcher-retry-limit=0", "-d", - "--os-check=check", + "--os-check=update", "--system-image-dir=../../third_party/fuchsia-sdk/images-internal/nelson-release/smart_display_m3_eng_paused" ], "path": "bin/run_base_perftests" @@ -26,11 +26,11 @@ }, "extra_infos": { "num_stories": 18, - "predicted_min_shard_time": 170, + "predicted_min_shard_time": 683.0, "predicted_min_shard_index": 1, "predicted_max_shard_time": 900.0, "predicted_max_shard_index": 0, "shard #0": 900.0, - "shard #1": 170 + "shard #1": 683.0 } } \ No newline at end of file
diff --git a/tools/perf/core/shard_maps/fuchsia-perf-nuc-fyi_map.json b/tools/perf/core/shard_maps/fuchsia-perf-nuc-fyi_map.json index 51dae71d..b5273cd 100644 --- a/tools/perf/core/shard_maps/fuchsia-perf-nuc-fyi_map.json +++ b/tools/perf/core/shard_maps/fuchsia-perf-nuc-fyi_map.json
@@ -6,7 +6,7 @@ "--test-launcher-jobs=1", "--test-launcher-retry-limit=0", "-d", - "--os-check=check", + "--os-check=update", "--system-image-dir=workstation_eng.x64" ], "path": "bin/run_base_perftests" @@ -35,7 +35,7 @@ "--test-launcher-jobs=1", "--test-launcher-retry-limit=0", "-d", - "--os-check=check", + "--os-check=update", "--system-image-dir=workstation_eng.x64" ], "path": "bin/run_sync_performance_tests"
diff --git a/tools/perf/core/shard_maps/fuchsia-perf-sherlock-fyi_map.json b/tools/perf/core/shard_maps/fuchsia-perf-sherlock-fyi_map.json index e1f57e8..e306a09 100644 --- a/tools/perf/core/shard_maps/fuchsia-perf-sherlock-fyi_map.json +++ b/tools/perf/core/shard_maps/fuchsia-perf-sherlock-fyi_map.json
@@ -5,7 +5,7 @@ "abridged": false }, "rendering.mobile": { - "end": 77, + "end": 85, "abridged": false } } @@ -13,8 +13,8 @@ "1": { "benchmarks": { "rendering.mobile": { - "begin": 77, - "end": 165, + "begin": 85, + "end": 174, "abridged": false } } @@ -22,8 +22,8 @@ "2": { "benchmarks": { "rendering.mobile": { - "begin": 165, - "end": 300, + "begin": 174, + "end": 320, "abridged": false } } @@ -31,8 +31,8 @@ "3": { "benchmarks": { "rendering.mobile": { - "begin": 300, - "end": 388, + "begin": 320, + "end": 398, "abridged": false } } @@ -40,11 +40,11 @@ "4": { "benchmarks": { "rendering.mobile": { - "begin": 388, + "begin": 398, "abridged": false }, "system_health.memory_desktop": { - "end": 33, + "end": 38, "abridged": false } } @@ -52,22 +52,22 @@ "5": { "benchmarks": { "system_health.memory_desktop": { - "begin": 33, + "begin": 38, "abridged": false } } }, "extra_infos": { "num_stories": 504, - "predicted_min_shard_time": 2032.0, - "predicted_min_shard_index": 2, - "predicted_max_shard_time": 2058.0, - "predicted_max_shard_index": 1, - "shard #0": 2052.0, - "shard #1": 2058.0, - "shard #2": 2032.0, - "shard #3": 2047.0, - "shard #4": 2040.0, - "shard #5": 2045.0 + "predicted_min_shard_time": 2078.0, + "predicted_min_shard_index": 4, + "predicted_max_shard_time": 2096.0, + "predicted_max_shard_index": 2, + "shard #0": 2086.0, + "shard #1": 2089.0, + "shard #2": 2096.0, + "shard #3": 2080.0, + "shard #4": 2078.0, + "shard #5": 2095.0 } } \ No newline at end of file
diff --git a/tools/perf/core/shard_maps/fuchsia-perf-shk_map.json b/tools/perf/core/shard_maps/fuchsia-perf-shk_map.json index c9edfa7..2bfefe84 100644 --- a/tools/perf/core/shard_maps/fuchsia-perf-shk_map.json +++ b/tools/perf/core/shard_maps/fuchsia-perf-shk_map.json
@@ -6,7 +6,7 @@ "--test-launcher-jobs=1", "--test-launcher-retry-limit=0", "-d", - "--os-check=check", + "--os-check=update", "--system-image-dir=../../third_party/fuchsia-sdk/images-internal/sherlock-release/smart_display_max_eng_arrested" ], "path": "bin/run_base_perftests" @@ -26,11 +26,11 @@ }, "extra_infos": { "num_stories": 18, - "predicted_min_shard_time": 628.0, + "predicted_min_shard_time": 623.0, "predicted_min_shard_index": 1, "predicted_max_shard_time": 900.0, "predicted_max_shard_index": 0, "shard #0": 900.0, - "shard #1": 628.0 + "shard #1": 623.0 } } \ No newline at end of file
diff --git a/tools/perf/core/shard_maps/timing_data/fuchsia-perf-ast_timing.json b/tools/perf/core/shard_maps/timing_data/fuchsia-perf-ast_timing.json index 45ee631d..341dcfa4 100644 --- a/tools/perf/core/shard_maps/timing_data/fuchsia-perf-ast_timing.json +++ b/tools/perf/core/shard_maps/timing_data/fuchsia-perf-ast_timing.json
@@ -1,6 +1,70 @@ [ { - "duration": "455.0", + "duration": "12.0", + "name": "media.mobile/mse.html?media=aac_audio.mp4" + }, + { + "duration": "13.0", + "name": "media.mobile/mse.html?media=aac_audio.mp4,h264_video.mp4" + }, + { + "duration": "12.0", + "name": "media.mobile/mse.html?media=h264_video.mp4" + }, + { + "duration": "18.0", + "name": "media.mobile/mse.html?media=tulip2.vp9.webm" + }, + { + "duration": "3.0", + "name": "media.mobile/video.html?src=boat_1080p60fps_vp9.webm" + }, + { + "duration": "3.0", + "name": "media.mobile/video.html?src=foodmarket_720p30fps.mp4" + }, + { + "duration": "25.0", + "name": "media.mobile/video.html?src=tulip2.m4a&type=audio" + }, + { + "duration": "24.0", + "name": "media.mobile/video.html?src=tulip2.mp3&type=audio" + }, + { + "duration": "7.0", + "name": "media.mobile/video.html?src=tulip2.mp3&type=audio&seek" + }, + { + "duration": "26.0", + "name": "media.mobile/video.html?src=tulip2.mp4" + }, + { + "duration": "27.0", + "name": "media.mobile/video.html?src=tulip2.mp4&busyjs" + }, + { + "duration": "40.0", + "name": "media.mobile/video.html?src=tulip2.ogg&type=audio" + }, + { + "duration": "8.0", + "name": "media.mobile/video.html?src=tulip2.ogg&type=audio&seek" + }, + { + "duration": "26.0", + "name": "media.mobile/video.html?src=tulip2.vp9.webm" + }, + { + "duration": "3.0", + "name": "media.mobile/video.html?src=tulip2.vp9.webm&background" + }, + { + "duration": "27.0", + "name": "media.mobile/video.html?src=tulip2.vp9.webm_WiFi" + }, + { + "duration": "457.0", "name": "speedometer2/Speedometer2" }, {
diff --git a/tools/perf/core/shard_maps/timing_data/fuchsia-perf-atlas-fyi_timing.json b/tools/perf/core/shard_maps/timing_data/fuchsia-perf-atlas-fyi_timing.json index b7976a1..b966888 100644 --- a/tools/perf/core/shard_maps/timing_data/fuchsia-perf-atlas-fyi_timing.json +++ b/tools/perf/core/shard_maps/timing_data/fuchsia-perf-atlas-fyi_timing.json
@@ -1,5 +1,341 @@ [ { + "duration": "278.0", + "name": "jetstream/JetStream" + }, + { + "duration": "365.0", + "name": "jetstream2/JetStream2" + }, + { + "duration": "71.0", + "name": "speedometer/http://browserbench.org/Speedometer/" + }, + { + "duration": "128.0", + "name": "speedometer2/Speedometer2" + }, + { + "duration": "33.0", + "name": "system_health.common_desktop/browse:media:googleplaystore:2021" + }, + { + "duration": "4.0", + "name": "system_health.common_desktop/browse:media:imgur" + }, + { + "duration": "98.0", + "name": "system_health.common_desktop/browse:media:pinterest:2018" + }, + { + "duration": "62.0", + "name": "system_health.common_desktop/browse:media:tumblr:2018" + }, + { + "duration": "6.0", + "name": "system_health.common_desktop/browse:media:youtube:2019" + }, + { + "duration": "70.0", + "name": "system_health.common_desktop/browse:media:youtubetv:2019" + }, + { + "duration": "76.0", + "name": "system_health.common_desktop/browse:media:youtubetv_watch:2020" + }, + { + "duration": "51.0", + "name": "system_health.common_desktop/browse:news:cnn:2021" + }, + { + "duration": "49.0", + "name": "system_health.common_desktop/browse:news:flipboard:2020" + }, + { + "duration": "52.0", + "name": "system_health.common_desktop/browse:news:hackernews:2020" + }, + { + "duration": "81.0", + "name": "system_health.common_desktop/browse:news:nytimes:2020" + }, + { + "duration": "78.0", + "name": "system_health.common_desktop/browse:news:reddit:2020" + }, + { + "duration": "48.0", + "name": "system_health.common_desktop/browse:search:google:2020" + }, + { + "duration": "32.0", + "name": "system_health.common_desktop/browse:search:google_india:2021" + }, + { + "duration": "71.0", + "name": "system_health.common_desktop/browse:social:facebook_infinite_scroll:2018" + }, + { + "duration": "62.0", + "name": "system_health.common_desktop/browse:social:tumblr_infinite_scroll:2018" + }, + { + "duration": "52.0", + "name": "system_health.common_desktop/browse:social:twitter:2018" + }, + { + "duration": "67.0", + "name": "system_health.common_desktop/browse:social:twitter_infinite_scroll:2018" + }, + { + "duration": "4.0", + "name": "system_health.common_desktop/browse:tech:discourse_infinite_scroll:2018" + }, + { + "duration": "49.0", + "name": "system_health.common_desktop/browse:tools:autocad:2021" + }, + { + "duration": "38.0", + "name": "system_health.common_desktop/browse:tools:docs_scrolling" + }, + { + "duration": "4.0", + "name": "system_health.common_desktop/browse:tools:gmail-compose:2020" + }, + { + "duration": "4.0", + "name": "system_health.common_desktop/browse:tools:gmail-labelclick:2020" + }, + { + "duration": "40.0", + "name": "system_health.common_desktop/browse:tools:gmail-openconversation:2020" + }, + { + "duration": "4.0", + "name": "system_health.common_desktop/browse:tools:gmail-search:2020" + }, + { + "duration": "77.0", + "name": "system_health.common_desktop/browse:tools:maps:2019" + }, + { + "duration": "6.0", + "name": "system_health.common_desktop/browse:tools:photoshop:2021" + }, + { + "duration": "6.0", + "name": "system_health.common_desktop/browse:tools:photoshop_warm:2021" + }, + { + "duration": "4.0", + "name": "system_health.common_desktop/browse:tools:sheets:2019" + }, + { + "duration": "4.0", + "name": "system_health.common_desktop/browse_accessibility:media:youtube" + }, + { + "duration": "27.0", + "name": "system_health.common_desktop/browse_accessibility:tech:codesearch:2018" + }, + { + "duration": "17.0", + "name": "system_health.common_desktop/load:chrome:blank" + }, + { + "duration": "18.0", + "name": "system_health.common_desktop/load:games:alphabetty:2018" + }, + { + "duration": "16.0", + "name": "system_health.common_desktop/load:games:bubbles:2020" + }, + { + "duration": "23.0", + "name": "system_health.common_desktop/load:games:lazors" + }, + { + "duration": "24.0", + "name": "system_health.common_desktop/load:games:miniclip:2018" + }, + { + "duration": "26.0", + "name": "system_health.common_desktop/load:games:spychase:2018" + }, + { + "duration": "20.0", + "name": "system_health.common_desktop/load:media:9gag" + }, + { + "duration": "19.0", + "name": "system_health.common_desktop/load:media:dailymotion:2019" + }, + { + "duration": "20.0", + "name": "system_health.common_desktop/load:media:facebook_feed:desktop:2020" + }, + { + "duration": "20.0", + "name": "system_health.common_desktop/load:media:facebook_photos:2018" + }, + { + "duration": "19.0", + "name": "system_health.common_desktop/load:media:facebook_photos:desktop:2020" + }, + { + "duration": "18.0", + "name": "system_health.common_desktop/load:media:flickr:2018" + }, + { + "duration": "6.0", + "name": "system_health.common_desktop/load:media:google_images:2018" + }, + { + "duration": "23.0", + "name": "system_health.common_desktop/load:media:imgur:2018" + }, + { + "duration": "26.0", + "name": "system_health.common_desktop/load:media:soundcloud:2018" + }, + { + "duration": "22.0", + "name": "system_health.common_desktop/load:media:youtube:2018" + }, + { + "duration": "22.0", + "name": "system_health.common_desktop/load:media:youtubelivingroom:2020" + }, + { + "duration": "18.0", + "name": "system_health.common_desktop/load:news:bbc:2018" + }, + { + "duration": "20.0", + "name": "system_health.common_desktop/load:news:cnn:2020" + }, + { + "duration": "18.0", + "name": "system_health.common_desktop/load:news:flipboard" + }, + { + "duration": "21.0", + "name": "system_health.common_desktop/load:news:hackernews:2018" + }, + { + "duration": "24.0", + "name": "system_health.common_desktop/load:news:nytimes:2018" + }, + { + "duration": "21.0", + "name": "system_health.common_desktop/load:news:qq:2018" + }, + { + "duration": "24.0", + "name": "system_health.common_desktop/load:news:reddit:2018" + }, + { + "duration": "20.0", + "name": "system_health.common_desktop/load:news:wikipedia:2018" + }, + { + "duration": "18.0", + "name": "system_health.common_desktop/load:search:amazon:2018" + }, + { + "duration": "17.0", + "name": "system_health.common_desktop/load:search:baidu:2018" + }, + { + "duration": "17.0", + "name": "system_health.common_desktop/load:search:ebay:2018" + }, + { + "duration": "18.0", + "name": "system_health.common_desktop/load:search:flipkart:2018" + }, + { + "duration": "22.0", + "name": "system_health.common_desktop/load:search:google:2018" + }, + { + "duration": "21.0", + "name": "system_health.common_desktop/load:search:taobao:2018" + }, + { + "duration": "21.0", + "name": "system_health.common_desktop/load:search:yahoo:2018" + }, + { + "duration": "22.0", + "name": "system_health.common_desktop/load:search:yandex:2018" + }, + { + "duration": "20.0", + "name": "system_health.common_desktop/load:social:instagram:2018" + }, + { + "duration": "26.0", + "name": "system_health.common_desktop/load:social:pinterest:2019" + }, + { + "duration": "22.0", + "name": "system_health.common_desktop/load:social:vk:2018" + }, + { + "duration": "4.0", + "name": "system_health.common_desktop/load:tools:chat:2020" + }, + { + "duration": "73.0", + "name": "system_health.common_desktop/load:tools:docs:2019" + }, + { + "duration": "22.0", + "name": "system_health.common_desktop/load:tools:drive:2019" + }, + { + "duration": "6.0", + "name": "system_health.common_desktop/load:tools:gmail:2019" + }, + { + "duration": "22.0", + "name": "system_health.common_desktop/load:tools:stackoverflow:2018" + }, + { + "duration": "21.0", + "name": "system_health.common_desktop/load:tools:weather:2019" + }, + { + "duration": "18.0", + "name": "system_health.common_desktop/load_accessibility:media:wikipedia:2018" + }, + { + "duration": "18.0", + "name": "system_health.common_desktop/load_accessibility:shopping:amazon:2018" + }, + { + "duration": "128.0", + "name": "system_health.common_desktop/long_running:tools:gmail-background" + }, + { + "duration": "124.0", + "name": "system_health.common_desktop/long_running:tools:gmail-foreground" + }, + { + "duration": "6.0", + "name": "system_health.common_desktop/multitab:misc:typical24" + }, + { + "duration": "43.0", + "name": "system_health.common_desktop/play:media:google_play_music" + }, + { + "duration": "47.0", + "name": "system_health.common_desktop/play:media:soundcloud:2018" + }, + { "duration": "900.0", "name": "base_perftests/_gtest_" },
diff --git a/tools/perf/core/shard_maps/timing_data/fuchsia-perf-fyi_timing.json b/tools/perf/core/shard_maps/timing_data/fuchsia-perf-fyi_timing.json index d2338eba..e986b37 100644 --- a/tools/perf/core/shard_maps/timing_data/fuchsia-perf-fyi_timing.json +++ b/tools/perf/core/shard_maps/timing_data/fuchsia-perf-fyi_timing.json
@@ -1,22 +1,22 @@ [ { - "duration": "9.0", + "duration": "6.0", "name": "rendering.mobile/accu_weather_mobile_pinch_2018" }, { - "duration": "32.0", + "duration": "23.0", "name": "rendering.mobile/amazon_2018" }, { - "duration": "33.0", + "duration": "26.0", "name": "rendering.mobile/amazon_mobile_2018" }, { - "duration": "22.0", + "duration": "20.0", "name": "rendering.mobile/analog_clock_svg" }, { - "duration": "51.0", + "duration": "57.0", "name": "rendering.mobile/androidpolice_mobile_2018" }, { @@ -24,7 +24,7 @@ "name": "rendering.mobile/animometer_webgl" }, { - "duration": "25.0", + "duration": "24.0", "name": "rendering.mobile/animometer_webgl_attrib_arrays" }, { @@ -36,55 +36,55 @@ "name": "rendering.mobile/aquarium" }, { - "duration": "9.0", + "duration": "6.0", "name": "rendering.mobile/aquarium_20k" }, { - "duration": "30.0", + "duration": "27.0", "name": "rendering.mobile/background_color_animation" }, { - "duration": "23.0", + "duration": "19.0", "name": "rendering.mobile/background_color_animation_with_gradient" }, { - "duration": "24.0", + "duration": "18.0", "name": "rendering.mobile/baidu_mobile_2018" }, { - "duration": "30.0", + "duration": "29.0", "name": "rendering.mobile/balls_css_key_frame_animations" }, { - "duration": "36.0", + "duration": "40.0", "name": "rendering.mobile/balls_css_key_frame_animations_composited_transform" }, { - "duration": "29.0", + "duration": "27.0", "name": "rendering.mobile/balls_css_transition_2_properties" }, { - "duration": "30.0", + "duration": "27.0", "name": "rendering.mobile/balls_css_transition_40_properties" }, { - "duration": "29.0", + "duration": "27.0", "name": "rendering.mobile/balls_css_transition_all_properties" }, { - "duration": "23.0", + "duration": "20.0", "name": "rendering.mobile/balls_javascript_canvas" }, { - "duration": "26.0", + "duration": "23.0", "name": "rendering.mobile/balls_javascript_css" }, { - "duration": "9.0", + "duration": "6.0", "name": "rendering.mobile/balls_svg_animations" }, { - "duration": "9.0", + "duration": "6.0", "name": "rendering.mobile/basic_stream" }, { @@ -92,27 +92,27 @@ "name": "rendering.mobile/bing_mobile_2018" }, { - "duration": "27.0", + "duration": "25.0", "name": "rendering.mobile/blob" }, { - "duration": "9.0", + "duration": "6.0", "name": "rendering.mobile/blogspot_2018" }, { - "duration": "22.0", + "duration": "25.0", "name": "rendering.mobile/blogspot_mobile_2018" }, { - "duration": "18.0", + "duration": "13.0", "name": "rendering.mobile/blur_rotating_background" }, { - "duration": "40.0", + "duration": "44.0", "name": "rendering.mobile/boingboing_mobile_2018" }, { - "duration": "35.0", + "duration": "31.0", "name": "rendering.mobile/booking.com_2018" }, { @@ -120,607 +120,607 @@ "name": "rendering.mobile/booking.com_mobile_2018" }, { - "duration": "23.0", + "duration": "21.0", "name": "rendering.mobile/bouncing_balls_15" }, { - "duration": "29.0", + "duration": "25.0", "name": "rendering.mobile/bouncing_balls_shadow" }, { - "duration": "23.0", + "duration": "19.0", "name": "rendering.mobile/bouncing_clipped_rectangles" }, { - "duration": "23.0", + "duration": "20.0", "name": "rendering.mobile/bouncing_gradient_circles" }, { - "duration": "23.0", + "duration": "20.0", "name": "rendering.mobile/bouncing_png_images" }, { - "duration": "24.0", + "duration": "21.0", "name": "rendering.mobile/bouncing_svg_images" }, { - "duration": "29.0", + "duration": "26.0", "name": "rendering.mobile/camera_to_webgl" }, { - "duration": "24.0", + "duration": "21.0", "name": "rendering.mobile/canvas2d_to_texture.html" }, { - "duration": "39.0", + "duration": "37.0", "name": "rendering.mobile/canvas_05000_pixels_per_second" }, { - "duration": "39.0", + "duration": "36.0", "name": "rendering.mobile/canvas_10000_pixels_per_second" }, { - "duration": "32.0", + "duration": "31.0", "name": "rendering.mobile/canvas_20000_pixels_per_second" }, { - "duration": "33.0", + "duration": "31.0", "name": "rendering.mobile/canvas_40000_pixels_per_second" }, { - "duration": "32.0", + "duration": "30.0", "name": "rendering.mobile/canvas_60000_pixels_per_second" }, { - "duration": "32.0", + "duration": "30.0", "name": "rendering.mobile/canvas_75000_pixels_per_second" }, { - "duration": "32.0", + "duration": "30.0", "name": "rendering.mobile/canvas_90000_pixels_per_second" }, { - "duration": "23.0", + "duration": "20.0", "name": "rendering.mobile/canvas_animation_no_clear" }, { - "duration": "24.0", + "duration": "22.0", "name": "rendering.mobile/canvas_arcs" }, { - "duration": "26.0", + "duration": "24.0", "name": "rendering.mobile/canvas_font_cycler" }, { - "duration": "23.0", + "duration": "19.0", "name": "rendering.mobile/canvas_lines" }, { - "duration": "24.0", + "duration": "21.0", "name": "rendering.mobile/canvas_to_blob" }, { - "duration": "22.0", + "duration": "35.0", "name": "rendering.mobile/canvas_to_canvas_draw" }, { - "duration": "34.0", + "duration": "47.0", "name": "rendering.mobile/capitolvolkswagen_mobile_2018" }, { - "duration": "17.0", + "duration": "15.0", "name": "rendering.mobile/card_expansion" }, { - "duration": "18.0", + "duration": "16.0", "name": "rendering.mobile/card_expansion_animated" }, { - "duration": "18.0", + "duration": "16.0", "name": "rendering.mobile/card_expansion_images_text" }, { - "duration": "17.0", + "duration": "15.0", "name": "rendering.mobile/card_flying" }, { - "duration": "27.0", + "duration": "24.0", "name": "rendering.mobile/cc_poster_circle" }, { - "duration": "24.0", + "duration": "21.0", "name": "rendering.mobile/cc_scroll_text_only" }, { - "duration": "26.0", + "duration": "34.0", "name": "rendering.mobile/chip_tune" }, { - "duration": "53.0", + "duration": "49.0", "name": "rendering.mobile/cnn_2018" }, { - "duration": "9.0", + "duration": "14.0", "name": "rendering.mobile/cnn_article_mobile_2018" }, { - "duration": "51.0", + "duration": "56.0", "name": "rendering.mobile/cnn_mobile_2018" }, { - "duration": "9.0", + "duration": "14.0", "name": "rendering.mobile/cnn_mobile_pinch_2018" }, { - "duration": "45.0", + "duration": "56.0", "name": "rendering.mobile/cnn_pathological_2018" }, { - "duration": "23.0", + "duration": "29.0", "name": "rendering.mobile/compositor_heavy_animation" }, { - "duration": "19.0", + "duration": "17.0", "name": "rendering.mobile/coordinated_animation" }, { - "duration": "23.0", + "duration": "29.0", "name": "rendering.mobile/crafty_mind" }, { - "duration": "31.0", + "duration": "36.0", "name": "rendering.mobile/css_animations_many_keyframes" }, { - "duration": "25.0", + "duration": "30.0", "name": "rendering.mobile/css_animations_simultaneous_inline_style" }, { - "duration": "25.0", + "duration": "29.0", "name": "rendering.mobile/css_animations_simultaneous_new_element" }, { - "duration": "25.0", + "duration": "29.0", "name": "rendering.mobile/css_animations_simultaneous_style_element" }, { - "duration": "25.0", + "duration": "29.0", "name": "rendering.mobile/css_animations_simultaneous_updating_class" }, { - "duration": "34.0", + "duration": "29.0", "name": "rendering.mobile/css_animations_staggered_infinite_iterations" }, { - "duration": "29.0", + "duration": "31.0", "name": "rendering.mobile/css_animations_staggered_inline_style" }, { - "duration": "28.0", + "duration": "31.0", "name": "rendering.mobile/css_animations_staggered_new_element" }, { - "duration": "31.0", + "duration": "32.0", "name": "rendering.mobile/css_animations_staggered_style_element" }, { - "duration": "29.0", + "duration": "31.0", "name": "rendering.mobile/css_animations_staggered_updating_class" }, { - "duration": "29.0", + "duration": "31.0", "name": "rendering.mobile/css_animations_triggered_inline_style" }, { - "duration": "29.0", + "duration": "31.0", "name": "rendering.mobile/css_animations_triggered_new_element" }, { - "duration": "28.0", + "duration": "30.0", "name": "rendering.mobile/css_animations_triggered_style_element" }, { - "duration": "29.0", + "duration": "31.0", "name": "rendering.mobile/css_animations_triggered_updating_class" }, { - "duration": "26.0", + "duration": "23.0", "name": "rendering.mobile/css_opacity_plus_n_layers_0" }, { - "duration": "26.0", + "duration": "23.0", "name": "rendering.mobile/css_opacity_plus_n_layers_75" }, { - "duration": "28.0", + "duration": "24.0", "name": "rendering.mobile/css_opacity_plus_n_layers_99" }, { - "duration": "26.0", + "duration": "29.0", "name": "rendering.mobile/css_transitions_inline_style" }, { - "duration": "27.0", + "duration": "29.0", "name": "rendering.mobile/css_transitions_new_element" }, { - "duration": "28.0", + "duration": "30.0", "name": "rendering.mobile/css_transitions_staggered_inline_style" }, { - "duration": "28.0", + "duration": "30.0", "name": "rendering.mobile/css_transitions_staggered_new_element" }, { - "duration": "28.0", + "duration": "30.0", "name": "rendering.mobile/css_transitions_staggered_style_element" }, { - "duration": "28.0", + "duration": "30.0", "name": "rendering.mobile/css_transitions_staggered_updating_class" }, { - "duration": "26.0", + "duration": "29.0", "name": "rendering.mobile/css_transitions_style_element" }, { - "duration": "28.0", + "duration": "30.0", "name": "rendering.mobile/css_transitions_triggered_inline_style" }, { - "duration": "28.0", + "duration": "30.0", "name": "rendering.mobile/css_transitions_triggered_new_element" }, { - "duration": "28.0", + "duration": "30.0", "name": "rendering.mobile/css_transitions_triggered_style_element" }, { - "duration": "28.0", + "duration": "30.0", "name": "rendering.mobile/css_transitions_triggered_updating_class" }, { - "duration": "26.0", + "duration": "29.0", "name": "rendering.mobile/css_transitions_updating_class" }, { - "duration": "25.0", + "duration": "28.0", "name": "rendering.mobile/css_value_type_color" }, { - "duration": "25.0", + "duration": "28.0", "name": "rendering.mobile/css_value_type_filter" }, { - "duration": "27.0", + "duration": "29.0", "name": "rendering.mobile/css_value_type_length" }, { - "duration": "25.0", + "duration": "28.0", "name": "rendering.mobile/css_value_type_length_complex" }, { - "duration": "25.0", + "duration": "28.0", "name": "rendering.mobile/css_value_type_length_simple" }, { - "duration": "25.0", + "duration": "28.0", "name": "rendering.mobile/css_value_type_path" }, { - "duration": "25.0", + "duration": "28.0", "name": "rendering.mobile/css_value_type_shadow" }, { - "duration": "27.0", + "duration": "29.0", "name": "rendering.mobile/css_value_type_transform_complex" }, { - "duration": "27.0", + "duration": "29.0", "name": "rendering.mobile/css_value_type_transform_simple" }, { - "duration": "32.0", + "duration": "34.0", "name": "rendering.mobile/deviantart_mobile_2018" }, { - "duration": "12.0", + "duration": "14.0", "name": "rendering.mobile/digg_mobile_2018" }, { - "duration": "12.0", + "duration": "14.0", "name": "rendering.mobile/docs_paper.html" }, { - "duration": "26.0", + "duration": "28.0", "name": "rendering.mobile/docs_resume.html" }, { - "duration": "25.0", + "duration": "36.0", "name": "rendering.mobile/docs_table.html" }, { - "duration": "25.0", + "duration": "23.0", "name": "rendering.mobile/draw_image" }, { - "duration": "25.0", + "duration": "23.0", "name": "rendering.mobile/draw_image_not_pixel_aligned" }, { - "duration": "26.0", + "duration": "23.0", "name": "rendering.mobile/dynamic_canvas_to_hw_accelerated_canvas.html" }, { - "duration": "31.0", + "duration": "29.0", "name": "rendering.mobile/dynamic_cube_map" }, { - "duration": "26.0", + "duration": "23.0", "name": "rendering.mobile/dynamic_webgl_to_hw_accelerated_canvas.html" }, { - "duration": "29.0", + "duration": "28.0", "name": "rendering.mobile/earth" }, { - "duration": "32.0", + "duration": "34.0", "name": "rendering.mobile/ebay_2018" }, { - "duration": "24.0", + "duration": "26.0", "name": "rendering.mobile/ebay_mobile_2018" }, { - "duration": "12.0", + "duration": "8.0", "name": "rendering.mobile/ebay_mobile_pinch_2018" }, { - "duration": "28.0", + "duration": "32.0", "name": "rendering.mobile/ebay_scroll_2018" }, { - "duration": "29.0", + "duration": "28.0", "name": "rendering.mobile/effect_games" }, { - "duration": "12.0", + "duration": "8.0", "name": "rendering.mobile/espn_2018" }, { - "duration": "55.0", + "duration": "53.0", "name": "rendering.mobile/espn_mobile_2018" }, { - "duration": "30.0", + "duration": "31.0", "name": "rendering.mobile/espn_pathological_2018" }, { - "duration": "27.0", + "duration": "24.0", "name": "rendering.mobile/extra_large_texture_uploads" }, { - "duration": "12.0", + "duration": "8.0", "name": "rendering.mobile/facebook_2018" }, { - "duration": "12.0", + "duration": "8.0", "name": "rendering.mobile/facebook_mobile_2018" }, { - "duration": "25.0", + "duration": "22.0", "name": "rendering.mobile/falling_particle_simulation_cpu.html" }, { - "duration": "25.0", + "duration": "24.0", "name": "rendering.mobile/falling_particle_simulation_gpu.html" }, { - "duration": "9.0", + "duration": "6.0", "name": "rendering.mobile/famo_us_twitter_demo" }, { - "duration": "26.0", + "duration": "23.0", "name": "rendering.mobile/fill_clear_rect.html" }, { - "duration": "25.0", + "duration": "22.0", "name": "rendering.mobile/fill_shapes" }, { - "duration": "25.0", + "duration": "22.0", "name": "rendering.mobile/filter_terrain_svg" }, { - "duration": "28.0", + "duration": "33.0", "name": "rendering.mobile/flickr_scroll_2018" }, { - "duration": "19.0", + "duration": "16.0", "name": "rendering.mobile/font_wipe" }, { - "duration": "21.0", + "duration": "14.0", "name": "rendering.mobile/forecast.io_mobile_2018" }, { - "duration": "26.0", + "duration": "22.0", "name": "rendering.mobile/get_image_data_cpu.html" }, { - "duration": "19.0", + "duration": "23.0", "name": "rendering.mobile/get_image_data_gpu.html" }, { - "duration": "5.0", + "duration": "8.0", "name": "rendering.mobile/gmail_2018" }, { - "duration": "5.0", + "duration": "8.0", "name": "rendering.mobile/google_calendar_2018" }, { - "duration": "18.0", + "duration": "23.0", "name": "rendering.mobile/google_image_search_2018" }, { - "duration": "17.0", + "duration": "23.0", "name": "rendering.mobile/google_image_search_mobile_2018" }, { - "duration": "9.0", + "duration": "6.0", "name": "rendering.mobile/google_news_ios" }, { - "duration": "22.0", + "duration": "27.0", "name": "rendering.mobile/google_news_mobile_2018" }, { - "duration": "5.0", + "duration": "8.0", "name": "rendering.mobile/google_plus_2018" }, { - "duration": "20.0", + "duration": "16.0", "name": "rendering.mobile/google_plus_mobile_2018" }, { - "duration": "5.0", + "duration": "8.0", "name": "rendering.mobile/google_search_mobile_pinch_2018" }, { - "duration": "5.0", + "duration": "8.0", "name": "rendering.mobile/google_web_search_2018" }, { - "duration": "15.0", + "duration": "22.0", "name": "rendering.mobile/google_web_search_mobile_2018" }, { - "duration": "22.0", + "duration": "27.0", "name": "rendering.mobile/gpu_bound_shader.html" }, { - "duration": "30.0", + "duration": "32.0", "name": "rendering.mobile/guardian_pathological_2018" }, { - "duration": "20.0", + "duration": "25.0", "name": "rendering.mobile/guimark_vector_chart" }, { - "duration": "5.0", + "duration": "8.0", "name": "rendering.mobile/gws_boogie_expansion" }, { - "duration": "5.0", + "duration": "8.0", "name": "rendering.mobile/gws_google_expansion" }, { - "duration": "23.0", + "duration": "25.0", "name": "rendering.mobile/hakim" }, { - "duration": "18.0", + "duration": "16.0", "name": "rendering.mobile/horizontal_vertical_expansion" }, { - "duration": "20.0", + "duration": "23.0", "name": "rendering.mobile/hw_accelerated_canvas_to_sw_canvas.html" }, { - "duration": "9.0", + "duration": "6.0", "name": "rendering.mobile/idle_power_animated_gif" }, { - "duration": "9.0", + "duration": "6.0", "name": "rendering.mobile/idle_power_blank" }, { - "duration": "9.0", + "duration": "14.0", "name": "rendering.mobile/idle_power_css_animation" }, { - "duration": "9.0", + "duration": "6.0", "name": "rendering.mobile/idle_power_request_animation_frame" }, { - "duration": "8.0", + "duration": "10.0", "name": "rendering.mobile/idle_power_set_timeout_long" }, { - "duration": "8.0", + "duration": "10.0", "name": "rendering.mobile/idle_power_set_timetout" }, { - "duration": "9.0", + "duration": "14.0", "name": "rendering.mobile/ie_chalkboard" }, { - "duration": "9.0", + "duration": "6.0", "name": "rendering.mobile/ie_pirate_mark" }, { - "duration": "21.0", + "duration": "25.0", "name": "rendering.mobile/infinite_scroll_element_n_layers_0" }, { - "duration": "22.0", + "duration": "25.0", "name": "rendering.mobile/infinite_scroll_element_n_layers_75" }, { - "duration": "23.0", + "duration": "27.0", "name": "rendering.mobile/infinite_scroll_element_n_layers_99" }, { - "duration": "21.0", + "duration": "24.0", "name": "rendering.mobile/infinite_scroll_root_fixed_n_layers_0" }, { - "duration": "21.0", + "duration": "25.0", "name": "rendering.mobile/infinite_scroll_root_fixed_n_layers_75" }, { - "duration": "23.0", + "duration": "26.0", "name": "rendering.mobile/infinite_scroll_root_fixed_n_layers_99" }, { - "duration": "21.0", + "duration": "24.0", "name": "rendering.mobile/infinite_scroll_root_n_layers_0" }, { - "duration": "21.0", + "duration": "25.0", "name": "rendering.mobile/infinite_scroll_root_n_layers_75" }, { - "duration": "23.0", + "duration": "26.0", "name": "rendering.mobile/infinite_scroll_root_n_layers_99" }, { - "duration": "23.0", + "duration": "20.0", "name": "rendering.mobile/infinite_scrolling" }, { - "duration": "21.0", + "duration": "25.0", "name": "rendering.mobile/jarro_doverson" }, { - "duration": "13.0", + "duration": "14.0", "name": "rendering.mobile/jpeg_decoding_rgb_and_gpu_rasterization" }, { - "duration": "13.0", + "duration": "14.0", "name": "rendering.mobile/jpeg_decoding_yuv_and_gpu_rasterization" }, { - "duration": "24.0", + "duration": "28.0", "name": "rendering.mobile/js_full_screen_invalidation" }, { - "duration": "22.0", + "duration": "26.0", "name": "rendering.mobile/js_opacity_plus_n_layers_0" }, { - "duration": "23.0", + "duration": "27.0", "name": "rendering.mobile/js_opacity_plus_n_layers_75" }, { @@ -728,43 +728,43 @@ "name": "rendering.mobile/js_opacity_plus_n_layers_99" }, { - "duration": "23.0", + "duration": "36.0", "name": "rendering.mobile/js_paint_plus_n_layers_0" }, { - "duration": "24.0", + "duration": "25.0", "name": "rendering.mobile/js_paint_plus_n_layers_75" }, { - "duration": "27.0", + "duration": "25.0", "name": "rendering.mobile/js_paint_plus_n_layers_99" }, { - "duration": "24.0", + "duration": "26.0", "name": "rendering.mobile/js_poster_circle" }, { - "duration": "22.0", + "duration": "23.0", "name": "rendering.mobile/js_scroll_text_only" }, { - "duration": "21.0", + "duration": "22.0", "name": "rendering.mobile/kevs_3d" }, { - "duration": "18.0", + "duration": "20.0", "name": "rendering.mobile/keyframed_animations" }, { - "duration": "19.0", + "duration": "20.0", "name": "rendering.mobile/large_texture_uploads" }, { - "duration": "29.0", + "duration": "37.0", "name": "rendering.mobile/latimes_pathological_2018" }, { - "duration": "15.0", + "duration": "17.0", "name": "rendering.mobile/linkedin_2018" }, { @@ -780,31 +780,31 @@ "name": "rendering.mobile/linkedin_pathological_2018" }, { - "duration": "17.0", + "duration": "14.0", "name": "rendering.mobile/list_animation_simple" }, { - "duration": "9.0", + "duration": "6.0", "name": "rendering.mobile/list_recycle_transform" }, { - "duration": "19.0", + "duration": "20.0", "name": "rendering.mobile/main_0fps_impl_60fps" }, { - "duration": "18.0", + "duration": "19.0", "name": "rendering.mobile/main_0fps_impl_60fps_no_update" }, { - "duration": "18.0", + "duration": "19.0", "name": "rendering.mobile/main_0fps_impl_60fps_no_update_jank" }, { - "duration": "18.0", + "duration": "19.0", "name": "rendering.mobile/main_0fps_with_jank_impl_0fps" }, { - "duration": "18.0", + "duration": "19.0", "name": "rendering.mobile/main_15fps_impl_0fps" }, { @@ -812,15 +812,15 @@ "name": "rendering.mobile/main_15fps_with_jank_impl_0fps" }, { - "duration": "19.0", + "duration": "20.0", "name": "rendering.mobile/main_30fps_impl_0fps" }, { - "duration": "19.0", + "duration": "20.0", "name": "rendering.mobile/main_30fps_impl_60fps" }, { - "duration": "19.0", + "duration": "20.0", "name": "rendering.mobile/main_60fps_impl_0fps" }, { @@ -828,7 +828,7 @@ "name": "rendering.mobile/main_60fps_impl_60fps" }, { - "duration": "18.0", + "duration": "20.0", "name": "rendering.mobile/main_60fps_impl_60fps_no_update" }, { @@ -852,35 +852,35 @@ "name": "rendering.mobile/main_animations_half_presented" }, { - "duration": "22.0", + "duration": "24.0", "name": "rendering.mobile/man_in_blue" }, { - "duration": "27.0", + "duration": "29.0", "name": "rendering.mobile/many_images" }, { - "duration": "24.0", + "duration": "25.0", "name": "rendering.mobile/many_planets_deep" }, { - "duration": "26.0", + "duration": "33.0", "name": "rendering.mobile/maps_perf_test" }, { - "duration": "18.0", + "duration": "16.0", "name": "rendering.mobile/mask_transition_animation" }, { - "duration": "18.0", + "duration": "20.0", "name": "rendering.mobile/masonry" }, { - "duration": "19.0", + "duration": "21.0", "name": "rendering.mobile/medium_texture_uploads" }, { - "duration": "18.0", + "duration": "20.0", "name": "rendering.mobile/megi_dish" }, { @@ -888,7 +888,7 @@ "name": "rendering.mobile/microgame_fps" }, { - "duration": "18.0", + "duration": "20.0", "name": "rendering.mobile/microsoft_asteroid_belt" }, { @@ -896,31 +896,31 @@ "name": "rendering.mobile/microsoft_fireflies" }, { - "duration": "18.0", + "duration": "20.0", "name": "rendering.mobile/microsoft_fish_ie_tank" }, { - "duration": "18.0", + "duration": "20.0", "name": "rendering.mobile/microsoft_performance" }, { - "duration": "18.0", + "duration": "20.0", "name": "rendering.mobile/microsoft_snow" }, { - "duration": "18.0", + "duration": "20.0", "name": "rendering.mobile/microsoft_speed_reading" }, { - "duration": "18.0", + "duration": "20.0", "name": "rendering.mobile/microsoft_tweet_map" }, { - "duration": "18.0", + "duration": "20.0", "name": "rendering.mobile/microsoft_video_city" }, { - "duration": "18.0", + "duration": "20.0", "name": "rendering.mobile/microsoft_worker_fountains" }, { @@ -928,35 +928,35 @@ "name": "rendering.mobile/mix_10k" }, { - "duration": "19.0", + "duration": "20.0", "name": "rendering.mobile/mix_blend_mode_animation_difference" }, { - "duration": "19.0", + "duration": "20.0", "name": "rendering.mobile/mix_blend_mode_animation_hue" }, { - "duration": "19.0", + "duration": "20.0", "name": "rendering.mobile/mix_blend_mode_animation_propagating_isolation" }, { - "duration": "19.0", + "duration": "20.0", "name": "rendering.mobile/mix_blend_mode_animation_screen" }, { - "duration": "54.0", + "duration": "58.0", "name": "rendering.mobile/mlb_mobile_2018" }, { - "duration": "9.0", + "duration": "6.0", "name": "rendering.mobile/mobile_news_sandbox" }, { - "duration": "20.0", + "duration": "23.0", "name": "rendering.mobile/motion_mark_canvas_fill_shapes" }, { - "duration": "20.0", + "duration": "22.0", "name": "rendering.mobile/motion_mark_canvas_stroke_shapes" }, { @@ -1080,11 +1080,11 @@ "name": "rendering.mobile/motionmark_svg_bouncing_svg_images_50" }, { - "duration": "23.0", + "duration": "24.0", "name": "rendering.mobile/new_tilings" }, { - "duration": "17.0", + "duration": "18.0", "name": "rendering.mobile/no_op_raf" }, { @@ -1092,79 +1092,79 @@ "name": "rendering.mobile/no_op_scroll" }, { - "duration": "15.0", + "duration": "16.0", "name": "rendering.mobile/no_op_settimeout" }, { - "duration": "27.0", + "duration": "17.0", "name": "rendering.mobile/no_op_touch_handler" }, { - "duration": "23.0", + "duration": "20.0", "name": "rendering.mobile/no_update_compositor_animation_with_janky_main_animation" }, { - "duration": "35.0", + "duration": "41.0", "name": "rendering.mobile/non_opaque_background_compositor_thread_scrolling_00050_pixels_per_second" }, { - "duration": "36.0", + "duration": "33.0", "name": "rendering.mobile/non_opaque_background_main_thread_scrolling_00050_pixels_per_second" }, { - "duration": "27.0", + "duration": "25.0", "name": "rendering.mobile/nvidia_vertex_buffer_object" }, { - "duration": "29.0", + "duration": "33.0", "name": "rendering.mobile/nyc_gov_scroll_2018" }, { - "duration": "49.0", + "duration": "51.0", "name": "rendering.mobile/nytimes_mobile_2018" }, { - "duration": "48.0", + "duration": "55.0", "name": "rendering.mobile/nytimes_scroll_2018" }, { - "duration": "22.0", + "duration": "19.0", "name": "rendering.mobile/off_screen_main_60fps" }, { - "duration": "9.0", + "duration": "6.0", "name": "rendering.mobile/off_screen_main_60fps_jank" }, { - "duration": "9.0", + "duration": "6.0", "name": "rendering.mobile/offscreen_animation_no_damage" }, { - "duration": "25.0", + "duration": "22.0", "name": "rendering.mobile/overlay_background_color_css_transitions_page" }, { - "duration": "23.0", + "duration": "21.0", "name": "rendering.mobile/paint_worklet" }, { - "duration": "18.0", + "duration": "16.0", "name": "rendering.mobile/parallax_effect" }, { - "duration": "27.0", + "duration": "26.0", "name": "rendering.mobile/particles" }, { - "duration": "33.0", + "duration": "31.0", "name": "rendering.mobile/pbs_pathological_2018" }, { - "duration": "16.0", + "duration": "13.0", "name": "rendering.mobile/physical_simulation" }, { - "duration": "23.0", + "duration": "24.0", "name": "rendering.mobile/pinterest_2018" }, { @@ -1172,131 +1172,131 @@ "name": "rendering.mobile/pinterest_mobile_2018" }, { - "duration": "26.0", + "duration": "23.0", "name": "rendering.mobile/put_and_create_imagebitmap_from_imagedata" }, { - "duration": "24.0", + "duration": "22.0", "name": "rendering.mobile/put_get_image_data" }, { - "duration": "24.0", + "duration": "20.0", "name": "rendering.mobile/put_image_data.html" }, { - "duration": "21.0", + "duration": "18.0", "name": "rendering.mobile/raf" }, { - "duration": "21.0", + "duration": "18.0", "name": "rendering.mobile/raf_animation" }, { - "duration": "21.0", + "duration": "18.0", "name": "rendering.mobile/raf_canvas" }, { - "duration": "20.0", + "duration": "18.0", "name": "rendering.mobile/raf_touch_animation" }, { - "duration": "33.0", + "duration": "34.0", "name": "rendering.mobile/recode_pathological_2018" }, { - "duration": "9.0", + "duration": "6.0", "name": "rendering.mobile/reddit_mobile_2018" }, { - "duration": "24.0", + "duration": "23.0", "name": "rendering.mobile/runway_2019" }, { - "duration": "28.0", + "duration": "26.0", "name": "rendering.mobile/san_angeles" }, { - "duration": "13.0", + "duration": "15.0", "name": "rendering.mobile/second_batch_js_heavy" }, { - "duration": "12.0", + "duration": "15.0", "name": "rendering.mobile/second_batch_js_light" }, { - "duration": "12.0", + "duration": "15.0", "name": "rendering.mobile/second_batch_js_medium" }, { - "duration": "48.0", + "duration": "52.0", "name": "rendering.mobile/sfgate_mobile_2018" }, { - "duration": "21.0", + "duration": "24.0", "name": "rendering.mobile/sheets_render.html" }, { - "duration": "24.0", + "duration": "27.0", "name": "rendering.mobile/silk_finance" }, { - "duration": "18.0", + "duration": "21.0", "name": "rendering.mobile/simple_text_page" }, { - "duration": "17.0", + "duration": "18.0", "name": "rendering.mobile/simple_touch_drag" }, { - "duration": "61.0", + "duration": "65.0", "name": "rendering.mobile/skelebuddies_wasm_2020" }, { - "duration": "34.0", + "duration": "39.0", "name": "rendering.mobile/slashdot_mobile_2018" }, { - "duration": "22.0", + "duration": "25.0", "name": "rendering.mobile/small_texture_uploads" }, { - "duration": "25.0", + "duration": "29.0", "name": "rendering.mobile/smash_cat" }, { - "duration": "22.0", + "duration": "26.0", "name": "rendering.mobile/spielzeugz" }, { - "duration": "22.0", + "duration": "24.0", "name": "rendering.mobile/static_canvas_to_hw_accelerated_canvas.html" }, { - "duration": "22.0", + "duration": "25.0", "name": "rendering.mobile/static_webgl_to_hw_accelerated_canvas.html" }, { - "duration": "9.0", + "duration": "6.0", "name": "rendering.mobile/sticky_using_webkit" }, { - "duration": "22.0", + "duration": "24.0", "name": "rendering.mobile/stroke_shapes" }, { - "duration": "9.0", + "duration": "6.0", "name": "rendering.mobile/svg_icon_raster" }, { - "duration": "17.0", + "duration": "15.0", "name": "rendering.mobile/swipe_to_dismiss" }, { - "duration": "18.0", + "duration": "20.0", "name": "rendering.mobile/sync_scroll_offset" }, { - "duration": "48.0", + "duration": "49.0", "name": "rendering.mobile/techcrunch_2018" }, { @@ -1304,27 +1304,27 @@ "name": "rendering.mobile/techcrunch_mobile_2018" }, { - "duration": "37.0", + "duration": "38.0", "name": "rendering.mobile/text_05000_pixels_per_second" }, { - "duration": "38.0", + "duration": "35.0", "name": "rendering.mobile/text_10000_pixels_per_second" }, { - "duration": "32.0", + "duration": "31.0", "name": "rendering.mobile/text_20000_pixels_per_second" }, { - "duration": "32.0", + "duration": "44.0", "name": "rendering.mobile/text_40000_pixels_per_second" }, { - "duration": "31.0", + "duration": "32.0", "name": "rendering.mobile/text_60000_pixels_per_second" }, { - "duration": "32.0", + "duration": "33.0", "name": "rendering.mobile/text_75000_pixels_per_second" }, { @@ -1332,147 +1332,147 @@ "name": "rendering.mobile/text_90000_pixels_per_second" }, { - "duration": "31.0", + "duration": "34.0", "name": "rendering.mobile/text_constant_full_page_raster_05000_pixels_per_second" }, { - "duration": "31.0", + "duration": "34.0", "name": "rendering.mobile/text_constant_full_page_raster_10000_pixels_per_second" }, { - "duration": "31.0", + "duration": "33.0", "name": "rendering.mobile/text_constant_full_page_raster_20000_pixels_per_second" }, { - "duration": "30.0", + "duration": "32.0", "name": "rendering.mobile/text_constant_full_page_raster_40000_pixels_per_second" }, { - "duration": "30.0", + "duration": "32.0", "name": "rendering.mobile/text_constant_full_page_raster_60000_pixels_per_second" }, { - "duration": "30.0", + "duration": "33.0", "name": "rendering.mobile/text_constant_full_page_raster_75000_pixels_per_second" }, { - "duration": "29.0", + "duration": "33.0", "name": "rendering.mobile/text_constant_full_page_raster_90000_pixels_per_second" }, { - "duration": "33.0", + "duration": "31.0", "name": "rendering.mobile/text_fling_05000_pixels_per_second" }, { - "duration": "33.0", + "duration": "30.0", "name": "rendering.mobile/text_fling_10000_pixels_per_second" }, { - "duration": "34.0", + "duration": "31.0", "name": "rendering.mobile/text_fling_20000_pixels_per_second" }, { - "duration": "36.0", + "duration": "38.0", "name": "rendering.mobile/text_hover_05000_pixels_per_second" }, { - "duration": "38.0", + "duration": "39.0", "name": "rendering.mobile/text_hover_10000_pixels_per_second" }, { - "duration": "37.0", + "duration": "34.0", "name": "rendering.mobile/text_hover_20000_pixels_per_second" }, { - "duration": "31.0", + "duration": "33.0", "name": "rendering.mobile/text_hover_40000_pixels_per_second" }, { - "duration": "30.0", + "duration": "32.0", "name": "rendering.mobile/text_hover_60000_pixels_per_second" }, { - "duration": "30.0", + "duration": "33.0", "name": "rendering.mobile/text_hover_75000_pixels_per_second" }, { - "duration": "30.0", + "duration": "32.0", "name": "rendering.mobile/text_hover_90000_pixels_per_second" }, { - "duration": "9.0", + "duration": "6.0", "name": "rendering.mobile/text_scrollbar_100_pixels_per_second" }, { - "duration": "9.0", + "duration": "6.0", "name": "rendering.mobile/text_scrollbar_1200_pixels_per_second" }, { - "duration": "9.0", + "duration": "6.0", "name": "rendering.mobile/text_scrollbar_200_pixels_per_second" }, { - "duration": "9.0", + "duration": "6.0", "name": "rendering.mobile/text_scrollbar_2300_pixels_per_second" }, { - "duration": "9.0", + "duration": "6.0", "name": "rendering.mobile/text_scrollbar_700_pixels_per_second" }, { - "duration": "33.0", + "duration": "38.0", "name": "rendering.mobile/theverge_article_mobile_2018" }, { - "duration": "32.0", + "duration": "38.0", "name": "rendering.mobile/theverge_mobile_2018" }, { - "duration": "26.0", + "duration": "29.0", "name": "rendering.mobile/throughput_scrolling_active_handler" }, { - "duration": "26.0", + "duration": "41.0", "name": "rendering.mobile/throughput_scrolling_composited" }, { - "duration": "26.0", + "duration": "31.0", "name": "rendering.mobile/throughput_scrolling_passive_handler" }, { - "duration": "27.0", + "duration": "32.0", "name": "rendering.mobile/throughput_scrolling_uncomposited" }, { - "duration": "56.0", + "duration": "69.0", "name": "rendering.mobile/tiny_racing_v3_wasm_2020" }, { - "duration": "30.0", + "duration": "26.0", "name": "rendering.mobile/toBlob_duration.html" }, { - "duration": "24.0", + "duration": "26.0", "name": "rendering.mobile/toBlob_duration_jpeg.html" }, { - "duration": "27.0", + "duration": "30.0", "name": "rendering.mobile/toBlob_small_canvas_in_worker.html" }, { - "duration": "21.0", + "duration": "23.0", "name": "rendering.mobile/touch_handler_scrolling" }, { - "duration": "24.0", + "duration": "26.0", "name": "rendering.mobile/transfer_from_imageBitmap.html" }, { - "duration": "24.0", + "duration": "26.0", "name": "rendering.mobile/transform_transitions" }, { - "duration": "24.0", + "duration": "26.0", "name": "rendering.mobile/transform_transitions_js_block" }, { @@ -1488,23 +1488,23 @@ "name": "rendering.mobile/twitter_2018" }, { - "duration": "34.0", + "duration": "38.0", "name": "rendering.mobile/twitter_mobile_2018" }, { - "duration": "21.0", + "duration": "23.0", "name": "rendering.mobile/update_history_state" }, { - "duration": "47.0", + "duration": "46.0", "name": "rendering.mobile/usatoday_mobile_2018" }, { - "duration": "18.0", + "duration": "16.0", "name": "rendering.mobile/vertical_expansion" }, { - "duration": "26.0", + "duration": "28.0", "name": "rendering.mobile/video_to_hw_accelerated_canvas" }, { @@ -1528,35 +1528,35 @@ "name": "rendering.mobile/video_to_texture" }, { - "duration": "24.0", + "duration": "26.0", "name": "rendering.mobile/web_animation_value_type_color" }, { - "duration": "26.0", + "duration": "28.0", "name": "rendering.mobile/web_animation_value_type_length_3d" }, { - "duration": "24.0", + "duration": "26.0", "name": "rendering.mobile/web_animation_value_type_length_complex" }, { - "duration": "24.0", + "duration": "26.0", "name": "rendering.mobile/web_animation_value_type_length_simple" }, { - "duration": "24.0", + "duration": "26.0", "name": "rendering.mobile/web_animation_value_type_path" }, { - "duration": "24.0", + "duration": "26.0", "name": "rendering.mobile/web_animation_value_type_shadow" }, { - "duration": "26.0", + "duration": "27.0", "name": "rendering.mobile/web_animation_value_type_transform_complex" }, { - "duration": "26.0", + "duration": "27.0", "name": "rendering.mobile/web_animation_value_type_transform_simple" }, { @@ -1564,47 +1564,47 @@ "name": "rendering.mobile/web_animations_many_keyframes" }, { - "duration": "26.0", + "duration": "28.0", "name": "rendering.mobile/web_animations_set_current_time" }, { - "duration": "26.0", + "duration": "27.0", "name": "rendering.mobile/web_animations_simultaneous" }, { - "duration": "27.0", + "duration": "29.0", "name": "rendering.mobile/web_animations_staggered_chaining" }, { - "duration": "26.0", + "duration": "27.0", "name": "rendering.mobile/web_animations_staggered_infinite_iterations" }, { - "duration": "28.0", + "duration": "29.0", "name": "rendering.mobile/web_animations_staggered_triggering_page" }, { - "duration": "25.0", + "duration": "28.0", "name": "rendering.mobile/webgl_to_texture" }, { - "duration": "18.0", + "duration": "20.0", "name": "rendering.mobile/webp_decoding_rgb_and_gpu_rasterization" }, { - "duration": "18.0", + "duration": "20.0", "name": "rendering.mobile/webp_decoding_yuv_and_gpu_rasterization" }, { - "duration": "37.0", + "duration": "40.0", "name": "rendering.mobile/wikipedia_2018" }, { - "duration": "32.0", + "duration": "35.0", "name": "rendering.mobile/wikipedia_delayed_scroll_start_2018" }, { - "duration": "32.0", + "duration": "35.0", "name": "rendering.mobile/wikipedia_mobile_2018" }, { @@ -1612,63 +1612,63 @@ "name": "rendering.mobile/wordpress_2018" }, { - "duration": "30.0", + "duration": "31.0", "name": "rendering.mobile/wordpress_mobile_2018" }, { - "duration": "91.0", + "duration": "99.0", "name": "rendering.mobile/worldjournal_mobile_2018" }, { - "duration": "56.0", + "duration": "57.0", "name": "rendering.mobile/wow_wiki_pathological_2018" }, { - "duration": "88.0", + "duration": "86.0", "name": "rendering.mobile/wowwiki_mobile_2018" }, { - "duration": "59.0", + "duration": "67.0", "name": "rendering.mobile/wsj_mobile_2018" }, { - "duration": "34.0", + "duration": "50.0", "name": "rendering.mobile/yahoo_answers_2018" }, { - "duration": "11.0", + "duration": "10.0", "name": "rendering.mobile/yahoo_answers_mobile_2018" }, { - "duration": "32.0", + "duration": "35.0", "name": "rendering.mobile/yahoo_news_2018" }, { - "duration": "34.0", + "duration": "35.0", "name": "rendering.mobile/yahoo_news_mobile_2018" }, { - "duration": "39.0", + "duration": "43.0", "name": "rendering.mobile/yahoo_sports_2018" }, { - "duration": "39.0", + "duration": "43.0", "name": "rendering.mobile/yahoo_sports_pathological_2018" }, { - "duration": "11.0", + "duration": "10.0", "name": "rendering.mobile/youtube_2018" }, { - "duration": "11.0", + "duration": "10.0", "name": "rendering.mobile/youtube_mobile_2018" }, { - "duration": "35.0", + "duration": "37.0", "name": "rendering.mobile/zdnet_pathological_2018" }, { - "duration": "17.0", + "duration": "15.0", "name": "rendering.mobile/zoom_in_animation" }, { @@ -1688,7 +1688,7 @@ "name": "system_health.memory_desktop/browse:media:tumblr:2018" }, { - "duration": "90.0", + "duration": "97.0", "name": "system_health.memory_desktop/browse:media:youtube:2019" }, { @@ -1704,7 +1704,7 @@ "name": "system_health.memory_desktop/browse:news:cnn:2021" }, { - "duration": "56.0", + "duration": "60.0", "name": "system_health.memory_desktop/browse:news:flipboard:2020" }, { @@ -1728,7 +1728,7 @@ "name": "system_health.memory_desktop/browse:social:facebook_infinite_scroll:2018" }, { - "duration": "64.0", + "duration": "68.0", "name": "system_health.memory_desktop/browse:social:tumblr_infinite_scroll:2018" }, { @@ -1748,7 +1748,7 @@ "name": "system_health.memory_desktop/browse:tools:autocad:2021" }, { - "duration": "38.0", + "duration": "40.0", "name": "system_health.memory_desktop/browse:tools:docs_scrolling" }, { @@ -1788,23 +1788,23 @@ "name": "system_health.memory_desktop/browse_accessibility:tech:codesearch:2018" }, { - "duration": "13.0", + "duration": "16.0", "name": "system_health.memory_desktop/load:chrome:blank" }, { - "duration": "18.0", + "duration": "28.0", "name": "system_health.memory_desktop/load:games:alphabetty:2018" }, { - "duration": "16.0", + "duration": "17.0", "name": "system_health.memory_desktop/load:games:bubbles:2020" }, { - "duration": "19.0", + "duration": "22.0", "name": "system_health.memory_desktop/load:games:lazors" }, { - "duration": "17.0", + "duration": "18.0", "name": "system_health.memory_desktop/load:games:miniclip:2018" }, { @@ -1812,15 +1812,15 @@ "name": "system_health.memory_desktop/load:games:spychase:2018" }, { - "duration": "23.0", + "duration": "26.0", "name": "system_health.memory_desktop/load:media:9gag" }, { - "duration": "24.0", + "duration": "25.0", "name": "system_health.memory_desktop/load:media:dailymotion:2019" }, { - "duration": "3.0", + "duration": "2.0", "name": "system_health.memory_desktop/load:media:facebook_feed:desktop:2020" }, { @@ -1828,7 +1828,7 @@ "name": "system_health.memory_desktop/load:media:facebook_photos:2018" }, { - "duration": "3.0", + "duration": "2.0", "name": "system_health.memory_desktop/load:media:facebook_photos:desktop:2020" }, { @@ -1836,35 +1836,35 @@ "name": "system_health.memory_desktop/load:media:flickr:2018" }, { - "duration": "19.0", + "duration": "20.0", "name": "system_health.memory_desktop/load:media:google_images:2018" }, { - "duration": "36.0", + "duration": "66.0", "name": "system_health.memory_desktop/load:media:imgur:2018" }, { - "duration": "25.0", + "duration": "22.0", "name": "system_health.memory_desktop/load:media:soundcloud:2018" }, { - "duration": "28.0", + "duration": "33.0", "name": "system_health.memory_desktop/load:media:youtube:2018" }, { - "duration": "16.0", + "duration": "18.0", "name": "system_health.memory_desktop/load:media:youtubelivingroom:2020" }, { - "duration": "28.0", + "duration": "24.0", "name": "system_health.memory_desktop/load:news:bbc:2018" }, { - "duration": "3.0", + "duration": "2.0", "name": "system_health.memory_desktop/load:news:cnn:2020" }, { - "duration": "23.0", + "duration": "21.0", "name": "system_health.memory_desktop/load:news:flipboard" }, { @@ -1872,23 +1872,19 @@ "name": "system_health.memory_desktop/load:news:hackernews:2018" }, { - "duration": "40.0", + "duration": "46.0", "name": "system_health.memory_desktop/load:news:nytimes:2018" }, { - "duration": "21.0", - "name": "system_health.memory_desktop/load:news:qq:2018" - }, - { "duration": "1.0", "name": "system_health.memory_desktop/load:news:reddit:2018" }, { - "duration": "19.0", + "duration": "20.0", "name": "system_health.memory_desktop/load:news:wikipedia:2018" }, { - "duration": "27.0", + "duration": "23.0", "name": "system_health.memory_desktop/load:search:amazon:2018" }, { @@ -1896,71 +1892,71 @@ "name": "system_health.memory_desktop/load:search:baidu:2018" }, { - "duration": "28.0", + "duration": "36.0", "name": "system_health.memory_desktop/load:search:ebay:2018" }, { - "duration": "51.0", + "duration": "27.0", "name": "system_health.memory_desktop/load:search:flipkart:2018" }, { - "duration": "17.0", + "duration": "19.0", "name": "system_health.memory_desktop/load:search:google:2018" }, { - "duration": "20.0", + "duration": "23.0", "name": "system_health.memory_desktop/load:search:taobao:2018" }, { - "duration": "15.0", + "duration": "16.0", "name": "system_health.memory_desktop/load:search:yahoo:2018" }, { - "duration": "16.0", + "duration": "18.0", "name": "system_health.memory_desktop/load:search:yandex:2018" }, { - "duration": "18.0", + "duration": "15.0", "name": "system_health.memory_desktop/load:social:instagram:2018" }, { - "duration": "13.0", + "duration": "15.0", "name": "system_health.memory_desktop/load:social:pinterest:2019" }, { - "duration": "20.0", + "duration": "23.0", "name": "system_health.memory_desktop/load:social:vk:2018" }, { - "duration": "3.0", + "duration": "2.0", "name": "system_health.memory_desktop/load:tools:chat:2020" }, { - "duration": "46.0", + "duration": "50.0", "name": "system_health.memory_desktop/load:tools:docs:2019" }, { - "duration": "16.0", + "duration": "17.0", "name": "system_health.memory_desktop/load:tools:drive:2019" }, { - "duration": "3.0", + "duration": "2.0", "name": "system_health.memory_desktop/load:tools:gmail:2019" }, { - "duration": "21.0", + "duration": "24.0", "name": "system_health.memory_desktop/load:tools:stackoverflow:2018" }, { - "duration": "26.0", + "duration": "29.0", "name": "system_health.memory_desktop/load:tools:weather:2019" }, { - "duration": "19.0", + "duration": "20.0", "name": "system_health.memory_desktop/load_accessibility:media:wikipedia:2018" }, { - "duration": "40.0", + "duration": "30.0", "name": "system_health.memory_desktop/load_accessibility:shopping:amazon:2018" }, { @@ -1982,5 +1978,9 @@ { "duration": "1.0", "name": "system_health.memory_desktop/play:media:google_play_music" + }, + { + "duration": "49.0", + "name": "system_health.memory_desktop/play:media:soundcloud:2018" } ] \ No newline at end of file
diff --git a/tools/perf/core/shard_maps/timing_data/fuchsia-perf-nsn_timing.json b/tools/perf/core/shard_maps/timing_data/fuchsia-perf-nsn_timing.json index 4ecf637..2a8f4df0 100644 --- a/tools/perf/core/shard_maps/timing_data/fuchsia-perf-nsn_timing.json +++ b/tools/perf/core/shard_maps/timing_data/fuchsia-perf-nsn_timing.json
@@ -1,5 +1,9 @@ [ { + "duration": "523.0", + "name": "speedometer2/Speedometer2" + }, + { "duration": "900.0", "name": "base_perftests/_gtest_" }
diff --git a/tools/perf/core/shard_maps/timing_data/fuchsia-perf-sherlock-fyi_timing.json b/tools/perf/core/shard_maps/timing_data/fuchsia-perf-sherlock-fyi_timing.json index 73893f0..f8a82a63 100644 --- a/tools/perf/core/shard_maps/timing_data/fuchsia-perf-sherlock-fyi_timing.json +++ b/tools/perf/core/shard_maps/timing_data/fuchsia-perf-sherlock-fyi_timing.json
@@ -1,282 +1,282 @@ [ { - "duration": "15.0", + "duration": "9.0", "name": "rendering.mobile/accu_weather_mobile_pinch_2018" }, { - "duration": "35.0", + "duration": "31.0", "name": "rendering.mobile/amazon_2018" }, { - "duration": "41.0", + "duration": "32.0", "name": "rendering.mobile/amazon_mobile_2018" }, { - "duration": "28.0", + "duration": "23.0", "name": "rendering.mobile/analog_clock_svg" }, { - "duration": "48.0", + "duration": "53.0", "name": "rendering.mobile/androidpolice_mobile_2018" }, { - "duration": "34.0", + "duration": "28.0", "name": "rendering.mobile/animometer_webgl" }, { - "duration": "27.0", + "duration": "26.0", "name": "rendering.mobile/animometer_webgl_attrib_arrays" }, { - "duration": "28.0", + "duration": "27.0", "name": "rendering.mobile/animometer_webgl_multi_draw" }, { - "duration": "33.0", + "duration": "31.0", "name": "rendering.mobile/aquarium" }, { - "duration": "11.0", + "duration": "9.0", "name": "rendering.mobile/aquarium_20k" }, { - "duration": "28.0", + "duration": "26.0", "name": "rendering.mobile/background_color_animation" }, { - "duration": "25.0", + "duration": "22.0", "name": "rendering.mobile/background_color_animation_with_gradient" }, { - "duration": "27.0", + "duration": "19.0", "name": "rendering.mobile/baidu_mobile_2018" }, { - "duration": "31.0", + "duration": "27.0", "name": "rendering.mobile/balls_css_key_frame_animations" }, { - "duration": "36.0", + "duration": "35.0", "name": "rendering.mobile/balls_css_key_frame_animations_composited_transform" }, { - "duration": "32.0", + "duration": "28.0", "name": "rendering.mobile/balls_css_transition_2_properties" }, { - "duration": "32.0", + "duration": "28.0", "name": "rendering.mobile/balls_css_transition_40_properties" }, { - "duration": "32.0", + "duration": "27.0", "name": "rendering.mobile/balls_css_transition_all_properties" }, { - "duration": "25.0", + "duration": "22.0", "name": "rendering.mobile/balls_javascript_canvas" }, { - "duration": "27.0", + "duration": "24.0", "name": "rendering.mobile/balls_javascript_css" }, { - "duration": "11.0", + "duration": "9.0", "name": "rendering.mobile/balls_svg_animations" }, { - "duration": "6.0", + "duration": "4.0", "name": "rendering.mobile/basic_stream" }, { - "duration": "22.0", + "duration": "21.0", "name": "rendering.mobile/bing_mobile_2018" }, { - "duration": "28.0", + "duration": "27.0", "name": "rendering.mobile/blob" }, { - "duration": "11.0", + "duration": "9.0", "name": "rendering.mobile/blogspot_2018" }, { - "duration": "22.0", + "duration": "23.0", "name": "rendering.mobile/blogspot_mobile_2018" }, { - "duration": "19.0", + "duration": "16.0", "name": "rendering.mobile/blur_rotating_background" }, { - "duration": "39.0", + "duration": "40.0", "name": "rendering.mobile/boingboing_mobile_2018" }, { - "duration": "35.0", + "duration": "29.0", "name": "rendering.mobile/booking.com_2018" }, { - "duration": "29.0", + "duration": "27.0", "name": "rendering.mobile/booking.com_mobile_2018" }, { - "duration": "25.0", + "duration": "23.0", "name": "rendering.mobile/bouncing_balls_15" }, { - "duration": "33.0", + "duration": "28.0", "name": "rendering.mobile/bouncing_balls_shadow" }, { - "duration": "25.0", + "duration": "22.0", "name": "rendering.mobile/bouncing_clipped_rectangles" }, { - "duration": "24.0", + "duration": "22.0", "name": "rendering.mobile/bouncing_gradient_circles" }, { - "duration": "25.0", + "duration": "23.0", "name": "rendering.mobile/bouncing_png_images" }, { - "duration": "27.0", + "duration": "23.0", "name": "rendering.mobile/bouncing_svg_images" }, { - "duration": "28.0", + "duration": "27.0", "name": "rendering.mobile/camera_to_webgl" }, { - "duration": "25.0", + "duration": "23.0", "name": "rendering.mobile/canvas2d_to_texture.html" }, { - "duration": "35.0", + "duration": "38.0", "name": "rendering.mobile/canvas_05000_pixels_per_second" }, { - "duration": "34.0", + "duration": "40.0", "name": "rendering.mobile/canvas_10000_pixels_per_second" }, { - "duration": "30.0", + "duration": "34.0", "name": "rendering.mobile/canvas_20000_pixels_per_second" }, { - "duration": "29.0", + "duration": "33.0", "name": "rendering.mobile/canvas_40000_pixels_per_second" }, { - "duration": "29.0", + "duration": "33.0", "name": "rendering.mobile/canvas_60000_pixels_per_second" }, { - "duration": "28.0", + "duration": "32.0", "name": "rendering.mobile/canvas_75000_pixels_per_second" }, { - "duration": "28.0", + "duration": "32.0", "name": "rendering.mobile/canvas_90000_pixels_per_second" }, { - "duration": "25.0", + "duration": "23.0", "name": "rendering.mobile/canvas_animation_no_clear" }, { - "duration": "25.0", + "duration": "23.0", "name": "rendering.mobile/canvas_arcs" }, { - "duration": "29.0", + "duration": "26.0", "name": "rendering.mobile/canvas_font_cycler" }, { - "duration": "25.0", + "duration": "22.0", "name": "rendering.mobile/canvas_lines" }, { - "duration": "25.0", + "duration": "23.0", "name": "rendering.mobile/canvas_to_blob" }, { - "duration": "24.0", + "duration": "22.0", "name": "rendering.mobile/canvas_to_canvas_draw" }, { - "duration": "32.0", + "duration": "29.0", "name": "rendering.mobile/capitolvolkswagen_mobile_2018" }, { - "duration": "14.0", + "duration": "13.0", "name": "rendering.mobile/card_expansion" }, { - "duration": "15.0", + "duration": "14.0", "name": "rendering.mobile/card_expansion_animated" }, { - "duration": "15.0", + "duration": "14.0", "name": "rendering.mobile/card_expansion_images_text" }, { - "duration": "14.0", + "duration": "13.0", "name": "rendering.mobile/card_flying" }, { - "duration": "28.0", + "duration": "27.0", "name": "rendering.mobile/cc_poster_circle" }, { - "duration": "23.0", + "duration": "21.0", "name": "rendering.mobile/cc_scroll_text_only" }, { - "duration": "28.0", + "duration": "26.0", "name": "rendering.mobile/chip_tune" }, { - "duration": "46.0", + "duration": "43.0", "name": "rendering.mobile/cnn_2018" }, { - "duration": "11.0", + "duration": "9.0", "name": "rendering.mobile/cnn_article_mobile_2018" }, { - "duration": "45.0", + "duration": "41.0", "name": "rendering.mobile/cnn_mobile_2018" }, { - "duration": "11.0", + "duration": "9.0", "name": "rendering.mobile/cnn_mobile_pinch_2018" }, { - "duration": "41.0", + "duration": "40.0", "name": "rendering.mobile/cnn_pathological_2018" }, { - "duration": "26.0", + "duration": "24.0", "name": "rendering.mobile/compositor_heavy_animation" }, { - "duration": "16.0", + "duration": "15.0", "name": "rendering.mobile/coordinated_animation" }, { - "duration": "25.0", + "duration": "24.0", "name": "rendering.mobile/crafty_mind" }, { - "duration": "31.0", + "duration": "28.0", "name": "rendering.mobile/css_animations_many_keyframes" }, { - "duration": "26.0", + "duration": "25.0", "name": "rendering.mobile/css_animations_simultaneous_inline_style" }, { - "duration": "26.0", + "duration": "25.0", "name": "rendering.mobile/css_animations_simultaneous_new_element" }, { @@ -284,63 +284,63 @@ "name": "rendering.mobile/css_animations_simultaneous_style_element" }, { - "duration": "26.0", + "duration": "25.0", "name": "rendering.mobile/css_animations_simultaneous_updating_class" }, { - "duration": "26.0", + "duration": "25.0", "name": "rendering.mobile/css_animations_staggered_infinite_iterations" }, { - "duration": "28.0", + "duration": "27.0", "name": "rendering.mobile/css_animations_staggered_inline_style" }, { - "duration": "32.0", + "duration": "27.0", "name": "rendering.mobile/css_animations_staggered_new_element" }, { - "duration": "30.0", + "duration": "27.0", "name": "rendering.mobile/css_animations_staggered_style_element" }, { - "duration": "29.0", + "duration": "27.0", "name": "rendering.mobile/css_animations_staggered_updating_class" }, { - "duration": "29.0", + "duration": "27.0", "name": "rendering.mobile/css_animations_triggered_inline_style" }, { - "duration": "13.0", + "duration": "9.0", "name": "rendering.mobile/css_animations_triggered_new_element" }, { - "duration": "28.0", + "duration": "26.0", "name": "rendering.mobile/css_animations_triggered_style_element" }, { - "duration": "30.0", + "duration": "27.0", "name": "rendering.mobile/css_animations_triggered_updating_class" }, { - "duration": "27.0", + "duration": "25.0", "name": "rendering.mobile/css_opacity_plus_n_layers_0" }, { - "duration": "28.0", + "duration": "26.0", "name": "rendering.mobile/css_opacity_plus_n_layers_75" }, { - "duration": "30.0", + "duration": "28.0", "name": "rendering.mobile/css_opacity_plus_n_layers_99" }, { - "duration": "27.0", + "duration": "24.0", "name": "rendering.mobile/css_transitions_inline_style" }, { - "duration": "27.0", + "duration": "30.0", "name": "rendering.mobile/css_transitions_new_element" }, { @@ -376,7 +376,7 @@ "name": "rendering.mobile/css_transitions_triggered_style_element" }, { - "duration": "13.0", + "duration": "11.0", "name": "rendering.mobile/css_transitions_triggered_updating_class" }, { @@ -384,7 +384,7 @@ "name": "rendering.mobile/css_transitions_updating_class" }, { - "duration": "26.0", + "duration": "25.0", "name": "rendering.mobile/css_value_type_color" }, { @@ -392,7 +392,7 @@ "name": "rendering.mobile/css_value_type_filter" }, { - "duration": "27.0", + "duration": "26.0", "name": "rendering.mobile/css_value_type_length" }, { @@ -400,15 +400,15 @@ "name": "rendering.mobile/css_value_type_length_complex" }, { - "duration": "26.0", + "duration": "25.0", "name": "rendering.mobile/css_value_type_length_simple" }, { - "duration": "26.0", + "duration": "25.0", "name": "rendering.mobile/css_value_type_path" }, { - "duration": "26.0", + "duration": "25.0", "name": "rendering.mobile/css_value_type_shadow" }, { @@ -424,19 +424,19 @@ "name": "rendering.mobile/deviantart_mobile_2018" }, { - "duration": "13.0", + "duration": "11.0", "name": "rendering.mobile/digg_mobile_2018" }, { - "duration": "13.0", + "duration": "11.0", "name": "rendering.mobile/docs_paper.html" }, { - "duration": "26.0", + "duration": "25.0", "name": "rendering.mobile/docs_resume.html" }, { - "duration": "26.0", + "duration": "25.0", "name": "rendering.mobile/docs_table.html" }, { @@ -444,11 +444,11 @@ "name": "rendering.mobile/draw_image" }, { - "duration": "26.0", + "duration": "25.0", "name": "rendering.mobile/draw_image_not_pixel_aligned" }, { - "duration": "26.0", + "duration": "25.0", "name": "rendering.mobile/dynamic_canvas_to_hw_accelerated_canvas.html" }, { @@ -456,7 +456,7 @@ "name": "rendering.mobile/dynamic_cube_map" }, { - "duration": "26.0", + "duration": "25.0", "name": "rendering.mobile/dynamic_webgl_to_hw_accelerated_canvas.html" }, { @@ -468,27 +468,27 @@ "name": "rendering.mobile/ebay_2018" }, { - "duration": "24.0", + "duration": "25.0", "name": "rendering.mobile/ebay_mobile_2018" }, { - "duration": "13.0", + "duration": "11.0", "name": "rendering.mobile/ebay_mobile_pinch_2018" }, { - "duration": "26.0", + "duration": "30.0", "name": "rendering.mobile/ebay_scroll_2018" }, { - "duration": "30.0", + "duration": "29.0", "name": "rendering.mobile/effect_games" }, { - "duration": "13.0", + "duration": "11.0", "name": "rendering.mobile/espn_2018" }, { - "duration": "48.0", + "duration": "46.0", "name": "rendering.mobile/espn_mobile_2018" }, { @@ -500,15 +500,15 @@ "name": "rendering.mobile/extra_large_texture_uploads" }, { - "duration": "13.0", + "duration": "11.0", "name": "rendering.mobile/facebook_2018" }, { - "duration": "13.0", + "duration": "11.0", "name": "rendering.mobile/facebook_mobile_2018" }, { - "duration": "26.0", + "duration": "25.0", "name": "rendering.mobile/falling_particle_simulation_cpu.html" }, { @@ -516,15 +516,15 @@ "name": "rendering.mobile/falling_particle_simulation_gpu.html" }, { - "duration": "6.0", + "duration": "4.0", "name": "rendering.mobile/famo_us_twitter_demo" }, { - "duration": "26.0", + "duration": "25.0", "name": "rendering.mobile/fill_clear_rect.html" }, { - "duration": "26.0", + "duration": "25.0", "name": "rendering.mobile/fill_shapes" }, { @@ -532,19 +532,19 @@ "name": "rendering.mobile/filter_terrain_svg" }, { - "duration": "25.0", + "duration": "29.0", "name": "rendering.mobile/flickr_scroll_2018" }, { - "duration": "16.0", + "duration": "15.0", "name": "rendering.mobile/font_wipe" }, { - "duration": "20.0", + "duration": "17.0", "name": "rendering.mobile/forecast.io_mobile_2018" }, { - "duration": "26.0", + "duration": "25.0", "name": "rendering.mobile/get_image_data_cpu.html" }, { @@ -552,11 +552,11 @@ "name": "rendering.mobile/get_image_data_gpu.html" }, { - "duration": "13.0", + "duration": "11.0", "name": "rendering.mobile/gmail_2018" }, { - "duration": "13.0", + "duration": "11.0", "name": "rendering.mobile/google_calendar_2018" }, { @@ -564,143 +564,143 @@ "name": "rendering.mobile/google_image_search_2018" }, { - "duration": "23.0", + "duration": "22.0", "name": "rendering.mobile/google_image_search_mobile_2018" }, { - "duration": "6.0", + "duration": "4.0", "name": "rendering.mobile/google_news_ios" }, { - "duration": "21.0", + "duration": "26.0", "name": "rendering.mobile/google_news_mobile_2018" }, { - "duration": "7.0", + "duration": "11.0", "name": "rendering.mobile/google_plus_2018" }, { - "duration": "20.0", + "duration": "18.0", "name": "rendering.mobile/google_plus_mobile_2018" }, { - "duration": "7.0", + "duration": "11.0", "name": "rendering.mobile/google_search_mobile_pinch_2018" }, { - "duration": "7.0", + "duration": "11.0", "name": "rendering.mobile/google_web_search_2018" }, { - "duration": "16.0", + "duration": "22.0", "name": "rendering.mobile/google_web_search_mobile_2018" }, { - "duration": "28.0", + "duration": "27.0", "name": "rendering.mobile/gpu_bound_shader.html" }, { - "duration": "26.0", + "duration": "31.0", "name": "rendering.mobile/guardian_pathological_2018" }, { - "duration": "27.0", + "duration": "26.0", "name": "rendering.mobile/guimark_vector_chart" }, { - "duration": "7.0", + "duration": "11.0", "name": "rendering.mobile/gws_boogie_expansion" }, { - "duration": "7.0", + "duration": "11.0", "name": "rendering.mobile/gws_google_expansion" }, { - "duration": "24.0", + "duration": "29.0", "name": "rendering.mobile/hakim" }, { - "duration": "15.0", + "duration": "14.0", "name": "rendering.mobile/horizontal_vertical_expansion" }, { - "duration": "21.0", + "duration": "26.0", "name": "rendering.mobile/hw_accelerated_canvas_to_sw_canvas.html" }, { - "duration": "15.0", + "duration": "9.0", "name": "rendering.mobile/idle_power_animated_gif" }, { - "duration": "11.0", + "duration": "9.0", "name": "rendering.mobile/idle_power_blank" }, { - "duration": "11.0", + "duration": "9.0", "name": "rendering.mobile/idle_power_css_animation" }, { - "duration": "6.0", + "duration": "4.0", "name": "rendering.mobile/idle_power_request_animation_frame" }, { - "duration": "6.0", + "duration": "10.0", "name": "rendering.mobile/idle_power_set_timeout_long" }, { - "duration": "6.0", + "duration": "10.0", "name": "rendering.mobile/idle_power_set_timetout" }, { - "duration": "11.0", + "duration": "9.0", "name": "rendering.mobile/ie_chalkboard" }, { - "duration": "6.0", + "duration": "4.0", "name": "rendering.mobile/ie_pirate_mark" }, { - "duration": "23.0", + "duration": "27.0", "name": "rendering.mobile/infinite_scroll_element_n_layers_0" }, { - "duration": "23.0", + "duration": "27.0", "name": "rendering.mobile/infinite_scroll_element_n_layers_75" }, { - "duration": "25.0", + "duration": "29.0", "name": "rendering.mobile/infinite_scroll_element_n_layers_99" }, { - "duration": "22.0", + "duration": "27.0", "name": "rendering.mobile/infinite_scroll_root_fixed_n_layers_0" }, { - "duration": "23.0", + "duration": "28.0", "name": "rendering.mobile/infinite_scroll_root_fixed_n_layers_75" }, { - "duration": "24.0", + "duration": "29.0", "name": "rendering.mobile/infinite_scroll_root_fixed_n_layers_99" }, { - "duration": "22.0", + "duration": "27.0", "name": "rendering.mobile/infinite_scroll_root_n_layers_0" }, { - "duration": "23.0", + "duration": "27.0", "name": "rendering.mobile/infinite_scroll_root_n_layers_75" }, { - "duration": "24.0", + "duration": "29.0", "name": "rendering.mobile/infinite_scroll_root_n_layers_99" }, { - "duration": "19.0", + "duration": "18.0", "name": "rendering.mobile/infinite_scrolling" }, { - "duration": "22.0", + "duration": "23.0", "name": "rendering.mobile/jarro_doverson" }, { @@ -708,55 +708,55 @@ "name": "rendering.mobile/jpeg_decoding_rgb_and_gpu_rasterization" }, { - "duration": "15.0", + "duration": "13.0", "name": "rendering.mobile/jpeg_decoding_yuv_and_gpu_rasterization" }, { - "duration": "26.0", + "duration": "30.0", "name": "rendering.mobile/js_full_screen_invalidation" }, { - "duration": "24.0", + "duration": "29.0", "name": "rendering.mobile/js_opacity_plus_n_layers_0" }, { - "duration": "25.0", + "duration": "29.0", "name": "rendering.mobile/js_opacity_plus_n_layers_75" }, { - "duration": "28.0", + "duration": "32.0", "name": "rendering.mobile/js_opacity_plus_n_layers_99" }, { - "duration": "24.0", + "duration": "28.0", "name": "rendering.mobile/js_paint_plus_n_layers_0" }, { - "duration": "25.0", + "duration": "30.0", "name": "rendering.mobile/js_paint_plus_n_layers_75" }, { - "duration": "28.0", + "duration": "32.0", "name": "rendering.mobile/js_paint_plus_n_layers_99" }, { - "duration": "25.0", + "duration": "23.0", "name": "rendering.mobile/js_poster_circle" }, { - "duration": "23.0", + "duration": "21.0", "name": "rendering.mobile/js_scroll_text_only" }, { - "duration": "22.0", + "duration": "20.0", "name": "rendering.mobile/kevs_3d" }, { - "duration": "20.0", + "duration": "18.0", "name": "rendering.mobile/keyframed_animations" }, { - "duration": "21.0", + "duration": "18.0", "name": "rendering.mobile/large_texture_uploads" }, { @@ -764,439 +764,439 @@ "name": "rendering.mobile/latimes_pathological_2018" }, { - "duration": "16.0", + "duration": "14.0", "name": "rendering.mobile/linkedin_2018" }, { - "duration": "7.0", + "duration": "4.0", "name": "rendering.mobile/linkedin_mobile_2018" }, { - "duration": "7.0", + "duration": "4.0", "name": "rendering.mobile/linkedin_mobile_pinch_2018" }, { - "duration": "7.0", + "duration": "4.0", "name": "rendering.mobile/linkedin_pathological_2018" }, { - "duration": "14.0", + "duration": "12.0", "name": "rendering.mobile/list_animation_simple" }, { - "duration": "6.0", + "duration": "4.0", "name": "rendering.mobile/list_recycle_transform" }, { - "duration": "21.0", + "duration": "18.0", "name": "rendering.mobile/main_0fps_impl_60fps" }, { - "duration": "20.0", + "duration": "18.0", "name": "rendering.mobile/main_0fps_impl_60fps_no_update" }, { - "duration": "20.0", + "duration": "18.0", "name": "rendering.mobile/main_0fps_impl_60fps_no_update_jank" }, { - "duration": "20.0", + "duration": "17.0", "name": "rendering.mobile/main_0fps_with_jank_impl_0fps" }, { - "duration": "20.0", + "duration": "18.0", "name": "rendering.mobile/main_15fps_impl_0fps" }, { - "duration": "7.0", + "duration": "4.0", "name": "rendering.mobile/main_15fps_with_jank_impl_0fps" }, { - "duration": "20.0", + "duration": "18.0", "name": "rendering.mobile/main_30fps_impl_0fps" }, { - "duration": "21.0", + "duration": "18.0", "name": "rendering.mobile/main_30fps_impl_60fps" }, { - "duration": "20.0", + "duration": "18.0", "name": "rendering.mobile/main_60fps_impl_0fps" }, { - "duration": "7.0", + "duration": "4.0", "name": "rendering.mobile/main_60fps_impl_60fps" }, { - "duration": "20.0", + "duration": "18.0", "name": "rendering.mobile/main_60fps_impl_60fps_no_update" }, { - "duration": "7.0", + "duration": "4.0", "name": "rendering.mobile/main_60fps_impl_60fps_no_update_jank" }, { - "duration": "7.0", + "duration": "4.0", "name": "rendering.mobile/main_60fps_with_extreme_jank_impl_0fps" }, { - "duration": "7.0", + "duration": "4.0", "name": "rendering.mobile/main_60fps_with_jank_and_delay_impl_60fps" }, { - "duration": "7.0", + "duration": "4.0", "name": "rendering.mobile/main_60fps_with_jank_impl_0fps" }, { - "duration": "7.0", + "duration": "4.0", "name": "rendering.mobile/main_animations_half_presented" }, { - "duration": "24.0", + "duration": "23.0", "name": "rendering.mobile/man_in_blue" }, { - "duration": "26.0", + "duration": "24.0", "name": "rendering.mobile/many_images" }, { - "duration": "25.0", + "duration": "23.0", "name": "rendering.mobile/many_planets_deep" }, { - "duration": "26.0", + "duration": "25.0", "name": "rendering.mobile/maps_perf_test" }, { - "duration": "15.0", + "duration": "14.0", "name": "rendering.mobile/mask_transition_animation" }, { - "duration": "19.0", + "duration": "16.0", "name": "rendering.mobile/masonry" }, { - "duration": "21.0", + "duration": "18.0", "name": "rendering.mobile/medium_texture_uploads" }, { - "duration": "20.0", + "duration": "18.0", "name": "rendering.mobile/megi_dish" }, { - "duration": "7.0", + "duration": "4.0", "name": "rendering.mobile/microgame_fps" }, { - "duration": "19.0", + "duration": "18.0", "name": "rendering.mobile/microsoft_asteroid_belt" }, { - "duration": "7.0", + "duration": "4.0", "name": "rendering.mobile/microsoft_fireflies" }, { - "duration": "19.0", + "duration": "18.0", "name": "rendering.mobile/microsoft_fish_ie_tank" }, { - "duration": "20.0", + "duration": "18.0", "name": "rendering.mobile/microsoft_performance" }, { - "duration": "20.0", + "duration": "18.0", "name": "rendering.mobile/microsoft_snow" }, { - "duration": "19.0", + "duration": "18.0", "name": "rendering.mobile/microsoft_speed_reading" }, { - "duration": "19.0", + "duration": "18.0", "name": "rendering.mobile/microsoft_tweet_map" }, { - "duration": "20.0", + "duration": "18.0", "name": "rendering.mobile/microsoft_video_city" }, { - "duration": "19.0", + "duration": "18.0", "name": "rendering.mobile/microsoft_worker_fountains" }, { - "duration": "7.0", + "duration": "4.0", "name": "rendering.mobile/mix_10k" }, { - "duration": "20.0", + "duration": "18.0", "name": "rendering.mobile/mix_blend_mode_animation_difference" }, { - "duration": "20.0", + "duration": "18.0", "name": "rendering.mobile/mix_blend_mode_animation_hue" }, { - "duration": "21.0", + "duration": "18.0", "name": "rendering.mobile/mix_blend_mode_animation_propagating_isolation" }, { - "duration": "20.0", + "duration": "19.0", "name": "rendering.mobile/mix_blend_mode_animation_screen" }, { - "duration": "53.0", + "duration": "49.0", "name": "rendering.mobile/mlb_mobile_2018" }, { - "duration": "6.0", + "duration": "4.0", "name": "rendering.mobile/mobile_news_sandbox" }, { - "duration": "23.0", + "duration": "20.0", "name": "rendering.mobile/motion_mark_canvas_fill_shapes" }, { - "duration": "21.0", + "duration": "19.0", "name": "rendering.mobile/motion_mark_canvas_stroke_shapes" }, { - "duration": "7.0", + "duration": "4.0", "name": "rendering.mobile/motionmark_anim_design_15" }, { - "duration": "7.0", + "duration": "4.0", "name": "rendering.mobile/motionmark_anim_focus_25" }, { - "duration": "7.0", + "duration": "4.0", "name": "rendering.mobile/motionmark_anim_images_50" }, { - "duration": "7.0", + "duration": "4.0", "name": "rendering.mobile/motionmark_anim_leaves_250" }, { - "duration": "7.0", + "duration": "4.0", "name": "rendering.mobile/motionmark_anim_multiply_175" }, { - "duration": "7.0", + "duration": "4.0", "name": "rendering.mobile/motionmark_anim_suits_125" }, { - "duration": "7.0", + "duration": "4.0", "name": "rendering.mobile/motionmark_html_composited_transforms_125" }, { - "duration": "7.0", + "duration": "4.0", "name": "rendering.mobile/motionmark_html_css_bouncing_blend_circles_25" }, { - "duration": "7.0", + "duration": "4.0", "name": "rendering.mobile/motionmark_html_css_bouncing_circles_250" }, { - "duration": "7.0", + "duration": "4.0", "name": "rendering.mobile/motionmark_html_css_bouncing_clipped_rects_100" }, { - "duration": "7.0", + "duration": "4.0", "name": "rendering.mobile/motionmark_html_css_bouncing_filter_circles_15" }, { - "duration": "7.0", + "duration": "4.0", "name": "rendering.mobile/motionmark_html_css_bouncing_gradient_circles_250" }, { - "duration": "7.0", + "duration": "4.0", "name": "rendering.mobile/motionmark_html_css_bouncing_svg_images_50" }, { - "duration": "7.0", + "duration": "4.0", "name": "rendering.mobile/motionmark_html_css_bouncing_tagged_images_225" }, { - "duration": "7.0", + "duration": "4.0", "name": "rendering.mobile/motionmark_html_dom_particles_svg_masks_25" }, { - "duration": "7.0", + "duration": "4.0", "name": "rendering.mobile/motionmark_html_focus_20_15" }, { - "duration": "7.0", + "duration": "4.0", "name": "rendering.mobile/motionmark_html_leaves_20_50" }, { - "duration": "7.0", + "duration": "4.0", "name": "rendering.mobile/motionmark_ramp_canvas_arcs" }, { - "duration": "7.0", + "duration": "4.0", "name": "rendering.mobile/motionmark_ramp_canvas_lines" }, { - "duration": "7.0", + "duration": "4.0", "name": "rendering.mobile/motionmark_ramp_design" }, { - "duration": "7.0", + "duration": "4.0", "name": "rendering.mobile/motionmark_ramp_images" }, { - "duration": "7.0", + "duration": "4.0", "name": "rendering.mobile/motionmark_ramp_leaves" }, { - "duration": "7.0", + "duration": "4.0", "name": "rendering.mobile/motionmark_ramp_multiply" }, { - "duration": "7.0", + "duration": "4.0", "name": "rendering.mobile/motionmark_ramp_paths" }, { - "duration": "7.0", + "duration": "4.0", "name": "rendering.mobile/motionmark_ramp_suits" }, { - "duration": "7.0", + "duration": "4.0", "name": "rendering.mobile/motionmark_svg_bouncing_circles_250" }, { - "duration": "7.0", + "duration": "4.0", "name": "rendering.mobile/motionmark_svg_bouncing_clipped_rects_100" }, { - "duration": "7.0", + "duration": "4.0", "name": "rendering.mobile/motionmark_svg_bouncing_gradient_circles_200" }, { - "duration": "7.0", + "duration": "4.0", "name": "rendering.mobile/motionmark_svg_bouncing_png_images_200" }, { - "duration": "7.0", + "duration": "4.0", "name": "rendering.mobile/motionmark_svg_bouncing_svg_images_50" }, { - "duration": "25.0", + "duration": "23.0", "name": "rendering.mobile/new_tilings" }, { - "duration": "19.0", + "duration": "16.0", "name": "rendering.mobile/no_op_raf" }, { - "duration": "17.0", + "duration": "15.0", "name": "rendering.mobile/no_op_scroll" }, { - "duration": "17.0", + "duration": "14.0", "name": "rendering.mobile/no_op_settimeout" }, { - "duration": "18.0", + "duration": "15.0", "name": "rendering.mobile/no_op_touch_handler" }, { - "duration": "20.0", + "duration": "18.0", "name": "rendering.mobile/no_update_compositor_animation_with_janky_main_animation" }, { - "duration": "33.0", + "duration": "29.0", "name": "rendering.mobile/non_opaque_background_compositor_thread_scrolling_00050_pixels_per_second" }, { - "duration": "32.0", + "duration": "30.0", "name": "rendering.mobile/non_opaque_background_main_thread_scrolling_00050_pixels_per_second" }, { - "duration": "23.0", + "duration": "22.0", "name": "rendering.mobile/nvidia_vertex_buffer_object" }, { - "duration": "26.0", + "duration": "30.0", "name": "rendering.mobile/nyc_gov_scroll_2018" }, { - "duration": "40.0", + "duration": "38.0", "name": "rendering.mobile/nytimes_mobile_2018" }, { - "duration": "37.0", + "duration": "44.0", "name": "rendering.mobile/nytimes_scroll_2018" }, { - "duration": "20.0", + "duration": "17.0", "name": "rendering.mobile/off_screen_main_60fps" }, { - "duration": "6.0", + "duration": "4.0", "name": "rendering.mobile/off_screen_main_60fps_jank" }, { - "duration": "6.0", + "duration": "4.0", "name": "rendering.mobile/offscreen_animation_no_damage" }, { - "duration": "24.0", + "duration": "19.0", "name": "rendering.mobile/overlay_background_color_css_transitions_page" }, { - "duration": "20.0", + "duration": "18.0", "name": "rendering.mobile/paint_worklet" }, { - "duration": "15.0", + "duration": "14.0", "name": "rendering.mobile/parallax_effect" }, { - "duration": "24.0", + "duration": "23.0", "name": "rendering.mobile/particles" }, { - "duration": "26.0", + "duration": "24.0", "name": "rendering.mobile/pbs_pathological_2018" }, { - "duration": "13.0", + "duration": "12.0", "name": "rendering.mobile/physical_simulation" }, { - "duration": "19.0", + "duration": "21.0", "name": "rendering.mobile/pinterest_2018" }, { - "duration": "18.0", + "duration": "13.0", "name": "rendering.mobile/pinterest_mobile_2018" }, { - "duration": "23.0", + "duration": "20.0", "name": "rendering.mobile/put_and_create_imagebitmap_from_imagedata" }, { - "duration": "21.0", + "duration": "20.0", "name": "rendering.mobile/put_get_image_data" }, { - "duration": "20.0", + "duration": "19.0", "name": "rendering.mobile/put_image_data.html" }, { - "duration": "17.0", + "duration": "15.0", "name": "rendering.mobile/raf" }, { - "duration": "17.0", + "duration": "15.0", "name": "rendering.mobile/raf_animation" }, { - "duration": "17.0", + "duration": "15.0", "name": "rendering.mobile/raf_canvas" }, { - "duration": "17.0", + "duration": "15.0", "name": "rendering.mobile/raf_touch_animation" }, { @@ -1204,295 +1204,295 @@ "name": "rendering.mobile/recode_pathological_2018" }, { - "duration": "6.0", + "duration": "4.0", "name": "rendering.mobile/reddit_mobile_2018" }, { - "duration": "21.0", + "duration": "26.0", "name": "rendering.mobile/runway_2019" }, { - "duration": "24.0", + "duration": "29.0", "name": "rendering.mobile/san_angeles" }, { - "duration": "11.0", + "duration": "15.0", "name": "rendering.mobile/second_batch_js_heavy" }, { - "duration": "11.0", + "duration": "15.0", "name": "rendering.mobile/second_batch_js_light" }, { - "duration": "11.0", + "duration": "15.0", "name": "rendering.mobile/second_batch_js_medium" }, { - "duration": "37.0", + "duration": "48.0", "name": "rendering.mobile/sfgate_mobile_2018" }, { - "duration": "20.0", + "duration": "23.0", "name": "rendering.mobile/sheets_render.html" }, { - "duration": "22.0", + "duration": "26.0", "name": "rendering.mobile/silk_finance" }, { - "duration": "17.0", + "duration": "20.0", "name": "rendering.mobile/simple_text_page" }, { - "duration": "12.0", + "duration": "16.0", "name": "rendering.mobile/simple_touch_drag" }, { - "duration": "60.0", + "duration": "65.0", "name": "rendering.mobile/skelebuddies_wasm_2020" }, { - "duration": "23.0", + "duration": "27.0", "name": "rendering.mobile/slashdot_mobile_2018" }, { - "duration": "20.0", + "duration": "24.0", "name": "rendering.mobile/small_texture_uploads" }, { - "duration": "23.0", + "duration": "28.0", "name": "rendering.mobile/smash_cat" }, { - "duration": "21.0", + "duration": "25.0", "name": "rendering.mobile/spielzeugz" }, { - "duration": "20.0", + "duration": "24.0", "name": "rendering.mobile/static_canvas_to_hw_accelerated_canvas.html" }, { - "duration": "20.0", + "duration": "24.0", "name": "rendering.mobile/static_webgl_to_hw_accelerated_canvas.html" }, { - "duration": "6.0", + "duration": "4.0", "name": "rendering.mobile/sticky_using_webkit" }, { - "duration": "20.0", + "duration": "23.0", "name": "rendering.mobile/stroke_shapes" }, { - "duration": "6.0", + "duration": "10.0", "name": "rendering.mobile/svg_icon_raster" }, { - "duration": "14.0", + "duration": "13.0", "name": "rendering.mobile/swipe_to_dismiss" }, { - "duration": "16.0", + "duration": "19.0", "name": "rendering.mobile/sync_scroll_offset" }, { - "duration": "40.0", + "duration": "43.0", "name": "rendering.mobile/techcrunch_2018" }, { - "duration": "39.0", + "duration": "37.0", "name": "rendering.mobile/techcrunch_mobile_2018" }, { - "duration": "34.0", + "duration": "36.0", "name": "rendering.mobile/text_05000_pixels_per_second" }, { - "duration": "32.0", + "duration": "37.0", "name": "rendering.mobile/text_10000_pixels_per_second" }, { - "duration": "29.0", + "duration": "33.0", "name": "rendering.mobile/text_20000_pixels_per_second" }, { - "duration": "28.0", + "duration": "32.0", "name": "rendering.mobile/text_40000_pixels_per_second" }, { - "duration": "28.0", + "duration": "32.0", "name": "rendering.mobile/text_60000_pixels_per_second" }, { - "duration": "28.0", + "duration": "32.0", "name": "rendering.mobile/text_75000_pixels_per_second" }, { - "duration": "28.0", + "duration": "32.0", "name": "rendering.mobile/text_90000_pixels_per_second" }, { - "duration": "28.0", + "duration": "33.0", "name": "rendering.mobile/text_constant_full_page_raster_05000_pixels_per_second" }, { - "duration": "28.0", + "duration": "36.0", "name": "rendering.mobile/text_constant_full_page_raster_10000_pixels_per_second" }, { - "duration": "31.0", + "duration": "33.0", "name": "rendering.mobile/text_constant_full_page_raster_20000_pixels_per_second" }, { - "duration": "29.0", + "duration": "32.0", "name": "rendering.mobile/text_constant_full_page_raster_40000_pixels_per_second" }, { - "duration": "28.0", + "duration": "32.0", "name": "rendering.mobile/text_constant_full_page_raster_60000_pixels_per_second" }, { - "duration": "28.0", + "duration": "32.0", "name": "rendering.mobile/text_constant_full_page_raster_75000_pixels_per_second" }, { - "duration": "27.0", + "duration": "32.0", "name": "rendering.mobile/text_constant_full_page_raster_90000_pixels_per_second" }, { - "duration": "34.0", + "duration": "33.0", "name": "rendering.mobile/text_fling_05000_pixels_per_second" }, { - "duration": "33.0", + "duration": "32.0", "name": "rendering.mobile/text_fling_10000_pixels_per_second" }, { - "duration": "35.0", + "duration": "33.0", "name": "rendering.mobile/text_fling_20000_pixels_per_second" }, { - "duration": "34.0", + "duration": "37.0", "name": "rendering.mobile/text_hover_05000_pixels_per_second" }, { - "duration": "33.0", + "duration": "37.0", "name": "rendering.mobile/text_hover_10000_pixels_per_second" }, { - "duration": "29.0", + "duration": "33.0", "name": "rendering.mobile/text_hover_20000_pixels_per_second" }, { - "duration": "28.0", + "duration": "32.0", "name": "rendering.mobile/text_hover_40000_pixels_per_second" }, { - "duration": "28.0", + "duration": "32.0", "name": "rendering.mobile/text_hover_60000_pixels_per_second" }, { - "duration": "27.0", + "duration": "31.0", "name": "rendering.mobile/text_hover_75000_pixels_per_second" }, { - "duration": "27.0", + "duration": "31.0", "name": "rendering.mobile/text_hover_90000_pixels_per_second" }, { - "duration": "6.0", + "duration": "10.0", "name": "rendering.mobile/text_scrollbar_100_pixels_per_second" }, { - "duration": "6.0", + "duration": "10.0", "name": "rendering.mobile/text_scrollbar_1200_pixels_per_second" }, { - "duration": "6.0", + "duration": "10.0", "name": "rendering.mobile/text_scrollbar_200_pixels_per_second" }, { - "duration": "6.0", + "duration": "10.0", "name": "rendering.mobile/text_scrollbar_2300_pixels_per_second" }, { - "duration": "6.0", + "duration": "10.0", "name": "rendering.mobile/text_scrollbar_700_pixels_per_second" }, { - "duration": "30.0", + "duration": "31.0", "name": "rendering.mobile/theverge_article_mobile_2018" }, { - "duration": "30.0", + "duration": "34.0", "name": "rendering.mobile/theverge_mobile_2018" }, { - "duration": "24.0", + "duration": "28.0", "name": "rendering.mobile/throughput_scrolling_active_handler" }, { - "duration": "24.0", + "duration": "28.0", "name": "rendering.mobile/throughput_scrolling_composited" }, { - "duration": "24.0", + "duration": "27.0", "name": "rendering.mobile/throughput_scrolling_passive_handler" }, { - "duration": "25.0", + "duration": "28.0", "name": "rendering.mobile/throughput_scrolling_uncomposited" }, { - "duration": "57.0", + "duration": "62.0", "name": "rendering.mobile/tiny_racing_v3_wasm_2020" }, { - "duration": "19.0", + "duration": "24.0", "name": "rendering.mobile/toBlob_duration.html" }, { - "duration": "19.0", + "duration": "23.0", "name": "rendering.mobile/toBlob_duration_jpeg.html" }, { - "duration": "22.0", + "duration": "26.0", "name": "rendering.mobile/toBlob_small_canvas_in_worker.html" }, { - "duration": "17.0", + "duration": "20.0", "name": "rendering.mobile/touch_handler_scrolling" }, { - "duration": "20.0", + "duration": "24.0", "name": "rendering.mobile/transfer_from_imageBitmap.html" }, { - "duration": "20.0", + "duration": "24.0", "name": "rendering.mobile/transform_transitions" }, { - "duration": "20.0", + "duration": "23.0", "name": "rendering.mobile/transform_transitions_js_block" }, { - "duration": "6.0", + "duration": "10.0", "name": "rendering.mobile/twitch_2018" }, { - "duration": "6.0", + "duration": "10.0", "name": "rendering.mobile/twitch_mobile_pinch_2018" }, { - "duration": "6.0", + "duration": "10.0", "name": "rendering.mobile/twitter_2018" }, { - "duration": "20.0", + "duration": "24.0", "name": "rendering.mobile/twitter_mobile_2018" }, { - "duration": "17.0", + "duration": "21.0", "name": "rendering.mobile/update_history_state" }, { @@ -1500,99 +1500,99 @@ "name": "rendering.mobile/usatoday_mobile_2018" }, { - "duration": "15.0", + "duration": "14.0", "name": "rendering.mobile/vertical_expansion" }, { - "duration": "22.0", + "duration": "25.0", "name": "rendering.mobile/video_to_hw_accelerated_canvas" }, { - "duration": "6.0", + "duration": "10.0", "name": "rendering.mobile/video_to_sub_texture" }, { - "duration": "11.0", + "duration": "10.0", "name": "rendering.mobile/video_to_sub_texture_flip_and_premultiply" }, { - "duration": "11.0", + "duration": "10.0", "name": "rendering.mobile/video_to_sub_texture_flip_y" }, { - "duration": "11.0", + "duration": "10.0", "name": "rendering.mobile/video_to_sub_texture_premultiply" }, { - "duration": "11.0", + "duration": "10.0", "name": "rendering.mobile/video_to_texture" }, { - "duration": "24.0", + "duration": "26.0", "name": "rendering.mobile/web_animation_value_type_color" }, { - "duration": "25.0", + "duration": "27.0", "name": "rendering.mobile/web_animation_value_type_length_3d" }, { - "duration": "24.0", + "duration": "26.0", "name": "rendering.mobile/web_animation_value_type_length_complex" }, { - "duration": "24.0", + "duration": "26.0", "name": "rendering.mobile/web_animation_value_type_length_simple" }, { - "duration": "24.0", + "duration": "26.0", "name": "rendering.mobile/web_animation_value_type_path" }, { - "duration": "24.0", + "duration": "26.0", "name": "rendering.mobile/web_animation_value_type_shadow" }, { - "duration": "25.0", + "duration": "28.0", "name": "rendering.mobile/web_animation_value_type_transform_complex" }, { - "duration": "25.0", + "duration": "29.0", "name": "rendering.mobile/web_animation_value_type_transform_simple" }, { - "duration": "11.0", + "duration": "12.0", "name": "rendering.mobile/web_animations_many_keyframes" }, { - "duration": "25.0", + "duration": "28.0", "name": "rendering.mobile/web_animations_set_current_time" }, { - "duration": "25.0", + "duration": "28.0", "name": "rendering.mobile/web_animations_simultaneous" }, { - "duration": "27.0", + "duration": "30.0", "name": "rendering.mobile/web_animations_staggered_chaining" }, { - "duration": "29.0", + "duration": "32.0", "name": "rendering.mobile/web_animations_staggered_infinite_iterations" }, { - "duration": "28.0", + "duration": "31.0", "name": "rendering.mobile/web_animations_staggered_triggering_page" }, { - "duration": "25.0", + "duration": "28.0", "name": "rendering.mobile/webgl_to_texture" }, { - "duration": "18.0", + "duration": "20.0", "name": "rendering.mobile/webp_decoding_rgb_and_gpu_rasterization" }, { - "duration": "18.0", + "duration": "20.0", "name": "rendering.mobile/webp_decoding_yuv_and_gpu_rasterization" }, { @@ -1600,23 +1600,23 @@ "name": "rendering.mobile/wikipedia_2018" }, { - "duration": "31.0", + "duration": "37.0", "name": "rendering.mobile/wikipedia_delayed_scroll_start_2018" }, { - "duration": "31.0", + "duration": "32.0", "name": "rendering.mobile/wikipedia_mobile_2018" }, { - "duration": "11.0", + "duration": "12.0", "name": "rendering.mobile/wordpress_2018" }, { - "duration": "28.0", + "duration": "29.0", "name": "rendering.mobile/wordpress_mobile_2018" }, { - "duration": "67.0", + "duration": "71.0", "name": "rendering.mobile/worldjournal_mobile_2018" }, { @@ -1624,51 +1624,51 @@ "name": "rendering.mobile/wow_wiki_pathological_2018" }, { - "duration": "72.0", + "duration": "67.0", "name": "rendering.mobile/wowwiki_mobile_2018" }, { - "duration": "57.0", + "duration": "52.0", "name": "rendering.mobile/wsj_mobile_2018" }, { - "duration": "30.0", + "duration": "32.0", "name": "rendering.mobile/yahoo_answers_2018" }, { - "duration": "11.0", + "duration": "12.0", "name": "rendering.mobile/yahoo_answers_mobile_2018" }, { - "duration": "27.0", + "duration": "31.0", "name": "rendering.mobile/yahoo_news_2018" }, { - "duration": "27.0", + "duration": "31.0", "name": "rendering.mobile/yahoo_news_mobile_2018" }, { - "duration": "33.0", + "duration": "37.0", "name": "rendering.mobile/yahoo_sports_2018" }, { - "duration": "33.0", + "duration": "37.0", "name": "rendering.mobile/yahoo_sports_pathological_2018" }, { - "duration": "11.0", + "duration": "12.0", "name": "rendering.mobile/youtube_2018" }, { - "duration": "11.0", + "duration": "12.0", "name": "rendering.mobile/youtube_mobile_2018" }, { - "duration": "35.0", + "duration": "38.0", "name": "rendering.mobile/zdnet_pathological_2018" }, { - "duration": "14.0", + "duration": "13.0", "name": "rendering.mobile/zoom_in_animation" }, { @@ -1680,23 +1680,23 @@ "name": "system_health.memory_desktop/browse:media:imgur" }, { - "duration": "1.0", + "duration": "2.0", "name": "system_health.memory_desktop/browse:media:pinterest:2018" }, { - "duration": "1.0", + "duration": "2.0", "name": "system_health.memory_desktop/browse:media:tumblr:2018" }, { - "duration": "77.0", + "duration": "78.0", "name": "system_health.memory_desktop/browse:media:youtube:2019" }, { - "duration": "1.0", + "duration": "2.0", "name": "system_health.memory_desktop/browse:media:youtubetv:2019" }, { - "duration": "1.0", + "duration": "2.0", "name": "system_health.memory_desktop/browse:media:youtubetv_watch:2020" }, { @@ -1708,11 +1708,11 @@ "name": "system_health.memory_desktop/browse:news:flipboard:2020" }, { - "duration": "1.0", + "duration": "2.0", "name": "system_health.memory_desktop/browse:news:nytimes:2020" }, { - "duration": "1.0", + "duration": "2.0", "name": "system_health.memory_desktop/browse:news:reddit:2020" }, { @@ -1732,11 +1732,11 @@ "name": "system_health.memory_desktop/browse:social:tumblr_infinite_scroll:2018" }, { - "duration": "1.0", + "duration": "2.0", "name": "system_health.memory_desktop/browse:social:twitter:2018" }, { - "duration": "1.0", + "duration": "2.0", "name": "system_health.memory_desktop/browse:social:twitter_infinite_scroll:2018" }, { @@ -1772,11 +1772,11 @@ "name": "system_health.memory_desktop/browse:tools:maps:2019" }, { - "duration": "1.0", + "duration": "2.0", "name": "system_health.memory_desktop/browse:tools:photoshop:2021" }, { - "duration": "1.0", + "duration": "2.0", "name": "system_health.memory_desktop/browse:tools:photoshop_warm:2021" }, { @@ -1788,31 +1788,31 @@ "name": "system_health.memory_desktop/browse_accessibility:tech:codesearch:2018" }, { - "duration": "13.0", + "duration": "14.0", "name": "system_health.memory_desktop/load:chrome:blank" }, { - "duration": "19.0", + "duration": "24.0", "name": "system_health.memory_desktop/load:games:alphabetty:2018" }, { - "duration": "14.0", + "duration": "16.0", "name": "system_health.memory_desktop/load:games:bubbles:2020" }, { - "duration": "15.0", + "duration": "17.0", "name": "system_health.memory_desktop/load:games:lazors" }, { - "duration": "15.0", + "duration": "17.0", "name": "system_health.memory_desktop/load:games:miniclip:2018" }, { - "duration": "1.0", + "duration": "2.0", "name": "system_health.memory_desktop/load:games:spychase:2018" }, { - "duration": "19.0", + "duration": "21.0", "name": "system_health.memory_desktop/load:media:9gag" }, { @@ -1820,31 +1820,31 @@ "name": "system_health.memory_desktop/load:media:dailymotion:2019" }, { - "duration": "1.0", + "duration": "2.0", "name": "system_health.memory_desktop/load:media:facebook_feed:desktop:2020" }, { - "duration": "14.0", + "duration": "16.0", "name": "system_health.memory_desktop/load:media:facebook_photos:2018" }, { - "duration": "1.0", + "duration": "2.0", "name": "system_health.memory_desktop/load:media:facebook_photos:desktop:2020" }, { - "duration": "23.0", + "duration": "24.0", "name": "system_health.memory_desktop/load:media:flickr:2018" }, { - "duration": "17.0", + "duration": "18.0", "name": "system_health.memory_desktop/load:media:google_images:2018" }, { - "duration": "26.0", + "duration": "30.0", "name": "system_health.memory_desktop/load:media:imgur:2018" }, { - "duration": "23.0", + "duration": "20.0", "name": "system_health.memory_desktop/load:media:soundcloud:2018" }, { @@ -1852,11 +1852,11 @@ "name": "system_health.memory_desktop/load:media:youtube:2018" }, { - "duration": "16.0", + "duration": "17.0", "name": "system_health.memory_desktop/load:media:youtubelivingroom:2020" }, { - "duration": "22.0", + "duration": "21.0", "name": "system_health.memory_desktop/load:news:bbc:2018" }, { @@ -1864,27 +1864,27 @@ "name": "system_health.memory_desktop/load:news:cnn:2020" }, { - "duration": "21.0", + "duration": "20.0", "name": "system_health.memory_desktop/load:news:flipboard" }, { - "duration": "13.0", + "duration": "14.0", "name": "system_health.memory_desktop/load:news:hackernews:2018" }, { - "duration": "32.0", + "duration": "34.0", "name": "system_health.memory_desktop/load:news:nytimes:2018" }, { - "duration": "20.0", - "name": "system_health.memory_desktop/load:news:qq:2018" + "duration": "26.0", + "name": "system_health.memory_desktop/load:news:reddit:2018" }, { - "duration": "18.0", + "duration": "19.0", "name": "system_health.memory_desktop/load:news:wikipedia:2018" }, { - "duration": "23.0", + "duration": "25.0", "name": "system_health.memory_desktop/load:search:amazon:2018" }, { @@ -1892,39 +1892,39 @@ "name": "system_health.memory_desktop/load:search:baidu:2018" }, { - "duration": "25.0", + "duration": "28.0", "name": "system_health.memory_desktop/load:search:ebay:2018" }, { - "duration": "42.0", + "duration": "23.0", "name": "system_health.memory_desktop/load:search:flipkart:2018" }, { - "duration": "15.0", + "duration": "16.0", "name": "system_health.memory_desktop/load:search:google:2018" }, { - "duration": "20.0", + "duration": "22.0", "name": "system_health.memory_desktop/load:search:taobao:2018" }, { - "duration": "15.0", + "duration": "16.0", "name": "system_health.memory_desktop/load:search:yahoo:2018" }, { - "duration": "16.0", + "duration": "18.0", "name": "system_health.memory_desktop/load:search:yandex:2018" }, { - "duration": "17.0", + "duration": "18.0", "name": "system_health.memory_desktop/load:social:instagram:2018" }, { - "duration": "13.0", + "duration": "15.0", "name": "system_health.memory_desktop/load:social:pinterest:2019" }, { - "duration": "20.0", + "duration": "22.0", "name": "system_health.memory_desktop/load:social:vk:2018" }, { @@ -1932,51 +1932,55 @@ "name": "system_health.memory_desktop/load:tools:chat:2020" }, { - "duration": "39.0", + "duration": "40.0", "name": "system_health.memory_desktop/load:tools:docs:2019" }, { - "duration": "14.0", + "duration": "16.0", "name": "system_health.memory_desktop/load:tools:drive:2019" }, { - "duration": "1.0", + "duration": "2.0", "name": "system_health.memory_desktop/load:tools:gmail:2019" }, { - "duration": "20.0", + "duration": "22.0", "name": "system_health.memory_desktop/load:tools:stackoverflow:2018" }, { - "duration": "23.0", + "duration": "24.0", "name": "system_health.memory_desktop/load:tools:weather:2019" }, { - "duration": "18.0", + "duration": "19.0", "name": "system_health.memory_desktop/load_accessibility:media:wikipedia:2018" }, { - "duration": "36.0", + "duration": "33.0", "name": "system_health.memory_desktop/load_accessibility:shopping:amazon:2018" }, { - "duration": "1.0", + "duration": "2.0", "name": "system_health.memory_desktop/long_running:tools:gmail-background" }, { - "duration": "1.0", + "duration": "2.0", "name": "system_health.memory_desktop/long_running:tools:gmail-foreground" }, { - "duration": "1.0", + "duration": "2.0", "name": "system_health.memory_desktop/multitab:misc:typical24" }, { - "duration": "1.0", + "duration": "2.0", "name": "system_health.memory_desktop/multitab:misc:typical24:2018" }, { "duration": "1.0", "name": "system_health.memory_desktop/play:media:google_play_music" + }, + { + "duration": "46.0", + "name": "system_health.memory_desktop/play:media:soundcloud:2018" } ] \ No newline at end of file
diff --git a/tools/perf/core/shard_maps/timing_data/fuchsia-perf-shk_timing.json b/tools/perf/core/shard_maps/timing_data/fuchsia-perf-shk_timing.json index 2b65865..e58f2b8 100644 --- a/tools/perf/core/shard_maps/timing_data/fuchsia-perf-shk_timing.json +++ b/tools/perf/core/shard_maps/timing_data/fuchsia-perf-shk_timing.json
@@ -1,6 +1,70 @@ [ { - "duration": "468.0", + "duration": "10.0", + "name": "media.mobile/mse.html?media=aac_audio.mp4" + }, + { + "duration": "10.0", + "name": "media.mobile/mse.html?media=aac_audio.mp4,h264_video.mp4" + }, + { + "duration": "10.0", + "name": "media.mobile/mse.html?media=h264_video.mp4" + }, + { + "duration": "14.0", + "name": "media.mobile/mse.html?media=tulip2.vp9.webm" + }, + { + "duration": "3.0", + "name": "media.mobile/video.html?src=boat_1080p60fps_vp9.webm" + }, + { + "duration": "3.0", + "name": "media.mobile/video.html?src=foodmarket_720p30fps.mp4" + }, + { + "duration": "25.0", + "name": "media.mobile/video.html?src=tulip2.m4a&type=audio" + }, + { + "duration": "24.0", + "name": "media.mobile/video.html?src=tulip2.mp3&type=audio" + }, + { + "duration": "7.0", + "name": "media.mobile/video.html?src=tulip2.mp3&type=audio&seek" + }, + { + "duration": "26.0", + "name": "media.mobile/video.html?src=tulip2.mp4" + }, + { + "duration": "26.0", + "name": "media.mobile/video.html?src=tulip2.mp4&busyjs" + }, + { + "duration": "28.0", + "name": "media.mobile/video.html?src=tulip2.ogg&type=audio" + }, + { + "duration": "7.0", + "name": "media.mobile/video.html?src=tulip2.ogg&type=audio&seek" + }, + { + "duration": "26.0", + "name": "media.mobile/video.html?src=tulip2.vp9.webm" + }, + { + "duration": "3.0", + "name": "media.mobile/video.html?src=tulip2.vp9.webm&background" + }, + { + "duration": "26.0", + "name": "media.mobile/video.html?src=tulip2.vp9.webm_WiFi" + }, + { + "duration": "375.0", "name": "speedometer2/Speedometer2" }, {
diff --git a/ui/accessibility/accessibility_features.cc b/ui/accessibility/accessibility_features.cc index e40e5b6..03e7c44 100644 --- a/ui/accessibility/accessibility_features.cc +++ b/ui/accessibility/accessibility_features.cc
@@ -210,6 +210,15 @@ return base::FeatureList::IsEnabled( ::features::kAccessibilitySelectToSpeakHoverTextImprovements); } + +BASE_FEATURE(kAccessibilityAcceleratorNotificationsTimeout, + "AccessibilityAcceleratorNotificationsTimeout", + base::FEATURE_DISABLED_BY_DEFAULT); + +bool IsAccessibilityAcceleratorNotificationsTimeoutEnabled() { + return base::FeatureList::IsEnabled( + ::features::kAccessibilityAcceleratorNotificationsTimeout); +} #endif // BUILDFLAG(IS_CHROMEOS_ASH) BASE_FEATURE(kAugmentExistingImageLabels, @@ -257,7 +266,7 @@ BASE_FEATURE(kOptimizeAccessibilityUiThreadWork, "OptimizeAccessibilityUiThreadWork", - base::FEATURE_DISABLED_BY_DEFAULT); + base::FEATURE_ENABLED_BY_DEFAULT); bool IsOptimizeAccessibilityUiThreadWorkEnabled() { return base::FeatureList::IsEnabled(
diff --git a/ui/accessibility/accessibility_features.h b/ui/accessibility/accessibility_features.h index 7849b166..5d1cc6f 100644 --- a/ui/accessibility/accessibility_features.h +++ b/ui/accessibility/accessibility_features.h
@@ -160,6 +160,13 @@ // Returns true if AccessibilitySelectToSpeakHoverTextImprovements is enabled. AX_BASE_EXPORT bool IsAccessibilitySelectToSpeakHoverTextImprovementsEnabled(); +// Enables accessibility accelerator notifications to timeout. +AX_BASE_EXPORT BASE_DECLARE_FEATURE( + kAccessibilityAcceleratorNotificationsTimeout); + +// Returns true if kAccessibilityAcceleratorNotificationsTimeout is enabled. +AX_BASE_EXPORT bool IsAccessibilityAcceleratorNotificationsTimeoutEnabled(); + #endif // BUILDFLAG(IS_CHROMEOS_ASH) // Enables Get Image Descriptions to augment existing images labels,
diff --git a/ui/android/java/res/values/color_palette.xml b/ui/android/java/res/values/color_palette.xml index ac398348..02d417c 100644 --- a/ui/android/java/res/values/color_palette.xml +++ b/ui/android/java/res/values/color_palette.xml
@@ -14,6 +14,7 @@ <color name="baseline_primary_200_alpha_10" tools:ignore="UnusedResources">#19A8C7FA</color> <color name="baseline_primary_200_alpha_20">#33A8C7FA</color> <color name="baseline_primary_200_alpha_50">#80A8C7FA</color> + <color name="baseline_primary_300">#7CACF8</color> <color name="baseline_primary_600">#0B57D0</color> <color name="baseline_primary_600_alpha_6">#0F0B57D0</color> <color name="baseline_primary_600_alpha_10">#190B57D0</color>
diff --git a/ui/base/ime/ash/input_method_ash.cc b/ui/base/ime/ash/input_method_ash.cc index d15e406..adef537 100644 --- a/ui/base/ime/ash/input_method_ash.cc +++ b/ui/base/ime/ash/input_method_ash.cc
@@ -271,7 +271,6 @@ TextInputMethod* engine = GetEngine(); if (engine) { - engine->SetCompositionBounds(GetCompositionBounds(client)); engine->SetCaretBounds(client->GetCaretBounds()); } @@ -1069,23 +1068,6 @@ return this; } -std::vector<gfx::Rect> InputMethodAsh::GetCompositionBounds( - const TextInputClient* client) { - std::vector<gfx::Rect> bounds; - if (client->HasCompositionText()) { - uint32_t i = 0; - gfx::Rect rect; - while (client->GetCompositionCharacterBounds(i++, &rect)) - bounds.push_back(rect); - } else { - // For case of no composition at present, use caret bounds which is required - // by the IME extension for certain features (e.g. physical keyboard - // auto-correct). - bounds.push_back(client->GetCaretBounds()); - } - return bounds; -} - bool InputMethodAsh::SendFakeProcessKeyEvent(bool pressed) const { ui::KeyEvent evt(pressed ? ui::ET_KEY_PRESSED : ui::ET_KEY_RELEASED, pressed ? ui::VKEY_PROCESSKEY : ui::VKEY_UNKNOWN,
diff --git a/ui/base/ime/ash/input_method_ash.h b/ui/base/ime/ash/input_method_ash.h index 762540c..b437a3e 100644 --- a/ui/base/ime/ash/input_method_ash.h +++ b/ui/base/ime/ash/input_method_ash.h
@@ -182,10 +182,6 @@ bool IsPasswordOrNoneInputFieldFocused(); - // Gets the bounds of the composition text or cursor in |client|. - std::vector<gfx::Rect> GetCompositionBounds( - const ui::TextInputClient* client); - // Sends a fake key event for IME composing without physical key events. // Returns true if the faked key event is stopped propagation. bool SendFakeProcessKeyEvent(bool pressed) const;
diff --git a/ui/base/ime/ash/mock_ime_engine_handler.cc b/ui/base/ime/ash/mock_ime_engine_handler.cc index e0ac2a31d..c024c2910 100644 --- a/ui/base/ime/ash/mock_ime_engine_handler.cc +++ b/ui/base/ime/ash/mock_ime_engine_handler.cc
@@ -50,9 +50,6 @@ last_passed_callback_ = std::move(callback); } -void MockIMEEngineHandler::SetCompositionBounds( - const std::vector<gfx::Rect>& bounds) {} - void MockIMEEngineHandler::SetCaretBounds( const gfx::Rect& caret_bounds) {}
diff --git a/ui/base/ime/ash/mock_ime_engine_handler.h b/ui/base/ime/ash/mock_ime_engine_handler.h index a835412e..9b73a0c 100644 --- a/ui/base/ime/ash/mock_ime_engine_handler.h +++ b/ui/base/ime/ash/mock_ime_engine_handler.h
@@ -34,7 +34,6 @@ void Reset() override; void ProcessKeyEvent(const ui::KeyEvent& key_event, KeyEventDoneCallback callback) override; - void SetCompositionBounds(const std::vector<gfx::Rect>& bounds) override; void SetCaretBounds(const gfx::Rect& caret_bounds) override; ui::VirtualKeyboardController* GetVirtualKeyboardController() const override; void PropertyActivate(const std::string& property_name) override;
diff --git a/ui/base/ime/ash/text_input_method.h b/ui/base/ime/ash/text_input_method.h index ce1ab51e..f5bcf86 100644 --- a/ui/base/ime/ash/text_input_method.h +++ b/ui/base/ime/ash/text_input_method.h
@@ -135,9 +135,6 @@ uint32_t anchor_pos, uint32_t offset_pos) = 0; - // Called when the composition bounds changed. - virtual void SetCompositionBounds(const std::vector<gfx::Rect>& bounds) = 0; - // Called when caret bounds changed. virtual void SetCaretBounds(const gfx::Rect& caret_bounds) = 0;
diff --git a/ui/gl/gl_image.h b/ui/gl/gl_image.h index 045f211..fa94864 100644 --- a/ui/gl/gl_image.h +++ b/ui/gl/gl_image.h
@@ -33,6 +33,7 @@ class DawnEGLImageRepresentation; class D3DImageBacking; class D3DImageBackingFactoryTest; +class GLTextureImageBacking; class GLTexturePassthroughD3DImageRepresentation; FORWARD_DECLARE_TEST(CALayerTreeTest, HDRTrigger); FORWARD_DECLARE_TEST(D3DImageBackingFactoryTestSwapChain, @@ -145,6 +146,7 @@ friend class gpu::DawnEGLImageRepresentation; friend class gpu::D3DImageBacking; friend class gpu::D3DImageBackingFactoryTest; + friend class gpu::GLTextureImageBacking; friend class gpu::GLTexturePassthroughD3DImageRepresentation; friend class gpu::gles2::BackTexture; friend class gpu::gles2::GLES2DecoderImpl;
diff --git a/ui/lottie/animation_unittest.cc b/ui/lottie/animation_unittest.cc index 8ab23d0..ddd865c 100644 --- a/ui/lottie/animation_unittest.cc +++ b/ui/lottie/animation_unittest.cc
@@ -22,6 +22,7 @@ #include "cc/paint/skottie_resource_metadata.h" #include "cc/paint/skottie_wrapper.h" #include "cc/test/lottie_test_data.h" +#include "cc/test/paint_image_matchers.h" #include "cc/test/skia_common.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" @@ -45,7 +46,6 @@ using ::testing::NotNull; using ::testing::Pair; using ::testing::SizeIs; -using ::testing::UnorderedElementsAre; // A skottie animation with solid green color for the first 2.5 seconds and then // a solid blue color for the next 2.5 seconds. @@ -1338,8 +1338,7 @@ const cc::DrawSkottieOp* op = paint_record.GetOpAtForTesting<cc::DrawSkottieOp>(0); ASSERT_THAT(op, NotNull()); - EXPECT_THAT(op->images, UnorderedElementsAre(Pair( - cc::HashSkottieResourceId("image_0"), frame_0))); + EXPECT_THAT(op->images, ElementsAre(cc::SkottieImageIs("image_0", frame_0))); AdvanceClock(animation_->GetAnimationDuration() * .75); @@ -1349,8 +1348,7 @@ ASSERT_THAT(paint_record.size(), Eq(1u)); op = paint_record.GetOpAtForTesting<cc::DrawSkottieOp>(0); ASSERT_THAT(op, NotNull()); - EXPECT_THAT(op->images, UnorderedElementsAre(Pair( - cc::HashSkottieResourceId("image_1"), frame_1))); + EXPECT_THAT(op->images, ElementsAre(cc::SkottieImageIs("image_1", frame_1))); } TEST_F(AnimationWithImageAssetsTest, GracefullyHandlesNullImages) { @@ -1365,9 +1363,8 @@ const cc::DrawSkottieOp* op = paint_record.GetOpAtForTesting<cc::DrawSkottieOp>(0); ASSERT_THAT(op, NotNull()); - EXPECT_THAT(op->images, - UnorderedElementsAre(Pair(cc::HashSkottieResourceId("image_0"), - cc::SkottieFrameData()))); + EXPECT_THAT(op->images, ElementsAre(cc::SkottieImageIs( + "image_0", cc::SkottieFrameData()))); } TEST_F(AnimationWithImageAssetsTest, LoadsCorrectFrameTimestamp) {
